From aa51ace46d4ea9a1429f1c101ea5b4f8fdfd21b5 Mon Sep 17 00:00:00 2001 From: ziggurat29 Date: Sat, 14 May 2016 08:15:48 -0500 Subject: [PATCH 001/229] initial code for USB OTG support in STM32L4. Builds, but needs debugging. --- arch/arm/src/stm32l4/Make.defs | 22 + arch/arm/src/stm32l4/chip/stm32l4_memorymap.h | 2 +- arch/arm/src/stm32l4/chip/stm32l4x6xx_otgfs.h | 1162 ++++ .../arm/src/stm32l4/chip/stm32l4x6xx_pinmap.h | 36 +- arch/arm/src/stm32l4/stm32l4_otgfs.h | 129 + arch/arm/src/stm32l4/stm32l4_otgfsdev.c | 5672 +++++++++++++++++ arch/arm/src/stm32l4/stm32l4_otgfshost.c | 5307 +++++++++++++++ arch/arm/src/stm32l4/stm32l4_usbhost.h | 212 + arch/arm/src/stm32l4/stm32l4_usbhost_trace.c | 189 + configs/stm32l476vg-disco/nsh/defconfig | 79 +- configs/stm32l476vg-disco/src/Makefile | 2 +- configs/stm32l476vg-disco/src/stm32_appinit.c | 24 + configs/stm32l476vg-disco/src/stm32_boot.c | 8 +- configs/stm32l476vg-disco/src/stm32_usb.c | 336 + .../stm32l476vg-disco/src/stm32l476vg-disco.h | 56 +- 15 files changed, 13204 insertions(+), 32 deletions(-) create mode 100644 arch/arm/src/stm32l4/chip/stm32l4x6xx_otgfs.h create mode 100644 arch/arm/src/stm32l4/stm32l4_otgfs.h create mode 100644 arch/arm/src/stm32l4/stm32l4_otgfsdev.c create mode 100644 arch/arm/src/stm32l4/stm32l4_otgfshost.c create mode 100644 arch/arm/src/stm32l4/stm32l4_usbhost.h create mode 100644 arch/arm/src/stm32l4/stm32l4_usbhost_trace.c create mode 100644 configs/stm32l476vg-disco/src/stm32_usb.c diff --git a/arch/arm/src/stm32l4/Make.defs b/arch/arm/src/stm32l4/Make.defs index 561cfedf28..fbbb3b5387 100644 --- a/arch/arm/src/stm32l4/Make.defs +++ b/arch/arm/src/stm32l4/Make.defs @@ -136,6 +136,28 @@ ifeq ($(CONFIG_STM32L4_DMA),y) CHIP_CSRCS += stm32l4_dma.c endif +ifeq ($(CONFIG_USBDEV),y) +ifeq ($(CONFIG_STM32L4_OTGFS),y) +CHIP_CSRCS += stm32l4_otgfsdev.c +endif +endif + +ifeq ($(CONFIG_USBHOST),y) +ifeq ($(CONFIG_STM32L4_OTGFS),y) +CHIP_CSRCS += stm32l4_otgfshost.c +endif +endif + +ifeq ($(CONFIG_USBHOST),y) +ifeq ($(CONFIG_USBHOST_TRACE),y) +CHIP_CSRCS += stm32l4_usbhost_trace.c +else +ifeq ($(CONFIG_DEBUG_USB),y) +CHIP_CSRCS += stm32l4_usbhost_trace.c +endif +endif +endif + ifeq ($(CONFIG_STM32L4_PWR),y) CHIP_CSRCS += stm32l4_exti_pwr.c endif diff --git a/arch/arm/src/stm32l4/chip/stm32l4_memorymap.h b/arch/arm/src/stm32l4/chip/stm32l4_memorymap.h index 0dd79ff8de..99271a7a52 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4_memorymap.h +++ b/arch/arm/src/stm32l4/chip/stm32l4_memorymap.h @@ -175,7 +175,7 @@ #define STM32L4_RNG_BASE 0x50060800 #define STM32L4_AES_BASE 0x50060000 #define STM32L4_ADC_BASE 0x50040000 -#define STM32L4_OTG_FS_BASE 0x50000000 +#define STM32L4_OTGFS_BASE 0x50000000 #define STM32L4_GPIOH_BASE 0x50001c00 #define STM32L4_GPIOG_BASE 0x48001800 #define STM32L4_GPIOF_BASE 0x48001400 diff --git a/arch/arm/src/stm32l4/chip/stm32l4x6xx_otgfs.h b/arch/arm/src/stm32l4/chip/stm32l4x6xx_otgfs.h new file mode 100644 index 0000000000..2d8d431285 --- /dev/null +++ b/arch/arm/src/stm32l4/chip/stm32l4x6xx_otgfs.h @@ -0,0 +1,1162 @@ +/**************************************************************************************************** + * arch/arm/src/stm32l4/chip/stm32l4x6xx_otgfs.h + * + * Copyright (C) 2012, 2014-2015 Gregory Nutt. All rights reserved. + * Copyright (C) 2016 Omni Hoverboards Inc. All rights reserved. + * Author: Gregory Nutt + * Paul Alexander Patience + * dev@ziggurat29.com + * + * 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_STM32L4_CHIP_STM32L4X6XX_OTGFS_H +#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X6XX_OTGFS_H + +/**************************************************************************************************** + * Included Files + ****************************************************************************************************/ +/**************************************************************************************************** + * Pre-processor Definitions + ****************************************************************************************************/ +/* General definitions */ + +#define OTGFS_EPTYPE_CTRL (0) /* Control */ +#define OTGFS_EPTYPE_ISOC (1) /* Isochronous */ +#define OTGFS_EPTYPE_BULK (2) /* Bulk */ +#define OTGFS_EPTYPE_INTR (3) /* Interrupt */ + +#define OTGFS_PID_DATA0 (0) +#define OTGFS_PID_DATA2 (1) +#define OTGFS_PID_DATA1 (2) +#define OTGFS_PID_MDATA (3) /* Non-control */ +#define OTGFS_PID_SETUP (3) /* Control */ + +/* Register Offsets *********************************************************************************/ +/* Core global control and status registers */ + +#define STM32_OTGFS_GOTGCTL_OFFSET 0x0000 /* Control and status register */ +#define STM32_OTGFS_GOTGINT_OFFSET 0x0004 /* Interrupt register */ +#define STM32_OTGFS_GAHBCFG_OFFSET 0x0008 /* AHB configuration register */ +#define STM32_OTGFS_GUSBCFG_OFFSET 0x000c /* USB configuration register */ +#define STM32_OTGFS_GRSTCTL_OFFSET 0x0010 /* Reset register */ +#define STM32_OTGFS_GINTSTS_OFFSET 0x0014 /* Core interrupt register */ +#define STM32_OTGFS_GINTMSK_OFFSET 0x0018 /* Interrupt mask register */ +#define STM32_OTGFS_GRXSTSR_OFFSET 0x001c /* Receive status debug read/OTG status read register */ +#define STM32_OTGFS_GRXSTSP_OFFSET 0x0020 /* Receive status debug read/OTG status pop register */ +#define STM32_OTGFS_GRXFSIZ_OFFSET 0x0024 /* Receive FIFO size register */ +#define STM32_OTGFS_HNPTXFSIZ_OFFSET 0x0028 /* Host non-periodic transmit FIFO size register */ +#define STM32_OTGFS_DIEPTXF0_OFFSET 0x0028 /* Endpoint 0 Transmit FIFO size */ +#define STM32_OTGFS_HNPTXSTS_OFFSET 0x002c /* Non-periodic transmit FIFO/queue status register */ +#define STM32_OTGFS_GCCFG_OFFSET 0x0038 /* General core configuration register */ +#define STM32_OTGFS_CID_OFFSET 0x003c /* Core ID register */ +#define STM32_OTGFS_GLPMCFG_OFFSET 0x0054 /* LPM configuration register */ +#define STM32_OTGFS_GPWRDN_OFFSET 0x0058 /* Power down register */ +#define STM32_OTGFS_GADPCTL_OFSSET 0x005c /* ADP timer, control and status register */ +#define STM32_OTGFS_HPTXFSIZ_OFFSET 0x0100 /* Host periodic transmit FIFO size register */ + +#define STM32_OTGFS_DIEPTXF_OFFSET(n) (104+(((n)-1) << 2)) +#define STM32_OTGFS_DIEPTXF1_OFFSET 0x0104 /* Device IN endpoint transmit FIFO1 size register */ +#define STM32_OTGFS_DIEPTXF2_OFFSET 0x0108 /* Device IN endpoint transmit FIFO2 size register */ +#define STM32_OTGFS_DIEPTXF3_OFFSET 0x010c /* Device IN endpoint transmit FIFO3 size register */ +#define STM32_OTGFS_DIEPTXF4_OFFSET 0x0110 /* Device IN endpoint transmit FIFO4 size register */ +#define STM32_OTGFS_DIEPTXF5_OFFSET 0x0114 /* Device IN endpoint transmit FIFO5 size register */ + +/* Host-mode control and status registers */ + +#define STM32_OTGFS_HCFG_OFFSET 0x0400 /* Host configuration register */ +#define STM32_OTGFS_HFIR_OFFSET 0x0404 /* Host frame interval register */ +#define STM32_OTGFS_HFNUM_OFFSET 0x0408 /* Host frame number/frame time remaining register */ +#define STM32_OTGFS_HPTXSTS_OFFSET 0x0410 /* Host periodic transmit FIFO/queue status register */ +#define STM32_OTGFS_HAINT_OFFSET 0x0414 /* Host all channels interrupt register */ +#define STM32_OTGFS_HAINTMSK_OFFSET 0x0418 /* Host all channels interrupt mask register */ +#define STM32_OTGFS_HPRT_OFFSET 0x0440 /* Host port control and status register */ + +#define STM32_OTGFS_CHAN_OFFSET(n) (0x500 + ((n) << 5) +#define STM32_OTGFS_HCCHAR_CHOFFSET 0x0000 /* Host channel characteristics register */ +#define STM32_OTGFS_HCINT_CHOFFSET 0x0008 /* Host channel interrupt register */ +#define STM32_OTGFS_HCINTMSK_CHOFFSET 0x000c /* Host channel interrupt mask register */ +#define STM32_OTGFS_HCTSIZ_CHOFFSET 0x0010 /* Host channel interrupt register */ + +#define STM32_OTGFS_HCCHAR_OFFSET(n) (0x500 + ((n) << 5)) +#define STM32_OTGFS_HCCHAR0_OFFSET 0x0500 /* Host channel-0 characteristics register */ +#define STM32_OTGFS_HCCHAR1_OFFSET 0x0520 /* Host channel-1 characteristics register */ +#define STM32_OTGFS_HCCHAR2_OFFSET 0x0540 /* Host channel-2 characteristics register */ +#define STM32_OTGFS_HCCHAR3_OFFSET 0x0560 /* Host channel-3 characteristics register */ +#define STM32_OTGFS_HCCHAR4_OFFSET 0x0580 /* Host channel-4 characteristics register */ +#define STM32_OTGFS_HCCHAR5_OFFSET 0x05a0 /* Host channel-5 characteristics register */ +#define STM32_OTGFS_HCCHAR6_OFFSET 0x05c0 /* Host channel-6 characteristics register */ +#define STM32_OTGFS_HCCHAR7_OFFSET 0x05e0 /* Host channel-7 characteristics register */ +#define STM32_OTGFS_HCCHAR8_OFFSET 0x0600 /* Host channel-8 characteristics register */ +#define STM32_OTGFS_HCCHAR9_OFFSET 0x0620 /* Host channel-9 characteristics register */ +#define STM32_OTGFS_HCCHAR10_OFFSET 0x0640 /* Host channel-10 characteristics register */ +#define STM32_OTGFS_HCCHAR11_OFFSET 0x0660 /* Host channel-11 characteristics register */ + +#define STM32_OTGFS_HCINT_OFFSET(n) (0x508 + ((n) << 5)) +#define STM32_OTGFS_HCINT0_OFFSET 0x0508 /* Host channel-0 interrupt register */ +#define STM32_OTGFS_HCINT1_OFFSET 0x0528 /* Host channel-1 interrupt register */ +#define STM32_OTGFS_HCINT2_OFFSET 0x0548 /* Host channel-2 interrupt register */ +#define STM32_OTGFS_HCINT3_OFFSET 0x0568 /* Host channel-3 interrupt register */ +#define STM32_OTGFS_HCINT4_OFFSET 0x0588 /* Host channel-4 interrupt register */ +#define STM32_OTGFS_HCINT5_OFFSET 0x05a8 /* Host channel-5 interrupt register */ +#define STM32_OTGFS_HCINT6_OFFSET 0x05c8 /* Host channel-6 interrupt register */ +#define STM32_OTGFS_HCINT7_OFFSET 0x05e8 /* Host channel-7 interrupt register */ +#define STM32_OTGFS_HCINT8_OFFSET 0x0608 /* Host channel-8 interrupt register */ +#define STM32_OTGFS_HCINT9_OFFSET 0x0628 /* Host channel-9 interrupt register */ +#define STM32_OTGFS_HCINT10_OFFSET 0x0648 /* Host channel-10 interrupt register */ +#define STM32_OTGFS_HCINT11_OFFSET 0x0668 /* Host channel-11 interrupt register */ + +#define STM32_OTGFS_HCINTMSK_OFFSET(n) (0x50c + ((n) << 5)) +#define STM32_OTGFS_HCINTMSK0_OFFSET 0x050c /* Host channel-0 interrupt mask register */ +#define STM32_OTGFS_HCINTMSK1_OFFSET 0x052c /* Host channel-1 interrupt mask register */ +#define STM32_OTGFS_HCINTMSK2_OFFSET 0x054c /* Host channel-2 interrupt mask register */ +#define STM32_OTGFS_HCINTMSK3_OFFSET 0x056c /* Host channel-3 interrupt mask register */ +#define STM32_OTGFS_HCINTMSK4_OFFSET 0x058c /* Host channel-4 interrupt mask register */ +#define STM32_OTGFS_HCINTMSK5_OFFSET 0x05ac /* Host channel-5 interrupt mask register */ +#define STM32_OTGFS_HCINTMSK6_OFFSET 0x05cc /* Host channel-6 interrupt mask register */ +#define STM32_OTGFS_HCINTMSK7_OFFSET 0x05ec /* Host channel-7 interrupt mask register */ +#define STM32_OTGFS_HCINTMSK8_OFFSET 0x060c /* Host channel-8 interrupt mask register */ +#define STM32_OTGFS_HCINTMSK9_OFFSET 0x062c /* Host channel-9 interrupt mask register */ +#define STM32_OTGFS_HCINTMSK10_OFFSET 0x064c /* Host channel-10 interrupt mask register */ +#define STM32_OTGFS_HCINTMSK11_OFFSET 0x066c /* Host channel-11 interrupt mask register */ + +#define STM32_OTGFS_HCTSIZ_OFFSET(n) (0x510 + ((n) << 5)) +#define STM32_OTGFS_HCTSIZ0_OFFSET 0x0510 /* Host channel-0 interrupt register */ +#define STM32_OTGFS_HCTSIZ1_OFFSET 0x0530 /* Host channel-1 interrupt register */ +#define STM32_OTGFS_HCTSIZ2_OFFSET 0x0550 /* Host channel-2 interrupt register */ +#define STM32_OTGFS_HCTSIZ3_OFFSET 0x0570 /* Host channel-3 interrupt register */ +#define STM32_OTGFS_HCTSIZ4_OFFSET 0x0590 /* Host channel-4 interrupt register */ +#define STM32_OTGFS_HCTSIZ5_OFFSET 0x05b0 /* Host channel-5 interrupt register */ +#define STM32_OTGFS_HCTSIZ6_OFFSET 0x05d0 /* Host channel-6 interrupt register */ +#define STM32_OTGFS_HCTSIZ7_OFFSET 0x05f0 /* Host channel-7 interrupt register */ +#define STM32_OTGFS_HCTSIZ8_OFFSET 0x0610 /* Host channel-8 interrupt register */ +#define STM32_OTGFS_HCTSIZ9_OFFSET 0x0630 /* Host channel-9 interrupt register */ +#define STM32_OTGFS_HCTSIZ10_OFFSET 0x0650 /* Host channel-10 interrupt register */ +#define STM32_OTGFS_HCTSIZ11_OFFSET 0x0670 /* Host channel-11 interrupt register */ + +/* Device-mode control and status registers */ + +#define STM32_OTGFS_DCFG_OFFSET 0x0800 /* Device configuration register */ +#define STM32_OTGFS_DCTL_OFFSET 0x0804 /* Device control register */ +#define STM32_OTGFS_DSTS_OFFSET 0x0808 /* Device status register */ +#define STM32_OTGFS_DIEPMSK_OFFSET 0x0810 /* Device IN endpoint common interrupt mask register */ +#define STM32_OTGFS_DOEPMSK_OFFSET 0x0814 /* Device OUT endpoint common interrupt mask register */ +#define STM32_OTGFS_DAINT_OFFSET 0x0818 /* Device all endpoints interrupt register */ +#define STM32_OTGFS_DAINTMSK_OFFSET 0x081c /* All endpoints interrupt mask register */ +#define STM32_OTGFS_DVBUSDIS_OFFSET 0x0828 /* Device VBUS discharge time register */ +#define STM32_OTGFS_DVBUSPULSE_OFFSET 0x082c /* Device VBUS pulsing time register */ +#define STM32_OTGFS_DIEPEMPMSK_OFFSET 0x0834 /* Device IN endpoint FIFO empty interrupt mask register */ + +#define STM32_OTGFS_DIEP_OFFSET(n) (0x0900 + ((n) << 5)) +#define STM32_OTGFS_DIEPCTL_EPOFFSET 0x0000 /* Device endpoint control register */ +#define STM32_OTGFS_DIEPINT_EPOFFSET 0x0008 /* Device endpoint interrupt register */ +#define STM32_OTGFS_DIEPTSIZ_EPOFFSET 0x0010 /* Device IN endpoint transfer size register */ +#define STM32_OTGFS_DTXFSTS_EPOFFSET 0x0018 /* Device IN endpoint transmit FIFO status register */ + +#define STM32_OTGFS_DIEPCTL_OFFSET(n) (0x0900 + ((n) << 5)) +#define STM32_OTGFS_DIEPCTL0_OFFSET 0x0900 /* Device control IN endpoint 0 control register */ +#define STM32_OTGFS_DIEPCTL1_OFFSET 0x0920 /* Device control IN endpoint 2 control register */ +#define STM32_OTGFS_DIEPCTL2_OFFSET 0x0940 /* Device control IN endpoint 3 control register */ +#define STM32_OTGFS_DIEPCTL3_OFFSET 0x0960 /* Device control IN endpoint 4 control register */ +#define STM32_OTGFS_DIEPCTL4_OFFSET 0x0980 /* Device control IN endpoint 4 control register */ +#define STM32_OTGFS_DIEPCTL5_OFFSET 0x09a0 /* Device control IN endpoint 4 control register */ + +#define STM32_OTGFS_DIEPINT_OFFSET(n) (0x0908 + ((n) << 5)) +#define STM32_OTGFS_DIEPINT0_OFFSET 0x0908 /* Device endpoint-0 interrupt register */ +#define STM32_OTGFS_DIEPINT1_OFFSET 0x0928 /* Device endpoint-1 interrupt register */ +#define STM32_OTGFS_DIEPINT2_OFFSET 0x0948 /* Device endpoint-2 interrupt register */ +#define STM32_OTGFS_DIEPINT3_OFFSET 0x0968 /* Device endpoint-3 interrupt register */ +#define STM32_OTGFS_DIEPINT4_OFFSET 0x0988 /* Device endpoint-3 interrupt register */ +#define STM32_OTGFS_DIEPINT5_OFFSET 0x09a8 /* Device endpoint-3 interrupt register */ + +#define STM32_OTGFS_DIEPTSIZ_OFFSET(n) (0x910 + ((n) << 5)) +#define STM32_OTGFS_DIEPTSIZ0_OFFSET 0x0910 /* Device IN endpoint 0 transfer size register */ +#define STM32_OTGFS_DIEPTSIZ1_OFFSET 0x0930 /* Device IN endpoint 1 transfer size register */ +#define STM32_OTGFS_DIEPTSIZ2_OFFSET 0x0950 /* Device IN endpoint 2 transfer size register */ +#define STM32_OTGFS_DIEPTSIZ3_OFFSET 0x0970 /* Device IN endpoint 3 transfer size register */ +#define STM32_OTGFS_DIEPTSIZ4_OFFSET 0x0990 /* Device IN endpoint 3 transfer size register */ +#define STM32_OTGFS_DIEPTSIZ5_OFFSET 0x09b0 /* Device IN endpoint 3 transfer size register */ + +#define STM32_OTGFS_DTXFSTS_OFFSET(n) (0x0918 + ((n) << 5)) +#define STM32_OTGFS_DTXFSTS0_OFFSET 0x0918 /* Device OUT endpoint-0 TxFIFO status register */ +#define STM32_OTGFS_DTXFSTS1_OFFSET 0x0938 /* Device OUT endpoint-1 TxFIFO status register */ +#define STM32_OTGFS_DTXFSTS2_OFFSET 0x0958 /* Device OUT endpoint-2 TxFIFO status register */ +#define STM32_OTGFS_DTXFSTS3_OFFSET 0x0978 /* Device OUT endpoint-3 TxFIFO status register */ +#define STM32_OTGFS_DTXFSTS4_OFFSET 0x0998 /* Device OUT endpoint-3 TxFIFO status register */ +#define STM32_OTGFS_DTXFSTS5_OFFSET 0x09b8 /* Device OUT endpoint-3 TxFIFO status register */ + +#define STM32_OTGFS_DOEP_OFFSET(n) (0x0b00 + ((n) << 5)) +#define STM32_OTGFS_DOEPCTL_EPOFFSET 0x0000 /* Device control OUT endpoint 0 control register */ +#define STM32_OTGFS_DOEPINT_EPOFFSET 0x0008 /* Device endpoint-x interrupt register */ +#define STM32_OTGFS_DOEPTSIZ_EPOFFSET 0x0010 /* Device endpoint OUT transfer size register */ + +#define STM32_OTGFS_DOEPCTL_OFFSET(n) (0x0b00 + ((n) << 5)) +#define STM32_OTGFS_DOEPCTL0_OFFSET 0x00b00 /* Device OUT endpoint 0 control register */ +#define STM32_OTGFS_DOEPCTL1_OFFSET 0x00b20 /* Device OUT endpoint 1 control register */ +#define STM32_OTGFS_DOEPCTL2_OFFSET 0x00b40 /* Device OUT endpoint 2 control register */ +#define STM32_OTGFS_DOEPCTL3_OFFSET 0x00b60 /* Device OUT endpoint 3 control register */ +#define STM32_OTGFS_DOEPCTL4_OFFSET 0x00b80 /* Device OUT endpoint 4 control register */ +#define STM32_OTGFS_DOEPCTL5_OFFSET 0x00ba0 /* Device OUT endpoint 5 control register */ + +#define STM32_OTGFS_DOEPINT_OFFSET(n) (0x0b08 + ((n) << 5)) +#define STM32_OTGFS_DOEPINT0_OFFSET 0x00b08 /* Device endpoint-0 interrupt register */ +#define STM32_OTGFS_DOEPINT1_OFFSET 0x00b28 /* Device endpoint-1 interrupt register */ +#define STM32_OTGFS_DOEPINT2_OFFSET 0x00b48 /* Device endpoint-2 interrupt register */ +#define STM32_OTGFS_DOEPINT3_OFFSET 0x00b68 /* Device endpoint-3 interrupt register */ +#define STM32_OTGFS_DOEPINT4_OFFSET 0x00b88 /* Device endpoint-4 interrupt register */ +#define STM32_OTGFS_DOEPINT5_OFFSET 0x00ba8 /* Device endpoint-5 interrupt register */ + +#define STM32_OTGFS_DOEPTSIZ_OFFSET(n) (0x0b10 + ((n) << 5)) +#define STM32_OTGFS_DOEPTSIZ0_OFFSET 0x00b10 /* Device OUT endpoint-0 transfer size register */ +#define STM32_OTGFS_DOEPTSIZ1_OFFSET 0x00b30 /* Device OUT endpoint-1 transfer size register */ +#define STM32_OTGFS_DOEPTSIZ2_OFFSET 0x00b50 /* Device OUT endpoint-2 transfer size register */ +#define STM32_OTGFS_DOEPTSIZ3_OFFSET 0x00b70 /* Device OUT endpoint-3 transfer size register */ +#define STM32_OTGFS_DOEPTSIZ4_OFFSET 0x00b90 /* Device OUT endpoint-4 transfer size register */ +#define STM32_OTGFS_DOEPTSIZ5_OFFSET 0x00bb0 /* Device OUT endpoint-5 transfer size register */ + +/* Power and clock gating registers */ + +#define STM32_OTGFS_PCGCCTL_OFFSET 0x0e00 /* Power and clock gating control register */ + +/* Data FIFO (DFIFO) access registers */ + +#define STM32_OTGFS_DFIFO_DEP_OFFSET(n) (0x1000 + ((n) << 12)) +#define STM32_OTGFS_DFIFO_HCH_OFFSET(n) (0x1000 + ((n) << 12)) + +#define STM32_OTGFS_DFIFO_DEP0_OFFSET 0x1000 /* 0x1000-0x1ffc Device IN/OUT Endpoint 0 DFIFO Write/Read Access */ +#define STM32_OTGFS_DFIFO_HCH0_OFFSET 0x1000 /* 0x1000-0x1ffc Host OUT/IN Channel 0 DFIFO Read/Write Access */ + +#define STM32_OTGFS_DFIFO_DEP1_OFFSET 0x2000 /* 0x2000-0x2ffc Device IN/OUT Endpoint 1 DFIFO Write/Read Access */ +#define STM32_OTGFS_DFIFO_HCH1_OFFSET 0x2000 /* 0x2000-0x2ffc Host OUT/IN Channel 1 DFIFO Read/Write Access */ + +#define STM32_OTGFS_DFIFO_DEP2_OFFSET 0x3000 /* 0x3000-0x3ffc Device IN/OUT Endpoint 2 DFIFO Write/Read Access */ +#define STM32_OTGFS_DFIFO_HCH2_OFFSET 0x3000 /* 0x3000-0x3ffc Host OUT/IN Channel 2 DFIFO Read/Write Access */ + +#define STM32_OTGFS_DFIFO_DEP3_OFFSET 0x4000 /* 0x4000-0x4ffc Device IN/OUT Endpoint 3 DFIFO Write/Read Access */ +#define STM32_OTGFS_DFIFO_HCH3_OFFSET 0x4000 /* 0x4000-0x4ffc Host OUT/IN Channel 3 DFIFO Read/Write Access */ + +#define STM32_OTGFS_DFIFO_DEP4_OFFSET 0x5000 /* 0x5000-0x5ffc Device IN/OUT Endpoint 4 DFIFO Write/Read Access */ +#define STM32_OTGFS_DFIFO_HCH4_OFFSET 0x5000 /* 0x5000-0x5ffc Host OUT/IN Channel 4 DFIFO Read/Write Access */ + +#define STM32_OTGFS_DFIFO_DEP5_OFFSET 0x6000 /* 0x6000-0x6ffc Device IN/OUT Endpoint 5 DFIFO Write/Read Access */ +#define STM32_OTGFS_DFIFO_HCH5_OFFSET 0x6000 /* 0x6000-0x6ffc Host OUT/IN Channel 5 DFIFO Read/Write Access */ + +/* Register Addresses *******************************************************************************/ + +#define STM32_OTGFS_GOTGCTL (STM32L4_OTGFS_BASE+STM32_OTGFS_GOTGCTL_OFFSET) +#define STM32_OTGFS_GOTGINT (STM32L4_OTGFS_BASE+STM32_OTGFS_GOTGINT_OFFSET) +#define STM32_OTGFS_GAHBCFG (STM32L4_OTGFS_BASE+STM32_OTGFS_GAHBCFG_OFFSET) +#define STM32_OTGFS_GUSBCFG (STM32L4_OTGFS_BASE+STM32_OTGFS_GUSBCFG_OFFSET) +#define STM32_OTGFS_GRSTCTL (STM32L4_OTGFS_BASE+STM32_OTGFS_GRSTCTL_OFFSET) +#define STM32_OTGFS_GINTSTS (STM32L4_OTGFS_BASE+STM32_OTGFS_GINTSTS_OFFSET) +#define STM32_OTGFS_GINTMSK (STM32L4_OTGFS_BASE+STM32_OTGFS_GINTMSK_OFFSET) +#define STM32_OTGFS_GRXSTSR (STM32L4_OTGFS_BASE+STM32_OTGFS_GRXSTSR_OFFSET) +#define STM32_OTGFS_GRXSTSP (STM32L4_OTGFS_BASE+STM32_OTGFS_GRXSTSP_OFFSET) +#define STM32_OTGFS_GRXFSIZ (STM32L4_OTGFS_BASE+STM32_OTGFS_GRXFSIZ_OFFSET) +#define STM32_OTGFS_HNPTXFSIZ (STM32L4_OTGFS_BASE+STM32_OTGFS_HNPTXFSIZ_OFFSET) +#define STM32_OTGFS_DIEPTXF0 (STM32L4_OTGFS_BASE+STM32_OTGFS_DIEPTXF0_OFFSET) +#define STM32_OTGFS_HNPTXSTS (STM32L4_OTGFS_BASE+STM32_OTGFS_HNPTXSTS_OFFSET) +#define STM32_OTGFS_GCCFG (STM32L4_OTGFS_BASE+STM32_OTGFS_GCCFG_OFFSET) +#define STM32_OTGFS_CID (STM32L4_OTGFS_BASE+STM32_OTGFS_CID_OFFSET) +#define STM32_OTGFS_GLPMCFG (STM32L4_OTGFS_BASE+STM32_OTGFS_GLPMCFG_OFFSET) +#define STM32_OTGFS_GPWRDN (STM32L4_OTGFS_BASE+STM32_OTGFS_GPWRDN_OFFSET) +#define STM32_OTGFS_GADPCTL (STM32L4_OTGFS_BASE+STM32_OTGFS_GADPCTL_OFSSET) +#define STM32_OTGFS_HPTXFSIZ (STM32L4_OTGFS_BASE+STM32_OTGFS_HPTXFSIZ_OFFSET) + +#define STM32_OTGFS_DIEPTXF(n) (STM32L4_OTGFS_BASE+STM32_OTGFS_DIEPTXF_OFFSET(n)) +#define STM32_OTGFS_DIEPTXF1 (STM32L4_OTGFS_BASE+STM32_OTGFS_DIEPTXF1_OFFSET) +#define STM32_OTGFS_DIEPTXF2 (STM32L4_OTGFS_BASE+STM32_OTGFS_DIEPTXF2_OFFSET) +#define STM32_OTGFS_DIEPTXF3 (STM32L4_OTGFS_BASE+STM32_OTGFS_DIEPTXF3_OFFSET) +#define STM32_OTGFS_DIEPTXF4 (STM32L4_OTGFS_BASE+STM32_OTGFS_DIEPTXF4_OFFSET) +#define STM32_OTGFS_DIEPTXF5 (STM32L4_OTGFS_BASE+STM32_OTGFS_DIEPTXF5_OFFSET) + +/* Host-mode control and status registers */ + +#define STM32_OTGFS_HCFG (STM32L4_OTGFS_BASE+STM32_OTGFS_HCFG_OFFSET) +#define STM32_OTGFS_HFIR (STM32L4_OTGFS_BASE+STM32_OTGFS_HFIR_OFFSET) +#define STM32_OTGFS_HFNUM (STM32L4_OTGFS_BASE+STM32_OTGFS_HFNUM_OFFSET) +#define STM32_OTGFS_HPTXSTS (STM32L4_OTGFS_BASE+STM32_OTGFS_HPTXSTS_OFFSET) +#define STM32_OTGFS_HAINT (STM32L4_OTGFS_BASE+STM32_OTGFS_HAINT_OFFSET) +#define STM32_OTGFS_HAINTMSK (STM32L4_OTGFS_BASE+STM32_OTGFS_HAINTMSK_OFFSET) +#define STM32_OTGFS_HPRT (STM32L4_OTGFS_BASE+STM32_OTGFS_HPRT_OFFSET) + +#define STM32_OTGFS_CHAN(n) (STM32L4_OTGFS_BASE+STM32_OTGFS_CHAN_OFFSET(n)) + +#define STM32_OTGFS_HCCHAR(n) (STM32L4_OTGFS_BASE+STM32_OTGFS_HCCHAR_OFFSET(n)) +#define STM32_OTGFS_HCCHAR0 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCCHAR0_OFFSET) +#define STM32_OTGFS_HCCHAR1 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCCHAR1_OFFSET) +#define STM32_OTGFS_HCCHAR2 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCCHAR2_OFFSET) +#define STM32_OTGFS_HCCHAR3 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCCHAR3_OFFSET) +#define STM32_OTGFS_HCCHAR4 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCCHAR4_OFFSET) +#define STM32_OTGFS_HCCHAR5 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCCHAR5_OFFSET) +#define STM32_OTGFS_HCCHAR6 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCCHAR6_OFFSET) +#define STM32_OTGFS_HCCHAR7 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCCHAR7_OFFSET) +#define STM32_OTGFS_HCCHAR8 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCCHAR8_OFFSET) +#define STM32_OTGFS_HCCHAR9 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCCHAR9_OFFSET) +#define STM32_OTGFS_HCCHAR10 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCCHAR10_OFFSET) +#define STM32_OTGFS_HCCHAR11 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCCHAR11_OFFSET) + +#define STM32_OTGFS_HCINT(n) (STM32L4_OTGFS_BASE+STM32_OTGFS_HCINT_OFFSET(n)) +#define STM32_OTGFS_HCINT0 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCINT0_OFFSET) +#define STM32_OTGFS_HCINT1 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCINT1_OFFSET) +#define STM32_OTGFS_HCINT2 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCINT2_OFFSET) +#define STM32_OTGFS_HCINT3 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCINT3_OFFSET) +#define STM32_OTGFS_HCINT4 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCINT4_OFFSET) +#define STM32_OTGFS_HCINT5 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCINT5_OFFSET) +#define STM32_OTGFS_HCINT6 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCINT6_OFFSET) +#define STM32_OTGFS_HCINT7 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCINT7_OFFSET) +#define STM32_OTGFS_HCINT8 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCINT8_OFFSET) +#define STM32_OTGFS_HCINT9 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCINT9_OFFSET) +#define STM32_OTGFS_HCINT10 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCINT10_OFFSET) +#define STM32_OTGFS_HCINT11 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCINT11_OFFSET) + +#define STM32_OTGFS_HCINTMSK(n) (STM32L4_OTGFS_BASE+STM32_OTGFS_HCINTMSK_OFFSET(n)) +#define STM32_OTGFS_HCINTMSK0 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCINTMSK0_OFFSET) +#define STM32_OTGFS_HCINTMSK1 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCINTMSK1_OFFSET) +#define STM32_OTGFS_HCINTMSK2 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCINTMSK2_OFFSET) +#define STM32_OTGFS_HCINTMSK3 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCINTMSK3_OFFSET) +#define STM32_OTGFS_HCINTMSK4 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCINTMSK4_OFFSET) +#define STM32_OTGFS_HCINTMSK5 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCINTMSK5_OFFSET) +#define STM32_OTGFS_HCINTMSK6 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCINTMSK6_OFFSET) +#define STM32_OTGFS_HCINTMSK7 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCINTMSK7_OFFSET) +#define STM32_OTGFS_HCINTMSK8 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCINTMSK8_OFFSET) +#define STM32_OTGFS_HCINTMSK9 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCINTMSK9_OFFSET) +#define STM32_OTGFS_HCINTMSK10 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCINTMSK10_OFFSET) +#define STM32_OTGFS_HCINTMSK11 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCINTMSK11_OFFSET) + +#define STM32_OTGFS_HCTSIZ(n) (STM32L4_OTGFS_BASE+STM32_OTGFS_HCTSIZ_OFFSET(n)) +#define STM32_OTGFS_HCTSIZ0 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCTSIZ0_OFFSET) +#define STM32_OTGFS_HCTSIZ1 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCTSIZ1_OFFSET) +#define STM32_OTGFS_HCTSIZ2 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCTSIZ2_OFFSET) +#define STM32_OTGFS_HCTSIZ3 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCTSIZ3_OFFSET) +#define STM32_OTGFS_HCTSIZ4 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCTSIZ4_OFFSET) +#define STM32_OTGFS_HCTSIZ5 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCTSIZ5_OFFSET) +#define STM32_OTGFS_HCTSIZ6 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCTSIZ6_OFFSET) +#define STM32_OTGFS_HCTSIZ7 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCTSIZ7_OFFSET) +#define STM32_OTGFS_HCTSIZ8 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCTSIZ8_OFFSET) +#define STM32_OTGFS_HCTSIZ9 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCTSIZ9_OFFSET) +#define STM32_OTGFS_HCTSIZ10 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCTSIZ10_OFFSET) +#define STM32_OTGFS_HCTSIZ11 (STM32L4_OTGFS_BASE+STM32_OTGFS_HCTSIZ11_OFFSET) + +/* Device-mode control and status registers */ + +#define STM32_OTGFS_DCFG (STM32L4_OTGFS_BASE+STM32_OTGFS_DCFG_OFFSET) +#define STM32_OTGFS_DCTL (STM32L4_OTGFS_BASE+STM32_OTGFS_DCTL_OFFSET) +#define STM32_OTGFS_DSTS (STM32L4_OTGFS_BASE+STM32_OTGFS_DSTS_OFFSET) +#define STM32_OTGFS_DIEPMSK (STM32L4_OTGFS_BASE+STM32_OTGFS_DIEPMSK_OFFSET) +#define STM32_OTGFS_DOEPMSK (STM32L4_OTGFS_BASE+STM32_OTGFS_DOEPMSK_OFFSET) +#define STM32_OTGFS_DAINT (STM32L4_OTGFS_BASE+STM32_OTGFS_DAINT_OFFSET) +#define STM32_OTGFS_DAINTMSK (STM32L4_OTGFS_BASE+STM32_OTGFS_DAINTMSK_OFFSET) +#define STM32_OTGFS_DVBUSDIS (STM32L4_OTGFS_BASE+STM32_OTGFS_DVBUSDIS_OFFSET) +#define STM32_OTGFS_DVBUSPULSE (STM32L4_OTGFS_BASE+STM32_OTGFS_DVBUSPULSE_OFFSET) +#define STM32_OTGFS_DIEPEMPMSK (STM32L4_OTGFS_BASE+STM32_OTGFS_DIEPEMPMSK_OFFSET) + +#define STM32_OTGFS_DIEP(n) (STM32L4_OTGFS_BASE+STM32_OTGFS_DIEP_OFFSET(n)) + +#define STM32_OTGFS_DIEPCTL(n) (STM32L4_OTGFS_BASE+STM32_OTGFS_DIEPCTL_OFFSET(n)) +#define STM32_OTGFS_DIEPCTL0 (STM32L4_OTGFS_BASE+STM32_OTGFS_DIEPCTL0_OFFSET) +#define STM32_OTGFS_DIEPCTL1 (STM32L4_OTGFS_BASE+STM32_OTGFS_DIEPCTL1_OFFSET) +#define STM32_OTGFS_DIEPCTL2 (STM32L4_OTGFS_BASE+STM32_OTGFS_DIEPCTL2_OFFSET) +#define STM32_OTGFS_DIEPCTL3 (STM32L4_OTGFS_BASE+STM32_OTGFS_DIEPCTL3_OFFSET) +#define STM32_OTGFS_DIEPCTL4 (STM32L4_OTGFS_BASE+STM32_OTGFS_DIEPCTL4_OFFSET) +#define STM32_OTGFS_DIEPCTL5 (STM32L4_OTGFS_BASE+STM32_OTGFS_DIEPCTL5_OFFSET) + +#define STM32_OTGFS_DIEPINT(n) (STM32L4_OTGFS_BASE+STM32_OTGFS_DIEPINT_OFFSET(n)) +#define STM32_OTGFS_DIEPINT0 (STM32L4_OTGFS_BASE+STM32_OTGFS_DIEPINT0_OFFSET) +#define STM32_OTGFS_DIEPINT1 (STM32L4_OTGFS_BASE+STM32_OTGFS_DIEPINT1_OFFSET) +#define STM32_OTGFS_DIEPINT2 (STM32L4_OTGFS_BASE+STM32_OTGFS_DIEPINT2_OFFSET) +#define STM32_OTGFS_DIEPINT3 (STM32L4_OTGFS_BASE+STM32_OTGFS_DIEPINT3_OFFSET) +#define STM32_OTGFS_DIEPINT4 (STM32L4_OTGFS_BASE+STM32_OTGFS_DIEPINT4_OFFSET) +#define STM32_OTGFS_DIEPINT5 (STM32L4_OTGFS_BASE+STM32_OTGFS_DIEPINT5_OFFSET) + +#define STM32_OTGFS_DIEPTSIZ(n) (STM32L4_OTGFS_BASE+STM32_OTGFS_DIEPTSIZ_OFFSET(n)) +#define STM32_OTGFS_DIEPTSIZ0 (STM32L4_OTGFS_BASE+STM32_OTGFS_DIEPTSIZ0_OFFSET) +#define STM32_OTGFS_DIEPTSIZ1 (STM32L4_OTGFS_BASE+STM32_OTGFS_DIEPTSIZ1_OFFSET) +#define STM32_OTGFS_DIEPTSIZ2 (STM32L4_OTGFS_BASE+STM32_OTGFS_DIEPTSIZ2_OFFSET) +#define STM32_OTGFS_DIEPTSIZ3 (STM32L4_OTGFS_BASE+STM32_OTGFS_DIEPTSIZ3_OFFSET) +#define STM32_OTGFS_DIEPTSIZ4 (STM32L4_OTGFS_BASE+STM32_OTGFS_DIEPTSIZ4_OFFSET) +#define STM32_OTGFS_DIEPTSIZ5 (STM32L4_OTGFS_BASE+STM32_OTGFS_DIEPTSIZ5_OFFSET) + +#define STM32_OTGFS_DTXFSTS(n) (STM32L4_OTGFS_BASE+STM32_OTGFS_DTXFSTS_OFFSET(n)) +#define STM32_OTGFS_DTXFSTS0 (STM32L4_OTGFS_BASE+STM32_OTGFS_DTXFSTS0_OFFSET) +#define STM32_OTGFS_DTXFSTS1 (STM32L4_OTGFS_BASE+STM32_OTGFS_DTXFSTS1_OFFSET) +#define STM32_OTGFS_DTXFSTS2 (STM32L4_OTGFS_BASE+STM32_OTGFS_DTXFSTS2_OFFSET) +#define STM32_OTGFS_DTXFSTS3 (STM32L4_OTGFS_BASE+STM32_OTGFS_DTXFSTS3_OFFSET) +#define STM32_OTGFS_DTXFSTS4 (STM32L4_OTGFS_BASE+STM32_OTGFS_DTXFSTS4_OFFSET) +#define STM32_OTGFS_DTXFSTS5 (STM32L4_OTGFS_BASE+STM32_OTGFS_DTXFSTS5_OFFSET) + +#define STM32_OTGFS_DOEP(n) (STM32L4_OTGFS_BASE+STM32_OTGFS_DOEP_OFFSET(n)) + +#define STM32_OTGFS_DOEPCTL(n) (STM32L4_OTGFS_BASE+STM32_OTGFS_DOEPCTL_OFFSET(n)) +#define STM32_OTGFS_DOEPCTL0 (STM32L4_OTGFS_BASE+STM32_OTGFS_DOEPCTL0_OFFSET) +#define STM32_OTGFS_DOEPCTL1 (STM32L4_OTGFS_BASE+STM32_OTGFS_DOEPCTL1_OFFSET) +#define STM32_OTGFS_DOEPCTL2 (STM32L4_OTGFS_BASE+STM32_OTGFS_DOEPCTL2_OFFSET) +#define STM32_OTGFS_DOEPCTL3 (STM32L4_OTGFS_BASE+STM32_OTGFS_DOEPCTL3_OFFSET) +#define STM32_OTGFS_DOEPCTL4 (STM32L4_OTGFS_BASE+STM32_OTGFS_DOEPCTL4_OFFSET) +#define STM32_OTGFS_DOEPCTL5 (STM32L4_OTGFS_BASE+STM32_OTGFS_DOEPCTL5_OFFSET) + +#define STM32_OTGFS_DOEPINT(n) (STM32L4_OTGFS_BASE+STM32_OTGFS_DOEPINT_OFFSET(n)) +#define STM32_OTGFS_DOEPINT0 (STM32L4_OTGFS_BASE+STM32_OTGFS_DOEPINT0_OFFSET) +#define STM32_OTGFS_DOEPINT1 (STM32L4_OTGFS_BASE+STM32_OTGFS_DOEPINT1_OFFSET) +#define STM32_OTGFS_DOEPINT2 (STM32L4_OTGFS_BASE+STM32_OTGFS_DOEPINT2_OFFSET) +#define STM32_OTGFS_DOEPINT3 (STM32L4_OTGFS_BASE+STM32_OTGFS_DOEPINT3_OFFSET) +#define STM32_OTGFS_DOEPINT4 (STM32L4_OTGFS_BASE+STM32_OTGFS_DOEPINT4_OFFSET) +#define STM32_OTGFS_DOEPINT5 (STM32L4_OTGFS_BASE+STM32_OTGFS_DOEPINT5_OFFSET) + +#define STM32_OTGFS_DOEPTSIZ(n) (STM32L4_OTGFS_BASE+STM32_OTGFS_DOEPTSIZ_OFFSET(n)) +#define STM32_OTGFS_DOEPTSIZ0 (STM32L4_OTGFS_BASE+STM32_OTGFS_DOEPTSIZ0_OFFSET) +#define STM32_OTGFS_DOEPTSIZ1 (STM32L4_OTGFS_BASE+STM32_OTGFS_DOEPTSIZ1_OFFSET) +#define STM32_OTGFS_DOEPTSIZ2 (STM32L4_OTGFS_BASE+STM32_OTGFS_DOEPTSIZ2_OFFSET) +#define STM32_OTGFS_DOEPTSIZ3 (STM32L4_OTGFS_BASE+STM32_OTGFS_DOEPTSIZ3_OFFSET) +#define STM32_OTGFS_DOEPTSIZ4 (STM32L4_OTGFS_BASE+STM32_OTGFS_DOEPTSIZ4_OFFSET) +#define STM32_OTGFS_DOEPTSIZ5 (STM32L4_OTGFS_BASE+STM32_OTGFS_DOEPTSIZ5_OFFSET) + +/* Power and clock gating registers */ + +#define STM32_OTGFS_PCGCCTL (STM32L4_OTGFS_BASE+STM32_OTGFS_PCGCCTL_OFFSET) + +/* Data FIFO (DFIFO) access registers */ + +#define STM32_OTGFS_DFIFO_DEP(n) (STM32L4_OTGFS_BASE+STM32_OTGFS_DFIFO_DEP_OFFSET(n)) +#define STM32_OTGFS_DFIFO_HCH(n) (STM32L4_OTGFS_BASE+STM32_OTGFS_DFIFO_HCH_OFFSET(n)) + +#define STM32_OTGFS_DFIFO_DEP0 (STM32L4_OTGFS_BASE+STM32_OTGFS_DFIFO_DEP0_OFFSET) +#define STM32_OTGFS_DFIFO_HCH0 (STM32L4_OTGFS_BASE+STM32_OTGFS_DFIFO_HCH0_OFFSET) + +#define STM32_OTGFS_DFIFO_DEP1 (STM32L4_OTGFS_BASE+STM32_OTGFS_DFIFO_DEP1_OFFSET) +#define STM32_OTGFS_DFIFO_HCH1 (STM32L4_OTGFS_BASE+STM32_OTGFS_DFIFO_HCH1_OFFSET) + +#define STM32_OTGFS_DFIFO_DEP2 (STM32L4_OTGFS_BASE+STM32_OTGFS_DFIFO_DEP2_OFFSET) +#define STM32_OTGFS_DFIFO_HCH2 (STM32L4_OTGFS_BASE+STM32_OTGFS_DFIFO_HCH2_OFFSET) + +#define STM32_OTGFS_DFIFO_DEP3 (STM32L4_OTGFS_BASE+STM32_OTGFS_DFIFO_DEP3_OFFSET) +#define STM32_OTGFS_DFIFO_HCH3 (STM32L4_OTGFS_BASE+STM32_OTGFS_DFIFO_HCH3_OFFSET) + +#define STM32_OTGFS_DFIFO_DEP4 (STM32L4_OTGFS_BASE+STM32_OTGFS_DFIFO_DEP4_OFFSET) +#define STM32_OTGFS_DFIFO_HCH4 (STM32L4_OTGFS_BASE+STM32_OTGFS_DFIFO_HCH4_OFFSET) + +#define STM32_OTGFS_DFIFO_DEP5 (STM32L4_OTGFS_BASE+STM32_OTGFS_DFIFO_DEP5_OFFSET) +#define STM32_OTGFS_DFIFO_HCH5 (STM32L4_OTGFS_BASE+STM32_OTGFS_DFIFO_HCH5_OFFSET) + +/* Register Bitfield Definitions ********************************************************************/ +/* Core global control and status registers */ + +/* Control and status register */ + +#define OTGFS_GOTGCTL_SRQSCS (1 << 0) /* Bit 0: Session request success */ +#define OTGFS_GOTGCTL_SRQ (1 << 1) /* Bit 1: Session request */ +#define OTGFS_GOTGCTL_VBVALOEN (1 << 2) /* Bit 2: VBUS valid override enable */ +#define OTGFS_GOTGCTL_VBVALOVAL (1 << 3) /* Bit 3: VBUS valid override value */ +#define OTGFS_GOTGCTL_AVALOEN (1 << 4) /* Bit 4: A-peripheral session valid override enable */ +#define OTGFS_GOTGCTL_AVALOVAL (1 << 5) /* Bit 5: A-peripheral session valid override value */ +#define OTGFS_GOTGCTL_BVALOEN (1 << 6) /* Bit 6: B-peripheral session valid override enable */ +#define OTGFS_GOTGCTL_BVALOVAL (1 << 7) /* Bit 7: B-peripheral session valid override value */ +#define OTGFS_GOTGCTL_HNGSCS (1 << 8) /* Bit 8: Host negotiation success */ +#define OTGFS_GOTGCTL_HNPRQ (1 << 9) /* Bit 9: HNP request */ +#define OTGFS_GOTGCTL_HSHNPEN (1 << 10) /* Bit 10: host set HNP enable */ +#define OTGFS_GOTGCTL_DHNPEN (1 << 11) /* Bit 11: Device HNP enabled */ +#define OTGFS_GOTGCTL_EHEN (1 << 12) /* Bit 12: Embedded host enable */ + /* Bits 13-15: Reserved, must be kept at reset value */ +#define OTGFS_GOTGCTL_CIDSTS (1 << 16) /* Bit 16: Connector ID status */ +#define OTGFS_GOTGCTL_DBCT (1 << 17) /* Bit 17: Long/short debounce time */ +#define OTGFS_GOTGCTL_ASVLD (1 << 18) /* Bit 18: A-session valid */ +#define OTGFS_GOTGCTL_BSVLD (1 << 19) /* Bit 19: B-session valid */ +#define OTGFS_GOTGCTL_OTGVER (1 << 20) /* Bit 20: OTG version */ + /* Bits 21-31: Reserved, must be kept at reset value */ +/* Interrupt register */ + /* Bits 1:0 Reserved, must be kept at reset value */ +#define OTGFS_GOTGINT_SEDET (1 << 2) /* Bit 2: Session end detected */ + /* Bits 3-7: Reserved, must be kept at reset value */ +#define OTGFS_GOTGINT_SRSSCHG (1 << 8) /* Bit 8: Session request success status change */ +#define OTGFS_GOTGINT_HNSSCHG (1 << 9) /* Bit 9: Host negotiation success status change */ + /* Bits 16:10 Reserved, must be kept at reset value */ +#define OTGFS_GOTGINT_HNGDET (1 << 17) /* Bit 17: Host negotiation detected */ +#define OTGFS_GOTGINT_ADTOCHG (1 << 18) /* Bit 18: A-device timeout change */ +#define OTGFS_GOTGINT_DBCDNE (1 << 19) /* Bit 19: Debounce done */ +#define OTGFS_GOTGINT_IDCHNG (1 << 20) /* Bit 20: Change in ID pin input value */ + /* Bits 21-31: Reserved, must be kept at reset value */ + +/* AHB configuration register */ + +#define OTGFS_GAHBCFG_GINTMSK (1 << 0) /* Bit 0: Global interrupt mask */ + /* Bits 1-6: Reserved, must be kept at reset value */ +#define OTGFS_GAHBCFG_TXFELVL (1 << 7) /* Bit 7: TxFIFO empty level */ +#define OTGFS_GAHBCFG_PTXFELVL (1 << 8) /* Bit 8: Periodic TxFIFO empty level */ + /* Bits 20-31: Reserved, must be kept at reset value */ +/* USB configuration register */ + +#define OTGFS_GUSBCFG_TOCAL_SHIFT (0) /* Bits 0-2: FS timeout calibration */ +#define OTGFS_GUSBCFG_TOCAL_MASK (7 << OTGFS_GUSBCFG_TOCAL_SHIFT) + /* Bits 3-5: Reserved, must be kept at reset value */ +#define OTGFS_GUSBCFG_PHYSEL (1 << 6) /* Bit 6: Full Speed serial transceiver select */ + /* Bit 7: Reserved, must be kept at reset value */ +#define OTGFS_GUSBCFG_SRPCAP (1 << 8) /* Bit 8: SRP-capable */ +#define OTGFS_GUSBCFG_HNPCAP (1 << 9) /* Bit 9: HNP-capable */ +#define OTGFS_GUSBCFG_TRDT_SHIFT (10) /* Bits 10-13: USB turnaround time */ +#define OTGFS_GUSBCFG_TRDT_MASK (15 << OTGFS_GUSBCFG_TRDT_SHIFT) +# define OTGFS_GUSBCFG_TRDT(n) ((n) << OTGFS_GUSBCFG_TRDT_SHIFT) + /* Bits 14-28: Reserved, must be kept at reset value */ +#define OTGFS_GUSBCFG_FHMOD (1 << 29) /* Bit 29: Force host mode */ +#define OTGFS_GUSBCFG_FDMOD (1 << 30) /* Bit 30: Force device mode */ + /* Bit 31: Reserved, must be kept at reset value */ +/* Reset register */ + +#define OTGFS_GRSTCTL_CSRST (1 << 0) /* Bit 0: Core soft reset */ + /* Bit 1 Reserved, must be kept at reset value */ +#define OTGFS_GRSTCTL_FCRST (1 << 2) /* Bit 2: Host frame counter reset */ + /* Bit 3 Reserved, must be kept at reset value */ +#define OTGFS_GRSTCTL_RXFFLSH (1 << 4) /* Bit 4: RxFIFO flush */ +#define OTGFS_GRSTCTL_TXFFLSH (1 << 5) /* Bit 5: TxFIFO flush */ +#define OTGFS_GRSTCTL_TXFNUM_SHIFT (6) /* Bits 6-10: TxFIFO number */ +#define OTGFS_GRSTCTL_TXFNUM_MASK (31 << OTGFS_GRSTCTL_TXFNUM_SHIFT) +# define OTGFS_GRSTCTL_TXFNUM_HNONPER (0 << OTGFS_GRSTCTL_TXFNUM_SHIFT) /* Non-periodic TxFIFO flush in host mode */ +# define OTGFS_GRSTCTL_TXFNUM_HPER (1 << OTGFS_GRSTCTL_TXFNUM_SHIFT) /* Periodic TxFIFO flush in host mode */ +# define OTGFS_GRSTCTL_TXFNUM_HALL (16 << OTGFS_GRSTCTL_TXFNUM_SHIFT) /* Flush all the transmit FIFOs in host mode.*/ +# define OTGFS_GRSTCTL_TXFNUM_D(n) ((n) << OTGFS_GRSTCTL_TXFNUM_SHIFT) /* TXFIFO n flush in device mode, n=0-15 */ +# define OTGFS_GRSTCTL_TXFNUM_DALL (16 << OTGFS_GRSTCTL_TXFNUM_SHIFT) /* Flush all the transmit FIFOs in device mode.*/ + /* Bits 11-30: Reserved, must be kept at reset value */ +#define OTGFS_GRSTCTL_AHBIDL (1 << 31) /* Bit 31: AHB master idle */ + +/* Core interrupt and Interrupt mask registers */ + +#define OTGFS_GINTSTS_CMOD (1 << 0) /* Bit 0: Current mode of operation */ +# define OTGFS_GINTSTS_DEVMODE (0) +# define OTGFS_GINTSTS_HOSTMODE (OTGFS_GINTSTS_CMOD) +#define OTGFS_GINT_MMIS (1 << 1) /* Bit 1: Mode mismatch interrupt */ +#define OTGFS_GINT_OTG (1 << 2) /* Bit 2: OTG interrupt */ +#define OTGFS_GINT_SOF (1 << 3) /* Bit 3: Start of frame */ +#define OTGFS_GINT_RXFLVL (1 << 4) /* Bit 4: RxFIFO non-empty */ +#define OTGFS_GINT_NPTXFE (1 << 5) /* Bit 5: Non-periodic TxFIFO empty */ +#define OTGFS_GINT_GINAKEFF (1 << 6) /* Bit 6: Global IN non-periodic NAK effective */ +#define OTGFS_GINT_GONAKEFF (1 << 7) /* Bit 7: Global OUT NAK effective */ + /* Bits 8-9: Reserved, must be kept at reset value */ +#define OTGFS_GINT_ESUSP (1 << 10) /* Bit 10: Early suspend */ +#define OTGFS_GINT_USBSUSP (1 << 11) /* Bit 11: USB suspend */ +#define OTGFS_GINT_USBRST (1 << 12) /* Bit 12: USB reset */ +#define OTGFS_GINT_ENUMDNE (1 << 13) /* Bit 13: Enumeration done */ +#define OTGFS_GINT_ISOODRP (1 << 14) /* Bit 14: Isochronous OUT packet dropped interrupt */ +#define OTGFS_GINT_EOPF (1 << 15) /* Bit 15: End of periodic frame interrupt */ + /* Bits 16-17: Reserved, must be kept at reset value */ +#define OTGFS_GINT_IEP (1 << 18) /* Bit 18: IN endpoint interrupt */ +#define OTGFS_GINT_OEP (1 << 19) /* Bit 19: OUT endpoint interrupt */ +#define OTGFS_GINT_IISOIXFR (1 << 20) /* Bit 20: Incomplete isochronous IN transfer */ +#define OTGFS_GINT_IISOOXFR (1 << 21) /* Bit 21: Incomplete isochronous OUT transfer (device) */ +#define OTGFS_GINT_IPXFR (1 << 21) /* Bit 21: Incomplete periodic transfer (host) */ + /* Bit 22: Reserved, must be kept at reset value */ +#define OTGFS_GINT_RSTDET (1 << 23) /* Bit 23: Reset detected interrupt */ +#define OTGFS_GINT_HPRT (1 << 24) /* Bit 24: Host port interrupt */ +#define OTGFS_GINT_HC (1 << 25) /* Bit 25: Host channels interrupt */ +#define OTGFS_GINT_PTXFE (1 << 26) /* Bit 26: Periodic TxFIFO empty */ +#define OTGFS_GINT_LPMINT (1 << 27) /* Bit 27: LPM interrupt */ +#define OTGFS_GINT_CIDSCHG (1 << 28) /* Bit 28: Connector ID status change */ +#define OTGFS_GINT_DISC (1 << 29) /* Bit 29: Disconnect detected interrupt */ +#define OTGFS_GINT_SRQ (1 << 30) /* Bit 30: Session request/new session detected interrupt */ +#define OTGFS_GINT_WKUP (1 << 31) /* Bit 31: Resume/remote wakeup detected interrupt */ + +/* Receive status debug read/OTG status read and pop registers (host mode) */ + +#define OTGFS_GRXSTSH_CHNUM_SHIFT (0) /* Bits 0-3: Channel number */ +#define OTGFS_GRXSTSH_CHNUM_MASK (15 << OTGFS_GRXSTSH_CHNUM_SHIFT) +#define OTGFS_GRXSTSH_BCNT_SHIFT (4) /* Bits 4-14: Byte count */ +#define OTGFS_GRXSTSH_BCNT_MASK (0x7ff << OTGFS_GRXSTSH_BCNT_SHIFT) +#define OTGFS_GRXSTSH_DPID_SHIFT (15) /* Bits 15-16: Data PID */ +#define OTGFS_GRXSTSH_DPID_MASK (3 << OTGFS_GRXSTSH_DPID_SHIFT) +# define OTGFS_GRXSTSH_DPID_DATA0 (0 << OTGFS_GRXSTSH_DPID_SHIFT) +# define OTGFS_GRXSTSH_DPID_DATA2 (1 << OTGFS_GRXSTSH_DPID_SHIFT) +# define OTGFS_GRXSTSH_DPID_DATA1 (2 << OTGFS_GRXSTSH_DPID_SHIFT) +# define OTGFS_GRXSTSH_DPID_MDATA (3 << OTGFS_GRXSTSH_DPID_SHIFT) +#define OTGFS_GRXSTSH_PKTSTS_SHIFT (17) /* Bits 17-20: Packet status */ +#define OTGFS_GRXSTSH_PKTSTS_MASK (15 << OTGFS_GRXSTSH_PKTSTS_SHIFT) +# define OTGFS_GRXSTSH_PKTSTS_INRECVD (2 << OTGFS_GRXSTSH_PKTSTS_SHIFT) /* IN data packet received */ +# define OTGFS_GRXSTSH_PKTSTS_INDONE (3 << OTGFS_GRXSTSH_PKTSTS_SHIFT) /* IN transfer completed */ +# define OTGFS_GRXSTSH_PKTSTS_DTOGERR (5 << OTGFS_GRXSTSH_PKTSTS_SHIFT) /* Data toggle error */ +# define OTGFS_GRXSTSH_PKTSTS_HALTED (7 << OTGFS_GRXSTSH_PKTSTS_SHIFT) /* Channel halted */ + /* Bits 21-31: Reserved, must be kept at reset value */ +/* Receive status debug read/OTG status read and pop registers (device mode) */ + +#define OTGFS_GRXSTSD_EPNUM_SHIFT (0) /* Bits 0-3: Endpoint number */ +#define OTGFS_GRXSTSD_EPNUM_MASK (15 << OTGFS_GRXSTSD_EPNUM_SHIFT) +#define OTGFS_GRXSTSD_BCNT_SHIFT (4) /* Bits 4-14: Byte count */ +#define OTGFS_GRXSTSD_BCNT_MASK (0x7ff << OTGFS_GRXSTSD_BCNT_SHIFT) +#define OTGFS_GRXSTSD_DPID_SHIFT (15) /* Bits 15-16: Data PID */ +#define OTGFS_GRXSTSD_DPID_MASK (3 << OTGFS_GRXSTSD_DPID_SHIFT) +# define OTGFS_GRXSTSD_DPID_DATA0 (0 << OTGFS_GRXSTSD_DPID_SHIFT) +# define OTGFS_GRXSTSD_DPID_DATA2 (1 << OTGFS_GRXSTSD_DPID_SHIFT) +# define OTGFS_GRXSTSD_DPID_DATA1 (2 << OTGFS_GRXSTSD_DPID_SHIFT) +# define OTGFS_GRXSTSD_DPID_MDATA (3 << OTGFS_GRXSTSD_DPID_SHIFT) +#define OTGFS_GRXSTSD_PKTSTS_SHIFT (17) /* Bits 17-20: Packet status */ +#define OTGFS_GRXSTSD_PKTSTS_MASK (15 << OTGFS_GRXSTSD_PKTSTS_SHIFT) +# define OTGFS_GRXSTSD_PKTSTS_OUTNAK (1 << OTGFS_GRXSTSD_PKTSTS_SHIFT) /* Global OUT NAK */ +# define OTGFS_GRXSTSD_PKTSTS_OUTRECVD (2 << OTGFS_GRXSTSD_PKTSTS_SHIFT) /* OUT data packet received */ +# define OTGFS_GRXSTSD_PKTSTS_OUTDONE (3 << OTGFS_GRXSTSD_PKTSTS_SHIFT) /* OUT transfer completed */ +# define OTGFS_GRXSTSD_PKTSTS_SETUPDONE (4 << OTGFS_GRXSTSD_PKTSTS_SHIFT) /* SETUP transaction completed */ +# define OTGFS_GRXSTSD_PKTSTS_SETUPRECVD (6 << OTGFS_GRXSTSD_PKTSTS_SHIFT) /* SETUP data packet received */ +#define OTGFS_GRXSTSD_FRMNUM_SHIFT (21) /* Bits 21-24: Frame number */ +#define OTGFS_GRXSTSD_FRMNUM_MASK (15 << OTGFS_GRXSTSD_FRMNUM_SHIFT) + /* Bits 25-31: Reserved, must be kept at reset value */ +/* Receive FIFO size register */ + +#define OTGFS_GRXFSIZ_MASK (0xffff) + +/* Host non-periodic transmit FIFO size register */ + +#define OTGFS_HNPTXFSIZ_NPTXFSA_SHIFT (0) /* Bits 0-15: Non-periodic transmit RAM start address */ +#define OTGFS_HNPTXFSIZ_NPTXFSA_MASK (0xffff << OTGFS_HNPTXFSIZ_NPTXFSA_SHIFT) +#define OTGFS_HNPTXFSIZ_NPTXFD_SHIFT (16) /* Bits 16-31: Non-periodic TxFIFO depth */ +#define OTGFS_HNPTXFSIZ_NPTXFD_MASK (0xffff << OTGFS_HNPTXFSIZ_NPTXFD_SHIFT) +# define OTGFS_HNPTXFSIZ_NPTXFD_MIN (16 << OTGFS_HNPTXFSIZ_NPTXFD_SHIFT) +# define OTGFS_HNPTXFSIZ_NPTXFD_MAX (256 << OTGFS_HNPTXFSIZ_NPTXFD_SHIFT) + +/* Endpoint 0 Transmit FIFO size */ + +#define OTGFS_DIEPTXF0_TX0FD_SHIFT (0) /* Bits 0-15: Endpoint 0 transmit RAM start address */ +#define OTGFS_DIEPTXF0_TX0FD_MASK (0xffff << OTGFS_DIEPTXF0_TX0FD_SHIFT) +#define OTGFS_DIEPTXF0_TX0FSA_SHIFT (16) /* Bits 16-31: Endpoint 0 TxFIFO depth */ +#define OTGFS_DIEPTXF0_TX0FSA_MASK (0xffff << OTGFS_DIEPTXF0_TX0FSA_SHIFT) +# define OTGFS_DIEPTXF0_TX0FSA_MIN (16 << OTGFS_DIEPTXF0_TX0FSA_SHIFT) +# define OTGFS_DIEPTXF0_TX0FSA_MAX (256 << OTGFS_DIEPTXF0_TX0FSA_SHIFT) + +/* Non-periodic transmit FIFO/queue status register */ + +#define OTGFS_HNPTXSTS_NPTXFSAV_SHIFT (0) /* Bits 0-15: Non-periodic TxFIFO space available */ +#define OTGFS_HNPTXSTS_NPTXFSAV_MASK (0xffff << OTGFS_HNPTXSTS_NPTXFSAV_SHIFT) +# define OTGFS_HNPTXSTS_NPTXFSAV_FULL (0 << OTGFS_HNPTXSTS_NPTXFSAV_SHIFT) +#define OTGFS_HNPTXSTS_NPTQXSAV_SHIFT (16) /* Bits 16-23: Non-periodic transmit request queue space available */ +#define OTGFS_HNPTXSTS_NPTQXSAV_MASK (0xff << OTGFS_HNPTXSTS_NPTQXSAV_SHIFT) +# define OTGFS_HNPTXSTS_NPTQXSAV_FULL (0 << OTGFS_HNPTXSTS_NPTQXSAV_SHIFT) +#define OTGFS_HNPTXSTS_NPTXQTOP_SHIFT (24) /* Bits 24-30: Top of the non-periodic transmit request queue */ +#define OTGFS_HNPTXSTS_NPTXQTOP_MASK (0x7f << OTGFS_HNPTXSTS_NPTXQTOP_SHIFT) +# define OTGFS_HNPTXSTS_TERMINATE (1 << 24) /* Bit 24: Terminate (last entry for selected channel/endpoint) */ +# define OTGFS_HNPTXSTS_TYPE_SHIFT (25) /* Bits 25-26: Status */ +# define OTGFS_HNPTXSTS_TYPE_MASK (3 << OTGFS_HNPTXSTS_TYPE_SHIFT) +# define OTGFS_HNPTXSTS_TYPE_INOUT (0 << OTGFS_HNPTXSTS_TYPE_SHIFT) /* IN/OUT token */ +# define OTGFS_HNPTXSTS_TYPE_ZLP (1 << OTGFS_HNPTXSTS_TYPE_SHIFT) /* Zero-length transmit packet (device IN/host OUT) */ +# define OTGFS_HNPTXSTS_TYPE_HALT (3 << OTGFS_HNPTXSTS_TYPE_SHIFT) /* Channel halt command */ +# define OTGFS_HNPTXSTS_CHNUM_SHIFT (27) /* Bits 27-30: Channel number */ +# define OTGFS_HNPTXSTS_CHNUM_MASK (15 << OTGFS_HNPTXSTS_CHNUM_SHIFT) +# define OTGFS_HNPTXSTS_EPNUM_SHIFT (27) /* Bits 27-30: Endpoint number */ +# define OTGFS_HNPTXSTS_EPNUM_MASK (15 << OTGFS_HNPTXSTS_EPNUM_SHIFT) + /* Bit 31 Reserved, must be kept at reset value */ +/* General core configuration register */ +#define OTGFS_GCCFG_DCDET (1 << 0) /* Bit 0: Data contact detect */ +#define OTGFS_GCCFG_PDET (1 << 1) /* Bit 1: Primary detect */ +#define OTGFS_GCCFG_SDET (1 << 2) /* Bit 2: Secondary detect */ +#define OTGFS_GCCFG_PS2DET (1 << 3) /* Bit 3: DM pull-up detect */ + /* Bits 4-15: Reserved, must be kept at reset value */ +#define OTGFS_GCCFG_PWRDWN (1 << 16) /* Bit 16: Power down */ +#define OTGFS_GCCFG_BCDEN (1 << 18) /* Bit 17: Battery charging detector enable */ +#define OTGFS_GCCFG_DCDEN (1 << 18) /* Bit 18: Data contact detection mode enable */ +#define OTGFS_GCCFG_PDEN (1 << 19) /* Bit 19: Primary detection mode enable */ +#define OTGFS_GCCFG_SDEN (1 << 20) /* Bit 20: Secondary detection mode enable */ +#define OTGFS_GCCFG_VBDEN (1 << 21) /* Bit 21: USB VBUS detection enable */ + /* Bits 22-31: Reserved, must be kept at reset value */ + +/* Core ID register (32-bit product ID) */ + +//XXX GLPMCFG +#define OTGFS_GLPMCFG_LPMEN (1 << 0) /* Bit 0: XXX */ +#define OTGFS_GLPMCFG_LPMACK (1 << 1) /* Bit 1: XXX */ +//#define OTGFS_GLPMCFG_BESL +#define OTGFS_GLPMCFG_REMWAKE (1 << 6) /* Bit 6: XXX */ +#define OTGFS_GLPMCFG_L1SSEN (1 << 7) /* Bit 7: XXX */ +//#define OTGFS_GLPMCFG_BESLTHRS +#define OTGFS_GLPMCFG_L1DSEN (1 << 12) /* Bit 12: XXX */ +//#define OTGFS_GLPMCFG_LPMRSP +#define OTGFS_GLPMCFG_SLPSTS (1 << 15) /* Bit 15: XXX */ +#define OTGFS_GLPMCFG_L1RSMOK (1 << 16) /* Bit 16: XXX */ +//#define OTGFS_GLPMCFG_LPMCHIDX +//#define OTGFS_GLPMCFG_LPMRCNT +#define OTGFS_GLPMCFG_SNDLPM (1 << 24) /* Bit 24: XXX */ +//#define OTGFS_GLPMCFG_LPMRCNTSTS +#define OTGFS_GLPMCFG_ENBESL (1 << 28) /* Bit 28: XXX */ + /* Bits 29-31: Reserved, must be kept at reset value */ + +//XXX GPWRDN +#define OTGFS_GPWRDN_ADPMEN (1 << 0) /* Bit 0: XXX */ +#define OTGFS_GPWRDN_ADPIF (1 << 23) /* Bit 23: XXX */ + +//XXX GADPCTL +//#define OTGFS_GADPCTL_PRBDSCHG +//#define OTGFS_GADPCTL_PRBDELTA +//#define OTGFS_GADPCTL_PRBPER +//#define OTGFS_GADPCTL_RTIM +#define OTGFS_GADPCTL_ENAPRB (1 << 17) /* Bit 17: XXX */ +#define OTGFS_GADPCTL_ENASNS (1 << 18) /* Bit 18: XXX */ +#define OTGFS_GADPCTL_ADPRST (1 << 19) /* Bit 19: XXX */ +#define OTGFS_GADPCTL_ADPEN (1 << 20) /* Bit 20: XXX */ +#define OTGFS_GADPCTL_ADPPRBIF (1 << 21) /* Bit 21: XXX */ +#define OTGFS_GADPCTL_ADPSNSIF (1 << 22) /* Bit 22: XXX */ +#define OTGFS_GADPCTL_ADPTOIF (1 << 23) /* Bit 23: XXX */ +#define OTGFS_GADPCTL_ADPPRBIM (1 << 24) /* Bit 24: XXX */ +#define OTGFS_GADPCTL_ADPSNSIM (1 << 25) /* Bit 25: XXX */ +#define OTGFS_GADPCTL_ADPTOIM (1 << 26) /* Bit 26: XXX */ +//#define OTGFS_GADPCTL_AR + +/* Host periodic transmit FIFO size register */ + +#define OTGFS_HPTXFSIZ_PTXSA_SHIFT (0) /* Bits 0-15: Host periodic TxFIFO start address */ +#define OTGFS_HPTXFSIZ_PTXSA_MASK (0xffff << OTGFS_HPTXFSIZ_PTXSA_SHIFT) +#define OTGFS_HPTXFSIZ_PTXFD_SHIFT (16) /* Bits 16-31: Host periodic TxFIFO depth */ +#define OTGFS_HPTXFSIZ_PTXFD_MASK (0xffff << OTGFS_HPTXFSIZ_PTXFD_SHIFT) + +/* Device IN endpoint transmit FIFOn size register */ + +#define OTGFS_DIEPTXF_INEPTXSA_SHIFT (0) /* Bits 0-15: IN endpoint FIFOx transmit RAM start address */ +#define OTGFS_DIEPTXF_INEPTXSA_MASK (0xffff << OTGFS_DIEPTXF_INEPTXSA_SHIFT) +#define OTGFS_DIEPTXF_INEPTXFD_SHIFT (16) /* Bits 16-31: IN endpoint TxFIFO depth */ +#define OTGFS_DIEPTXF_INEPTXFD_MASK (0xffff << OTGFS_DIEPTXF_INEPTXFD_SHIFT) +# define OTGFS_DIEPTXF_INEPTXFD_MIN (16 << OTGFS_DIEPTXF_INEPTXFD_MASK) + +/* Host-mode control and status registers */ + +/* Host configuration register */ + +#define OTGFS_HCFG_FSLSPCS_SHIFT (0) /* Bits 0-1: FS/LS PHY clock select */ +#define OTGFS_HCFG_FSLSPCS_MASK (3 << OTGFS_HCFG_FSLSPCS_SHIFT) +# define OTGFS_HCFG_FSLSPCS_FS48MHz (1 << OTGFS_HCFG_FSLSPCS_SHIFT) /* FS host mode, PHY clock is running at 48 MHz */ +# define OTGFS_HCFG_FSLSPCS_LS48MHz (1 << OTGFS_HCFG_FSLSPCS_SHIFT) /* LS host mode, Select 48 MHz PHY clock frequency */ +# define OTGFS_HCFG_FSLSPCS_LS6MHz (2 << OTGFS_HCFG_FSLSPCS_SHIFT) /* LS host mode, Select 6 MHz PHY clock frequency */ +#define OTGFS_HCFG_FSLSS (1 << 2) /* Bit 2: FS- and LS-only support */ + /* Bits 31:3 Reserved, must be kept at reset value */ +/* Host frame interval register */ + +#define OTGFS_HFIR_MASK (0xffff) +#define OTGFS_HFIR_RLDCTRL (1 << 16) /* Bit 16: XXX */ + +/* Host frame number/frame time remaining register */ + +#define OTGFS_HFNUM_FRNUM_SHIFT (0) /* Bits 0-15: Frame number */ +#define OTGFS_HFNUM_FRNUM_MASK (0xffff << OTGFS_HFNUM_FRNUM_SHIFT) +#define OTGFS_HFNUM_FTREM_SHIFT (16) /* Bits 16-31: Frame time remaining */ +#define OTGFS_HFNUM_FTREM_MASK (0xffff << OTGFS_HFNUM_FTREM_SHIFT) + +/* Host periodic transmit FIFO/queue status register */ + +#define OTGFS_HPTXSTS_PTXFSAVL_SHIFT (0) /* Bits 0-15: Periodic transmit data FIFO space available */ +#define OTGFS_HPTXSTS_PTXFSAVL_MASK (0xffff << OTGFS_HPTXSTS_PTXFSAVL_SHIFT) +# define OTGFS_HPTXSTS_PTXFSAVL_FULL (0 << OTGFS_HPTXSTS_PTXFSAVL_SHIFT) +#define OTGFS_HPTXSTS_PTXQSAV_SHIFT (16) /* Bits 16-23: Periodic transmit request queue space available */ +#define OTGFS_HPTXSTS_PTXQSAV_MASK (0xff << OTGFS_HPTXSTS_PTXQSAV_SHIFT) +# define OTGFS_HPTXSTS_PTXQSAV_FULL (0 << OTGFS_HPTXSTS_PTXQSAV_SHIFT) +#define OTGFS_HPTXSTS_PTXQTOP_SHIFT (24) /* Bits 24-31: Top of the periodic transmit request queue */ +#define OTGFS_HPTXSTS_PTXQTOP_MASK (0x7f << OTGFS_HPTXSTS_PTXQTOP_SHIFT) +# define OTGFS_HPTXSTS_TERMINATE (1 << 24) /* Bit 24: Terminate (last entry for selected channel/endpoint) */ +# define OTGFS_HPTXSTS_TYPE_SHIFT (25) /* Bits 25-26: Type */ +# define OTGFS_HPTXSTS_TYPE_MASK (3 << OTGFS_HPTXSTS_TYPE_SHIFT) +# define OTGFS_HPTXSTS_TYPE_INOUT (0 << OTGFS_HPTXSTS_TYPE_SHIFT) /* IN/OUT token */ +# define OTGFS_HPTXSTS_TYPE_ZLP (1 << OTGFS_HPTXSTS_TYPE_SHIFT) /* Zero-length transmit packet */ +# define OTGFS_HPTXSTS_TYPE_HALT (3 << OTGFS_HPTXSTS_TYPE_SHIFT) /* Disable channel command */ +# define OTGFS_HPTXSTS_EPNUM_SHIFT (27) /* Bits 27-30: Endpoint number */ +# define OTGFS_HPTXSTS_EPNUM_MASK (15 << OTGFS_HPTXSTS_EPNUM_SHIFT) +# define OTGFS_HPTXSTS_CHNUM_SHIFT (27) /* Bits 27-30: Channel number */ +# define OTGFS_HPTXSTS_CHNUM_MASK (15 << OTGFS_HPTXSTS_CHNUM_SHIFT) +# define OTGFS_HPTXSTS_ODD (1 << 24) /* Bit 31: Send in odd (vs even) frame */ + +/* Host all channels interrupt and all channels interrupt mask registers */ + +#define OTGFS_HAINT(n) (1 << (n)) /* Bits 15:0 HAINTM: Channel interrupt */ + +/* Host port control and status register */ + +#define OTGFS_HPRT_PCSTS (1 << 0) /* Bit 0: Port connect status */ +#define OTGFS_HPRT_PCDET (1 << 1) /* Bit 1: Port connect detected */ +#define OTGFS_HPRT_PENA (1 << 2) /* Bit 2: Port enable */ +#define OTGFS_HPRT_PENCHNG (1 << 3) /* Bit 3: Port enable/disable change */ +#define OTGFS_HPRT_POCA (1 << 4) /* Bit 4: Port overcurrent active */ +#define OTGFS_HPRT_POCCHNG (1 << 5) /* Bit 5: Port overcurrent change */ +#define OTGFS_HPRT_PRES (1 << 6) /* Bit 6: Port resume */ +#define OTGFS_HPRT_PSUSP (1 << 7) /* Bit 7: Port suspend */ +#define OTGFS_HPRT_PRST (1 << 8) /* Bit 8: Port reset */ + /* Bit 9: Reserved, must be kept at reset value */ +#define OTGFS_HPRT_PLSTS_SHIFT (10) /* Bits 10-11: Port line status */ +#define OTGFS_HPRT_PLSTS_MASK (3 << OTGFS_HPRT_PLSTS_SHIFT) +# define OTGFS_HPRT_PLSTS_DP (1 << 10) /* Bit 10: Logic level of OTG_FS_FS_DP */ +# define OTGFS_HPRT_PLSTS_DM (1 << 11) /* Bit 11: Logic level of OTG_FS_FS_DM */ +#define OTGFS_HPRT_PPWR (1 << 12) /* Bit 12: Port power */ +#define OTGFS_HPRT_PTCTL_SHIFT (13) /* Bits 13-16: Port test control */ +#define OTGFS_HPRT_PTCTL_MASK (15 << OTGFS_HPRT_PTCTL_SHIFT) +# define OTGFS_HPRT_PTCTL_DISABLED (0 << OTGFS_HPRT_PTCTL_SHIFT) /* Test mode disabled */ +# define OTGFS_HPRT_PTCTL_J (1 << OTGFS_HPRT_PTCTL_SHIFT) /* Test_J mode */ +# define OTGFS_HPRT_PTCTL_L (2 << OTGFS_HPRT_PTCTL_SHIFT) /* Test_K mode */ +# define OTGFS_HPRT_PTCTL_SE0_NAK (3 << OTGFS_HPRT_PTCTL_SHIFT) /* Test_SE0_NAK mode */ +# define OTGFS_HPRT_PTCTL_PACKET (4 << OTGFS_HPRT_PTCTL_SHIFT) /* Test_Packet mode */ +# define OTGFS_HPRT_PTCTL_FORCE (5 << OTGFS_HPRT_PTCTL_SHIFT) /* Test_Force_Enable */ +#define OTGFS_HPRT_PSPD_SHIFT (17) /* Bits 17-18: Port speed */ +#define OTGFS_HPRT_PSPD_MASK (3 << OTGFS_HPRT_PSPD_SHIFT) +# define OTGFS_HPRT_PSPD_FS (1 << OTGFS_HPRT_PSPD_SHIFT) /* Full speed */ +# define OTGFS_HPRT_PSPD_LS (2 << OTGFS_HPRT_PSPD_SHIFT) /* Low speed */ + /* Bits 19-31: Reserved, must be kept at reset value */ + +/* Host channel-n characteristics register */ + +#define OTGFS_HCCHAR_MPSIZ_SHIFT (0) /* Bits 0-10: Maximum packet size */ +#define OTGFS_HCCHAR_MPSIZ_MASK (0x7ff << OTGFS_HCCHAR_MPSIZ_SHIFT) +#define OTGFS_HCCHAR_EPNUM_SHIFT (11) /* Bits 11-14: Endpoint number */ +#define OTGFS_HCCHAR_EPNUM_MASK (15 << OTGFS_HCCHAR_EPNUM_SHIFT) +#define OTGFS_HCCHAR_EPDIR (1 << 15) /* Bit 15: Endpoint direction */ +# define OTGFS_HCCHAR_EPDIR_OUT (0) +# define OTGFS_HCCHAR_EPDIR_IN OTGFS_HCCHAR_EPDIR + /* Bit 16 Reserved, must be kept at reset value */ +#define OTGFS_HCCHAR_LSDEV (1 << 17) /* Bit 17: Low-speed device */ +#define OTGFS_HCCHAR_EPTYP_SHIFT (18) /* Bits 18-19: Endpoint type */ +#define OTGFS_HCCHAR_EPTYP_MASK (3 << OTGFS_HCCHAR_EPTYP_SHIFT) +# define OTGFS_HCCHAR_EPTYP_CTRL (0 << OTGFS_HCCHAR_EPTYP_SHIFT) /* Control */ +# define OTGFS_HCCHAR_EPTYP_ISOC (1 << OTGFS_HCCHAR_EPTYP_SHIFT) /* Isochronous */ +# define OTGFS_HCCHAR_EPTYP_BULK (2 << OTGFS_HCCHAR_EPTYP_SHIFT) /* Bulk */ +# define OTGFS_HCCHAR_EPTYP_INTR (3 << OTGFS_HCCHAR_EPTYP_SHIFT) /* Interrupt */ +#define OTGFS_HCCHAR_MCNT_SHIFT (20) /* Bits 20-21: Multicount */ +#define OTGFS_HCCHAR_MCNT_MASK (3 << OTGFS_HCCHAR_MCNT_SHIFT) +#define OTGFS_HCCHAR_DAD_SHIFT (22) /* Bits 22-28: Device address */ +#define OTGFS_HCCHAR_DAD_MASK (0x7f << OTGFS_HCCHAR_DAD_SHIFT) +#define OTGFS_HCCHAR_ODDFRM (1 << 29) /* Bit 29: Odd frame */ +#define OTGFS_HCCHAR_CHDIS (1 << 30) /* Bit 30: Channel disable */ +#define OTGFS_HCCHAR_CHENA (1 << 31) /* Bit 31: Channel enable */ + +/* Host channel-n interrupt and Host channel-0 interrupt mask registers */ + +#define OTGFS_HCINT_XFRC (1 << 0) /* Bit 0: Transfer completed */ +#define OTGFS_HCINT_CHH (1 << 1) /* Bit 1: Channel halted */ + /* Bit 2: Reserved, must be kept at reset value */ +#define OTGFS_HCINT_STALL (1 << 3) /* Bit 3: STALL response received interrupt */ +#define OTGFS_HCINT_NAK (1 << 4) /* Bit 4: NAK response received interrupt */ +#define OTGFS_HCINT_ACK (1 << 5) /* Bit 5: ACK response received/transmitted interrupt */ +//#define OTGFS_HCINT_NYET (1 << 6) /* Bit 6: Response received interrupt */ +#define OTGFS_HCINT_TXERR (1 << 7) /* Bit 7: Transaction error */ +#define OTGFS_HCINT_BBERR (1 << 8) /* Bit 8: Babble error */ +#define OTGFS_HCINT_FRMOR (1 << 9) /* Bit 9: Frame overrun */ +#define OTGFS_HCINT_DTERR (1 << 10) /* Bit 10: Data toggle error */ + /* Bits 11-31 Reserved, must be kept at reset value */ +/* Host channel-n interrupt register */ + +#define OTGFS_HCTSIZ_XFRSIZ_SHIFT (0) /* Bits 0-18: Transfer size */ +#define OTGFS_HCTSIZ_XFRSIZ_MASK (0x7ffff << OTGFS_HCTSIZ_XFRSIZ_SHIFT) +#define OTGFS_HCTSIZ_PKTCNT_SHIFT (19) /* Bits 19-28: Packet count */ +#define OTGFS_HCTSIZ_PKTCNT_MASK (0x3ff << OTGFS_HCTSIZ_PKTCNT_SHIFT) +#define OTGFS_HCTSIZ_DPID_SHIFT (29) /* Bits 29-30: Data PID */ +#define OTGFS_HCTSIZ_DPID_MASK (3 << OTGFS_HCTSIZ_DPID_SHIFT) +# define OTGFS_HCTSIZ_DPID_DATA0 (0 << OTGFS_HCTSIZ_DPID_SHIFT) +# define OTGFS_HCTSIZ_DPID_DATA2 (1 << OTGFS_HCTSIZ_DPID_SHIFT) +# define OTGFS_HCTSIZ_DPID_DATA1 (2 << OTGFS_HCTSIZ_DPID_SHIFT) +# define OTGFS_HCTSIZ_DPID_MDATA (3 << OTGFS_HCTSIZ_DPID_SHIFT) /* Non-control */ +# define OTGFS_HCTSIZ_PID_SETUP (3 << OTGFS_HCTSIZ_DPID_SHIFT) /* Control */ + /* Bit 31 Reserved, must be kept at reset value */ +/* Device-mode control and status registers */ + +/* Device configuration register */ + +#define OTGFS_DCFG_DSPD_SHIFT (0) /* Bits 0-1: Device speed */ +#define OTGFS_DCFG_DSPD_MASK (3 << OTGFS_DCFG_DSPD_SHIFT) +# define OTGFS_DCFG_DSPD_FS (3 << OTGFS_DCFG_DSPD_SHIFT) /* Full speed */ +#define OTGFS_DCFG_NZLSOHSK (1 << 2) /* Bit 2: Non-zero-length status OUT handshake */ + /* Bit 3: Reserved, must be kept at reset value */ +#define OTGFS_DCFG_DAD_SHIFT (4) /* Bits 4-10: Device address */ +#define OTGFS_DCFG_DAD_MASK (0x7f << OTGFS_DCFG_DAD_SHIFT) +#define OTGFS_DCFG_PFIVL_SHIFT (11) /* Bits 11-12: Periodic frame interval */ +#define OTGFS_DCFG_PFIVL_MASK (3 << OTGFS_DCFG_PFIVL_SHIFT) +# define OTGFS_DCFG_PFIVL_80PCT (0 << OTGFS_DCFG_PFIVL_SHIFT) /* 80% of the frame interval */ +# define OTGFS_DCFG_PFIVL_85PCT (1 << OTGFS_DCFG_PFIVL_SHIFT) /* 85% of the frame interval */ +# define OTGFS_DCFG_PFIVL_90PCT (2 << OTGFS_DCFG_PFIVL_SHIFT) /* 90% of the frame interval */ +# define OTGFS_DCFG_PFIVL_95PCT (3 << OTGFS_DCFG_PFIVL_SHIFT) /* 95% of the frame interval */ + /* Bits 13-31 Reserved, must be kept at reset value */ +/* Device control register */ + +#define OTGFS_TESTMODE_DISABLED (0) /* Test mode disabled */ +#define OTGFS_TESTMODE_J (1) /* Test_J mode */ +#define OTGFS_TESTMODE_K (2) /* Test_K mode */ +#define OTGFS_TESTMODE_SE0_NAK (3) /* Test_SE0_NAK mode */ +#define OTGFS_TESTMODE_PACKET (4) /* Test_Packet mode */ +#define OTGFS_TESTMODE_FORCE (5) /* Test_Force_Enable */ + +#define OTGFS_DCTL_RWUSIG (1 << 0) /* Bit 0: Remote wakeup signaling */ +#define OTGFS_DCTL_SDIS (1 << 1) /* Bit 1: Soft disconnect */ +#define OTGFS_DCTL_GINSTS (1 << 2) /* Bit 2: Global IN NAK status */ +#define OTGFS_DCTL_GONSTS (1 << 3) /* Bit 3: Global OUT NAK status */ +#define OTGFS_DCTL_TCTL_SHIFT (4) /* Bits 4-6: Test control */ +#define OTGFS_DCTL_TCTL_MASK (7 << OTGFS_DCTL_TCTL_SHIFT) +# define OTGFS_DCTL_TCTL_DISABLED (0 << OTGFS_DCTL_TCTL_SHIFT) /* Test mode disabled */ +# define OTGFS_DCTL_TCTL_J (1 << OTGFS_DCTL_TCTL_SHIFT) /* Test_J mode */ +# define OTGFS_DCTL_TCTL_K (2 << OTGFS_DCTL_TCTL_SHIFT) /* Test_K mode */ +# define OTGFS_DCTL_TCTL_SE0_NAK (3 << OTGFS_DCTL_TCTL_SHIFT) /* Test_SE0_NAK mode */ +# define OTGFS_DCTL_TCTL_PACKET (4 << OTGFS_DCTL_TCTL_SHIFT) /* Test_Packet mode */ +# define OTGFS_DCTL_TCTL_FORCE (5 << OTGFS_DCTL_TCTL_SHIFT) /* Test_Force_Enable */ +#define OTGFS_DCTL_SGINAK (1 << 7) /* Bit 7: Set global IN NAK */ +#define OTGFS_DCTL_CGINAK (1 << 8) /* Bit 8: Clear global IN NAK */ +#define OTGFS_DCTL_SGONAK (1 << 9) /* Bit 9: Set global OUT NAK */ +#define OTGFS_DCTL_CGONAK (1 << 10) /* Bit 10: Clear global OUT NAK */ +#define OTGFS_DCTL_POPRGDNE (1 << 11) /* Bit 11: Power-on programming done */ + /* Bits 12-17: Reserved, must be kept at reset value */ +#define OTGFS_DCTL_DSBESLRJCT (1 << 18) /* Bit 18: XXX */ + /* Bits 19-31: Reserved, must be kept at reset value */ +/* Device status register */ + +#define OTGFS_DSTS_SUSPSTS (1 << 0) /* Bit 0: Suspend status */ +#define OTGFS_DSTS_ENUMSPD_SHIFT (1) /* Bits 1-2: Enumerated speed */ +#define OTGFS_DSTS_ENUMSPD_MASK (3 << OTGFS_DSTS_ENUMSPD_SHIFT) +# define OTGFS_DSTS_ENUMSPD_FS (3 << OTGFS_DSTS_ENUMSPD_MASK) /* Full speed */ + /* Bits 4-7: Reserved, must be kept at reset value */ +#define OTGFS_DSTS_EERR (1 << 3) /* Bit 3: Erratic error */ +#define OTGFS_DSTS_SOFFN_SHIFT (8) /* Bits 8-21: Frame number of the received SOF */ +#define OTGFS_DSTS_SOFFN_MASK (0x3fff << OTGFS_DSTS_SOFFN_SHIFT) +#define OTGFS_DSTS_SOFFN0 (1 << 8) /* Bits 8: Frame number even/odd bit */ +#define OTGFS_DSTS_SOFFN_EVEN 0 +#define OTGFS_DSTS_SOFFN_ODD OTGFS_DSTS_SOFFN0 +#define OTGFS_DSTS_DEVLNSTS_SHIFT (22) /* Bits 22-23: XXX */ +#define OTGFS_DSTS_DEVLNSTS_MASK (0x3 << OTGFS_DSTS_DEVLNSTS_SHIFT) +//XXX + /* Bits 24-31: Reserved, must be kept at reset value */ +/* Device IN endpoint common interrupt mask register */ + +#define OTGFS_DIEPMSK_XFRCM (1 << 0) /* Bit 0: Transfer completed interrupt mask */ +#define OTGFS_DIEPMSK_EPDM (1 << 1) /* Bit 1: Endpoint disabled interrupt mask */ + /* Bit 2: Reserved, must be kept at reset value */ +#define OTGFS_DIEPMSK_TOM (1 << 3) /* Bit 3: Timeout condition mask (Non-isochronous endpoints) */ +#define OTGFS_DIEPMSK_ITTXFEMSK (1 << 4) /* Bit 4: IN token received when TxFIFO empty mask */ +#define OTGFS_DIEPMSK_INEPNMM (1 << 5) /* Bit 5: IN token received with EP mismatch mask */ +#define OTGFS_DIEPMSK_INEPNEM (1 << 6) /* Bit 6: IN endpoint NAK effective mask */ + /* Bits 7-11: Reserved, must be kept at reset value */ +#define OTGFS_DIEPMSK_NAKM (1 << 12) /* Bit 12: XXX mask */ + /* Bits 13-31: Reserved, must be kept at reset value */ +/* Device OUT endpoint common interrupt mask register */ + +#define OTGFS_DOEPMSK_XFRCM (1 << 0) /* Bit 0: Transfer completed interrupt mask */ +#define OTGFS_DOEPMSK_EPDM (1 << 1) /* Bit 1: Endpoint disabled interrupt mask */ + /* Bit 2: Reserved, must be kept at reset value */ +#define OTGFS_DOEPMSK_STUPM (1 << 3) /* Bit 3: SETUP phase done mask */ +#define OTGFS_DOEPMSK_OTEPDM (1 << 4) /* Bit 4: OUT token received when endpoint disabled mask */ + /* Bits 5-31: Reserved, must be kept at reset value */ +/* Device all endpoints interrupt and All endpoints interrupt mask registers */ + +#define OTGFS_DAINT_IEP_SHIFT (0) /* Bits 0-15: IN endpoint interrupt bits */ +#define OTGFS_DAINT_IEP_MASK (0xffff << OTGFS_DAINT_IEP_SHIFT) +# define OTGFS_DAINT_IEP(n) (1 << (n)) +#define OTGFS_DAINT_OEP_SHIFT (16) /* Bits 16-31: OUT endpoint interrupt bits */ +#define OTGFS_DAINT_OEP_MASK (0xffff << OTGFS_DAINT_OEP_SHIFT) +# define OTGFS_DAINT_OEP(n) (1 << ((n)+16)) + +/* Device VBUS discharge time register */ + +#define OTGFS_DVBUSDIS_MASK (0xffff) + +/* Device VBUS pulsing time register */ + +#define OTGFS_DVBUSPULSE_MASK (0xffff) + +/* Device IN endpoint FIFO empty interrupt mask register */ + +#define OTGFS_DIEPEMPMSK(n) (1 << (n)) + +/* Device control IN endpoint 0 control register */ + +#define OTGFS_DIEPCTL0_MPSIZ_SHIFT (0) /* Bits 0-1: Maximum packet size */ +#define OTGFS_DIEPCTL0_MPSIZ_MASK (3 << OTGFS_DIEPCTL0_MPSIZ_SHIFT) +# define OTGFS_DIEPCTL0_MPSIZ_64 (0 << OTGFS_DIEPCTL0_MPSIZ_SHIFT) /* 64 bytes */ +# define OTGFS_DIEPCTL0_MPSIZ_32 (1 << OTGFS_DIEPCTL0_MPSIZ_SHIFT) /* 32 bytes */ +# define OTGFS_DIEPCTL0_MPSIZ_16 (2 << OTGFS_DIEPCTL0_MPSIZ_SHIFT) /* 16 bytes */ +# define OTGFS_DIEPCTL0_MPSIZ_8 (3 << OTGFS_DIEPCTL0_MPSIZ_SHIFT) /* 8 bytes */ + /* Bits 2-14: Reserved, must be kept at reset value */ +#define OTGFS_DIEPCTL0_USBAEP (1 << 15) /* Bit 15: USB active endpoint */ + /* Bit 16: Reserved, must be kept at reset value */ +#define OTGFS_DIEPCTL0_NAKSTS (1 << 17) /* Bit 17: NAK status */ +#define OTGFS_DIEPCTL0_EPTYP_SHIFT (18) /* Bits 18-19: Endpoint type */ +#define OTGFS_DIEPCTL0_EPTYP_MASK (3 << OTGFS_DIEPCTL0_EPTYP_SHIFT) +# define OTGFS_DIEPCTL0_EPTYP_CTRL (0 << OTGFS_DIEPCTL0_EPTYP_SHIFT) /* Control (hard-coded) */ + /* Bit 20: Reserved, must be kept at reset value */ +#define OTGFS_DIEPCTL0_STALL (1 << 21) /* Bit 21: STALL handshake */ +#define OTGFS_DIEPCTL0_TXFNUM_SHIFT (22) /* Bits 22-25: TxFIFO number */ +#define OTGFS_DIEPCTL0_TXFNUM_MASK (15 << OTGFS_DIEPCTL0_TXFNUM_SHIFT) +#define OTGFS_DIEPCTL0_CNAK (1 << 26) /* Bit 26: Clear NAK */ +#define OTGFS_DIEPCTL0_SNAK (1 << 27) /* Bit 27: Set NAK */ + /* Bits 28-29: Reserved, must be kept at reset value */ +#define OTGFS_DIEPCTL0_EPDIS (1 << 30) /* Bit 30: Endpoint disable */ +#define OTGFS_DIEPCTL0_EPENA (1 << 31) /* Bit 31: Endpoint enable */ + +/* Device control IN endpoint n control register */ + +#define OTGFS_DIEPCTL_MPSIZ_SHIFT (0) /* Bits 0-10: Maximum packet size */ +#define OTGFS_DIEPCTL_MPSIZ_MASK (0x7ff << OTGFS_DIEPCTL_MPSIZ_SHIFT) + /* Bits 11-14: Reserved, must be kept at reset value */ +#define OTGFS_DIEPCTL_USBAEP (1 << 15) /* Bit 15: USB active endpoint */ +#define OTGFS_DIEPCTL_EONUM (1 << 16) /* Bit 16: Even/odd frame */ +# define OTGFS_DIEPCTL_EVEN (0) +# define OTGFS_DIEPCTL_ODD OTGFS_DIEPCTL_EONUM +# define OTGFS_DIEPCTL_DATA0 (0) +# define OTGFS_DIEPCTL_DATA1 OTGFS_DIEPCTL_EONUM +#define OTGFS_DIEPCTL_NAKSTS (1 << 17) /* Bit 17: NAK status */ +#define OTGFS_DIEPCTL_EPTYP_SHIFT (18) /* Bits 18-19: Endpoint type */ +#define OTGFS_DIEPCTL_EPTYP_MASK (3 << OTGFS_DIEPCTL_EPTYP_SHIFT) +# define OTGFS_DIEPCTL_EPTYP_CTRL (0 << OTGFS_DIEPCTL_EPTYP_SHIFT) /* Control */ +# define OTGFS_DIEPCTL_EPTYP_ISOC (1 << OTGFS_DIEPCTL_EPTYP_SHIFT) /* Isochronous */ +# define OTGFS_DIEPCTL_EPTYP_BULK (2 << OTGFS_DIEPCTL_EPTYP_SHIFT) /* Bulk */ +# define OTGFS_DIEPCTL_EPTYP_INTR (3 << OTGFS_DIEPCTL_EPTYP_SHIFT) /* Interrupt */ + /* Bit 20: Reserved, must be kept at reset value */ +#define OTGFS_DIEPCTL_STALL (1 << 21) /* Bit 21: STALL handshake */ +#define OTGFS_DIEPCTL_TXFNUM_SHIFT (22) /* Bits 22-25: TxFIFO number */ +#define OTGFS_DIEPCTL_TXFNUM_MASK (15 << OTGFS_DIEPCTL_TXFNUM_SHIFT) +#define OTGFS_DIEPCTL_CNAK (1 << 26) /* Bit 26: Clear NAK */ +#define OTGFS_DIEPCTL_SNAK (1 << 27) /* Bit 27: Set NAK */ +#define OTGFS_DIEPCTL_SD0PID (1 << 28) /* Bit 28: Set DATA0 PID (interrupt/bulk) */ +#define OTGFS_DIEPCTL_SEVNFRM (1 << 28) /* Bit 28: Set even frame (isochronous)) */ +#define OTGFS_DIEPCTL_SODDFRM (1 << 29) /* Bit 29: Set odd frame (isochronous) */ +#define OTGFS_DIEPCTL_EPDIS (1 << 30) /* Bit 30: Endpoint disable */ +#define OTGFS_DIEPCTL_EPENA (1 << 31) /* Bit 31: Endpoint enable */ + +/* Device endpoint-n interrupt register */ + +#define OTGFS_DIEPINT_XFRC (1 << 0) /* Bit 0: Transfer completed interrupt */ +#define OTGFS_DIEPINT_EPDISD (1 << 1) /* Bit 1: Endpoint disabled interrupt */ + /* Bit 2: Reserved, must be kept at reset value */ +#define OTGFS_DIEPINT_TOC (1 << 3) /* Bit 3: Timeout condition */ +#define OTGFS_DIEPINT_ITTXFE (1 << 4) /* Bit 4: IN token received when TxFIFO is empty */ + /* Bit 5: Reserved, must be kept at reset value */ +#define OTGFS_DIEPINT_INEPNE (1 << 6) /* Bit 6: IN endpoint NAK effective */ +#define OTGFS_DIEPINT_TXFE (1 << 7) /* Bit 7: Transmit FIFO empty */ + /* Bits 8-31: Reserved, must be kept at reset value */ +/* Device IN endpoint 0 transfer size register */ + +#define OTGFS_DIEPTSIZ0_XFRSIZ_SHIFT (0) /* Bits 0-6: Transfer size */ +#define OTGFS_DIEPTSIZ0_XFRSIZ_MASK (0x7f << OTGFS_DIEPTSIZ0_XFRSIZ_SHIFT) + /* Bits 7-18: Reserved, must be kept at reset value */ +#define OTGFS_DIEPTSIZ0_PKTCNT_SHIFT (19) /* Bits 19-20: Packet count */ +#define OTGFS_DIEPTSIZ0_PKTCNT_MASK (3 << OTGFS_DIEPTSIZ0_PKTCNT_SHIFT) + /* Bits 21-31: Reserved, must be kept at reset value */ +/* Device IN endpoint n transfer size register */ + +#define OTGFS_DIEPTSIZ_XFRSIZ_SHIFT (0) /* Bits 0-18: Transfer size */ +#define OTGFS_DIEPTSIZ_XFRSIZ_MASK (0x7ffff << OTGFS_DIEPTSIZ_XFRSIZ_SHIFT) +#define OTGFS_DIEPTSIZ_PKTCNT_SHIFT (19) /* Bit 19-28: Packet count */ +#define OTGFS_DIEPTSIZ_PKTCNT_MASK (0x3ff << OTGFS_DIEPTSIZ_PKTCNT_SHIFT) +#define OTGFS_DIEPTSIZ_MCNT_SHIFT (29) /* Bits 29-30: Multi count */ +#define OTGFS_DIEPTSIZ_MCNT_MASK (3 << OTGFS_DIEPTSIZ_MCNT_SHIFT) + /* Bit 31: Reserved, must be kept at reset value */ +/* Device OUT endpoint TxFIFO status register */ + +#define OTGFS_DTXFSTS_MASK (0xffff) + +/* Device OUT endpoint 0 control register */ + +#define OTGFS_DOEPCTL0_MPSIZ_SHIFT (0) /* Bits 0-1: Maximum packet size */ +#define OTGFS_DOEPCTL0_MPSIZ_MASK (3 << OTGFS_DOEPCTL0_MPSIZ_SHIFT) +# define OTGFS_DOEPCTL0_MPSIZ_64 (0 << OTGFS_DOEPCTL0_MPSIZ_SHIFT) /* 64 bytes */ +# define OTGFS_DOEPCTL0_MPSIZ_32 (1 << OTGFS_DOEPCTL0_MPSIZ_SHIFT) /* 32 bytes */ +# define OTGFS_DOEPCTL0_MPSIZ_16 (2 << OTGFS_DOEPCTL0_MPSIZ_SHIFT) /* 16 bytes */ +# define OTGFS_DOEPCTL0_MPSIZ_8 (3 << OTGFS_DOEPCTL0_MPSIZ_SHIFT) /* 8 bytes */ + /* Bits 2-14: Reserved, must be kept at reset value */ +#define OTGFS_DOEPCTL0_USBAEP (1 << 15) /* Bit 15: USB active endpoint */ + /* Bit 16: Reserved, must be kept at reset value */ +#define OTGFS_DOEPCTL0_NAKSTS (1 << 17) /* Bit 17: NAK status */ +#define OTGFS_DOEPCTL0_EPTYP_SHIFT (18) /* Bits 18-19: Endpoint type */ +#define OTGFS_DOEPCTL0_EPTYP_MASK (3 << OTGFS_DOEPCTL0_EPTYP_SHIFT) +# define OTGFS_DOEPCTL0_EPTYP_CTRL (0 << OTGFS_DOEPCTL0_EPTYP_SHIFT) /* Control (hard-coded) */ +#define OTGFS_DOEPCTL0_SNPM (1 << 20) /* Bit 20: Snoop mode */ +#define OTGFS_DOEPCTL0_STALL (1 << 21) /* Bit 21: STALL handshake */ + /* Bits 22-25: Reserved, must be kept at reset value */ +#define OTGFS_DOEPCTL0_CNAK (1 << 26) /* Bit 26: Clear NAK */ +#define OTGFS_DOEPCTL0_SNAK (1 << 27) /* Bit 27: Set NAK */ + /* Bits 28-29: Reserved, must be kept at reset value */ +#define OTGFS_DOEPCTL0_EPDIS (1 << 30) /* Bit 30: Endpoint disable */ +#define OTGFS_DOEPCTL0_EPENA (1 << 31) /* Bit 31: Endpoint enable */ + +/* Device OUT endpoint n control register */ + +#define OTGFS_DOEPCTL_MPSIZ_SHIFT (0) /* Bits 0-10: Maximum packet size */ +#define OTGFS_DOEPCTL_MPSIZ_MASK (0x7ff << OTGFS_DOEPCTL_MPSIZ_SHIFT) + /* Bits 11-14: Reserved, must be kept at reset value */ +#define OTGFS_DOEPCTL_USBAEP (1 << 15) /* Bit 15: USB active endpoint */ +#define OTGFS_DOEPCTL_DPID (1 << 16) /* Bit 16: Endpoint data PID (interrupt/buld) */ +# define OTGFS_DOEPCTL_DATA0 (0) +# define OTGFS_DOEPCTL_DATA1 OTGFS_DOEPCTL_DPID +#define OTGFS_DOEPCTL_EONUM (1 << 16) /* Bit 16: Even/odd frame (isochronous) */ +# define OTGFS_DOEPCTL_EVEN (0) +# define OTGFS_DOEPCTL_ODD OTGFS_DOEPCTL_EONUM +#define OTGFS_DOEPCTL_NAKSTS (1 << 17) /* Bit 17: NAK status */ +#define OTGFS_DOEPCTL_EPTYP_SHIFT (18) /* Bits 18-19: Endpoint type */ +#define OTGFS_DOEPCTL_EPTYP_MASK (3 << OTGFS_DOEPCTL_EPTYP_SHIFT) +# define OTGFS_DOEPCTL_EPTYP_CTRL (0 << OTGFS_DOEPCTL_EPTYP_SHIFT) /* Control */ +# define OTGFS_DOEPCTL_EPTYP_ISOC (1 << OTGFS_DOEPCTL_EPTYP_SHIFT) /* Isochronous */ +# define OTGFS_DOEPCTL_EPTYP_BULK (2 << OTGFS_DOEPCTL_EPTYP_SHIFT) /* Bulk */ +# define OTGFS_DOEPCTL_EPTYP_INTR (3 << OTGFS_DOEPCTL_EPTYP_SHIFT) /* Interrupt */ +#define OTGFS_DOEPCTL_SNPM (1 << 20) /* Bit 20: Snoop mode */ +#define OTGFS_DOEPCTL_STALL (1 << 21) /* Bit 21: STALL handshake */ + /* Bits 22-25: Reserved, must be kept at reset value */ +#define OTGFS_DOEPCTL_CNAK (1 << 26) /* Bit 26: Clear NAK */ +#define OTGFS_DOEPCTL_SNAK (1 << 27) /* Bit 27: Set NAK */ +#define OTGFS_DOEPCTL_SD0PID (1 << 28) /* Bit 28: Set DATA0 PID (interrupt/bulk) */ +#define OTGFS_DOEPCTL_SEVNFRM (1 << 28) /* Bit 28: Set even frame (isochronous) */ +#define OTGFS_DOEPCTL_SD1PID (1 << 29) /* Bit 29: Set DATA1 PID (interrupt/bulk) */ +#define OTGFS_DOEPCTL_SODDFRM (1 << 29) /* Bit 29: Set odd frame (isochronous */ +#define OTGFS_DOEPCTL_EPDIS (1 << 30) /* Bit 30: Endpoint disable */ +#define OTGFS_DOEPCTL_EPENA (1 << 31) /* Bit 31: Endpoint enable */ + +/* Device endpoint-n interrupt register */ + +#define OTGFS_DOEPINT_XFRC (1 << 0) /* Bit 0: Transfer completed interrupt */ +#define OTGFS_DOEPINT_EPDISD (1 << 1) /* Bit 1: Endpoint disabled interrupt */ + /* Bit 2: Reserved, must be kept at reset value */ +#define OTGFS_DOEPINT_SETUP (1 << 3) /* Bit 3: SETUP phase done */ +#define OTGFS_DOEPINT_OTEPDIS (1 << 4) /* Bit 4: OUT token received when endpoint disabled */ + /* Bit 5: Reserved, must be kept at reset value */ +#define OTGFS_DOEPINT_B2BSTUP (1 << 6) /* Bit 6: Back-to-back SETUP packets received */ + /* Bits 7-31: Reserved, must be kept at reset value */ +/* Device OUT endpoint-0 transfer size register */ + +#define OTGFS_DOEPTSIZ0_XFRSIZ_SHIFT (0) /* Bits 0-6: Transfer size */ +#define OTGFS_DOEPTSIZ0_XFRSIZ_MASK (0x7f << OTGFS_DOEPTSIZ0_XFRSIZ_SHIFT) + /* Bits 7-18: Reserved, must be kept at reset value */ +#define OTGFS_DOEPTSIZ0_PKTCNT (1 << 19) /* Bit 19 PKTCNT: Packet count */ + /* Bits 20-28: Reserved, must be kept at reset value */ +#define OTGFS_DOEPTSIZ0_STUPCNT_SHIFT (29) /* Bits 29-30: SETUP packet count */ +#define OTGFS_DOEPTSIZ0_STUPCNT_MASK (3 << OTGFS_DOEPTSIZ0_STUPCNT_SHIFT) + /* Bit 31: Reserved, must be kept at reset value */ +/* Device OUT endpoint-n transfer size register */ + +#define OTGFS_DOEPTSIZ_XFRSIZ_SHIFT (0) /* Bits 0-18: Transfer size */ +#define OTGFS_DOEPTSIZ_XFRSIZ_MASK (0x7ffff << OTGFS_DOEPTSIZ_XFRSIZ_SHIFT) +#define OTGFS_DOEPTSIZ_PKTCNT_SHIFT (19) /* Bit 19-28: Packet count */ +#define OTGFS_DOEPTSIZ_PKTCNT_MASK (0x3ff << OTGFS_DOEPTSIZ_PKTCNT_SHIFT) +#define OTGFS_DOEPTSIZ_STUPCNT_SHIFT (29) /* Bits 29-30: SETUP packet count */ +#define OTGFS_DOEPTSIZ_STUPCNT_MASK (3 << OTGFS_DOEPTSIZ_STUPCNT_SHIFT) +#define OTGFS_DOEPTSIZ_RXDPID_SHIFT (29) /* Bits 29-30: Received data PID */ +#define OTGFS_DOEPTSIZ_RXDPID_MASK (3 << OTGFS_DOEPTSIZ_RXDPID_SHIFT) +# define OTGFS_DOEPTSIZ_RXDPID_DATA0 (0 << OTGFS_DOEPTSIZ_RXDPID_SHIFT) +# define OTGFS_DOEPTSIZ_RXDPID_DATA2 (1 << OTGFS_DOEPTSIZ_RXDPID_SHIFT) +# define OTGFS_DOEPTSIZ_RXDPID_DATA1 (2 << OTGFS_DOEPTSIZ_RXDPID_SHIFT) +# define OTGFS_DOEPTSIZ_RXDPID_MDATA (3 << OTGFS_DOEPTSIZ_RXDPID_SHIFT) + /* Bit 31: Reserved, must be kept at reset value */ +/* Power and clock gating control register */ + +#define OTGFS_PCGCCTL_STPPCLK (1 << 0) /* Bit 0: Stop PHY clock */ +#define OTGFS_PCGCCTL_GATEHCLK (1 << 1) /* Bit 1: Gate HCLK */ + /* Bits 2-3: Reserved, must be kept at reset value */ +#define OTGFS_PCGCCTL_PHYSUSP (1 << 4) /* Bit 4: PHY Suspended */ +#define OTGFS_PCGCCTL_ENL1GTG (1 << 5) /* Bit 5: XXX */ +#define OTGFS_PCGCCTL_PHYSLEEP (1 << 6) /* Bit 6: XXX */ +#define OTGFS_PCGCCTL_SUSP (1 << 7) /* Bit 7: XXX */ + /* Bits 8-31: Reserved, must be kept at reset value */ + +#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4X6XX_OTGFS_H */ diff --git a/arch/arm/src/stm32l4/chip/stm32l4x6xx_pinmap.h b/arch/arm/src/stm32l4/chip/stm32l4x6xx_pinmap.h index 8a564fc377..c4ebc1413c 100644 --- a/arch/arm/src/stm32l4/chip/stm32l4x6xx_pinmap.h +++ b/arch/arm/src/stm32l4/chip/stm32l4x6xx_pinmap.h @@ -350,27 +350,27 @@ /* OTG FS */ -#define GPIO_OTG_FS_SOF (GPIO_ALT|GPIO_AF10|GPIO_PORTA|GPIO_PIN8) -#define GPIO_OTG_FS_ID (GPIO_ALT|GPIO_AF10|GPIO_PORTA|GPIO_PIN10) -#define GPIO_OTG_FS_DM (GPIO_ALT|GPIO_AF10|GPIO_PORTA|GPIO_PIN11) -#define GPIO_OTG_FS_DP (GPIO_ALT|GPIO_AF10|GPIO_PORTA|GPIO_PIN12) -#define GPIO_OTG_FS_NOE_1 (GPIO_ALT|GPIO_AF10|GPIO_PORTA|GPIO_PIN13) -#define GPIO_OTG_FS_NOE_2 (GPIO_ALT|GPIO_AF10|GPIO_PORTC|GPIO_PIN9) +#define GPIO_OTGFS_SOF (GPIO_ALT|GPIO_AF10|GPIO_PORTA|GPIO_PIN8) +#define GPIO_OTGFS_ID (GPIO_ALT|GPIO_AF10|GPIO_PORTA|GPIO_PIN10) +#define GPIO_OTGFS_DM (GPIO_ALT|GPIO_AF10|GPIO_PORTA|GPIO_PIN11) +#define GPIO_OTGFS_DP (GPIO_ALT|GPIO_AF10|GPIO_PORTA|GPIO_PIN12) +#define GPIO_OTGFS_NOE_1 (GPIO_ALT|GPIO_AF10|GPIO_PORTA|GPIO_PIN13) +#define GPIO_OTGFS_NOE_2 (GPIO_ALT|GPIO_AF10|GPIO_PORTC|GPIO_PIN9) /* QUADSPI */ -#define GPIO_QSPI_NCS_1 (GPIO_ALT|GPIO_AF10|GPIO_PORTB|GPIO_PIN11) -#define GPIO_QSPI_NCS_2 (GPIO_ALT|GPIO_AF10|GPIO_PORTE|GPIO_PIN11) -#define GPIO_QSPI_CLK_1 (GPIO_ALT|GPIO_AF10|GPIO_PORTB|GPIO_PIN10) -#define GPIO_QSPI_CLK_2 (GPIO_ALT|GPIO_AF10|GPIO_PORTE|GPIO_PIN10) -#define GPIO_QSPI_BK1_IO0_1 (GPIO_ALT|GPIO_AF10|GPIO_PORTB|GPIO_PIN1) -#define GPIO_QSPI_BK1_IO0_2 (GPIO_ALT|GPIO_AF10|GPIO_PORTE|GPIO_PIN12) -#define GPIO_QSPI_BK1_IO1_1 (GPIO_ALT|GPIO_AF10|GPIO_PORTB|GPIO_PIN0) -#define GPIO_QSPI_BK1_IO1_2 (GPIO_ALT|GPIO_AF10|GPIO_PORTE|GPIO_PIN13) -#define GPIO_QSPI_BK1_IO2_1 (GPIO_ALT|GPIO_AF10|GPIO_PORTA|GPIO_PIN7) -#define GPIO_QSPI_BK1_IO2_2 (GPIO_ALT|GPIO_AF10|GPIO_PORTE|GPIO_PIN14) -#define GPIO_QSPI_BK1_IO3_1 (GPIO_ALT|GPIO_AF10|GPIO_PORTA|GPIO_PIN6) -#define GPIO_QSPI_BK1_IO3_2 (GPIO_ALT|GPIO_AF10|GPIO_PORTE|GPIO_PIN15) +#define GPIO_QSPI_NCS_1 (GPIO_ALT|GPIO_AF10|GPIO_PORTB|GPIO_PIN11) +#define GPIO_QSPI_NCS_2 (GPIO_ALT|GPIO_AF10|GPIO_PORTE|GPIO_PIN11) +#define GPIO_QSPI_CLK_1 (GPIO_ALT|GPIO_AF10|GPIO_PORTB|GPIO_PIN10) +#define GPIO_QSPI_CLK_2 (GPIO_ALT|GPIO_AF10|GPIO_PORTE|GPIO_PIN10) +#define GPIO_QSPI_BK1_IO0_1 (GPIO_ALT|GPIO_AF10|GPIO_PORTB|GPIO_PIN1) +#define GPIO_QSPI_BK1_IO0_2 (GPIO_ALT|GPIO_AF10|GPIO_PORTE|GPIO_PIN12) +#define GPIO_QSPI_BK1_IO1_1 (GPIO_ALT|GPIO_AF10|GPIO_PORTB|GPIO_PIN0) +#define GPIO_QSPI_BK1_IO1_2 (GPIO_ALT|GPIO_AF10|GPIO_PORTE|GPIO_PIN13) +#define GPIO_QSPI_BK1_IO2_1 (GPIO_ALT|GPIO_AF10|GPIO_PORTA|GPIO_PIN7) +#define GPIO_QSPI_BK1_IO2_2 (GPIO_ALT|GPIO_AF10|GPIO_PORTE|GPIO_PIN14) +#define GPIO_QSPI_BK1_IO3_1 (GPIO_ALT|GPIO_AF10|GPIO_PORTA|GPIO_PIN6) +#define GPIO_QSPI_BK1_IO3_2 (GPIO_ALT|GPIO_AF10|GPIO_PORTE|GPIO_PIN15) /* RTC */ diff --git a/arch/arm/src/stm32l4/stm32l4_otgfs.h b/arch/arm/src/stm32l4/stm32l4_otgfs.h new file mode 100644 index 0000000000..cdeb0ee590 --- /dev/null +++ b/arch/arm/src/stm32l4/stm32l4_otgfs.h @@ -0,0 +1,129 @@ +/************************************************************************************ + * arch/arm/src/stm32l4/stm32l4_otgfs.h + * + * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * dev@ziggurat29.com + * + * 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_STM32L4_STM32L4_OTGFS_H +#define __ARCH_ARM_SRC_STM32L4_STM32L4_OTGFS_H + +/************************************************************************************ + * Included Files + ************************************************************************************/ + +#include + +#include + +#include "stm32l4.h" + +#include "chip/stm32l4x6xx_otgfs.h" + +#if defined(CONFIG_STM32L4_OTGFS) + +/************************************************************************************ + * Pre-processor Definitions + ************************************************************************************/ +/* Configuration ********************************************************************/ + +#ifndef CONFIG_OTGFS_PRI +# define CONFIG_OTGFS_PRI NVIC_SYSH_PRIORITY_DEFAULT +#endif + +/************************************************************************************ + * Public Functions + ************************************************************************************/ + +#ifndef __ASSEMBLY__ + +#undef EXTERN +#if defined(__cplusplus) +#define EXTERN extern "C" +extern "C" +{ +#else +#define EXTERN extern +#endif + +/**************************************************************************** + * Name: stm32l4_otgfshost_initialize + * + * Description: + * Initialize USB host device controller hardware. + * + * Input Parameters: + * controller -- If the device supports more than USB host controller, then + * this identifies which controller is being initialized. Normally, this + * is just zero. + * + * Returned Value: + * And instance of the USB host interface. The controlling task should + * use this interface to (1) call the wait() method to wait for a device + * to be connected, and (2) call the enumerate() method to bind the device + * to a class driver. + * + * Assumptions: + * - This function should called in the initialization sequence in order + * to initialize the USB device functionality. + * - Class drivers should be initialized prior to calling this function. + * Otherwise, there is a race condition if the device is already connected. + * + ****************************************************************************/ + +#ifdef CONFIG_USBHOST +struct usbhost_connection_s; +FAR struct usbhost_connection_s *stm32l4_otgfshost_initialize(int controller); +#endif + +/************************************************************************************ + * Name: stm32l4_usbsuspend + * + * Description: + * Board logic must provide the stm32l4_usbsuspend logic if the OTG FS device driver + * is used. This function is called whenever the USB enters or leaves suspend + * mode. This is an opportunity for the board logic to shutdown clocks, power, + * etc. while the USB is suspended. + * + ************************************************************************************/ + +void stm32l4_usbsuspend(FAR struct usbdev_s *dev, bool resume); + +#undef EXTERN +#if defined(__cplusplus) +} +#endif + +#endif /* __ASSEMBLY__ */ +#endif /* CONFIG_STM32_OTGFS */ +#endif /* __ARCH_ARM_SRC_STM32_STM32_OTGFS_H */ + diff --git a/arch/arm/src/stm32l4/stm32l4_otgfsdev.c b/arch/arm/src/stm32l4/stm32l4_otgfsdev.c new file mode 100644 index 0000000000..52178fcde7 --- /dev/null +++ b/arch/arm/src/stm32l4/stm32l4_otgfsdev.c @@ -0,0 +1,5672 @@ +/**************************************************************************** + * arch/arm/src/stm32l4/stm32l4_otgfsdev.c + * + * Copyright (C) 2012-2014 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * dev@ziggurat29.com + * + * 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 +#include +#include + +#include +#include + +#include "chip.h" +#include "up_arch.h" +#include "up_internal.h" + +#include "stm32l4_otgfs.h" + +#if defined(CONFIG_USBDEV) && (defined(CONFIG_STM32L4_OTGFS)) + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ +/* Configuration ***************************************************************/ + +#ifndef CONFIG_USBDEV_EP0_MAXSIZE +# define CONFIG_USBDEV_EP0_MAXSIZE 64 +#endif + +#ifndef CONFIG_USBDEV_SETUP_MAXDATASIZE +# define CONFIG_USBDEV_SETUP_MAXDATASIZE CONFIG_USBDEV_EP0_MAXSIZE +#endif + +#ifndef CONFIG_USBDEV_MAXPOWER +# define CONFIG_USBDEV_MAXPOWER 100 /* mA */ +#endif + +/* There is 1.25Kb of FIFO memory. The default partitions this memory + * so that there is a TxFIFO allocated for each endpoint and with more + * memory provided for the common RxFIFO. A more knowledge-able + * configuration would not allocate any TxFIFO space to OUT endpoints. + */ + +#ifndef CONFIG_USBDEV_RXFIFO_SIZE +# define CONFIG_USBDEV_RXFIFO_SIZE 512 +#endif + +#ifndef CONFIG_USBDEV_EP0_TXFIFO_SIZE +# define CONFIG_USBDEV_EP0_TXFIFO_SIZE 192 +#endif + +#ifndef CONFIG_USBDEV_EP1_TXFIFO_SIZE +# define CONFIG_USBDEV_EP1_TXFIFO_SIZE 192 +#endif + +#ifndef CONFIG_USBDEV_EP2_TXFIFO_SIZE +# define CONFIG_USBDEV_EP2_TXFIFO_SIZE 192 +#endif + +#ifndef CONFIG_USBDEV_EP3_TXFIFO_SIZE +# define CONFIG_USBDEV_EP3_TXFIFO_SIZE 192 +#endif + +#if (CONFIG_USBDEV_RXFIFO_SIZE + CONFIG_USBDEV_EP0_TXFIFO_SIZE + \ + CONFIG_USBDEV_EP2_TXFIFO_SIZE + CONFIG_USBDEV_EP3_TXFIFO_SIZE) > 1280 +# error "FIFO allocations exceed FIFO memory size" +#endif + +/* The actual FIFO addresses that we use must be aligned to 4-byte boundaries; + * FIFO sizes must be provided in units of 32-bit words. + */ + +#define STM32_RXFIFO_BYTES ((CONFIG_USBDEV_RXFIFO_SIZE + 3) & ~3) +#define STM32_RXFIFO_WORDS ((CONFIG_USBDEV_RXFIFO_SIZE + 3) >> 2) + +#define STM32_EP0_TXFIFO_BYTES ((CONFIG_USBDEV_EP0_TXFIFO_SIZE + 3) & ~3) +#define STM32_EP0_TXFIFO_WORDS ((CONFIG_USBDEV_EP0_TXFIFO_SIZE + 3) >> 2) + +#if STM32_EP0_TXFIFO_WORDS < 16 || STM32_EP0_TXFIFO_WORDS > 256 +# error "CONFIG_USBDEV_EP0_TXFIFO_SIZE is out of range" +#endif + +#define STM32_EP1_TXFIFO_BYTES ((CONFIG_USBDEV_EP1_TXFIFO_SIZE + 3) & ~3) +#define STM32_EP1_TXFIFO_WORDS ((CONFIG_USBDEV_EP1_TXFIFO_SIZE + 3) >> 2) + +#if STM32_EP1_TXFIFO_WORDS < 16 +# error "CONFIG_USBDEV_EP1_TXFIFO_SIZE is out of range" +#endif + +#define STM32_EP2_TXFIFO_BYTES ((CONFIG_USBDEV_EP2_TXFIFO_SIZE + 3) & ~3) +#define STM32_EP2_TXFIFO_WORDS ((CONFIG_USBDEV_EP2_TXFIFO_SIZE + 3) >> 2) + +#if STM32_EP2_TXFIFO_WORDS < 16 +# error "CONFIG_USBDEV_EP2_TXFIFO_SIZE is out of range" +#endif + +#define STM32_EP3_TXFIFO_BYTES ((CONFIG_USBDEV_EP3_TXFIFO_SIZE + 3) & ~3) +#define STM32_EP3_TXFIFO_WORDS ((CONFIG_USBDEV_EP3_TXFIFO_SIZE + 3) >> 2) + +#if STM32_EP3_TXFIFO_WORDS < 16 +# error "CONFIG_USBDEV_EP3_TXFIFO_SIZE is out of range" +#endif + +/* Debug ***********************************************************************/ +/* Trace error codes */ + +#define STM32_TRACEERR_ALLOCFAIL 0x01 +#define STM32_TRACEERR_BADCLEARFEATURE 0x02 +#define STM32_TRACEERR_BADDEVGETSTATUS 0x03 +#define STM32_TRACEERR_BADEPNO 0x04 +#define STM32_TRACEERR_BADEPGETSTATUS 0x05 +#define STM32_TRACEERR_BADGETCONFIG 0x06 +#define STM32_TRACEERR_BADGETSETDESC 0x07 +#define STM32_TRACEERR_BADGETSTATUS 0x08 +#define STM32_TRACEERR_BADSETADDRESS 0x09 +#define STM32_TRACEERR_BADSETCONFIG 0x0a +#define STM32_TRACEERR_BADSETFEATURE 0x0b +#define STM32_TRACEERR_BADTESTMODE 0x0c +#define STM32_TRACEERR_BINDFAILED 0x0d +#define STM32_TRACEERR_DISPATCHSTALL 0x0e +#define STM32_TRACEERR_DRIVER 0x0f +#define STM32_TRACEERR_DRIVERREGISTERED 0x10 +#define STM32_TRACEERR_EP0NOSETUP 0x11 +#define STM32_TRACEERR_EP0SETUPSTALLED 0x12 +#define STM32_TRACEERR_EPINNULLPACKET 0x13 +#define STM32_TRACEERR_EPINUNEXPECTED 0x14 +#define STM32_TRACEERR_EPOUTNULLPACKET 0x15 +#define STM32_TRACEERR_EPOUTUNEXPECTED 0x16 +#define STM32_TRACEERR_INVALIDCTRLREQ 0x17 +#define STM32_TRACEERR_INVALIDPARMS 0x18 +#define STM32_TRACEERR_IRQREGISTRATION 0x19 +#define STM32_TRACEERR_NOEP 0x1a +#define STM32_TRACEERR_NOTCONFIGURED 0x1b +#define STM32_TRACEERR_EPOUTQEMPTY 0x1c +#define STM32_TRACEERR_EPINREQEMPTY 0x1d +#define STM32_TRACEERR_NOOUTSETUP 0x1e +#define STM32_TRACEERR_POLLTIMEOUT 0x1f + +/* Trace interrupt codes */ + +#define STM32_TRACEINTID_USB 1 /* USB Interrupt entry/exit */ +#define STM32_TRACEINTID_INTPENDING 2 /* On each pass through the loop */ + +#define STM32_TRACEINTID_EPOUT (10 + 0) /* First level interrupt decode */ +#define STM32_TRACEINTID_EPIN (10 + 1) +#define STM32_TRACEINTID_MISMATCH (10 + 2) +#define STM32_TRACEINTID_WAKEUP (10 + 3) +#define STM32_TRACEINTID_SUSPEND (10 + 4) +#define STM32_TRACEINTID_SOF (10 + 5) +#define STM32_TRACEINTID_RXFIFO (10 + 6) +#define STM32_TRACEINTID_DEVRESET (10 + 7) +#define STM32_TRACEINTID_ENUMDNE (10 + 8) +#define STM32_TRACEINTID_IISOIXFR (10 + 9) +#define STM32_TRACEINTID_IISOOXFR (10 + 10) +#define STM32_TRACEINTID_SRQ (10 + 11) +#define STM32_TRACEINTID_OTG (10 + 12) + +#define STM32_TRACEINTID_EPOUT_XFRC (40 + 0) /* EPOUT second level decode */ +#define STM32_TRACEINTID_EPOUT_EPDISD (40 + 1) +#define STM32_TRACEINTID_EPOUT_SETUP (40 + 2) +#define STM32_TRACEINTID_DISPATCH (40 + 3) + +#define STM32_TRACEINTID_GETSTATUS (50 + 0) /* EPOUT third level decode */ +#define STM32_TRACEINTID_EPGETSTATUS (50 + 1) +#define STM32_TRACEINTID_DEVGETSTATUS (50 + 2) +#define STM32_TRACEINTID_IFGETSTATUS (50 + 3) +#define STM32_TRACEINTID_CLEARFEATURE (50 + 4) +#define STM32_TRACEINTID_SETFEATURE (50 + 5) +#define STM32_TRACEINTID_SETADDRESS (50 + 6) +#define STM32_TRACEINTID_GETSETDESC (50 + 7) +#define STM32_TRACEINTID_GETCONFIG (50 + 8) +#define STM32_TRACEINTID_SETCONFIG (50 + 9) +#define STM32_TRACEINTID_GETSETIF (50 + 10) +#define STM32_TRACEINTID_SYNCHFRAME (50 + 11) + +#define STM32_TRACEINTID_EPIN_XFRC (70 + 0) /* EPIN second level decode */ +#define STM32_TRACEINTID_EPIN_TOC (70 + 1) +#define STM32_TRACEINTID_EPIN_ITTXFE (70 + 2) +#define STM32_TRACEINTID_EPIN_EPDISD (70 + 3) +#define STM32_TRACEINTID_EPIN_TXFE (70 + 4) + +#define STM32_TRACEINTID_EPIN_EMPWAIT (80 + 0) /* EPIN second level decode */ + +#define STM32_TRACEINTID_OUTNAK (90 + 0) /* RXFLVL second level decode */ +#define STM32_TRACEINTID_OUTRECVD (90 + 1) +#define STM32_TRACEINTID_OUTDONE (90 + 2) +#define STM32_TRACEINTID_SETUPDONE (90 + 3) +#define STM32_TRACEINTID_SETUPRECVD (90 + 4) + +/* Endpoints ******************************************************************/ + +/* Number of endpoints */ +//XXX I think this needs to be 6 for the 'L4 +#define STM32_NENDPOINTS (4) /* ep0-3 x 2 for IN and OUT */ + +/* Odd physical endpoint numbers are IN; even are OUT */ + +#define STM32_EPPHYIN2LOG(epphy) ((uint8_t)(epphy)|USB_DIR_IN) +#define STM32_EPPHYOUT2LOG(epphy) ((uint8_t)(epphy)|USB_DIR_OUT) + +/* Endpoint 0 */ + +#define EP0 (0) + +/* The set of all endpoints available to the class implementation (1-3) */ + +#define STM32_EP_AVAILABLE (0x0e) /* All available endpoints */ + +/* Maximum packet sizes for full speed endpoints */ + +#define STM32_MAXPACKET (64) /* Max packet size (1-64) */ + +/* Delays **********************************************************************/ + +#define STM32_READY_DELAY 200000 +#define STM32_FLUSH_DELAY 200000 + +/* Request queue operations ****************************************************/ + +#define stm32_rqempty(ep) ((ep)->head == NULL) +#define stm32_rqpeek(ep) ((ep)->head) + +/* Standard stuff **************************************************************/ + +#ifndef MIN +# define MIN(a,b) ((a) < (b) ? (a) : (b)) +#endif + +#ifndef MAX +# define MAX(a,b) ((a) > (b) ? (a) : (b)) +#endif + +/**************************************************************************** + * Private Types + ****************************************************************************/ + +/* Overall device state */ + +enum stm32_devstate_e +{ + DEVSTATE_DEFAULT = 0, /* Power-up, unconfigured state. This state simply + * means that the device is not yet been given an + * address. + * SET: At initialization, uninitialization, + * reset, and whenever the device address + * is set to zero + * TESTED: Never + */ + DEVSTATE_ADDRESSED, /* Device address has been assigned, not no + * configuration has yet been selected. + * SET: When either a non-zero device address + * is first assigned or when the device + * is unconfigured (with configuration == 0) + * TESTED: never + */ + DEVSTATE_CONFIGURED, /* Address assigned and configured: + * SET: When the device has been addressed and + * an non-zero configuration has been selected. + * TESTED: In many places to assure that the USB device + * has been properly configured by the host. + */ +}; + +/* Endpoint 0 states */ + +enum stm32_ep0state_e +{ + EP0STATE_IDLE = 0, /* Idle State, leave on receiving a SETUP packet or + * epsubmit: + * SET: In stm32_epin() and stm32_epout() when + * we revert from request processing to + * SETUP processing. + * TESTED: Never + */ + EP0STATE_SETUP_OUT, /* OUT SETUP packet received. Waiting for the DATA + * OUT phase of SETUP Packet to complete before + * processing a SETUP command (without a USB request): + * SET: Set in stm32_rxinterrupt() when SETUP OUT + * packet is received. + * TESTED: In stm32_ep0out_receive() + */ + EP0STATE_SETUP_READY, /* IN SETUP packet received -OR- OUT SETUP packet and + * accompanying data have been received. Processing + * of SETUP command will happen soon. + * SET: (1) stm32_ep0out_receive() when the OUT + * SETUP data phase completes, or (2) + * stm32_rxinterrupt() when an IN SETUP is + * packet received. + * TESTED: Tested in stm32_epout_interrupt() when + * SETUP phase is done to see if the SETUP + * command is ready to be processed. Also + * tested in stm32_ep0out_setup() just to + * double-check that we have a SETUP request + * and any accompanying data. + */ + EP0STATE_SETUP_PROCESS, /* SETUP Packet is being processed by stm32_ep0out_setup(): + * SET: When SETUP packet received in EP0 OUT + * TESTED: Never + */ + EP0STATE_SETUPRESPONSE, /* Short SETUP response write (without a USB request): + * SET: When SETUP response is sent by + * stm32_ep0in_setupresponse() + * TESTED: Never + */ + EP0STATE_DATA_IN, /* Waiting for data out stage (with a USB request): + * SET: In stm32_epin_request() when a write + * request is processed on EP0. + * TESTED: In stm32_epin() to see if we should + * revert to SETUP processing. + */ + EP0STATE_DATA_OUT /* Waiting for data in phase to complete ( with a + * USB request) + * SET: In stm32_epout_request() when a read + * request is processed on EP0. + * TESTED: In stm32_epout() to see if we should + * revert to SETUP processing + */ +}; + +/* Parsed control request */ + +struct stm32_ctrlreq_s +{ + uint8_t type; + uint8_t req; + uint16_t value; + uint16_t index; + uint16_t len; +}; + +/* A container for a request so that the request may be retained in a list */ + +struct stm32_req_s +{ + struct usbdev_req_s req; /* Standard USB request */ + struct stm32_req_s *flink; /* Supports a singly linked list */ +}; + +/* This is the internal representation of an endpoint */ + +struct stm32_ep_s +{ + /* Common endpoint fields. This must be the first thing defined in the + * structure so that it is possible to simply cast from struct usbdev_ep_s + * to struct stm32_ep_s. + */ + + struct usbdev_ep_s ep; /* Standard endpoint structure */ + + /* STM32-specific fields */ + + struct stm32_usbdev_s *dev; /* Reference to private driver data */ + struct stm32_req_s *head; /* Request list for this endpoint */ + struct stm32_req_s *tail; + uint8_t epphy; /* Physical EP address */ + uint8_t eptype:2; /* Endpoint type */ + uint8_t active:1; /* 1: A request is being processed */ + uint8_t stalled:1; /* 1: Endpoint is stalled */ + uint8_t isin:1; /* 1: IN Endpoint */ + uint8_t odd:1; /* 1: Odd frame */ + uint8_t zlp:1; /* 1: Transmit a zero-length-packet (IN EPs only) */ +}; + +/* This structure retains the state of the USB device controller */ + +struct stm32_usbdev_s +{ + /* Common device fields. This must be the first thing defined in the + * structure so that it is possible to simply cast from struct usbdev_s + * to struct stm32_usbdev_s. + */ + + struct usbdev_s usbdev; + + /* The bound device class driver */ + + struct usbdevclass_driver_s *driver; + + /* STM32-specific fields */ + + uint8_t stalled:1; /* 1: Protocol stalled */ + uint8_t selfpowered:1; /* 1: Device is self powered */ + uint8_t addressed:1; /* 1: Peripheral address has been set */ + uint8_t configured:1; /* 1: Class driver has been configured */ + uint8_t wakeup:1; /* 1: Device remote wake-up */ + uint8_t dotest:1; /* 1: Test mode selected */ + + uint8_t devstate:4; /* See enum stm32_devstate_e */ + uint8_t ep0state:4; /* See enum stm32_ep0state_e */ + uint8_t testmode:4; /* Selected test mode */ + uint8_t epavail[2]; /* Bitset of available OUT/IN endpoints */ + + /* E0 SETUP data buffering. + * + * ctrlreq: + * The 8-byte SETUP request is received on the EP0 OUT endpoint and is + * saved. + * + * ep0data + * For OUT SETUP requests, the SETUP data phase must also complete before + * the SETUP command can be processed. The pack receipt logic will save + * the accompanying EP0 IN data in ep0data[] before the SETUP command is + * processed. + * + * For IN SETUP requests, the DATA phase will occur AFTER the SETUP + * control request is processed. In that case, ep0data[] may be used as + * the response buffer. + * + * ep0datlen + * Length of OUT DATA received in ep0data[] (Not used with OUT data) + */ + + struct usb_ctrlreq_s ctrlreq; + uint8_t ep0data[CONFIG_USBDEV_SETUP_MAXDATASIZE]; + uint16_t ep0datlen; + + /* The endpoint lists */ + + struct stm32_ep_s epin[STM32_NENDPOINTS]; + struct stm32_ep_s epout[STM32_NENDPOINTS]; +}; + +/**************************************************************************** + * Private Function Prototypes + ****************************************************************************/ + +/* Register operations ********************************************************/ + +#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG) +static uint32_t stm32_getreg(uint32_t addr); +static void stm32_putreg(uint32_t val, uint32_t addr); +#else +# define stm32_getreg(addr) getreg32(addr) +# define stm32_putreg(val,addr) putreg32(val,addr) +#endif + +/* Request queue operations ****************************************************/ + +static FAR struct stm32_req_s *stm32_req_remfirst(FAR struct stm32_ep_s *privep); +static bool stm32_req_addlast(FAR struct stm32_ep_s *privep, + FAR struct stm32_req_s *req); + +/* Low level data transfers and request operations *****************************/ +/* Special endpoint 0 data transfer logic */ + +static void stm32_ep0in_setupresponse(FAR struct stm32_usbdev_s *priv, + FAR uint8_t *data, uint32_t nbytes); +static inline void stm32_ep0in_transmitzlp(FAR struct stm32_usbdev_s *priv); +static void stm32_ep0in_activate(void); + +static void stm32_ep0out_ctrlsetup(FAR struct stm32_usbdev_s *priv); + +/* IN request and TxFIFO handling */ + +static void stm32_txfifo_write(FAR struct stm32_ep_s *privep, + FAR uint8_t *buf, int nbytes); +static void stm32_epin_transfer(FAR struct stm32_ep_s *privep, + FAR uint8_t *buf, int nbytes); +static void stm32_epin_request(FAR struct stm32_usbdev_s *priv, + FAR struct stm32_ep_s *privep); + +/* OUT request and RxFIFO handling */ + +static void stm32_rxfifo_read(FAR struct stm32_ep_s *privep, + FAR uint8_t *dest, uint16_t len); +static void stm32_rxfifo_discard(FAR struct stm32_ep_s *privep, int len); +static void stm32_epout_complete(FAR struct stm32_usbdev_s *priv, + FAR struct stm32_ep_s *privep); +static inline void stm32_ep0out_receive(FAR struct stm32_ep_s *privep, int bcnt); +static inline void stm32_epout_receive(FAR struct stm32_ep_s *privep, int bcnt); +static void stm32_epout_request(FAR struct stm32_usbdev_s *priv, + FAR struct stm32_ep_s *privep); + +/* General request handling */ + +static void stm32_ep_flush(FAR struct stm32_ep_s *privep); +static void stm32_req_complete(FAR struct stm32_ep_s *privep, + int16_t result); +static void stm32_req_cancel(FAR struct stm32_ep_s *privep, + int16_t status); + +/* Interrupt handling **********************************************************/ + +static struct stm32_ep_s *stm32_ep_findbyaddr(struct stm32_usbdev_s *priv, + uint16_t eplog); +static int stm32_req_dispatch(FAR struct stm32_usbdev_s *priv, + FAR const struct usb_ctrlreq_s *ctrl); +static void stm32_usbreset(FAR struct stm32_usbdev_s *priv); + +/* Second level OUT endpoint interrupt processing */ + +static inline void stm32_ep0out_testmode(FAR struct stm32_usbdev_s *priv, + uint16_t index); +static inline void stm32_ep0out_stdrequest(struct stm32_usbdev_s *priv, + FAR struct stm32_ctrlreq_s *ctrlreq); +static inline void stm32_ep0out_setup(struct stm32_usbdev_s *priv); +static inline void stm32_epout(FAR struct stm32_usbdev_s *priv, + uint8_t epno); +static inline void stm32_epout_interrupt(FAR struct stm32_usbdev_s *priv); + +/* Second level IN endpoint interrupt processing */ + +static inline void stm32_epin_runtestmode(FAR struct stm32_usbdev_s *priv); +static inline void stm32_epin(FAR struct stm32_usbdev_s *priv, uint8_t epno); +static inline void stm32_epin_txfifoempty(FAR struct stm32_usbdev_s *priv, int epno); +static inline void stm32_epin_interrupt(FAR struct stm32_usbdev_s *priv); + +/* Other second level interrupt processing */ + +static inline void stm32_resumeinterrupt(FAR struct stm32_usbdev_s *priv); +static inline void stm32_suspendinterrupt(FAR struct stm32_usbdev_s *priv); +static inline void stm32_rxinterrupt(FAR struct stm32_usbdev_s *priv); +static inline void stm32_enuminterrupt(FAR struct stm32_usbdev_s *priv); +#ifdef CONFIG_USBDEV_ISOCHRONOUS +static inline void stm32_isocininterrupt(FAR struct stm32_usbdev_s *priv); +static inline void stm32_isocoutinterrupt(FAR struct stm32_usbdev_s *priv); +#endif +#ifdef CONFIG_USBDEV_VBUSSENSING +static inline void stm32_sessioninterrupt(FAR struct stm32_usbdev_s *priv); +static inline void stm32_otginterrupt(FAR struct stm32_usbdev_s *priv); +#endif + +/* First level interrupt processing */ + +static int stm32_usbinterrupt(int irq, FAR void *context); + +/* Endpoint operations *********************************************************/ +/* Global OUT NAK controls */ + +static void stm32_enablegonak(FAR struct stm32_ep_s *privep); +static void stm32_disablegonak(FAR struct stm32_ep_s *privep); + +/* Endpoint configuration */ + +static int stm32_epout_configure(FAR struct stm32_ep_s *privep, + uint8_t eptype, uint16_t maxpacket); +static int stm32_epin_configure(FAR struct stm32_ep_s *privep, + uint8_t eptype, uint16_t maxpacket); +static int stm32_ep_configure(FAR struct usbdev_ep_s *ep, + FAR const struct usb_epdesc_s *desc, bool last); +static void stm32_ep0_configure(FAR struct stm32_usbdev_s *priv); + +/* Endpoint disable */ + +static void stm32_epout_disable(FAR struct stm32_ep_s *privep); +static void stm32_epin_disable(FAR struct stm32_ep_s *privep); +static int stm32_ep_disable(FAR struct usbdev_ep_s *ep); + +/* Endpoint request management */ + +static FAR struct usbdev_req_s *stm32_ep_allocreq(FAR struct usbdev_ep_s *ep); +static void stm32_ep_freereq(FAR struct usbdev_ep_s *ep, + FAR struct usbdev_req_s *); + +/* Endpoint buffer management */ + +#ifdef CONFIG_USBDEV_DMA +static void *stm32_ep_allocbuffer(FAR struct usbdev_ep_s *ep, unsigned bytes); +static void stm32_ep_freebuffer(FAR struct usbdev_ep_s *ep, FAR void *buf); +#endif + +/* Endpoint request submission */ + +static int stm32_ep_submit(FAR struct usbdev_ep_s *ep, + struct usbdev_req_s *req); + +/* Endpoint request cancellation */ + +static int stm32_ep_cancel(FAR struct usbdev_ep_s *ep, + struct usbdev_req_s *req); + +/* Stall handling */ + +static int stm32_epout_setstall(FAR struct stm32_ep_s *privep); +static int stm32_epin_setstall(FAR struct stm32_ep_s *privep); +static int stm32_ep_setstall(FAR struct stm32_ep_s *privep); +static int stm32_ep_clrstall(FAR struct stm32_ep_s *privep); +static int stm32_ep_stall(FAR struct usbdev_ep_s *ep, bool resume); +static void stm32_ep0_stall(FAR struct stm32_usbdev_s *priv); + +/* Endpoint allocation */ + +static FAR struct usbdev_ep_s *stm32_ep_alloc(FAR struct usbdev_s *dev, + uint8_t epno, bool in, uint8_t eptype); +static void stm32_ep_free(FAR struct usbdev_s *dev, + FAR struct usbdev_ep_s *ep); + +/* USB device controller operations ********************************************/ + +static int stm32_getframe(struct usbdev_s *dev); +static int stm32_wakeup(struct usbdev_s *dev); +static int stm32_selfpowered(struct usbdev_s *dev, bool selfpowered); +static int stm32_pullup(struct usbdev_s *dev, bool enable); +static void stm32_setaddress(struct stm32_usbdev_s *priv, + uint16_t address); +static int stm32_txfifo_flush(uint32_t txfnum); +static int stm32_rxfifo_flush(void); + +/* Initialization **************************************************************/ + +static void stm32_swinitialize(FAR struct stm32_usbdev_s *priv); +static void stm32_hwinitialize(FAR struct stm32_usbdev_s *priv); + +/**************************************************************************** + * Private Data + ****************************************************************************/ +/* Since there is only a single USB interface, all status information can be + * be simply retained in a single global instance. + */ + +static struct stm32_usbdev_s g_otgfsdev; + +static const struct usbdev_epops_s g_epops = +{ + .configure = stm32_ep_configure, + .disable = stm32_ep_disable, + .allocreq = stm32_ep_allocreq, + .freereq = stm32_ep_freereq, +#ifdef CONFIG_USBDEV_DMA + .allocbuffer = stm32_ep_allocbuffer, + .freebuffer = stm32_ep_freebuffer, +#endif + .submit = stm32_ep_submit, + .cancel = stm32_ep_cancel, + .stall = stm32_ep_stall, +}; + +static const struct usbdev_ops_s g_devops = +{ + .allocep = stm32_ep_alloc, + .freeep = stm32_ep_free, + .getframe = stm32_getframe, + .wakeup = stm32_wakeup, + .selfpowered = stm32_selfpowered, + .pullup = stm32_pullup, +}; + +/* Device error strings that may be enabled for more descriptive USB trace + * output. + */ + +#ifdef CONFIG_USBDEV_TRACE_STRINGS +const struct trace_msg_t g_usb_trace_strings_deverror[] = +{ + TRACE_STR(STM32_TRACEERR_ALLOCFAIL ), + TRACE_STR(STM32_TRACEERR_BADCLEARFEATURE ), + TRACE_STR(STM32_TRACEERR_BADDEVGETSTATUS ), + TRACE_STR(STM32_TRACEERR_BADEPNO ), + TRACE_STR(STM32_TRACEERR_BADEPGETSTATUS ), + TRACE_STR(STM32_TRACEERR_BADGETCONFIG ), + TRACE_STR(STM32_TRACEERR_BADGETSETDESC ), + TRACE_STR(STM32_TRACEERR_BADGETSTATUS ), + TRACE_STR(STM32_TRACEERR_BADSETADDRESS ), + TRACE_STR(STM32_TRACEERR_BADSETCONFIG ), + TRACE_STR(STM32_TRACEERR_BADSETFEATURE ), + TRACE_STR(STM32_TRACEERR_BADTESTMODE ), + TRACE_STR(STM32_TRACEERR_BINDFAILED ), + TRACE_STR(STM32_TRACEERR_DISPATCHSTALL ), + TRACE_STR(STM32_TRACEERR_DRIVER ), + TRACE_STR(STM32_TRACEERR_DRIVERREGISTERED), + TRACE_STR(STM32_TRACEERR_EP0NOSETUP ), + TRACE_STR(STM32_TRACEERR_EP0SETUPSTALLED ), + TRACE_STR(STM32_TRACEERR_EPINNULLPACKET ), + TRACE_STR(STM32_TRACEERR_EPINUNEXPECTED ), + TRACE_STR(STM32_TRACEERR_EPOUTNULLPACKET ), + TRACE_STR(STM32_TRACEERR_EPOUTUNEXPECTED ), + TRACE_STR(STM32_TRACEERR_INVALIDCTRLREQ ), + TRACE_STR(STM32_TRACEERR_INVALIDPARMS ), + TRACE_STR(STM32_TRACEERR_IRQREGISTRATION ), + TRACE_STR(STM32_TRACEERR_NOEP ), + TRACE_STR(STM32_TRACEERR_NOTCONFIGURED ), + TRACE_STR(STM32_TRACEERR_EPOUTQEMPTY ), + TRACE_STR(STM32_TRACEERR_EPINREQEMPTY ), + TRACE_STR(STM32_TRACEERR_NOOUTSETUP ), + TRACE_STR(STM32_TRACEERR_POLLTIMEOUT ), + TRACE_STR_END +}; +#endif + +/* Interrupt event strings that may be enabled for more descriptive USB trace + * output. + */ + +#ifdef CONFIG_USBDEV_TRACE_STRINGS +const struct trace_msg_t g_usb_trace_strings_intdecode[] = +{ + TRACE_STR(STM32_TRACEINTID_USB ), + TRACE_STR(STM32_TRACEINTID_INTPENDING ), + TRACE_STR(STM32_TRACEINTID_EPOUT ), + TRACE_STR(STM32_TRACEINTID_EPIN ), + TRACE_STR(STM32_TRACEINTID_MISMATCH ), + TRACE_STR(STM32_TRACEINTID_WAKEUP ), + TRACE_STR(STM32_TRACEINTID_SUSPEND ), + TRACE_STR(STM32_TRACEINTID_SOF ), + TRACE_STR(STM32_TRACEINTID_RXFIFO ), + TRACE_STR(STM32_TRACEINTID_DEVRESET ), + TRACE_STR(STM32_TRACEINTID_ENUMDNE ), + TRACE_STR(STM32_TRACEINTID_IISOIXFR ), + TRACE_STR(STM32_TRACEINTID_IISOOXFR ), + TRACE_STR(STM32_TRACEINTID_SRQ ), + TRACE_STR(STM32_TRACEINTID_OTG ), + TRACE_STR(STM32_TRACEINTID_EPOUT_XFRC ), + TRACE_STR(STM32_TRACEINTID_EPOUT_EPDISD), + TRACE_STR(STM32_TRACEINTID_EPOUT_SETUP ), + TRACE_STR(STM32_TRACEINTID_DISPATCH ), + TRACE_STR(STM32_TRACEINTID_GETSTATUS ), + TRACE_STR(STM32_TRACEINTID_EPGETSTATUS ), + TRACE_STR(STM32_TRACEINTID_DEVGETSTATUS), + TRACE_STR(STM32_TRACEINTID_IFGETSTATUS ), + TRACE_STR(STM32_TRACEINTID_CLEARFEATURE), + TRACE_STR(STM32_TRACEINTID_SETFEATURE ), + TRACE_STR(STM32_TRACEINTID_SETADDRESS ), + TRACE_STR(STM32_TRACEINTID_GETSETDESC ), + TRACE_STR(STM32_TRACEINTID_GETCONFIG ), + TRACE_STR(STM32_TRACEINTID_SETCONFIG ), + TRACE_STR(STM32_TRACEINTID_GETSETIF ), + TRACE_STR(STM32_TRACEINTID_SYNCHFRAME ), + TRACE_STR(STM32_TRACEINTID_EPIN_XFRC ), + TRACE_STR(STM32_TRACEINTID_EPIN_TOC ), + TRACE_STR(STM32_TRACEINTID_EPIN_ITTXFE ), + TRACE_STR(STM32_TRACEINTID_EPIN_EPDISD ), + TRACE_STR(STM32_TRACEINTID_EPIN_TXFE ), + TRACE_STR(STM32_TRACEINTID_EPIN_EMPWAIT), + TRACE_STR(STM32_TRACEINTID_OUTNAK ), + TRACE_STR(STM32_TRACEINTID_OUTRECVD ), + TRACE_STR(STM32_TRACEINTID_OUTDONE ), + TRACE_STR(STM32_TRACEINTID_SETUPDONE ), + TRACE_STR(STM32_TRACEINTID_SETUPRECVD ), + TRACE_STR_END +}; +#endif + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: stm32_getreg + * + * Description: + * Get the contents of an STM32 register + * + ****************************************************************************/ + +#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG) +static uint32_t stm32_getreg(uint32_t addr) +{ + static uint32_t prevaddr = 0; + static uint32_t preval = 0; + static uint32_t count = 0; + + /* Read the value from the register */ + + uint32_t val = getreg32(addr); + + /* Is this the same value that we read from the same register last time? Are + * we polling the register? If so, suppress some of the output. + */ + + if (addr == prevaddr && val == preval) + { + if (count == 0xffffffff || ++count > 3) + { + if (count == 4) + { + lldbg("...\n"); + } + + return val; + } + } + + /* No this is a new address or value */ + + else + { + /* Did we print "..." for the previous value? */ + + if (count > 3) + { + /* Yes.. then show how many times the value repeated */ + + lldbg("[repeats %d more times]\n", count-3); + } + + /* Save the new address, value, and count */ + + prevaddr = addr; + preval = val; + count = 1; + } + + /* Show the register value read */ + + lldbg("%08x->%08x\n", addr, val); + return val; +} +#endif + +/**************************************************************************** + * Name: stm32_putreg + * + * Description: + * Set the contents of an STM32 register to a value + * + ****************************************************************************/ + +#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG) +static void stm32_putreg(uint32_t val, uint32_t addr) +{ + /* Show the register value being written */ + + lldbg("%08x<-%08x\n", addr, val); + + /* Write the value */ + + putreg32(val, addr); +} +#endif + +/**************************************************************************** + * Name: stm32_req_remfirst + * + * Description: + * Remove a request from the head of an endpoint request queue + * + ****************************************************************************/ + +static FAR struct stm32_req_s *stm32_req_remfirst(FAR struct stm32_ep_s *privep) +{ + FAR struct stm32_req_s *ret = privep->head; + + if (ret) + { + privep->head = ret->flink; + if (!privep->head) + { + privep->tail = NULL; + } + + ret->flink = NULL; + } + + return ret; +} + +/**************************************************************************** + * Name: stm32_req_addlast + * + * Description: + * Add a request to the end of an endpoint request queue + * + ****************************************************************************/ + +static bool stm32_req_addlast(FAR struct stm32_ep_s *privep, + FAR struct stm32_req_s *req) +{ + bool is_empty = !privep->head; + + req->flink = NULL; + if (is_empty) + { + privep->head = req; + privep->tail = req; + } + else + { + privep->tail->flink = req; + privep->tail = req; + } + return is_empty; +} + +/**************************************************************************** + * Name: stm32_ep0in_setupresponse + * + * Description: + * Schedule a short transfer on Endpoint 0 (IN or OUT) + * + ****************************************************************************/ + +static void stm32_ep0in_setupresponse(FAR struct stm32_usbdev_s *priv, + FAR uint8_t *buf, uint32_t nbytes) +{ + stm32_epin_transfer(&priv->epin[EP0], buf, nbytes); + priv->ep0state = EP0STATE_SETUPRESPONSE; + stm32_ep0out_ctrlsetup(priv); +} + +/**************************************************************************** + * Name: stm32_ep0in_transmitzlp + * + * Description: + * Send a zero length packet (ZLP) on endpoint 0 IN + * + ****************************************************************************/ + +static inline void stm32_ep0in_transmitzlp(FAR struct stm32_usbdev_s *priv) +{ + stm32_ep0in_setupresponse(priv, NULL, 0); +} + +/**************************************************************************** + * Name: stm32_ep0in_activate + * + * Description: + * Activate the endpoint 0 IN endpoint. + * + ****************************************************************************/ + +static void stm32_ep0in_activate(void) +{ + uint32_t regval; + + /* Set the max packet size of the IN EP. */ + + regval = stm32_getreg(STM32_OTGFS_DIEPCTL0); + regval &= ~OTGFS_DIEPCTL0_MPSIZ_MASK; + +#if CONFIG_USBDEV_EP0_MAXSIZE == 8 + regval |= OTGFS_DIEPCTL0_MPSIZ_8; +#elif CONFIG_USBDEV_EP0_MAXSIZE == 16 + regval |= OTGFS_DIEPCTL0_MPSIZ_16; +#elif CONFIG_USBDEV_EP0_MAXSIZE == 32 + regval |= OTGFS_DIEPCTL0_MPSIZ_32; +#elif CONFIG_USBDEV_EP0_MAXSIZE == 64 + regval |= OTGFS_DIEPCTL0_MPSIZ_64; +#else +# error "Unsupported value of CONFIG_USBDEV_EP0_MAXSIZE" +#endif + + stm32_putreg(regval, STM32_OTGFS_DIEPCTL0); + + /* Clear global IN NAK */ + + regval = stm32_getreg(STM32_OTGFS_DCTL); + regval |= OTGFS_DCTL_CGINAK; + stm32_putreg(regval, STM32_OTGFS_DCTL); +} + +/**************************************************************************** + * Name: stm32_ep0out_ctrlsetup + * + * Description: + * Setup to receive a SETUP packet. + * + ****************************************************************************/ + +static void stm32_ep0out_ctrlsetup(FAR struct stm32_usbdev_s *priv) +{ + uint32_t regval; + + /* Setup the hardware to perform the SETUP transfer */ + + regval = (USB_SIZEOF_CTRLREQ * 3 << OTGFS_DOEPTSIZ0_XFRSIZ_SHIFT) | + (OTGFS_DOEPTSIZ0_PKTCNT) | + (3 << OTGFS_DOEPTSIZ0_STUPCNT_SHIFT); + stm32_putreg(regval, STM32_OTGFS_DOEPTSIZ0); + + /* Then clear NAKing and enable the transfer */ + + regval = stm32_getreg(STM32_OTGFS_DOEPCTL0); + regval |= (OTGFS_DOEPCTL0_CNAK | OTGFS_DOEPCTL0_EPENA); + stm32_putreg(regval, STM32_OTGFS_DOEPCTL0); +} + +/**************************************************************************** + * Name: stm32_txfifo_write + * + * Description: + * Send data to the endpoint's TxFIFO. + * + ****************************************************************************/ + +static void stm32_txfifo_write(FAR struct stm32_ep_s *privep, + FAR uint8_t *buf, int nbytes) +{ + uint32_t regaddr; + uint32_t regval; + int nwords; + int i; + + /* Convert the number of bytes to words */ + + nwords = (nbytes + 3) >> 2; + + /* Get the TxFIFO for this endpoint (same as the endpoint number) */ + + regaddr = STM32_OTGFS_DFIFO_DEP(privep->epphy); + + /* Then transfer each word to the TxFIFO */ + + for (i = 0; i < nwords; i++) + { + /* Read four bytes from the source buffer (to avoid unaligned accesses) + * and pack these into one 32-bit word (little endian). + */ + + regval = (uint32_t)*buf++; + regval |= ((uint32_t)*buf++) << 8; + regval |= ((uint32_t)*buf++) << 16; + regval |= ((uint32_t)*buf++) << 24; + + /* Then write the packet data to the TxFIFO */ + + stm32_putreg(regval, regaddr); + } +} + +/**************************************************************************** + * Name: stm32_epin_transfer + * + * Description: + * Start the Tx data transfer + * + ****************************************************************************/ + +static void stm32_epin_transfer(FAR struct stm32_ep_s *privep, + FAR uint8_t *buf, int nbytes) +{ + uint32_t pktcnt; + uint32_t regval; + + /* Read the DIEPSIZx register */ + + regval = stm32_getreg(STM32_OTGFS_DIEPTSIZ(privep->epphy)); + + /* Clear the XFRSIZ, PKTCNT, and MCNT field of the DIEPSIZx register */ + + regval &= ~(OTGFS_DIEPTSIZ_XFRSIZ_MASK | OTGFS_DIEPTSIZ_PKTCNT_MASK | + OTGFS_DIEPTSIZ_MCNT_MASK); + + /* Are we sending a zero length packet (ZLP) */ + + if (nbytes == 0) + { + /* Yes.. leave the transfer size at zero and set the packet count to 1 */ + + pktcnt = 1; + } + else + { + /* No.. Program the transfer size and packet count . First calculate: + * + * xfrsize = The total number of bytes to be sent. + * pktcnt = the number of packets (of maxpacket bytes) required to + * perform the transfer. + */ + + pktcnt = ((uint32_t)nbytes + (privep->ep.maxpacket - 1)) / privep->ep.maxpacket; + } + + /* Set the XFRSIZ and PKTCNT */ + + regval |= (pktcnt << OTGFS_DIEPTSIZ_PKTCNT_SHIFT); + regval |= ((uint32_t)nbytes << OTGFS_DIEPTSIZ_XFRSIZ_SHIFT); + + /* If this is an isochronous endpoint, then set the multi-count field to + * the PKTCNT as well. + */ + + if (privep->eptype == USB_EP_ATTR_XFER_ISOC) + { + regval |= (pktcnt << OTGFS_DIEPTSIZ_MCNT_SHIFT); + } + + /* Save DIEPSIZx register value */ + + stm32_putreg(regval, STM32_OTGFS_DIEPTSIZ(privep->epphy)); + + /* Read the DIEPCTLx register */ + + regval = stm32_getreg(STM32_OTGFS_DIEPCTL(privep->epphy)); + + /* If this is an isochronous endpoint, then set the even/odd frame bit + * the DIEPCTLx register. + */ + + if (privep->eptype == USB_EP_ATTR_XFER_ISOC) + { + /* Check bit 0 of the frame number of the received SOF and set the + * even/odd frame to match. + */ + + uint32_t status = stm32_getreg(STM32_OTGFS_DSTS); + if ((status & OTGFS_DSTS_SOFFN0) == OTGFS_DSTS_SOFFN_EVEN) + { + regval |= OTGFS_DIEPCTL_SEVNFRM; + } + else + { + regval |= OTGFS_DIEPCTL_SODDFRM; + } + } + + /* EP enable, IN data in FIFO */ + + regval &= ~OTGFS_DIEPCTL_EPDIS; + regval |= (OTGFS_DIEPCTL_CNAK | OTGFS_DIEPCTL_EPENA); + stm32_putreg(regval, STM32_OTGFS_DIEPCTL(privep->epphy)); + + /* Transfer the data to the TxFIFO. At this point, the caller has already + * assured that there is sufficient space in the TxFIFO to hold the transfer + * we can just blindly continue. + */ + + stm32_txfifo_write(privep, buf, nbytes); +} + +/**************************************************************************** + * Name: stm32_epin_request + * + * Description: + * Begin or continue write request processing. + * + ****************************************************************************/ + +static void stm32_epin_request(FAR struct stm32_usbdev_s *priv, + FAR struct stm32_ep_s *privep) +{ + struct stm32_req_s *privreq; + uint32_t regaddr; + uint32_t regval; + uint8_t *buf; + int nbytes; + int nwords; + int bytesleft; + + /* We get here in one of four possible ways. From three interrupting + * events: + * + * 1. From stm32_epin as part of the transfer complete interrupt processing + * This interrupt indicates that the last transfer has completed. + * 2. As part of the ITTXFE interrupt processing. That interrupt indicates + * that an IN token was received when the associated TxFIFO was empty. + * 3. From stm32_epin_txfifoempty as part of the TXFE interrupt processing. + * The TXFE interrupt is only enabled when the TxFIFO is full and the + * software must wait for space to become available in the TxFIFO. + * + * And this function may be called immediately when the write request is + * queue to start up the next transaction. + * + * 4. From stm32_ep_submit when a new write request is received WHILE the + * endpoint is not active (privep->active == false). + */ + + /* Check the request from the head of the endpoint request queue */ + + privreq = stm32_rqpeek(privep); + if (!privreq) + { + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_EPINREQEMPTY), privep->epphy); + + /* There is no TX transfer in progress and no new pending TX + * requests to send. To stop transmitting any data on a particular + * IN endpoint, the application must set the IN NAK bit. To set this + * bit, the following field must be programmed. + */ + + regaddr = STM32_OTGFS_DIEPCTL(privep->epphy); + regval = stm32_getreg(regaddr); + regval |= OTGFS_DIEPCTL_SNAK; + stm32_putreg(regval, regaddr); + + /* The endpoint is no longer active */ + + privep->active = false; + return; + } + + ullvdbg("EP%d req=%p: len=%d xfrd=%d zlp=%d\n", + privep->epphy, privreq, privreq->req.len, + privreq->req.xfrd, privep->zlp); + + /* Check for a special case: If we are just starting a request (xfrd==0) and + * the class driver is trying to send a zero-length packet (len==0). Then set + * the ZLP flag so that the packet will be sent. + */ + + if (privreq->req.len == 0) + { + /* The ZLP flag is set TRUE whenever we want to force the driver to + * send a zero-length-packet on the next pass through the loop (below). + * The flag is cleared whenever a packet is sent in the loop below. + */ + + privep->zlp = true; + } + + /* Add one more packet to the TxFIFO. We will wait for the transfer + * complete event before we add the next packet (or part of a packet + * to the TxFIFO). + * + * The documentation says that we can can multiple packets to the TxFIFO, + * but it seems that we need to get the transfer complete event before + * we can add the next (or maybe I have got something wrong?) + */ + +#if 0 + while (privreq->req.xfrd < privreq->req.len || privep->zlp) +#else + if (privreq->req.xfrd < privreq->req.len || privep->zlp) +#endif + { + /* Get the number of bytes left to be sent in the request */ + + bytesleft = privreq->req.len - privreq->req.xfrd; + nbytes = bytesleft; + + /* Assume no zero-length-packet on the next pass through this loop */ + + privep->zlp = false; + + /* Limit the size of the transfer to one full packet and handle + * zero-length packets (ZLPs). + */ + + if (nbytes > 0) + { + /* Either send the maxpacketsize or all of the remaining data in + * the request. + */ + + if (nbytes >= privep->ep.maxpacket) + { + nbytes = privep->ep.maxpacket; + + /* Handle the case where this packet is exactly the + * maxpacketsize. Do we need to send a zero-length packet + * in this case? + */ + + if (bytesleft == privep->ep.maxpacket && + (privreq->req.flags & USBDEV_REQFLAGS_NULLPKT) != 0) + { + /* The ZLP flag is set TRUE whenever we want to force + * the driver to send a zero-length-packet on the next + * pass through this loop. The flag is cleared (above) + * whenever we are committed to sending any packet and + * set here when we want to force one more pass through + * the loop. + */ + + privep->zlp = true; + } + } + } + + /* Get the transfer size in 32-bit words */ + + nwords = (nbytes + 3) >> 2; + + /* Get the number of 32-bit words available in the TxFIFO. The + * DXTFSTS indicates the amount of free space available in the + * endpoint TxFIFO. Values are in terms of 32-bit words: + * + * 0: Endpoint TxFIFO is full + * 1: 1 word available + * 2: 2 words available + * n: n words available + */ + + regaddr = STM32_OTGFS_DTXFSTS(privep->epphy); + + /* Check for space in the TxFIFO. If space in the TxFIFO is not + * available, then set up an interrupt to resume the transfer when + * the TxFIFO is empty. + */ + + regval = stm32_getreg(regaddr); + if ((int)(regval & OTGFS_DTXFSTS_MASK) < nwords) + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPIN_EMPWAIT), (uint16_t)regval); + + /* There is insufficient space in the TxFIFO. Wait for a TxFIFO + * empty interrupt and try again. + */ + + uint32_t empmsk = stm32_getreg(STM32_OTGFS_DIEPEMPMSK); + empmsk |= OTGFS_DIEPEMPMSK(privep->epphy); + stm32_putreg(empmsk, STM32_OTGFS_DIEPEMPMSK); + + /* Terminate the transfer. We will try again when the TxFIFO empty + * interrupt is received. + */ + + return; + } + + /* Transfer data to the TxFIFO */ + + buf = privreq->req.buf + privreq->req.xfrd; + stm32_epin_transfer(privep, buf, nbytes); + + /* If it was not before, the OUT endpoint is now actively transferring + * data. + */ + + privep->active = true; + + /* EP0 is a special case */ + + if (privep->epphy == EP0) + { + priv->ep0state = EP0STATE_DATA_IN; + } + + /* Update for the next time through the loop */ + + privreq->req.xfrd += nbytes; + } + + /* Note that the ZLP, if any, must be sent as a separate transfer. The need + * for a ZLP is indicated by privep->zlp. If all of the bytes were sent + * (including any final null packet) then we are finished with the transfer + */ + + if (privreq->req.xfrd >= privreq->req.len && !privep->zlp) + { + usbtrace(TRACE_COMPLETE(privep->epphy), privreq->req.xfrd); + + /* We are finished with the request (although the transfer has not + * yet completed). + */ + + stm32_req_complete(privep, OK); + } +} + +/**************************************************************************** + * Name: stm32_rxfifo_read + * + * Description: + * Read packet from the RxFIFO into a read request. + * + ****************************************************************************/ + +static void stm32_rxfifo_read(FAR struct stm32_ep_s *privep, + FAR uint8_t *dest, uint16_t len) +{ + uint32_t regaddr; + int i; + + /* Get the address of the RxFIFO. Note: there is only one RxFIFO so + * we might as well use the address associated with EP0. + */ + + regaddr = STM32_OTGFS_DFIFO_DEP(EP0); + + /* Read 32-bits and write 4 x 8-bits at time (to avoid unaligned accesses) */ + + for (i = 0; i < len; i += 4) + { + union + { + uint32_t w; + uint8_t b[4]; + } data; + + /* Read 1 x 32-bits of EP0 packet data */ + + data.w = stm32_getreg(regaddr); + + /* Write 4 x 8-bits of EP0 packet data */ + + *dest++ = data.b[0]; + *dest++ = data.b[1]; + *dest++ = data.b[2]; + *dest++ = data.b[3]; + } +} + +/**************************************************************************** + * Name: stm32_rxfifo_discard + * + * Description: + * Discard packet data from the RxFIFO. + * + ****************************************************************************/ + +static void stm32_rxfifo_discard(FAR struct stm32_ep_s *privep, int len) +{ + if (len > 0) + { + uint32_t regaddr; + int i; + + /* Get the address of the RxFIFO Note: there is only one RxFIFO so + * we might as well use the address associated with EP0. + */ + + regaddr = STM32_OTGFS_DFIFO_DEP(EP0); + + /* Read 32-bits at time */ + + for (i = 0; i < len; i += 4) + { + volatile uint32_t data = stm32_getreg(regaddr); + (void)data; + } + } +} + +/**************************************************************************** + * Name: stm32_epout_complete + * + * Description: + * This function is called when an OUT transfer complete interrupt is + * received. It completes the read request at the head of the endpoint's + * request queue. + * + ****************************************************************************/ + +static void stm32_epout_complete(FAR struct stm32_usbdev_s *priv, + FAR struct stm32_ep_s *privep) +{ + struct stm32_req_s *privreq; + + /* Since a transfer just completed, there must be a read request at the head of + * the endpoint request queue. + */ + + privreq = stm32_rqpeek(privep); + DEBUGASSERT(privreq); + + if (!privreq) + { + /* An OUT transfer completed, but no packet to receive the data. This + * should not happen. + */ + + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_EPOUTQEMPTY), privep->epphy); + privep->active = false; + return; + } + + ullvdbg("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 + * IDLE. + */ + + usbtrace(TRACE_COMPLETE(privep->epphy), privreq->req.xfrd); + stm32_req_complete(privep, OK); + privep->active = false; + + /* Now set up the next read request (if any) */ + + stm32_epout_request(priv, privep); +} + +/**************************************************************************** + * Name: stm32_ep0out_receive + * + * Description: + * This function is called from the RXFLVL interrupt handler when new incoming + * data is available in the endpoint's RxFIFO. This function will simply + * copy the incoming data into pending request's data buffer. + * + ****************************************************************************/ + +static inline void stm32_ep0out_receive(FAR struct stm32_ep_s *privep, int bcnt) +{ + FAR struct stm32_usbdev_s *priv; + + /* Sanity Checking */ + + DEBUGASSERT(privep && privep->ep.priv); + priv = (FAR struct stm32_usbdev_s *)privep->ep.priv; + + ullvdbg("EP0: bcnt=%d\n", bcnt); + usbtrace(TRACE_READ(EP0), bcnt); + + /* Verify that an OUT SETUP request as received before this data was + * received in the RxFIFO. + */ + + if (priv->ep0state == EP0STATE_SETUP_OUT) + { + /* Read the data into our special buffer for SETUP data */ + + int readlen = MIN(CONFIG_USBDEV_SETUP_MAXDATASIZE, bcnt); + stm32_rxfifo_read(privep, priv->ep0data, readlen); + + /* Do we have to discard any excess bytes? */ + + stm32_rxfifo_discard(privep, bcnt - readlen); + + /* Now we can process the setup command */ + + privep->active = false; + priv->ep0state = EP0STATE_SETUP_READY; + priv->ep0datlen = readlen; + + stm32_ep0out_setup(priv); + } + else + { + /* This is an error. We don't have any idea what to do with the EP0 + * data in this case. Just read and discard it so that the RxFIFO + * does not become constipated. + */ + + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_NOOUTSETUP), priv->ep0state); + stm32_rxfifo_discard(privep, bcnt); + privep->active = false; + } +} + +/**************************************************************************** + * Name: stm32_epout_receive + * + * Description: + * This function is called from the RXFLVL interrupt handler when new incoming + * data is available in the endpoint's RxFIFO. This function will simply + * copy the incoming data into pending request's data buffer. + * + ****************************************************************************/ + +static inline void stm32_epout_receive(FAR struct stm32_ep_s *privep, int bcnt) +{ + struct stm32_req_s *privreq; + uint8_t *dest; + int buflen; + int readlen; + + /* Get a reference to the request at the head of the endpoint's request + * queue. + */ + + privreq = stm32_rqpeek(privep); + if (!privreq) + { + /* Incoming data is available in the RxFIFO, but there is no read setup + * to receive the receive the data. This should not happen for data + * endpoints; those endpoints should have been NAKing any OUT data tokens. + * + * We should get here normally on OUT data phase following an OUT + * SETUP command. EP0 data will still receive data in this case and it + * should not be NAKing. + */ + + if (privep->epphy == 0) + { + stm32_ep0out_receive(privep, bcnt); + } + else + { + /* Otherwise, the data is lost. This really should not happen if + * NAKing is working as expected. + */ + + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_EPOUTQEMPTY), privep->epphy); + + /* Discard the data in the RxFIFO */ + + stm32_rxfifo_discard(privep, bcnt); + } + + privep->active = false; + return; + } + + ullvdbg("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 */ + + buflen = privreq->req.len - privreq->req.xfrd; + DEBUGASSERT(buflen > 0 && buflen >= bcnt); + readlen = MIN(buflen, bcnt); + + /* Get the destination of the data transfer */ + + dest = privreq->req.buf + privreq->req.xfrd; + + /* Transfer the data from the RxFIFO to the request's data buffer */ + + stm32_rxfifo_read(privep, dest, readlen); + + /* If there were more bytes in the RxFIFO than could be held in the read + * request, then we will have to discard those. + */ + + stm32_rxfifo_discard(privep, bcnt - readlen); + + /* Update the number of bytes transferred */ + + privreq->req.xfrd += readlen; +} + +/**************************************************************************** + * Name: stm32_epout_request + * + * Description: + * This function is called when either (1) new read request is received, or + * (2) a pending receive request completes. If there is no read in pending, + * then this function will initiate the next OUT (read) operation. + * + ****************************************************************************/ + +static void stm32_epout_request(FAR struct stm32_usbdev_s *priv, + FAR struct stm32_ep_s *privep) +{ + struct stm32_req_s *privreq; + uint32_t regaddr; + uint32_t regval; + uint32_t xfrsize; + uint32_t pktcnt; + + /* Make sure that there is not already a pending request request. If there is, + * just return, leaving the newly received request in the request queue. + */ + + if (!privep->active) + { + /* Loop until a valid request is found (or the request queue is empty). + * The loop is only need to look at the request queue again is an invalid + * read request is encountered. + */ + + for (; ; ) + { + /* Get a reference to the request at the head of the endpoint's request queue */ + + privreq = stm32_rqpeek(privep); + if (!privreq) + { + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_EPOUTQEMPTY), privep->epphy); + + /* There are no read requests to be setup. Configure the hardware to + * NAK any incoming packets. (This should already be the case. I + * think that the hardware will automatically NAK after a transfer is + * completed until SNAK is cleared). + */ + + regaddr = STM32_OTGFS_DOEPCTL(privep->epphy); + regval = stm32_getreg(regaddr); + regval |= OTGFS_DOEPCTL_SNAK; + stm32_putreg(regval, regaddr); + + /* This endpoint is no longer actively transferring */ + + privep->active = false; + return; + } + + ullvdbg("EP%d: len=%d\n", privep->epphy, privreq->req.len); + + /* Ignore any attempt to receive a zero length packet (this really + * should not happen. + */ + + if (privreq->req.len <= 0) + { + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_EPOUTNULLPACKET), 0); + stm32_req_complete(privep, OK); + } + + /* Otherwise, we have a usable read request... break out of the loop */ + + else + { + break; + } + } + + /* Setup the pending read into the request buffer. First calculate: + * + * pktcnt = the number of packets (of maxpacket bytes) required to + * perform the transfer. + * xfrsize = The total number of bytes required (in units of + * maxpacket bytes). + */ + + pktcnt = (privreq->req.len + (privep->ep.maxpacket - 1)) / privep->ep.maxpacket; + xfrsize = pktcnt * privep->ep.maxpacket; + + /* Then setup the hardware to perform this transfer */ + + regaddr = STM32_OTGFS_DOEPTSIZ(privep->epphy); + regval = stm32_getreg(regaddr); + regval &= ~(OTGFS_DOEPTSIZ_XFRSIZ_MASK | OTGFS_DOEPTSIZ_PKTCNT_MASK); + regval |= (xfrsize << OTGFS_DOEPTSIZ_XFRSIZ_SHIFT); + regval |= (pktcnt << OTGFS_DOEPTSIZ_PKTCNT_SHIFT); + stm32_putreg(regval, regaddr); + + /* Then enable the transfer */ + + regaddr = STM32_OTGFS_DOEPCTL(privep->epphy); + regval = stm32_getreg(regaddr); + + /* When an isochronous transfer is enabled the Even/Odd frame bit must + * also be set appropriately. + */ + +#ifdef CONFIG_USBDEV_ISOCHRONOUS + if (privep->eptype == USB_EP_ATTR_XFER_ISOC) + { + if (privep->odd) + { + regval |= OTGFS_DOEPCTL_SODDFRM; + } + else + { + regval |= OTGFS_DOEPCTL_SEVNFRM; + } + } +#endif + + /* Clearing NAKing and enable the transfer. */ + + regval |= (OTGFS_DOEPCTL_CNAK | OTGFS_DOEPCTL_EPENA); + stm32_putreg(regval, regaddr); + + /* A transfer is now active on this endpoint */ + + privep->active = true; + + /* EP0 is a special case. We need to know when to switch back to + * normal SETUP processing. + */ + + if (privep->epphy == EP0) + { + priv->ep0state = EP0STATE_DATA_OUT; + } + } +} + +/**************************************************************************** + * Name: stm32_ep_flush + * + * Description: + * Flush any primed descriptors from this ep + * + ****************************************************************************/ + +static void stm32_ep_flush(struct stm32_ep_s *privep) +{ + if (privep->isin) + { + stm32_txfifo_flush(OTGFS_GRSTCTL_TXFNUM_D(privep->epphy)); + } + else + { + stm32_rxfifo_flush(); + } +} + +/**************************************************************************** + * Name: stm32_req_complete + * + * Description: + * Handle termination of the request at the head of the endpoint request queue. + * + ****************************************************************************/ + +static void stm32_req_complete(struct stm32_ep_s *privep, int16_t result) +{ + FAR struct stm32_req_s *privreq; + + /* Remove the request at the head of the request list */ + + privreq = stm32_req_remfirst(privep); + DEBUGASSERT(privreq != NULL); + + /* If endpoint 0, temporarily reflect the state of protocol stalled + * in the callback. + */ + + bool stalled = privep->stalled; + if (privep->epphy == EP0) + { + privep->stalled = privep->dev->stalled; + } + + /* Save the result in the request structure */ + + privreq->req.result = result; + + /* Callback to the request completion handler */ + + privreq->req.callback(&privep->ep, &privreq->req); + + /* Restore the stalled indication */ + + privep->stalled = stalled; +} + +/**************************************************************************** + * Name: stm32_req_cancel + * + * Description: + * Cancel all pending requests for an endpoint + * + ****************************************************************************/ + +static void stm32_req_cancel(struct stm32_ep_s *privep, int16_t status) +{ + if (!stm32_rqempty(privep)) + { + stm32_ep_flush(privep); + } + + while (!stm32_rqempty(privep)) + { + usbtrace(TRACE_COMPLETE(privep->epphy), + (stm32_rqpeek(privep))->req.xfrd); + stm32_req_complete(privep, status); + } +} + +/**************************************************************************** + * Name: stm32_ep_findbyaddr + * + * Description: + * Find the physical endpoint structure corresponding to a logic endpoint + * address + * + ****************************************************************************/ + +static struct stm32_ep_s *stm32_ep_findbyaddr(struct stm32_usbdev_s *priv, + uint16_t eplog) +{ + struct stm32_ep_s *privep; + uint8_t epphy = USB_EPNO(eplog); + + if (epphy >= STM32_NENDPOINTS) + { + return NULL; + } + + /* Is this an IN or an OUT endpoint? */ + + if (USB_ISEPIN(eplog)) + { + privep = &priv->epin[epphy]; + } + else + { + privep = &priv->epout[epphy]; + } + + /* Return endpoint reference */ + + DEBUGASSERT(privep->epphy == epphy); + return privep; +} + +/**************************************************************************** + * Name: stm32_req_dispatch + * + * Description: + * Provide unhandled setup actions to the class driver. This is logically part + * of the USB interrupt handler. + * + ****************************************************************************/ + +static int stm32_req_dispatch(struct stm32_usbdev_s *priv, + const struct usb_ctrlreq_s *ctrl) +{ + int ret = -EIO; + + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_DISPATCH), 0); + if (priv->driver) + { + /* Forward to the control request to the class driver implementation */ + + ret = CLASS_SETUP(priv->driver, &priv->usbdev, ctrl, + priv->ep0data, priv->ep0datlen); + } + + if (ret < 0) + { + /* Stall on failure */ + + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_DISPATCHSTALL), 0); + priv->stalled = true; + } + + return ret; +} + +/**************************************************************************** + * Name: stm32_usbreset + * + * Description: + * Reset Usb engine + * + ****************************************************************************/ + +static void stm32_usbreset(struct stm32_usbdev_s *priv) +{ + FAR struct stm32_ep_s *privep; + uint32_t regval; + int i; + + /* Clear the Remote Wake-up Signaling */ + + regval = stm32_getreg(STM32_OTGFS_DCTL); + regval &= ~OTGFS_DCTL_RWUSIG; + stm32_putreg(regval, STM32_OTGFS_DCTL); + + /* Flush the EP0 Tx FIFO */ + + stm32_txfifo_flush(OTGFS_GRSTCTL_TXFNUM_D(EP0)); + + /* Tell the class driver that we are disconnected. The class + * driver should then accept any new configurations. + */ + + if (priv->driver) + { + CLASS_DISCONNECT(priv->driver, &priv->usbdev); + } + + /* Mark all endpoints as available */ + + priv->epavail[0] = STM32_EP_AVAILABLE; + priv->epavail[1] = STM32_EP_AVAILABLE; + + /* Disable all end point interrupts */ + + for (i = 0; i < STM32_NENDPOINTS ; i++) + { + /* Disable endpoint interrupts */ + + stm32_putreg(0xff, STM32_OTGFS_DIEPINT(i)); + stm32_putreg(0xff, STM32_OTGFS_DOEPINT(i)); + + /* Return write requests to the class implementation */ + + privep = &priv->epin[i]; + stm32_req_cancel(privep, -ESHUTDOWN); + + /* Reset IN endpoint status */ + + privep->stalled = false; + + /* Return read requests to the class implementation */ + + privep = &priv->epout[i]; + stm32_req_cancel(privep, -ESHUTDOWN); + + /* Reset endpoint status */ + + privep->stalled = false; + } + + stm32_putreg(0xffffffff, STM32_OTGFS_DAINT); + + /* Mask all device endpoint interrupts except EP0 */ + + regval = (OTGFS_DAINT_IEP(EP0) | OTGFS_DAINT_OEP(EP0)); + stm32_putreg(regval, STM32_OTGFS_DAINTMSK); + + /* Unmask OUT interrupts */ + + regval = (OTGFS_DOEPMSK_XFRCM | OTGFS_DOEPMSK_STUPM | OTGFS_DOEPMSK_EPDM); + stm32_putreg(regval, STM32_OTGFS_DOEPMSK); + + /* Unmask IN interrupts */ + + regval = (OTGFS_DIEPMSK_XFRCM | OTGFS_DIEPMSK_EPDM | OTGFS_DIEPMSK_TOM); + stm32_putreg(regval, STM32_OTGFS_DIEPMSK); + + /* Reset device address to 0 */ + + stm32_setaddress(priv, 0); + priv->devstate = DEVSTATE_DEFAULT; + priv->usbdev.speed = USB_SPEED_FULL; + + /* Re-configure EP0 */ + + stm32_ep0_configure(priv); + + /* Setup EP0 to receive SETUP packets */ + + stm32_ep0out_ctrlsetup(priv); +} + +/**************************************************************************** + * Name: stm32_ep0out_testmode + * + * Description: + * Select test mode + * + ****************************************************************************/ + +static inline void stm32_ep0out_testmode(FAR struct stm32_usbdev_s *priv, + uint16_t index) +{ + uint8_t testmode; + + testmode = index >> 8; + switch (testmode) + { + case 1: + priv->testmode = OTGFS_TESTMODE_J; + break; + + case 2: + priv->testmode = OTGFS_TESTMODE_K; + break; + + case 3: + priv->testmode = OTGFS_TESTMODE_SE0_NAK; + break; + + case 4: + priv->testmode = OTGFS_TESTMODE_PACKET; + break; + + case 5: + priv->testmode = OTGFS_TESTMODE_FORCE; + break; + + default: + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADTESTMODE), testmode); + priv->dotest = false; + priv->testmode = OTGFS_TESTMODE_DISABLED; + priv->stalled = true; + } + + priv->dotest = true; + stm32_ep0in_transmitzlp(priv); +} + +/**************************************************************************** + * Name: stm32_ep0out_stdrequest + * + * Description: + * Handle a stanard request on EP0. Pick off the things of interest to the + * USB device controller driver; pass what is left to the class driver. + * + ****************************************************************************/ + +static inline void stm32_ep0out_stdrequest(struct stm32_usbdev_s *priv, + FAR struct stm32_ctrlreq_s *ctrlreq) +{ + FAR struct stm32_ep_s *privep; + + /* Handle standard request */ + + switch (ctrlreq->req) + { + case USB_REQ_GETSTATUS: + { + /* type: device-to-host; recipient = device, interface, endpoint + * value: 0 + * index: zero interface endpoint + * len: 2; data = status + */ + + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_GETSTATUS), 0); + if (!priv->addressed || + ctrlreq->len != 2 || + USB_REQ_ISOUT(ctrlreq->type) || + ctrlreq->value != 0) + { + priv->stalled = true; + } + else + { + switch (ctrlreq->type & USB_REQ_RECIPIENT_MASK) + { + case USB_REQ_RECIPIENT_ENDPOINT: + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPGETSTATUS), 0); + privep = stm32_ep_findbyaddr(priv, ctrlreq->index); + if (!privep) + { + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADEPGETSTATUS), 0); + priv->stalled = true; + } + else + { + if (privep->stalled) + { + priv->ep0data[0] = (1 << USB_FEATURE_ENDPOINTHALT); + } + else + { + priv->ep0data[0] = 0; /* Not stalled */ + } + + priv->ep0data[1] = 0; + stm32_ep0in_setupresponse(priv, priv->ep0data, 2); + } + } + break; + + case USB_REQ_RECIPIENT_DEVICE: + { + if (ctrlreq->index == 0) + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_DEVGETSTATUS), 0); + + /* Features: Remote Wakeup and self-powered */ + + priv->ep0data[0] = (priv->selfpowered << USB_FEATURE_SELFPOWERED); + priv->ep0data[0] |= (priv->wakeup << USB_FEATURE_REMOTEWAKEUP); + priv->ep0data[1] = 0; + + stm32_ep0in_setupresponse(priv, priv->ep0data, 2); + } + else + { + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADDEVGETSTATUS), 0); + priv->stalled = true; + } + } + break; + + case USB_REQ_RECIPIENT_INTERFACE: + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_IFGETSTATUS), 0); + priv->ep0data[0] = 0; + priv->ep0data[1] = 0; + + stm32_ep0in_setupresponse(priv, priv->ep0data, 2); + } + break; + + default: + { + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADGETSTATUS), 0); + priv->stalled = true; + } + break; + } + } + } + break; + + case USB_REQ_CLEARFEATURE: + { + /* type: host-to-device; recipient = device, interface or endpoint + * value: feature selector + * index: zero interface endpoint; + * len: zero, data = none + */ + + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_CLEARFEATURE), 0); + if (priv->addressed != 0 && ctrlreq->len == 0) + { + uint8_t recipient = ctrlreq->type & USB_REQ_RECIPIENT_MASK; + if (recipient == USB_REQ_RECIPIENT_ENDPOINT && + ctrlreq->value == USB_FEATURE_ENDPOINTHALT && + (privep = stm32_ep_findbyaddr(priv, ctrlreq->index)) != NULL) + { + stm32_ep_clrstall(privep); + stm32_ep0in_transmitzlp(priv); + } + else if (recipient == USB_REQ_RECIPIENT_DEVICE && + ctrlreq->value == USB_FEATURE_REMOTEWAKEUP) + { + priv->wakeup = 0; + stm32_ep0in_transmitzlp(priv); + } + else + { + /* Actually, I think we could just stall here. */ + + (void)stm32_req_dispatch(priv, &priv->ctrlreq); + } + } + else + { + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADCLEARFEATURE), 0); + priv->stalled = true; + } + } + break; + + case USB_REQ_SETFEATURE: + { + /* type: host-to-device; recipient = device, interface, endpoint + * value: feature selector + * index: zero interface endpoint; + * len: 0; data = none + */ + + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_SETFEATURE), 0); + if (priv->addressed != 0 && ctrlreq->len == 0) + { + uint8_t recipient = ctrlreq->type & USB_REQ_RECIPIENT_MASK; + if (recipient == USB_REQ_RECIPIENT_ENDPOINT && + ctrlreq->value == USB_FEATURE_ENDPOINTHALT && + (privep = stm32_ep_findbyaddr(priv, ctrlreq->index)) != NULL) + { + stm32_ep_setstall(privep); + stm32_ep0in_transmitzlp(priv); + } + else if (recipient == USB_REQ_RECIPIENT_DEVICE && + ctrlreq->value == USB_FEATURE_REMOTEWAKEUP) + { + priv->wakeup = 1; + stm32_ep0in_transmitzlp(priv); + } + else if (recipient == USB_REQ_RECIPIENT_DEVICE && + ctrlreq->value == USB_FEATURE_TESTMODE && + ((ctrlreq->index & 0xff) == 0)) + { + stm32_ep0out_testmode(priv, ctrlreq->index); + } + else if (priv->configured) + { + /* Actually, I think we could just stall here. */ + + (void)stm32_req_dispatch(priv, &priv->ctrlreq); + } + else + { + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADSETFEATURE), 0); + priv->stalled = true; + } + } + else + { + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADSETFEATURE), 0); + priv->stalled = true; + } + } + break; + + case USB_REQ_SETADDRESS: + { + /* type: host-to-device; recipient = device + * value: device address + * index: 0 + * len: 0; data = none + */ + + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_SETADDRESS), ctrlreq->value); + if ((ctrlreq->type & USB_REQ_RECIPIENT_MASK) == USB_REQ_RECIPIENT_DEVICE && + ctrlreq->index == 0 && + ctrlreq->len == 0 && + ctrlreq->value < 128 && + priv->devstate != DEVSTATE_CONFIGURED) + { + /* Save the address. We cannot actually change to the next address until + * the completion of the status phase. + */ + + stm32_setaddress(priv, (uint16_t)priv->ctrlreq.value[0]); + stm32_ep0in_transmitzlp(priv); + } + else + { + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADSETADDRESS), 0); + priv->stalled = true; + } + } + break; + + case USB_REQ_GETDESCRIPTOR: + /* type: device-to-host; recipient = device + * value: descriptor type and index + * index: 0 or language ID; + * len: descriptor len; data = descriptor + */ + + case USB_REQ_SETDESCRIPTOR: + /* type: host-to-device; recipient = device + * value: descriptor type and index + * index: 0 or language ID; + * len: descriptor len; data = descriptor + */ + + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_GETSETDESC), 0); + if ((ctrlreq->type & USB_REQ_RECIPIENT_MASK) == USB_REQ_RECIPIENT_DEVICE) + { + (void)stm32_req_dispatch(priv, &priv->ctrlreq); + } + else + { + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADGETSETDESC), 0); + priv->stalled = true; + } + } + break; + + case USB_REQ_GETCONFIGURATION: + /* type: device-to-host; recipient = device + * value: 0; + * index: 0; + * len: 1; data = configuration value + */ + + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_GETCONFIG), 0); + if (priv->addressed && + (ctrlreq->type & USB_REQ_RECIPIENT_MASK) == USB_REQ_RECIPIENT_DEVICE && + ctrlreq->value == 0 && + ctrlreq->index == 0 && + ctrlreq->len == 1) + { + (void)stm32_req_dispatch(priv, &priv->ctrlreq); + } + else + { + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADGETCONFIG), 0); + priv->stalled = true; + } + } + break; + + case USB_REQ_SETCONFIGURATION: + /* type: host-to-device; recipient = device + * value: configuration value + * index: 0; + * len: 0; data = none + */ + + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_SETCONFIG), 0); + if (priv->addressed && + (ctrlreq->type & USB_REQ_RECIPIENT_MASK) == USB_REQ_RECIPIENT_DEVICE && + ctrlreq->index == 0 && + ctrlreq->len == 0) + { + /* Give the configuration to the class driver */ + + int ret = stm32_req_dispatch(priv, &priv->ctrlreq); + + /* If the class driver accepted the configuration, then mark the + * device state as configured (or not, depending on the + * configuration). + */ + + if (ret == OK) + { + uint8_t cfg = (uint8_t)ctrlreq->value; + if (cfg != 0) + { + priv->devstate = DEVSTATE_CONFIGURED; + priv->configured = true; + } + else + { + priv->devstate = DEVSTATE_ADDRESSED; + priv->configured = false; + } + } + } + else + { + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADSETCONFIG), 0); + priv->stalled = true; + } + } + break; + + case USB_REQ_GETINTERFACE: + /* type: device-to-host; recipient = interface + * value: 0 + * index: interface; + * len: 1; data = alt interface + */ + + case USB_REQ_SETINTERFACE: + /* type: host-to-device; recipient = interface + * value: alternate setting + * index: interface; + * len: 0; data = none + */ + + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_GETSETIF), 0); + (void)stm32_req_dispatch(priv, &priv->ctrlreq); + } + break; + + case USB_REQ_SYNCHFRAME: + /* type: device-to-host; recipient = endpoint + * value: 0 + * index: endpoint; + * len: 2; data = frame number + */ + + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_SYNCHFRAME), 0); + } + break; + + default: + { + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDCTRLREQ), 0); + priv->stalled = true; + } + break; + } +} + +/**************************************************************************** + * Name: stm32_ep0out_setup + * + * Description: + * USB Ctrl EP Setup Event. This is logically part of the USB interrupt + * handler. This event occurs when a setup packet is receive on EP0 OUT. + * + ****************************************************************************/ + +static inline void stm32_ep0out_setup(struct stm32_usbdev_s *priv) +{ + struct stm32_ctrlreq_s ctrlreq; + + /* Verify that a SETUP was received */ + + if (priv->ep0state != EP0STATE_SETUP_READY) + { + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_EP0NOSETUP), priv->ep0state); + return; + } + + /* Terminate any pending requests */ + + stm32_req_cancel(&priv->epout[EP0], -EPROTO); + stm32_req_cancel(&priv->epin[EP0], -EPROTO); + + /* Assume NOT stalled */ + + priv->epout[EP0].stalled = false; + priv->epin[EP0].stalled = false; + priv->stalled = false; + + /* Starting to process a control request - update state */ + + priv->ep0state = EP0STATE_SETUP_PROCESS; + + /* And extract the little-endian 16-bit values to host order */ + + ctrlreq.type = priv->ctrlreq.type; + ctrlreq.req = priv->ctrlreq.req; + ctrlreq.value = GETUINT16(priv->ctrlreq.value); + ctrlreq.index = GETUINT16(priv->ctrlreq.index); + ctrlreq.len = GETUINT16(priv->ctrlreq.len); + + ullvdbg("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 */ + + if ((ctrlreq.type & USB_REQ_TYPE_MASK) != USB_REQ_TYPE_STANDARD) + { + /* Dispatch any non-standard requests */ + + (void)stm32_req_dispatch(priv, &priv->ctrlreq); + } + else + { + /* Handle standard requests. */ + + stm32_ep0out_stdrequest(priv, &ctrlreq); + } + + /* Check if the setup processing resulted in a STALL */ + + if (priv->stalled) + { + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_EP0SETUPSTALLED), priv->ep0state); + stm32_ep0_stall(priv); + } + + /* Reset state/data associated with thie SETUP request */ + + priv->ep0datlen = 0; +} + +/**************************************************************************** + * Name: stm32_epout + * + * Description: + * This is part of the OUT endpoint interrupt processing. This function + * handles the OUT event for a single endpoint. + * + ****************************************************************************/ + +static inline void stm32_epout(FAR struct stm32_usbdev_s *priv, uint8_t epno) +{ + FAR struct stm32_ep_s *privep; + + /* Endpoint 0 is a special case. */ + + if (epno == 0) + { + privep = &priv->epout[EP0]; + + /* In the EP0STATE_DATA_OUT state, we are receiving data into the + * request buffer. In that case, we must continue the request + * processing. + */ + + if (priv->ep0state == EP0STATE_DATA_OUT) + { + /* Continue processing data from the EP0 OUT request queue */ + + stm32_epout_complete(priv, privep); + + /* If we are not actively processing an OUT request, then we + * need to setup to receive the next control request. + */ + + if (!privep->active) + { + stm32_ep0out_ctrlsetup(priv); + priv->ep0state = EP0STATE_IDLE; + } + } + } + + /* For other endpoints, the only possibility is that we are continuing + * or finishing an OUT request. + */ + + else if (priv->devstate == DEVSTATE_CONFIGURED) + { + stm32_epout_complete(priv, &priv->epout[epno]); + } +} + +/**************************************************************************** + * Name: stm32_epout_interrupt + * + * Description: + * USB OUT endpoint interrupt handler. The core generates this interrupt when + * there is an interrupt is pending on one of the OUT endpoints of the core. + * The driver must read the OTGFS DAINT register to determine the exact number + * of the OUT endpoint on which the interrupt occurred, and then read the + * corresponding OTGFS DOEPINTx register to determine the exact cause of the + * interrupt. + * + ****************************************************************************/ + +static inline void stm32_epout_interrupt(FAR struct stm32_usbdev_s *priv) +{ + uint32_t daint; + uint32_t regval; + uint32_t doepint; + int epno; + + /* Get the pending, enabled interrupts for the OUT endpoint from the endpoint + * interrupt status register. + */ + + regval = stm32_getreg(STM32_OTGFS_DAINT); + regval &= stm32_getreg(STM32_OTGFS_DAINTMSK); + daint = (regval & OTGFS_DAINT_OEP_MASK) >> OTGFS_DAINT_OEP_SHIFT; + + if (daint == 0) + { + /* We got an interrupt, but there is no unmasked endpoint that caused + * it ?! When this happens, the interrupt flag never gets cleared and + * we are stuck in infinite interrupt loop. + * + * This shouldn't happen if we are diligent about handling timing + * issues when masking endpoint interrupts. However, this workaround + * avoids infinite loop and allows operation to continue normally. It + * works by clearing each endpoint flags, masked or not. + */ + + regval = stm32_getreg(STM32_OTGFS_DAINT); + daint = (regval & OTGFS_DAINT_OEP_MASK) >> OTGFS_DAINT_OEP_SHIFT; + + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_EPOUTUNEXPECTED), + (uint16_t)regval); + + epno = 0; + while (daint) + { + if ((daint & 1) != 0) + { + regval = stm32_getreg(STM32_OTGFS_DOEPINT(epno)); + ulldbg("DOEPINT(%d) = %08x\n", epno, regval); + stm32_putreg(0xFF, STM32_OTGFS_DOEPINT(epno)); + } + + epno++; + daint >>= 1; + } + + return; + } + + /* Process each pending IN endpoint interrupt */ + + epno = 0; + while (daint) + { + /* Is an OUT interrupt pending for this endpoint? */ + + if ((daint & 1) != 0) + { + /* Yes.. get the OUT endpoint interrupt status */ + + doepint = stm32_getreg(STM32_OTGFS_DOEPINT(epno)); + doepint &= stm32_getreg(STM32_OTGFS_DOEPMSK); + + /* Transfer completed interrupt. This interrupt is trigged when + * stm32_rxinterrupt() removes the last packet data from the RxFIFO. + * In this case, core internally sets the NAK bit for this endpoint to + * prevent it from receiving any more packets. + */ + + if ((doepint & OTGFS_DOEPINT_XFRC) != 0) + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPOUT_XFRC), (uint16_t)doepint); + + /* Clear the bit in DOEPINTn for this interrupt */ + + stm32_putreg(OTGFS_DOEPINT_XFRC, STM32_OTGFS_DOEPINT(epno)); + + /* Handle the RX transfer data ready event */ + + stm32_epout(priv, epno); + } + + /* Endpoint disabled interrupt (ignored because this interrupt is + * used in polled mode by the endpoint disable logic). + */ +#if 1 + /* REVISIT: */ + if ((doepint & OTGFS_DOEPINT_EPDISD) != 0) + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPOUT_EPDISD), (uint16_t)doepint); + + /* Clear the bit in DOEPINTn for this interrupt */ + + stm32_putreg(OTGFS_DOEPINT_EPDISD, STM32_OTGFS_DOEPINT(epno)); + } +#endif + /* Setup Phase Done (control EPs) */ + + if ((doepint & OTGFS_DOEPINT_SETUP) != 0) + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPOUT_SETUP), priv->ep0state); + + /* Handle the receipt of the IN SETUP packets now (OUT setup + * packet processing may be delayed until the accompanying + * OUT DATA is received) + */ + + if (priv->ep0state == EP0STATE_SETUP_READY) + { + stm32_ep0out_setup(priv); + } + stm32_putreg(OTGFS_DOEPINT_SETUP, STM32_OTGFS_DOEPINT(epno)); + } + } + + epno++; + daint >>= 1; + } +} + +/**************************************************************************** + * Name: stm32_epin_runtestmode + * + * Description: + * Execute the test mode setup by the SET FEATURE request + * + ****************************************************************************/ + +static inline void stm32_epin_runtestmode(FAR struct stm32_usbdev_s *priv) +{ + uint32_t regval = stm32_getreg(STM32_OTGFS_DCTL); + regval &= OTGFS_DCTL_TCTL_MASK; + regval |= (uint32_t)priv->testmode << OTGFS_DCTL_TCTL_SHIFT; + stm32_putreg(regval , STM32_OTGFS_DCTL); + + priv->dotest = 0; + priv->testmode = OTGFS_TESTMODE_DISABLED; +} + +/**************************************************************************** + * Name: stm32_epin + * + * Description: + * This is part of the IN endpoint interrupt processing. This function + * handles the IN event for a single endpoint. + * + ****************************************************************************/ + +static inline void stm32_epin(FAR struct stm32_usbdev_s *priv, uint8_t epno) +{ + FAR struct stm32_ep_s *privep = &priv->epin[epno]; + + /* Endpoint 0 is a special case. */ + + if (epno == 0) + { + /* In the EP0STATE_DATA_IN state, we are sending data from request + * buffer. In that case, we must continue the request processing. + */ + + if (priv->ep0state == EP0STATE_DATA_IN) + { + /* Continue processing data from the EP0 OUT request queue */ + + stm32_epin_request(priv, privep); + + /* If we are not actively processing an OUT request, then we + * need to setup to receive the next control request. + */ + + if (!privep->active) + { + stm32_ep0out_ctrlsetup(priv); + priv->ep0state = EP0STATE_IDLE; + } + } + + /* Test mode is another special case */ + + if (priv->dotest) + { + stm32_epin_runtestmode(priv); + } + } + + /* For other endpoints, the only possibility is that we are continuing + * or finishing an IN request. + */ + + else if (priv->devstate == DEVSTATE_CONFIGURED) + { + /* Continue processing data from the endpoint write request queue */ + + stm32_epin_request(priv, privep); + } +} + +/**************************************************************************** + * Name: stm32_epin_txfifoempty + * + * Description: + * TxFIFO empty interrupt handling + * + ****************************************************************************/ + +static inline void stm32_epin_txfifoempty(FAR struct stm32_usbdev_s *priv, int epno) +{ + FAR struct stm32_ep_s *privep = &priv->epin[epno]; + + /* Continue processing the write request queue. This may mean sending + * more data from the existing request or terminating the current requests + * and (perhaps) starting the IN transfer from the next write request. + */ + + stm32_epin_request(priv, privep); +} + +/**************************************************************************** + * Name: stm32_epin_interrupt + * + * Description: + * USB IN endpoint interrupt handler. The core generates this interrupt when + * an interrupt is pending on one of the IN endpoints of the core. The driver + * must read the OTGFS DAINT register to determine the exact number of the IN + * endpoint on which the interrupt occurred, and then read the corresponding + * OTGFS DIEPINTx register to determine the exact cause of the interrupt. + * + ****************************************************************************/ + +static inline void stm32_epin_interrupt(FAR struct stm32_usbdev_s *priv) +{ + uint32_t diepint; + uint32_t daint; + uint32_t mask; + uint32_t empty; + int epno; + + /* Get the pending, enabled interrupts for the IN endpoint from the endpoint + * interrupt status register. + */ + + daint = stm32_getreg(STM32_OTGFS_DAINT); + daint &= stm32_getreg(STM32_OTGFS_DAINTMSK); + daint &= OTGFS_DAINT_IEP_MASK; + + if (daint == 0) + { + /* We got an interrupt, but there is no unmasked endpoint that caused + * it ?! When this happens, the interrupt flag never gets cleared and + * we are stuck in infinite interrupt loop. + * + * This shouldn't happen if we are diligent about handling timing + * issues when masking endpoint interrupts. However, this workaround + * avoids infinite loop and allows operation to continue normally. It + * works by clearing each endpoint flags, masked or not. + */ + + daint = stm32_getreg(STM32_OTGFS_DAINT); + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_EPINUNEXPECTED), + (uint16_t)daint); + + daint &= OTGFS_DAINT_IEP_MASK; + epno = 0; + + while (daint) + { + if ((daint & 1) != 0) + { + ulldbg("DIEPINT(%d) = %08x\n", + epno, stm32_getreg(STM32_OTGFS_DIEPINT(epno))); + stm32_putreg(0xFF, STM32_OTGFS_DIEPINT(epno)); + } + + epno++; + daint >>= 1; + } + + return; + } + + /* Process each pending IN endpoint interrupt */ + + epno = 0; + while (daint) + { + /* Is an IN interrupt pending for this endpoint? */ + + if ((daint & 1) != 0) + { + /* Get IN interrupt mask register. Bits 0-6 correspond to enabled + * interrupts as will be found in the DIEPINT interrupt status + * register. + */ + + mask = stm32_getreg(STM32_OTGFS_DIEPMSK); + + /* Check if the TxFIFO not empty interrupt is enabled for this + * endpoint in the DIEPMSK register. Bits n corresponds to + * endpoint n in the register. That condition corresponds to + * bit 7 of the DIEPINT interrupt status register. There is + * no TXFE bit in the mask register, so we fake one here. + */ + + empty = stm32_getreg(STM32_OTGFS_DIEPEMPMSK); + if ((empty & OTGFS_DIEPEMPMSK(epno)) != 0) + { + mask |= OTGFS_DIEPINT_TXFE; + } + + /* Now, read the interrupt status and mask out all disabled + * interrupts. + */ + + diepint = stm32_getreg(STM32_OTGFS_DIEPINT(epno)) & mask; + + /* Decode and process the enabled, pending interrupts */ + /* Transfer completed interrupt */ + + if ((diepint & OTGFS_DIEPINT_XFRC) != 0) + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPIN_XFRC), + (uint16_t)diepint); + + /* It is possible that logic may be waiting for a the + * TxFIFO to become empty. We disable the TxFIFO empty + * interrupt here; it will be re-enabled if there is still + * insufficient space in the TxFIFO. + */ + + empty &= ~OTGFS_DIEPEMPMSK(epno); + stm32_putreg(empty, STM32_OTGFS_DIEPEMPMSK); + stm32_putreg(OTGFS_DIEPINT_XFRC, STM32_OTGFS_DIEPINT(epno)); + + /* IN transfer complete */ + + stm32_epin(priv, epno); + } + + /* Timeout condition */ + + if ((diepint & OTGFS_DIEPINT_TOC) != 0) + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPIN_TOC), (uint16_t)diepint); + stm32_putreg(OTGFS_DIEPINT_TOC, STM32_OTGFS_DIEPINT(epno)); + } + + /* IN token received when TxFIFO is empty. Applies to non-periodic IN + * endpoints only. This interrupt indicates that an IN token was received + * when the associated TxFIFO (periodic/non-periodic) was empty. This + * interrupt is asserted on the endpoint for which the IN token was + * received. + */ + + if ((diepint & OTGFS_DIEPINT_ITTXFE) != 0) + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPIN_ITTXFE), (uint16_t)diepint); + stm32_epin_request(priv, &priv->epin[epno]); + stm32_putreg(OTGFS_DIEPINT_ITTXFE, STM32_OTGFS_DIEPINT(epno)); + } + + /* IN endpoint NAK effective (ignored as this used only in polled + * mode) + */ +#if 0 + if ((diepint & OTGFS_DIEPINT_INEPNE) != 0) + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPIN_INEPNE), (uint16_t)diepint); + stm32_putreg(OTGFS_DIEPINT_INEPNE, STM32_OTGFS_DIEPINT(epno)); + } +#endif + /* Endpoint disabled interrupt (ignored as this used only in polled + * mode) + */ +#if 0 + if ((diepint & OTGFS_DIEPINT_EPDISD) != 0) + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPIN_EPDISD), (uint16_t)diepint); + stm32_putreg(OTGFS_DIEPINT_EPDISD, STM32_OTGFS_DIEPINT(epno)); + } +#endif + /* Transmit FIFO empty */ + + if ((diepint & OTGFS_DIEPINT_TXFE) != 0) + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPIN_TXFE), (uint16_t)diepint); + + /* If we were waiting for TxFIFO to become empty, the we might have both + * XFRC and TXFE interrupts pending. Since we do the same thing for both + * cases, ignore the TXFE if we have already processed the XFRC. + */ + + if ((diepint & OTGFS_DIEPINT_XFRC) == 0) + { + /* Mask further FIFO empty interrupts. This will be re-enabled + * whenever we need to wait for a FIFO event. + */ + + empty &= ~OTGFS_DIEPEMPMSK(epno); + stm32_putreg(empty, STM32_OTGFS_DIEPEMPMSK); + + /* Handle TxFIFO empty */ + + stm32_epin_txfifoempty(priv, epno); + } + + /* Clear the pending TxFIFO empty interrupt */ + + stm32_putreg(OTGFS_DIEPINT_TXFE, STM32_OTGFS_DIEPINT(epno)); + } + } + + epno++; + daint >>= 1; + } +} + +/**************************************************************************** + * Name: stm32_resumeinterrupt + * + * Description: + * Resume/remote wakeup detected interrupt + * + ****************************************************************************/ + +static inline void stm32_resumeinterrupt(FAR struct stm32_usbdev_s *priv) +{ + uint32_t regval; + + /* Restart the PHY clock and un-gate USB core clock (HCLK) */ + +#ifdef CONFIG_USBDEV_LOWPOWER + regval = stm32_getreg(STM32_OTGFS_PCGCCTL); + regval &= ~(OTGFS_PCGCCTL_STPPCLK | OTGFS_PCGCCTL_GATEHCLK); + stm32_putreg(regval, STM32_OTGFS_PCGCCTL); +#endif + + /* Clear remote wake-up signaling */ + + regval = stm32_getreg(STM32_OTGFS_DCTL); + regval &= ~OTGFS_DCTL_RWUSIG; + stm32_putreg(regval, STM32_OTGFS_DCTL); + + /* Restore full power -- whatever that means for this particular board */ + + stm32l4_usbsuspend((struct usbdev_s *)priv, true); + + /* Notify the class driver of the resume event */ + + if (priv->driver) + { + CLASS_RESUME(priv->driver, &priv->usbdev); + } +} + +/**************************************************************************** + * Name: stm32_suspendinterrupt + * + * Description: + * USB suspend interrupt + * + ****************************************************************************/ + +static inline void stm32_suspendinterrupt(FAR struct stm32_usbdev_s *priv) +{ +#ifdef CONFIG_USBDEV_LOWPOWER + uint32_t regval; +#endif + + /* Notify the class driver of the suspend event */ + + if (priv->driver) + { + CLASS_SUSPEND(priv->driver, &priv->usbdev); + } + +#ifdef CONFIG_USBDEV_LOWPOWER + /* OTGFS_DSTS_SUSPSTS is set as long as the suspend condition is detected + * on USB. Check if we are still have the suspend condition, that we are + * connected to the host, and that we have been configured. + */ + + regval = stm32_getreg(STM32_OTGFS_DSTS); + + if ((regval & OTGFS_DSTS_SUSPSTS) != 0 && devstate == DEVSTATE_CONFIGURED) + { + /* Switch off OTG FS clocking. Setting OTGFS_PCGCCTL_STPPCLK stops the + * PHY clock. + */ + + regval = stm32_getreg(STM32_OTGFS_PCGCCTL); + regval |= OTGFS_PCGCCTL_STPPCLK; + stm32_putreg(regval, STM32_OTGFS_PCGCCTL); + + /* Setting OTGFS_PCGCCTL_GATEHCLK gate HCLK to modules other than + * the AHB Slave and Master and wakeup logic. + */ + + regval |= OTGFS_PCGCCTL_GATEHCLK; + stm32_putreg(regval, STM32_OTGFS_PCGCCTL); + } +#endif + + /* Let the board-specific logic know that we have entered the suspend + * state + */ + + stm32l4_usbsuspend((FAR struct usbdev_s *)priv, false); +} + +/**************************************************************************** + * Name: stm32_rxinterrupt + * + * Description: + * RxFIFO non-empty interrupt. This interrupt indicates that there is at + * least one packet pending to be read from the RxFIFO. + * + ****************************************************************************/ + +static inline void stm32_rxinterrupt(FAR struct stm32_usbdev_s *priv) +{ + FAR struct stm32_ep_s *privep; + uint32_t regval; + int bcnt; + int epphy; + + /* Disable the Rx status queue level interrupt */ + + regval = stm32_getreg(STM32_OTGFS_GINTMSK); + regval &= ~OTGFS_GINT_RXFLVL; + stm32_putreg(regval, STM32_OTGFS_GINTMSK); + + /* Get the status from the top of the FIFO */ + + regval = stm32_getreg(STM32_OTGFS_GRXSTSP); + + /* Decode status fields */ + + epphy = (regval & OTGFS_GRXSTSD_EPNUM_MASK) >> OTGFS_GRXSTSD_EPNUM_SHIFT; + + if (epphy < STM32_NENDPOINTS) + { + privep = &priv->epout[epphy]; + + /* Handle the RX event according to the packet status field */ + + switch (regval & OTGFS_GRXSTSD_PKTSTS_MASK) + { + /* Global OUT NAK. This indicate that the global OUT NAK bit has taken + * effect. + * + * PKTSTS = Global OUT NAK, BCNT = 0, EPNUM = Don't Care, DPID = Don't + * Care. + */ + + case OTGFS_GRXSTSD_PKTSTS_OUTNAK: + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_OUTNAK), 0); + } + break; + + /* OUT data packet received. + * + * PKTSTS = DataOUT, BCNT = size of the received data OUT packet, + * EPNUM = EPNUM on which the packet was received, DPID = Actual Data PID. + */ + + case OTGFS_GRXSTSD_PKTSTS_OUTRECVD: + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_OUTRECVD), epphy); + bcnt = (regval & OTGFS_GRXSTSD_BCNT_MASK) >> OTGFS_GRXSTSD_BCNT_SHIFT; + if (bcnt > 0) + { + stm32_epout_receive(privep, bcnt); + } + } + break; + + /* OUT transfer completed. This indicates that an OUT data transfer for + * the specified OUT endpoint has completed. After this entry is popped + * from the receive FIFO, the core asserts a Transfer Completed interrupt + * on the specified OUT endpoint. + * + * PKTSTS = Data OUT Transfer Done, BCNT = 0, EPNUM = OUT EP Num on + * which the data transfer is complete, DPID = Don't Care. + */ + + case OTGFS_GRXSTSD_PKTSTS_OUTDONE: + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_OUTDONE), epphy); + } + break; + + /* SETUP transaction completed. This indicates that the Setup stage for + * the specified endpoint has completed and the Data stage has started. + * After this entry is popped from the receive FIFO, the core asserts a + * Setup interrupt on the specified control OUT endpoint (triggers an + * interrupt). + * + * PKTSTS = Setup Stage Done, BCNT = 0, EPNUM = Control EP Num, + * DPID = Don't Care. + */ + + case OTGFS_GRXSTSD_PKTSTS_SETUPDONE: + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_SETUPDONE), epphy); + } + break; + + /* SETUP data packet received. This indicates that a SETUP packet for the + * specified endpoint is now available for reading from the receive FIFO. + * + * PKTSTS = SETUP, BCNT = 8, EPNUM = Control EP Num, DPID = D0. + */ + + case OTGFS_GRXSTSD_PKTSTS_SETUPRECVD: + { + uint16_t datlen; + + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_SETUPRECVD), epphy); + + /* Read EP0 setup data. NOTE: If multiple SETUP packets are received, + * the last one overwrites the previous setup packets and only that + * last SETUP packet will be processed. + */ + + stm32_rxfifo_read(&priv->epout[EP0], (FAR uint8_t *)&priv->ctrlreq, + USB_SIZEOF_CTRLREQ); + + /* Was this an IN or an OUT SETUP packet. If it is an OUT SETUP, + * then we need to wait for the completion of the data phase to + * process the setup command. If it is an IN SETUP packet, then + * we must processing the command BEFORE we enter the DATA phase. + * + * If the data associated with the OUT SETUP packet is zero length, + * then, of course, we don't need to wait. + */ + + datlen = GETUINT16(priv->ctrlreq.len); + if (USB_REQ_ISOUT(priv->ctrlreq.type) && datlen > 0) + { + /* Clear NAKSTS so that we can receive the data */ + + regval = stm32_getreg(STM32_OTGFS_DOEPCTL0); + regval |= OTGFS_DOEPCTL0_CNAK; + stm32_putreg(regval, STM32_OTGFS_DOEPCTL0); + + /* Wait for the data phase. */ + + priv->ep0state = EP0STATE_SETUP_OUT; + } + else + { + /* We can process the setup data as soon as SETUP done word is + * popped of the RxFIFO. + */ + + priv->ep0state = EP0STATE_SETUP_READY; + } + } + break; + + default: + { + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), + (regval & OTGFS_GRXSTSD_PKTSTS_MASK) >> OTGFS_GRXSTSD_PKTSTS_SHIFT); + } + break; + } + } + + /* Enable the Rx Status Queue Level interrupt */ + + regval = stm32_getreg(STM32_OTGFS_GINTMSK); + regval |= OTGFS_GINT_RXFLVL; + stm32_putreg(regval, STM32_OTGFS_GINTMSK); +} + +/**************************************************************************** + * Name: stm32_enuminterrupt + * + * Description: + * Enumeration done interrupt + * + ****************************************************************************/ + +static inline void stm32_enuminterrupt(FAR struct stm32_usbdev_s *priv) +{ + uint32_t regval; + + /* Activate EP0 */ + + stm32_ep0in_activate(); + + /* Set USB turn-around time for the full speed device with internal PHY interface. */ + + regval = stm32_getreg(STM32_OTGFS_GUSBCFG); + regval &= ~OTGFS_GUSBCFG_TRDT_MASK; + regval |= OTGFS_GUSBCFG_TRDT(5); + stm32_putreg(regval, STM32_OTGFS_GUSBCFG); +} + +/**************************************************************************** + * Name: stm32_isocininterrupt + * + * Description: + * Incomplete isochronous IN transfer interrupt. Assertion of the incomplete + * isochronous IN transfer interrupt indicates an incomplete isochronous IN + * transfer on at least one of the isochronous IN endpoints. + * + ****************************************************************************/ + +#ifdef CONFIG_USBDEV_ISOCHRONOUS +static inline void stm32_isocininterrupt(FAR struct stm32_usbdev_s *priv) +{ + int i; + + /* The application must read the endpoint control register for all isochronous + * IN endpoints to detect endpoints with incomplete IN data transfers. + */ + + for (i = 0; i < STM32_NENDPOINTS; i++) + { + /* Is this an isochronous IN endpoint? */ + + privep = &priv->epin[i]; + if (privep->eptype != USB_EP_ATTR_XFER_ISOC) + { + /* No... keep looking */ + + continue; + } + + /* Is there an active read request on the isochronous OUT endpoint? */ + + if (!privep->active) + { + /* No.. the endpoint is not actively transmitting data */ + + continue; + } + + /* Check if this is the endpoint that had the incomplete transfer */ + + regaddr = STM32_OTGFS_DIEPCTL(privep->epphy); + doepctl = stm32_getreg(regaddr); + dsts = stm32_getreg(STM32_OTGFS_DSTS); + + /* EONUM = 0:even frame, 1:odd frame + * SOFFN = Frame number of the received SOF + */ + + eonum = ((doepctl & OTGFS_DIEPCTL_EONUM) != 0); + soffn = ((dsts & OTGFS_DSTS_SOFFN0) != 0); + + if (eonum != soffn) + { + /* Not this endpoint */ + + continue; + } + + /* For isochronous IN endpoints with incomplete transfers, + * the application must discard the data in the memory and + * disable the endpoint. + */ + + stm32_req_complete(privep, -EIO); +#warning "Will clear OTGFS_DIEPCTL_USBAEP too" + stm32_epin_disable(privep); + break; + } +} +#endif + +/**************************************************************************** + * Name: stm32_isocoutinterrupt + * + * Description: + * Incomplete periodic transfer interrupt + * + ****************************************************************************/ + +#ifdef CONFIG_USBDEV_ISOCHRONOUS +static inline void stm32_isocoutinterrupt(FAR struct stm32_usbdev_s *priv) +{ + FAR struct stm32_ep_s *privep; + FAR struct stm32_req_s *privreq; + uint32_t regaddr; + uint32_t doepctl; + uint32_t dsts; + bool eonum; + bool soffn; + + /* When it receives an IISOOXFR interrupt, the application must read the + * control registers of all isochronous OUT endpoints to determine which + * endpoints had an incomplete transfer in the current microframe. An + * endpoint transfer is incomplete if both the following conditions are true: + * + * DOEPCTLx:EONUM = DSTS:SOFFN[0], and + * DOEPCTLx:EPENA = 1 + */ + + for (i = 0; i < STM32_NENDPOINTS; i++) + { + /* Is this an isochronous OUT endpoint? */ + + privep = &priv->epout[i]; + if (privep->eptype != USB_EP_ATTR_XFER_ISOC) + { + /* No... keep looking */ + + continue; + } + + /* Is there an active read request on the isochronous OUT endpoint? */ + + if (!privep->active) + { + /* No.. the endpoint is not actively transmitting data */ + + continue; + } + + /* Check if this is the endpoint that had the incomplete transfer */ + + regaddr = STM32_OTGFS_DOEPCTL(privep->epphy); + doepctl = stm32_getreg(regaddr); + dsts = stm32_getreg(STM32_OTGFS_DSTS); + + /* EONUM = 0:even frame, 1:odd frame + * SOFFN = Frame number of the received SOF + */ + + eonum = ((doepctl & OTGFS_DOEPCTL_EONUM) != 0); + soffn = ((dsts & OTGFS_DSTS_SOFFN0) != 0); + + if (eonum != soffn) + { + /* Not this endpoint */ + + continue; + } + + /* For isochronous OUT endpoints with incomplete transfers, + * the application must discard the data in the memory and + * disable the endpoint. + */ + + stm32_req_complete(privep, -EIO); +#warning "Will clear OTGFS_DOEPCTL_USBAEP too" + stm32_epout_disable(privep); + break; + } +} +#endif + +/**************************************************************************** + * Name: stm32_sessioninterrupt + * + * Description: + * Session request/new session detected interrupt + * + ****************************************************************************/ + +#ifdef CONFIG_USBDEV_VBUSSENSING +static inline void stm32_sessioninterrupt(FAR struct stm32_usbdev_s *priv) +{ +#warning "Missing logic" +} +#endif + +/**************************************************************************** + * Name: stm32_otginterrupt + * + * Description: + * OTG interrupt + * + ****************************************************************************/ + +#ifdef CONFIG_USBDEV_VBUSSENSING +static inline void stm32_otginterrupt(FAR struct stm32_usbdev_s *priv) +{ + uint32_t regval; + + /* Check for session end detected */ + + regval = stm32_getreg(STM32_OTGFS_GOTGINT); + if ((regval & OTGFS_GOTGINT_SEDET) != 0) + { +#warning "Missing logic" + } + + /* Clear OTG interrupt */ + + stm32_putreg(retval, STM32_OTGFS_GOTGINT); +} +#endif + +/**************************************************************************** + * Name: stm32_usbinterrupt + * + * Description: + * USB interrupt handler + * + ****************************************************************************/ + +static int stm32_usbinterrupt(int irq, FAR void *context) +{ + /* At present, there is only a single OTG FS device support. Hence it is + * pre-allocated as g_otgfsdev. However, in most code, the private data + * structure will be referenced using the 'priv' pointer (rather than the + * global data) in order to simplify any future support for multiple devices. + */ + + FAR struct stm32_usbdev_s *priv = &g_otgfsdev; + uint32_t regval; + + usbtrace(TRACE_INTENTRY(STM32_TRACEINTID_USB), 0); + + /* Assure that we are in device mode */ + + DEBUGASSERT((stm32_getreg(STM32_OTGFS_GINTSTS) & OTGFS_GINTSTS_CMOD) == OTGFS_GINTSTS_DEVMODE); + + /* Get the state of all enabled interrupts. We will do this repeatedly + * some interrupts (like RXFLVL) will generate additional interrupting + * events. + */ + + for (; ; ) + { + /* Get the set of pending, un-masked interrupts */ + + regval = stm32_getreg(STM32_OTGFS_GINTSTS); + regval &= stm32_getreg(STM32_OTGFS_GINTMSK); + + /* Break out of the loop when there are no further pending (and + * unmasked) interrupts to be processes. + */ + + if (regval == 0) + { + break; + } + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_INTPENDING), (uint16_t)regval); + + /* OUT endpoint interrupt. The core sets this bit to indicate that an + * interrupt is pending on one of the OUT endpoints of the core. + */ + + if ((regval & OTGFS_GINT_OEP) != 0) + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPOUT), (uint16_t)regval); + stm32_epout_interrupt(priv); + stm32_putreg(OTGFS_GINT_OEP, STM32_OTGFS_GINTSTS); + } + + /* IN endpoint interrupt. The core sets this bit to indicate that + * an interrupt is pending on one of the IN endpoints of the core. + */ + + if ((regval & OTGFS_GINT_IEP) != 0) + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPIN), (uint16_t)regval); + stm32_epin_interrupt(priv); + stm32_putreg(OTGFS_GINT_IEP, STM32_OTGFS_GINTSTS); + } + + /* Host/device mode mismatch error interrupt */ + +#ifdef CONFIG_DEBUG_USB + if ((regval & OTGFS_GINT_MMIS) != 0) + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_MISMATCH), (uint16_t)regval); + stm32_putreg(OTGFS_GINT_MMIS, STM32_OTGFS_GINTSTS); + } +#endif + + /* Resume/remote wakeup detected interrupt */ + + if ((regval & OTGFS_GINT_WKUP) != 0) + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_WAKEUP), (uint16_t)regval); + stm32_resumeinterrupt(priv); + stm32_putreg(OTGFS_GINT_WKUP, STM32_OTGFS_GINTSTS); + } + + /* USB suspend interrupt */ + + if ((regval & OTGFS_GINT_USBSUSP) != 0) + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_SUSPEND), (uint16_t)regval); + stm32_suspendinterrupt(priv); + stm32_putreg(OTGFS_GINT_USBSUSP, STM32_OTGFS_GINTSTS); + } + + /* Start of frame interrupt */ + +#ifdef CONFIG_USBDEV_SOFINTERRUPT + if ((regval & OTGFS_GINT_SOF) != 0) + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_SOF), (uint16_t)regval); + stm32_putreg(OTGFS_GINT_SOF, STM32_OTGFS_GINTSTS); + } +#endif + + /* RxFIFO non-empty interrupt. Indicates that there is at least one + * packet pending to be read from the RxFIFO. + */ + + if ((regval & OTGFS_GINT_RXFLVL) != 0) + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_RXFIFO), (uint16_t)regval); + stm32_rxinterrupt(priv); + stm32_putreg(OTGFS_GINT_RXFLVL, STM32_OTGFS_GINTSTS); + } + + /* USB reset interrupt */ + + if ((regval & OTGFS_GINT_USBRST) != 0) + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_DEVRESET), (uint16_t)regval); + + /* Perform the device reset */ + + stm32_usbreset(priv); + usbtrace(TRACE_INTEXIT(STM32_TRACEINTID_USB), 0); + stm32_putreg(OTGFS_GINT_USBRST, STM32_OTGFS_GINTSTS); + return OK; + } + + /* Enumeration done interrupt */ + + if ((regval & OTGFS_GINT_ENUMDNE) != 0) + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_ENUMDNE), (uint16_t)regval); + stm32_enuminterrupt(priv); + stm32_putreg(OTGFS_GINT_ENUMDNE, STM32_OTGFS_GINTSTS); + } + + /* Incomplete isochronous IN transfer interrupt. When the core finds + * non-empty any of the isochronous IN endpoint FIFOs scheduled for + * the current frame non-empty, the core generates an IISOIXFR + * interrupt. + */ + +#ifdef CONFIG_USBDEV_ISOCHRONOUS + if ((regval & OTGFS_GINT_IISOIXFR) != 0) + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_IISOIXFR), (uint16_t)regval); + stm32_isocininterrupt(priv); + stm32_putreg(OTGFS_GINT_IISOIXFR, STM32_OTGFS_GINTSTS); + } + + /* Incomplete isochronous OUT transfer. For isochronous OUT + * endpoints, the XFRC interrupt may not always be asserted. If the + * core drops isochronous OUT data packets, the application could fail + * to detect the XFRC interrupt. The incomplete Isochronous OUT data + * interrupt indicates that an XFRC interrupt was not asserted on at + * least one of the isochronous OUT endpoints. At this point, the + * endpoint with the incomplete transfer remains enabled, but no active + * transfers remain in progress on this endpoint on the USB. + */ + + if ((regval & OTGFS_GINT_IISOOXFR) != 0) + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_IISOOXFR), (uint16_t)regval); + stm32_isocoutinterrupt(priv); + stm32_putreg(OTGFS_GINT_IISOOXFR, STM32_OTGFS_GINTSTS); + } +#endif + + /* Session request/new session detected interrupt */ + +#ifdef CONFIG_USBDEV_VBUSSENSING + if ((regval & OTGFS_GINT_SRQ) != 0) + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_SRQ), (uint16_t)regval); + stm32_sessioninterrupt(priv); + stm32_putreg(OTGFS_GINT_SRQ, STM32_OTGFS_GINTSTS); + } + + /* OTG interrupt */ + + if ((regval & OTGFS_GINT_OTG) != 0) + { + usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_OTG), (uint16_t)regval); + stm32_otginterrupt(priv); + stm32_putreg(OTGFS_GINT_OTG, STM32_OTGFS_GINTSTS); + } +#endif + } + + usbtrace(TRACE_INTEXIT(STM32_TRACEINTID_USB), 0); + return OK; +} + +/**************************************************************************** + * Endpoint operations + ****************************************************************************/ + +/**************************************************************************** + * Name: stm32_enablegonak + * + * Description: + * Enable global OUT NAK mode + * + ****************************************************************************/ + +static void stm32_enablegonak(FAR struct stm32_ep_s *privep) +{ + uint32_t regval; + + /* First, make sure that there is no GNOAKEFF interrupt pending. */ + +#if 0 + stm32_putreg(OTGFS_GINT_GONAKEFF, STM32_OTGFS_GINTSTS); +#endif + + /* Enable Global OUT NAK mode in the core. */ + + regval = stm32_getreg(STM32_OTGFS_DCTL); + regval |= OTGFS_DCTL_SGONAK; + stm32_putreg(regval, STM32_OTGFS_DCTL); + +#if 0 + /* Wait for the GONAKEFF interrupt that indicates that the OUT NAK + * mode is in effect. When the interrupt handler pops the OUTNAK word + * from the RxFIFO, the core sets the GONAKEFF interrupt. + */ + + while ((stm32_getreg(STM32_OTGFS_GINTSTS) & OTGFS_GINT_GONAKEFF) == 0); + stm32_putreg(OTGFS_GINT_GONAKEFF, STM32_OTGFS_GINTSTS); + +#else + /* Since we are in the interrupt handler, we cannot wait inline for the + * GONAKEFF because it cannot occur until service the RXFLVL global interrupt + * and pop the OUTNAK word from the RxFIFO. + * + * Perhaps it is sufficient to wait for Global OUT NAK status to be reported + * in OTGFS DCTL register? + */ + + while ((stm32_getreg(STM32_OTGFS_DCTL) & OTGFS_DCTL_GONSTS) == 0); +#endif +} + +/**************************************************************************** + * Name: stm32_disablegonak + * + * Description: + * Disable global OUT NAK mode + * + ****************************************************************************/ + +static void stm32_disablegonak(FAR struct stm32_ep_s *privep) +{ + uint32_t regval; + + /* Set the "Clear the Global OUT NAK bit" to disable global OUT NAK mode */ + + regval = stm32_getreg(STM32_OTGFS_DCTL); + regval |= OTGFS_DCTL_CGONAK; + stm32_putreg(regval, STM32_OTGFS_DCTL); +} + +/**************************************************************************** + * Name: stm32_epout_configure + * + * Description: + * Configure an OUT endpoint, making it usable + * + * Input Parameters: + * privep - a pointer to an internal endpoint structure + * eptype - The type of the endpoint + * maxpacket - The max packet size of the endpoint + * + ****************************************************************************/ + +static int stm32_epout_configure(FAR struct stm32_ep_s *privep, uint8_t eptype, + uint16_t maxpacket) +{ + uint32_t mpsiz; + uint32_t regaddr; + uint32_t regval; + + usbtrace(TRACE_EPCONFIGURE, privep->epphy); + + /* For EP0, the packet size is encoded */ + + if (privep->epphy == EP0) + { + DEBUGASSERT(eptype == USB_EP_ATTR_XFER_CONTROL); + + /* Map the size in bytes to the encoded value in the register */ + + switch (maxpacket) + { + case 8: + mpsiz = OTGFS_DOEPCTL0_MPSIZ_8; + break; + + case 16: + mpsiz = OTGFS_DOEPCTL0_MPSIZ_16; + break; + + case 32: + mpsiz = OTGFS_DOEPCTL0_MPSIZ_32; + break; + + case 64: + mpsiz = OTGFS_DOEPCTL0_MPSIZ_64; + break; + + default: + udbg("Unsupported maxpacket: %d\n", maxpacket); + return -EINVAL; + } + } + + /* For other endpoints, the packet size is in bytes */ + + else + { + mpsiz = (maxpacket << OTGFS_DOEPCTL_MPSIZ_SHIFT); + } + + /* If the endpoint is already active don't change the endpoint control + * register. + */ + + regaddr = STM32_OTGFS_DOEPCTL(privep->epphy); + regval = stm32_getreg(regaddr); + if ((regval & OTGFS_DOEPCTL_USBAEP) == 0) + { + if (regval & OTGFS_DOEPCTL_NAKSTS) + { + regval |= OTGFS_DOEPCTL_CNAK; + } + + regval &= ~(OTGFS_DOEPCTL_MPSIZ_MASK | OTGFS_DOEPCTL_EPTYP_MASK); + regval |= mpsiz; + regval |= (eptype << OTGFS_DOEPCTL_EPTYP_SHIFT); + regval |= (OTGFS_DOEPCTL_SD0PID | OTGFS_DOEPCTL_USBAEP); + stm32_putreg(regval, regaddr); + + /* Save the endpoint configuration */ + + privep->ep.maxpacket = maxpacket; + privep->eptype = eptype; + privep->stalled = false; + } + + /* Enable the interrupt for this endpoint */ + + regval = stm32_getreg(STM32_OTGFS_DAINTMSK); + regval |= OTGFS_DAINT_OEP(privep->epphy); + stm32_putreg(regval, STM32_OTGFS_DAINTMSK); + return OK; +} + +/**************************************************************************** + * Name: stm32_epin_configure + * + * Description: + * Configure an IN endpoint, making it usable + * + * Input Parameters: + * privep - a pointer to an internal endpoint structure + * eptype - The type of the endpoint + * maxpacket - The max packet size of the endpoint + * + ****************************************************************************/ + +static int stm32_epin_configure(FAR struct stm32_ep_s *privep, uint8_t eptype, + uint16_t maxpacket) +{ + uint32_t mpsiz; + uint32_t regaddr; + uint32_t regval; + + usbtrace(TRACE_EPCONFIGURE, privep->epphy); + + /* For EP0, the packet size is encoded */ + + if (privep->epphy == EP0) + { + DEBUGASSERT(eptype == USB_EP_ATTR_XFER_CONTROL); + + /* Map the size in bytes to the encoded value in the register */ + + switch (maxpacket) + { + case 8: + mpsiz = OTGFS_DIEPCTL0_MPSIZ_8; + break; + + case 16: + mpsiz = OTGFS_DIEPCTL0_MPSIZ_16; + break; + + case 32: + mpsiz = OTGFS_DIEPCTL0_MPSIZ_32; + break; + + case 64: + mpsiz = OTGFS_DIEPCTL0_MPSIZ_64; + break; + + default: + udbg("Unsupported maxpacket: %d\n", maxpacket); + return -EINVAL; + } + } + + /* For other endpoints, the packet size is in bytes */ + + else + { + mpsiz = (maxpacket << OTGFS_DIEPCTL_MPSIZ_SHIFT); + } + + + /* If the endpoint is already active don't change the endpoint control + * register. + */ + + regaddr = STM32_OTGFS_DIEPCTL(privep->epphy); + regval = stm32_getreg(regaddr); + if ((regval & OTGFS_DIEPCTL_USBAEP) == 0) + { + if (regval & OTGFS_DIEPCTL_NAKSTS) + { + regval |= OTGFS_DIEPCTL_CNAK; + } + + regval &= ~(OTGFS_DIEPCTL_MPSIZ_MASK | OTGFS_DIEPCTL_EPTYP_MASK | OTGFS_DIEPCTL_TXFNUM_MASK); + regval |= mpsiz; + regval |= (eptype << OTGFS_DIEPCTL_EPTYP_SHIFT); + regval |= (eptype << OTGFS_DIEPCTL_TXFNUM_SHIFT); + regval |= (OTGFS_DIEPCTL_SD0PID | OTGFS_DIEPCTL_USBAEP); + stm32_putreg(regval, regaddr); + + /* Save the endpoint configuration */ + + privep->ep.maxpacket = maxpacket; + privep->eptype = eptype; + privep->stalled = false; + } + + /* Enable the interrupt for this endpoint */ + + regval = stm32_getreg(STM32_OTGFS_DAINTMSK); + regval |= OTGFS_DAINT_IEP(privep->epphy); + stm32_putreg(regval, STM32_OTGFS_DAINTMSK); + + return OK; +} + +/**************************************************************************** + * Name: stm32_ep_configure + * + * Description: + * Configure endpoint, making it usable + * + * Input Parameters: + * ep - the struct usbdev_ep_s instance obtained from allocep() + * desc - A struct usb_epdesc_s instance describing the endpoint + * last - true if this this last endpoint to be configured. Some hardware + * needs to take special action when all of the endpoints have been + * configured. + * + ****************************************************************************/ + +static int stm32_ep_configure(FAR struct usbdev_ep_s *ep, + FAR const struct usb_epdesc_s *desc, + bool last) +{ + FAR struct stm32_ep_s *privep = (FAR struct stm32_ep_s *)ep; + uint16_t maxpacket; + uint8_t eptype; + int ret; + + usbtrace(TRACE_EPCONFIGURE, privep->epphy); + DEBUGASSERT(desc->addr == ep->eplog); + + /* Initialize EP capabilities */ + + maxpacket = GETUINT16(desc->mxpacketsize); + eptype = desc->attr & USB_EP_ATTR_XFERTYPE_MASK; + + /* Setup Endpoint Control Register */ + + if (privep->isin) + { + ret = stm32_epin_configure(privep, eptype, maxpacket); + } + else + { + ret = stm32_epout_configure(privep, eptype, maxpacket); + } + + return ret; +} + +/**************************************************************************** + * Name: stm32_ep0_configure + * + * Description: + * Reset Usb engine + * + ****************************************************************************/ + +static void stm32_ep0_configure(FAR struct stm32_usbdev_s *priv) +{ + /* Enable EP0 IN and OUT */ + + (void)stm32_epin_configure(&priv->epin[EP0], USB_EP_ATTR_XFER_CONTROL, + CONFIG_USBDEV_EP0_MAXSIZE); + (void)stm32_epout_configure(&priv->epout[EP0], USB_EP_ATTR_XFER_CONTROL, + CONFIG_USBDEV_EP0_MAXSIZE); +} + +/**************************************************************************** + * Name: stm32_epout_disable + * + * Description: + * Diable an OUT endpoint will no longer be used + * + ****************************************************************************/ + +static void stm32_epout_disable(FAR struct stm32_ep_s *privep) +{ + uint32_t regaddr; + uint32_t regval; + irqstate_t flags; + + usbtrace(TRACE_EPDISABLE, privep->epphy); + + /* Is this an IN or an OUT endpoint */ + + /* Before disabling any OUT endpoint, the application must enable + * Global OUT NAK mode in the core. + */ + + flags = enter_critical_section(); + stm32_enablegonak(privep); + + /* Disable the required OUT endpoint by setting the EPDIS and SNAK bits + * int DOECPTL register. + */ + + regaddr = STM32_OTGFS_DOEPCTL(privep->epphy); + regval = stm32_getreg(regaddr); + regval &= ~OTGFS_DOEPCTL_USBAEP; + regval |= (OTGFS_DOEPCTL_EPDIS | OTGFS_DOEPCTL_SNAK); + stm32_putreg(regval, regaddr); + + /* Wait for the EPDISD interrupt which indicates that the OUT + * endpoint is completely disabled. + */ + +#if 0 /* Doesn't happen */ + regaddr = STM32_OTGFS_DOEPINT(privep->epphy); + while ((stm32_getreg(regaddr) & OTGFS_DOEPINT_EPDISD) == 0); +#else + /* REVISIT: */ + up_udelay(10); +#endif + + /* Clear the EPDISD interrupt indication */ + + stm32_putreg(OTGFS_DOEPINT_EPDISD, STM32_OTGFS_DOEPINT(privep->epphy)); + + /* Then disable the Global OUT NAK mode to continue receiving data + * from other non-disabled OUT endpoints. + */ + + stm32_disablegonak(privep); + + /* Disable endpoint interrupts */ + + regval = stm32_getreg(STM32_OTGFS_DAINTMSK); + regval &= ~OTGFS_DAINT_OEP(privep->epphy); + stm32_putreg(regval, STM32_OTGFS_DAINTMSK); + + /* Cancel any queued read requests */ + + stm32_req_cancel(privep, -ESHUTDOWN); + + leave_critical_section(flags); +} + +/**************************************************************************** + * Name: stm32_epin_disable + * + * Description: + * Disable an IN endpoint when it will no longer be used + * + ****************************************************************************/ + +static void stm32_epin_disable(FAR struct stm32_ep_s *privep) +{ + uint32_t regaddr; + uint32_t regval; + irqstate_t flags; + + usbtrace(TRACE_EPDISABLE, privep->epphy); + + /* After USB reset, the endpoint will already be deactivated by the + * hardware. Trying to disable again will just hang in the wait. + */ + + regaddr = STM32_OTGFS_DIEPCTL(privep->epphy); + regval = stm32_getreg(regaddr); + if ((regval & OTGFS_DIEPCTL_USBAEP) == 0) + { + return; + } + + /* This INEPNE wait logic is suggested by reference manual, but seems + * to get stuck to infinite loop. + */ + +#if 0 + /* Make sure that there is no pending IPEPNE interrupt (because we are + * to poll this bit below). + */ + + stm32_putreg(OTGFS_DIEPINT_INEPNE, STM32_OTGFS_DIEPINT(privep->epphy)); + + /* Set the endpoint in NAK mode */ + + regaddr = STM32_OTGFS_DIEPCTL(privep->epphy); + regval = stm32_getreg(regaddr); + regval &= ~OTGFS_DIEPCTL_USBAEP; + regval |= (OTGFS_DIEPCTL_EPDIS | OTGFS_DIEPCTL_SNAK); + stm32_putreg(regval, regaddr); + + /* Wait for the INEPNE interrupt that indicates that we are now in NAK mode */ + + regaddr = STM32_OTGFS_DIEPINT(privep->epphy); + while ((stm32_getreg(regaddr) & OTGFS_DIEPINT_INEPNE) == 0); + + /* Clear the INEPNE interrupt indication */ + + stm32_putreg(OTGFS_DIEPINT_INEPNE, regaddr); +#endif + + /* Deactivate and disable the endpoint by setting the EPDIS and SNAK bits + * the DIEPCTLx register. + */ + + flags = enter_critical_section(); + regaddr = STM32_OTGFS_DIEPCTL(privep->epphy); + regval = stm32_getreg(regaddr); + regval &= ~OTGFS_DIEPCTL_USBAEP; + regval |= (OTGFS_DIEPCTL_EPDIS | OTGFS_DIEPCTL_SNAK); + stm32_putreg(regval, regaddr); + + /* Wait for the EPDISD interrupt which indicates that the IN + * endpoint is completely disabled. + */ + + regaddr = STM32_OTGFS_DIEPINT(privep->epphy); + while ((stm32_getreg(regaddr) & OTGFS_DIEPINT_EPDISD) == 0); + + /* Clear the EPDISD interrupt indication */ + + stm32_putreg(OTGFS_DIEPINT_EPDISD, stm32_getreg(regaddr)); + + /* Flush any data remaining in the TxFIFO */ + + stm32_txfifo_flush(OTGFS_GRSTCTL_TXFNUM_D(privep->epphy)); + + /* Disable endpoint interrupts */ + + regval = stm32_getreg(STM32_OTGFS_DAINTMSK); + regval &= ~OTGFS_DAINT_IEP(privep->epphy); + stm32_putreg(regval, STM32_OTGFS_DAINTMSK); + + /* Cancel any queued write requests */ + + stm32_req_cancel(privep, -ESHUTDOWN); + leave_critical_section(flags); +} + +/**************************************************************************** + * Name: stm32_ep_disable + * + * Description: + * The endpoint will no longer be used + * + ****************************************************************************/ + +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 + if (!ep) + { + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0); + return -EINVAL; + } +#endif + + usbtrace(TRACE_EPDISABLE, privep->epphy); + + /* Is this an IN or an OUT endpoint */ + + if (privep->isin) + { + /* Disable the IN endpoint */ + + stm32_epin_disable(privep); + } + else + { + /* Disable the OUT endpoint */ + + stm32_epout_disable(privep); + } + + return OK; +} + +/**************************************************************************** + * Name: stm32_ep_allocreq + * + * Description: + * Allocate an I/O request + * + ****************************************************************************/ + +static FAR struct usbdev_req_s *stm32_ep_allocreq(FAR struct usbdev_ep_s *ep) +{ + FAR struct stm32_req_s *privreq; + +#ifdef CONFIG_DEBUG + if (!ep) + { + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0); + return NULL; + } +#endif + + usbtrace(TRACE_EPALLOCREQ, ((FAR struct stm32_ep_s *)ep)->epphy); + + privreq = (FAR struct stm32_req_s *)kmm_malloc(sizeof(struct stm32_req_s)); + if (!privreq) + { + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_ALLOCFAIL), 0); + return NULL; + } + + memset(privreq, 0, sizeof(struct stm32_req_s)); + return &privreq->req; +} + +/**************************************************************************** + * Name: stm32_ep_freereq + * + * Description: + * Free an I/O request + * + ****************************************************************************/ + +static void stm32_ep_freereq(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *req) +{ + FAR struct stm32_req_s *privreq = (FAR struct stm32_req_s *)req; + +#ifdef CONFIG_DEBUG + if (!ep || !req) + { + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0); + return; + } +#endif + + usbtrace(TRACE_EPFREEREQ, ((FAR struct stm32_ep_s *)ep)->epphy); + kmm_free(privreq); +} + +/**************************************************************************** + * Name: stm32_ep_allocbuffer + * + * Description: + * Allocate an I/O buffer + * + ****************************************************************************/ + +#ifdef CONFIG_USBDEV_DMA +static void *stm32_ep_allocbuffer(FAR struct usbdev_ep_s *ep, unsigned bytes) +{ + usbtrace(TRACE_EPALLOCBUFFER, privep->epphy); + +#ifdef CONFIG_USBDEV_DMAMEMORY + return usbdev_dma_alloc(bytes); +#else + return kmm_malloc(bytes); +#endif +} +#endif + +/**************************************************************************** + * Name: stm32_ep_freebuffer + * + * Description: + * Free an I/O buffer + * + ****************************************************************************/ + +#ifdef CONFIG_USBDEV_DMA +static void stm32_ep_freebuffer(FAR struct usbdev_ep_s *ep, FAR void *buf) +{ + usbtrace(TRACE_EPFREEBUFFER, privep->epphy); + +#ifdef CONFIG_USBDEV_DMAMEMORY + usbdev_dma_free(buf); +#else + kmm_free(buf); +#endif +} +#endif + +/**************************************************************************** + * Name: stm32_ep_submit + * + * Description: + * Submit an I/O request to the endpoint + * + ****************************************************************************/ + +static int stm32_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *req) +{ + FAR struct stm32_req_s *privreq = (FAR struct stm32_req_s *)req; + FAR struct stm32_ep_s *privep = (FAR struct stm32_ep_s *)ep; + FAR struct stm32_usbdev_s *priv; + irqstate_t flags; + int ret = OK; + + /* Some sanity checking */ + +#ifdef CONFIG_DEBUG + 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); + return -EINVAL; + } +#endif + + usbtrace(TRACE_EPSUBMIT, privep->epphy); + priv = privep->dev; + +#ifdef CONFIG_DEBUG + if (!priv->driver) + { + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_NOTCONFIGURED), priv->usbdev.speed); + return -ESHUTDOWN; + } +#endif + + /* Handle the request from the class driver */ + + req->result = -EINPROGRESS; + req->xfrd = 0; + + /* Disable Interrupts */ + + flags = enter_critical_section(); + + /* If we are stalled, then drop all requests on the floor */ + + if (privep->stalled) + { + ret = -EBUSY; + } + else + { + /* Add the new request to the request queue for the endpoint. */ + + if (stm32_req_addlast(privep, privreq) && !privep->active) + { + /* If a request was added to an IN endpoint, then attempt to send + * the request data buffer now. + */ + + if (privep->isin) + { + usbtrace(TRACE_INREQQUEUED(privep->epphy), privreq->req.len); + + /* If the endpoint is not busy with another write request, + * then process the newly received write request now. + */ + + if (!privep->active) + { + stm32_epin_request(priv, privep); + } + } + + /* If the request was added to an OUT endpoint, then attempt to + * setup a read into the request data buffer now (this will, of + * course, fail if there is already a read in place). + */ + + else + { + usbtrace(TRACE_OUTREQQUEUED(privep->epphy), privreq->req.len); + stm32_epout_request(priv, privep); + } + } + } + + leave_critical_section(flags); + return ret; +} + +/**************************************************************************** + * Name: stm32_ep_cancel + * + * Description: + * Cancel an I/O request previously sent to an endpoint + * + ****************************************************************************/ + +static int stm32_ep_cancel(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *req) +{ + FAR struct stm32_ep_s *privep = (FAR struct stm32_ep_s *)ep; + irqstate_t flags; + +#ifdef CONFIG_DEBUG + if (!ep || !req) + { + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0); + return -EINVAL; + } +#endif + + usbtrace(TRACE_EPCANCEL, privep->epphy); + + flags = enter_critical_section(); + + /* FIXME: if the request is the first, then we need to flush the EP + * otherwise just remove it from the list + * + * but ... all other implementations cancel all requests ... + */ + + stm32_req_cancel(privep, -ESHUTDOWN); + leave_critical_section(flags); + return OK; +} + +/**************************************************************************** + * Name: stm32_epout_setstall + * + * Description: + * Stall an OUT endpoint + * + ****************************************************************************/ + +static int stm32_epout_setstall(FAR struct stm32_ep_s *privep) +{ +#if 1 + /* This implementation follows the requirements from the STM32 F4 reference + * manual. + */ + + uint32_t regaddr; + uint32_t regval; + + /* Put the core in the Global OUT NAK mode */ + + stm32_enablegonak(privep); + + /* Disable and STALL the OUT endpoint by setting the EPDIS and STALL bits + * in the DOECPTL register. + */ + + regaddr = STM32_OTGFS_DOEPCTL(privep->epphy); + regval = stm32_getreg(regaddr); + regval |= (OTGFS_DOEPCTL_EPDIS | OTGFS_DOEPCTL_STALL); + stm32_putreg(regval, regaddr); + + /* Wait for the EPDISD interrupt which indicates that the OUT + * endpoint is completely disabled. + */ + +#if 0 /* Doesn't happen */ + regaddr = STM32_OTGFS_DOEPINT(privep->epphy); + while ((stm32_getreg(regaddr) & OTGFS_DOEPINT_EPDISD) == 0); +#else + /* REVISIT: */ + up_udelay(10); +#endif + + /* Disable Global OUT NAK mode */ + + stm32_disablegonak(privep); + + /* The endpoint is now stalled */ + + privep->stalled = true; + return OK; +#else + /* This implementation follows the STMicro code example. */ + /* REVISIT: */ + + uint32_t regaddr; + uint32_t regval; + + /* Stall the OUT endpoint by setting the STALL bit in the DOECPTL register. */ + + regaddr = STM32_OTGFS_DOEPCTL(privep->epphy); + regval = stm32_getreg(regaddr); + regval |= OTGFS_DOEPCTL_STALL; + stm32_putreg(regval, regaddr); + + /* The endpoint is now stalled */ + + privep->stalled = true; + return OK; +#endif +} + +/**************************************************************************** + * Name: stm32_epin_setstall + * + * Description: + * Stall an IN endpoint + * + ****************************************************************************/ + +static int stm32_epin_setstall(FAR struct stm32_ep_s *privep) +{ + uint32_t regaddr; + uint32_t regval; + + /* Get the IN endpoint device control register */ + + regaddr = STM32_OTGFS_DIEPCTL(privep->epphy); + regval = stm32_getreg(regaddr); + + /* Then stall the endpoint */ + + regval |= OTGFS_DIEPCTL_STALL; + stm32_putreg(regval, regaddr); + + /* The endpoint is now stalled */ + + privep->stalled = true; + return OK; +} + +/**************************************************************************** + * Name: stm32_ep_setstall + * + * Description: + * Stall an endpoint + * + ****************************************************************************/ + +static int stm32_ep_setstall(FAR struct stm32_ep_s *privep) +{ + usbtrace(TRACE_EPSTALL, privep->epphy); + + /* Is this an IN endpoint? */ + + if (privep->isin == 1) + { + return stm32_epin_setstall(privep); + } + else + { + return stm32_epout_setstall(privep); + } +} + +/**************************************************************************** + * Name: stm32_ep_clrstall + * + * Description: + * Resume a stalled endpoint + * + ****************************************************************************/ + +static int stm32_ep_clrstall(FAR struct stm32_ep_s *privep) +{ + uint32_t regaddr; + uint32_t regval; + uint32_t stallbit; + uint32_t data0bit; + + usbtrace(TRACE_EPRESUME, privep->epphy); + + /* Is this an IN endpoint? */ + + if (privep->isin == 1) + { + /* Clear the stall bit in the IN endpoint device control register */ + + regaddr = STM32_OTGFS_DIEPCTL(privep->epphy); + stallbit = OTGFS_DIEPCTL_STALL; + data0bit = OTGFS_DIEPCTL_SD0PID; + } + else + { + /* Clear the stall bit in the IN endpoint device control register */ + + regaddr = STM32_OTGFS_DOEPCTL(privep->epphy); + stallbit = OTGFS_DOEPCTL_STALL; + data0bit = OTGFS_DOEPCTL_SD0PID; + } + + /* Clear the stall bit */ + + regval = stm32_getreg(regaddr); + regval &= ~stallbit; + + /* Set the DATA0 pid for interrupt and bulk endpoints */ + + if (privep->eptype == USB_EP_ATTR_XFER_INT || + privep->eptype == USB_EP_ATTR_XFER_BULK) + { + /* Writing this bit sets the DATA0 PID */ + + regval |= data0bit; + } + + stm32_putreg(regval, regaddr); + + /* The endpoint is no longer stalled */ + + privep->stalled = false; + return OK; +} + +/**************************************************************************** + * Name: stm32_ep_stall + * + * Description: + * Stall or resume an endpoint + * + ****************************************************************************/ + +static int stm32_ep_stall(FAR struct usbdev_ep_s *ep, bool resume) +{ + FAR struct stm32_ep_s *privep = (FAR struct stm32_ep_s *)ep; + irqstate_t flags; + int ret; + + /* Set or clear the stall condition as requested */ + + flags = enter_critical_section(); + if (resume) + { + ret = stm32_ep_clrstall(privep); + } + else + { + ret = stm32_ep_setstall(privep); + } + leave_critical_section(flags); + + return ret; +} + +/**************************************************************************** + * Name: stm32_ep0_stall + * + * Description: + * Stall endpoint 0 + * + ****************************************************************************/ + +static void stm32_ep0_stall(FAR struct stm32_usbdev_s *priv) +{ + stm32_epin_setstall(&priv->epin[EP0]); + stm32_epout_setstall(&priv->epout[EP0]); + priv->stalled = true; + stm32_ep0out_ctrlsetup(priv); +} + +/**************************************************************************** + * Device operations + ****************************************************************************/ + +/**************************************************************************** + * Name: stm32_ep_alloc + * + * Description: + * Allocate an endpoint matching the parameters. + * + * Input Parameters: + * eplog - 7-bit logical endpoint number (direction bit ignored). Zero means + * that any endpoint matching the other requirements will suffice. The + * assigned endpoint can be found in the eplog field. + * in - true: IN (device-to-host) endpoint requested + * eptype - Endpoint type. One of {USB_EP_ATTR_XFER_ISOC, USB_EP_ATTR_XFER_BULK, + * USB_EP_ATTR_XFER_INT} + * + ****************************************************************************/ + +static FAR struct usbdev_ep_s *stm32_ep_alloc(FAR struct usbdev_s *dev, + uint8_t eplog, bool in, + uint8_t eptype) +{ + FAR struct stm32_usbdev_s *priv = (FAR struct stm32_usbdev_s *)dev; + uint8_t epavail; + irqstate_t flags; + int epphy; + int epno = 0; + + usbtrace(TRACE_DEVALLOCEP, (uint16_t)eplog); + + /* Ignore any direction bits in the logical address */ + + epphy = USB_EPNO(eplog); + + /* Get the set of available endpoints depending on the direction */ + + flags = enter_critical_section(); + epavail = priv->epavail[in]; + + /* A physical address of 0 means that any endpoint will do */ + + if (epphy > 0) + { + /* Otherwise, we will return the endpoint structure only for the requested + * 'logical' endpoint. All of the other checks will still be performed. + * + * First, verify that the logical endpoint is in the range supported by + * by the hardware. + */ + + if (epphy >= STM32_NENDPOINTS) + { + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADEPNO), (uint16_t)epphy); + return NULL; + } + + /* Remove all of the candidate endpoints from the bitset except for the + * this physical endpoint number. + */ + + epavail &= (1 << epphy); + } + + /* Is there an available endpoint? */ + + if (epavail) + { + /* Yes.. Select the lowest numbered endpoint in the set of available + * endpoints. + */ + + for (epno = 1; epno < STM32_NENDPOINTS; epno++) + { + uint8_t bit = 1 << epno; + if ((epavail & bit) != 0) + { + /* Mark the endpoint no longer available */ + + priv->epavail[in] &= ~(1 << epno); + + /* And return the pointer to the standard endpoint structure */ + + leave_critical_section(flags); + return in ? &priv->epin[epno].ep : &priv->epout[epno].ep; + } + } + + /* We should not get here */ + } + + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_NOEP), (uint16_t)eplog); + leave_critical_section(flags); + return NULL; +} + +/**************************************************************************** + * Name: stm32_ep_free + * + * Description: + * Free the previously allocated endpoint + * + ****************************************************************************/ + +static void stm32_ep_free(FAR struct usbdev_s *dev, FAR struct usbdev_ep_s *ep) +{ + FAR struct stm32_usbdev_s *priv = (FAR struct stm32_usbdev_s *)dev; + FAR struct stm32_ep_s *privep = (FAR struct stm32_ep_s *)ep; + irqstate_t flags; + + usbtrace(TRACE_DEVFREEEP, (uint16_t)privep->epphy); + + if (priv && privep) + { + /* Mark the endpoint as available */ + + flags = enter_critical_section(); + priv->epavail[privep->isin] |= (1 << privep->epphy); + leave_critical_section(flags); + } +} + +/**************************************************************************** + * Name: stm32_getframe + * + * Description: + * Returns the current frame number + * + ****************************************************************************/ + +static int stm32_getframe(struct usbdev_s *dev) +{ + uint32_t regval; + + usbtrace(TRACE_DEVGETFRAME, 0); + + /* Return the last frame number of the last SOF detected by the hardware */ + + regval = stm32_getreg(STM32_OTGFS_DSTS); + return (int)((regval & OTGFS_DSTS_SOFFN_MASK) >> OTGFS_DSTS_SOFFN_SHIFT); +} + +/**************************************************************************** + * Name: stm32_wakeup + * + * Description: + * Exit suspend mode. + * + ****************************************************************************/ + +static int stm32_wakeup(struct usbdev_s *dev) +{ + FAR struct stm32_usbdev_s *priv = (FAR struct stm32_usbdev_s *)dev; + uint32_t regval; + irqstate_t flags; + + usbtrace(TRACE_DEVWAKEUP, 0); + + /* Is wakeup enabled? */ + + flags = enter_critical_section(); + if (priv->wakeup) + { + /* Yes... is the core suspended? */ + + regval = stm32_getreg(STM32_OTGFS_DSTS); + if ((regval & OTGFS_DSTS_SUSPSTS) != 0) + { + /* Re-start the PHY clock and un-gate USB core clock (HCLK) */ + +#ifdef CONFIG_USBDEV_LOWPOWER + regval = stm32_getreg(STM32_OTGFS_PCGCCTL); + regval &= ~(OTGFS_PCGCCTL_STPPCLK | OTGFS_PCGCCTL_GATEHCLK); + stm32_putreg(regval, STM32_OTGFS_PCGCCTL); +#endif + /* Activate Remote wakeup signaling */ + + regval = stm32_getreg(STM32_OTGFS_DCTL); + regval |= OTGFS_DCTL_RWUSIG; + stm32_putreg(regval, STM32_OTGFS_DCTL); + up_mdelay(5); + regval &= ~OTGFS_DCTL_RWUSIG; + stm32_putreg(regval, STM32_OTGFS_DCTL); + } + } + + leave_critical_section(flags); + return OK; +} + +/**************************************************************************** + * Name: stm32_selfpowered + * + * Description: + * Sets/clears the device self-powered feature + * + ****************************************************************************/ + +static int stm32_selfpowered(struct usbdev_s *dev, bool selfpowered) +{ + FAR struct stm32_usbdev_s *priv = (FAR struct stm32_usbdev_s *)dev; + + usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered); + +#ifdef CONFIG_DEBUG + if (!dev) + { + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0); + return -ENODEV; + } +#endif + + priv->selfpowered = selfpowered; + return OK; +} + +/**************************************************************************** + * Name: stm32_pullup + * + * Description: + * Software-controlled connect to/disconnect from USB host + * + ****************************************************************************/ + +static int stm32_pullup(struct usbdev_s *dev, bool enable) +{ + uint32_t regval; + + usbtrace(TRACE_DEVPULLUP, (uint16_t)enable); + + irqstate_t flags = enter_critical_section(); + regval = stm32_getreg(STM32_OTGFS_DCTL); + if (enable) + { + /* Connect the device by clearing the soft disconnect bit in the DCTL + * register + */ + + regval &= ~OTGFS_DCTL_SDIS; + } + else + { + /* Connect the device by setting the soft disconnect bit in the DCTL + * register + */ + + regval |= OTGFS_DCTL_SDIS; + } + + stm32_putreg(regval, STM32_OTGFS_DCTL); + leave_critical_section(flags); + return OK; +} + +/**************************************************************************** + * Name: stm32_setaddress + * + * Description: + * Set the devices USB address + * + ****************************************************************************/ + +static void stm32_setaddress(struct stm32_usbdev_s *priv, uint16_t address) +{ + uint32_t regval; + + /* Set the device address in the DCFG register */ + + regval = stm32_getreg(STM32_OTGFS_DCFG); + regval &= ~OTGFS_DCFG_DAD_MASK; + regval |= ((uint32_t)address << OTGFS_DCFG_DAD_SHIFT); + stm32_putreg(regval, STM32_OTGFS_DCFG); + + /* Are we now addressed? (i.e., do we have a non-NULL device + * address?) + */ + + if (address != 0) + { + priv->devstate = DEVSTATE_ADDRESSED; + priv->addressed = true; + } + else + { + priv->devstate = DEVSTATE_DEFAULT; + priv->addressed = false; + } +} + +/**************************************************************************** + * Name: stm32_txfifo_flush + * + * Description: + * Flush the specific TX fifo. + * + ****************************************************************************/ + +static int stm32_txfifo_flush(uint32_t txfnum) +{ + uint32_t regval; + uint32_t timeout; + + /* Initiate the TX FIFO flush operation */ + + regval = OTGFS_GRSTCTL_TXFFLSH | txfnum; + stm32_putreg(regval, STM32_OTGFS_GRSTCTL); + + /* Wait for the FLUSH to complete */ + + for (timeout = 0; timeout < STM32_FLUSH_DELAY; timeout++) + { + regval = stm32_getreg(STM32_OTGFS_GRSTCTL); + if ((regval & OTGFS_GRSTCTL_TXFFLSH) == 0) + { + break; + } + } + + /* Wait for 3 PHY Clocks */ + + up_udelay(3); + return OK; +} + +/**************************************************************************** + * Name: stm32_rxfifo_flush + * + * Description: + * Flush the RX fifo. + * + ****************************************************************************/ + +static int stm32_rxfifo_flush(void) +{ + uint32_t regval; + uint32_t timeout; + + /* Initiate the RX FIFO flush operation */ + + stm32_putreg(OTGFS_GRSTCTL_RXFFLSH, STM32_OTGFS_GRSTCTL); + + /* Wait for the FLUSH to complete */ + + for (timeout = 0; timeout < STM32_FLUSH_DELAY; timeout++) + { + regval = stm32_getreg(STM32_OTGFS_GRSTCTL); + if ((regval & OTGFS_GRSTCTL_RXFFLSH) == 0) + { + break; + } + } + + /* Wait for 3 PHY Clocks */ + + up_udelay(3); + return OK; +} + +/**************************************************************************** + * Name: stm32_swinitialize + * + * Description: + * Initialize all driver data structures. + * + ****************************************************************************/ + +static void stm32_swinitialize(FAR struct stm32_usbdev_s *priv) +{ + FAR struct stm32_ep_s *privep; + int i; + + /* Initialize the device state structure */ + + memset(priv, 0, sizeof(struct stm32_usbdev_s)); + + priv->usbdev.ops = &g_devops; + priv->usbdev.ep0 = &priv->epin[EP0].ep; + + priv->epavail[0] = STM32_EP_AVAILABLE; + priv->epavail[1] = STM32_EP_AVAILABLE; + + priv->epin[EP0].ep.priv = priv; + priv->epout[EP0].ep.priv = priv; + + /* Initialize the endpoint lists */ + + for (i = 0; i < STM32_NENDPOINTS; i++) + { + /* Set endpoint operations, reference to driver structure (not + * really necessary because there is only one controller), and + * the physical endpoint number (which is just the index to the + * endpoint). + */ + + privep = &priv->epin[i]; + privep->ep.ops = &g_epops; + privep->dev = priv; + privep->isin = 1; + + /* The index, i, is the physical endpoint address; Map this + * to a logical endpoint address usable by the class driver. + */ + + privep->epphy = i; + privep->ep.eplog = STM32_EPPHYIN2LOG(i); + + /* Control until endpoint is activated */ + + privep->eptype = USB_EP_ATTR_XFER_CONTROL; + privep->ep.maxpacket = CONFIG_USBDEV_EP0_MAXSIZE; + } + + /* Initialize the endpoint lists */ + + for (i = 0; i < STM32_NENDPOINTS; i++) + { + /* Set endpoint operations, reference to driver structure (not + * really necessary because there is only one controller), and + * the physical endpoint number (which is just the index to the + * endpoint). + */ + + privep = &priv->epout[i]; + privep->ep.ops = &g_epops; + privep->dev = priv; + + /* The index, i, is the physical endpoint address; Map this + * to a logical endpoint address usable by the class driver. + */ + + privep->epphy = i; + privep->ep.eplog = STM32_EPPHYOUT2LOG(i); + + /* Control until endpoint is activated */ + + privep->eptype = USB_EP_ATTR_XFER_CONTROL; + privep->ep.maxpacket = CONFIG_USBDEV_EP0_MAXSIZE; + } +} + +/**************************************************************************** + * Name: stm32_hwinitialize + * + * Description: + * Configure the OTG FS core for operation. + * + ****************************************************************************/ + +static void stm32_hwinitialize(FAR struct stm32_usbdev_s *priv) +{ + uint32_t regval; + uint32_t timeout; + uint32_t address; + int i; + + /* At start-up the core is in FS mode. */ + + /* Disable global interrupts by clearing the GINTMASK bit in the GAHBCFG + * register; Set the TXFELVL bit in the GAHBCFG register so that TxFIFO + * interrupts will occur when the TxFIFO is truly empty (not just half full). + */ + + stm32_putreg(OTGFS_GAHBCFG_TXFELVL, STM32_OTGFS_GAHBCFG); + + /* Common USB OTG core initialization */ + /* Reset after a PHY select and set Host mode. First, wait for AHB master + * IDLE state. + */ + + for (timeout = 0; timeout < STM32_READY_DELAY; timeout++) + { + up_udelay(3); + regval = stm32_getreg(STM32_OTGFS_GRSTCTL); + if ((regval & OTGFS_GRSTCTL_AHBIDL) != 0) + { + break; + } + } + + /* Then perform the core soft reset. */ + + stm32_putreg(OTGFS_GRSTCTL_CSRST, STM32_OTGFS_GRSTCTL); + for (timeout = 0; timeout < STM32_READY_DELAY; timeout++) + { + regval = stm32_getreg(STM32_OTGFS_GRSTCTL); + if ((regval & OTGFS_GRSTCTL_CSRST) == 0) + { + break; + } + } + + /* Wait for 3 PHY Clocks */ + + up_udelay(3); + + /* Deactivate the power down */ + +#if 1 //XXX defined(CONFIG_STM32_STM32F446) + /* In the case of the STM32F446 the meaning of the bit has changed to VBUS + * Detection Enable when set + */ + + regval = OTGFS_GCCFG_PWRDWN; + +# ifdef CONFIG_USBDEV_VBUSSENSING + regval |= OTGFS_GCCFG_VBDEN; +# endif + +#else + /* In the case of the the all others the meaning of the bit is No VBUS + * Sense when Set + */ + + regval = (OTGFS_GCCFG_PWRDWN | OTGFS_GCCFG_VBUSASEN | OTGFS_GCCFG_VBUSBSEN); +# ifndef CONFIG_USBDEV_VBUSSENSING + regval |= OTGFS_GCCFG_NOVBUSSENS; +# endif +# ifdef CONFIG_STM32_OTGFS_SOFOUTPUT + regval |= OTGFS_GCCFG_SOFOUTEN; +# endif +#endif + stm32_putreg(regval, STM32_OTGFS_GCCFG); + up_mdelay(20); + + /* For the new OTG controller in the F446 when VBUS sensing is not used we + * need to force the B session valid + */ + +#if 1 //XXX defined(CONFIG_STM32_STM32F446) +# ifndef CONFIG_USBDEV_VBUSSENSING + regval = stm32_getreg(STM32_OTGFS_GOTGCTL); + regval |= (OTGFS_GOTGCTL_BVALOEN | OTGFS_GOTGCTL_BVALOVAL); + stm32_putreg(regval, STM32_OTGFS_GOTGCTL); +# endif +#endif + + /* Force Device Mode */ + + regval = stm32_getreg(STM32_OTGFS_GUSBCFG); + regval &= ~OTGFS_GUSBCFG_FHMOD; + regval |= OTGFS_GUSBCFG_FDMOD; + stm32_putreg(regval, STM32_OTGFS_GUSBCFG); + up_mdelay(50); + + /* Initialize device mode */ + /* Restart the PHY Clock */ + + stm32_putreg(0, STM32_OTGFS_PCGCCTL); + + /* Device configuration register */ + + regval = stm32_getreg(STM32_OTGFS_DCFG); + regval &= ~OTGFS_DCFG_PFIVL_MASK; + regval |= OTGFS_DCFG_PFIVL_80PCT; + stm32_putreg(regval, STM32_OTGFS_DCFG); + + /* Set full speed PHY */ + + regval = stm32_getreg(STM32_OTGFS_DCFG); + regval &= ~OTGFS_DCFG_DSPD_MASK; + regval |= OTGFS_DCFG_DSPD_FS; + stm32_putreg(regval, STM32_OTGFS_DCFG); + + /* Set Rx FIFO size */ + + stm32_putreg(STM32_RXFIFO_WORDS, STM32_OTGFS_GRXFSIZ); + + /* EP0 TX */ + + address = STM32_RXFIFO_WORDS; + regval = (address << OTGFS_DIEPTXF0_TX0FD_SHIFT) | + (STM32_EP0_TXFIFO_WORDS << OTGFS_DIEPTXF0_TX0FSA_SHIFT); + stm32_putreg(regval, STM32_OTGFS_DIEPTXF0); + + /* EP1 TX */ + + address += STM32_EP0_TXFIFO_WORDS; + regval = (address << OTGFS_DIEPTXF_INEPTXSA_SHIFT) | + (STM32_EP1_TXFIFO_WORDS << OTGFS_DIEPTXF_INEPTXFD_SHIFT); + stm32_putreg(regval, STM32_OTGFS_DIEPTXF1); + + /* EP2 TX */ + + address += STM32_EP1_TXFIFO_WORDS; + regval = (address << OTGFS_DIEPTXF_INEPTXSA_SHIFT) | + (STM32_EP2_TXFIFO_WORDS << OTGFS_DIEPTXF_INEPTXFD_SHIFT); + stm32_putreg(regval, STM32_OTGFS_DIEPTXF2); + + /* EP3 TX */ + + address += STM32_EP2_TXFIFO_WORDS; + regval = (address << OTGFS_DIEPTXF_INEPTXSA_SHIFT) | + (STM32_EP3_TXFIFO_WORDS << OTGFS_DIEPTXF_INEPTXFD_SHIFT); + stm32_putreg(regval, STM32_OTGFS_DIEPTXF3); + + /* Flush the FIFOs */ + + stm32_txfifo_flush(OTGFS_GRSTCTL_TXFNUM_DALL); + stm32_rxfifo_flush(); + + /* Clear all pending Device Interrupts */ + + stm32_putreg(0, STM32_OTGFS_DIEPMSK); + stm32_putreg(0, STM32_OTGFS_DOEPMSK); + stm32_putreg(0, STM32_OTGFS_DIEPEMPMSK); + stm32_putreg(0xffffffff, STM32_OTGFS_DAINT); + stm32_putreg(0, STM32_OTGFS_DAINTMSK); + + /* Configure all IN endpoints */ + + for (i = 0; i < STM32_NENDPOINTS; i++) + { + regval = stm32_getreg(STM32_OTGFS_DIEPCTL(i)); + if ((regval & OTGFS_DIEPCTL_EPENA) != 0) + { + /* The endpoint is already enabled */ + + regval = OTGFS_DIEPCTL_EPENA | OTGFS_DIEPCTL_SNAK; + } + else + { + regval = 0; + } + + stm32_putreg(regval, STM32_OTGFS_DIEPCTL(i)); + stm32_putreg(0, STM32_OTGFS_DIEPTSIZ(i)); + stm32_putreg(0xff, STM32_OTGFS_DIEPINT(i)); + } + + /* Configure all OUT endpoints */ + + for (i = 0; i < STM32_NENDPOINTS; i++) + { + regval = stm32_getreg(STM32_OTGFS_DOEPCTL(i)); + if ((regval & OTGFS_DOEPCTL_EPENA) != 0) + { + /* The endpoint is already enabled */ + + regval = OTGFS_DOEPCTL_EPENA | OTGFS_DOEPCTL_SNAK; + } + else + { + regval = 0; + } + + stm32_putreg(regval, STM32_OTGFS_DOEPCTL(i)); + stm32_putreg(0, STM32_OTGFS_DOEPTSIZ(i)); + stm32_putreg(0xff, STM32_OTGFS_DOEPINT(i)); + } + + /* Disable all interrupts. */ + + stm32_putreg(0, STM32_OTGFS_GINTMSK); + + /* Clear any pending USB_OTG Interrupts */ + + stm32_putreg(0xffffffff, STM32_OTGFS_GOTGINT); + + /* Clear any pending interrupts */ + + stm32_putreg(0xbfffffff, STM32_OTGFS_GINTSTS); + + /* Enable the interrupts in the INTMSK */ + + regval = (OTGFS_GINT_RXFLVL | OTGFS_GINT_USBSUSP | OTGFS_GINT_ENUMDNE | + OTGFS_GINT_IEP | OTGFS_GINT_OEP | OTGFS_GINT_USBRST); + +#ifdef CONFIG_USBDEV_ISOCHRONOUS + regval |= (OTGFS_GINT_IISOIXFR | OTGFS_GINT_IISOOXFR); +#endif + +#ifdef CONFIG_USBDEV_SOFINTERRUPT + regval |= OTGFS_GINT_SOF; +#endif + +#ifdef CONFIG_USBDEV_VBUSSENSING + regval |= (OTGFS_GINT_OTG | OTGFS_GINT_SRQ); +#endif + +#ifdef CONFIG_DEBUG_USB + regval |= OTGFS_GINT_MMIS; +#endif + + stm32_putreg(regval, STM32_OTGFS_GINTMSK); + + /* Enable the USB global interrupt by setting GINTMSK in the global OTG + * FS AHB configuration register; Set the TXFELVL bit in the GAHBCFG + * register so that TxFIFO interrupts will occur when the TxFIFO is truly + * empty (not just half full). + */ + + stm32_putreg(OTGFS_GAHBCFG_GINTMSK | OTGFS_GAHBCFG_TXFELVL, + STM32_OTGFS_GAHBCFG); +} + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: up_usbinitialize + * + * Description: + * Initialize USB hardware. + * + * Assumptions: + * - This function is called very early in the initialization sequence + * - PLL and GIO pin initialization is not performed here but should been in + * the low-level boot logic: PLL1 must be configured for operation at 48MHz + * and P0.23 and PO.31 in PINSEL1 must be configured for Vbus and USB connect + * LED. + * + ****************************************************************************/ + +void up_usbinitialize(void) +{ + /* At present, there is only a single OTG FS device support. Hence it is + * pre-allocated as g_otgfsdev. However, in most code, the private data + * structure will be referenced using the 'priv' pointer (rather than the + * global data) in order to simplify any future support for multiple devices. + */ + + FAR struct stm32_usbdev_s *priv = &g_otgfsdev; + int ret; + + usbtrace(TRACE_DEVINIT, 0); + + /* Here we assume that: + * + * 1. GPIOA and OTG FS peripheral clocking has already been enabled as part + * of the boot sequence. + * 2. Board-specific logic has already enabled other board specific GPIOs + * for things like soft pull-up, VBUS sensing, power controls, and over- + * current detection. + */ + + /* Configure OTG FS alternate function pins + * + * PIN* SIGNAL DIRECTION + * ---- ----------- ---------- + * PA8 OTG_FS_SOF SOF clock output + * PA9 OTG_FS_VBUS VBUS input for device, Driven by external regulator by + * host (not an alternate function) + * PA10 OTG_FS_ID OTG ID pin (only needed in Dual mode) + * PA11 OTG_FS_DM D- I/O + * PA12 OTG_FS_DP D+ I/O + * + * *Pins may vary from device-to-device. + */ + + stm32l4_configgpio(GPIO_OTGFS_DM); + stm32l4_configgpio(GPIO_OTGFS_DP); + stm32l4_configgpio(GPIO_OTGFS_ID); /* Only needed for OTG */ + + /* SOF output pin configuration is configurable. */ + +#ifdef CONFIG_STM32_OTGFS_SOFOUTPUT + stm32l4_configgpio(GPIO_OTGFS_SOF); +#endif + + /* Uninitialize the hardware so that we know that we are starting from a + * known state. */ + + up_usbuninitialize(); + + /* Initialie the driver data structure */ + + stm32_swinitialize(priv); + + /* Attach the OTG FS interrupt handler */ + + ret = irq_attach(STM32L4_IRQ_OTGFS, stm32_usbinterrupt); + if (ret < 0) + { + udbg("irq_attach failed\n", ret); + goto errout; + } + + /* Initialize the USB OTG core */ + + stm32_hwinitialize(priv); + + /* Disconnect device */ + + stm32_pullup(&priv->usbdev, false); + + /* Reset/Re-initialize the USB hardware */ + + stm32_usbreset(priv); + + /* Enable USB controller interrupts at the NVIC */ + + up_enable_irq(STM32L4_IRQ_OTGFS); + +#ifdef CONFIG_ARCH_IRQPRIO + /* Set the interrupt priority */ + + up_prioritize_irq(STM32L4_IRQ_OTGFS, CONFIG_OTGFS_PRI); +#endif + return; + +errout: + up_usbuninitialize(); +} + +/**************************************************************************** + * Name: up_usbuninitialize + ****************************************************************************/ + +void up_usbuninitialize(void) +{ + /* At present, there is only a single OTG FS device support. Hence it is + * pre-allocated as g_otgfsdev. However, in most code, the private data + * structure will be referenced using the 'priv' pointer (rather than the + * global data) in order to simplify any future support for multiple devices. + */ + + FAR struct stm32_usbdev_s *priv = &g_otgfsdev; + irqstate_t flags; + int i; + + usbtrace(TRACE_DEVUNINIT, 0); + + if (priv->driver) + { + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_DRIVERREGISTERED), 0); + usbdev_unregister(priv->driver); + } + + /* Disconnect device */ + + flags = enter_critical_section(); + stm32_pullup(&priv->usbdev, false); + priv->usbdev.speed = USB_SPEED_UNKNOWN; + + /* Disable and detach IRQs */ + + up_disable_irq(STM32L4_IRQ_OTGFS); + irq_detach(STM32L4_IRQ_OTGFS); + + /* Disable all endpoint interrupts */ + + for (i = 0; i < STM32_NENDPOINTS; i++) + { + stm32_putreg(0xff, STM32_OTGFS_DIEPINT(i)); + stm32_putreg(0xff, STM32_OTGFS_DOEPINT(i)); + } + + stm32_putreg(0, STM32_OTGFS_DIEPMSK); + stm32_putreg(0, STM32_OTGFS_DOEPMSK); + stm32_putreg(0, STM32_OTGFS_DIEPEMPMSK); + stm32_putreg(0, STM32_OTGFS_DAINTMSK); + stm32_putreg(0xffffffff, STM32_OTGFS_DAINT); + + /* Flush the FIFOs */ + + stm32_txfifo_flush(OTGFS_GRSTCTL_TXFNUM_DALL); + stm32_rxfifo_flush(); + + /* TODO: Turn off USB power and clocking */ + + priv->devstate = DEVSTATE_DEFAULT; + leave_critical_section(flags); +} + +/**************************************************************************** + * Name: usbdev_register + * + * Description: + * Register a USB device class driver. The class driver's bind() method will be + * called to bind it to a USB device driver. + * + ****************************************************************************/ + +int usbdev_register(struct usbdevclass_driver_s *driver) +{ + /* At present, there is only a single OTG FS device support. Hence it is + * pre-allocated as g_otgfsdev. However, in most code, the private data + * structure will be referenced using the 'priv' pointer (rather than the + * global data) in order to simplify any future support for multiple devices. + */ + + FAR struct stm32_usbdev_s *priv = &g_otgfsdev; + int ret; + + usbtrace(TRACE_DEVREGISTER, 0); + +#ifdef CONFIG_DEBUG + if (!driver || !driver->ops->bind || !driver->ops->unbind || + !driver->ops->disconnect || !driver->ops->setup) + { + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0); + return -EINVAL; + } + + if (priv->driver) + { + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_DRIVER), 0); + return -EBUSY; + } +#endif + + /* First hook up the driver */ + + priv->driver = driver; + + /* Then bind the class driver */ + + ret = CLASS_BIND(driver, &priv->usbdev); + if (ret) + { + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BINDFAILED), (uint16_t)-ret); + priv->driver = NULL; + } + else + { + /* Enable USB controller interrupts */ + + up_enable_irq(STM32L4_IRQ_OTGFS); + + /* FIXME: nothing seems to call DEV_CONNECT(), but we need to set + * the RS bit to enable the controller. It kind of makes sense + * to do this after the class has bound to us... + * GEN: This bug is really in the class driver. It should make the + * soft connect when it is ready to be enumerated. I have added + * that logic to the class drivers but left this logic here. + */ + + stm32_pullup(&priv->usbdev, true); + priv->usbdev.speed = USB_SPEED_FULL; + } + + return ret; +} + +/**************************************************************************** + * Name: usbdev_unregister + * + * Description: + * Un-register usbdev class driver.If the USB device is connected to a USB host, + * it will first disconnect(). The driver is also requested to unbind() and clean + * up any device state, before this procedure finally returns. + * + ****************************************************************************/ + +int usbdev_unregister(struct usbdevclass_driver_s *driver) +{ + /* At present, there is only a single OTG FS device support. Hence it is + * pre-allocated as g_otgfsdev. However, in most code, the private data + * structure will be referenced using the 'priv' pointer (rather than the + * global data) in order to simplify any future support for multiple devices. + */ + + FAR struct stm32_usbdev_s *priv = &g_otgfsdev; + irqstate_t flags; + + usbtrace(TRACE_DEVUNREGISTER, 0); + +#ifdef CONFIG_DEBUG + if (driver != priv->driver) + { + usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0); + return -EINVAL; + } +#endif + + /* Reset the hardware and cancel all requests. All requests must be + * canceled while the class driver is still bound. + */ + + flags = enter_critical_section(); + stm32_usbreset(priv); + leave_critical_section(flags); + + /* Unbind the class driver */ + + CLASS_UNBIND(driver, &priv->usbdev); + + /* Disable USB controller interrupts */ + + flags = enter_critical_section(); + up_disable_irq(STM32L4_IRQ_OTGFS); + + /* Disconnect device */ + + stm32_pullup(&priv->usbdev, false); + + /* Unhook the driver */ + + priv->driver = NULL; + leave_critical_section(flags); + + return OK; +} + +#endif /* CONFIG_USBDEV && CONFIG_STM32_OTGFSDEV */ diff --git a/arch/arm/src/stm32l4/stm32l4_otgfshost.c b/arch/arm/src/stm32l4/stm32l4_otgfshost.c new file mode 100644 index 0000000000..352db80f7b --- /dev/null +++ b/arch/arm/src/stm32l4/stm32l4_otgfshost.c @@ -0,0 +1,5307 @@ +/**************************************************************************** + * arch/arm/src/stm32l4/stm32_otgfshost.c + * + * Copyright (C) 2012-2016 Gregory Nutt. All rights reserved. + * Authors: Gregory Nutt + * dev@ziggurat29.com + * + * 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 +#include +#include +#include +#include +#include +#include + +#include + +#include "chip.h" /* Includes default GPIO settings */ +#include /* May redefine GPIO settings */ + +#include "up_arch.h" +#include "up_internal.h" + +#include "stm32l4_usbhost.h" + +#if defined(CONFIG_USBHOST) && defined(CONFIG_STM32_OTGFS) + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ +/* Configuration ***************************************************************/ +/* STM32 USB OTG FS Host Driver Support + * + * Pre-requisites + * + * CONFIG_USBHOST - Enable general USB host support + * CONFIG_STM32_OTGFS - Enable the STM32 USB OTG FS block + * CONFIG_STM32_SYSCFG - Needed + * + * Options: + * + * CONFIG_STM32_OTGFS_RXFIFO_SIZE - Size of the RX FIFO in 32-bit words. + * Default 128 (512 bytes) + * CONFIG_STM32_OTGFS_NPTXFIFO_SIZE - Size of the non-periodic Tx FIFO + * in 32-bit words. Default 96 (384 bytes) + * CONFIG_STM32_OTGFS_PTXFIFO_SIZE - Size of the periodic Tx FIFO in 32-bit + * words. Default 96 (384 bytes) + * CONFIG_STM32_OTGFS_DESCSIZE - Maximum size of a descriptor. Default: 128 + * 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. + * CONFIG_STM32_USBHOST_PKTDUMP - Dump all incoming and outgoing USB + * packets. Depends on CONFIG_DEBUG. + */ + +/* Pre-requisites (partial) */ + +#ifndef CONFIG_STM32_SYSCFG +# error "CONFIG_STM32_SYSCFG is required" +#endif + +/* Default RxFIFO size */ + +#ifndef CONFIG_STM32_OTGFS_RXFIFO_SIZE +# define CONFIG_STM32_OTGFS_RXFIFO_SIZE 128 +#endif + +/* Default host non-periodic Tx FIFO size */ + +#ifndef CONFIG_STM32_OTGFS_NPTXFIFO_SIZE +# define CONFIG_STM32_OTGFS_NPTXFIFO_SIZE 96 +#endif + +/* Default host periodic Tx fifo size register */ + +#ifndef CONFIG_STM32_OTGFS_PTXFIFO_SIZE +# define CONFIG_STM32_OTGFS_PTXFIFO_SIZE 96 +#endif + +/* Maximum size of a descriptor */ + +#ifndef CONFIG_STM32_OTGFS_DESCSIZE +# define CONFIG_STM32_OTGFS_DESCSIZE 128 +#endif + +/* Register/packet debug depends on CONFIG_DEBUG */ + +#ifndef CONFIG_DEBUG +# undef CONFIG_STM32_USBHOST_REGDEBUG +# undef CONFIG_STM32_USBHOST_PKTDUMP +#endif + +/* HCD Setup *******************************************************************/ +/* Hardware capabilities */ +//XXX I think this needs to be 12 for the 'L4 +#define STM32_NHOST_CHANNELS 8 /* Number of host channels */ +#define STM32_MAX_PACKET_SIZE 64 /* Full speed max packet size */ +#define STM32_EP0_DEF_PACKET_SIZE 8 /* EP0 default packet size */ +#define STM32_EP0_MAX_PACKET_SIZE 64 /* EP0 FS max packet size */ +#define STM32_MAX_TX_FIFOS 15 /* Max number of TX FIFOs */ +#define STM32_MAX_PKTCOUNT 256 /* Max packet count */ +#define STM32_RETRY_COUNT 3 /* Number of ctrl transfer retries */ + +/* Delays **********************************************************************/ + +#define STM32_READY_DELAY 200000 /* In loop counts */ +#define STM32_FLUSH_DELAY 200000 /* In loop counts */ +#define STM32_SETUP_DELAY SEC2TICK(5) /* 5 seconds in system ticks */ +#define STM32_DATANAK_DELAY SEC2TICK(5) /* 5 seconds in system ticks */ + +/* Ever-present MIN/MAX macros */ + +#ifndef MIN +# define MIN(a, b) (((a) < (b)) ? (a) : (b)) +#endif + +#ifndef MAX +# define MAX(a, b) (((a) > (b)) ? (a) : (b)) +#endif + +/**************************************************************************** + * Private Types + ****************************************************************************/ + +/* The following enumeration represents the various states of the USB host + * state machine (for debug purposes only) + */ + +enum stm32_smstate_e +{ + SMSTATE_DETACHED = 0, /* Not attached to a device */ + SMSTATE_ATTACHED, /* Attached to a device */ + SMSTATE_ENUM, /* Attached, enumerating */ + SMSTATE_CLASS_BOUND, /* Enumeration complete, class bound */ +}; + +/* This enumeration provides the reason for the channel halt. */ + +enum stm32_chreason_e +{ + CHREASON_IDLE = 0, /* Inactive (initial state) */ + CHREASON_FREED, /* Channel is no longer in use */ + CHREASON_XFRC, /* Transfer complete */ + CHREASON_NAK, /* NAK received */ + CHREASON_NYET, /* NotYet received */ + CHREASON_STALL, /* Endpoint stalled */ + CHREASON_TXERR, /* Transfer error received */ + CHREASON_DTERR, /* Data toggle error received */ + CHREASON_FRMOR, /* Frame overrun */ + CHREASON_CANCELLED /* Transfer cancelled */ +}; + +/* This structure retains the state of one host channel. NOTE: Since there + * is only one channel operation active at a time, some of the fields in + * in the structure could be moved in struct stm32_ubhost_s to achieve + * some memory savings. + */ + +struct stm32_chan_s +{ + sem_t waitsem; /* Channel wait semaphore */ + volatile uint8_t result; /* The result of the transfer */ + volatile uint8_t chreason; /* Channel halt reason. See enum stm32_chreason_e */ + uint8_t chidx; /* Channel index */ + uint8_t epno; /* Device endpoint number (0-127) */ + uint8_t eptype; /* See OTGFS_EPTYPE_* definitions */ + uint8_t funcaddr; /* Device function address */ + uint8_t speed; /* Device speed */ + uint8_t pid; /* Data PID */ + uint8_t npackets; /* Number of packets (for data toggle) */ + bool inuse; /* True: This channel is "in use" */ + volatile bool indata1; /* IN data toggle. True: DATA01 (Bulk and INTR only) */ + volatile bool outdata1; /* OUT data toggle. True: DATA01 */ + bool in; /* True: IN endpoint */ + volatile bool waiter; /* True: Thread is waiting for a channel event */ + uint16_t maxpacket; /* Max packet size */ + uint16_t buflen; /* Buffer length (at start of transfer) */ + volatile uint16_t xfrd; /* Bytes transferred (at end of transfer) */ + volatile uint16_t inflight; /* Number of Tx bytes "in-flight" */ + FAR uint8_t *buffer; /* Transfer buffer pointer */ +#ifdef CONFIG_USBHOST_ASYNCH + usbhost_asynch_t callback; /* Transfer complete callback */ + FAR void *arg; /* Argument that accompanies the callback */ +#endif +}; + +/* A channel represents on uni-directional endpoint. So, in the case of the + * bi-directional, control endpoint, there must be two channels to represent + * the endpoint. + */ + +struct stm32_ctrlinfo_s +{ + uint8_t inndx; /* EP0 IN control channel index */ + uint8_t outndx; /* EP0 OUT control channel index */ +}; + +/* This structure retains the state of the USB host controller */ + +struct stm32_usbhost_s +{ + /* Common device fields. This must be the first thing defined in the + * structure so that it is possible to simply cast from struct usbhost_s + * to structstm32_usbhost_s. + */ + + struct usbhost_driver_s drvr; + + /* This is the hub port description understood by class drivers */ + + struct usbhost_roothubport_s rhport; + + /* Overall driver status */ + + volatile uint8_t smstate; /* The state of the USB host state machine */ + uint8_t chidx; /* ID of channel waiting for space in Tx FIFO */ + volatile bool connected; /* Connected to device */ + volatile bool change; /* Connection change */ + volatile bool pscwait; /* True: Thread is waiting for a port event */ + sem_t exclsem; /* Support mutually exclusive access */ + sem_t pscsem; /* Semaphore to wait for a port event */ + struct stm32_ctrlinfo_s ep0; /* Root hub port EP0 description */ + +#ifdef CONFIG_USBHOST_HUB + /* Used to pass external hub port events */ + + volatile struct usbhost_hubport_s *hport; +#endif + + /* The state of each host channel */ + + struct stm32_chan_s chan[STM32_MAX_TX_FIFOS]; +}; + +/**************************************************************************** + * Private Function Prototypes + ****************************************************************************/ + +/* Register operations ********************************************************/ + +#ifdef CONFIG_STM32_USBHOST_REGDEBUG +static void stm32_printreg(uint32_t addr, uint32_t val, bool iswrite); +static void stm32_checkreg(uint32_t addr, uint32_t val, bool iswrite); +static uint32_t stm32_getreg(uint32_t addr); +static void stm32_putreg(uint32_t addr, uint32_t value); +#else +# define stm32_getreg(addr) getreg32(addr) +# define stm32_putreg(addr,val) putreg32(val,addr) +#endif + +static inline void stm32_modifyreg(uint32_t addr, uint32_t clrbits, + uint32_t setbits); + +#ifdef CONFIG_STM32_USBHOST_PKTDUMP +# define stm32_pktdump(m,b,n) lib_dumpbuffer(m,b,n) +#else +# define stm32_pktdump(m,b,n) +#endif + +/* Semaphores ******************************************************************/ + +static void stm32_takesem(sem_t *sem); +#define stm32_givesem(s) sem_post(s); + +/* Byte stream access helper functions *****************************************/ + +static inline uint16_t stm32_getle16(const uint8_t *val); + +/* Channel management **********************************************************/ + +static int stm32_chan_alloc(FAR struct stm32_usbhost_s *priv); +static inline void stm32_chan_free(FAR struct stm32_usbhost_s *priv, int chidx); +static inline void stm32_chan_freeall(FAR struct stm32_usbhost_s *priv); +static void stm32_chan_configure(FAR struct stm32_usbhost_s *priv, int chidx); +static void stm32_chan_halt(FAR struct stm32_usbhost_s *priv, int chidx, + enum stm32_chreason_e chreason); +static int stm32_chan_waitsetup(FAR struct stm32_usbhost_s *priv, + FAR struct stm32_chan_s *chan); +#ifdef CONFIG_USBHOST_ASYNCH +static int stm32_chan_asynchsetup(FAR struct stm32_usbhost_s *priv, + FAR struct stm32_chan_s *chan, + usbhost_asynch_t callback, FAR void *arg); +#endif +static int stm32_chan_wait(FAR struct stm32_usbhost_s *priv, + FAR struct stm32_chan_s *chan); +static void stm32_chan_wakeup(FAR struct stm32_usbhost_s *priv, + FAR struct stm32_chan_s *chan); +static int stm32_ctrlchan_alloc(FAR struct stm32_usbhost_s *priv, + uint8_t epno, uint8_t funcaddr, uint8_t speed, + FAR struct stm32_ctrlinfo_s *ctrlep); +static int stm32_ctrlep_alloc(FAR struct stm32_usbhost_s *priv, + FAR const struct usbhost_epdesc_s *epdesc, + FAR usbhost_ep_t *ep); +static int stm32_xfrep_alloc(FAR struct stm32_usbhost_s *priv, + FAR const struct usbhost_epdesc_s *epdesc, + FAR usbhost_ep_t *ep); + +/* Control/data transfer logic *************************************************/ + +static void stm32_transfer_start(FAR struct stm32_usbhost_s *priv, int chidx); +#if 0 /* Not used */ +static inline uint16_t stm32_getframe(void); +#endif +static int stm32_ctrl_sendsetup(FAR struct stm32_usbhost_s *priv, + FAR struct stm32_ctrlinfo_s *ep0, + FAR const struct usb_ctrlreq_s *req); +static int stm32_ctrl_senddata(FAR struct stm32_usbhost_s *priv, + FAR struct stm32_ctrlinfo_s *ep0, + FAR uint8_t *buffer, unsigned int buflen); +static int stm32_ctrl_recvdata(FAR struct stm32_usbhost_s *priv, + FAR struct stm32_ctrlinfo_s *ep0, + FAR uint8_t *buffer, unsigned int buflen); +static int stm32_in_setup(FAR struct stm32_usbhost_s *priv, int chidx); +static ssize_t stm32_in_transfer(FAR struct stm32_usbhost_s *priv, int chidx, + FAR uint8_t *buffer, size_t buflen); +#ifdef CONFIG_USBHOST_ASYNCH +static void stm32_in_next(FAR struct stm32_usbhost_s *priv, + FAR struct stm32_chan_s *chan); +static int stm32_in_asynch(FAR struct stm32_usbhost_s *priv, int chidx, + FAR uint8_t *buffer, size_t buflen, + usbhost_asynch_t callback, FAR void *arg); +#endif +static int stm32_out_setup(FAR struct stm32_usbhost_s *priv, int chidx); +static ssize_t stm32_out_transfer(FAR struct stm32_usbhost_s *priv, int chidx, + FAR uint8_t *buffer, size_t buflen); +#ifdef CONFIG_USBHOST_ASYNCH +static void stm32_out_next(FAR struct stm32_usbhost_s *priv, + FAR struct stm32_chan_s *chan); +static int stm32_out_asynch(FAR struct stm32_usbhost_s *priv, int chidx, + FAR uint8_t *buffer, size_t buflen, + usbhost_asynch_t callback, FAR void *arg); +#endif + +/* Interrupt handling **********************************************************/ +/* Lower level interrupt handlers */ + +static void stm32_gint_wrpacket(FAR struct stm32_usbhost_s *priv, + FAR uint8_t *buffer, int chidx, int buflen); +static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, + int chidx); +static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, + int chidx); +static void stm32_gint_connected(FAR struct stm32_usbhost_s *priv); +static void stm32_gint_disconnected(FAR struct stm32_usbhost_s *priv); + +/* Second level interrupt handlers */ + +#ifdef CONFIG_STM32_OTGFS_SOFINTR +static inline void stm32_gint_sofisr(FAR struct stm32_usbhost_s *priv); +#endif +static inline void stm32_gint_rxflvlisr(FAR struct stm32_usbhost_s *priv); +static inline void stm32_gint_nptxfeisr(FAR struct stm32_usbhost_s *priv); +static inline void stm32_gint_ptxfeisr(FAR struct stm32_usbhost_s *priv); +static inline void stm32_gint_hcisr(FAR struct stm32_usbhost_s *priv); +static inline void stm32_gint_hprtisr(FAR struct stm32_usbhost_s *priv); +static inline void stm32_gint_discisr(FAR struct stm32_usbhost_s *priv); +static inline void stm32_gint_ipxfrisr(FAR struct stm32_usbhost_s *priv); + +/* First level, global interrupt handler */ + +static int stm32_gint_isr(int irq, FAR void *context); + +/* Interrupt controls */ + +static void stm32_gint_enable(void); +static void stm32_gint_disable(void); +static inline void stm32_hostinit_enable(void); +static void stm32_txfe_enable(FAR struct stm32_usbhost_s *priv, int chidx); + +/* USB host controller operations **********************************************/ + +static int stm32_wait(FAR struct usbhost_connection_s *conn, + FAR struct usbhost_hubport_s **hport); +static int stm32_rh_enumerate(FAR struct stm32_usbhost_s *priv, + FAR struct usbhost_connection_s *conn, + FAR struct usbhost_hubport_s *hport); +static int stm32_enumerate(FAR struct usbhost_connection_s *conn, + FAR struct usbhost_hubport_s *hport); + +static int stm32_ep0configure(FAR struct usbhost_driver_s *drvr, + usbhost_ep_t ep0, uint8_t funcaddr, uint8_t speed, + uint16_t maxpacketsize); +static int stm32_epalloc(FAR struct usbhost_driver_s *drvr, + FAR const FAR struct usbhost_epdesc_s *epdesc, + FAR usbhost_ep_t *ep); +static int stm32_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep); +static int stm32_alloc(FAR struct usbhost_driver_s *drvr, + FAR uint8_t **buffer, FAR size_t *maxlen); +static int stm32_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer); +static int stm32_ioalloc(FAR struct usbhost_driver_s *drvr, + FAR uint8_t **buffer, size_t buflen); +static int stm32_iofree(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer); +static int stm32_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, + const struct usb_ctrlreq_s *req, + FAR uint8_t *buffer); +static int stm32_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, + FAR const struct usb_ctrlreq_s *req, + FAR const uint8_t *buffer); +static ssize_t stm32_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, + FAR uint8_t *buffer, size_t buflen); +#ifdef CONFIG_USBHOST_ASYNCH +static int stm32_asynch(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, + FAR uint8_t *buffer, size_t buflen, + usbhost_asynch_t callback, FAR void *arg); +#endif +static int stm32_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep); +#ifdef CONFIG_USBHOST_HUB +static int stm32_connect(FAR struct usbhost_driver_s *drvr, + FAR struct usbhost_hubport_s *hport, + bool connected); +#endif +static void stm32_disconnect(FAR struct usbhost_driver_s *drvr, + FAR struct usbhost_hubport_s *hport); + +/* Initialization **************************************************************/ + +static void stm32_portreset(FAR struct stm32_usbhost_s *priv); +static void stm32_flush_txfifos(uint32_t txfnum); +static void stm32_flush_rxfifo(void); +static void stm32_vbusdrive(FAR struct stm32_usbhost_s *priv, bool state); +static void stm32_host_initialize(FAR struct stm32_usbhost_s *priv); + +static inline void stm32_sw_initialize(FAR struct stm32_usbhost_s *priv); +static inline int stm32_hw_initialize(FAR struct stm32_usbhost_s *priv); + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +/* In this driver implementation, support is provided for only a single a single + * USB device. All status information can be simply retained in a single global + * instance. + */ + +static struct stm32_usbhost_s g_usbhost; + +/* This is the connection/enumeration interface */ + +static struct usbhost_connection_s g_usbconn = +{ + .wait = stm32_wait, + .enumerate = stm32_enumerate, +}; + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: stm32_printreg + * + * Description: + * Print the contents of an STM32xx register operation + * + ****************************************************************************/ + +#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); +} +#endif + +/**************************************************************************** + * Name: stm32_checkreg + * + * Description: + * Get the contents of an STM32 register + * + ****************************************************************************/ + +#ifdef CONFIG_STM32_USBHOST_REGDEBUG +static void stm32_checkreg(uint32_t addr, uint32_t val, bool iswrite) +{ + static uint32_t prevaddr = 0; + static uint32_t preval = 0; + static uint32_t count = 0; + static bool prevwrite = false; + + /* Is this the same value that we read from/wrote to the same register last time? + * Are we polling the register? If so, suppress the output. + */ + + if (addr == prevaddr && val == preval && prevwrite == iswrite) + { + /* Yes.. Just increment the count */ + + count++; + } + else + { + /* No this is a new address or value or operation. Were there any + * duplicate accesses before this one? + */ + + if (count > 0) + { + /* Yes.. Just one? */ + + if (count == 1) + { + /* Yes.. Just one */ + + stm32_printreg(prevaddr, preval, prevwrite); + } + else + { + /* No.. More than one. */ + + lldbg("[repeats %d more times]\n", count); + } + } + + /* Save the new address, value, count, and operation for next time */ + + prevaddr = addr; + preval = val; + count = 0; + prevwrite = iswrite; + + /* Show the new regisgter access */ + + stm32_printreg(addr, val, iswrite); + } +} +#endif + +/**************************************************************************** + * Name: stm32_getreg + * + * Description: + * Get the contents of an STM32 register + * + ****************************************************************************/ + +#ifdef CONFIG_STM32_USBHOST_REGDEBUG +static uint32_t stm32_getreg(uint32_t addr) +{ + /* Read the value from the register */ + + uint32_t val = getreg32(addr); + + /* Check if we need to print this value */ + + stm32_checkreg(addr, val, false); + return val; +} +#endif + +/**************************************************************************** + * Name: stm32_putreg + * + * Description: + * Set the contents of an STM32 register to a value + * + ****************************************************************************/ + +#ifdef CONFIG_STM32_USBHOST_REGDEBUG +static void stm32_putreg(uint32_t addr, uint32_t val) +{ + /* Check if we need to print this value */ + + stm32_checkreg(addr, val, true); + + /* Write the value */ + + putreg32(val, addr); +} +#endif + +/**************************************************************************** + * Name: stm32_modifyreg + * + * Description: + * Modify selected bits of an STM32 register. + * + ****************************************************************************/ + +static inline void stm32_modifyreg(uint32_t addr, uint32_t clrbits, uint32_t setbits) +{ + stm32_putreg(addr, (((stm32_getreg(addr)) & ~clrbits) | setbits)); +} + +/**************************************************************************** + * Name: stm32_takesem + * + * Description: + * This is just a wrapper to handle the annoying behavior of semaphore + * waits that return due to the receipt of a signal. + * + ****************************************************************************/ + +static void stm32_takesem(sem_t *sem) +{ + /* Take the semaphore (perhaps waiting) */ + + while (sem_wait(sem) != 0) + { + /* The only case that an error should occr here is if the wait was + * awakened by a signal. + */ + + ASSERT(errno == EINTR); + } +} + +/**************************************************************************** + * Name: stm32_getle16 + * + * Description: + * Get a (possibly unaligned) 16-bit little endian value. + * + ****************************************************************************/ + +static inline uint16_t stm32_getle16(const uint8_t *val) +{ + return (uint16_t)val[1] << 8 | (uint16_t)val[0]; +} + +/**************************************************************************** + * Name: stm32_chan_alloc + * + * Description: + * Allocate a channel. + * + ****************************************************************************/ + +static int stm32_chan_alloc(FAR struct stm32_usbhost_s *priv) +{ + int chidx; + + /* Search the table of channels */ + + for (chidx = 0; chidx < STM32_NHOST_CHANNELS; chidx++) + { + /* Is this channel available? */ + + if (!priv->chan[chidx].inuse) + { + /* Yes... make it "in use" and return the index */ + + priv->chan[chidx].inuse = true; + return chidx; + } + } + + /* All of the channels are "in-use" */ + + return -EBUSY; +} + +/**************************************************************************** + * Name: stm32_chan_free + * + * Description: + * Free a previoiusly allocated channel. + * + ****************************************************************************/ + +static void stm32_chan_free(FAR struct stm32_usbhost_s *priv, int chidx) +{ + DEBUGASSERT((unsigned)chidx < STM32_NHOST_CHANNELS); + + /* Halt the channel */ + + stm32_chan_halt(priv, chidx, CHREASON_FREED); + + /* Mark the channel available */ + + priv->chan[chidx].inuse = false; +} + +/**************************************************************************** + * Name: stm32_chan_freeall + * + * Description: + * Free all channels. + * + ****************************************************************************/ + +static inline void stm32_chan_freeall(FAR struct stm32_usbhost_s *priv) +{ + uint8_t chidx; + + /* Free all host channels */ + + for (chidx = 2; chidx < STM32_NHOST_CHANNELS; chidx ++) + { + stm32_chan_free(priv, chidx); + } +} + +/**************************************************************************** + * Name: stm32_chan_configure + * + * Description: + * Configure or re-configure a host channel. Host channels are configured + * when endpoint is allocated and EP0 (only) is re-configured with the + * max packet size or device address changes. + * + ****************************************************************************/ + +static void stm32_chan_configure(FAR struct stm32_usbhost_s *priv, int chidx) +{ + FAR struct stm32_chan_s *chan = &priv->chan[chidx]; + uint32_t regval; + + /* Clear any old pending interrupts for this host channel. */ + + stm32_putreg(STM32_OTGFS_HCINT(chidx), 0xffffffff); + + /* Enable channel interrupts required for transfers on this channel. */ + + regval = 0; + + switch (chan->eptype) + { + case OTGFS_EPTYPE_CTRL: + case OTGFS_EPTYPE_BULK: + { +#ifdef HAVE_USBHOST_TRACE_VERBOSE + uint16_t intrace; + uint16_t outtrace; + + /* Determine the definitive trace ID to use below */ + + if (chan->eptype == OTGFS_EPTYPE_CTRL) + { + intrace = OTGFS_VTRACE2_CHANCONF_CTRL_IN; + outtrace = OTGFS_VTRACE2_CHANCONF_CTRL_OUT; + } + else + { + intrace = OTGFS_VTRACE2_CHANCONF_BULK_IN; + outtrace = OTGFS_VTRACE2_CHANCONF_BULK_OUT; + } +#endif + + /* Interrupts required for CTRL and BULK endpoints */ + + regval |= (OTGFS_HCINT_XFRC | OTGFS_HCINT_STALL | OTGFS_HCINT_NAK | + OTGFS_HCINT_TXERR | OTGFS_HCINT_DTERR); + + /* Additional setting for IN/OUT endpoints */ + + if (chan->in) + { + usbhost_vtrace2(intrace, chidx, chan->epno); + regval |= OTGFS_HCINT_BBERR; + } + else + { + usbhost_vtrace2(outtrace, chidx, chan->epno); + regval |= OTGFS_HCINT_NYET; + } + } + break; + + case OTGFS_EPTYPE_INTR: + { + /* Interrupts required for INTR endpoints */ + + regval |= (OTGFS_HCINT_XFRC | OTGFS_HCINT_STALL | OTGFS_HCINT_NAK | + OTGFS_HCINT_TXERR | OTGFS_HCINT_FRMOR | OTGFS_HCINT_DTERR); + + /* Additional setting for IN endpoints */ + + if (chan->in) + { + usbhost_vtrace2(OTGFS_VTRACE2_CHANCONF_INTR_IN, chidx, + chan->epno); + regval |= OTGFS_HCINT_BBERR; + } +#ifdef HAVE_USBHOST_TRACE_VERBOSE + else + { + usbhost_vtrace2(OTGFS_VTRACE2_CHANCONF_INTR_OUT, chidx, + chan->epno); + } +#endif + } + break; + + case OTGFS_EPTYPE_ISOC: + { + /* Interrupts required for ISOC endpoints */ + + regval |= (OTGFS_HCINT_XFRC | OTGFS_HCINT_ACK | OTGFS_HCINT_FRMOR); + + /* Additional setting for IN endpoints */ + + if (chan->in) + { + usbhost_vtrace2(OTGFS_VTRACE2_CHANCONF_ISOC_IN, chidx, + chan->epno); + regval |= (OTGFS_HCINT_TXERR | OTGFS_HCINT_BBERR); + } +#ifdef HAVE_USBHOST_TRACE_VERBOSE + else + { + usbhost_vtrace2(OTGFS_VTRACE2_CHANCONF_ISOC_OUT, chidx, + chan->epno); + } +#endif + } + break; + } + + stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), regval); + + /* Enable the top level host channel interrupt. */ + + stm32_modifyreg(STM32_OTGFS_HAINTMSK, 0, OTGFS_HAINT(chidx)); + + /* Make sure host channel interrupts are enabled. */ + + stm32_modifyreg(STM32_OTGFS_GINTMSK, 0, OTGFS_GINT_HC); + + /* Program the HCCHAR register */ + + regval = ((uint32_t)chan->maxpacket << OTGFS_HCCHAR_MPSIZ_SHIFT) | + ((uint32_t)chan->epno << OTGFS_HCCHAR_EPNUM_SHIFT) | + ((uint32_t)chan->eptype << OTGFS_HCCHAR_EPTYP_SHIFT) | + ((uint32_t)chan->funcaddr << OTGFS_HCCHAR_DAD_SHIFT); + + /* Special case settings for low speed devices */ + + if (chan->speed == USB_SPEED_LOW) + { + regval |= OTGFS_HCCHAR_LSDEV; + } + + /* Special case settings for IN endpoints */ + + if (chan->in) + { + regval |= OTGFS_HCCHAR_EPDIR_IN; + } + + /* Special case settings for INTR endpoints */ + + if (chan->eptype == OTGFS_EPTYPE_INTR) + { + regval |= OTGFS_HCCHAR_ODDFRM; + } + + /* Write the channel configuration */ + + stm32_putreg(STM32_OTGFS_HCCHAR(chidx), regval); +} + +/**************************************************************************** + * Name: stm32_chan_halt + * + * Description: + * Halt the channel associated with 'chidx' by setting the CHannel DISable + * (CHDIS) bit in in the HCCHAR register. + * + ****************************************************************************/ + +static void stm32_chan_halt(FAR struct stm32_usbhost_s *priv, int chidx, + enum stm32_chreason_e chreason) +{ + uint32_t hcchar; + uint32_t intmsk; + uint32_t eptype; + unsigned int avail; + + /* Save the reason for the halt. We need this in the channel halt interrupt + * handling logic to know what to do next. + */ + + usbhost_vtrace2(OTGFS_VTRACE2_CHANHALT, chidx, chreason); + + priv->chan[chidx].chreason = (uint8_t)chreason; + + /* "The application can disable any channel by programming the OTG_FS_HCCHARx + * register with the CHDIS and CHENA bits set to 1. This enables the OTG_FS + * host to flush the posted requests (if any) and generates a channel halted + * interrupt. The application must wait for the CHH interrupt in OTG_FS_HCINTx + * before reallocating the channel for other transactions. The OTG_FS host + * does not interrupt the transaction that has already been started on the + * USB." + */ + + hcchar = stm32_getreg(STM32_OTGFS_HCCHAR(chidx)); + hcchar |= (OTGFS_HCCHAR_CHDIS | OTGFS_HCCHAR_CHENA); + + /* Get the endpoint type from the HCCHAR register */ + + eptype = hcchar & OTGFS_HCCHAR_EPTYP_MASK; + + /* Check for space in the Tx FIFO to issue the halt. + * + * "Before disabling a channel, the application must ensure that there is at + * least one free space available in the non-periodic request queue (when + * disabling a non-periodic channel) or the periodic request queue (when + * disabling a periodic channel). The application can simply flush the + * posted requests when the Request queue is full (before disabling the + * channel), by programming the OTG_FS_HCCHARx register with the CHDIS bit + * set to 1, and the CHENA bit cleared to 0. + */ + + if (eptype == OTGFS_HCCHAR_EPTYP_CTRL || eptype == OTGFS_HCCHAR_EPTYP_BULK) + { + /* Get the number of words available in the non-periodic Tx FIFO. */ + + avail = stm32_getreg(STM32_OTGFS_HNPTXSTS) & OTGFS_HNPTXSTS_NPTXFSAV_MASK; + } + else /* if (eptype == OTGFS_HCCHAR_EPTYP_ISOC || eptype == OTGFS_HCCHAR_EPTYP_INTR) */ + { + /* Get the number of words available in the non-periodic Tx FIFO. */ + + avail = stm32_getreg(STM32_OTGFS_HPTXSTS) & OTGFS_HPTXSTS_PTXFSAVL_MASK; + } + + /* Check if there is any space available in the Tx FIFO. */ + + if (avail == 0) + { + /* The Tx FIFO is full... disable the channel to flush the requests */ + + hcchar &= ~OTGFS_HCCHAR_CHENA; + } + + /* Unmask the CHannel Halted (CHH) interrupt */ + + intmsk = stm32_getreg(STM32_OTGFS_HCINTMSK(chidx)); + intmsk |= OTGFS_HCINT_CHH; + stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), intmsk); + + /* Halt the channel by setting CHDIS (and maybe CHENA) in the HCCHAR */ + + stm32_putreg(STM32_OTGFS_HCCHAR(chidx), hcchar); +} + +/**************************************************************************** + * Name: stm32_chan_waitsetup + * + * Description: + * Set the request for the transfer complete event well BEFORE enabling the + * transfer (as soon as we are absolutely committed to the to avoid transfer). + * We do this to minimize race conditions. This logic would have to be expanded + * if we want to have more than one packet in flight at a time! + * + * Assumptions: + * Called from a normal thread context BEFORE the transfer has been started. + * + ****************************************************************************/ + +static int stm32_chan_waitsetup(FAR struct stm32_usbhost_s *priv, + FAR struct stm32_chan_s *chan) +{ + irqstate_t flags = enter_critical_section(); + int ret = -ENODEV; + + /* Is the device still connected? */ + + if (priv->connected) + { + /* Yes.. then set waiter to indicate that we expect to be informed when + * either (1) the device is disconnected, or (2) the transfer completed. + */ + + chan->waiter = true; +#ifdef CONFIG_USBHOST_ASYNCH + chan->callback = NULL; + chan->arg = NULL; +#endif + ret = OK; + } + + leave_critical_section(flags); + return ret; +} + +/**************************************************************************** + * Name: stm32_chan_asynchsetup + * + * Description: + * Set the request for the transfer complete event well BEFORE enabling the + * transfer (as soon as we are absolutely committed to the to avoid transfer). + * We do this to minimize race conditions. This logic would have to be expanded + * if we want to have more than one packet in flight at a time! + * + * Assumptions: + * Might be called from the level of an interrupt handler + * + ****************************************************************************/ + +#ifdef CONFIG_USBHOST_ASYNCH +static int stm32_chan_asynchsetup(FAR struct stm32_usbhost_s *priv, + FAR struct stm32_chan_s *chan, + usbhost_asynch_t callback, FAR void *arg) +{ + irqstate_t flags = enter_critical_section(); + int ret = -ENODEV; + + /* Is the device still connected? */ + + if (priv->connected) + { + /* Yes.. then set waiter to indicate that we expect to be informed when + * either (1) the device is disconnected, or (2) the transfer completed. + */ + + chan->waiter = false; + chan->callback = callback; + chan->arg = arg; + ret = OK; + } + + leave_critical_section(flags); + return ret; +} +#endif + +/**************************************************************************** + * Name: stm32_chan_wait + * + * Description: + * Wait for a transfer on a channel to complete. + * + * Assumptions: + * Called from a normal thread context + * + ****************************************************************************/ + +static int stm32_chan_wait(FAR struct stm32_usbhost_s *priv, + FAR struct stm32_chan_s *chan) +{ + irqstate_t flags; + int ret; + + /* Disable interrupts so that the following operations will be atomic. On + * the OTG FS global interrupt needs to be disabled. However, here we disable + * all interrupts to exploit that fact that interrupts will be re-enabled + * while we wait. + */ + + flags = enter_critical_section(); + + /* Loop, testing for an end of transfer condition. The channel 'result' + * was set to EBUSY and 'waiter' was set to true before the transfer; 'waiter' + * will be set to false and 'result' will be set appropriately when the + * transfer is completed. + */ + + do + { + /* Wait for the transfer to complete. NOTE the transfer may already + * completed before we get here or the transfer may complete while we + * wait here. + */ + + ret = sem_wait(&chan->waitsem); + + /* sem_wait should succeed. But it is possible that we could be + * awakened by a signal too. + */ + + DEBUGASSERT(ret == OK || get_errno() == EINTR); + } + while (chan->waiter); + + /* The transfer is complete re-enable interrupts and return the result */ + + ret = -(int)chan->result; + leave_critical_section(flags); + return ret; +} + +/**************************************************************************** + * Name: stm32_chan_wakeup + * + * Description: + * A channel transfer has completed... wakeup any threads waiting for the + * transfer to complete. + * + * Assumptions: + * This function is called from the transfer complete interrupt handler for + * the channel. Interrupts are disabled. + * + ****************************************************************************/ + +static void stm32_chan_wakeup(FAR struct stm32_usbhost_s *priv, + FAR struct stm32_chan_s *chan) +{ + /* Is the transfer complete? */ + + if (chan->result != EBUSY) + { + /* Is there a thread waiting for this transfer to complete? */ + + if (chan->waiter) + { +#ifdef CONFIG_USBHOST_ASYNCH + /* Yes.. there should not also be a callback scheduled */ + + DEBUGASSERT(chan->callback == NULL); +#endif + /* Wake'em up! */ + + usbhost_vtrace2(chan->in ? OTGFS_VTRACE2_CHANWAKEUP_IN : + OTGFS_VTRACE2_CHANWAKEUP_OUT, + chan->epno, chan->result); + + stm32_givesem(&chan->waitsem); + chan->waiter = false; + } + +#ifdef CONFIG_USBHOST_ASYNCH + /* No.. is an asynchronous callback expected when the transfer + * completes? + */ + + else if (chan->callback) + { + /* Handle continuation of IN/OUT pipes */ + + if (chan->in) + { + stm32_in_next(priv, chan); + } + else + { + stm32_out_next(priv, chan); + } + } +#endif + } +} + +/**************************************************************************** + * Name: stm32_ctrlchan_alloc + * + * Description: + * Allocate and configured channels for a control pipe. + * + ****************************************************************************/ + +static int stm32_ctrlchan_alloc(FAR struct stm32_usbhost_s *priv, + uint8_t epno, uint8_t funcaddr, uint8_t speed, + FAR struct stm32_ctrlinfo_s *ctrlep) +{ + FAR struct stm32_chan_s *chan; + int inndx; + int outndx; + + outndx = stm32_chan_alloc(priv); + if (outndx < 0) + { + return -ENOMEM; + } + + ctrlep->outndx = outndx; + chan = &priv->chan[outndx]; + chan->epno = epno; + chan->in = false; + chan->eptype = OTGFS_EPTYPE_CTRL; + chan->funcaddr = funcaddr; + chan->speed = speed; + chan->maxpacket = STM32_EP0_DEF_PACKET_SIZE; + chan->indata1 = false; + chan->outdata1 = false; + + /* Configure control OUT channels */ + + stm32_chan_configure(priv, outndx); + + /* Allocate and initialize the control IN channel */ + + inndx = stm32_chan_alloc(priv); + if (inndx < 0) + { + stm32_chan_free(priv, outndx); + return -ENOMEM; + } + + ctrlep->inndx = inndx; + chan = &priv->chan[inndx]; + chan->epno = epno; + chan->in = true; + chan->eptype = OTGFS_EPTYPE_CTRL; + chan->funcaddr = funcaddr; + chan->speed = speed; + chan->maxpacket = STM32_EP0_DEF_PACKET_SIZE; + chan->indata1 = false; + chan->outdata1 = false; + + /* Configure control IN channels */ + + stm32_chan_configure(priv, inndx); + return OK; +} + +/**************************************************************************** + * Name: stm32_ctrlep_alloc + * + * Description: + * Allocate a container and channels for control pipe. + * + * Input Parameters: + * priv - The private USB host driver state. + * epdesc - Describes the endpoint to be allocated. + * ep - A memory location provided by the caller in which to receive the + * allocated endpoint descriptor. + * + * Returned Values: + * On success, zero (OK) is returned. On a failure, a negated errno value is + * returned indicating the nature of the failure + * + * Assumptions: + * This function will *not* be called from an interrupt handler. + * + ****************************************************************************/ + +static int stm32_ctrlep_alloc(FAR struct stm32_usbhost_s *priv, + FAR const struct usbhost_epdesc_s *epdesc, + FAR usbhost_ep_t *ep) +{ + FAR struct usbhost_hubport_s *hport; + FAR struct stm32_ctrlinfo_s *ctrlep; + int ret; + + /* Sanity check. NOTE that this method should only be called if a device is + * connected (because we need a valid low speed indication). + */ + + DEBUGASSERT(epdesc->hport != NULL); + hport = epdesc->hport; + + /* Allocate a container for the control endpoint */ + + 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"); + return -ENOMEM; + } + + /* Then allocate and configure the IN/OUT channnels */ + + ret = stm32_ctrlchan_alloc(priv, epdesc->addr & USB_EPNO_MASK, + hport->funcaddr, hport->speed, ctrlep); + if (ret < 0) + { + udbg("ERROR: stm32_ctrlchan_alloc failed: %d\n", ret); + kmm_free(ctrlep); + return ret; + } + + /* Return a pointer to the control pipe container as the pipe "handle" */ + + *ep = (usbhost_ep_t)ctrlep; + return OK; +} + +/************************************************************************************ + * Name: stm32_xfrep_alloc + * + * Description: + * Allocate and configure one unidirectional endpoint. + * + * Input Parameters: + * priv - The private USB host driver state. + * epdesc - Describes the endpoint to be allocated. + * ep - A memory location provided by the caller in which to receive the + * allocated endpoint descriptor. + * + * Returned Values: + * On success, zero (OK) is returned. On a failure, a negated errno value is + * returned indicating the nature of the failure + * + * Assumptions: + * This function will *not* be called from an interrupt handler. + * + ************************************************************************************/ + +static int stm32_xfrep_alloc(FAR struct stm32_usbhost_s *priv, + FAR const struct usbhost_epdesc_s *epdesc, + FAR usbhost_ep_t *ep) +{ + struct usbhost_hubport_s *hport; + FAR struct stm32_chan_s *chan; + int chidx; + + /* Sanity check. NOTE that this method should only be called if a device is + * connected (because we need a valid low speed indication). + */ + + DEBUGASSERT(epdesc->hport != NULL); + hport = epdesc->hport; + + /* Allocate a host channel for the endpoint */ + + chidx = stm32_chan_alloc(priv); + if (chidx < 0) + { + udbg("ERROR: Failed to allocate a host channel\n"); + return -ENOMEM; + } + + /* Decode the endpoint descriptor to initialize the channel data structures. + * Note: Here we depend on the fact that the endpoint point type is + * encoded in the same way in the endpoint descriptor as it is in the OTG + * HS hardware. + */ + + chan = &priv->chan[chidx]; + chan->epno = epdesc->addr & USB_EPNO_MASK; + chan->in = epdesc->in; + chan->eptype = epdesc->xfrtype; + chan->funcaddr = hport->funcaddr; + chan->speed = hport->speed; + chan->maxpacket = epdesc->mxpacketsize; + chan->indata1 = false; + chan->outdata1 = false; + + /* Then configure the endpoint */ + + stm32_chan_configure(priv, chidx); + + /* Return the index to the allocated channel as the endpoint "handle" */ + + *ep = (usbhost_ep_t)chidx; + return OK; +} + +/**************************************************************************** + * Name: stm32_transfer_start + * + * Description: + * Start at transfer on the select IN or OUT channel. + * + ****************************************************************************/ + +static void stm32_transfer_start(FAR struct stm32_usbhost_s *priv, int chidx) +{ + FAR struct stm32_chan_s *chan; + uint32_t regval; + unsigned int npackets; + unsigned int maxpacket; + unsigned int avail; + unsigned int wrsize; + unsigned int minsize; + + /* Set up the initial state of the transfer */ + + chan = &priv->chan[chidx]; + + usbhost_vtrace2(OTGFS_VTRACE2_STARTTRANSFER, chidx, chan->buflen); + + chan->result = EBUSY; + chan->inflight = 0; + chan->xfrd = 0; + priv->chidx = chidx; + + /* Compute the expected number of packets associated to the transfer. + * If the transfer length is zero (or less than the size of one maximum + * size packet), then one packet is expected. + */ + + /* If the transfer size is greater than one packet, then calculate the + * number of packets that will be received/sent, including any partial + * final packet. + */ + + maxpacket = chan->maxpacket; + + if (chan->buflen > maxpacket) + { + npackets = (chan->buflen + maxpacket - 1) / maxpacket; + + /* Clip if the buffer length if it exceeds the maximum number of + * packets that can be transferred (this should not happen). + */ + + if (npackets > STM32_MAX_PKTCOUNT) + { + npackets = STM32_MAX_PKTCOUNT; + chan->buflen = STM32_MAX_PKTCOUNT * maxpacket; + usbhost_trace2(OTGFS_TRACE2_CLIP, chidx, chan->buflen); + } + } + else + { + /* One packet will be sent/received (might be a zero length packet) */ + + npackets = 1; + } + + /* If it is an IN transfer, then adjust the size of the buffer UP to + * a full number of packets. Hmmm... couldn't this cause an overrun + * into unallocated memory? + */ + +#if 0 /* Think about this */ + if (chan->in) + { + /* Force the buffer length to an even multiple of maxpacket */ + + chan->buflen = npackets * maxpacket; + } +#endif + + /* Save the number of packets in the transfer. We will need this in + * order to set the next data toggle correctly when the transfer + * completes. + */ + + chan->npackets = (uint8_t)npackets; + + /* Setup the HCTSIZn register */ + + regval = ((uint32_t)chan->buflen << OTGFS_HCTSIZ_XFRSIZ_SHIFT) | + ((uint32_t)npackets << OTGFS_HCTSIZ_PKTCNT_SHIFT) | + ((uint32_t)chan->pid << OTGFS_HCTSIZ_DPID_SHIFT); + stm32_putreg(STM32_OTGFS_HCTSIZ(chidx), regval); + + /* Setup the HCCHAR register: Frame oddness and host channel enable */ + + regval = stm32_getreg(STM32_OTGFS_HCCHAR(chidx)); + + /* Set/clear the Odd Frame bit. Check for an even frame; if so set Odd + * Frame. This field is applicable for only periodic (isochronous and + * interrupt) channels. + */ + + if ((stm32_getreg(STM32_OTGFS_HFNUM) & 1) == 0) + { + regval |= OTGFS_HCCHAR_ODDFRM; + } + else + { + regval &= ~OTGFS_HCCHAR_ODDFRM; + } + + regval &= ~OTGFS_HCCHAR_CHDIS; + regval |= OTGFS_HCCHAR_CHENA; + stm32_putreg(STM32_OTGFS_HCCHAR(chidx), regval); + + /* If this is an out transfer, then we need to do more.. we need to copy + * the outgoing data into the correct TxFIFO. + */ + + if (!chan->in && chan->buflen > 0) + { + /* Handle non-periodic (CTRL and BULK) OUT transfers differently than + * periodic (INTR and ISOC) OUT transfers. + */ + + minsize = MIN(chan->buflen, chan->maxpacket); + + switch (chan->eptype) + { + case OTGFS_EPTYPE_CTRL: /* Non periodic transfer */ + case OTGFS_EPTYPE_BULK: + { + /* Read the Non-periodic Tx FIFO status register */ + + regval = stm32_getreg(STM32_OTGFS_HNPTXSTS); + avail = ((regval & OTGFS_HNPTXSTS_NPTXFSAV_MASK) >> OTGFS_HNPTXSTS_NPTXFSAV_SHIFT) << 2; + } + break; + + /* Periodic transfer */ + + case OTGFS_EPTYPE_INTR: + case OTGFS_EPTYPE_ISOC: + { + /* Read the Non-periodic Tx FIFO status register */ + + regval = stm32_getreg(STM32_OTGFS_HPTXSTS); + avail = ((regval & OTGFS_HPTXSTS_PTXFSAVL_MASK) >> OTGFS_HPTXSTS_PTXFSAVL_SHIFT) << 2; + } + break; + + default: + DEBUGASSERT(false); + return; + } + + /* Is there space in the TxFIFO to hold the minimum size packet? */ + + if (minsize <= avail) + { + /* Yes.. Get the size of the biggest thing that we can put in the Tx FIFO now */ + + wrsize = chan->buflen; + if (wrsize > avail) + { + /* Clip the write size to the number of full, max sized packets + * that will fit in the Tx FIFO. + */ + + unsigned int wrpackets = avail / chan->maxpacket; + wrsize = wrpackets * chan->maxpacket; + } + + /* Write packet into the Tx FIFO. */ + + stm32_gint_wrpacket(priv, chan->buffer, chidx, wrsize); + } + + /* Did we put the entire buffer into the Tx FIFO? */ + + if (chan->buflen > avail) + { + /* No, there was insufficient space to hold the entire transfer ... + * Enable the Tx FIFO interrupt to handle the transfer when the Tx + * FIFO becomes empty. + */ + + stm32_txfe_enable(priv, chidx); + } + } +} + +/**************************************************************************** + * Name: stm32_getframe + * + * Description: + * Get the current frame number. The frame number (FRNUM) field increments + * when a new SOF is transmitted on the USB, and is cleared to 0 when it + * reaches 0x3fff. + * + ****************************************************************************/ + +#if 0 /* Not used */ +static inline uint16_t stm32_getframe(void) +{ + return (uint16_t)(stm32_getreg(STM32_OTGFS_HFNUM) & OTGFS_HFNUM_FRNUM_MASK); +} +#endif + +/**************************************************************************** + * Name: stm32_ctrl_sendsetup + * + * Description: + * Send an IN/OUT SETUP packet. + * + ****************************************************************************/ + +static int stm32_ctrl_sendsetup(FAR struct stm32_usbhost_s *priv, + FAR struct stm32_ctrlinfo_s *ep0, + FAR const struct usb_ctrlreq_s *req) +{ + FAR struct stm32_chan_s *chan; + systime_t start; + systime_t elapsed; + int ret; + + /* Loop while the device reports NAK (and a timeout is not exceeded */ + + chan = &priv->chan[ep0->outndx]; + start = clock_systimer(); + + do + { + /* Send the SETUP packet */ + + chan->pid = OTGFS_PID_SETUP; + chan->buffer = (FAR uint8_t *)req; + chan->buflen = USB_SIZEOF_CTRLREQ; + chan->xfrd = 0; + + /* Set up for the wait BEFORE starting the transfer */ + + ret = stm32_chan_waitsetup(priv, chan); + if (ret < 0) + { + usbhost_trace1(OTGFS_TRACE1_DEVDISCONN, 0); + return ret; + } + + /* Start the transfer */ + + stm32_transfer_start(priv, ep0->outndx); + + /* Wait for the transfer to complete */ + + ret = stm32_chan_wait(priv, chan); + + /* Return on success and for all failures other than EAGAIN. EAGAIN + * means that the device NAKed the SETUP command and that we should + * try a few more times. + */ + + if (ret != -EAGAIN) + { + /* Output some debug information if the transfer failed */ + + if (ret < 0) + { + usbhost_trace1(OTGFS_TRACE1_TRNSFRFAILED, ret); + } + + /* Return the result in any event */ + + return ret; + } + + /* Get the elapsed time (in frames) */ + + elapsed = clock_systimer() - start; + } + while (elapsed < STM32_SETUP_DELAY); + + return -ETIMEDOUT; +} + +/**************************************************************************** + * Name: stm32_ctrl_senddata + * + * Description: + * Send data in the data phase of an OUT control transfer. Or send status + * in the status phase of an IN control transfer + * + ****************************************************************************/ + +static int stm32_ctrl_senddata(FAR struct stm32_usbhost_s *priv, + FAR struct stm32_ctrlinfo_s *ep0, + FAR uint8_t *buffer, unsigned int buflen) +{ + FAR struct stm32_chan_s *chan = &priv->chan[ep0->outndx]; + int ret; + + /* Save buffer information */ + + chan->buffer = buffer; + chan->buflen = buflen; + chan->xfrd = 0; + + /* Set the DATA PID */ + + if (buflen == 0) + { + /* For status OUT stage with buflen == 0, set PID DATA1 */ + + chan->outdata1 = true; + } + + /* Set the Data PID as per the outdata1 boolean */ + + chan->pid = chan->outdata1 ? OTGFS_PID_DATA1 : OTGFS_PID_DATA0; + + /* Set up for the wait BEFORE starting the transfer */ + + ret = stm32_chan_waitsetup(priv, chan); + if (ret < 0) + { + usbhost_trace1(OTGFS_TRACE1_DEVDISCONN, 0); + return ret; + } + + /* Start the transfer */ + + stm32_transfer_start(priv, ep0->outndx); + + /* Wait for the transfer to complete and return the result */ + + return stm32_chan_wait(priv, chan); +} + +/**************************************************************************** + * Name: stm32_ctrl_recvdata + * + * Description: + * Receive data in the data phase of an IN control transfer. Or receive status + * in the status phase of an OUT control transfer + * + ****************************************************************************/ + +static int stm32_ctrl_recvdata(FAR struct stm32_usbhost_s *priv, + FAR struct stm32_ctrlinfo_s *ep0, + FAR uint8_t *buffer, unsigned int buflen) +{ + FAR struct stm32_chan_s *chan = &priv->chan[ep0->inndx]; + int ret; + + /* Save buffer information */ + + chan->pid = OTGFS_PID_DATA1; + chan->buffer = buffer; + chan->buflen = buflen; + chan->xfrd = 0; + + /* Set up for the wait BEFORE starting the transfer */ + + ret = stm32_chan_waitsetup(priv, chan); + if (ret < 0) + { + usbhost_trace1(OTGFS_TRACE1_DEVDISCONN, 0); + return ret; + } + + /* Start the transfer */ + + stm32_transfer_start(priv, ep0->inndx); + + /* Wait for the transfer to complete and return the result */ + + return stm32_chan_wait(priv, chan); +} + +/**************************************************************************** + * Name: stm32_in_setup + * + * Description: + * Initiate an IN transfer on an bulk, interrupt, or isochronous pipe. + * + ****************************************************************************/ + +static int stm32_in_setup(FAR struct stm32_usbhost_s *priv, int chidx) +{ + FAR struct stm32_chan_s *chan; + + /* Set up for the transfer based on the direction and the endpoint type */ + + chan = &priv->chan[chidx]; + switch (chan->eptype) + { + default: + case OTGFS_EPTYPE_CTRL: /* Control */ + { + /* This kind of transfer on control endpoints other than EP0 are not + * currently supported + */ + + return -ENOSYS; + } + + case OTGFS_EPTYPE_ISOC: /* Isochronous */ + { + /* Set up the IN data PID */ + + usbhost_vtrace2(OTGFS_VTRACE2_ISOCIN, chidx, chan->buflen); + chan->pid = OTGFS_PID_DATA0; + } + break; + + case OTGFS_EPTYPE_BULK: /* Bulk */ + { + /* Setup the IN data PID */ + + usbhost_vtrace2(OTGFS_VTRACE2_BULKIN, chidx, chan->buflen); + chan->pid = chan->indata1 ? OTGFS_PID_DATA1 : OTGFS_PID_DATA0; + } + break; + + case OTGFS_EPTYPE_INTR: /* Interrupt */ + { + /* Setup the IN data PID */ + + usbhost_vtrace2(OTGFS_VTRACE2_INTRIN, chidx, chan->buflen); + chan->pid = chan->indata1 ? OTGFS_PID_DATA1 : OTGFS_PID_DATA0; + } + break; + } + + /* Start the transfer */ + + stm32_transfer_start(priv, chidx); + return OK; +} + +/**************************************************************************** + * Name: stm32_in_transfer + * + * Description: + * Transfer 'buflen' bytes into 'buffer' from an IN channel. + * + ****************************************************************************/ + +static ssize_t stm32_in_transfer(FAR struct stm32_usbhost_s *priv, int chidx, + FAR uint8_t *buffer, size_t buflen) +{ + FAR struct stm32_chan_s *chan; + systime_t start; + systime_t elapsed; + int ret; + + /* Loop until the transfer completes (i.e., buflen is decremented to zero) + * or a fatal error occurs (any error other than a simple NAK) + */ + + chan = &priv->chan[chidx]; + chan->buffer = buffer; + chan->buflen = buflen; + chan->xfrd = 0; + + start = clock_systimer(); + while (chan->xfrd < chan->buflen) + { + /* Set up for the wait BEFORE starting the transfer */ + + ret = stm32_chan_waitsetup(priv, chan); + if (ret < 0) + { + usbhost_trace1(OTGFS_TRACE1_DEVDISCONN, 0); + return (ssize_t)ret; + } + + /* Set up for the transfer based on the direction and the endpoint type */ + + ret = stm32_in_setup(priv, chidx); + if (ret < 0) + { + udbg("ERROR: stm32_in_setup failed: %d\n", ret); + return (ssize_t)ret; + } + + /* Wait for the transfer to complete and get the result */ + + ret = stm32_chan_wait(priv, chan); + + /* EAGAIN indicates that the device NAKed the transfer and we need + * do try again. Anything else (success or other errors) will + * cause use to return + */ + + if (ret < 0) + { + usbhost_trace1(OTGFS_TRACE1_TRNSFRFAILED, ret); + + /* Check for a special case: If (1) the transfer was NAKed and (2) + * no Tx FIFO empty or Rx FIFO not-empty event occurred, then we + * should be able to just flush the Rx and Tx FIFOs and try again. + * We can detect this latter case because the then the transfer + * buffer pointer and buffer size will be unaltered. + */ + + elapsed = clock_systimer() - start; + if (ret != -EAGAIN || /* Not a NAK condition OR */ + elapsed >= STM32_DATANAK_DELAY || /* Timeout has elapsed OR */ + chan->xfrd > 0) /* Data has been partially transferred */ + { + /* Break out and return the error */ + + udbg("ERROR: stm32_chan_wait failed: %d\n", ret); + return (ssize_t)ret; + } + } + } + + return (ssize_t)chan->xfrd; +} + +/**************************************************************************** + * Name: stm32_in_next + * + * Description: + * Initiate the next of a sequence of asynchronous transfers. + * + * Assumptions: + * This function is always called from an interrupt handler + * + ****************************************************************************/ + +#ifdef CONFIG_USBHOST_ASYNCH +static void stm32_in_next(FAR struct stm32_usbhost_s *priv, + FAR struct stm32_chan_s *chan) +{ + usbhost_asynch_t callback; + FAR void *arg; + ssize_t nbytes; + int result; + int ret; + + /* Is the full transfer complete? Did the last chunk transfer complete OK? */ + + result = -(int)chan->result; + if (chan->xfrd < chan->buflen && result == OK) + { + /* Yes.. Set up for the next transfer based on the direction and the + * endpoint type + */ + + ret = stm32_in_setup(priv, chan->chidx); + if (ret >= 0) + { + return; + } + + udbg("ERROR: stm32_in_setup failed: %d\n", ret); + result = ret; + } + + /* The transfer is complete, with or without an error */ + + uvdbg("Transfer complete: %d\n", result); + + /* Extract the callback information */ + + callback = chan->callback; + arg = chan->arg; + nbytes = chan->xfrd; + + chan->callback = NULL; + chan->arg = NULL; + chan->xfrd = 0; + + /* Then perform the callback */ + + if (result < 0) + { + nbytes = (ssize_t)result; + } + + callback(arg, nbytes); +} +#endif + +/**************************************************************************** + * Name: stm32_in_asynch + * + * Description: + * Initiate the first of a sequence of asynchronous transfers. + * + * Assumptions: + * This function is never called from an interrupt handler + * + ****************************************************************************/ + +#ifdef CONFIG_USBHOST_ASYNCH +static int stm32_in_asynch(FAR struct stm32_usbhost_s *priv, int chidx, + FAR uint8_t *buffer, size_t buflen, + usbhost_asynch_t callback, FAR void *arg) +{ + FAR struct stm32_chan_s *chan; + int ret; + + /* Set up for the transfer data and callback BEFORE starting the first transfer */ + + chan = &priv->chan[chidx]; + chan->buffer = buffer; + chan->buflen = buflen; + chan->xfrd = 0; + + ret = stm32_chan_asynchsetup(priv, chan, callback, arg); + if (ret < 0) + { + udbg("ERROR: stm32_chan_asynchsetup failed: %d\n", ret); + return ret; + } + + /* Set up for the transfer based on the direction and the endpoint type */ + + ret = stm32_in_setup(priv, chidx); + if (ret < 0) + { + udbg("ERROR: stm32_in_setup failed: %d\n", ret); + } + + /* And return with the transfer pending */ + + return ret; +} +#endif + +/**************************************************************************** + * Name: stm32_out_setup + * + * Description: + * Initiate an OUT transfer on an bulk, interrupt, or isochronous pipe. + * + ****************************************************************************/ + +static int stm32_out_setup(FAR struct stm32_usbhost_s *priv, int chidx) +{ + FAR struct stm32_chan_s *chan; + + /* Set up for the transfer based on the direction and the endpoint type */ + + chan = &priv->chan[chidx]; + switch (chan->eptype) + { + default: + case OTGFS_EPTYPE_CTRL: /* Control */ + { + /* This kind of transfer on control endpoints other than EP0 are not + * currently supported + */ + + return -ENOSYS; + } + + case OTGFS_EPTYPE_ISOC: /* Isochronous */ + { + /* Set up the OUT data PID */ + + usbhost_vtrace2(OTGFS_VTRACE2_ISOCOUT, chidx, chan->buflen); + chan->pid = OTGFS_PID_DATA0; + } + break; + + case OTGFS_EPTYPE_BULK: /* Bulk */ + { + /* Setup the OUT data PID */ + + usbhost_vtrace2(OTGFS_VTRACE2_BULKOUT, chidx, chan->buflen); + chan->pid = chan->outdata1 ? OTGFS_PID_DATA1 : OTGFS_PID_DATA0; + } + break; + + case OTGFS_EPTYPE_INTR: /* Interrupt */ + { + /* Setup the OUT data PID */ + + usbhost_vtrace2(OTGFS_VTRACE2_INTROUT, chidx, chan->buflen); + chan->pid = chan->outdata1 ? OTGFS_PID_DATA1 : OTGFS_PID_DATA0; + + /* Toggle the OUT data PID for the next transfer */ + + chan->outdata1 ^= true; + } + break; + } + + /* Start the transfer */ + + stm32_transfer_start(priv, chidx); + return OK; +} + +/**************************************************************************** + * Name: stm32_out_transfer + * + * Description: + * Transfer the 'buflen' bytes in 'buffer' through an OUT channel. + * + ****************************************************************************/ + +static ssize_t stm32_out_transfer(FAR struct stm32_usbhost_s *priv, int chidx, + FAR uint8_t *buffer, size_t buflen) +{ + FAR struct stm32_chan_s *chan; + systime_t start; + systime_t elapsed; + size_t xfrlen; + ssize_t xfrd; + int ret; + + /* Loop until the transfer completes (i.e., buflen is decremented to zero) + * or a fatal error occurs (any error other than a simple NAK) + */ + + chan = &priv->chan[chidx]; + start = clock_systimer(); + xfrd = 0; + + while (buflen > 0) + { + /* Transfer one packet at a time. The hardware is capable of queueing + * multiple OUT packets, but I just haven't figured out how to handle + * the case where a single OUT packet in the group is NAKed. + */ + + xfrlen = MIN(chan->maxpacket, buflen); + chan->buffer = buffer; + chan->buflen = xfrlen; + chan->xfrd = 0; + + /* Set up for the wait BEFORE starting the transfer */ + + ret = stm32_chan_waitsetup(priv, chan); + if (ret < 0) + { + usbhost_trace1(OTGFS_TRACE1_DEVDISCONN, 0); + return (ssize_t)ret; + } + + /* Set up for the transfer based on the direction and the endpoint type */ + + ret = stm32_out_setup(priv, chidx); + if (ret < 0) + { + udbg("ERROR: stm32_out_setup failed: %d\n", ret); + return (ssize_t)ret; + } + + /* Wait for the transfer to complete and get the result */ + + ret = stm32_chan_wait(priv, chan); + + /* Handle transfer failures */ + + if (ret < 0) + { + usbhost_trace1(OTGFS_TRACE1_TRNSFRFAILED, ret); + + /* Check for a special case: If (1) the transfer was NAKed and (2) + * no Tx FIFO empty or Rx FIFO not-empty event occurred, then we + * should be able to just flush the Rx and Tx FIFOs and try again. + * We can detect this latter case because the then the transfer + * buffer pointer and buffer size will be unaltered. + */ + + elapsed = clock_systimer() - start; + if (ret != -EAGAIN || /* Not a NAK condition OR */ + elapsed >= STM32_DATANAK_DELAY || /* Timeout has elapsed OR */ + chan->xfrd > 0) /* Data has been partially transferred */ + { + /* Break out and return the error */ + + udbg("ERROR: stm32_chan_wait failed: %d\n", ret); + return (ssize_t)ret; + } + + /* Is this flush really necessary? What does the hardware do with the + * data in the FIFO when the NAK occurs? Does it discard it? + */ + + stm32_flush_txfifos(OTGFS_GRSTCTL_TXFNUM_HALL); + + /* Get the device a little time to catch up. Then retry the transfer + * using the same buffer pointer and length. + */ + + usleep(20*1000); + } + else + { + /* Successfully transferred. Update the buffer pointer and length */ + + buffer += xfrlen; + buflen -= xfrlen; + xfrd += chan->xfrd; + } + } + + return xfrd; +} + +/**************************************************************************** + * Name: stm32_out_next + * + * Description: + * Initiate the next of a sequence of asynchronous transfers. + * + * Assumptions: + * This function is always called from an interrupt handler + * + ****************************************************************************/ + +#ifdef CONFIG_USBHOST_ASYNCH +static void stm32_out_next(FAR struct stm32_usbhost_s *priv, + FAR struct stm32_chan_s *chan) +{ + usbhost_asynch_t callback; + FAR void *arg; + ssize_t nbytes; + int result; + int ret; + + /* Is the full transfer complete? Did the last chunk transfer complete OK? */ + + result = -(int)chan->result; + if (chan->xfrd < chan->buflen && result == OK) + { + /* Yes.. Set up for the next transfer based on the direction and the + * endpoint type + */ + + ret = stm32_out_setup(priv, chan->chidx); + if (ret >= 0) + { + return; + } + + udbg("ERROR: stm32_out_setup failed: %d\n", ret); + result = ret; + } + + /* The transfer is complete, with or without an error */ + + uvdbg("Transfer complete: %d\n", result); + + /* Extract the callback information */ + + callback = chan->callback; + arg = chan->arg; + nbytes = chan->xfrd; + + chan->callback = NULL; + chan->arg = NULL; + chan->xfrd = 0; + + /* Then perform the callback */ + + if (result < 0) + { + nbytes = (ssize_t)result; + } + + callback(arg, nbytes); +} +#endif + +/**************************************************************************** + * Name: stm32_out_asynch + * + * Description: + * Initiate the first of a sequence of asynchronous transfers. + * + * Assumptions: + * This function is never called from an interrupt handler + * + ****************************************************************************/ + +#ifdef CONFIG_USBHOST_ASYNCH +static int stm32_out_asynch(FAR struct stm32_usbhost_s *priv, int chidx, + FAR uint8_t *buffer, size_t buflen, + usbhost_asynch_t callback, FAR void *arg) +{ + FAR struct stm32_chan_s *chan; + int ret; + + /* Set up for the transfer data and callback BEFORE starting the first transfer */ + + chan = &priv->chan[chidx]; + chan->buffer = buffer; + chan->buflen = buflen; + chan->xfrd = 0; + + ret = stm32_chan_asynchsetup(priv, chan, callback, arg); + if (ret < 0) + { + udbg("ERROR: stm32_chan_asynchsetup failed: %d\n", ret); + return ret; + } + + /* Set up for the transfer based on the direction and the endpoint type */ + + ret = stm32_out_setup(priv, chidx); + if (ret < 0) + { + udbg("ERROR: stm32_out_setup failed: %d\n", ret); + } + + /* And return with the transfer pending */ + + return ret; +} +#endif + +/**************************************************************************** + * Name: stm32_gint_wrpacket + * + * Description: + * Transfer the 'buflen' bytes in 'buffer' to the Tx FIFO associated with + * 'chidx' (non-DMA). + * + ****************************************************************************/ + +static void stm32_gint_wrpacket(FAR struct stm32_usbhost_s *priv, + FAR uint8_t *buffer, int chidx, int buflen) +{ + FAR uint32_t *src; + uint32_t fifo; + int buflen32; + + stm32_pktdump("Sending", buffer, buflen); + + /* Get the number of 32-byte words associated with this byte size */ + + buflen32 = (buflen + 3) >> 2; + + /* Get the address of the Tx FIFO associated with this channel */ + + fifo = STM32_OTGFS_DFIFO_HCH(chidx); + + /* Transfer all of the data into the Tx FIFO */ + + src = (FAR uint32_t *)buffer; + for (; buflen32 > 0; buflen32--) + { + uint32_t data = *src++; + stm32_putreg(fifo, data); + } + + /* Increment the count of bytes "in-flight" in the Tx FIFO */ + + priv->chan[chidx].inflight += buflen; +} + +/**************************************************************************** + * Name: stm32_gint_hcinisr + * + * Description: + * USB OTG FS host IN channels interrupt handler + * + * One the completion of the transfer, the channel result byte may be set as + * follows: + * + * OK - Transfer completed successfully + * EAGAIN - If devices NAKs the transfer or NYET occurs + * EPERM - If the endpoint stalls + * EIO - On a TX or data toggle error + * EPIPE - Frame overrun + * + * EBUSY in the result field indicates that the transfer has not completed. + * + ****************************************************************************/ + +static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv, + int chidx) +{ + FAR struct stm32_chan_s *chan = &priv->chan[chidx]; + uint32_t regval; + uint32_t pending; + + /* Read the HCINT register to get the pending HC interrupts. Read the + * HCINTMSK register to get the set of enabled HC interrupts. + */ + + pending = stm32_getreg(STM32_OTGFS_HCINT(chidx)); + regval = stm32_getreg(STM32_OTGFS_HCINTMSK(chidx)); + + /* AND the two to get the set of enabled, pending HC interrupts */ + + pending &= regval; + ullvdbg("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending); + + /* Check for a pending ACK response received/transmitted (ACK) interrupt */ + + if ((pending & OTGFS_HCINT_ACK) != 0) + { + /* Clear the pending the ACK response received/transmitted (ACK) interrupt */ + + stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_ACK); + } + + /* Check for a pending STALL response receive (STALL) interrupt */ + + else if ((pending & OTGFS_HCINT_STALL) != 0) + { + /* Clear the NAK and STALL Conditions. */ + + stm32_putreg(STM32_OTGFS_HCINT(chidx), (OTGFS_HCINT_NAK | OTGFS_HCINT_STALL)); + + /* Halt the channel when a STALL, TXERR, BBERR or DTERR interrupt is + * received on the channel. + */ + + stm32_chan_halt(priv, chidx, CHREASON_STALL); + + /* When there is a STALL, clear any pending NAK so that it is not + * processed below. + */ + + pending &= ~OTGFS_HCINT_NAK; + } + + /* Check for a pending Data Toggle ERRor (DTERR) interrupt */ + + else if ((pending & OTGFS_HCINT_DTERR) != 0) + { + /* Halt the channel when a STALL, TXERR, BBERR or DTERR interrupt is + * received on the channel. + */ + + stm32_chan_halt(priv, chidx, CHREASON_DTERR); + + /* Clear the NAK and data toggle error conditions */ + + stm32_putreg(STM32_OTGFS_HCINT(chidx), (OTGFS_HCINT_NAK | OTGFS_HCINT_DTERR)); + } + + /* Check for a pending FRaMe OverRun (FRMOR) interrupt */ + + if ((pending & OTGFS_HCINT_FRMOR) != 0) + { + /* Halt the channel -- the CHH interrupt is expected next */ + + stm32_chan_halt(priv, chidx, CHREASON_FRMOR); + + /* Clear the FRaMe OverRun (FRMOR) condition */ + + stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_FRMOR); + } + + /* Check for a pending TransFeR Completed (XFRC) interrupt */ + + else if ((pending & OTGFS_HCINT_XFRC) != 0) + { + /* Clear the TransFeR Completed (XFRC) condition */ + + stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_XFRC); + + /* Then handle the transfer completion event based on the endpoint type */ + + if (chan->eptype == OTGFS_EPTYPE_CTRL || chan->eptype == OTGFS_EPTYPE_BULK) + { + /* Halt the channel -- the CHH interrupt is expected next */ + + stm32_chan_halt(priv, chidx, CHREASON_XFRC); + + /* Clear any pending NAK condition. The 'indata1' data toggle + * should have been appropriately updated by the RxFIFO + * logic as each packet was received. + */ + + stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_NAK); + } + else if (chan->eptype == OTGFS_EPTYPE_INTR) + { + /* Force the next transfer on an ODD frame */ + + regval = stm32_getreg(STM32_OTGFS_HCCHAR(chidx)); + regval |= OTGFS_HCCHAR_ODDFRM; + stm32_putreg(STM32_OTGFS_HCCHAR(chidx), regval); + + /* Set the request done state */ + + chan->result = OK; + } + } + + /* Check for a pending CHannel Halted (CHH) interrupt */ + + else if ((pending & OTGFS_HCINT_CHH) != 0) + { + /* Mask the CHannel Halted (CHH) interrupt */ + + regval = stm32_getreg(STM32_OTGFS_HCINTMSK(chidx)); + regval &= ~OTGFS_HCINT_CHH; + stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), regval); + + /* Update the request state based on the host state machine state */ + + if (chan->chreason == CHREASON_XFRC) + { + /* Set the request done result */ + + chan->result = OK; + } + else if (chan->chreason == CHREASON_STALL) + { + /* Set the request stall result */ + + chan->result = EPERM; + } + else if ((chan->chreason == CHREASON_TXERR) || + (chan->chreason == CHREASON_DTERR)) + { + /* Set the request I/O error result */ + + chan->result = EIO; + } + else if (chan->chreason == CHREASON_NAK) + { + /* Halt on NAK only happens on an INTR channel. Fetch the HCCHAR register + * and check for an interrupt endpoint. + */ + + regval = stm32_getreg(STM32_OTGFS_HCCHAR(chidx)); + if ((regval & OTGFS_HCCHAR_EPTYP_MASK) == OTGFS_HCCHAR_EPTYP_INTR) + { + /* Toggle the IN data toggle (Used by Bulk and INTR only) */ + + chan->indata1 ^= true; + } + + /* Set the NAK error result */ + + chan->result = EAGAIN; + } + else /* if (chan->chreason == CHREASON_FRMOR) */ + { + /* Set the frame overrun error result */ + + chan->result = EPIPE; + } + + /* Clear the CHannel Halted (CHH) condition */ + + stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_CHH); + } + + /* Check for a pending Transaction ERror (TXERR) interrupt */ + + else if ((pending & OTGFS_HCINT_TXERR) != 0) + { + /* Halt the channel when a STALL, TXERR, BBERR or DTERR interrupt is + * received on the channel. + */ + + stm32_chan_halt(priv, chidx, CHREASON_TXERR); + + /* Clear the Transaction ERror (TXERR) condition */ + + stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_TXERR); + } + + /* Check for a pending NAK response received (NAK) interrupt */ + + else if ((pending & OTGFS_HCINT_NAK) != 0) + { + /* For a BULK transfer, the hardware is capable of retrying + * automatically on a NAK. However, this is not always + * what we need to do. So we always halt the transfer and + * return control to high level logic in the event of a NAK. + */ + +#if 1 + /* Halt the interrupt channel */ + + if (chan->eptype == OTGFS_EPTYPE_INTR) + { + /* Halt the channel -- the CHH interrupt is expected next */ + + stm32_chan_halt(priv, chidx, CHREASON_NAK); + } + + /* Re-activate CTRL and BULK channels. + * REVISIT: This can cause a lot of interrupts! + */ + + else if (chan->eptype == OTGFS_EPTYPE_CTRL || + chan->eptype == OTGFS_EPTYPE_BULK) + { + /* Re-activate the channel by clearing CHDIS and assuring that + * CHENA is set + */ + + regval = stm32_getreg(STM32_OTGFS_HCCHAR(chidx)); + regval |= OTGFS_HCCHAR_CHENA; + regval &= ~OTGFS_HCCHAR_CHDIS; + stm32_putreg(STM32_OTGFS_HCCHAR(chidx), regval); + } +#else + /* Halt all transfers on the NAK -- the CHH interrupt is expected next */ + + stm32_chan_halt(priv, chidx, CHREASON_NAK); +#endif + + /* Clear the NAK condition */ + + stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_NAK); + } + + /* Check for a transfer complete event */ + + stm32_chan_wakeup(priv, chan); +} + +/**************************************************************************** + * Name: stm32_gint_hcoutisr + * + * Description: + * USB OTG FS host OUT channels interrupt handler + * + * One the completion of the transfer, the channel result byte may be set as + * follows: + * + * OK - Transfer completed successfully + * EAGAIN - If devices NAKs the transfer or NYET occurs + * EPERM - If the endpoint stalls + * EIO - On a TX or data toggle error + * EPIPE - Frame overrun + * + * EBUSY in the result field indicates that the transfer has not completed. + * + ****************************************************************************/ + +static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv, + int chidx) +{ + FAR struct stm32_chan_s *chan = &priv->chan[chidx]; + uint32_t regval; + uint32_t pending; + + /* Read the HCINT register to get the pending HC interrupts. Read the + * HCINTMSK register to get the set of enabled HC interrupts. + */ + + pending = stm32_getreg(STM32_OTGFS_HCINT(chidx)); + regval = stm32_getreg(STM32_OTGFS_HCINTMSK(chidx)); + + /* AND the two to get the set of enabled, pending HC interrupts */ + + pending &= regval; + ullvdbg("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending); + + /* Check for a pending ACK response received/transmitted (ACK) interrupt */ + + if ((pending & OTGFS_HCINT_ACK) != 0) + { + /* Clear the pending the ACK response received/transmitted (ACK) interrupt */ + + stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_ACK); + } + + /* Check for a pending FRaMe OverRun (FRMOR) interrupt */ + + else if ((pending & OTGFS_HCINT_FRMOR) != 0) + { + /* Halt the channel (probably not necessary for FRMOR) */ + + stm32_chan_halt(priv, chidx, CHREASON_FRMOR); + + /* Clear the pending the FRaMe OverRun (FRMOR) interrupt */ + + stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_FRMOR); + } + + /* Check for a pending TransFeR Completed (XFRC) interrupt */ + + else if ((pending & OTGFS_HCINT_XFRC) != 0) + { + /* Decrement the number of bytes remaining by the number of + * bytes that were "in-flight". + */ + + priv->chan[chidx].buffer += priv->chan[chidx].inflight; + priv->chan[chidx].xfrd += priv->chan[chidx].inflight; + priv->chan[chidx].inflight = 0; + + /* Halt the channel -- the CHH interrupt is expected next */ + + stm32_chan_halt(priv, chidx, CHREASON_XFRC); + + /* Clear the pending the TransFeR Completed (XFRC) interrupt */ + + stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_XFRC); + } + + /* Check for a pending STALL response receive (STALL) interrupt */ + + else if ((pending & OTGFS_HCINT_STALL) != 0) + { + /* Clear the pending the STALL response receiv (STALL) interrupt */ + + stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_STALL); + + /* Halt the channel when a STALL, TXERR, BBERR or DTERR interrupt is + * received on the channel. + */ + + stm32_chan_halt(priv, chidx, CHREASON_STALL); + } + + /* Check for a pending NAK response received (NAK) interrupt */ + + else if ((pending & OTGFS_HCINT_NAK) != 0) + { + /* Halt the channel -- the CHH interrupt is expected next */ + + stm32_chan_halt(priv, chidx, CHREASON_NAK); + + /* Clear the pending the NAK response received (NAK) interrupt */ + + stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_NAK); + } + + /* Check for a pending Transaction ERror (TXERR) interrupt */ + + else if ((pending & OTGFS_HCINT_TXERR) != 0) + { + /* Halt the channel when a STALL, TXERR, BBERR or DTERR interrupt is + * received on the channel. + */ + + stm32_chan_halt(priv, chidx, CHREASON_TXERR); + + /* Clear the pending the Transaction ERror (TXERR) interrupt */ + + stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_TXERR); + } + + /* Check for a NYET interrupt */ + +#if 0 /* NYET is a reserved bit in the HCINT register */ + else if ((pending & OTGFS_HCINT_NYET) != 0) + { + /* Halt the channel */ + + stm32_chan_halt(priv, chidx, CHREASON_NYET); + + /* Clear the pending the NYET interrupt */ + + stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_NYET); + } +#endif + + /* Check for a pending Data Toggle ERRor (DTERR) interrupt */ + + else if (pending & OTGFS_HCINT_DTERR) + { + /* Halt the channel when a STALL, TXERR, BBERR or DTERR interrupt is + * received on the channel. + */ + + stm32_chan_halt(priv, chidx, CHREASON_DTERR); + + /* Clear the pending the Data Toggle ERRor (DTERR) and NAK interrupts */ + + stm32_putreg(STM32_OTGFS_HCINT(chidx), (OTGFS_HCINT_DTERR | OTGFS_HCINT_NAK)); + } + + /* Check for a pending CHannel Halted (CHH) interrupt */ + + else if ((pending & OTGFS_HCINT_CHH) != 0) + { + /* Mask the CHannel Halted (CHH) interrupt */ + + regval = stm32_getreg(STM32_OTGFS_HCINTMSK(chidx)); + regval &= ~OTGFS_HCINT_CHH; + stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), regval); + + if (chan->chreason == CHREASON_XFRC) + { + /* Set the request done result */ + + chan->result = OK; + + /* Read the HCCHAR register to get the HCCHAR register to get + * the endpoint type. + */ + + regval = stm32_getreg(STM32_OTGFS_HCCHAR(chidx)); + + /* Is it a bulk endpoint? Were an odd number of packets + * transferred? + */ + + if ((regval & OTGFS_HCCHAR_EPTYP_MASK) == OTGFS_HCCHAR_EPTYP_BULK && + (chan->npackets & 1) != 0) + { + /* Yes to both... toggle the data out PID */ + + chan->outdata1 ^= true; + } + } + else if (chan->chreason == CHREASON_NAK || + chan->chreason == CHREASON_NYET) + { + /* Set the try again later result */ + + chan->result = EAGAIN; + } + else if (chan->chreason == CHREASON_STALL) + { + /* Set the request stall result */ + + chan->result = EPERM; + } + else if ((chan->chreason == CHREASON_TXERR) || + (chan->chreason == CHREASON_DTERR)) + { + /* Set the I/O failure result */ + + chan->result = EIO; + } + else /* if (chan->chreason == CHREASON_FRMOR) */ + { + /* Set the frame error result */ + + chan->result = EPIPE; + } + + /* Clear the pending the CHannel Halted (CHH) interrupt */ + + stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_CHH); + } + + /* Check for a transfer complete event */ + + stm32_chan_wakeup(priv, chan); +} + +/**************************************************************************** + * Name: stm32_gint_connected + * + * Description: + * Handle a connection event. + * + ****************************************************************************/ + +static void stm32_gint_connected(FAR struct stm32_usbhost_s *priv) +{ + /* We we previously disconnected? */ + + if (!priv->connected) + { + /* Yes.. then now we are connected */ + + usbhost_vtrace1(OTGFS_VTRACE1_CONNECTED, 0); + priv->connected = true; + priv->change = true; + DEBUGASSERT(priv->smstate == SMSTATE_DETACHED); + + /* Notify any waiters */ + + priv->smstate = SMSTATE_ATTACHED; + if (priv->pscwait) + { + stm32_givesem(&priv->pscsem); + priv->pscwait = false; + } + } +} + +/**************************************************************************** + * Name: stm32_gint_disconnected + * + * Description: + * Handle a disconnection event. + * + ****************************************************************************/ + +static void stm32_gint_disconnected(FAR struct stm32_usbhost_s *priv) +{ + /* Were we previously connected? */ + + if (priv->connected) + { + /* Yes.. then we no longer connected */ + + usbhost_vtrace1(OTGFS_VTRACE1_DISCONNECTED, 0); + + /* Are we bound to a class driver? */ + + if (priv->rhport.hport.devclass) + { + /* Yes.. Disconnect the class driver */ + + CLASS_DISCONNECTED(priv->rhport.hport.devclass); + priv->rhport.hport.devclass = NULL; + } + + /* Re-Initialize Host for new Enumeration */ + + priv->smstate = SMSTATE_DETACHED; + priv->connected = false; + priv->change = true; + stm32_chan_freeall(priv); + + priv->rhport.hport.speed = USB_SPEED_FULL; + + /* Notify any waiters that there is a change in the connection state */ + + if (priv->pscwait) + { + stm32_givesem(&priv->pscsem); + priv->pscwait = false; + } + } +} + +/**************************************************************************** + * Name: stm32_gint_sofisr + * + * Description: + * USB OTG FS start-of-frame interrupt handler + * + ****************************************************************************/ + +#ifdef CONFIG_STM32_OTGFS_SOFINTR +static inline void stm32_gint_sofisr(FAR struct stm32_usbhost_s *priv) +{ + /* Handle SOF interrupt */ +#warning "Do what?" + + /* Clear pending SOF interrupt */ + + stm32_putreg(STM32_OTGFS_GINTSTS, OTGFS_GINT_SOF); +} +#endif + +/**************************************************************************** + * Name: stm32_gint_rxflvlisr + * + * Description: + * USB OTG FS RxFIFO non-empty interrupt handler + * + ****************************************************************************/ + +static inline void stm32_gint_rxflvlisr(FAR struct stm32_usbhost_s *priv) +{ + FAR uint32_t *dest; + uint32_t grxsts; + uint32_t intmsk; + uint32_t hcchar; + uint32_t hctsiz; + uint32_t fifo; + int bcnt; + int bcnt32; + int chidx; + int i; + + /* Disable the RxFIFO non-empty interrupt */ + + intmsk = stm32_getreg(STM32_OTGFS_GINTMSK); + intmsk &= ~OTGFS_GINT_RXFLVL; + stm32_putreg(STM32_OTGFS_GINTMSK, intmsk); + + /* Read and pop the next status from the Rx FIFO */ + + grxsts = stm32_getreg(STM32_OTGFS_GRXSTSP); + ullvdbg("GRXSTS: %08x\n", grxsts); + + /* Isolate the channel number/index in the status word */ + + chidx = (grxsts & OTGFS_GRXSTSH_CHNUM_MASK) >> OTGFS_GRXSTSH_CHNUM_SHIFT; + + /* Get the host channel characteristics register (HCCHAR) for this channel */ + + hcchar = stm32_getreg(STM32_OTGFS_HCCHAR(chidx)); + + /* Then process the interrupt according to the packet status */ + + switch (grxsts & OTGFS_GRXSTSH_PKTSTS_MASK) + { + case OTGFS_GRXSTSH_PKTSTS_INRECVD: /* IN data packet received */ + { + /* Read the data into the host buffer. */ + + bcnt = (grxsts & OTGFS_GRXSTSH_BCNT_MASK) >> OTGFS_GRXSTSH_BCNT_SHIFT; + if (bcnt > 0 && priv->chan[chidx].buffer != NULL) + { + /* Transfer the packet from the Rx FIFO into the user buffer */ + + dest = (FAR uint32_t *)priv->chan[chidx].buffer; + fifo = STM32_OTGFS_DFIFO_HCH(0); + bcnt32 = (bcnt + 3) >> 2; + + for (i = 0; i < bcnt32; i++) + { + *dest++ = stm32_getreg(fifo); + } + + stm32_pktdump("Received", priv->chan[chidx].buffer, bcnt); + + /* Toggle the IN data pid (Used by Bulk and INTR only) */ + + priv->chan[chidx].indata1 ^= true; + + /* Manage multiple packet transfers */ + + priv->chan[chidx].buffer += bcnt; + priv->chan[chidx].xfrd += bcnt; + + /* Check if more packets are expected */ + + hctsiz = stm32_getreg(STM32_OTGFS_HCTSIZ(chidx)); + if ((hctsiz & OTGFS_HCTSIZ_PKTCNT_MASK) != 0) + { + /* Re-activate the channel when more packets are expected */ + + hcchar |= OTGFS_HCCHAR_CHENA; + hcchar &= ~OTGFS_HCCHAR_CHDIS; + stm32_putreg(STM32_OTGFS_HCCHAR(chidx), hcchar); + } + } + } + break; + + case OTGFS_GRXSTSH_PKTSTS_INDONE: /* IN transfer completed */ + case OTGFS_GRXSTSH_PKTSTS_DTOGERR: /* Data toggle error */ + case OTGFS_GRXSTSH_PKTSTS_HALTED: /* Channel halted */ + default: + break; + } + + /* Re-enable the RxFIFO non-empty interrupt */ + + intmsk |= OTGFS_GINT_RXFLVL; + stm32_putreg(STM32_OTGFS_GINTMSK, intmsk); +} + +/**************************************************************************** + * Name: stm32_gint_nptxfeisr + * + * Description: + * USB OTG FS non-periodic TxFIFO empty interrupt handler + * + ****************************************************************************/ + +static inline void stm32_gint_nptxfeisr(FAR struct stm32_usbhost_s *priv) +{ + FAR struct stm32_chan_s *chan; + uint32_t regval; + unsigned int wrsize; + unsigned int avail; + unsigned int chidx; + + /* Recover the index of the channel that is waiting for space in the Tx + * FIFO. + */ + + chidx = priv->chidx; + chan = &priv->chan[chidx]; + + /* Reduce the buffer size by the number of bytes that were previously placed + * in the Tx FIFO. + */ + + chan->buffer += chan->inflight; + chan->xfrd += chan->inflight; + chan->inflight = 0; + + /* If we have now transferred the entire buffer, then this transfer is + * complete (this case really should never happen because we disable + * the NPTXFE interrupt on the final packet). + */ + + if (chan->xfrd >= chan->buflen) + { + /* Disable further Tx FIFO empty interrupts and bail. */ + + stm32_modifyreg(STM32_OTGFS_GINTMSK, OTGFS_GINT_NPTXFE, 0); + return; + } + + /* Read the status from the top of the non-periodic TxFIFO */ + + regval = stm32_getreg(STM32_OTGFS_HNPTXSTS); + + /* Extract the number of bytes available in the non-periodic Tx FIFO. */ + + avail = ((regval & OTGFS_HNPTXSTS_NPTXFSAV_MASK) >> OTGFS_HNPTXSTS_NPTXFSAV_SHIFT) << 2; + + /* Get the size to put in the Tx FIFO now */ + + wrsize = chan->buflen - chan->xfrd; + + /* Get minimal size packet that can be sent. Something is seriously + * configured wrong if one packet will not fit into the empty Tx FIFO. + */ + + DEBUGASSERT(wrsize > 0 && avail >= MIN(wrsize, chan->maxpacket)); + if (wrsize > avail) + { + /* Clip the write size to the number of full, max sized packets + * that will fit in the Tx FIFO. + */ + + unsigned int wrpackets = avail / chan->maxpacket; + wrsize = wrpackets * chan->maxpacket; + } + + /* Otherwise, this will be the last packet to be sent in this transaction. + * We now need to disable further NPTXFE interrupts. + */ + + else + { + stm32_modifyreg(STM32_OTGFS_GINTMSK, OTGFS_GINT_NPTXFE, 0); + } + + /* Write the next group of packets into the Tx FIFO */ + + ullvdbg("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); +} + +/**************************************************************************** + * Name: stm32_gint_ptxfeisr + * + * Description: + * USB OTG FS periodic TxFIFO empty interrupt handler + * + ****************************************************************************/ + +static inline void stm32_gint_ptxfeisr(FAR struct stm32_usbhost_s *priv) +{ + FAR struct stm32_chan_s *chan; + uint32_t regval; + unsigned int wrsize; + unsigned int avail; + unsigned int chidx; + + /* Recover the index of the channel that is waiting for space in the Tx + * FIFO. + */ + + chidx = priv->chidx; + chan = &priv->chan[chidx]; + + /* Reduce the buffer size by the number of bytes that were previously placed + * in the Tx FIFO. + */ + + chan->buffer += chan->inflight; + chan->xfrd += chan->inflight; + chan->inflight = 0; + + /* If we have now transfered the entire buffer, then this transfer is + * complete (this case really should never happen because we disable + * the PTXFE interrupt on the final packet). + */ + + if (chan->xfrd >= chan->buflen) + { + /* Disable further Tx FIFO empty interrupts and bail. */ + + stm32_modifyreg(STM32_OTGFS_GINTMSK, OTGFS_GINT_PTXFE, 0); + return; + } + + /* Read the status from the top of the periodic TxFIFO */ + + regval = stm32_getreg(STM32_OTGFS_HPTXSTS); + + /* Extract the number of bytes available in the periodic Tx FIFO. */ + + avail = ((regval & OTGFS_HPTXSTS_PTXFSAVL_MASK) >> OTGFS_HPTXSTS_PTXFSAVL_SHIFT) << 2; + + /* Get the size to put in the Tx FIFO now */ + + wrsize = chan->buflen - chan->xfrd; + + /* Get minimal size packet that can be sent. Something is seriously + * configured wrong if one packet will not fit into the empty Tx FIFO. + */ + + DEBUGASSERT(wrsize && avail >= MIN(wrsize, chan->maxpacket)); + if (wrsize > avail) + { + /* Clip the write size to the number of full, max sized packets + * that will fit in the Tx FIFO. + */ + + unsigned int wrpackets = avail / chan->maxpacket; + wrsize = wrpackets * chan->maxpacket; + } + + /* Otherwise, this will be the last packet to be sent in this transaction. + * We now need to disable further PTXFE interrupts. + */ + + else + { + stm32_modifyreg(STM32_OTGFS_GINTMSK, OTGFS_GINT_PTXFE, 0); + } + + /* Write the next group of packets into the Tx FIFO */ + + ullvdbg("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); +} + +/**************************************************************************** + * Name: stm32_gint_hcisr + * + * Description: + * USB OTG FS host channels interrupt handler + * + ****************************************************************************/ + +static inline void stm32_gint_hcisr(FAR struct stm32_usbhost_s *priv) +{ + uint32_t haint; + uint32_t hcchar; + int i = 0; + + /* Read the Host all channels interrupt register and test each bit in the + * register. Each bit i, i=0...(STM32_NHOST_CHANNELS-1), corresponds to + * a pending interrupt on channel i. + */ + + haint = stm32_getreg(STM32_OTGFS_HAINT); + for (i = 0; i < STM32_NHOST_CHANNELS; i++) + { + /* Is an interrupt pending on this channel? */ + + if ((haint & OTGFS_HAINT(i)) != 0) + { + /* Yes... read the HCCHAR register to get the direction bit */ + + hcchar = stm32_getreg(STM32_OTGFS_HCCHAR(i)); + + /* Was this an interrupt on an IN or an OUT channel? */ + + if ((hcchar & OTGFS_HCCHAR_EPDIR) != 0) + { + /* Handle the HC IN channel interrupt */ + + stm32_gint_hcinisr(priv, i); + } + else + { + /* Handle the HC OUT channel interrupt */ + + stm32_gint_hcoutisr(priv, i); + } + } + } +} + +/**************************************************************************** + * Name: stm32_gint_hprtisr + * + * Description: + * USB OTG FS host port interrupt handler + * + ****************************************************************************/ + +static inline void stm32_gint_hprtisr(FAR struct stm32_usbhost_s *priv) +{ + uint32_t hprt; + uint32_t newhprt; + uint32_t hcfg; + + usbhost_vtrace1(OTGFS_VTRACE1_GINT_HPRT, 0); + /* Read the port status and control register (HPRT) */ + + hprt = stm32_getreg(STM32_OTGFS_HPRT); + + /* Setup to clear the interrupt bits in GINTSTS by setting the corresponding + * bits in the HPRT. The HCINT interrupt bit is cleared when the appropriate + * status bits in the HPRT register are cleared. + */ + + newhprt = hprt & ~(OTGFS_HPRT_PENA | OTGFS_HPRT_PCDET | + OTGFS_HPRT_PENCHNG | OTGFS_HPRT_POCCHNG); + + /* Check for Port Overcurrent CHaNGe (POCCHNG) */ + + if ((hprt & OTGFS_HPRT_POCCHNG) != 0) + { + /* Set up to clear the POCCHNG status in the new HPRT contents. */ + + usbhost_vtrace1(OTGFS_VTRACE1_GINT_HPRT_POCCHNG, 0); + newhprt |= OTGFS_HPRT_POCCHNG; + } + + /* Check for Port Connect DETected (PCDET). The core sets this bit when a + * device connection is detected. + */ + + if ((hprt & OTGFS_HPRT_PCDET) != 0) + { + /* Set up to clear the PCDET status in the new HPRT contents. Then + * process the new connection event. + */ + + usbhost_vtrace1(OTGFS_VTRACE1_GINT_HPRT_PCDET, 0); + newhprt |= OTGFS_HPRT_PCDET; + stm32_portreset(priv); + stm32_gint_connected(priv); + } + + /* Check for Port Enable CHaNGed (PENCHNG) */ + + if ((hprt & OTGFS_HPRT_PENCHNG) != 0) + { + /* Set up to clear the PENCHNG status in the new HPRT contents. */ + + usbhost_vtrace1(OTGFS_VTRACE1_GINT_HPRT_PENCHNG, 0); + newhprt |= OTGFS_HPRT_PENCHNG; + + /* Was the port enabled? */ + + if ((hprt & OTGFS_HPRT_PENA) != 0) + { + /* Yes.. handle the new connection event */ + + stm32_gint_connected(priv); + + /* Check the Host ConFiGuration register (HCFG) */ + + hcfg = stm32_getreg(STM32_OTGFS_HCFG); + + /* Is this a low speed or full speed connection (OTG FS does not + * support high speed) + */ + + if ((hprt & OTGFS_HPRT_PSPD_MASK) == OTGFS_HPRT_PSPD_LS) + { + /* Set the Host Frame Interval Register for the 6KHz speed */ + + usbhost_vtrace1(OTGFS_VTRACE1_GINT_HPRT_LSDEV, 0); + stm32_putreg(STM32_OTGFS_HFIR, 6000); + + /* Are we switching from FS to LS? */ + + if ((hcfg & OTGFS_HCFG_FSLSPCS_MASK) != OTGFS_HCFG_FSLSPCS_LS6MHz) + { + usbhost_vtrace1(OTGFS_VTRACE1_GINT_HPRT_FSLSSW, 0); + + /* Yes... configure for LS */ + + hcfg &= ~OTGFS_HCFG_FSLSPCS_MASK; + hcfg |= OTGFS_HCFG_FSLSPCS_LS6MHz; + stm32_putreg(STM32_OTGFS_HCFG, hcfg); + + /* And reset the port */ + + stm32_portreset(priv); + } + } + else /* if ((hprt & OTGFS_HPRT_PSPD_MASK) == OTGFS_HPRT_PSPD_FS) */ + { + + usbhost_vtrace1(OTGFS_VTRACE1_GINT_HPRT_FSDEV, 0); + stm32_putreg(STM32_OTGFS_HFIR, 48000); + + /* Are we switching from LS to FS? */ + + if ((hcfg & OTGFS_HCFG_FSLSPCS_MASK) != OTGFS_HCFG_FSLSPCS_FS48MHz) + { + + usbhost_vtrace1(OTGFS_VTRACE1_GINT_HPRT_LSFSSW, 0); + /* Yes... configure for FS */ + + hcfg &= ~OTGFS_HCFG_FSLSPCS_MASK; + hcfg |= OTGFS_HCFG_FSLSPCS_FS48MHz; + stm32_putreg(STM32_OTGFS_HCFG, hcfg); + + /* And reset the port */ + + stm32_portreset(priv); + } + } + } + } + + /* Clear port interrupts by setting bits in the HPRT */ + + stm32_putreg(STM32_OTGFS_HPRT, newhprt); +} + +/**************************************************************************** + * Name: stm32_gint_discisr + * + * Description: + * USB OTG FS disconnect detected interrupt handler + * + ****************************************************************************/ + +static inline void stm32_gint_discisr(FAR struct stm32_usbhost_s *priv) +{ + /* Handle the disconnection event */ + + stm32_gint_disconnected(priv); + + /* Clear the dicsonnect interrupt */ + + stm32_putreg(STM32_OTGFS_GINTSTS, OTGFS_GINT_DISC); +} + +/**************************************************************************** + * Name: stm32_gint_ipxfrisr + * + * Description: + * USB OTG FS incomplete periodic interrupt handler + * + ****************************************************************************/ + +static inline void stm32_gint_ipxfrisr(FAR struct stm32_usbhost_s *priv) +{ + uint32_t regval; + + /* CHENA : Set to enable the channel + * CHDIS : Set to stop transmitting/receiving data on a channel + */ + + regval = stm32_getreg(STM32_OTGFS_HCCHAR(0)); + regval |= (OTGFS_HCCHAR_CHDIS | OTGFS_HCCHAR_CHENA); + stm32_putreg(STM32_OTGFS_HCCHAR(0), regval); + + /* Clear the incomplete isochronous OUT interrupt */ + + stm32_putreg(STM32_OTGFS_GINTSTS, OTGFS_GINT_IPXFR); +} + +/**************************************************************************** + * Name: stm32_gint_isr + * + * Description: + * USB OTG FS global interrupt handler + * + ****************************************************************************/ + +static int stm32_gint_isr(int irq, FAR void *context) +{ + /* At present, there is only support for a single OTG FS host. Hence it is + * pre-allocated as g_usbhost. However, in most code, the private data + * structure will be referenced using the 'priv' pointer (rather than the + * global data) in order to simplify any future support for multiple devices. + */ + + FAR struct stm32_usbhost_s *priv = &g_usbhost; + uint32_t pending; + + /* If OTG were supported, we would need to check if we are in host or + * device mode when the global interrupt occurs. Here we support only + * host mode + */ + + /* Loop while there are pending interrupts to process. This loop may save a + * little interrupt handling overhead. + */ + + for (; ; ) + { + /* Get the unmasked bits in the GINT status */ + + pending = stm32_getreg(STM32_OTGFS_GINTSTS); + pending &= stm32_getreg(STM32_OTGFS_GINTMSK); + + /* Return from the interrupt when there are no further pending + * interrupts. + */ + + if (pending == 0) + { + return OK; + } + + /* Otherwise, process each pending, unmasked GINT interrupts */ + + /* Handle the start of frame interrupt */ + +#ifdef CONFIG_STM32_OTGFS_SOFINTR + if ((pending & OTGFS_GINT_SOF) != 0) + { + usbhost_vtrace1(OTGFS_VTRACE1_GINT_SOF, 0); + stm32_gint_sofisr(priv); + } +#endif + + /* Handle the RxFIFO non-empty interrupt */ + + if ((pending & OTGFS_GINT_RXFLVL) != 0) + { + usbhost_vtrace1(OTGFS_VTRACE1_GINT_RXFLVL, 0); + stm32_gint_rxflvlisr(priv); + } + + /* Handle the non-periodic TxFIFO empty interrupt */ + + if ((pending & OTGFS_GINT_NPTXFE) != 0) + { + usbhost_vtrace1(OTGFS_VTRACE1_GINT_NPTXFE, 0); + stm32_gint_nptxfeisr(priv); + } + + /* Handle the periodic TxFIFO empty interrupt */ + + if ((pending & OTGFS_GINT_PTXFE) != 0) + { + usbhost_vtrace1(OTGFS_VTRACE1_GINT_PTXFE, 0); + stm32_gint_ptxfeisr(priv); + } + + /* Handle the host channels interrupt */ + + if ((pending & OTGFS_GINT_HC) != 0) + { + usbhost_vtrace1(OTGFS_VTRACE1_GINT_HC, 0); + stm32_gint_hcisr(priv); + } + + /* Handle the host port interrupt */ + + if ((pending & OTGFS_GINT_HPRT) != 0) + { + stm32_gint_hprtisr(priv); + } + + /* Handle the disconnect detected interrupt */ + + if ((pending & OTGFS_GINT_DISC) != 0) + { + usbhost_vtrace1(OTGFS_VTRACE1_GINT_DISC, 0); + stm32_gint_discisr(priv); + } + + /* Handle the incomplete periodic transfer */ + + if ((pending & OTGFS_GINT_IPXFR) != 0) + { + usbhost_vtrace1(OTGFS_VTRACE1_GINT_IPXFR, 0); + stm32_gint_ipxfrisr(priv); + } + } + + /* We won't get here */ + + return OK; +} + +/**************************************************************************** + * Name: stm32_gint_enable and stm32_gint_disable + * + * Description: + * Respectively enable or disable the global OTG FS interrupt. + * + * Input Parameters: + * None + * + * Returned Value: + * None + * + ****************************************************************************/ + +static void stm32_gint_enable(void) +{ + uint32_t regval; + + /* Set the GINTMSK bit to unmask the interrupt */ + + regval = stm32_getreg(STM32_OTGFS_GAHBCFG); + regval |= OTGFS_GAHBCFG_GINTMSK; + stm32_putreg(STM32_OTGFS_GAHBCFG, regval); +} + +static void stm32_gint_disable(void) +{ + uint32_t regval; + + /* Clear the GINTMSK bit to mask the interrupt */ + + regval = stm32_getreg(STM32_OTGFS_GAHBCFG); + regval &= ~OTGFS_GAHBCFG_GINTMSK; + stm32_putreg(STM32_OTGFS_GAHBCFG, regval); +} + +/**************************************************************************** + * Name: stm32_hostinit_enable + * + * Description: + * Enable host interrupts. + * + * Input Parameters: + * None + * + * Returned Value: + * None + * + ****************************************************************************/ + +static inline void stm32_hostinit_enable(void) +{ + uint32_t regval; + + /* Disable all interrupts. */ + + stm32_putreg(STM32_OTGFS_GINTMSK, 0); + + /* Clear any pending interrupts. */ + + stm32_putreg(STM32_OTGFS_GINTSTS, 0xffffffff); + + /* Clear any pending USB OTG Interrupts (should be done elsewhere if OTG is supported) */ + + stm32_putreg(STM32_OTGFS_GOTGINT, 0xffffffff); + + /* Clear any pending USB OTG interrupts */ + + stm32_putreg(STM32_OTGFS_GINTSTS, 0xbfffffff); + + /* Enable the host interrupts */ + /* Common interrupts: + * + * OTGFS_GINT_WKUP : Resume/remote wakeup detected interrupt + * OTGFS_GINT_USBSUSP : USB suspend + */ + + regval = (OTGFS_GINT_WKUP | OTGFS_GINT_USBSUSP); + + /* If OTG were supported, we would need to enable the following as well: + * + * OTGFS_GINT_OTG : OTG interrupt + * OTGFS_GINT_SRQ : Session request/new session detected interrupt + * OTGFS_GINT_CIDSCHG : Connector ID status change + */ + + /* Host-specific interrupts + * + * OTGFS_GINT_SOF : Start of frame + * OTGFS_GINT_RXFLVL : RxFIFO non-empty + * OTGFS_GINT_IISOOXFR : Incomplete isochronous OUT transfer + * OTGFS_GINT_HPRT : Host port interrupt + * OTGFS_GINT_HC : Host channels interrupt + * OTGFS_GINT_DISC : Disconnect detected interrupt + */ + +#ifdef CONFIG_STM32_OTGFS_SOFINTR + regval |= (OTGFS_GINT_SOF | OTGFS_GINT_RXFLVL | OTGFS_GINT_IISOOXFR | + OTGFS_GINT_HPRT | OTGFS_GINT_HC | OTGFS_GINT_DISC); +#else + regval |= (OTGFS_GINT_RXFLVL | OTGFS_GINT_IPXFR | OTGFS_GINT_HPRT | + OTGFS_GINT_HC | OTGFS_GINT_DISC); +#endif + stm32_putreg(STM32_OTGFS_GINTMSK, regval); +} + +/**************************************************************************** + * Name: stm32_txfe_enable + * + * Description: + * Enable Tx FIFO empty interrupts. This is necessary when the entire + * transfer will not fit into Tx FIFO. The transfer will then be completed + * when the Tx FIFO is empty. NOTE: The Tx FIFO interrupt is disabled + * the fifo empty interrupt handler when the transfer is complete. + * + * Input Parameters: + * priv - Driver state structure reference + * chidx - The channel that requires the Tx FIFO empty interrupt + * + * Returned Value: + * None + * + * Assumptions: + * Called from user task context. Interrupts must be disabled to assure + * exclusive access to the GINTMSK register. + * + ****************************************************************************/ + +static void stm32_txfe_enable(FAR struct stm32_usbhost_s *priv, int chidx) +{ + FAR struct stm32_chan_s *chan = &priv->chan[chidx]; + irqstate_t flags; + uint32_t regval; + + /* Disable all interrupts so that we have exclusive access to the GINTMSK + * (it would be sufficent just to disable the GINT interrupt). + */ + + flags = enter_critical_section(); + + /* Should we enable the periodic or non-peridic Tx FIFO empty interrupts */ + + regval = stm32_getreg(STM32_OTGFS_GINTMSK); + switch (chan->eptype) + { + default: + case OTGFS_EPTYPE_CTRL: /* Non periodic transfer */ + case OTGFS_EPTYPE_BULK: + regval |= OTGFS_GINT_NPTXFE; + break; + + case OTGFS_EPTYPE_INTR: /* Periodic transfer */ + case OTGFS_EPTYPE_ISOC: + regval |= OTGFS_GINT_PTXFE; + break; + } + + /* Enable interrupts */ + + stm32_putreg(STM32_OTGFS_GINTMSK, regval); + leave_critical_section(flags); +} + +/**************************************************************************** + * USB Host Controller Operations + ****************************************************************************/ + +/**************************************************************************** + * Name: stm32_wait + * + * Description: + * Wait for a device to be connected or disconnected to/from a hub port. + * + * Input Parameters: + * conn - The USB host connection instance obtained as a parameter from the call to + * the USB driver initialization logic. + * hport - The location to return the hub port descriptor that detected the + * connection related event. + * + * Returned Values: + * Zero (OK) is returned on success when a device in connected or + * disconnected. This function will not return until either (1) a device is + * connected or disconnect to/from any hub port or until (2) some failure + * occurs. On a failure, a negated errno value is returned indicating the + * nature of the failure + * + * Assumptions: + * - Called from a single thread so no mutual exclusion is required. + * - Never called from an interrupt handler. + * + ****************************************************************************/ + +static int stm32_wait(FAR struct usbhost_connection_s *conn, + FAR struct usbhost_hubport_s **hport) +{ + FAR struct stm32_usbhost_s *priv = &g_usbhost; + struct usbhost_hubport_s *connport; + irqstate_t flags; + + /* Loop until a change in connection state is detected */ + + flags = enter_critical_section(); + for (; ; ) + { + /* Is there a change in the connection state of the single root hub + * port? + */ + + if (priv->change) + { + connport = &priv->rhport.hport; + + /* Yes. Remember the new state */ + + connport->connected = priv->connected; + priv->change = false; + + /* And return the root hub port */ + + *hport = connport; + leave_critical_section(flags); + + uvdbg("RHport Connected: %s\n", connport->connected ? "YES" : "NO"); + return OK; + } + +#ifdef CONFIG_USBHOST_HUB + /* Is a device connected to an external hub? */ + + if (priv->hport) + { + /* Yes.. return the external hub port */ + + connport = (struct usbhost_hubport_s *)priv->hport; + priv->hport = NULL; + + *hport = connport; + leave_critical_section(flags); + + uvdbg("Hub port Connected: %s\n", connport->connected ? "YES" : "NO"); + return OK; + } +#endif + + /* Wait for the next connection event */ + + priv->pscwait = true; + stm32_takesem(&priv->pscsem); + } +} + +/**************************************************************************** + * Name: stm32_enumerate + * + * Description: + * Enumerate the connected device. As part of this enumeration process, + * the driver will (1) get the device's configuration descriptor, (2) + * extract the class ID info from the configuration descriptor, (3) call + * usbhost_findclass() to find the class that supports this device, (4) + * call the create() method on the struct usbhost_registry_s interface + * to get a class instance, and finally (5) call the connect() method + * of the struct usbhost_class_s interface. After that, the class is in + * charge of the sequence of operations. + * + * Input Parameters: + * conn - The USB host connection instance obtained as a parameter from + * the call to the USB driver initialization logic. + * hport - The descriptor of the hub port that has the newly connected + * device. + * + * Returned Values: + * On success, zero (OK) is returned. On a failure, a negated errno value is + * returned indicating the nature of the failure + * + * Assumptions: + * This function will *not* be called from an interrupt handler. + * + ****************************************************************************/ + +static int stm32_rh_enumerate(FAR struct stm32_usbhost_s *priv, + FAR struct usbhost_connection_s *conn, + FAR struct usbhost_hubport_s *hport) +{ + uint32_t regval; + int ret; + + DEBUGASSERT(conn != NULL && hport != NULL && hport->port == 0); + + /* Are we connected to a device? The caller should have called the wait() + * method first to be assured that a device is connected. + */ + + while (!priv->connected) + { + /* No, return an error */ + + usbhost_trace1(OTGFS_TRACE1_DEVDISCONN, 0); + return -ENODEV; + } + + DEBUGASSERT(priv->smstate == SMSTATE_ATTACHED); + + /* USB 2.0 spec says at least 50ms delay before port reset. We wait 100ms. */ + + usleep(100*1000); + + /* Reset the host port */ + + stm32_portreset(priv); + + /* Get the current device speed */ + + regval = stm32_getreg(STM32_OTGFS_HPRT); + if ((regval & OTGFS_HPRT_PSPD_MASK) == OTGFS_HPRT_PSPD_LS) + { + priv->rhport.hport.speed = USB_SPEED_LOW; + } + else + { + priv->rhport.hport.speed = USB_SPEED_FULL; + } + + /* Allocate and initialize the root hub port EP0 channels */ + + 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); + } + + return ret; +} + +static int stm32_enumerate(FAR struct usbhost_connection_s *conn, + FAR struct usbhost_hubport_s *hport) +{ + FAR struct stm32_usbhost_s *priv = &g_usbhost; + int ret; + + DEBUGASSERT(hport); + + /* If this is a connection on the root hub, then we need to go to + * little more effort to get the device speed. If it is a connection + * on an external hub, then we already have that information. + */ + +#ifdef CONFIG_USBHOST_HUB + if (ROOTHUB(hport)) +#endif + { + ret = stm32_rh_enumerate(priv, conn, hport); + if (ret < 0) + { + return ret; + } + } + + /* Then let the common usbhost_enumerate do the real enumeration. */ + + uvdbg("Enumerate the device\n"); + priv->smstate = SMSTATE_ENUM; + ret = usbhost_enumerate(hport, &hport->devclass); + + /* The enumeration may fail either because of some HCD interfaces failure + * or because the device class is not supported. In either case, we just + * need to perform the disconnection operation and make ready for a new + * enumeration. + */ + + if (ret < 0) + { + /* Return to the disconnected state */ + + udbg("ERROR: Enumeration failed: %d\n", ret); + stm32_gint_disconnected(priv); + } + + return ret; +} + +/************************************************************************************ + * Name: stm32_ep0configure + * + * Description: + * Configure endpoint 0. This method is normally used internally by the + * enumerate() method but is made available at the interface to support an + * external implementation of the enumeration logic. + * + * Input Parameters: + * drvr - The USB host driver instance obtained as a parameter from the call to + * the class create() method. + * ep0 - The (opaque) EP0 endpoint instance + * funcaddr - The USB address of the function containing the endpoint that EP0 + * controls + * speed - The speed of the port USB_SPEED_LOW, _FULL, or _HIGH + * maxpacketsize - The maximum number of bytes that can be sent to or + * received from the endpoint in a single data packet + * + * Returned Values: + * On success, zero (OK) is returned. On a failure, a negated errno value is + * returned indicating the nature of the failure + * + * Assumptions: + * This function will *not* be called from an interrupt handler. + * + ************************************************************************************/ + +static int stm32_ep0configure(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, + uint8_t funcaddr, uint8_t speed, + uint16_t maxpacketsize) +{ + FAR struct stm32_usbhost_s *priv = (FAR struct stm32_usbhost_s *)drvr; + FAR struct stm32_ctrlinfo_s *ep0info = (FAR struct stm32_ctrlinfo_s *)ep0; + FAR struct stm32_chan_s *chan; + + DEBUGASSERT(drvr != NULL && ep0info != NULL && funcaddr < 128 && + maxpacketsize <= 64); + + /* We must have exclusive access to the USB host hardware and state structures */ + + stm32_takesem(&priv->exclsem); + + /* Configure the EP0 OUT channel */ + + chan = &priv->chan[ep0info->outndx]; + chan->funcaddr = funcaddr; + chan->speed = speed; + chan->maxpacket = maxpacketsize; + + stm32_chan_configure(priv, ep0info->outndx); + + /* Configure the EP0 IN channel */ + + chan = &priv->chan[ep0info->inndx]; + chan->funcaddr = funcaddr; + chan->speed = speed; + chan->maxpacket = maxpacketsize; + + stm32_chan_configure(priv, ep0info->inndx); + + stm32_givesem(&priv->exclsem); + return OK; +} + +/************************************************************************************ + * Name: stm32_epalloc + * + * Description: + * Allocate and configure one endpoint. + * + * Input Parameters: + * drvr - The USB host driver instance obtained as a parameter from the call to + * the class create() method. + * epdesc - Describes the endpoint to be allocated. + * ep - A memory location provided by the caller in which to receive the + * allocated endpoint descriptor. + * + * Returned Values: + * On success, zero (OK) is returned. On a failure, a negated errno value is + * returned indicating the nature of the failure + * + * Assumptions: + * This function will *not* be called from an interrupt handler. + * + ************************************************************************************/ + +static int stm32_epalloc(FAR struct usbhost_driver_s *drvr, + FAR const struct usbhost_epdesc_s *epdesc, + FAR usbhost_ep_t *ep) +{ + FAR struct stm32_usbhost_s *priv = (FAR struct stm32_usbhost_s *)drvr; + int ret; + + /* Sanity check. NOTE that this method should only be called if a device is + * connected (because we need a valid low speed indication). + */ + + DEBUGASSERT(drvr != 0 && epdesc != NULL && ep != NULL); + + /* We must have exclusive access to the USB host hardware and state structures */ + + stm32_takesem(&priv->exclsem); + + /* Handler control pipes differently from other endpoint types. This is + * because the normal, "transfer" endpoints are unidirectional an require + * only a single channel. Control endpoints, however, are bi-diretional + * and require two channels, one for the IN and one for the OUT direction. + */ + + if (epdesc->xfrtype == OTGFS_EPTYPE_CTRL) + { + ret = stm32_ctrlep_alloc(priv, epdesc, ep); + } + else + { + ret = stm32_xfrep_alloc(priv, epdesc, ep); + } + + stm32_givesem(&priv->exclsem); + return ret; +} + +/************************************************************************************ + * Name: stm32_epfree + * + * Description: + * Free and endpoint previously allocated by DRVR_EPALLOC. + * + * Input Parameters: + * drvr - The USB host driver instance obtained as a parameter from the call to + * the class create() method. + * ep - The endpoint to be freed. + * + * Returned Values: + * On success, zero (OK) is returned. On a failure, a negated errno value is + * returned indicating the nature of the failure + * + * Assumptions: + * This function will *not* be called from an interrupt handler. + * + ************************************************************************************/ + +static int stm32_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep) +{ + FAR struct stm32_usbhost_s *priv = (FAR struct stm32_usbhost_s *)drvr; + + DEBUGASSERT(priv); + + /* We must have exclusive access to the USB host hardware and state structures */ + + stm32_takesem(&priv->exclsem); + + /* A single channel is represent by an index in the range of 0 to STM32_MAX_TX_FIFOS. + * Otherwise, the ep must be a pointer to an allocated control endpoint structure. + */ + + if ((uintptr_t)ep < STM32_MAX_TX_FIFOS) + { + /* Halt the channel and mark the channel available */ + + stm32_chan_free(priv, (int)ep); + } + else + { + /* Halt both control channel and mark the channels available */ + + FAR struct stm32_ctrlinfo_s *ctrlep = (FAR struct stm32_ctrlinfo_s *)ep; + stm32_chan_free(priv, ctrlep->inndx); + stm32_chan_free(priv, ctrlep->outndx); + + /* And free the control endpoint container */ + + kmm_free(ctrlep); + } + + stm32_givesem(&priv->exclsem); + return OK; +} + +/**************************************************************************** + * Name: stm32_alloc + * + * Description: + * Some hardware supports special memory in which request and descriptor data can + * be accessed more efficiently. This method provides a mechanism to allocate + * the request/descriptor memory. If the underlying hardware does not support + * such "special" memory, this functions may simply map to kmm_malloc. + * + * This interface was optimized under a particular assumption. It was assumed + * that the driver maintains a pool of small, pre-allocated buffers for descriptor + * traffic. NOTE that size is not an input, but an output: The size of the + * pre-allocated buffer is returned. + * + * Input Parameters: + * drvr - The USB host driver instance obtained as a parameter from the call to + * the class create() method. + * buffer - The address of a memory location provided by the caller in which to + * return the allocated buffer memory address. + * maxlen - The address of a memory location provided by the caller in which to + * return the maximum size of the allocated buffer memory. + * + * Returned Values: + * On success, zero (OK) is returned. On a failure, a negated errno value is + * returned indicating the nature of the failure + * + * Assumptions: + * - Called from a single thread so no mutual exclusion is required. + * - Never called from an interrupt handler. + * + ****************************************************************************/ + +static int stm32_alloc(FAR struct usbhost_driver_s *drvr, + FAR uint8_t **buffer, FAR size_t *maxlen) +{ + FAR uint8_t *alloc; + + DEBUGASSERT(drvr && buffer && maxlen); + + /* There is no special memory requirement for the STM32. */ + + alloc = (FAR uint8_t *)kmm_malloc(CONFIG_STM32_OTGFS_DESCSIZE); + if (!alloc) + { + return -ENOMEM; + } + + /* Return the allocated address and size of the descriptor buffer */ + + *buffer = alloc; + *maxlen = CONFIG_STM32_OTGFS_DESCSIZE; + return OK; +} + +/**************************************************************************** + * Name: stm32_free + * + * Description: + * Some hardware supports special memory in which request and descriptor data can + * be accessed more efficiently. This method provides a mechanism to free that + * request/descriptor memory. If the underlying hardware does not support + * such "special" memory, this functions may simply map to kmm_free(). + * + * Input Parameters: + * drvr - The USB host driver instance obtained as a parameter from the call to + * the class create() method. + * buffer - The address of the allocated buffer memory to be freed. + * + * Returned Values: + * On success, zero (OK) is returned. On a failure, a negated errno value is + * returned indicating the nature of the failure + * + * Assumptions: + * - Never called from an interrupt handler. + * + ****************************************************************************/ + +static int stm32_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer) +{ + /* There is no special memory requirement */ + + DEBUGASSERT(drvr && buffer); + kmm_free(buffer); + return OK; +} + +/************************************************************************************ + * Name: stm32_ioalloc + * + * Description: + * Some hardware supports special memory in which larger IO buffers can + * be accessed more efficiently. This method provides a mechanism to allocate + * the request/descriptor memory. If the underlying hardware does not support + * such "special" memory, this functions may simply map to kmm_malloc. + * + * This interface differs from DRVR_ALLOC in that the buffers are variable-sized. + * + * Input Parameters: + * drvr - The USB host driver instance obtained as a parameter from the call to + * the class create() method. + * buffer - The address of a memory location provided by the caller in which to + * return the allocated buffer memory address. + * buflen - The size of the buffer required. + * + * Returned Values: + * On success, zero (OK) is returned. On a failure, a negated errno value is + * returned indicating the nature of the failure + * + * Assumptions: + * This function will *not* be called from an interrupt handler. + * + ************************************************************************************/ + +static int stm32_ioalloc(FAR struct usbhost_driver_s *drvr, + FAR uint8_t **buffer, size_t buflen) +{ + FAR uint8_t *alloc; + + DEBUGASSERT(drvr && buffer && buflen > 0); + + /* There is no special memory requirement */ + + alloc = (FAR uint8_t *)kmm_malloc(buflen); + if (!alloc) + { + return -ENOMEM; + } + + /* Return the allocated buffer */ + + *buffer = alloc; + return OK; +} + +/************************************************************************************ + * Name: stm32_iofree + * + * Description: + * Some hardware supports special memory in which IO data can be accessed more + * efficiently. This method provides a mechanism to free that IO buffer + * memory. If the underlying hardware does not support such "special" memory, + * this functions may simply map to kmm_free(). + * + * Input Parameters: + * drvr - The USB host driver instance obtained as a parameter from the call to + * the class create() method. + * buffer - The address of the allocated buffer memory to be freed. + * + * Returned Values: + * On success, zero (OK) is returned. On a failure, a negated errno value is + * returned indicating the nature of the failure + * + * Assumptions: + * This function will *not* be called from an interrupt handler. + * + ************************************************************************************/ + +static int stm32_iofree(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer) +{ + /* There is no special memory requirement */ + + DEBUGASSERT(drvr && buffer); + kmm_free(buffer); + return OK; +} + +/**************************************************************************** + * Name: stm32_ctrlin and stm32_ctrlout + * + * Description: + * Process a IN or OUT request on the control endpoint. These methods + * will enqueue the request and wait for it to complete. Only one transfer may be + * queued; Neither these methods nor the transfer() method can be called again + * until the control transfer functions returns. + * + * These are blocking methods; these functions will not return until the + * control transfer has completed. + * + * Input Parameters: + * drvr - The USB host driver instance obtained as a parameter from the call to + * the class create() method. + * ep0 - The control endpoint to send/receive the control request. + * req - Describes the request to be sent. This request must lie in memory + * created by DRVR_ALLOC. + * buffer - A buffer used for sending the request and for returning any + * responses. This buffer must be large enough to hold the length value + * in the request description. buffer must have been allocated using DRVR_ALLOC. + * + * NOTE: On an IN transaction, req and buffer may refer to the same allocated + * memory. + * + * Returned Values: + * On success, zero (OK) is returned. On a failure, a negated errno value is + * returned indicating the nature of the failure + * + * Assumptions: + * - Called from a single thread so no mutual exclusion is required. + * - Never called from an interrupt handler. + * + ****************************************************************************/ + +static int stm32_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, + FAR const struct usb_ctrlreq_s *req, + FAR uint8_t *buffer) +{ + FAR struct stm32_usbhost_s *priv = (FAR struct stm32_usbhost_s *)drvr; + FAR struct stm32_ctrlinfo_s *ep0info = (FAR struct stm32_ctrlinfo_s *)ep0; + uint16_t buflen; + systime_t start; + systime_t elapsed; + int retries; + int ret; + + 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", + req->type, req->req, req->value[1], req->value[0], + req->index[1], req->index[0], req->len[1], req->len[0]); + + /* Extract values from the request */ + + buflen = stm32_getle16(req->len); + + /* We must have exclusive access to the USB host hardware and state structures */ + + stm32_takesem(&priv->exclsem); + + /* Loop, retrying until the retry time expires */ + + for (retries = 0; retries < STM32_RETRY_COUNT; retries++) + { + /* Send the SETUP request */ + + ret = stm32_ctrl_sendsetup(priv, ep0info, req); + if (ret < 0) + { + usbhost_trace1(OTGFS_TRACE1_SENDSETUP, -ret); + continue; + } + + /* Get the start time. Loop again until the timeout expires */ + + start = clock_systimer(); + do + { + /* Handle the IN data phase (if any) */ + + if (buflen > 0) + { + ret = stm32_ctrl_recvdata(priv, ep0info, buffer, buflen); + if (ret < 0) + { + usbhost_trace1(OTGFS_TRACE1_RECVDATA, -ret); + } + } + + /* Handle the status OUT phase */ + + if (ret == OK) + { + priv->chan[ep0info->outndx].outdata1 ^= true; + ret = stm32_ctrl_senddata(priv, ep0info, NULL, 0); + if (ret == OK) + { + /* All success transactions exit here */ + + stm32_givesem(&priv->exclsem); + return OK; + } + + usbhost_trace1(OTGFS_TRACE1_SENDDATA, ret < 0 ? -ret : ret); + } + + /* Get the elapsed time (in frames) */ + + elapsed = clock_systimer() - start; + } + while (elapsed < STM32_DATANAK_DELAY); + } + + /* All failures exit here after all retries and timeouts have been exhausted */ + + stm32_givesem(&priv->exclsem); + return -ETIMEDOUT; +} + +static int stm32_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0, + FAR const struct usb_ctrlreq_s *req, + FAR const uint8_t *buffer) +{ + FAR struct stm32_usbhost_s *priv = (FAR struct stm32_usbhost_s *)drvr; + FAR struct stm32_ctrlinfo_s *ep0info = (FAR struct stm32_ctrlinfo_s *)ep0; + uint16_t buflen; + systime_t start; + systime_t elapsed; + int retries; + int ret; + + 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", + req->type, req->req, req->value[1], req->value[0], + req->index[1], req->index[0], req->len[1], req->len[0]); + + /* Extract values from the request */ + + buflen = stm32_getle16(req->len); + + /* We must have exclusive access to the USB host hardware and state structures */ + + stm32_takesem(&priv->exclsem); + + /* Loop, retrying until the retry time expires */ + + for (retries = 0; retries < STM32_RETRY_COUNT; retries++) + { + /* Send the SETUP request */ + + ret = stm32_ctrl_sendsetup(priv, ep0info, req); + if (ret < 0) + { + usbhost_trace1(OTGFS_TRACE1_SENDSETUP, -ret); + continue; + } + + /* Get the start time. Loop again until the timeout expires */ + + start = clock_systimer(); + do + { + /* Handle the data OUT phase (if any) */ + + if (buflen > 0) + { + /* Start DATA out transfer (only one DATA packet) */ + + priv->chan[ep0info->outndx].outdata1 = true; + ret = stm32_ctrl_senddata(priv, ep0info, NULL, 0); + if (ret < 0) + { + usbhost_trace1(OTGFS_TRACE1_SENDDATA, -ret); + } + } + + /* Handle the status IN phase */ + + if (ret == OK) + { + ret = stm32_ctrl_recvdata(priv, ep0info, NULL, 0); + if (ret == OK) + { + /* All success transactins exit here */ + + stm32_givesem(&priv->exclsem); + return OK; + } + + usbhost_trace1(OTGFS_TRACE1_RECVDATA, ret < 0 ? -ret : ret); + } + + /* Get the elapsed time (in frames) */ + + elapsed = clock_systimer() - start; + } + while (elapsed < STM32_DATANAK_DELAY); + } + + /* All failures exit here after all retries and timeouts have been exhausted */ + + stm32_givesem(&priv->exclsem); + return -ETIMEDOUT; +} + +/**************************************************************************** + * Name: stm32_transfer + * + * Description: + * Process a request to handle a transfer descriptor. This method will + * enqueue the transfer request, blocking until the transfer completes. Only + * one transfer may be queued; Neither this method nor the ctrlin or + * ctrlout methods can be called again until this function returns. + * + * This is a blocking method; this functions will not return until the + * transfer has completed. + * + * Input Parameters: + * drvr - The USB host driver instance obtained as a parameter from the call to + * the class create() method. + * ep - The IN or OUT endpoint descriptor for the device endpoint on which to + * perform the transfer. + * buffer - A buffer containing the data to be sent (OUT endpoint) or received + * (IN endpoint). buffer must have been allocated using DRVR_ALLOC + * buflen - The length of the data to be sent or received. + * + * Returned Values: + * On success, a non-negative value is returned that indicates the number + * of bytes successfully transferred. On a failure, a negated errno value is + * returned that indicates the nature of the failure: + * + * EAGAIN - If devices NAKs the transfer (or NYET or other error where + * it may be appropriate to restart the entire transaction). + * EPERM - If the endpoint stalls + * EIO - On a TX or data toggle error + * EPIPE - Overrun errors + * + * Assumptions: + * - Called from a single thread so no mutual exclusion is required. + * - Never called from an interrupt handler. + * + ****************************************************************************/ + +static ssize_t stm32_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, + FAR uint8_t *buffer, size_t buflen) +{ + FAR struct stm32_usbhost_s *priv = (FAR struct stm32_usbhost_s *)drvr; + unsigned int chidx = (unsigned int)ep; + ssize_t nbytes; + + uvdbg("chidx: %d buflen: %d\n", (unsigned int)ep, buflen); + + DEBUGASSERT(priv && buffer && chidx < STM32_MAX_TX_FIFOS && buflen > 0); + + /* We must have exclusive access to the USB host hardware and state structures */ + + stm32_takesem(&priv->exclsem); + + /* Handle IN and OUT transfer slightly differently */ + + if (priv->chan[chidx].in) + { + nbytes = stm32_in_transfer(priv, chidx, buffer, buflen); + } + else + { + nbytes = stm32_out_transfer(priv, chidx, buffer, buflen); + } + + stm32_givesem(&priv->exclsem); + return nbytes; +} + +/**************************************************************************** + * Name: stm32_asynch + * + * Description: + * Process a request to handle a transfer descriptor. This method will + * enqueue the transfer request and return immediately. When the transfer + * completes, the the callback will be invoked with the provided transfer. + * This method is useful for receiving interrupt transfers which may come + * infrequently. + * + * Only one transfer may be queued; Neither this method nor the ctrlin or + * ctrlout methods can be called again until the transfer completes. + * + * Input Parameters: + * drvr - The USB host driver instance obtained as a parameter from the call to + * the class create() method. + * ep - The IN or OUT endpoint descriptor for the device endpoint on which to + * perform the transfer. + * buffer - A buffer containing the data to be sent (OUT endpoint) or received + * (IN endpoint). buffer must have been allocated using DRVR_ALLOC + * buflen - The length of the data to be sent or received. + * callback - This function will be called when the transfer completes. + * arg - The arbitrary parameter that will be passed to the callback function + * when the transfer completes. + * + * Returned Values: + * On success, zero (OK) is returned. On a failure, a negated errno value is + * returned indicating the nature of the failure + * + * Assumptions: + * - Called from a single thread so no mutual exclusion is required. + * - Never called from an interrupt handler. + * + ****************************************************************************/ + +#ifdef CONFIG_USBHOST_ASYNCH +static int stm32_asynch(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep, + FAR uint8_t *buffer, size_t buflen, + usbhost_asynch_t callback, FAR void *arg) +{ + FAR struct stm32_usbhost_s *priv = (FAR struct stm32_usbhost_s *)drvr; + unsigned int chidx = (unsigned int)ep; + int ret; + + uvdbg("chidx: %d buflen: %d\n", (unsigned int)ep, buflen); + + DEBUGASSERT(priv && buffer && chidx < STM32_MAX_TX_FIFOS && buflen > 0); + + /* We must have exclusive access to the USB host hardware and state structures */ + + stm32_takesem(&priv->exclsem); + + /* Handle IN and OUT transfer slightly differently */ + + if (priv->chan[chidx].in) + { + ret = stm32_in_asynch(priv, chidx, buffer, buflen, callback, arg); + } + else + { + ret = stm32_out_asynch(priv, chidx, buffer, buflen, callback, arg); + } + + stm32_givesem(&priv->exclsem); + return ret; +} +#endif /* CONFIG_USBHOST_ASYNCH */ + +/************************************************************************************ + * Name: stm32_cancel + * + * Description: + * Cancel a pending transfer on an endpoint. Cancelled synchronous or + * asynchronous transfer will complete normally with the error -ESHUTDOWN. + * + * Input Parameters: + * drvr - The USB host driver instance obtained as a parameter from the call to + * the class create() method. + * ep - The IN or OUT endpoint descriptor for the device endpoint on which an + * asynchronous transfer should be transferred. + * + * Returned Values: + * On success, zero (OK) is returned. On a failure, a negated errno value is + * returned indicating the nature of the failure. + * + ************************************************************************************/ + +static int stm32_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep) +{ + FAR struct stm32_usbhost_s *priv = (FAR struct stm32_usbhost_s *)drvr; + FAR struct stm32_chan_s *chan; + unsigned int chidx = (unsigned int)ep; + irqstate_t flags; + + uvdbg("chidx: %u: %d\n", chidx); + + DEBUGASSERT(priv && chidx < STM32_MAX_TX_FIFOS); + chan = &priv->chan[chidx]; + + /* We need to disable interrupts to avoid race conditions with the asynchronous + * completion of the transfer being cancelled. + */ + + flags = enter_critical_section(); + + /* Halt the channel */ + + stm32_chan_halt(priv, chidx, CHREASON_CANCELLED); + chan->result = -ESHUTDOWN; + + /* Is there a thread waiting for this transfer to complete? */ + + if (chan->waiter) + { +#ifdef CONFIG_USBHOST_ASYNCH + /* Yes.. there should not also be a callback scheduled */ + + DEBUGASSERT(chan->callback == NULL); +#endif + + /* Wake'em up! */ + + stm32_givesem(&chan->waitsem); + chan->waiter = false; + } + +#ifdef CONFIG_USBHOST_ASYNCH + /* No.. is an asynchronous callback expected when the transfer + * completes? + */ + + else if (chan->callback) + { + usbhost_asynch_t callback; + FAR void *arg; + + /* Extract the callback information */ + + callback = chan->callback; + arg = chan->arg; + + chan->callback = NULL; + chan->arg = NULL; + chan->xfrd = 0; + + /* Then perform the callback */ + + callback(arg, -ESHUTDOWN); + } +#endif + + leave_critical_section(flags); + return OK; +} + +/************************************************************************************ + * Name: stm32_connect + * + * Description: + * New connections may be detected by an attached hub. This method is the + * mechanism that is used by the hub class to introduce a new connection + * and port description to the system. + * + * Input Parameters: + * drvr - The USB host driver instance obtained as a parameter from the call to + * the class create() method. + * hport - The descriptor of the hub port that detected the connection + * related event + * connected - True: device connected; false: device disconnected + * + * Returned Values: + * On success, zero (OK) is returned. On a failure, a negated errno value is + * returned indicating the nature of the failure. + * + ************************************************************************************/ + +#ifdef CONFIG_USBHOST_HUB +static int stm32_connect(FAR struct usbhost_driver_s *drvr, + FAR struct usbhost_hubport_s *hport, + bool connected) +{ + FAR struct stm32_usbhost_s *priv = (FAR struct stm32_usbhost_s *)drvr; + irqstate_t flags; + + DEBUGASSERT(priv != NULL && hport != NULL); + + /* Set the connected/disconnected flag */ + + hport->connected = connected; + ullvdbg("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO"); + + /* Report the connection event */ + + flags = enter_critical_section(); + priv->hport = hport; + if (priv->pscwait) + { + priv->pscwait = false; + stm32_givesem(&priv->pscsem); + } + + leave_critical_section(flags); + return OK; +} +#endif + +/**************************************************************************** + * Name: stm32_disconnect + * + * Description: + * Called by the class when an error occurs and driver has been disconnected. + * The USB host driver should discard the handle to the class instance (it is + * stale) and not attempt any further interaction with the class driver instance + * (until a new instance is received from the create() method). The driver + * should not called the class' disconnected() method. + * + * Input Parameters: + * drvr - The USB host driver instance obtained as a parameter from the call to + * the class create() method. + * hport - The port from which the device is being disconnected. Might be a port + * on a hub. + * + * Returned Values: + * None + * + * Assumptions: + * - Only a single class bound to a single device is supported. + * - Never called from an interrupt handler. + * + ****************************************************************************/ + +static void stm32_disconnect(FAR struct usbhost_driver_s *drvr, + FAR struct usbhost_hubport_s *hport) +{ + DEBUGASSERT(hport != NULL); + hport->devclass = NULL; +} + +/**************************************************************************** + * Initialization + ****************************************************************************/ +/**************************************************************************** + * Name: stm32_portreset + * + * Description: + * Reset the USB host port. + * + * NOTE: "Before starting to drive a USB reset, the application waits for the + * OTG interrupt triggered by the debounce done bit (DBCDNE bit in + * OTG_FS_GOTGINT), which indicates that the bus is stable again after the + * electrical debounce caused by the attachment of a pull-up resistor on DP + * (FS) or DM (LS). + * + * Input Parameters: + * priv -- USB host driver private data structure. + * + * Returned Value: + * None + * + ****************************************************************************/ + +static void stm32_portreset(FAR struct stm32_usbhost_s *priv) +{ + uint32_t regval; + + regval = stm32_getreg(STM32_OTGFS_HPRT); + regval &= ~(OTGFS_HPRT_PENA | OTGFS_HPRT_PCDET | OTGFS_HPRT_PENCHNG | + OTGFS_HPRT_POCCHNG); + regval |= OTGFS_HPRT_PRST; + stm32_putreg(STM32_OTGFS_HPRT, regval); + + up_mdelay(20); + + regval &= ~OTGFS_HPRT_PRST; + stm32_putreg(STM32_OTGFS_HPRT, regval); + + up_mdelay(20); +} + +/**************************************************************************** + * Name: stm32_flush_txfifos + * + * Description: + * Flush the selected Tx FIFO. + * + * Input Parameters: + * txfnum -- USB host driver private data structure. + * + * Returned Value: + * None. + * + ****************************************************************************/ + +static void stm32_flush_txfifos(uint32_t txfnum) +{ + uint32_t regval; + uint32_t timeout; + + /* Initiate the TX FIFO flush operation */ + + regval = OTGFS_GRSTCTL_TXFFLSH | txfnum; + stm32_putreg(STM32_OTGFS_GRSTCTL, regval); + + /* Wait for the FLUSH to complete */ + + for (timeout = 0; timeout < STM32_FLUSH_DELAY; timeout++) + { + regval = stm32_getreg(STM32_OTGFS_GRSTCTL); + if ((regval & OTGFS_GRSTCTL_TXFFLSH) == 0) + { + break; + } + } + + /* Wait for 3 PHY Clocks */ + + up_udelay(3); +} + +/**************************************************************************** + * Name: stm32_flush_rxfifo + * + * Description: + * Flush the Rx FIFO. + * + * Input Parameters: + * priv -- USB host driver private data structure. + * + * Returned Value: + * None. + * + ****************************************************************************/ + +static void stm32_flush_rxfifo(void) +{ + uint32_t regval; + uint32_t timeout; + + /* Initiate the RX FIFO flush operation */ + + stm32_putreg(STM32_OTGFS_GRSTCTL, OTGFS_GRSTCTL_RXFFLSH); + + /* Wait for the FLUSH to complete */ + + for (timeout = 0; timeout < STM32_FLUSH_DELAY; timeout++) + { + regval = stm32_getreg(STM32_OTGFS_GRSTCTL); + if ((regval & OTGFS_GRSTCTL_RXFFLSH) == 0) + { + break; + } + } + + /* Wait for 3 PHY Clocks */ + + up_udelay(3); +} + +/**************************************************************************** + * Name: stm32_vbusdrive + * + * Description: + * Drive the Vbus +5V. + * + * Input Parameters: + * priv - USB host driver private data structure. + * state - True: Drive, False: Don't drive + * + * Returned Value: + * None. + * + ****************************************************************************/ + +static void stm32_vbusdrive(FAR struct stm32_usbhost_s *priv, bool state) +{ + uint32_t regval; + + /* Enable/disable the external charge pump */ + + stm32_usbhost_vbusdrive(0, state); + + /* Turn on the Host port power. */ + + regval = stm32_getreg(STM32_OTGFS_HPRT); + regval &= ~(OTGFS_HPRT_PENA | OTGFS_HPRT_PCDET | OTGFS_HPRT_PENCHNG | + OTGFS_HPRT_POCCHNG); + + if (((regval & OTGFS_HPRT_PPWR) == 0) && state) + { + regval |= OTGFS_HPRT_PPWR; + stm32_putreg(STM32_OTGFS_HPRT, regval); + } + + if (((regval & OTGFS_HPRT_PPWR) != 0) && !state) + { + regval &= ~OTGFS_HPRT_PPWR; + stm32_putreg(STM32_OTGFS_HPRT, regval); + } + + up_mdelay(200); +} + +/**************************************************************************** + * Name: stm32_host_initialize + * + * Description: + * Initialize/re-initialize hardware for host mode operation. At present, + * this function is called only from stm32_hw_initialize(). But if OTG mode + * were supported, this function would also be called to swtich between + * host and device modes on a connector ID change interrupt. + * + * Input Parameters: + * priv -- USB host driver private data structure. + * + * Returned Value: + * None. + * + ****************************************************************************/ + +static void stm32_host_initialize(FAR struct stm32_usbhost_s *priv) +{ + uint32_t regval; + uint32_t offset; + int i; + + /* Restart the PHY Clock */ + + stm32_putreg(STM32_OTGFS_PCGCCTL, 0); + + /* Initialize Host Configuration (HCFG) register */ + + regval = stm32_getreg(STM32_OTGFS_HCFG); + regval &= ~OTGFS_HCFG_FSLSPCS_MASK; + regval |= OTGFS_HCFG_FSLSPCS_FS48MHz; + stm32_putreg(STM32_OTGFS_HCFG, regval); + + /* Reset the host port */ + + stm32_portreset(priv); + + /* Clear the FS-/LS-only support bit in the HCFG register */ + + regval = stm32_getreg(STM32_OTGFS_HCFG); + regval &= ~OTGFS_HCFG_FSLSS; + stm32_putreg(STM32_OTGFS_HCFG, regval); + + /* Carve up FIFO memory for the Rx FIFO and the periodic and non-periodic Tx FIFOs */ + /* Configure Rx FIFO size (GRXFSIZ) */ + + stm32_putreg(STM32_OTGFS_GRXFSIZ, CONFIG_STM32_OTGFS_RXFIFO_SIZE); + offset = CONFIG_STM32_OTGFS_RXFIFO_SIZE; + + /* Setup the host non-periodic Tx FIFO size (HNPTXFSIZ) */ + + regval = (offset | (CONFIG_STM32_OTGFS_NPTXFIFO_SIZE << OTGFS_HNPTXFSIZ_NPTXFD_SHIFT)); + stm32_putreg(STM32_OTGFS_HNPTXFSIZ, regval); + offset += CONFIG_STM32_OTGFS_NPTXFIFO_SIZE; + + /* Set up the host periodic Tx fifo size register (HPTXFSIZ) */ + + regval = (offset | (CONFIG_STM32_OTGFS_PTXFIFO_SIZE << OTGFS_HPTXFSIZ_PTXFD_SHIFT)); + stm32_putreg(STM32_OTGFS_HPTXFSIZ, regval); + + /* If OTG were supported, we sould need to clear HNP enable bit in the + * USB_OTG control register about here. + */ + + /* Flush all FIFOs */ + + stm32_flush_txfifos(OTGFS_GRSTCTL_TXFNUM_HALL); + stm32_flush_rxfifo(); + + /* Clear all pending HC Interrupts */ + + for (i = 0; i < STM32_NHOST_CHANNELS; i++) + { + stm32_putreg(STM32_OTGFS_HCINT(i), 0xffffffff); + stm32_putreg(STM32_OTGFS_HCINTMSK(i), 0); + } + + /* Driver Vbus +5V (the smoke test). Should be done elsewhere in OTG + * mode. + */ + + stm32_vbusdrive(priv, true); + + /* Enable host interrupts */ + + stm32_hostinit_enable(); +} + +/**************************************************************************** + * Name: stm32_sw_initialize + * + * Description: + * One-time setup of the host driver state structure. + * + * Input Parameters: + * priv -- USB host driver private data structure. + * + * Returned Value: + * None. + * + ****************************************************************************/ + +static inline void stm32_sw_initialize(FAR struct stm32_usbhost_s *priv) +{ + FAR struct usbhost_driver_s *drvr; + FAR struct usbhost_hubport_s *hport; + int i; + + /* Initialize the device operations */ + + drvr = &priv->drvr; + drvr->ep0configure = stm32_ep0configure; + drvr->epalloc = stm32_epalloc; + drvr->epfree = stm32_epfree; + drvr->alloc = stm32_alloc; + drvr->free = stm32_free; + drvr->ioalloc = stm32_ioalloc; + drvr->iofree = stm32_iofree; + drvr->ctrlin = stm32_ctrlin; + drvr->ctrlout = stm32_ctrlout; + drvr->transfer = stm32_transfer; +#ifdef CONFIG_USBHOST_ASYNCH + drvr->asynch = stm32_asynch; +#endif + drvr->cancel = stm32_cancel; +#ifdef CONFIG_USBHOST_HUB + drvr->connect = stm32_connect; +#endif + drvr->disconnect = stm32_disconnect; + + /* Initialize the public port representation */ + + hport = &priv->rhport.hport; + hport->drvr = drvr; +#ifdef CONFIG_USBHOST_HUB + hport->parent = NULL; +#endif + hport->ep0 = (usbhost_ep_t)&priv->ep0; + hport->speed = USB_SPEED_FULL; + + /* Initialize function address generation logic */ + + usbhost_devaddr_initialize(&priv->rhport); + + /* Initialize semaphores */ + + sem_init(&priv->pscsem, 0, 0); + sem_init(&priv->exclsem, 0, 1); + + /* Initialize the driver state data */ + + priv->smstate = SMSTATE_DETACHED; + priv->connected = false; + priv->change = false; + + /* Put all of the channels back in their initial, allocated state */ + + memset(priv->chan, 0, STM32_MAX_TX_FIFOS * sizeof(struct stm32_chan_s)); + + /* Initialize each channel */ + + for (i = 0; i < STM32_MAX_TX_FIFOS; i++) + { + FAR struct stm32_chan_s *chan = &priv->chan[i]; + chan->chidx = i; + sem_init(&chan->waitsem, 0, 0); + } +} + +/**************************************************************************** + * Name: stm32_hw_initialize + * + * Description: + * One-time setup of the host controller harware for normal operations. + * + * Input Parameters: + * priv -- USB host driver private data structure. + * + * Returned Value: + * Zero on success; a negated errno value on failure. + * + ****************************************************************************/ + +static inline int stm32_hw_initialize(FAR struct stm32_usbhost_s *priv) +{ + uint32_t regval; + unsigned long timeout; + + /* Set the PHYSEL bit in the GUSBCFG register to select the OTG FS serial + * transceiver: "This bit is always 1 with write-only access" + */ + + regval = stm32_getreg(STM32_OTGFS_GUSBCFG); + regval |= OTGFS_GUSBCFG_PHYSEL; + stm32_putreg(STM32_OTGFS_GUSBCFG, regval); + + /* Reset after a PHY select and set Host mode. First, wait for AHB master + * IDLE state. + */ + + for (timeout = 0; timeout < STM32_READY_DELAY; timeout++) + { + up_udelay(3); + regval = stm32_getreg(STM32_OTGFS_GRSTCTL); + if ((regval & OTGFS_GRSTCTL_AHBIDL) != 0) + { + break; + } + } + + /* Then perform the core soft reset. */ + + stm32_putreg(STM32_OTGFS_GRSTCTL, OTGFS_GRSTCTL_CSRST); + for (timeout = 0; timeout < STM32_READY_DELAY; timeout++) + { + regval = stm32_getreg(STM32_OTGFS_GRSTCTL); + if ((regval & OTGFS_GRSTCTL_CSRST) == 0) + { + break; + } + } + + /* Wait for 3 PHY Clocks */ + + up_udelay(3); + + /* Deactivate the power down */ + + regval = (OTGFS_GCCFG_PWRDWN | OTGFS_GCCFG_VBUSASEN | OTGFS_GCCFG_VBUSBSEN); +#ifndef CONFIG_USBDEV_VBUSSENSING + regval |= OTGFS_GCCFG_NOVBUSSENS; +#endif +#ifdef CONFIG_STM32_OTGFS_SOFOUTPUT + regval |= OTGFS_GCCFG_SOFOUTEN; +#endif + stm32_putreg(STM32_OTGFS_GCCFG, regval); + up_mdelay(20); + + /* Initialize OTG features: In order to support OTP, the HNPCAP and SRPCAP + * bits would need to be set in the GUSBCFG register about here. + */ + + /* Force Host Mode */ + + regval = stm32_getreg(STM32_OTGFS_GUSBCFG); + regval &= ~OTGFS_GUSBCFG_FDMOD; + regval |= OTGFS_GUSBCFG_FHMOD; + stm32_putreg(STM32_OTGFS_GUSBCFG, regval); + up_mdelay(50); + + /* Initialize host mode and return success */ + + stm32_host_initialize(priv); + return OK; +} + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: stm32_otgfshost_initialize + * + * Description: + * Initialize USB host device controller hardware. + * + * Input Parameters: + * controller -- If the device supports more than USB host controller, then + * this identifies which controller is being initialized. Normally, this + * is just zero. + * + * Returned Value: + * And instance of the USB host interface. The controlling task should + * use this interface to (1) call the wait() method to wait for a device + * to be connected, and (2) call the enumerate() method to bind the device + * to a class driver. + * + * Assumptions: + * - This function should called in the initialization sequence in order + * to initialize the USB device functionality. + * - Class drivers should be initialized prior to calling this function. + * Otherwise, there is a race condition if the device is already connected. + * + ****************************************************************************/ + +FAR struct usbhost_connection_s *stm32_otgfshost_initialize(int controller) +{ + /* At present, there is only support for a single OTG FS host. Hence it is + * pre-allocated as g_usbhost. However, in most code, the private data + * structure will be referenced using the 'priv' pointer (rather than the + * global data) in order to simplify any future support for multiple devices. + */ + + FAR struct stm32_usbhost_s *priv = &g_usbhost; + + /* Sanity checks */ + + DEBUGASSERT(controller == 0); + + /* Make sure that interrupts from the OTG FS core are disabled */ + + stm32_gint_disable(); + + /* Reset the state of the host driver */ + + stm32_sw_initialize(priv); + + /* Alternate function pin configuration. Here we assume that: + * + * 1. GPIOA, SYSCFG, and OTG FS peripheral clocking have already been\ + * enabled as part of the boot sequence. + * 2. Board-specific logic has already enabled other board specific GPIOs + * for things like soft pull-up, VBUS sensing, power controls, and over- + * current detection. + */ + + /* Configure OTG FS alternate function pins for DM, DP, ID, and SOF. + * + * PIN* SIGNAL DIRECTION + * ---- ----------- ---------- + * PA8 OTG_FS_SOF SOF clock output + * PA9 OTG_FS_VBUS VBUS input for device, Driven by external regulator by + * host (not an alternate function) + * PA10 OTG_FS_ID OTG ID pin (only needed in Dual mode) + * PA11 OTG_FS_DM D- I/O + * PA12 OTG_FS_DP D+ I/O + * + * *Pins may vary from device-to-device. + */ + + stm32_configgpio(GPIO_OTGFS_DM); + stm32_configgpio(GPIO_OTGFS_DP); + stm32_configgpio(GPIO_OTGFS_ID); /* Only needed for OTG */ + + /* SOF output pin configuration is configurable */ + +#ifdef CONFIG_STM32_OTGFS_SOFOUTPUT + stm32_configgpio(GPIO_OTGFS_SOF); +#endif + + /* Initialize the USB OTG FS core */ + + stm32_hw_initialize(priv); + + /* Attach USB host controller interrupt handler */ + + if (irq_attach(STM32_IRQ_OTGFS, stm32_gint_isr) != 0) + { + usbhost_trace1(OTGFS_TRACE1_IRQATTACH, 0); + return NULL; + } + + /* Enable USB OTG FS global interrupts */ + + stm32_gint_enable(); + + /* Enable interrupts at the interrupt controller */ + + up_enable_irq(STM32_IRQ_OTGFS); + return &g_usbconn; +} + +#endif /* CONFIG_USBHOST && CONFIG_STM32_OTGFS */ diff --git a/arch/arm/src/stm32l4/stm32l4_usbhost.h b/arch/arm/src/stm32l4/stm32l4_usbhost.h new file mode 100644 index 0000000000..efa910414c --- /dev/null +++ b/arch/arm/src/stm32l4/stm32l4_usbhost.h @@ -0,0 +1,212 @@ +/************************************************************************************ + * arch/arm/src/stm32l4/stm32l4_usbhost.h + * + * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * dev@ziggurat29.com + * + * 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_STM32L4_STM32L4_USBHOST_H +#define __ARCH_ARM_SRC_STM32L4_STM32L4_USBHOST_H + +/************************************************************************************ + * Included Files + ************************************************************************************/ + +#include +#include +#include +#include + +#include "chip.h" +#include "chip/stm32l4x6xx_otgfs.h" + +#if defined(CONFIG_STM32L4_OTGFS) && defined(CONFIG_USBHOST) + +/************************************************************************************ + * Public Types + ************************************************************************************/ + +#ifdef HAVE_USBHOST_TRACE +enum usbhost_trace1codes_e +{ + __TRACE1_BASEVALUE = 0, /* This will force the first value to be 1 */ + + OTGFS_TRACE1_DEVDISCONN, /* OTGFS ERROR: Host Port Device disconnected */ + OTGFS_TRACE1_IRQATTACH, /* OTGFS ERROR: Failed to attach IRQ */ + OTGFS_TRACE1_TRNSFRFAILED, /* OTGFS ERROR: Host Port Transfer Failed */ + OTGFS_TRACE1_SENDSETUP, /* OTGFS ERROR: sendsetup() failed with: */ + OTGFS_TRACE1_SENDDATA, /* OTGFS ERROR: senddata() failed with: */ + OTGFS_TRACE1_RECVDATA, /* OTGFS ERROR: recvdata() failed with: */ + +#ifdef HAVE_USBHOST_TRACE_VERBOSE + + OTGFS_VTRACE1_CONNECTED, /* OTGFS Host Port connected */ + OTGFS_VTRACE1_DISCONNECTED, /* OTGFS Host Port disconnected */ + OTGFS_VTRACE1_GINT, /* OTGFS Handling Interrupt. Entry Point */ + OTGFS_VTRACE1_GINT_SOF, /* OTGFS Handle the start of frame interrupt */ + OTGFS_VTRACE1_GINT_RXFLVL, /* OTGFS Handle the RxFIFO non-empty interrupt */ + OTGFS_VTRACE1_GINT_NPTXFE, /* OTGFS Handle the non-periodic TxFIFO empty interrupt */ + OTGFS_VTRACE1_GINT_PTXFE, /* OTGFS Handle the periodic TxFIFO empty interrupt */ + OTGFS_VTRACE1_GINT_HC, /* OTGFS Handle the host channels interrupt */ + OTGFS_VTRACE1_GINT_HPRT, /* OTGFS Handle the host port interrupt */ + OTGFS_VTRACE1_GINT_HPRT_POCCHNG, /* OTGFS HPRT: Port Over-Current Change*/ + OTGFS_VTRACE1_GINT_HPRT_PCDET, /* OTGFS HPRT: Port Connect Detect */ + OTGFS_VTRACE1_GINT_HPRT_PENCHNG, /* OTGFS HPRT: Port Enable Changed */ + OTGFS_VTRACE1_GINT_HPRT_LSDEV, /* OTGFS HPRT: Low Speed Device Connected */ + OTGFS_VTRACE1_GINT_HPRT_FSDEV, /* OTGFS HPRT: Full Speed Device Connected */ + OTGFS_VTRACE1_GINT_HPRT_LSFSSW, /* OTGFS HPRT: Host Switch: LS -> FS */ + OTGFS_VTRACE1_GINT_HPRT_FSLSSW, /* OTGFS HPRT: Host Switch: FS -> LS */ + OTGFS_VTRACE1_GINT_DISC, /* OTGFS Handle the disconnect detected interrupt */ + OTGFS_VTRACE1_GINT_IPXFR, /* OTGFS Handle the incomplete periodic transfer */ + +#endif + + __TRACE1_NSTRINGS, /* Separates the format 1 from the format 2 strings */ + + OTGFS_TRACE2_CLIP, /* OTGFS CLIP: chidx: buflen: */ + +#ifdef HAVE_USBHOST_TRACE_VERBOSE + + OTGFS_VTRACE2_CHANWAKEUP_IN, /* OTGFS IN Channel wake up with result */ + OTGFS_VTRACE2_CHANWAKEUP_OUT, /* OTGFS OUT Channel wake up with result */ + OTGFS_VTRACE2_CTRLIN, /* OTGFS CTRLIN */ + OTGFS_VTRACE2_CTRLOUT, /* OTGFS CTRLOUT */ + OTGFS_VTRACE2_INTRIN, /* OTGFS INTRIN */ + OTGFS_VTRACE2_INTROUT, /* OTGFS INTROUT */ + OTGFS_VTRACE2_BULKIN, /* OTGFS BULKIN */ + OTGFS_VTRACE2_BULKOUT, /* OTGFS BULKOUT */ + OTGFS_VTRACE2_ISOCIN, /* OTGFS ISOCIN */ + OTGFS_VTRACE2_ISOCOUT, /* OTGFS ISOCOUT */ + OTGFS_VTRACE2_STARTTRANSFER, /* OTGFS EP buflen */ + OTGFS_VTRACE2_CHANCONF_CTRL_IN, + OTGFS_VTRACE2_CHANCONF_CTRL_OUT, + OTGFS_VTRACE2_CHANCONF_INTR_IN, + OTGFS_VTRACE2_CHANCONF_INTR_OUT, + OTGFS_VTRACE2_CHANCONF_BULK_IN, + OTGFS_VTRACE2_CHANCONF_BULK_OUT, + OTGFS_VTRACE2_CHANCONF_ISOC_IN, + OTGFS_VTRACE2_CHANCONF_ISOC_OUT, + OTGFS_VTRACE2_CHANHALT, /* Channel halted. chidx: , reason: */ + +#endif + + __TRACE2_NSTRINGS /* Total number of enumeration values */ +}; + +# define TRACE1_FIRST ((int)__TRACE1_BASEVALUE + 1) +# define TRACE1_INDEX(id) ((int)(id) - TRACE1_FIRST) +# define TRACE1_NSTRINGS TRACE1_INDEX(__TRACE1_NSTRINGS) + +# define TRACE2_FIRST ((int)__TRACE1_NSTRINGS + 1) +# define TRACE2_INDEX(id) ((int)(id) - TRACE2_FIRST) +# define TRACE2_NSTRINGS TRACE2_INDEX(__TRACE2_NSTRINGS) + +#endif + +/************************************************************************************ + * Public Functions + ************************************************************************************/ +/* + * STM32L4 USB OTG FS Host Driver Support + * + * Pre-requisites + * + * CONFIG_USBHOST - Enable general USB host support + * CONFIG_STM32L4_OTGFS - Enable the STM32 USB OTG FS block + * CONFIG_STM32L4_SYSCFG - Needed + * + * Options: + * + * CONFIG_STM32L4_OTGFS_RXFIFO_SIZE - Size of the RX FIFO in 32-bit words. + * Default 128 (512 bytes) + * CONFIG_STM32L4_OTGFS_NPTXFIFO_SIZE - Size of the non-periodic Tx FIFO + * in 32-bit words. Default 96 (384 bytes) + * CONFIG_STM32L4_OTGFS_PTXFIFO_SIZE - Size of the periodic Tx FIFO in 32-bit + * words. Default 96 (384 bytes) + * CONFIG_STM32L4_OTGFS_SOFINTR - Enable SOF interrupts. Why would you ever + * want to do that? + * + * CONFIG_STM32L4_USBHOST_REGDEBUG - Enable very low-level register access + * debug. Depends on CONFIG_DEBUG. + */ + +/************************************************************************************ + * Public Functions + ************************************************************************************/ + +#ifndef __ASSEMBLY__ + +#undef EXTERN +#if defined(__cplusplus) +#define EXTERN extern "C" +extern "C" +{ +#else +#define EXTERN extern +#endif + +/*********************************************************************************** + * Name: stm32l4_usbhost_vbusdrive + * + * Description: + * Enable/disable driving of VBUS 5V output. This function must be provided be + * each platform that implements the STM32L4 OTG FS host interface + * + * "On-chip 5 V VBUS generation is not supported. For this reason, a charge pump + * or, if 5 V are available on the application board, a basic power switch, must + * be added externally to drive the 5 V VBUS line. The external charge pump can + * be driven by any GPIO output. When the application decides to power on VBUS + * using the chosen GPIO, it must also set the port power bit in the host port + * control and status register (PPWR bit in OTG_FS_HPRT). + * + * "The application uses this field to control power to this port, and the core + * clears this bit on an over current condition." + * + * Input Parameters: + * iface - For future growth to handle multiple USB host interface. Should be zero. + * enable - true: enable VBUS power; false: disable VBUS power + * + * Returned Value: + * None + * + ***********************************************************************************/ + +void stm32l4_usbhost_vbusdrive(int iface, bool enable); + +#undef EXTERN +#if defined(__cplusplus) +} +#endif + +#endif /* __ASSEMBLY__ */ +#endif /* CONFIG_STM32L4_OTGFS && CONFIG_USBHOST */ +#endif /* __ARCH_ARM_SRC_STM32L4_STM32L4_USBHOST_H */ diff --git a/arch/arm/src/stm32l4/stm32l4_usbhost_trace.c b/arch/arm/src/stm32l4/stm32l4_usbhost_trace.c new file mode 100644 index 0000000000..6ede922c74 --- /dev/null +++ b/arch/arm/src/stm32l4/stm32l4_usbhost_trace.c @@ -0,0 +1,189 @@ +/******************************************************************************************** + * arch/arm/src/stm32l4/stm32l4_usbhost_trace.c + * + * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * dev@ziggurat29.com + * + * 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 "stm32l4_usbhost.h" + +#ifdef HAVE_USBHOST_TRACE + +/******************************************************************************************** + * Pre-processor Definitions + ********************************************************************************************/ + +#define TR_FMT1 false +#define TR_FMT2 true + +#define TRENTRY(id,fmt1,string) {string} + +#ifndef NULL +# define NULL ((FAR void *)0) +#endif + +/******************************************************************************************** + * Private Types + ********************************************************************************************/ + +struct stm32l4_usbhost_trace_s +{ +#if 0 + uint16_t id; + bool fmt2; +#endif + FAR const char *string; +}; + +/******************************************************************************************** + * Private Data + ********************************************************************************************/ + +static const struct stm32l4_usbhost_trace_s g_trace1[TRACE1_NSTRINGS] = +{ + TRENTRY(OTGFS_TRACE1_DEVDISCONN, TR_FMT1, "OTGFS ERROR: Host Port %d. Device disconnected\n"), + TRENTRY(OTGFS_TRACE1_IRQATTACH, TR_FMT1, "OTGFS ERROR: Failed to attach IRQ\n"), + TRENTRY(OTGFS_TRACE1_TRNSFRFAILED, TR_FMT1, "OTGFS ERROR: Transfer Failed. ret=%d\n"), + TRENTRY(OTGFS_TRACE1_SENDSETUP, TR_FMT1, "OTGFS ERROR: ctrl_sendsetup() failed with: %d\n"), + TRENTRY(OTGFS_TRACE1_SENDDATA, TR_FMT1, "OTGFS ERROR: ctrl_senddata() failed with: %d\n"), + TRENTRY(OTGFS_TRACE1_RECVDATA, TR_FMT1, "OTGFS ERROR: ctrl_recvdata() failed with: %d\n"), + +#ifdef HAVE_USBHOST_TRACE_VERBOSE + + TRENTRY(OTGFS_VTRACE1_CONNECTED, TR_FMT1, "OTGFS Host Port %d connected.\n"), + TRENTRY(OTGFS_VTRACE1_DISCONNECTED, TR_FMT1, "OTGFS Host Port %d disconnected.\n"), + TRENTRY(OTGFS_VTRACE1_GINT, TR_FMT1, "OTGFS Handling Interrupt. Entry Point.\n"), + TRENTRY(OTGFS_VTRACE1_GINT_SOF, TR_FMT1, "OTGFS Handle the start of frame interrupt.\n"), + TRENTRY(OTGFS_VTRACE1_GINT_RXFLVL, TR_FMT1, "OTGFS Handle the RxFIFO non-empty interrupt.\n"), + TRENTRY(OTGFS_VTRACE1_GINT_NPTXFE, TR_FMT1, "OTGFS Handle the non-periodic TxFIFO empty interrupt.\n"), + TRENTRY(OTGFS_VTRACE1_GINT_PTXFE, TR_FMT1, "OTGFS Handle the periodic TxFIFO empty interrupt.\n"), + TRENTRY(OTGFS_VTRACE1_GINT_HC, TR_FMT1, "OTGFS Handle the host channels interrupt.\n"), + TRENTRY(OTGFS_VTRACE1_GINT_HPRT, TR_FMT1, "OTGFS Handle the host port interrupt.\n"), + TRENTRY(OTGFS_VTRACE1_GINT_HPRT_POCCHNG, TR_FMT1, "OTGFS HPRT: Port Over-Current Change.\n"), + TRENTRY(OTGFS_VTRACE1_GINT_HPRT_PCDET, TR_FMT1, "OTGFS HPRT: Port Connect Detect.\n"), + TRENTRY(OTGFS_VTRACE1_GINT_HPRT_PENCHNG, TR_FMT1, "OTGFS HPRT: Port Enable Changed.\n"), + TRENTRY(OTGFS_VTRACE1_GINT_HPRT_LSDEV, TR_FMT1, "OTGFS HPRT: Low Speed Device Connected.\n"), + TRENTRY(OTGFS_VTRACE1_GINT_HPRT_FSDEV, TR_FMT1, "OTGFS HPRT: Full Speed Device Connected.\n"), + TRENTRY(OTGFS_VTRACE1_GINT_HPRT_LSFSSW, TR_FMT1, "OTGFS HPRT: Host Switch: LS -> FS.\n"), + TRENTRY(OTGFS_VTRACE1_GINT_HPRT_FSLSSW, TR_FMT1, "OTGFS HPRT: Host Switch: FS -> LS.\n"), + TRENTRY(OTGFS_VTRACE1_GINT_DISC, TR_FMT1, "OTGFS Handle the disconnect detected interrupt.\n"), + TRENTRY(OTGFS_VTRACE1_GINT_IPXFR, TR_FMT1, "OTGFS Handle the incomplete periodic transfer.\n"), + +#endif +}; + +static const struct stm32l4_usbhost_trace_s g_trace2[TRACE2_NSTRINGS] = +{ + TRENTRY(OTGFS_TRACE2_CLIP, TR_FMT2, "OTGFS CLIP: chidx: %d buflen: %d\n"), + +#ifdef HAVE_USBHOST_TRACE_VERBOSE + + TRENTRY(OTGFS_VTRACE2_CHANWAKEUP_IN, TR_FMT2, "OTGFS EP%d(IN) wake up with result: %d\n"), + TRENTRY(OTGFS_VTRACE2_CHANWAKEUP_OUT, TR_FMT2, "OTGFS EP%d(OUT) wake up with result: %d\n"), + TRENTRY(OTGFS_VTRACE2_CTRLIN, TR_FMT2, "OTGFS CTRL_IN type: %02x req: %02x\n"), + TRENTRY(OTGFS_VTRACE2_CTRLOUT, TR_FMT2, "OTGFS CTRL_OUT type: %02x req: %02x\n"), + TRENTRY(OTGFS_VTRACE2_INTRIN, TR_FMT2, "OTGFS INTR_IN chidx: %02x len: %02x\n"), + TRENTRY(OTGFS_VTRACE2_INTROUT, TR_FMT2, "OTGFS INTR_OUT chidx: %02x len: %02x\n"), + TRENTRY(OTGFS_VTRACE2_BULKIN, TR_FMT2, "OTGFS BULK_IN chidx: %02x len: %02x\n"), + TRENTRY(OTGFS_VTRACE2_BULKOUT, TR_FMT2, "OTGFS BULK_OUT chidx: %02x len: %02x\n"), + TRENTRY(OTGFS_VTRACE2_ISOCIN, TR_FMT2, "OTGFS ISOC_IN chidx: %02x len: %04d\n"), + TRENTRY(OTGFS_VTRACE2_ISOCOUT, TR_FMT2, "OTGFS ISOC_OUT chidx: %02x req: %02x\n"), + TRENTRY(OTGFS_VTRACE2_STARTTRANSFER, TR_FMT2, "OTGFS Transfer chidx: %d buflen: %d\n"), + TRENTRY(OTGFS_VTRACE2_CHANCONF_CTRL_IN, TR_FMT2, "OTGFS Channel configured. chidx: %d: (EP%d,IN ,CTRL)\n"), + TRENTRY(OTGFS_VTRACE2_CHANCONF_CTRL_OUT, TR_FMT2, "OTGFS Channel configured. chidx: %d: (EP%d,OUT,CTRL)\n"), + TRENTRY(OTGFS_VTRACE2_CHANCONF_INTR_IN, TR_FMT2, "OTGFS Channel configured. chidx: %d: (EP%d,IN ,INTR)\n"), + TRENTRY(OTGFS_VTRACE2_CHANCONF_INTR_OUT, TR_FMT2, "OTGFS Channel configured. chidx: %d: (EP%d,OUT,INTR)\n"), + TRENTRY(OTGFS_VTRACE2_CHANCONF_BULK_IN, TR_FMT2, "OTGFS Channel configured. chidx: %d: (EP%d,IN ,BULK)\n"), + TRENTRY(OTGFS_VTRACE2_CHANCONF_BULK_OUT, TR_FMT2, "OTGFS Channel configured. chidx: %d: (EP%d,OUT,BULK)\n"), + TRENTRY(OTGFS_VTRACE2_CHANCONF_ISOC_IN, TR_FMT2, "OTGFS Channel configured. chidx: %d: (EP%d,IN ,ISOC)\n"), + TRENTRY(OTGFS_VTRACE2_CHANCONF_ISOC_OUT, TR_FMT2, "OTGFS Channel configured. chidx: %d: (EP%d,OUT,ISOC)\n"), + TRENTRY(OTGFS_VTRACE2_CHANHALT, TR_FMT2, "OTGFS Channel halted. chidx: %d, reason: %d\n"), + +#endif +}; + +/******************************************************************************************** + * Private Function Prototypes + ********************************************************************************************/ + +/******************************************************************************************** + * Public Functions + ********************************************************************************************/ + +/******************************************************************************************** + * Name: usbhost_trformat1 and usbhost_trformat2 + * + * Description: + * This interface must be provided by platform specific logic that knows + * the HCDs encoding of USB trace data. + * + * Given an 9-bit index, return a format string suitable for use with, say, + * printf. The returned format is expected to handle two unsigned integer + * values. + * + ********************************************************************************************/ + +FAR const char *usbhost_trformat1(uint16_t id) +{ + int ndx = TRACE1_INDEX(id); + + if (ndx < TRACE1_NSTRINGS) + { + return g_trace1[ndx].string; + } + + return NULL; +} + +FAR const char *usbhost_trformat2(uint16_t id) +{ + int ndx = TRACE2_INDEX(id); + + if (ndx < TRACE2_NSTRINGS) + { + return g_trace2[ndx].string; + } + + return NULL; +} + +#endif /* HAVE_USBHOST_TRACE */ diff --git a/configs/stm32l476vg-disco/nsh/defconfig b/configs/stm32l476vg-disco/nsh/defconfig index 78242a4deb..5c5043b7a9 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_VERBOSE=y # # Subsystem Debug Options @@ -71,6 +71,7 @@ CONFIG_ARCH_HAVE_HEAPCHECK=y # CONFIG_DEBUG_GPIO is not set # CONFIG_DEBUG_RTC is not set # CONFIG_DEBUG_SPI is not set +CONFIG_DEBUG_USB=y CONFIG_ARCH_HAVE_STACKCHECK=y # CONFIG_STACK_COLORATION is not set CONFIG_DEBUG_SYMBOLS=y @@ -223,7 +224,7 @@ CONFIG_STM32L4_DMA2=y # # AHB2 Peripherals # -# CONFIG_STM32L4_OTGFS is not set +CONFIG_STM32L4_OTGFS=y # CONFIG_STM32L4_ADC1 is not set # CONFIG_STM32L4_ADC2 is not set # CONFIG_STM32L4_ADC3 is not set @@ -338,6 +339,7 @@ CONFIG_ARCH_HAVE_RESET=y # CONFIG_ARCH_USE_MPU is not set # CONFIG_ARCH_IRQPRIO is not set CONFIG_ARCH_STACKDUMP=y +CONFIG_ARCH_USBDUMP=y # CONFIG_ENDIAN_BIG is not set # CONFIG_ARCH_IDLE_CUSTOM is not set # CONFIG_ARCH_HAVE_RAMFUNCS is not set @@ -400,6 +402,7 @@ CONFIG_LIB_BOARDCTL=y # CONFIG_BOARDCTL_RESET is not set CONFIG_BOARDCTL_UNIQUEID=y CONFIG_BOARDCTL_UNIQUEID_SIZE=12 +CONFIG_BOARDCTL_USBDEVCTRL=y # CONFIG_BOARDCTL_TSCTEST is not set # CONFIG_BOARDCTL_ADCTEST is not set # CONFIG_BOARDCTL_PWMTEST is not set @@ -596,6 +599,7 @@ CONFIG_N25QXXX_SECTOR512=y # CONFIG_MTD_RAMTRON is not set # CONFIG_MTD_SST25 is not set # CONFIG_MTD_SST25XX is not set +# CONFIG_MTD_SST26 is not set # CONFIG_MTD_SST39FV is not set # CONFIG_MTD_W25 is not set # CONFIG_EEPROM is not set @@ -606,6 +610,7 @@ CONFIG_N25QXXX_SECTOR512=y # CONFIG_SERCOMM_CONSOLE is not set CONFIG_SERIAL=y # CONFIG_DEV_LOWCONSOLE is not set +CONFIG_SERIAL_REMOVABLE=y # CONFIG_16550_UART is not set # CONFIG_ARCH_HAVE_UART is not set # CONFIG_ARCH_HAVE_UART0 is not set @@ -657,7 +662,50 @@ CONFIG_USART2_2STOP=0 # CONFIG_USART2_IFLOWCONTROL is not set # CONFIG_USART2_OFLOWCONTROL is not set # CONFIG_USART2_DMA is not set -# CONFIG_USBDEV is not set +CONFIG_USBDEV=y + +# +# USB Device Controller Driver Options +# +# CONFIG_USBDEV_ISOCHRONOUS is not set +# CONFIG_USBDEV_DUALSPEED is not set +CONFIG_USBDEV_SELFPOWERED=y +# CONFIG_USBDEV_BUSPOWERED is not set +CONFIG_USBDEV_MAXPOWER=100 +# CONFIG_USBDEV_DMA is not set +# CONFIG_ARCH_USBDEV_STALLQUEUE is not set +CONFIG_USBDEV_TRACE=y +CONFIG_USBDEV_TRACE_NRECORDS=128 +CONFIG_USBDEV_TRACE_STRINGS=y +CONFIG_USBDEV_TRACE_INITIALIDSET=y + +# +# USB Device Class Driver Options +# +# CONFIG_USBDEV_COMPOSITE is not set +# CONFIG_PL2303 is not set +CONFIG_CDCACM=y +# CONFIG_CDCACM_CONSOLE is not set +CONFIG_CDCACM_EP0MAXPACKET=64 +CONFIG_CDCACM_EPINTIN=1 +CONFIG_CDCACM_EPINTIN_FSSIZE=64 +CONFIG_CDCACM_EPINTIN_HSSIZE=64 +CONFIG_CDCACM_EPBULKOUT=3 +CONFIG_CDCACM_EPBULKOUT_FSSIZE=64 +CONFIG_CDCACM_EPBULKOUT_HSSIZE=512 +CONFIG_CDCACM_EPBULKIN=2 +CONFIG_CDCACM_EPBULKIN_FSSIZE=64 +CONFIG_CDCACM_EPBULKIN_HSSIZE=512 +CONFIG_CDCACM_NRDREQS=4 +CONFIG_CDCACM_NWRREQS=4 +CONFIG_CDCACM_BULKIN_REQLEN=96 +CONFIG_CDCACM_RXBUFSIZE=257 +CONFIG_CDCACM_TXBUFSIZE=193 +CONFIG_CDCACM_VENDORID=0x0525 +CONFIG_CDCACM_PRODUCTID=0xa4a7 +CONFIG_CDCACM_VENDORSTR="NuttX" +CONFIG_CDCACM_PRODUCTSTR="CDC/ACM Serial" +# CONFIG_USBMSC is not set # CONFIG_USBHOST is not set # CONFIG_DRIVERS_WIRELESS is not set @@ -737,7 +785,7 @@ CONFIG_FS_PROCFS_REGISTER=y # Memory Management # # CONFIG_MM_SMALL is not set -CONFIG_MM_REGIONS=1 +CONFIG_MM_REGIONS=2 # CONFIG_ARCH_HAVE_HEAP2 is not set # CONFIG_GRAN is not set @@ -910,7 +958,13 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y # CONFIG_EXAMPLES_TOUCHSCREEN is not set # CONFIG_EXAMPLES_WEBSERVER is not set # CONFIG_EXAMPLES_UNIONFS is not set -# CONFIG_EXAMPLES_USBSERIAL is not set +CONFIG_EXAMPLES_USBSERIAL=y +CONFIG_EXAMPLES_USBSERIAL_BUFSIZE=512 +CONFIG_EXAMPLES_USBSERIAL_TRACEINIT=y +CONFIG_EXAMPLES_USBSERIAL_TRACECLASS=y +CONFIG_EXAMPLES_USBSERIAL_TRACETRANSFERS=y +CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=y +CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=y # CONFIG_EXAMPLES_USBTERM is not set # CONFIG_EXAMPLES_WATCHDOG is not set @@ -967,7 +1021,7 @@ CONFIG_NSH_LINELEN=64 # CONFIG_NSH_DISABLE_SEMICOLON is not set # CONFIG_NSH_CMDPARMS is not set CONFIG_NSH_MAXARGUMENTS=6 -# CONFIG_NSH_ARGCAT is not set +CONFIG_NSH_ARGCAT=y CONFIG_NSH_NESTDEPTH=3 # CONFIG_NSH_DISABLEBG is not set CONFIG_NSH_BUILTIN_APPS=y @@ -1053,7 +1107,18 @@ CONFIG_NSH_ARCHROMFS=y # Console Configuration # CONFIG_NSH_CONSOLE=y +# CONFIG_NSH_USBCONSOLE is not set # CONFIG_NSH_ALTCONDEV is not set + +# +# USB Device Trace Support +# +CONFIG_NSH_USBDEV_TRACE=y +CONFIG_NSH_USBDEV_TRACEINIT=y +CONFIG_NSH_USBDEV_TRACECLASS=y +CONFIG_NSH_USBDEV_TRACETRANSFERS=y +CONFIG_NSH_USBDEV_TRACECONTROLLER=y +CONFIG_NSH_USBDEV_TRACEINTERRUPTS=y CONFIG_NSH_ARCHINIT=y # CONFIG_NSH_LOGIN is not set # CONFIG_NSH_CONSOLE_LOGIN is not set @@ -1085,6 +1150,8 @@ CONFIG_READLINE_ECHO=y # CONFIG_READLINE_CMD_HISTORY is not set # CONFIG_SYSTEM_SUDOKU is not set # CONFIG_SYSTEM_VI is not set +# CONFIG_SYSTEM_CDCACM is not set # CONFIG_SYSTEM_UBLOXMODEM is not set +# CONFIG_SYSTEM_USBMONITOR is not set # CONFIG_SYSTEM_ZMODEM is not set CONFIG_SYSTEM_DISCOTEST=y diff --git a/configs/stm32l476vg-disco/src/Makefile b/configs/stm32l476vg-disco/src/Makefile index 64e8fa360c..a41699b66d 100644 --- a/configs/stm32l476vg-disco/src/Makefile +++ b/configs/stm32l476vg-disco/src/Makefile @@ -42,7 +42,7 @@ ifeq ($(CONFIG_ARCH_BOARD_STM32L4_CUSTOM_CLOCKCONFIG),y) CSRCS += stm32_clockconfig.c endif -ifeq ($(CONFIG_STM32_OTGFS),y) +ifeq ($(CONFIG_STM32L4_OTGFS),y) CSRCS += stm32_usb.c endif diff --git a/configs/stm32l476vg-disco/src/stm32_appinit.c b/configs/stm32l476vg-disco/src/stm32_appinit.c index ec485fa1f1..8454e9bd70 100644 --- a/configs/stm32l476vg-disco/src/stm32_appinit.c +++ b/configs/stm32l476vg-disco/src/stm32_appinit.c @@ -262,6 +262,30 @@ FAR struct mtd_dev_s *mtd_temp; } #endif +#ifdef HAVE_USBHOST + /* Initialize USB host operation. stm32l4_usbhost_initialize() starts a thread + * will monitor for USB connection and disconnection events. + */ + + ret = stm32l4_usbhost_initialize(); + if (ret != OK) + { + udbg("ERROR: Failed to initialize USB host: %d\n", ret); + return ret; + } +#endif + +#ifdef HAVE_USBMONITOR + /* Start the USB Monitor */ + + ret = usbmonitor_start(0, NULL); + if (ret != OK) + { + udbg("ERROR: Failed to start USB monitor: %d\n", ret); + return ret; + } +#endif + return OK; } #endif /* CONFIG_LIB_BOARDCTL */ diff --git a/configs/stm32l476vg-disco/src/stm32_boot.c b/configs/stm32l476vg-disco/src/stm32_boot.c index 5886183380..336b578184 100644 --- a/configs/stm32l476vg-disco/src/stm32_boot.c +++ b/configs/stm32l476vg-disco/src/stm32_boot.c @@ -81,12 +81,12 @@ void stm32l4_boardinitialize(void) stm32l4_spiinitialize(); #endif - /* Initialize USB is 1) USBDEV is selected, 2) the USB controller is not +#ifdef CONFIG_STM32L4_OTGFS + /* Initialize USB if the 1) OTG FS controller is in the configuration and 2) * disabled, and 3) the weak function stm32_usbinitialize() has been brought - * into the build. + * into the build. Presumably either CONFIG_USBDEV or CONFIG_USBHOST is also + * selected. */ - -#if defined(CONFIG_USBDEV) && defined(CONFIG_STM32_USB) stm32l4_usbinitialize(); #endif } diff --git a/configs/stm32l476vg-disco/src/stm32_usb.c b/configs/stm32l476vg-disco/src/stm32_usb.c new file mode 100644 index 0000000000..f1a2aa5f22 --- /dev/null +++ b/configs/stm32l476vg-disco/src/stm32_usb.c @@ -0,0 +1,336 @@ +/************************************************************************************ + * configs/stm32f4discovery/src/stm32_usb.c + * + * Copyright (C) 2012-2013, 2015 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 +#include +#include +#include + +#include +#include +#include + +#include "up_arch.h" +#include "stm32l4.h" +#include "stm32l4_otgfs.h" +#include "stm32l476vg-disco.h" + +#ifdef CONFIG_STM32L4_OTGFS + +/************************************************************************************ + * Pre-processor Definitions + ************************************************************************************/ + +#if defined(CONFIG_USBDEV) || defined(CONFIG_USBHOST) +# define HAVE_USB 1 +#else +# warning "CONFIG_STM32L4_OTGFS is enabled but neither CONFIG_USBDEV nor CONFIG_USBHOST" +# undef HAVE_USB +#endif + +#ifndef CONFIG_STM32L4DISCO_USBHOST_PRIO +# define CONFIG_STM32L4DISCO_USBHOST_PRIO 100 +#endif + +#ifndef CONFIG_STM32L4DISCO_USBHOST_STACKSIZE +# define CONFIG_STM32L4DISCO_USBHOST_STACKSIZE 1024 +#endif + +/************************************************************************************ + * Private Data + ************************************************************************************/ + +#ifdef CONFIG_USBHOST +static struct usbhost_connection_s *g_usbconn; +#endif + +/************************************************************************************ + * Private Functions + ************************************************************************************/ + +/************************************************************************************ + * Name: usbhost_waiter + * + * Description: + * Wait for USB devices to be connected. + * + ************************************************************************************/ + +#ifdef CONFIG_USBHOST +static int usbhost_waiter(int argc, char *argv[]) +{ + struct usbhost_hubport_s *hport; + + uvdbg("Running\n"); + for (;;) + { + /* Wait for the device to change state */ + + DEBUGVERIFY(CONN_WAIT(g_usbconn, &hport)); + uvdbg("%s\n", hport->connected ? "connected" : "disconnected"); + + /* Did we just become connected? */ + + if (hport->connected) + { + /* Yes.. enumerate the newly connected device */ + + (void)CONN_ENUMERATE(g_usbconn, hport); + } + } + + /* Keep the compiler from complaining */ + + return 0; +} +#endif + +/************************************************************************************ + * Public Functions + ************************************************************************************/ + +/************************************************************************************ + * Name: stm32l4_usbinitialize + * + * Description: + * Called from stm32l4_usbinitialize very early in initialization to setup USB-related + * GPIO pins for the STM32L4Discovery board. + * + ************************************************************************************/ + +void stm32l4_usbinitialize(void) +{ + /* The OTG FS has an internal soft pull-up. No GPIO configuration is required */ + + /* Configure the OTG FS VBUS sensing GPIO, Power On, and Over current GPIOs */ + +#ifdef CONFIG_STM32L4_OTGFS + stm32l4_configgpio(GPIO_OTGFS_VBUS); + stm32l4_configgpio(GPIO_OTGFS_PWRON); + stm32l4_configgpio(GPIO_OTGFS_OVER); +#endif +} + +/*********************************************************************************** + * Name: stm32l4_usbhost_initialize + * + * Description: + * Called at application startup time to initialize the USB host functionality. + * This function will start a thread that will monitor for device + * connection/disconnection events. + * + ***********************************************************************************/ + +#ifdef CONFIG_USBHOST +int stm32l4_usbhost_initialize(void) +{ + int pid; +#if defined(CONFIG_USBHOST_HUB) || defined(CONFIG_USBHOST_MSC) || \ + defined(CONFIG_USBHOST_HIDKBD) || defined(CONFIG_USBHOST_HIDMOUSE) + int ret; +#endif + + /* First, register all of the class drivers needed to support the drivers + * that we care about: + */ + + uvdbg("Register class drivers\n"); + +#ifdef CONFIG_USBHOST_HUB + /* Initialize USB hub class support */ + + ret = usbhost_hub_initialize(); + if (ret < 0) + { + udbg("ERROR: usbhost_hub_initialize failed: %d\n", ret); + } +#endif + +#ifdef CONFIG_USBHOST_MSC + /* Register the USB mass storage class class */ + + ret = usbhost_msc_initialize(); + if (ret != OK) + { + udbg("ERROR: Failed to register the mass storage class: %d\n", ret); + } +#endif + +#ifdef CONFIG_USBHOST_CDCACM + /* Register the CDC/ACM serial class */ + + ret = usbhost_cdcacm_initialize(); + if (ret != OK) + { + udbg("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret); + } +#endif + +#ifdef CONFIG_USBHOST_HIDKBD + /* Initialize the HID keyboard class */ + + ret = usbhost_kbdinit(); + if (ret != OK) + { + udbg("Failed to register the HID keyboard class\n"); + } +#endif + +#ifdef CONFIG_USBHOST_HIDMOUSE + /* Initialize the HID mouse class */ + + ret = usbhost_mouse_init(); + if (ret != OK) + { + udbg("Failed to register the HID mouse class\n"); + } +#endif + + /* Then get an instance of the USB host interface */ + + uvdbg("Initialize USB host\n"); + g_usbconn = stm32l4_otgfshost_initialize(0); + if (g_usbconn) + { + /* Start a thread to handle device connection. */ + + uvdbg("Start usbhost_waiter\n"); + + pid = task_create("usbhost", CONFIG_STM32L4DISCO_USBHOST_PRIO, + CONFIG_STM32L4DISCO_USBHOST_STACKSIZE, + (main_t)usbhost_waiter, (FAR char * const *)NULL); + return pid < 0 ? -ENOEXEC : OK; + } + + return -ENODEV; +} +#endif + +/*********************************************************************************** + * Name: stm32l4_usbhost_vbusdrive + * + * Description: + * Enable/disable driving of VBUS 5V output. This function must be provided be + * each platform that implements the STM32 OTG FS host interface + * + * "On-chip 5 V VBUS generation is not supported. For this reason, a charge pump + * or, if 5 V are available on the application board, a basic power switch, must + * be added externally to drive the 5 V VBUS line. The external charge pump can + * be driven by any GPIO output. When the application decides to power on VBUS + * using the chosen GPIO, it must also set the port power bit in the host port + * control and status register (PPWR bit in OTG_FS_HPRT). + * + * "The application uses this field to control power to this port, and the core + * clears this bit on an over current condition." + * + * Input Parameters: + * iface - For future growth to handle multiple USB host interface. Should be zero. + * enable - true: enable VBUS power; false: disable VBUS power + * + * Returned Value: + * None + * + ***********************************************************************************/ + +#ifdef CONFIG_USBHOST +void stm32l4_usbhost_vbusdrive(int iface, bool enable) +{ + DEBUGASSERT(iface == 0); + + if (enable) + { + /* Enable the Power Switch by driving the enable pin low */ + + stm32l4_gpiowrite(GPIO_OTGFS_PWRON, false); + } + else + { + /* Disable the Power Switch by driving the enable pin high */ + + stm32l4_gpiowrite(GPIO_OTGFS_PWRON, true); + } +} +#endif + +/************************************************************************************ + * Name: stm32l4_setup_overcurrent + * + * Description: + * Setup to receive an interrupt-level callback if an over current condition is + * detected. + * + * Input Parameter: + * handler - New over current interrupt handler + * + * Returned value: + * Old over current interrupt handler + * + ************************************************************************************/ + +#ifdef CONFIG_USBHOST +xcpt_t stm32l4_setup_overcurrent(xcpt_t handler) +{ + return stm32l4_gpiosetevent(GPIO_OTGFS_OVER, true, true, true, handler); +} +#endif + +/************************************************************************************ + * Name: stm32l4_usbsuspend + * + * Description: + * Board logic must provide the stm32l4_usbsuspend logic if the USBDEV driver is + * used. This function is called whenever the USB enters or leaves suspend mode. + * This is an opportunity for the board logic to shutdown clocks, power, etc. + * while the USB is suspended. + * + ************************************************************************************/ + +#ifdef CONFIG_USBDEV +void stm32l4_usbsuspend(FAR struct usbdev_s *dev, bool resume) +{ + ulldbg("resume: %d\n", resume); +} +#endif + +#endif /* CONFIG_STM32L4_OTGFS */ diff --git a/configs/stm32l476vg-disco/src/stm32l476vg-disco.h b/configs/stm32l476vg-disco/src/stm32l476vg-disco.h index 4331d064d5..471a19d561 100644 --- a/configs/stm32l476vg-disco/src/stm32l476vg-disco.h +++ b/configs/stm32l476vg-disco/src/stm32l476vg-disco.h @@ -59,6 +59,9 @@ #define HAVE_N25QXXX_NXFFS 1 #define HAVE_N25QXXX_SMARTFS 1 #define HAVE_N25QXXX_CHARDEV 1 +#define HAVE_USBDEV 1 +#define HAVE_USBHOST 1 +#define HAVE_USBMONITOR 1 #if !defined(CONFIG_FS_PROCFS) # undef HAVE_PROC @@ -124,6 +127,55 @@ #define PROGMEM_MTD_MINOR 1 +/* Can't support USB host or device features if USB OTG FS is not enabled */ + +#ifndef CONFIG_STM32L4_OTGFS +# undef HAVE_USBDEV +# undef HAVE_USBHOST +# undef HAVE_USBMONITOR +#endif + +/* Can't support USB device monitor if USB device is not enabled */ + +#ifndef CONFIG_USBDEV +# undef HAVE_USBDEV +# undef HAVE_USBMONITOR +#endif + +/* Can't support USB host is USB host is not enabled */ + +#ifndef CONFIG_USBHOST +# undef HAVE_USBHOST +#endif + +/* Check if we should enable the USB monitor before starting NSH */ + +#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_SYSTEM_USBMONITOR) +# undef HAVE_USBMONITOR +#endif + +/* USB OTG FS + * + * PC11 OTG_FS_VBUS VBUS sensing (also connected to the green LED) + * PC9 OTG_FS_PowerSwitchOn + * PC10 OTG_FS_Overcurrent + */ + +#define GPIO_OTGFS_VBUS (GPIO_INPUT|GPIO_FLOAT|GPIO_SPEED_100MHz|\ + GPIO_OPENDRAIN|GPIO_PORTC|GPIO_PIN11) +#define GPIO_OTGFS_PWRON (GPIO_OUTPUT|GPIO_FLOAT|GPIO_SPEED_100MHz|\ + GPIO_PUSHPULL|GPIO_PORTC|GPIO_PIN9) + +#ifdef CONFIG_USBHOST +# define GPIO_OTGFS_OVER (GPIO_INPUT|GPIO_EXTI|GPIO_FLOAT|\ + GPIO_SPEED_100MHz|GPIO_PUSHPULL|\ + GPIO_PORTC|GPIO_PIN10) + +#else +# define GPIO_OTGFS_OVER (GPIO_INPUT|GPIO_FLOAT|GPIO_SPEED_100MHz|\ + GPIO_PUSHPULL|GPIO_PORTC|GPIO_PIN10) +#endif + /* LED. * LD4: the red LED on PB2 * LD5: the green LED on PE8 @@ -211,14 +263,14 @@ extern struct spi_dev_s *g_spi2; void stm32_spiinitialize(void); /************************************************************************************ - * Name: stm32_usbinitialize + * Name: stm32l4_usbinitialize * * Description: * Called to setup USB-related GPIO pins. * ************************************************************************************/ -void stm32_usbinitialize(void); +void stm32l4_usbinitialize(void); /************************************************************************************ * Name: board_adc_initialize -- GitLab From d2b78eddec97cdcf82f119b44fc503571517358e Mon Sep 17 00:00:00 2001 From: ziggurat29 Date: Thu, 9 Jun 2016 11:26:36 -0500 Subject: [PATCH 002/229] need to be able to explicitly indicate Vddusb is valid in order to use the OTFS block in this chip; done via PWR CR2 bit USV. --- arch/arm/src/stm32l4/stm32l4_pwr.c | 48 +++++++++++++++++++++++++++++- arch/arm/src/stm32l4/stm32l4_pwr.h | 18 +++++++++++ 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/arch/arm/src/stm32l4/stm32l4_pwr.c b/arch/arm/src/stm32l4/stm32l4_pwr.c index 7659f73147..bc9a022fa0 100644 --- a/arch/arm/src/stm32l4/stm32l4_pwr.c +++ b/arch/arm/src/stm32l4/stm32l4_pwr.c @@ -138,7 +138,7 @@ bool stm32l4_pwr_enablebkp(bool writable) uint16_t regval; bool waswritable; - /* Get the current state of the STM32 PWR control register */ + /* Get the current state of the STM32L4 PWR control register 1 */ regval = stm32l4_pwr_getreg(STM32L4_PWR_CR1_OFFSET); waswritable = ((regval & PWR_CR1_DBP) != 0); @@ -166,3 +166,49 @@ bool stm32l4_pwr_enablebkp(bool writable) return waswritable; } + +/************************************************************************************ + * Name: stm32l4_pwr_enableusv + * + * Description: + * Enables or disables the USB Supply Valid monitoring. Setting this bit is + * mandatory to use the USB OTG FS peripheral. + * + * Input Parameters: + * set - True: Vddusb is valid; False: Vddusb is not present. Logical and electrical + * isolation is applied to ignore this supply. + * + * Returned Value: + * True: The bit was previously set. + * + ************************************************************************************/ + +bool stm32l4_pwr_enableusv(bool set) +{ + uint16_t regval; + bool wasset; + + /* Get the current state of the STM32L4 PWR control register 2 */ + + regval = stm32l4_pwr_getreg(STM32L4_PWR_CR2_OFFSET); + wasset = ((regval & PWR_CR2_USV) != 0); + + /* Enable or disable the ability to write */ + + if (wasset && !set) + { + /* Disable the Vddusb monitoring */ + + regval &= ~PWR_CR2_USV; + stm32l4_pwr_putreg(STM32L4_PWR_CR2_OFFSET, regval); + } + else if (!wasset && set) + { + /* Enable the Vddusb monitoring */ + + regval |= PWR_CR2_USV; + stm32l4_pwr_putreg(STM32L4_PWR_CR2_OFFSET, regval); + } + + return wasset; +} diff --git a/arch/arm/src/stm32l4/stm32l4_pwr.h b/arch/arm/src/stm32l4/stm32l4_pwr.h index 6c065f3d44..14891fe00a 100644 --- a/arch/arm/src/stm32l4/stm32l4_pwr.h +++ b/arch/arm/src/stm32l4/stm32l4_pwr.h @@ -101,6 +101,24 @@ bool stm32l4_pwr_enableclk(bool enable); bool stm32l4_pwr_enablebkp(bool writable); +/************************************************************************************ + * Name: stm32l4_pwr_enableusv + * + * Description: + * Enables or disables the USB Supply Valid monitoring. Setting this bit is + * mandatory to use the USB OTG FS peripheral. + * + * Input Parameters: + * set - True: Vddusb is valid; False: Vddusb is not present. Logical and electrical + * isolation is applied to ignore this supply. + * + * Returned Value: + * True: The bit was previously set. + * + ************************************************************************************/ + +bool stm32l4_pwr_enableusv(bool set); + #undef EXTERN #if defined(__cplusplus) } -- GitLab From b91ce6b6b8f0acbc223ead3b44b25ba6e4f51ed1 Mon Sep 17 00:00:00 2001 From: ziggurat29 Date: Thu, 9 Jun 2016 11:28:23 -0500 Subject: [PATCH 003/229] set power ctl USV bit as early (and required) step in initializing USB device. also various comment fixups and minor syntax error in some conditional compile blocks. --- arch/arm/src/stm32l4/stm32l4_otgfsdev.c | 41 +++++++++---------------- 1 file changed, 14 insertions(+), 27 deletions(-) diff --git a/arch/arm/src/stm32l4/stm32l4_otgfsdev.c b/arch/arm/src/stm32l4/stm32l4_otgfsdev.c index 52178fcde7..621b58c5b6 100644 --- a/arch/arm/src/stm32l4/stm32l4_otgfsdev.c +++ b/arch/arm/src/stm32l4/stm32l4_otgfsdev.c @@ -62,6 +62,7 @@ #include "up_internal.h" #include "stm32l4_otgfs.h" +#include "stm32l4_pwr.h" #if defined(CONFIG_USBDEV) && (defined(CONFIG_STM32L4_OTGFS)) @@ -250,7 +251,7 @@ #define EP0 (0) /* The set of all endpoints available to the class implementation (1-3) */ - +//XXX I think this needs to be 0x3e for the 'L4 #define STM32_EP_AVAILABLE (0x0e) /* All available endpoints */ /* Maximum packet sizes for full speed endpoints */ @@ -3482,7 +3483,7 @@ static inline void stm32_otginterrupt(FAR struct stm32_usbdev_s *priv) /* Clear OTG interrupt */ - stm32_putreg(retval, STM32_OTGFS_GOTGINT); + stm32_putreg(regval, STM32_OTGFS_GOTGINT); } #endif @@ -4916,7 +4917,7 @@ static int stm32_pullup(struct usbdev_s *dev, bool enable) } else { - /* Connect the device by setting the soft disconnect bit in the DCTL + /* Disconnect the device by setting the soft disconnect bit in the DCTL * register */ @@ -5129,6 +5130,10 @@ static void stm32_hwinitialize(FAR struct stm32_usbdev_s *priv) uint32_t address; int i; + /* Enable Vbus monitoring in the Power control */ + + stm32l4_pwr_enableusv(true); + /* At start-up the core is in FS mode. */ /* Disable global interrupts by clearing the GINTMASK bit in the GAHBCFG @@ -5171,44 +5176,24 @@ static void stm32_hwinitialize(FAR struct stm32_usbdev_s *priv) /* Deactivate the power down */ -#if 1 //XXX defined(CONFIG_STM32_STM32F446) - /* In the case of the STM32F446 the meaning of the bit has changed to VBUS - * Detection Enable when set - */ - regval = OTGFS_GCCFG_PWRDWN; # ifdef CONFIG_USBDEV_VBUSSENSING + /* Enable Vbus sensing */ + regval |= OTGFS_GCCFG_VBDEN; # endif -#else - /* In the case of the the all others the meaning of the bit is No VBUS - * Sense when Set - */ - - regval = (OTGFS_GCCFG_PWRDWN | OTGFS_GCCFG_VBUSASEN | OTGFS_GCCFG_VBUSBSEN); -# ifndef CONFIG_USBDEV_VBUSSENSING - regval |= OTGFS_GCCFG_NOVBUSSENS; -# endif -# ifdef CONFIG_STM32_OTGFS_SOFOUTPUT - regval |= OTGFS_GCCFG_SOFOUTEN; -# endif -#endif stm32_putreg(regval, STM32_OTGFS_GCCFG); up_mdelay(20); - /* For the new OTG controller in the F446 when VBUS sensing is not used we - * need to force the B session valid - */ + /* When VBUS sensing is not used we need to force the B session valid */ -#if 1 //XXX defined(CONFIG_STM32_STM32F446) # ifndef CONFIG_USBDEV_VBUSSENSING regval = stm32_getreg(STM32_OTGFS_GOTGCTL); regval |= (OTGFS_GOTGCTL_BVALOEN | OTGFS_GOTGCTL_BVALOVAL); stm32_putreg(regval, STM32_OTGFS_GOTGCTL); # endif -#endif /* Force Device Mode */ @@ -5269,6 +5254,8 @@ static void stm32_hwinitialize(FAR struct stm32_usbdev_s *priv) (STM32_EP3_TXFIFO_WORDS << OTGFS_DIEPTXF_INEPTXFD_SHIFT); stm32_putreg(regval, STM32_OTGFS_DIEPTXF3); + /* XXX EP 4,5 ? */ + /* Flush the FIFOs */ stm32_txfifo_flush(OTGFS_GRSTCTL_TXFNUM_DALL); @@ -5439,7 +5426,7 @@ void up_usbinitialize(void) up_usbuninitialize(); - /* Initialie the driver data structure */ + /* Initialize the driver data structure */ stm32_swinitialize(priv); -- GitLab From 5db2618c3cb678f0ccb3a83920ad9f237d2a68ef Mon Sep 17 00:00:00 2001 From: ziggurat29 Date: Thu, 9 Jun 2016 14:01:59 -0500 Subject: [PATCH 004/229] accomodate the additional endpoint descriptors (and allocate fifo space) that are present in the 'L4 --- arch/arm/src/stm32l4/stm32l4_otgfsdev.c | 61 +++++++++++++++++++------ 1 file changed, 48 insertions(+), 13 deletions(-) diff --git a/arch/arm/src/stm32l4/stm32l4_otgfsdev.c b/arch/arm/src/stm32l4/stm32l4_otgfsdev.c index 621b58c5b6..155a6c209a 100644 --- a/arch/arm/src/stm32l4/stm32l4_otgfsdev.c +++ b/arch/arm/src/stm32l4/stm32l4_otgfsdev.c @@ -94,23 +94,33 @@ #endif #ifndef CONFIG_USBDEV_EP0_TXFIFO_SIZE -# define CONFIG_USBDEV_EP0_TXFIFO_SIZE 192 +# define CONFIG_USBDEV_EP0_TXFIFO_SIZE 128 #endif #ifndef CONFIG_USBDEV_EP1_TXFIFO_SIZE -# define CONFIG_USBDEV_EP1_TXFIFO_SIZE 192 +# define CONFIG_USBDEV_EP1_TXFIFO_SIZE 128 #endif #ifndef CONFIG_USBDEV_EP2_TXFIFO_SIZE -# define CONFIG_USBDEV_EP2_TXFIFO_SIZE 192 +# define CONFIG_USBDEV_EP2_TXFIFO_SIZE 128 #endif #ifndef CONFIG_USBDEV_EP3_TXFIFO_SIZE -# define CONFIG_USBDEV_EP3_TXFIFO_SIZE 192 +# define CONFIG_USBDEV_EP3_TXFIFO_SIZE 128 #endif -#if (CONFIG_USBDEV_RXFIFO_SIZE + CONFIG_USBDEV_EP0_TXFIFO_SIZE + \ - CONFIG_USBDEV_EP2_TXFIFO_SIZE + CONFIG_USBDEV_EP3_TXFIFO_SIZE) > 1280 +#ifndef CONFIG_USBDEV_EP4_TXFIFO_SIZE +# define CONFIG_USBDEV_EP4_TXFIFO_SIZE 128 +#endif + +#ifndef CONFIG_USBDEV_EP5_TXFIFO_SIZE +# define CONFIG_USBDEV_EP5_TXFIFO_SIZE 128 +#endif + +#if (CONFIG_USBDEV_RXFIFO_SIZE + CONFIG_USBDEV_EP0_TXFIFO_SIZE +\ + CONFIG_USBDEV_EP1_TXFIFO_SIZE + CONFIG_USBDEV_EP2_TXFIFO_SIZE +\ + CONFIG_USBDEV_EP3_TXFIFO_SIZE + CONFIG_USBDEV_EP4_TXFIFO_SIZE +\ + CONFIG_USBDEV_EP5_TXFIFO_SIZE ) > 1280 # error "FIFO allocations exceed FIFO memory size" #endif @@ -149,6 +159,20 @@ # error "CONFIG_USBDEV_EP3_TXFIFO_SIZE is out of range" #endif +#define STM32_EP4_TXFIFO_BYTES ((CONFIG_USBDEV_EP4_TXFIFO_SIZE + 3) & ~3) +#define STM32_EP4_TXFIFO_WORDS ((CONFIG_USBDEV_EP4_TXFIFO_SIZE + 3) >> 2) + +#if STM32_EP4_TXFIFO_WORDS < 16 +# error "CONFIG_USBDEV_EP4_TXFIFO_SIZE is out of range" +#endif + +#define STM32_EP5_TXFIFO_BYTES ((CONFIG_USBDEV_EP5_TXFIFO_SIZE + 3) & ~3) +#define STM32_EP5_TXFIFO_WORDS ((CONFIG_USBDEV_EP5_TXFIFO_SIZE + 3) >> 2) + +#if STM32_EP5_TXFIFO_WORDS < 16 +# error "CONFIG_USBDEV_EP5_TXFIFO_SIZE is out of range" +#endif + /* Debug ***********************************************************************/ /* Trace error codes */ @@ -238,8 +262,7 @@ /* Endpoints ******************************************************************/ /* Number of endpoints */ -//XXX I think this needs to be 6 for the 'L4 -#define STM32_NENDPOINTS (4) /* ep0-3 x 2 for IN and OUT */ +#define STM32_NENDPOINTS (6) /* ep0-5 x 2 for IN and OUT */ /* Odd physical endpoint numbers are IN; even are OUT */ @@ -251,8 +274,7 @@ #define EP0 (0) /* The set of all endpoints available to the class implementation (1-3) */ -//XXX I think this needs to be 0x3e for the 'L4 -#define STM32_EP_AVAILABLE (0x0e) /* All available endpoints */ +#define STM32_EP_AVAILABLE (0x3e) /* All available endpoints */ /* Maximum packet sizes for full speed endpoints */ @@ -5059,7 +5081,7 @@ static void stm32_swinitialize(FAR struct stm32_usbdev_s *priv) priv->epin[EP0].ep.priv = priv; priv->epout[EP0].ep.priv = priv; - /* Initialize the endpoint lists */ + /* Initialize the IN endpoint list */ for (i = 0; i < STM32_NENDPOINTS; i++) { @@ -5087,7 +5109,7 @@ static void stm32_swinitialize(FAR struct stm32_usbdev_s *priv) privep->ep.maxpacket = CONFIG_USBDEV_EP0_MAXSIZE; } - /* Initialize the endpoint lists */ + /* Initialize the OUT endpoint list */ for (i = 0; i < STM32_NENDPOINTS; i++) { @@ -5254,7 +5276,20 @@ static void stm32_hwinitialize(FAR struct stm32_usbdev_s *priv) (STM32_EP3_TXFIFO_WORDS << OTGFS_DIEPTXF_INEPTXFD_SHIFT); stm32_putreg(regval, STM32_OTGFS_DIEPTXF3); - /* XXX EP 4,5 ? */ + /* EP4 TX */ + + address += STM32_EP3_TXFIFO_WORDS; + regval = (address << OTGFS_DIEPTXF_INEPTXSA_SHIFT) | + (STM32_EP4_TXFIFO_WORDS << OTGFS_DIEPTXF_INEPTXFD_SHIFT); + stm32_putreg(regval, STM32_OTGFS_DIEPTXF4); + + /* EP5 TX */ + + address += STM32_EP4_TXFIFO_WORDS; + regval = (address << OTGFS_DIEPTXF_INEPTXSA_SHIFT) | + (STM32_EP5_TXFIFO_WORDS << OTGFS_DIEPTXF_INEPTXFD_SHIFT); + stm32_putreg(regval, STM32_OTGFS_DIEPTXF5); + /* Flush the FIFOs */ -- GitLab From cb55c0615339b2b33ee9a0f6e7f0f2644addf121 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 21 Jun 2016 16:39:28 -0600 Subject: [PATCH 005/229] sched_file_channel(): Comments say that we need to lock the scheduler, but we do not. --- drivers/syslog/syslog_filechannel.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/drivers/syslog/syslog_filechannel.c b/drivers/syslog/syslog_filechannel.c index b703b88928..3f2f7d7df1 100644 --- a/drivers/syslog/syslog_filechannel.c +++ b/drivers/syslog/syslog_filechannel.c @@ -40,6 +40,7 @@ #include #include +#include #include #include @@ -143,14 +144,15 @@ int syslog_file_channel(FAR const char *devpath) * after the default channel has been selected. * * We disable pre-emption only so that we are not suspended and a lot of - * important debug output is lost. + * important debug output is lost while we futz with the channels. */ + sched_lock(); saved_channel = g_syslog_channel; ret = syslog_channel(&g_default_syslog_channel); if (ret < 0) { - return ret; + goto errout_with_lock; } /* Uninitialize any driver interface that may have been in place */ @@ -163,7 +165,7 @@ int syslog_file_channel(FAR const char *devpath) */ (void)syslog_channel(saved_channel); - return ret; + goto errout_with_lock; } /* Then initialize the file interface */ @@ -171,16 +173,22 @@ int syslog_file_channel(FAR const char *devpath) ret = syslog_dev_initialize(devpath, OPEN_FLAGS, OPEN_MODE); if (ret < 0) { - /* We should still be able to back-up an re-initialized everything */ + /* We should still be able to back-up and re-initialized everything */ (void)syslog_initialize(SYSLOG_INIT_EARLY); (void)syslog_initialize(SYSLOG_INIT_LATE); - return ret; + goto errout_with_lock; } - /* Use the file as the SYSLOG channel */ + /* Use the file as the SYSLOG channel. If this fails we are pretty much + * screwed. + */ + + ret = syslog_channel(&g_syslog_file_channel); - return syslog_channel(&g_syslog_file_channel); +errout_with_lock: + sched_unlock(); + return ret; } #endif /* CONFIG_SYSLOG_FILE */ -- GitLab From c373b45b2145dc9d2f76ce5520b35d9b8cab1aa6 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 21 Jun 2016 16:52:28 -0600 Subject: [PATCH 006/229] _vsyslog PROXY: Wrong header file --- syscall/syscall.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syscall/syscall.csv b/syscall/syscall.csv index 29271925c4..77b7ce750c 100644 --- a/syscall/syscall.csv +++ b/syscall/syscall.csv @@ -159,7 +159,7 @@ "up_assert","assert.h","","void","FAR const uint8_t*","int" #"up_assert","assert.h","","void" "vfork","unistd.h","defined(CONFIG_ARCH_HAVE_VFORK)","pid_t" -"_vsyslog","syslog.h","","int","int","FAR const IPTR char*","FAR va_list*" +"_vsyslog","nuttx/syslog/syslog.h","","int","int","FAR const IPTR char*","FAR va_list*" "wait","sys/wait.h","defined(CONFIG_SCHED_WAITPID) && defined(CONFIG_SCHED_HAVE_PARENT)","pid_t","int*" "waitid","sys/wait.h","defined(CONFIG_SCHED_WAITPID) && defined(CONFIG_SCHED_HAVE_PARENT)","int","idtype_t","id_t"," FAR siginfo_t *","int" "waitpid","sys/wait.h","defined(CONFIG_SCHED_WAITPID)","pid_t","pid_t","int*","int" -- GitLab From 35cb2fb87d85c31e9c39c50daa63f4d0139b7e87 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 21 Jun 2016 16:59:46 -0600 Subject: [PATCH 007/229] Eliminate a warning --- drivers/syslog/syslog_initialize.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/syslog/syslog_initialize.c b/drivers/syslog/syslog_initialize.c index 08f12831ac..3c408e61db 100644 --- a/drivers/syslog/syslog_initialize.c +++ b/drivers/syslog/syslog_initialize.c @@ -41,6 +41,7 @@ #include +#include #include #include "syslog.h" -- GitLab From 863e830c0d3cc0de78bef77fc3030127232e42b7 Mon Sep 17 00:00:00 2001 From: Lok Tep Date: Wed, 22 Jun 2016 10:54:06 +0200 Subject: [PATCH 008/229] merge --- .../src/stm32f7/chip/stm32f74xx75xx_sdmmc.h | 268 ++ arch/arm/src/stm32f7/stm32_sdmmc.c | 2982 +++++++++++++++++ 2 files changed, 3250 insertions(+) create mode 100644 arch/arm/src/stm32f7/chip/stm32f74xx75xx_sdmmc.h create mode 100644 arch/arm/src/stm32f7/stm32_sdmmc.c diff --git a/arch/arm/src/stm32f7/chip/stm32f74xx75xx_sdmmc.h b/arch/arm/src/stm32f7/chip/stm32f74xx75xx_sdmmc.h new file mode 100644 index 0000000000..117c4da2fa --- /dev/null +++ b/arch/arm/src/stm32f7/chip/stm32f74xx75xx_sdmmc.h @@ -0,0 +1,268 @@ +/************************************************************************************ + * arch/arm/src/stm32f7/chip/stm32_sdmmc.h + * + * Copyright (C) 2009, 2011-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. + * + ************************************************************************************/ + +#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XX_SDMMC_H +#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XX_SDMMC_H + +/************************************************************************************ + * Pre-processor Definitions + ************************************************************************************/ + +/* Register Offsets *****************************************************************/ + +#define STM32_SDMMC1_POWER_OFFSET 0x0000 /* SDIO power control register */ +#define STM32_SDMMC1_CLKCR_OFFSET 0x0004 /* SDI clock control register */ +#define STM32_SDMMC1_ARG_OFFSET 0x0008 /* SDIO argument register */ +#define STM32_SDMMC1_CMD_OFFSET 0x000c /* SDIO command register */ +#define STM32_SDMMC1_RESPCMD_OFFSET 0x0010 /* SDIO command response register */ +#define STM32_SDMMC1_RESP_OFFSET(n) (0x0010+4*(n)) +#define STM32_SDMMC1_RESP1_OFFSET 0x0014 /* SDIO response 1 register */ +#define STM32_SDMMC1_RESP2_OFFSET 0x0018 /* SDIO response 2 register */ +#define STM32_SDMMC1_RESP3_OFFSET 0x001c /* SDIO response 3 register */ +#define STM32_SDMMC1_RESP4_OFFSET 0x0020 /* SDIO response 4 register */ +#define STM32_SDMMC1_DTIMER_OFFSET 0x0024 /* SDIO data timer register */ +#define STM32_SDMMC1_DLEN_OFFSET 0x0028 /* SDIO data length register */ +#define STM32_SDMMC1_DCTRL_OFFSET 0x002c /* SDIO data control register */ +#define STM32_SDMMC1_DCOUNT_OFFSET 0x0030 /* SDIO data counter register */ +#define STM32_SDMMC1_STA_OFFSET 0x0034 /* SDIO status register */ +#define STM32_SDMMC1_ICR_OFFSET 0x0038 /* SDIO interrupt clear register */ +#define STM32_SDMMC1_MASK_OFFSET 0x003c /* SDIO mask register */ +#define STM32_SDMMC1_FIFOCNT_OFFSET 0x0048 /* SDIO FIFO counter register */ +#define STM32_SDMMC1_FIFO_OFFSET 0x0080 /* SDIO data FIFO register */ + +/* Register Addresses ***************************************************************/ + +#define STM32_SDMMC1_POWER (STM32_SDMMC1_BASE+STM32_SDMMC1_POWER_OFFSET) +#define STM32_SDMMC1_CLKCR (STM32_SDMMC1_BASE+STM32_SDMMC1_CLKCR_OFFSET) +#define STM32_SDMMC1_ARG (STM32_SDMMC1_BASE+STM32_SDMMC1_ARG_OFFSET) +#define STM32_SDMMC1_CMD (STM32_SDMMC1_BASE+STM32_SDMMC1_CMD_OFFSET) +#define STM32_SDMMC1_RESPCMD (STM32_SDMMC1_BASE+STM32_SDMMC1_RESPCMD_OFFSET) +#define STM32_SDMMC1_RESP(n) (STM32_SDMMC1_BASE+STM32_SDMMC1_RESP_OFFSET(n)) +#define STM32_SDMMC1_RESP1 (STM32_SDMMC1_BASE+STM32_SDMMC1_RESP1_OFFSET) +#define STM32_SDMMC1_RESP2 (STM32_SDMMC1_BASE+STM32_SDMMC1_RESP2_OFFSET) +#define STM32_SDMMC1_RESP3 (STM32_SDMMC1_BASE+STM32_SDMMC1_RESP3_OFFSET) +#define STM32_SDMMC1_RESP4 (STM32_SDMMC1_BASE+STM32_SDMMC1_RESP4_OFFSET) +#define STM32_SDMMC1_DTIMER (STM32_SDMMC1_BASE+STM32_SDMMC1_DTIMER_OFFSET) +#define STM32_SDMMC1_DLEN (STM32_SDMMC1_BASE+STM32_SDMMC1_DLEN_OFFSET) +#define STM32_SDMMC1_DCTRL (STM32_SDMMC1_BASE+STM32_SDMMC1_DCTRL_OFFSET) +#define STM32_SDMMC1_DCOUNT (STM32_SDMMC1_BASE+STM32_SDMMC1_DCOUNT_OFFSET) +#define STM32_SDMMC1_STA (STM32_SDMMC1_BASE+STM32_SDMMC1_STA_OFFSET) +#define STM32_SDMMC1_ICR (STM32_SDMMC1_BASE+STM32_SDMMC1_ICR_OFFSET) +#define STM32_SDMMC1_MASK (STM32_SDMMC1_BASE+STM32_SDMMC1_MASK_OFFSET) +#define STM32_SDMMC1_FIFOCNT (STM32_SDMMC1_BASE+STM32_SDMMC1_FIFOCNT_OFFSET) +#define STM32_SDMMC1_FIFO (STM32_SDMMC1_BASE+STM32_SDMMC1_FIFO_OFFSET) + + +/* Register Bitfield Definitions ****************************************************/ + +#define SDIO_POWER_PWRCTRL_SHIFT (0) /* Bits 0-1: Power supply control bits */ +#define SDIO_POWER_PWRCTRL_MASK (3 << SDIO_POWER_PWRCTRL_SHIFT) +# define SDIO_POWER_PWRCTRL_OFF (0 << SDIO_POWER_PWRCTRL_SHIFT) /* 00: Power-off: card clock stopped */ +# define SDIO_POWER_PWRCTRL_PWRUP (2 << SDIO_POWER_PWRCTRL_SHIFT) /* 10: Reserved power-up */ +# define SDIO_POWER_PWRCTRL_ON (3 << SDIO_POWER_PWRCTRL_SHIFT) /* 11: Power-on: card is clocked */ + +#define SDIO_POWER_RESET (0) /* Reset value */ + +#define SDIO_CLKCR_CLKDIV_SHIFT (0) /* Bits 7-0: Clock divide factor */ +#define SDIO_CLKCR_CLKDIV_MASK (0xff << SDIO_CLKCR_CLKDIV_SHIFT) +#define SDIO_CLKCR_CLKEN (1 << 8) /* Bit 8: Clock enable bit */ +#define SDIO_CLKCR_PWRSAV (1 << 9) /* Bit 9: Power saving configuration bit */ +#define SDIO_CLKCR_BYPASS (1 << 10) /* Bit 10: Clock divider bypass enable bit */ +#define SDIO_CLKCR_WIDBUS_SHIFT (11) /* Bits 12-11: Wide bus mode enable bits */ +#define SDIO_CLKCR_WIDBUS_MASK (3 << SDIO_CLKCR_WIDBUS_SHIFT) +# define SDIO_CLKCR_WIDBUS_D1 (0 << SDIO_CLKCR_WIDBUS_SHIFT) /* 00: Default (SDIO_D0) */ +# define SDIO_CLKCR_WIDBUS_D4 (1 << SDIO_CLKCR_WIDBUS_SHIFT) /* 01: 4-wide (SDIO_D[3:0]) */ +# define SDIO_CLKCR_WIDBUS_D8 (2 << SDIO_CLKCR_WIDBUS_SHIFT) /* 10: 8-wide (SDIO_D[7:0]) */ +#define SDIO_CLKCR_NEGEDGE (1 << 13) /* Bit 13: SDIO_CK dephasing selection bit */ +#define SDIO_CLKCR_HWFC_EN (1 << 14) /* Bit 14: HW Flow Control enable */ + +#define SDIO_CLKCR_RESET (0) /* Reset value */ +#define SDIO_ARG_RESET (0) /* Reset value */ + +#define SDIO_CLKCR_CLKEN_BB (STM32_SDMMC1_CLKCR_BB + (8 * 4)) +#define SDIO_CLKCR_PWRSAV_BB (STM32_SDMMC1_CLKCR_BB + (9 * 4)) +#define SDIO_CLKCR_BYPASS_BB (STM32_SDMMC1_CLKCR_BB + (10 * 4)) +#define SDIO_CLKCR_NEGEDGE_BB (STM32_SDMMC1_CLKCR_BB + (13 * 4)) +#define SDIO_CLKCR_HWFC_EN_BB (STM32_SDMMC1_CLKCR_BB + (14 * 4)) + +#define SDIO_CMD_CMDINDEX_SHIFT (0) +#define SDIO_CMD_CMDINDEX_MASK (0x3f << SDIO_CMD_CMDINDEX_SHIFT) +#define SDIO_CMD_WAITRESP_SHIFT (6) /* Bits 7-6: Wait for response bits */ +#define SDIO_CMD_WAITRESP_MASK (3 << SDIO_CMD_WAITRESP_SHIFT) +# define SDIO_CMD_NORESPONSE (0 << SDIO_CMD_WAITRESP_SHIFT) /* 00/10: No response */ +# define SDIO_CMD_SHORTRESPONSE (1 << SDIO_CMD_WAITRESP_SHIFT) /* 01: Short response */ +# define SDIO_CMD_LONGRESPONSE (3 << SDIO_CMD_WAITRESP_SHIFT) /* 11: Long response */ +#define SDIO_CMD_WAITINT (1 << 8) /* Bit 8: CPSM waits for interrupt request */ +#define SDIO_CMD_WAITPEND (1 << 9) /* Bit 9: CPSM Waits for ends of data transfer */ +#define SDIO_CMD_CPSMEN (1 << 10) /* Bit 10: Command path state machine enable */ +#define SDIO_CMD_SUSPEND (1 << 11) /* Bit 11: SD I/O suspend command */ +#define SDIO_CMD_ENDCMD (1 << 12) /* Bit 12: Enable CMD completion */ +#define SDIO_CMD_NIEN (1 << 13) /* Bit 13: not Interrupt Enable */ +#define SDIO_CMD_ATACMD (1 << 14) /* Bit 14: CE-ATA command */ + +#define SDIO_CMD_RESET (0) /* Reset value */ + +#define SDIO_CMD_WAITINT_BB (STM32_SDMMC1_CMD_BB + (8 * 4)) +#define SDIO_CMD_WAITPEND_BB (STM32_SDMMC1_CMD_BB + (9 * 4)) +#define SDIO_CMD_CPSMEN_BB (STM32_SDMMC1_CMD_BB + (10 * 4)) +#define SDIO_CMD_SUSPEND_BB (STM32_SDMMC1_CMD_BB + (11 * 4)) +#define SDIO_CMD_ENCMD_BB (STM32_SDMMC1_CMD_BB + (12 * 4)) +#define SDIO_CMD_NIEN_BB (STM32_SDMMC1_CMD_BB + (13 * 4)) +#define SDIO_CMD_ATACMD_BB (STM32_SDMMC1_CMD_BB + (14 * 4)) + +#define SDIO_RESPCMD_SHIFT (0) +#define SDIO_RESPCMD_MASK (0x3f << SDIO_RESPCMD_SHIFT) + +#define SDIO_DTIMER_RESET (0) /* Reset value */ + +#define SDIO_DLEN_SHIFT (0) +#define SDIO_DLEN_MASK (0x01ffffff << SDIO_DLEN_SHIFT) + +#define SDIO_DLEN_RESET (0) /* Reset value */ + +#define SDIO_DCTRL_DTEN (1 << 0) /* Bit 0: Data transfer enabled bit */ +#define SDIO_DCTRL_DTDIR (1 << 1) /* Bit 1: Data transfer direction */ +#define SDIO_DCTRL_DTMODE (1 << 2) /* Bit 2: Data transfer mode */ +#define SDIO_DCTRL_DMAEN (1 << 3) /* Bit 3: DMA enable bit */ +#define SDIO_DCTRL_DBLOCKSIZE_SHIFT (4) /* Bits 7-4: Data block size */ +#define SDIO_DCTRL_DBLOCKSIZE_MASK (15 << SDIO_DCTRL_DBLOCKSIZE_SHIFT) +# define SDIO_DCTRL_1BYTE (0 << SDIO_DCTRL_DBLOCKSIZE_SHIFT) +# define SDIO_DCTRL_2BYTES (1 << SDIO_DCTRL_DBLOCKSIZE_SHIFT) +# define SDIO_DCTRL_4BYTES (2 << SDIO_DCTRL_DBLOCKSIZE_SHIFT) +# define SDIO_DCTRL_8BYTES (3 << SDIO_DCTRL_DBLOCKSIZE_SHIFT) +# define SDIO_DCTRL_16BYTES (4 << SDIO_DCTRL_DBLOCKSIZE_SHIFT) +# define SDIO_DCTRL_32BYTES (5 << SDIO_DCTRL_DBLOCKSIZE_SHIFT) +# define SDIO_DCTRL_64BYTES (6 << SDIO_DCTRL_DBLOCKSIZE_SHIFT) +# define SDIO_DCTRL_128BYTES (7 << SDIO_DCTRL_DBLOCKSIZE_SHIFT) +# define SDIO_DCTRL_256BYTES (8 << SDIO_DCTRL_DBLOCKSIZE_SHIFT) +# define SDIO_DCTRL_512BYTES (9 << SDIO_DCTRL_DBLOCKSIZE_SHIFT) +# define SDIO_DCTRL_1KBYTE (10 << SDIO_DCTRL_DBLOCKSIZE_SHIFT) +# define SDIO_DCTRL_2KBYTES (11 << SDIO_DCTRL_DBLOCKSIZE_SHIFT) +# define SDIO_DCTRL_4KBYTES (12 << SDIO_DCTRL_DBLOCKSIZE_SHIFT) +# define SDIO_DCTRL_8KBYTES (13 << SDIO_DCTRL_DBLOCKSIZE_SHIFT) +# define SDIO_DCTRL_16KBYTES (14 << SDIO_DCTRL_DBLOCKSIZE_SHIFT) +#define SDIO_DCTRL_RWSTART (1 << 8) /* Bit 8: Read wait start */ +#define SDIO_DCTRL_RWSTOP (1 << 9) /* Bit 9: Read wait stop */ +#define SDIO_DCTRL_RWMOD (1 << 10) /* Bit 10: Read wait mode */ +#define SDIO_DCTRL_SDIOEN (1 << 11) /* Bit 11: SD I/O enable functions */ + +#define SDIO_DCTRL_RESET (0) /* Reset value */ + +#define SDIO_DCTRL_DTEN_BB (STM32_SDMMC1_DCTRL_BB + (0 * 4)) +#define SDIO_DCTRL_DTDIR_BB (STM32_SDMMC1_DCTRL_BB + (1 * 4)) +#define SDIO_DCTRL_DTMODE_BB (STM32_SDMMC1_DCTRL_BB + (2 * 4)) +#define SDIO_DCTRL_DMAEN_BB (STM32_SDMMC1_DCTRL_BB + (3 * 4)) +#define SDIO_DCTRL_RWSTART_BB (STM32_SDMMC1_DCTRL_BB + (8 * 4)) +#define SDIO_DCTRL_RWSTOP_BB (STM32_SDMMC1_DCTRL_BB + (9 * 4)) +#define SDIO_DCTRL_RWMOD_BB (STM32_SDMMC1_DCTRL_BB + (10 * 4)) +#define SDIO_DCTRL_SDIOEN_BB (STM32_SDMMC1_DCTRL_BB + (11 * 4)) + +#define SDIO_DATACOUNT_SHIFT (0) +#define SDIO_DATACOUNT_MASK (0x01ffffff << SDIO_DATACOUNT_SHIFT) + +#define SDIO_STA_CCRCFAIL (1 << 0) /* Bit 0: Command response CRC fail */ +#define SDIO_STA_DCRCFAIL (1 << 1) /* Bit 1: Data block CRC fail */ +#define SDIO_STA_CTIMEOUT (1 << 2) /* Bit 2: Command response timeout */ +#define SDIO_STA_DTIMEOUT (1 << 3) /* Bit 3: Data timeout */ +#define SDIO_STA_TXUNDERR (1 << 4) /* Bit 4: Transmit FIFO underrun error */ +#define SDIO_STA_RXOVERR (1 << 5) /* Bit 5: Received FIFO overrun error */ +#define SDIO_STA_CMDREND (1 << 6) /* Bit 6: Command response received */ +#define SDIO_STA_CMDSENT (1 << 7) /* Bit 7: Command sent */ +#define SDIO_STA_DATAEND (1 << 8) /* Bit 8: Data end */ +#define SDIO_STA_STBITERR (1 << 9) /* Bit 9: Start bit not detected */ +#define SDIO_STA_DBCKEND (1 << 10) /* Bit 10: Data block sent/received */ +#define SDIO_STA_CMDACT (1 << 11) /* Bit 11: Command transfer in progress */ +#define SDIO_STA_TXACT (1 << 12) /* Bit 12: Data transmit in progress */ +#define SDIO_STA_RXACT (1 << 13) /* Bit 13: Data receive in progress */ +#define SDIO_STA_TXFIFOHE (1 << 14) /* Bit 14: Transmit FIFO half empty */ +#define SDIO_STA_RXFIFOHF (1 << 15) /* Bit 15: Receive FIFO half full */ +#define SDIO_STA_TXFIFOF (1 << 16) /* Bit 16: Transmit FIFO full */ +#define SDIO_STA_RXFIFOF (1 << 17) /* Bit 17: Receive FIFO full */ +#define SDIO_STA_TXFIFOE (1 << 18) /* Bit 18: Transmit FIFO empty */ +#define SDIO_STA_RXFIFOE (1 << 19) /* Bit 19: Receive FIFO empty */ +#define SDIO_STA_TXDAVL (1 << 20) /* Bit 20: Data available in transmit FIFO */ +#define SDIO_STA_RXDAVL (1 << 21) /* Bit 21: Data available in receive FIFO */ +#define SDIO_STA_SDIOIT (1 << 22) /* Bit 22: SDIO interrupt received */ +#define SDIO_STA_CEATAEND (1 << 23) /* Bit 23: CMD6 CE-ATA command completion */ + +#define SDIO_ICR_CCRCFAILC (1 << 0) /* Bit 0: CCRCFAIL flag clear bit */ +#define SDIO_ICR_DCRCFAILC (1 << 1) /* Bit 1: DCRCFAIL flag clear bit */ +#define SDIO_ICR_CTIMEOUTC (1 << 2) /* Bit 2: CTIMEOUT flag clear bit */ +#define SDIO_ICR_DTIMEOUTC (1 << 3) /* Bit 3: DTIMEOUT flag clear bit */ +#define SDIO_ICR_TXUNDERRC (1 << 4) /* Bit 4: TXUNDERR flag clear bit */ +#define SDIO_ICR_RXOVERRC (1 << 5) /* Bit 5: RXOVERR flag clear bit */ +#define SDIO_ICR_CMDRENDC (1 << 6) /* Bit 6: CMDREND flag clear bit */ +#define SDIO_ICR_CMDSENTC (1 << 7) /* Bit 7: CMDSENT flag clear bit */ +#define SDIO_ICR_DATAENDC (1 << 8) /* Bit 8: DATAEND flag clear bit */ +#define SDIO_ICR_STBITERRC (1 << 9) /* Bit 9: STBITERR flag clear bit */ +#define SDIO_ICR_DBCKENDC (1 << 10) /* Bit 10: DBCKEND flag clear bit */ +#define SDIO_ICR_SDIOITC (1 << 22) /* Bit 22: SDIOIT flag clear bit */ +#define SDIO_ICR_CEATAENDC (1 << 23) /* Bit 23: CEATAEND flag clear bit */ + +#define SDIO_ICR_RESET 0x00c007ff +#define SDIO_ICR_STATICFLAGS 0x000005ff + +#define SDIO_MASK_CCRCFAILIE (1 << 0) /* Bit 0: Command CRC fail interrupt enable */ +#define SDIO_MASK_DCRCFAILIE (1 << 1) /* Bit 1: Data CRC fail interrupt enable */ +#define SDIO_MASK_CTIMEOUTIE (1 << 2) /* Bit 2: Command timeout interrupt enable */ +#define SDIO_MASK_DTIMEOUTIE (1 << 3) /* Bit 3: Data timeout interrupt enable */ +#define SDIO_MASK_TXUNDERRIE (1 << 4) /* Bit 4: Tx FIFO underrun error interrupt enable */ +#define SDIO_MASK_RXOVERRIE (1 << 5) /* Bit 5: Rx FIFO overrun error interrupt enable */ +#define SDIO_MASK_CMDRENDIE (1 << 6) /* Bit 6: Command response received interrupt enable */ +#define SDIO_MASK_CMDSENTIE (1 << 7) /* Bit 7: Command sent interrupt enable */ +#define SDIO_MASK_DATAENDIE (1 << 8) /* Bit 8: Data end interrupt enable */ +#define SDIO_MASK_STBITERRIE (1 << 9) /* Bit 9: Start bit error interrupt enable */ +#define SDIO_MASK_DBCKENDIE (1 << 10) /* Bit 10: Data block end interrupt enable */ +#define SDIO_MASK_CMDACTIE (1 << 11) /* Bit 11: Command acting interrupt enable */ +#define SDIO_MASK_TXACTIE (1 << 12) /* Bit 12: Data transmit acting interrupt enable */ +#define SDIO_MASK_RXACTIE (1 << 13) /* Bit 13: Data receive acting interrupt enable */ +#define SDIO_MASK_TXFIFOHEIE (1 << 14) /* Bit 14: Tx FIFO half empty interrupt enable */ +#define SDIO_MASK_RXFIFOHFIE (1 << 15) /* Bit 15: Rx FIFO half full interrupt enable */ +#define SDIO_MASK_TXFIFOFIE (1 << 16) /* Bit 16: Tx FIFO full interrupt enable */ +#define SDIO_MASK_RXFIFOFIE (1 << 17) /* Bit 17: Rx FIFO full interrupt enable */ +#define SDIO_MASK_TXFIFOEIE (1 << 18) /* Bit 18: Tx FIFO empty interrupt enable */ +#define SDIO_MASK_RXFIFOEIE (1 << 19) /* Bit 19: Rx FIFO empty interrupt enable */ +#define SDIO_MASK_TXDAVLIE (1 << 20) /* Bit 20: Data available in Tx FIFO interrupt enable */ +#define SDIO_MASK_RXDAVLIE (1 << 21) /* Bit 21: Data available in Rx FIFO interrupt enable */ +#define SDIO_MASK_SDIOITIE (1 << 22) /* Bit 22: SDIO mode interrupt received interrupt enable */ +#define SDIO_MASK_CEATAENDIE (1 << 23) /* Bit 23: CE-ATA command completion interrupt enable */ + +#define SDIO_MASK_RESET (0) + +#define SDIO_FIFOCNT_SHIFT (0) +#define SDIO_FIFOCNT_MASK (0x01ffffff << SDIO_FIFOCNT_SHIFT) + +#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XX_SDMMC_H */ + diff --git a/arch/arm/src/stm32f7/stm32_sdmmc.c b/arch/arm/src/stm32f7/stm32_sdmmc.c new file mode 100644 index 0000000000..16473094b5 --- /dev/null +++ b/arch/arm/src/stm32f7/stm32_sdmmc.c @@ -0,0 +1,2982 @@ +/**************************************************************************** + * arch/arm/src/stm32f7/stm32_sdmmc.c + * + * Copyright (C) 2009, 2011-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 "stm32_sdmmc.h" + +#include + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "cache.h" +#include "chip.h" +#include "up_arch.h" + +#include "stm32_dma.h" +#include "stm32_gpio.h" + + +/* TODO STM32F7_SDMMC2 + */ + +#ifdef CONFIG_STM32F7_SDMMC1 + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/* Configuration ************************************************************/ +/* Required system configuration options: + * + * CONFIG_ARCH_DMA - Enable architecture-specific DMA subsystem + * initialization. Required if CONFIG_SDIO_DMA is enabled. + * CONFIG_STM32F7_DMA2 - Enable STM32 DMA2 support. Required if + * CONFIG_SDIO_DMA is enabled + * CONFIG_SCHED_WORKQUEUE -- Callback support requires work queue support. + * + * Driver-specific configuration options: + * + * CONFIG_SDIO_MUXBUS - Setting this configuration enables some locking + * APIs to manage concurrent accesses on the SDIO bus. This is not + * needed for the simple case of a single SD card, for example. + * CONFIG_SDIO_DMA - Enable SDIO. This is a marginally optional. For + * most usages, SDIO will cause data overruns if used without DMA. + * NOTE the above system DMA configuration options. + * CONFIG_SDIO_WIDTH_D1_ONLY - This may be selected to force the driver + * operate with only a single data line (the default is to use all + * 4 SD data lines). + * CONFIG_SDIO_PRI - SDIO interrupt priority. This setting is not very + * important since interrupt nesting is not currently supported. + * 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_INFO + */ + +#if defined(CONFIG_SDIO_DMA) && !defined(CONFIG_STM32F7_DMA2) +# warning "CONFIG_SDIO_DMA support requires CONFIG_STM32F7_DMA2" +#endif + +#ifndef CONFIG_SDIO_DMA +# warning "Large Non-DMA transfer may result in RX overrun failures" +#endif + +#ifndef CONFIG_SCHED_WORKQUEUE +# error "Callback support requires CONFIG_SCHED_WORKQUEUE" +#endif + +#ifndef CONFIG_SDIO_PRI +# define CONFIG_SDIO_PRI NVIC_SYSH_PRIORITY_DEFAULT +#endif + +#ifdef CONFIG_SDIO_DMA +# ifndef CONFIG_SDIO_DMAPRIO +# define CONFIG_SDIO_DMAPRIO DMA_SCR_PRIVERYHI +# endif +# if (CONFIG_SDIO_DMAPRIO & ~DMA_SCR_PL_MASK) != 0 +# error "Illegal value for CONFIG_SDIO_DMAPRIO" +# endif +#else +# undef CONFIG_SDIO_DMAPRIO +#endif + +#if !defined(CONFIG_DEBUG_FS) || !defined(CONFIG_DEBUG_FEATURES) +# undef CONFIG_SDIO_XFRDEBUG +#endif + +/* Friendly CLKCR bit re-definitions ****************************************/ + +#define SDIO_CLKCR_RISINGEDGE (0) +#define SDIO_CLKCR_FALLINGEDGE SDIO_CLKCR_NEGEDGE + +/* Mode dependent settings. These depend on clock devisor settings that must + * be defined in the board-specific board.h header file: SDIO_INIT_CLKDIV, + * SDIO_MMCXFR_CLKDIV, and SDIO_SDXFR_CLKDIV. + */ + +#define STM32_CLCKCR_INIT (SDMMC1_INIT_CLKDIV | SDIO_CLKCR_RISINGEDGE | \ + SDIO_CLKCR_WIDBUS_D1) +#define SDIO_CLKCR_MMCXFR (SDMMC1_MMCXFR_CLKDIV | SDIO_CLKCR_RISINGEDGE | \ + SDIO_CLKCR_WIDBUS_D1) +#define SDIO_CLCKR_SDXFR (SDMMC1_SDXFR_CLKDIV | SDIO_CLKCR_RISINGEDGE | \ + SDIO_CLKCR_WIDBUS_D1) +#define SDIO_CLCKR_SDWIDEXFR (SDMMC1_SDXFR_CLKDIV | SDIO_CLKCR_RISINGEDGE | \ + SDIO_CLKCR_WIDBUS_D4) + +/* Timing */ + +#define SDIO_CMDTIMEOUT (100000) +#define SDIO_LONGTIMEOUT (0x7fffffff) + +/* Big DTIMER setting */ + +#define SDIO_DTIMER_DATATIMEOUT (0x000fffff) + +/* DMA channel/stream configuration register settings. The following + * must be selected. The DMA driver will select the remaining fields. + * + * - 32-bit DMA + * - Memory increment + * - Direction (memory-to-peripheral, peripheral-to-memory) + * - Memory burst size (F4 only) + */ + + +/* STM32 stream configuration register (SCR) settings. */ + +#define SDIO_RXDMA32_CONFIG (DMA_SCR_PFCTRL | DMA_SCR_DIR_P2M|DMA_SCR_MINC | \ + DMA_SCR_PSIZE_32BITS | DMA_SCR_MSIZE_32BITS | \ + CONFIG_SDIO_DMAPRIO | DMA_SCR_PBURST_INCR4 | \ + DMA_SCR_MBURST_INCR4) +#define SDIO_TXDMA32_CONFIG (DMA_SCR_PFCTRL | DMA_SCR_DIR_M2P | DMA_SCR_MINC | \ + DMA_SCR_PSIZE_32BITS | DMA_SCR_MSIZE_32BITS | \ + CONFIG_SDIO_DMAPRIO | DMA_SCR_PBURST_INCR4 | \ + DMA_SCR_MBURST_INCR4) + +/* SDIO DMA Channel/Stream selection. There + * are multiple DMA stream options that must be dis-ambiguated in the board.h + * file. + */ + +#define SDIO_DMACHAN DMAMAP_SDMMC1 + +/* FIFO sizes */ + +#define SDIO_HALFFIFO_WORDS (8) +#define SDIO_HALFFIFO_BYTES (8*4) + +/* Data transfer interrupt mask bits */ + +#define SDIO_RECV_MASK (SDIO_MASK_DCRCFAILIE | SDIO_MASK_DTIMEOUTIE | \ + SDIO_MASK_DATAENDIE | SDIO_MASK_RXOVERRIE | \ + SDIO_MASK_RXFIFOHFIE | SDIO_MASK_STBITERRIE) +#define SDIO_SEND_MASK (SDIO_MASK_DCRCFAILIE | SDIO_MASK_DTIMEOUTIE | \ + SDIO_MASK_DATAENDIE | SDIO_MASK_TXUNDERRIE | \ + SDIO_MASK_TXFIFOHEIE | SDIO_MASK_STBITERRIE) +#define SDIO_DMARECV_MASK (SDIO_MASK_DCRCFAILIE | SDIO_MASK_DTIMEOUTIE | \ + SDIO_MASK_DATAENDIE | SDIO_MASK_RXOVERRIE | \ + SDIO_MASK_STBITERRIE) +#define SDIO_DMASEND_MASK (SDIO_MASK_DCRCFAILIE | SDIO_MASK_DTIMEOUTIE | \ + SDIO_MASK_DATAENDIE | SDIO_MASK_TXUNDERRIE | \ + SDIO_MASK_STBITERRIE) + +/* Event waiting interrupt mask bits */ + +#define SDIO_CMDDONE_STA (SDIO_STA_CMDSENT) +#define SDIO_RESPDONE_STA (SDIO_STA_CTIMEOUT | SDIO_STA_CCRCFAIL | \ + SDIO_STA_CMDREND) +#define SDIO_XFRDONE_STA (0) + +#define SDIO_CMDDONE_MASK (SDIO_MASK_CMDSENTIE) +#define SDIO_RESPDONE_MASK (SDIO_MASK_CCRCFAILIE | SDIO_MASK_CTIMEOUTIE | \ + SDIO_MASK_CMDRENDIE) +#define SDIO_XFRDONE_MASK (0) + +#define SDIO_CMDDONE_ICR (SDIO_ICR_CMDSENTC | SDIO_ICR_DBCKENDC) +#define SDIO_RESPDONE_ICR (SDIO_ICR_CTIMEOUTC | SDIO_ICR_CCRCFAILC | \ + SDIO_ICR_CMDRENDC | SDIO_ICR_DBCKENDC) +#define SDIO_XFRDONE_ICR (SDIO_ICR_DATAENDC | SDIO_ICR_DCRCFAILC | \ + SDIO_ICR_DTIMEOUTC | SDIO_ICR_RXOVERRC | \ + SDIO_ICR_TXUNDERRC | SDIO_ICR_STBITERRC | \ + SDIO_ICR_DBCKENDC) + +#define SDIO_WAITALL_ICR (SDIO_CMDDONE_ICR | SDIO_RESPDONE_ICR | \ + SDIO_XFRDONE_ICR | SDIO_ICR_DBCKENDC) + +/* Let's wait until we have both SDIO transfer complete and DMA complete. */ + +#define SDIO_XFRDONE_FLAG (1) +#define SDIO_DMADONE_FLAG (2) +#define SDIO_ALLDONE (3) + +/* Register logging support */ + +#ifdef CONFIG_SDIO_XFRDEBUG +# ifdef CONFIG_SDIO_DMA +# define SAMPLENDX_BEFORE_SETUP 0 +# define SAMPLENDX_BEFORE_ENABLE 1 +# define SAMPLENDX_AFTER_SETUP 2 +# define SAMPLENDX_END_TRANSFER 3 +# define SAMPLENDX_DMA_CALLBACK 4 +# define DEBUG_NSAMPLES 5 +# else +# define SAMPLENDX_BEFORE_SETUP 0 +# define SAMPLENDX_AFTER_SETUP 1 +# define SAMPLENDX_END_TRANSFER 2 +# define DEBUG_NSAMPLES 3 +# endif +#endif + +/**************************************************************************** + * Private Types + ****************************************************************************/ + +/* This structure defines the state of the STM32 SDIO interface */ + +struct stm32_dev_s +{ + struct sdio_dev_s dev; /* Standard, base SDIO interface */ + + /* STM32-specific extensions */ + /* Event support */ + + sem_t waitsem; /* Implements event waiting */ + sdio_eventset_t waitevents; /* Set of events to be waited for */ + uint32_t waitmask; /* Interrupt enables for event waiting */ + volatile sdio_eventset_t wkupevent; /* The event that caused the wakeup */ + WDOG_ID waitwdog; /* Watchdog that handles event timeouts */ + + /* Callback support */ + + uint8_t cdstatus; /* Card status */ + sdio_eventset_t cbevents; /* Set of events to be cause callbacks */ + worker_t callback; /* Registered callback function */ + void *cbarg; /* Registered callback argument */ + struct work_s cbwork; /* Callback work queue structure */ + + /* Interrupt mode data transfer support */ + + uint32_t *buffer; /* Address of current R/W buffer */ + size_t remaining; /* Number of bytes remaining in the transfer */ + uint32_t xfrmask; /* Interrupt enables for data transfer */ + + /* DMA data transfer support */ + + bool widebus; /* Required for DMA support */ +#ifdef CONFIG_SDIO_DMA + volatile uint8_t xfrflags; /* Used to synchronize SDIO and DMA completion events */ + bool dmamode; /* true: DMA mode transfer */ + DMA_HANDLE dma; /* Handle for DMA channel */ +#endif +}; + +/* Register logging support */ + +#ifdef CONFIG_SDIO_XFRDEBUG +struct stm32_sdioregs_s +{ + uint8_t power; + uint16_t clkcr; + uint16_t dctrl; + uint32_t dtimer; + uint32_t dlen; + uint32_t dcount; + uint32_t sta; + uint32_t mask; + uint32_t fifocnt; +}; + +struct stm32_sampleregs_s +{ + struct stm32_sdioregs_s sdio; +#if defined(CONFIG_DEBUG_DMA_INFO) && defined(CONFIG_SDIO_DMA) + struct stm32_dmaregs_s dma; +#endif +}; +#endif + +/**************************************************************************** + * Private Function Prototypes + ****************************************************************************/ + +/* Low-level helpers ********************************************************/ + +static void stm32_takesem(struct stm32_dev_s *priv); +#define stm32_givesem(priv) (sem_post(&priv->waitsem)) +static inline void stm32_setclkcr(uint32_t clkcr); +static void stm32_configwaitints(struct stm32_dev_s *priv, uint32_t waitmask, + sdio_eventset_t waitevents, sdio_eventset_t wkupevents); +static void stm32_configxfrints(struct stm32_dev_s *priv, uint32_t xfrmask); +static void stm32_setpwrctrl(uint32_t pwrctrl); +static inline uint32_t stm32_getpwrctrl(void); + +/* DMA Helpers **************************************************************/ + +#ifdef CONFIG_SDIO_XFRDEBUG +static void stm32_sampleinit(void); +static void stm32_sdiosample(struct stm32_sdioregs_s *regs); +static void stm32_sample(struct stm32_dev_s *priv, int index); +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); +static void stm32_dumpsamples(struct stm32_dev_s *priv); +#else +# define stm32_sampleinit() +# define stm32_sample(priv,index) +# define stm32_dumpsamples(priv) +#endif + +#ifdef CONFIG_SDIO_DMA +static void stm32_dmacallback(DMA_HANDLE handle, uint8_t status, void *arg); +#endif + +/* Data Transfer Helpers ****************************************************/ + +static uint8_t stm32_log2(uint16_t value); +static void stm32_dataconfig(uint32_t timeout, uint32_t dlen, uint32_t dctrl); +static void stm32_datadisable(void); +static void stm32_sendfifo(struct stm32_dev_s *priv); +static void stm32_recvfifo(struct stm32_dev_s *priv); +static void stm32_eventtimeout(int argc, uint32_t arg); +static void stm32_endwait(struct stm32_dev_s *priv, sdio_eventset_t wkupevent); +static void stm32_endtransfer(struct stm32_dev_s *priv, sdio_eventset_t wkupevent); + +/* Interrupt Handling *******************************************************/ + +static int stm32_interrupt(int irq, void *context); +#ifdef CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE +static int stm32_rdyinterrupt(int irq, void *context); +#endif + +/* SDIO interface methods ***************************************************/ + +/* Mutual exclusion */ + +#ifdef CONFIG_SDIO_MUXBUS +static int stm32_lock(FAR struct sdio_dev_s *dev, bool lock); +#endif + +/* Initialization/setup */ + +static void stm32_reset(FAR struct sdio_dev_s *dev); +static uint8_t stm32_status(FAR struct sdio_dev_s *dev); +static void stm32_widebus(FAR struct sdio_dev_s *dev, bool enable); +static void stm32_clock(FAR struct sdio_dev_s *dev, + enum sdio_clock_e rate); +static int stm32_attach(FAR struct sdio_dev_s *dev); + +/* Command/Status/Data Transfer */ + +static int stm32_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, + uint32_t arg); +static int stm32_recvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer, + size_t nbytes); +static int stm32_sendsetup(FAR struct sdio_dev_s *dev, + FAR const uint8_t *buffer, uint32_t nbytes); +static int stm32_cancel(FAR struct sdio_dev_s *dev); + +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); +static int stm32_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, + uint32_t rlong[4]); +static int stm32_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, + uint32_t *rshort); +static int stm32_recvnotimpl(FAR struct sdio_dev_s *dev, uint32_t cmd, + uint32_t *rnotimpl); + +/* EVENT handler */ + +static void stm32_waitenable(FAR struct sdio_dev_s *dev, + sdio_eventset_t eventset); +static sdio_eventset_t + stm32_eventwait(FAR struct sdio_dev_s *dev, uint32_t timeout); +static void stm32_callbackenable(FAR struct sdio_dev_s *dev, + sdio_eventset_t eventset); +static int stm32_registercallback(FAR struct sdio_dev_s *dev, + worker_t callback, void *arg); + +/* DMA */ + +#ifdef CONFIG_SDIO_DMA +static bool stm32_dmasupported(FAR struct sdio_dev_s *dev); +#ifdef CONFIG_SDIO_PREFLIGHT +static int stm32_dmapreflight(FAR struct sdio_dev_s *dev, + FAR const uint8_t *buffer, size_t buflen); +#endif +static int stm32_dmarecvsetup(FAR struct sdio_dev_s *dev, + FAR uint8_t *buffer, size_t buflen); +static int stm32_dmasendsetup(FAR struct sdio_dev_s *dev, + FAR const uint8_t *buffer, size_t buflen); +#endif + +/* Initialization/uninitialization/reset ************************************/ + +static void stm32_callback(void *arg); +static void stm32_default(void); + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +struct stm32_dev_s g_sdiodev = +{ + .dev = + { +#ifdef CONFIG_SDIO_MUXBUS + .lock = stm32_lock, +#endif + .reset = stm32_reset, + .status = stm32_status, + .widebus = stm32_widebus, + .clock = stm32_clock, + .attach = stm32_attach, + .sendcmd = stm32_sendcmd, +#ifdef CONFIG_SDIO_BLOCKSETUP + .blocksetup = stm32_blocksetup, /* Not implemented yet */ +#endif + .recvsetup = stm32_recvsetup, + .sendsetup = stm32_sendsetup, + .cancel = stm32_cancel, + .waitresponse = stm32_waitresponse, + .recvR1 = stm32_recvshortcrc, + .recvR2 = stm32_recvlong, + .recvR3 = stm32_recvshort, + .recvR4 = stm32_recvnotimpl, + .recvR5 = stm32_recvnotimpl, + .recvR6 = stm32_recvshortcrc, + .recvR7 = stm32_recvshort, + .waitenable = stm32_waitenable, + .eventwait = stm32_eventwait, + .callbackenable = stm32_callbackenable, + .registercallback = stm32_registercallback, +#ifdef CONFIG_SDIO_DMA + .dmasupported = stm32_dmasupported, +#ifdef CONFIG_SDIO_PREFLIGHT + .dmapreflight = stm32_dmapreflight, +#endif + .dmarecvsetup = stm32_dmarecvsetup, + .dmasendsetup = stm32_dmasendsetup, +#endif + }, +}; + +/* Register logging support */ + +#ifdef CONFIG_SDIO_XFRDEBUG +static struct stm32_sampleregs_s g_sampleregs[DEBUG_NSAMPLES]; +#endif + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Low-level Helpers + ****************************************************************************/ +/**************************************************************************** + * Name: stm32_takesem + * + * Description: + * Take the wait semaphore (handling false alarm wakeups due to the receipt + * of signals). + * + * Input Parameters: + * dev - Instance of the SDIO device driver state structure. + * + * Returned Value: + * None + * + ****************************************************************************/ + +static void stm32_takesem(struct stm32_dev_s *priv) +{ + /* Take the semaphore (perhaps waiting) */ + + while (sem_wait(&priv->waitsem) != 0) + { + /* The only case that an error should occr here is if the wait was + * awakened by a signal. + */ + + ASSERT(errno == EINTR); + } +} + +/**************************************************************************** + * Name: stm32_setclkcr + * + * Description: + * Modify oft-changed bits in the CLKCR register. Only the following bit- + * fields are changed: + * + * CLKDIV, PWRSAV, BYPASS, WIDBUS, NEGEDGE, and HWFC_EN + * + * Input Parameters: + * clkcr - A new CLKCR setting for the above mentions bits (other bits + * are ignored. + * + * Returned Value: + * None + * + ****************************************************************************/ + +static inline void stm32_setclkcr(uint32_t clkcr) +{ + uint32_t regval = getreg32(STM32_SDMMC1_CLKCR); + + /* Clear CLKDIV, PWRSAV, BYPASS, WIDBUS, NEGEDGE, HWFC_EN bits */ + + regval &= ~(SDIO_CLKCR_CLKDIV_MASK | SDIO_CLKCR_PWRSAV | SDIO_CLKCR_BYPASS | + SDIO_CLKCR_WIDBUS_MASK | SDIO_CLKCR_NEGEDGE | SDIO_CLKCR_HWFC_EN | + SDIO_CLKCR_CLKEN); + + /* Replace with user provided settings */ + + clkcr &= (SDIO_CLKCR_CLKDIV_MASK | SDIO_CLKCR_PWRSAV | SDIO_CLKCR_BYPASS | + SDIO_CLKCR_WIDBUS_MASK | SDIO_CLKCR_NEGEDGE | SDIO_CLKCR_HWFC_EN | + SDIO_CLKCR_CLKEN); + + regval |= clkcr; + putreg32(regval, STM32_SDMMC1_CLKCR); + + finfo("CLKCR: %08x PWR: %08x\n", + getreg32(STM32_SDMMC1_CLKCR), getreg32(STM32_SDMMC1_POWER)); +} + +/**************************************************************************** + * Name: stm32_configwaitints + * + * Description: + * Enable/disable SDIO interrupts needed to suport the wait function + * + * Input Parameters: + * priv - A reference to the SDIO device state structure + * waitmask - The set of bits in the SDIO MASK register to set + * waitevents - Waited for events + * wkupevent - Wake-up events + * + * Returned Value: + * None + * + ****************************************************************************/ + +static void stm32_configwaitints(struct stm32_dev_s *priv, uint32_t waitmask, + sdio_eventset_t waitevents, + sdio_eventset_t wkupevent) +{ + irqstate_t flags; +#ifdef CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE + int pinset; +#endif + + /* Save all of the data and set the new interrupt mask in one, atomic + * operation. + */ + flags = enter_critical_section(); + +#ifdef CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE + if ((waitmask & SDIOWAIT_WRCOMPLETE) != 0) + { + /* Do not use this in STM32_SDMMC1_MASK register */ + + waitmask &= !SDIOWAIT_WRCOMPLETE; + + pinset = GPIO_SDMMC1_D0 & (GPIO_PORT_MASK | GPIO_PIN_MASK); + pinset |= (GPIO_INPUT | GPIO_FLOAT | GPIO_EXTI); + + /* Arm the SDIO_D Ready and install Isr */ + + stm32_gpiosetevent(pinset, true, false, false, stm32_rdyinterrupt); + } + + /* Disarm SDIO_D ready */ + + if ((wkupevent & SDIOWAIT_WRCOMPLETE) != 0) + { + stm32_gpiosetevent(GPIO_SDMMC1_D0, false, false, false , NULL); + stm32_configgpio(GPIO_SDMMC1_D0); + } +#endif + + priv->waitevents = waitevents; + priv->wkupevent = wkupevent; + priv->waitmask = waitmask; +#ifdef CONFIG_SDIO_DMA + priv->xfrflags = 0; +#endif + putreg32(priv->xfrmask | priv->waitmask, STM32_SDMMC1_MASK); + leave_critical_section(flags); +} + +/**************************************************************************** + * Name: stm32_configxfrints + * + * Description: + * Enable SDIO interrupts needed to support the data transfer event + * + * Input Parameters: + * priv - A reference to the SDIO device state structure + * xfrmask - The set of bits in the SDIO MASK register to set + * + * Returned Value: + * None + * + ****************************************************************************/ + +static void stm32_configxfrints(struct stm32_dev_s *priv, uint32_t xfrmask) +{ + irqstate_t flags; + flags = enter_critical_section(); + priv->xfrmask = xfrmask; + putreg32(priv->xfrmask | priv->waitmask, STM32_SDMMC1_MASK); + leave_critical_section(flags); +} + +/**************************************************************************** + * Name: stm32_setpwrctrl + * + * Description: + * Change the PWRCTRL field of the SDIO POWER register to turn the SDIO + * ON or OFF + * + * Input Parameters: + * clkcr - A new PWRCTRL setting + * + * Returned Value: + * None + * + ****************************************************************************/ + +static void stm32_setpwrctrl(uint32_t pwrctrl) +{ + uint32_t regval; + + regval = getreg32(STM32_SDMMC1_POWER); + regval &= ~SDIO_POWER_PWRCTRL_MASK; + regval |= pwrctrl; + putreg32(regval, STM32_SDMMC1_POWER); +} + +/**************************************************************************** + * Name: stm32_getpwrctrl + * + * Description: + * Return the current value of the the PWRCTRL field of the SDIO POWER + * register. This function can be used to see if the SDIO is powered ON + * or OFF + * + * Input Parameters: + * None + * + * Returned Value: + * The current value of the the PWRCTRL field of the SDIO POWER register. + * + ****************************************************************************/ + +static inline uint32_t stm32_getpwrctrl(void) +{ + return getreg32(STM32_SDMMC1_POWER) & SDIO_POWER_PWRCTRL_MASK; +} + +/**************************************************************************** + * DMA Helpers + ****************************************************************************/ + +/**************************************************************************** + * Name: stm32_sampleinit + * + * Description: + * Setup prior to collecting DMA samples + * + ****************************************************************************/ + +#ifdef CONFIG_SDIO_XFRDEBUG +static void stm32_sampleinit(void) +{ + memset(g_sampleregs, 0xff, DEBUG_NSAMPLES * sizeof(struct stm32_sampleregs_s)); +} +#endif + +/**************************************************************************** + * Name: stm32_sdiosample + * + * Description: + * Sample SDIO registers + * + ****************************************************************************/ + +#ifdef CONFIG_SDIO_XFRDEBUG +static void stm32_sdiosample(struct stm32_sdioregs_s *regs) +{ + regs->power = (uint8_t)getreg32(STM32_SDMMC1_POWER); + regs->clkcr = (uint16_t)getreg32(STM32_SDMMC1_CLKCR); + regs->dctrl = (uint16_t)getreg32(STM32_SDMMC1_DCTRL); + regs->dtimer = getreg32(STM32_SDMMC1_DTIMER); + regs->dlen = getreg32(STM32_SDMMC1_DLEN); + regs->dcount = getreg32(STM32_SDMMC1_DCOUNT); + regs->sta = getreg32(STM32_SDMMC1_STA); + regs->mask = getreg32(STM32_SDMMC1_MASK); + regs->fifocnt = getreg32(STM32_SDMMC1_FIFOCNT); +} +#endif + +/**************************************************************************** + * Name: stm32_sample + * + * Description: + * Sample SDIO/DMA registers + * + ****************************************************************************/ + +#ifdef CONFIG_SDIO_XFRDEBUG +static void stm32_sample(struct stm32_dev_s *priv, int index) +{ + struct stm32_sampleregs_s *regs = &g_sampleregs[index]; + +#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 + +/**************************************************************************** + * Name: stm32_sdiodump + * + * Description: + * Dump one register sample + * + ****************************************************************************/ + +#ifdef CONFIG_SDIO_XFRDEBUG +static void stm32_sdiodump(struct stm32_sdioregs_s *regs, const char *msg) +{ + ferr("SDIO Registers: %s\n", msg); + ferr(" POWER[%08x]: %08x\n", STM32_SDMMC1_POWER, regs->power); + ferr(" CLKCR[%08x]: %08x\n", STM32_SDMMC1_CLKCR, regs->clkcr); + ferr(" DCTRL[%08x]: %08x\n", STM32_SDMMC1_DCTRL, regs->dctrl); + ferr(" DTIMER[%08x]: %08x\n", STM32_SDMMC1_DTIMER, regs->dtimer); + ferr(" DLEN[%08x]: %08x\n", STM32_SDMMC1_DLEN, regs->dlen); + ferr(" DCOUNT[%08x]: %08x\n", STM32_SDMMC1_DCOUNT, regs->dcount); + ferr(" STA[%08x]: %08x\n", STM32_SDMMC1_STA, regs->sta); + ferr(" MASK[%08x]: %08x\n", STM32_SDMMC1_MASK, regs->mask); + ferr("FIFOCNT[%08x]: %08x\n", STM32_SDMMC1_FIFOCNT, regs->fifocnt); +} +#endif + +/**************************************************************************** + * Name: stm32_dumpsample + * + * Description: + * Dump one register sample + * + ****************************************************************************/ + +#ifdef CONFIG_SDIO_XFRDEBUG +static void stm32_dumpsample(struct stm32_dev_s *priv, + struct stm32_sampleregs_s *regs, const char *msg) +{ +#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 + +/**************************************************************************** + * Name: stm32_dumpsamples + * + * Description: + * Dump all sampled register data + * + ****************************************************************************/ + +#ifdef CONFIG_SDIO_XFRDEBUG +static void stm32_dumpsamples(struct stm32_dev_s *priv) +{ + stm32_dumpsample(priv, &g_sampleregs[SAMPLENDX_BEFORE_SETUP], "Before setup"); + +#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_INFO) && defined(CONFIG_SDIO_DMA) + if (priv->dmamode) + { + stm32_dumpsample(priv, &g_sampleregs[SAMPLENDX_DMA_CALLBACK], "DMA Callback"); + } +#endif +} +#endif + +/**************************************************************************** + * Name: stm32_dmacallback + * + * Description: + * Called when SDIO DMA completes + * + ****************************************************************************/ + +#ifdef CONFIG_SDIO_DMA +static void stm32_dmacallback(DMA_HANDLE handle, uint8_t status, void *arg) +{ + FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)arg; + DEBUGASSERT(priv->dmamode); + sdio_eventset_t result; + + /* In the normal case, SDIO appears to handle the End-Of-Transfer interrupt + * first with the End-Of-DMA event occurring significantly later. On + * transfer errors, however, the DMA error will occur before the End-of- + * Transfer. + */ + + stm32_sample((struct stm32_dev_s *)arg, SAMPLENDX_DMA_CALLBACK); + + /* Get the result of the DMA transfer */ + + if ((status & DMA_STATUS_ERROR) != 0) + { + fllerr("DMA error %02x, remaining: %d\n", status, priv->remaining); + result = SDIOWAIT_ERROR; + } + else + { + result = SDIOWAIT_TRANSFERDONE; + } + + /* Then terminate the transfer if this completes all of the steps in the + * transfer OR if a DMA error occurred. In the non-error case, we should + * already have the SDIO transfer done interrupt. If not, the transfer + * will appropriately time out. + */ + + priv->xfrflags |= SDIO_DMADONE_FLAG; + if (priv->xfrflags == SDIO_ALLDONE || result == SDIOWAIT_ERROR) + { + stm32_endtransfer(priv, result); + } +} +#endif + +/**************************************************************************** + * Data Transfer Helpers + ****************************************************************************/ + +/**************************************************************************** + * Name: stm32_log2 + * + * Description: + * Take (approximate) log base 2 of the provided number (Only works if the + * provided number is a power of 2). + * + ****************************************************************************/ + +static uint8_t stm32_log2(uint16_t value) +{ + uint8_t log2 = 0; + + /* 0000 0000 0000 0001 -> return 0, + * 0000 0000 0000 001x -> return 1, + * 0000 0000 0000 01xx -> return 2, + * 0000 0000 0000 1xxx -> return 3, + * ... + * 1xxx xxxx xxxx xxxx -> return 15, + */ + + DEBUGASSERT(value > 0); + while (value != 1) + { + value >>= 1; + log2++; + } + + return log2; +} + +/**************************************************************************** + * Name: stm32_dataconfig + * + * Description: + * Configure the SDIO data path for the next data transfer + * + ****************************************************************************/ + +static void stm32_dataconfig(uint32_t timeout, uint32_t dlen, uint32_t dctrl) +{ + uint32_t regval = 0; + + /* Enable data path */ + + putreg32(timeout, STM32_SDMMC1_DTIMER); /* Set DTIMER */ + putreg32(dlen, STM32_SDMMC1_DLEN); /* Set DLEN */ + + /* Configure DCTRL DTDIR, DTMODE, and DBLOCKSIZE fields and set the DTEN + * field + */ + + regval = getreg32(STM32_SDMMC1_DCTRL); + regval &= ~(SDIO_DCTRL_DTDIR | SDIO_DCTRL_DTMODE | SDIO_DCTRL_DBLOCKSIZE_MASK); + dctrl &= (SDIO_DCTRL_DTDIR | SDIO_DCTRL_DTMODE | SDIO_DCTRL_DBLOCKSIZE_MASK); + regval |= (dctrl | SDIO_DCTRL_DTEN); + +#ifdef CONFIG_SDIO_DMA + regval |= SDIO_DCTRL_DMAEN; +#endif + + putreg32(regval, STM32_SDMMC1_DCTRL); +} + +/**************************************************************************** + * Name: stm32_datadisable + * + * Description: + * Disable the SDIO data path setup by stm32_dataconfig() and + * disable DMA. + * + ****************************************************************************/ + +static void stm32_datadisable(void) +{ + uint32_t regval; + + /* Disable the data path */ + + putreg32(SDIO_DTIMER_DATATIMEOUT, STM32_SDMMC1_DTIMER); /* Reset DTIMER */ + putreg32(0, STM32_SDMMC1_DLEN); /* Reset DLEN */ + + /* Reset DCTRL DTEN, DTDIR, DTMODE, DMAEN, and DBLOCKSIZE fields */ + + regval = getreg32(STM32_SDMMC1_DCTRL); + regval &= ~(SDIO_DCTRL_DTEN | SDIO_DCTRL_DTDIR | SDIO_DCTRL_DTMODE | + SDIO_DCTRL_DMAEN | SDIO_DCTRL_DBLOCKSIZE_MASK); + putreg32(regval, STM32_SDMMC1_DCTRL); +} + +/**************************************************************************** + * Name: stm32_sendfifo + * + * Description: + * Send SDIO data in interrupt mode + * + * Input Parameters: + * priv - An instance of the SDIO device interface + * + * Returned Value: + * None + * + ****************************************************************************/ + +static void stm32_sendfifo(struct stm32_dev_s *priv) +{ + union + { + uint32_t w; + uint8_t b[4]; + } data; + + /* Loop while there is more data to be sent and the RX FIFO is not full */ + + while (priv->remaining > 0 && + (getreg32(STM32_SDMMC1_STA) & SDIO_STA_TXFIFOF) == 0) + { + /* Is there a full word remaining in the user buffer? */ + + if (priv->remaining >= sizeof(uint32_t)) + { + /* Yes, transfer the word to the TX FIFO */ + + data.w = *priv->buffer++; + priv->remaining -= sizeof(uint32_t); + } + else + { + /* No.. transfer just the bytes remaining in the user buffer, + * padding with zero as necessary to extend to a full word. + */ + + uint8_t *ptr = (uint8_t *)priv->remaining; + int i; + + data.w = 0; + for (i = 0; i < (int)priv->remaining; i++) + { + data.b[i] = *ptr++; + } + + /* Now the transfer is finished */ + + priv->remaining = 0; + } + + /* Put the word in the FIFO */ + + putreg32(data.w, STM32_SDMMC1_FIFO); + } +} + +/**************************************************************************** + * Name: stm32_recvfifo + * + * Description: + * Receive SDIO data in interrupt mode + * + * Input Parameters: + * priv - An instance of the SDIO device interface + * + * Returned Value: + * None + * + ****************************************************************************/ + +static void stm32_recvfifo(struct stm32_dev_s *priv) +{ + union + { + uint32_t w; + uint8_t b[4]; + } data; + + /* Loop while there is space to store the data and there is more + * data available in the RX FIFO. + */ + + while (priv->remaining > 0 && + (getreg32(STM32_SDMMC1_STA) & SDIO_STA_RXDAVL) != 0) + { + /* Read the next word from the RX FIFO */ + + data.w = getreg32(STM32_SDMMC1_FIFO); + if (priv->remaining >= sizeof(uint32_t)) + { + /* Transfer the whole word to the user buffer */ + + *priv->buffer++ = data.w; + priv->remaining -= sizeof(uint32_t); + } + else + { + /* Transfer any trailing fractional word */ + + uint8_t *ptr = (uint8_t *)priv->buffer; + int i; + + for (i = 0; i < (int)priv->remaining; i++) + { + *ptr++ = data.b[i]; + } + + /* Now the transfer is finished */ + + priv->remaining = 0; + } + } +} + +/**************************************************************************** + * Name: stm32_eventtimeout + * + * Description: + * The watchdog timeout setup when the event wait start has expired without + * any other waited-for event occurring. + * + * Input Parameters: + * argc - The number of arguments (should be 1) + * arg - The argument (state structure reference cast to uint32_t) + * + * Returned Value: + * None + * + * Assumptions: + * Always called from the interrupt level with interrupts disabled. + * + ****************************************************************************/ + +static void stm32_eventtimeout(int argc, uint32_t arg) +{ + struct stm32_dev_s *priv = (struct stm32_dev_s *)arg; + + /* There is always race conditions with timer expirations. */ + + DEBUGASSERT((priv->waitevents & SDIOWAIT_TIMEOUT) != 0 || priv->wkupevent != 0); + + /* Is a data transfer complete event expected? */ + + if ((priv->waitevents & SDIOWAIT_TIMEOUT) != 0) + { + /* Yes.. wake up any waiting threads */ + + stm32_endwait(priv, SDIOWAIT_TIMEOUT); + fllerr("Timeout: remaining: %d\n", priv->remaining); + } +} + +/**************************************************************************** + * Name: stm32_endwait + * + * Description: + * Wake up a waiting thread if the waited-for event has occurred. + * + * Input Parameters: + * priv - An instance of the SDIO device interface + * wkupevent - The event that caused the wait to end + * + * Returned Value: + * None + * + * Assumptions: + * Always called from the interrupt level with interrupts disabled. + * + ****************************************************************************/ + +static void stm32_endwait(struct stm32_dev_s *priv, sdio_eventset_t wkupevent) +{ + /* Cancel the watchdog timeout */ + + (void)wd_cancel(priv->waitwdog); + + /* Disable event-related interrupts */ + + stm32_configwaitints(priv, 0, 0, wkupevent); + + /* Wake up the waiting thread */ + + stm32_givesem(priv); +} + +/**************************************************************************** + * Name: stm32_endtransfer + * + * Description: + * Terminate a transfer with the provided status. This function is called + * only from the SDIO interrupt handler when end-of-transfer conditions + * are detected. + * + * Input Parameters: + * priv - An instance of the SDIO device interface + * wkupevent - The event that caused the transfer to end + * + * Returned Value: + * None + * + * Assumptions: + * Always called from the interrupt level with interrupts disabled. + * + ****************************************************************************/ + +static void stm32_endtransfer(struct stm32_dev_s *priv, sdio_eventset_t wkupevent) +{ + /* Disable all transfer related interrupts */ + + stm32_configxfrints(priv, 0); + + /* Clearing pending interrupt status on all transfer related interrupts */ + + putreg32(SDIO_XFRDONE_ICR, STM32_SDMMC1_ICR); + + /* If this was a DMA transfer, make sure that DMA is stopped */ + +#ifdef CONFIG_SDIO_DMA + if (priv->dmamode) + { + /* DMA debug instrumentation */ + + stm32_sample(priv, SAMPLENDX_END_TRANSFER); + + /* Make sure that the DMA is stopped (it will be stopped automatically + * on normal transfers, but not necessarily when the transfer terminates + * on an error condition). + */ + + stm32_dmastop(priv->dma); + } +#endif + + /* Mark the transfer finished */ + + priv->remaining = 0; + + /* Is a thread wait for these data transfer complete events? */ + + if ((priv->waitevents & wkupevent) != 0) + { + /* Yes.. wake up any waiting threads */ + + stm32_endwait(priv, wkupevent); + } +} + +/**************************************************************************** + * Interrupt Handling + ****************************************************************************/ + +/**************************************************************************** + * Name: stm32_rdyinterrupt + * + * Description: + * SDIO ready interrupt handler + * + * Input Parameters: + * dev - An instance of the SDIO device interface + * + * Returned Value: + * None + * + ****************************************************************************/ + +#ifdef CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE +static int stm32_rdyinterrupt(int irq, void *context) +{ + struct stm32_dev_s *priv = &g_sdiodev; + stm32_endwait(priv, SDIOWAIT_WRCOMPLETE); + return OK; +} +#endif + +/**************************************************************************** + * Name: stm32_interrupt + * + * Description: + * SDIO interrupt handler + * + * Input Parameters: + * dev - An instance of the SDIO device interface + * + * Returned Value: + * None + * + ****************************************************************************/ + +static int stm32_interrupt(int irq, void *context) +{ + struct stm32_dev_s *priv = &g_sdiodev; + uint32_t enabled; + uint32_t pending; + + /* Loop while there are pending interrupts. Check the SDIO status + * register. Mask out all bits that don't correspond to enabled + * interrupts. (This depends on the fact that bits are ordered + * the same in both the STA and MASK register). If there are non-zero + * bits remaining, then we have work to do here. + */ + + while ((enabled = getreg32(STM32_SDMMC1_STA) & getreg32(STM32_SDMMC1_MASK)) != 0) + { + /* Handle in progress, interrupt driven data transfers ****************/ + + pending = enabled & priv->xfrmask; + if (pending != 0) + { +#ifdef CONFIG_SDIO_DMA + if (!priv->dmamode) +#endif + { + /* Is the RX FIFO half full or more? Is so then we must be + * processing a receive transaction. + */ + + if ((pending & SDIO_STA_RXFIFOHF) != 0) + { + /* Receive data from the RX FIFO */ + + stm32_recvfifo(priv); + } + + /* Otherwise, Is the transmit FIFO half empty or less? If so we must + * be processing a send transaction. NOTE: We can't be processing + * both! + */ + + else if ((pending & SDIO_STA_TXFIFOHE) != 0) + { + /* Send data via the TX FIFO */ + + stm32_sendfifo(priv); + } + } + + /* Handle data end events */ + + if ((pending & SDIO_STA_DATAEND) != 0) + { + /* Handle any data remaining the RX FIFO. If the RX FIFO is + * less than half full at the end of the transfer, then no + * half-full interrupt will be received. + */ + + /* Was this transfer performed in DMA mode? */ + +#ifdef CONFIG_SDIO_DMA + if (priv->dmamode) + { + /* Yes.. Terminate the transfers only if the DMA has also + * finished. + */ + + priv->xfrflags |= SDIO_XFRDONE_FLAG; + if (priv->xfrflags == SDIO_ALLDONE) + { + stm32_endtransfer(priv, SDIOWAIT_TRANSFERDONE); + } + + /* Otherwise, just disable futher transfer interrupts and + * wait for the DMA complete event. + */ + + else + { + stm32_configxfrints(priv, 0); + } + } + else +#endif + { + /* Receive data from the RX FIFO */ + + stm32_recvfifo(priv); + + /* Then terminate the transfer */ + + stm32_endtransfer(priv, SDIOWAIT_TRANSFERDONE); + } + } + + /* Handle data block send/receive CRC failure */ + + else if ((pending & SDIO_STA_DCRCFAIL) != 0) + { + /* Terminate the transfer with an error */ + + fllerr("ERROR: Data block CRC failure, remaining: %d\n", priv->remaining); + stm32_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR); + } + + /* Handle data timeout error */ + + else if ((pending & SDIO_STA_DTIMEOUT) != 0) + { + /* Terminate the transfer with an error */ + + fllerr("ERROR: Data timeout, remaining: %d\n", priv->remaining); + stm32_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_TIMEOUT); + } + + /* Handle RX FIFO overrun error */ + + else if ((pending & SDIO_STA_RXOVERR) != 0) + { + /* Terminate the transfer with an error */ + + fllerr("ERROR: RX FIFO overrun, remaining: %d\n", priv->remaining); + stm32_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR); + } + + /* Handle TX FIFO underrun error */ + + else if ((pending & SDIO_STA_TXUNDERR) != 0) + { + /* Terminate the transfer with an error */ + + fllerr("ERROR: TX FIFO underrun, remaining: %d\n", priv->remaining); + stm32_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR); + } + + /* Handle start bit error */ + + else if ((pending & SDIO_STA_STBITERR) != 0) + { + /* Terminate the transfer with an error */ + + fllerr("ERROR: Start bit, remaining: %d\n", priv->remaining); + stm32_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR); + } + } + + /* Handle wait events *************************************************/ + + pending = enabled & priv->waitmask; + if (pending != 0) + { + /* Is this a response completion event? */ + + if ((pending & SDIO_RESPDONE_STA) != 0) + { + /* Yes.. Is their a thread waiting for response done? */ + + if ((priv->waitevents & SDIOWAIT_RESPONSEDONE) != 0) + { + /* Yes.. wake the thread up */ + + putreg32(SDIO_RESPDONE_ICR | SDIO_CMDDONE_ICR, STM32_SDMMC1_ICR); + stm32_endwait(priv, SDIOWAIT_RESPONSEDONE); + } + } + + /* Is this a command completion event? */ + + if ((pending & SDIO_CMDDONE_STA) != 0) + { + /* Yes.. Is their a thread waiting for command done? */ + + if ((priv->waitevents & SDIOWAIT_RESPONSEDONE) != 0) + { + /* Yes.. wake the thread up */ + + putreg32(SDIO_CMDDONE_ICR, STM32_SDMMC1_ICR); + stm32_endwait(priv, SDIOWAIT_CMDDONE); + } + } + } + } + + return OK; +} + +/**************************************************************************** + * SDIO Interface Methods + ****************************************************************************/ + +/**************************************************************************** + * Name: stm32_lock + * + * Description: + * Locks the bus. Function calls low-level multiplexed bus routines to + * resolve bus requests and acknowledgment issues. + * + * Input Parameters: + * dev - An instance of the SDIO device interface + * lock - TRUE to lock, FALSE to unlock. + * + * Returned Value: + * OK on success; a negated errno on failure + * + ****************************************************************************/ + +#ifdef CONFIG_SDIO_MUXBUS +static int stm32_lock(FAR struct sdio_dev_s *dev, bool lock) +{ + /* Single SDIO instance so there is only one possibility. The multiplex + * bus is part of board support package. + */ + + stm32_muxbus_sdio_lock(lock); + return OK; +} +#endif + +/**************************************************************************** + * Name: stm32_reset + * + * Description: + * Reset the SDIO controller. Undo all setup and initialization. + * + * Input Parameters: + * dev - An instance of the SDIO device interface + * + * Returned Value: + * None + * + ****************************************************************************/ + +static void stm32_reset(FAR struct sdio_dev_s *dev) +{ + FAR struct stm32_dev_s *priv = (FAR struct stm32_dev_s *)dev; + irqstate_t flags; + + /* Disable clocking */ + + flags = enter_critical_section(); + stm32_setpwrctrl(SDIO_POWER_PWRCTRL_OFF); + + /* Put SDIO registers in their default, reset state */ + + stm32_default(); + + /* Reset data */ + + priv->waitevents = 0; /* Set of events to be waited for */ + priv->waitmask = 0; /* Interrupt enables for event waiting */ + priv->wkupevent = 0; /* The event that caused the wakeup */ +#ifdef CONFIG_SDIO_DMA + priv->xfrflags = 0; /* Used to synchronize SDIO and DMA completion events */ +#endif + + wd_cancel(priv->waitwdog); /* Cancel any timeouts */ + + /* Interrupt mode data transfer support */ + + priv->buffer = 0; /* Address of current R/W buffer */ + priv->remaining = 0; /* Number of bytes remaining in the transfer */ + priv->xfrmask = 0; /* Interrupt enables for data transfer */ + + /* DMA data transfer support */ + + priv->widebus = false; /* Required for DMA support */ +#ifdef CONFIG_SDIO_DMA + priv->dmamode = false; /* true: DMA mode transfer */ +#endif + + /* Configure the SDIO peripheral */ + + stm32_setclkcr(STM32_CLCKCR_INIT | SDIO_CLKCR_CLKEN); + stm32_setpwrctrl(SDIO_POWER_PWRCTRL_ON); + leave_critical_section(flags); + + finfo("CLCKR: %08x POWER: %08x\n", + getreg32(STM32_SDMMC1_CLKCR), getreg32(STM32_SDMMC1_POWER)); +} + +/**************************************************************************** + * Name: stm32_status + * + * Description: + * Get SDIO status. + * + * Input Parameters: + * dev - Device-specific state data + * + * Returned Value: + * Returns a bitset of status values (see stm32_status_* defines) + * + ****************************************************************************/ + +static uint8_t stm32_status(FAR struct sdio_dev_s *dev) +{ + struct stm32_dev_s *priv = (struct stm32_dev_s *)dev; + return priv->cdstatus; +} + +/**************************************************************************** + * Name: stm32_widebus + * + * Description: + * Called after change in Bus width has been selected (via ACMD6). Most + * controllers will need to perform some special operations to work + * correctly in the new bus mode. + * + * Input Parameters: + * dev - An instance of the SDIO device interface + * wide - true: wide bus (4-bit) bus mode enabled + * + * Returned Value: + * None + * + ****************************************************************************/ + +static void stm32_widebus(FAR struct sdio_dev_s *dev, bool wide) +{ + struct stm32_dev_s *priv = (struct stm32_dev_s *)dev; + priv->widebus = wide; +} + +/**************************************************************************** + * Name: stm32_clock + * + * Description: + * Enable/disable SDIO clocking + * + * Input Parameters: + * dev - An instance of the SDIO device interface + * rate - Specifies the clocking to use (see enum sdio_clock_e) + * + * Returned Value: + * None + * + ****************************************************************************/ + +static void stm32_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate) +{ + uint32_t clckr; + + switch (rate) + { + /* Disable clocking (with default ID mode divisor) */ + + default: + case CLOCK_SDIO_DISABLED: + clckr = STM32_CLCKCR_INIT; + return; + + /* Enable in initial ID mode clocking (<400KHz) */ + + case CLOCK_IDMODE: + clckr = (STM32_CLCKCR_INIT | SDIO_CLKCR_CLKEN); + break; + + /* Enable in MMC normal operation clocking */ + + case CLOCK_MMC_TRANSFER: + clckr = (SDIO_CLKCR_MMCXFR | SDIO_CLKCR_CLKEN); + break; + + /* SD normal operation clocking (wide 4-bit mode) */ + + case CLOCK_SD_TRANSFER_4BIT: +#ifndef CONFIG_SDIO_WIDTH_D1_ONLY + clckr = (SDIO_CLCKR_SDWIDEXFR | SDIO_CLKCR_CLKEN); + break; +#endif + + /* SD normal operation clocking (narrow 1-bit mode) */ + + case CLOCK_SD_TRANSFER_1BIT: + clckr = (SDIO_CLCKR_SDXFR | SDIO_CLKCR_CLKEN); + break; + } + + /* Set the new clock frequency along with the clock enable/disable bit */ + + stm32_setclkcr(clckr); +} + +/**************************************************************************** + * Name: stm32_attach + * + * Description: + * Attach and prepare interrupts + * + * Input Parameters: + * dev - An instance of the SDIO device interface + * + * Returned Value: + * OK on success; A negated errno on failure. + * + ****************************************************************************/ + +static int stm32_attach(FAR struct sdio_dev_s *dev) +{ + int ret; + + /* Attach the SDIO interrupt handler */ + + ret = irq_attach(STM32_IRQ_SDMMC1, stm32_interrupt); + if (ret == OK) + { + + /* Disable all interrupts at the SDIO controller and clear static + * interrupt flags + */ + + putreg32(SDIO_MASK_RESET, STM32_SDMMC1_MASK); + putreg32(SDIO_ICR_STATICFLAGS, STM32_SDMMC1_ICR); + + /* Enable SDIO interrupts at the NVIC. They can now be enabled at + * the SDIO controller as needed. + */ + + up_enable_irq(STM32_IRQ_SDMMC1); + +#ifdef CONFIG_ARCH_IRQPRIO + /* Set the interrupt priority */ + + up_prioritize_irq(STM32_IRQ_SDIO, CONFIG_SDIO_PRI); +#endif + } + + return ret; +} + +/**************************************************************************** + * Name: stm32_sendcmd + * + * Description: + * Send the SDIO command + * + * Input Parameters: + * dev - An instance of the SDIO device interface + * cmd - The command to send (32-bits, encoded) + * arg - 32-bit argument required with some commands + * + * Returned Value: + * None + * + ****************************************************************************/ + +static int stm32_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t arg) +{ + uint32_t regval; + uint32_t cmdidx; + + /* Set the SDIO Argument value */ + + putreg32(arg, STM32_SDMMC1_ARG); + + /* Clear CMDINDEX, WAITRESP, WAITINT, WAITPEND, and CPSMEN bits */ + + regval = getreg32(STM32_SDMMC1_CMD); + regval &= ~(SDIO_CMD_CMDINDEX_MASK | SDIO_CMD_WAITRESP_MASK | + SDIO_CMD_WAITINT | SDIO_CMD_WAITPEND | SDIO_CMD_CPSMEN); + + /* Set WAITRESP bits */ + + switch (cmd & MMCSD_RESPONSE_MASK) + { + case MMCSD_NO_RESPONSE: + regval |= SDIO_CMD_NORESPONSE; + break; + + case MMCSD_R1_RESPONSE: + case MMCSD_R1B_RESPONSE: + case MMCSD_R3_RESPONSE: + case MMCSD_R4_RESPONSE: + case MMCSD_R5_RESPONSE: + case MMCSD_R6_RESPONSE: + case MMCSD_R7_RESPONSE: + regval |= SDIO_CMD_SHORTRESPONSE; + break; + + case MMCSD_R2_RESPONSE: + regval |= SDIO_CMD_LONGRESPONSE; + break; + } + + /* Set CPSMEN and the command index */ + + cmdidx = (cmd & MMCSD_CMDIDX_MASK) >> MMCSD_CMDIDX_SHIFT; + regval |= cmdidx | SDIO_CMD_CPSMEN; + + finfo("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, regval); + + /* Write the SDIO CMD */ + + putreg32(SDIO_RESPDONE_ICR | SDIO_CMDDONE_ICR, STM32_SDMMC1_ICR); + putreg32(regval, STM32_SDMMC1_CMD); + return OK; +} + +/**************************************************************************** + * Name: stm32_recvsetup + * + * Description: + * Setup hardware in preparation for data transfer from the card in non-DMA + * (interrupt driven mode). This method will do whatever controller setup + * is necessary. This would be called for SD memory just BEFORE sending + * CMD13 (SEND_STATUS), CMD17 (READ_SINGLE_BLOCK), CMD18 + * (READ_MULTIPLE_BLOCKS), ACMD51 (SEND_SCR), etc. Normally, SDIO_WAITEVENT + * will be called to receive the indication that the transfer is complete. + * + * Input Parameters: + * dev - An instance of the SDIO device interface + * buffer - Address of the buffer in which to receive the data + * nbytes - The number of bytes in the transfer + * + * Returned Value: + * Number of bytes sent on success; a negated errno on failure + * + ****************************************************************************/ + +static int stm32_recvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer, + size_t nbytes) +{ + struct stm32_dev_s *priv = (struct stm32_dev_s *)dev; + uint32_t dblocksize; + + DEBUGASSERT(priv != NULL && buffer != NULL && nbytes > 0); + DEBUGASSERT(((uint32_t)buffer & 3) == 0); + + /* Reset the DPSM configuration */ + + stm32_datadisable(); + stm32_sampleinit(); + stm32_sample(priv, SAMPLENDX_BEFORE_SETUP); + + /* Save the destination buffer information for use by the interrupt handler */ + + priv->buffer = (uint32_t *)buffer; + priv->remaining = nbytes; +#ifdef CONFIG_SDIO_DMA + priv->dmamode = false; +#endif + + /* Then set up the SDIO data path */ + + dblocksize = stm32_log2(nbytes) << SDIO_DCTRL_DBLOCKSIZE_SHIFT; + stm32_dataconfig(SDIO_DTIMER_DATATIMEOUT, nbytes, dblocksize | SDIO_DCTRL_DTDIR); + + /* And enable interrupts */ + + stm32_configxfrints(priv, SDIO_RECV_MASK); + stm32_sample(priv, SAMPLENDX_AFTER_SETUP); + return OK; +} + +/**************************************************************************** + * Name: stm32_sendsetup + * + * Description: + * Setup hardware in preparation for data transfer from the card. This method + * will do whatever controller setup is necessary. This would be called + * for SD memory just AFTER sending CMD24 (WRITE_BLOCK), CMD25 + * (WRITE_MULTIPLE_BLOCK), ... and before SDIO_SENDDATA is called. + * + * Input Parameters: + * dev - An instance of the SDIO device interface + * buffer - Address of the buffer containing the data to send + * nbytes - The number of bytes in the transfer + * + * Returned Value: + * Number of bytes sent on success; a negated errno on failure + * + ****************************************************************************/ + +static int stm32_sendsetup(FAR struct sdio_dev_s *dev, FAR const uint8_t *buffer, + size_t nbytes) +{ + struct stm32_dev_s *priv = (struct stm32_dev_s *)dev; + uint32_t dblocksize; + + DEBUGASSERT(priv != NULL && buffer != NULL && nbytes > 0); + DEBUGASSERT(((uint32_t)buffer & 3) == 0); + + /* Reset the DPSM configuration */ + + stm32_datadisable(); + stm32_sampleinit(); + stm32_sample(priv, SAMPLENDX_BEFORE_SETUP); + + /* Save the source buffer information for use by the interrupt handler */ + + priv->buffer = (uint32_t *)buffer; + priv->remaining = nbytes; +#ifdef CONFIG_SDIO_DMA + priv->dmamode = false; +#endif + + /* Then set up the SDIO data path */ + + dblocksize = stm32_log2(nbytes) << SDIO_DCTRL_DBLOCKSIZE_SHIFT; + stm32_dataconfig(SDIO_DTIMER_DATATIMEOUT, nbytes, dblocksize); + + /* Enable TX interrupts */ + + stm32_configxfrints(priv, SDIO_SEND_MASK); + stm32_sample(priv, SAMPLENDX_AFTER_SETUP); + return OK; +} + +/**************************************************************************** + * Name: stm32_cancel + * + * Description: + * Cancel the data transfer setup of SDIO_RECVSETUP, SDIO_SENDSETUP, + * SDIO_DMARECVSETUP or SDIO_DMASENDSETUP. This must be called to cancel + * the data transfer setup if, for some reason, you cannot perform the + * transfer. + * + * Input Parameters: + * dev - An instance of the SDIO device interface + * + * Returned Value: + * OK is success; a negated errno on failure + * + ****************************************************************************/ + +static int stm32_cancel(FAR struct sdio_dev_s *dev) +{ + struct stm32_dev_s *priv = (struct stm32_dev_s *)dev; + + /* Disable all transfer- and event- related interrupts */ + + stm32_configxfrints(priv, 0); + stm32_configwaitints(priv, 0, 0, 0); + + /* Clearing pending interrupt status on all transfer- and event- related + * interrupts + */ + + putreg32(SDIO_WAITALL_ICR, STM32_SDMMC1_ICR); + + /* Cancel any watchdog timeout */ + + (void)wd_cancel(priv->waitwdog); + + /* If this was a DMA transfer, make sure that DMA is stopped */ + +#ifdef CONFIG_SDIO_DMA + if (priv->dmamode) + { + /* Make sure that the DMA is stopped (it will be stopped automatically + * on normal transfers, but not necessarily when the transfer terminates + * on an error condition. + */ + + stm32_dmastop(priv->dma); + } +#endif + + /* Mark no transfer in progress */ + + priv->remaining = 0; + return OK; +} + +/**************************************************************************** + * Name: stm32_waitresponse + * + * Description: + * Poll-wait for the response to the last command to be ready. + * + * Input Parameters: + * dev - An instance of the SDIO device interface + * cmd - The command that was sent. See 32-bit command definitions above. + * + * Returned Value: + * OK is success; a negated errno on failure + * + ****************************************************************************/ + +static int stm32_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd) +{ + int32_t timeout; + uint32_t events; + + switch (cmd & MMCSD_RESPONSE_MASK) + { + case MMCSD_NO_RESPONSE: + events = SDIO_CMDDONE_STA; + timeout = SDIO_CMDTIMEOUT; + break; + + case MMCSD_R1_RESPONSE: + case MMCSD_R1B_RESPONSE: + case MMCSD_R2_RESPONSE: + case MMCSD_R6_RESPONSE: + events = SDIO_RESPDONE_STA; + timeout = SDIO_LONGTIMEOUT; + break; + + case MMCSD_R4_RESPONSE: + case MMCSD_R5_RESPONSE: + return -ENOSYS; + + case MMCSD_R3_RESPONSE: + case MMCSD_R7_RESPONSE: + events = SDIO_RESPDONE_STA; + timeout = SDIO_CMDTIMEOUT; + break; + + default: + return -EINVAL; + } + + /* Then wait for the response (or timeout) */ + + while ((getreg32(STM32_SDMMC1_STA) & events) == 0) + { + if (--timeout <= 0) + { + ferr("ERROR: Timeout cmd: %08x events: %08x STA: %08x\n", + cmd, events, getreg32(STM32_SDMMC1_STA)); + + return -ETIMEDOUT; + } + } + + putreg32(SDIO_CMDDONE_ICR, STM32_SDMMC1_ICR); + return OK; +} + +/**************************************************************************** + * Name: stm32_recvRx + * + * Description: + * Receive response to SDIO command. Only the critical payload is + * returned -- that is 32 bits for 48 bit status and 128 bits for 136 bit + * status. The driver implementation should verify the correctness of + * the remaining, non-returned bits (CRCs, CMD index, etc.). + * + * Input Parameters: + * dev - An instance of the SDIO device interface + * Rx - Buffer in which to receive the response + * + * Returned Value: + * Number of bytes sent on success; a negated errno on failure. Here a + * failure means only a faiure to obtain the requested reponse (due to + * transport problem -- timeout, CRC, etc.). The implementation only + * assures that the response is returned intacta and does not check errors + * within the response itself. + * + ****************************************************************************/ + +static int stm32_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort) +{ +#ifdef CONFIG_DEBUG_FEATURES + uint32_t respcmd; +#endif + uint32_t regval; + int ret = OK; + + /* R1 Command response (48-bit) + * 47 0 Start bit + * 46 0 Transmission bit (0=from card) + * 45:40 bit5 - bit0 Command index (0-63) + * 39:8 bit31 - bit0 32-bit card status + * 7:1 bit6 - bit0 CRC7 + * 0 1 End bit + * + * R1b Identical to R1 with the additional busy signaling via the data + * line. + * + * R6 Published RCA Response (48-bit, SD card only) + * 47 0 Start bit + * 46 0 Transmission bit (0=from card) + * 45:40 bit5 - bit0 Command index (0-63) + * 39:8 bit31 - bit0 32-bit Argument Field, consisting of: + * [31:16] New published RCA of card + * [15:0] Card status bits {23,22,19,12:0} + * 7:1 bit6 - bit0 CRC7 + * 0 1 End bit + */ + + +#ifdef CONFIG_DEBUG_FEATURES + if (!rshort) + { + ferr("ERROR: rshort=NULL\n"); + ret = -EINVAL; + } + + /* Check that this is the correct response to this command */ + + else if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R1_RESPONSE && + (cmd & MMCSD_RESPONSE_MASK) != MMCSD_R1B_RESPONSE && + (cmd & MMCSD_RESPONSE_MASK) != MMCSD_R6_RESPONSE) + { + ferr("ERROR: Wrong response CMD=%08x\n", cmd); + ret = -EINVAL; + } + else +#endif + { + /* Check if a timeout or CRC error occurred */ + + regval = getreg32(STM32_SDMMC1_STA); + if ((regval & SDIO_STA_CTIMEOUT) != 0) + { + ferr("ERROR: Command timeout: %08x\n", regval); + ret = -ETIMEDOUT; + } + else if ((regval & SDIO_STA_CCRCFAIL) != 0) + { + ferr("ERROR: CRC failure: %08x\n", regval); + ret = -EIO; + } +#ifdef CONFIG_DEBUG_FEATURES + else + { + /* Check response received is of desired command */ + + respcmd = getreg32(STM32_SDMMC1_RESPCMD); + if ((uint8_t)(respcmd & SDIO_RESPCMD_MASK) != (cmd & MMCSD_CMDIDX_MASK)) + { + ferr("ERROR: RESCMD=%02x CMD=%08x\n", respcmd, cmd); + ret = -EINVAL; + } + } +#endif + } + + /* Clear all pending message completion events and return the R1/R6 response */ + + putreg32(SDIO_RESPDONE_ICR | SDIO_CMDDONE_ICR, STM32_SDMMC1_ICR); + *rshort = getreg32(STM32_SDMMC1_RESP1); + return ret; +} + +static int stm32_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlong[4]) +{ + uint32_t regval; + int ret = OK; + + /* R2 CID, CSD register (136-bit) + * 135 0 Start bit + * 134 0 Transmission bit (0=from card) + * 133:128 bit5 - bit0 Reserved + * 127:1 bit127 - bit1 127-bit CID or CSD register + * (including internal CRC) + * 0 1 End bit + */ + +#ifdef CONFIG_DEBUG_FEATURES + /* Check that R1 is the correct response to this command */ + + if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R2_RESPONSE) + { + ferr("ERROR: Wrong response CMD=%08x\n", cmd); + ret = -EINVAL; + } + else +#endif + { + /* Check if a timeout or CRC error occurred */ + + regval = getreg32(STM32_SDMMC1_STA); + if (regval & SDIO_STA_CTIMEOUT) + { + ferr("ERROR: Timeout STA: %08x\n", regval); + ret = -ETIMEDOUT; + } + else if (regval & SDIO_STA_CCRCFAIL) + { + ferr("ERROR: CRC fail STA: %08x\n", regval); + ret = -EIO; + } + } + + /* Return the long response */ + + putreg32(SDIO_RESPDONE_ICR | SDIO_CMDDONE_ICR, STM32_SDMMC1_ICR); + if (rlong) + { + rlong[0] = getreg32(STM32_SDMMC1_RESP1); + rlong[1] = getreg32(STM32_SDMMC1_RESP2); + rlong[2] = getreg32(STM32_SDMMC1_RESP3); + rlong[3] = getreg32(STM32_SDMMC1_RESP4); + } + return ret; +} + +static int stm32_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort) +{ + uint32_t regval; + int ret = OK; + + /* R3 OCR (48-bit) + * 47 0 Start bit + * 46 0 Transmission bit (0=from card) + * 45:40 bit5 - bit0 Reserved + * 39:8 bit31 - bit0 32-bit OCR register + * 7:1 bit6 - bit0 Reserved + * 0 1 End bit + */ + + /* Check that this is the correct response to this command */ + +#ifdef CONFIG_DEBUG_FEATURES + if ((cmd & MMCSD_RESPONSE_MASK) != MMCSD_R3_RESPONSE && + (cmd & MMCSD_RESPONSE_MASK) != MMCSD_R7_RESPONSE) + { + ferr("ERROR: Wrong response CMD=%08x\n", cmd); + ret = -EINVAL; + } + else +#endif + { + /* Check if a timeout occurred (Apparently a CRC error can terminate + * a good response) + */ + + regval = getreg32(STM32_SDMMC1_STA); + if (regval & SDIO_STA_CTIMEOUT) + { + ferr("ERROR: Timeout STA: %08x\n", regval); + ret = -ETIMEDOUT; + } + } + + putreg32(SDIO_RESPDONE_ICR | SDIO_CMDDONE_ICR, STM32_SDMMC1_ICR); + if (rshort) + { + *rshort = getreg32(STM32_SDMMC1_RESP1); + } + return ret; +} + +/* MMC responses not supported */ + +static int stm32_recvnotimpl(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rnotimpl) +{ + putreg32(SDIO_RESPDONE_ICR | SDIO_CMDDONE_ICR, STM32_SDMMC1_ICR); + return -ENOSYS; +} + +/**************************************************************************** + * Name: stm32_waitenable + * + * Description: + * Enable/disable of a set of SDIO wait events. This is part of the + * the SDIO_WAITEVENT sequence. The set of to-be-waited-for events is + * configured before calling stm32_eventwait. This is done in this way + * to help the driver to eliminate race conditions between the command + * setup and the subsequent events. + * + * The enabled events persist until either (1) SDIO_WAITENABLE is called + * again specifying a different set of wait events, or (2) SDIO_EVENTWAIT + * returns. + * + * Input Parameters: + * dev - An instance of the SDIO device interface + * eventset - A bitset of events to enable or disable (see SDIOWAIT_* + * definitions). 0=disable; 1=enable. + * + * Returned Value: + * None + * + ****************************************************************************/ + +static void stm32_waitenable(FAR struct sdio_dev_s *dev, + sdio_eventset_t eventset) +{ + struct stm32_dev_s *priv = (struct stm32_dev_s *)dev; + uint32_t waitmask; + + DEBUGASSERT(priv != NULL); + + /* Disable event-related interrupts */ + + stm32_configwaitints(priv, 0, 0, 0); + + /* Select the interrupt mask that will give us the appropriate wakeup + * interrupts. + */ + +#if defined(CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE) + if ((eventset & SDIOWAIT_WRCOMPLETE) != 0) + { + waitmask = SDIOWAIT_WRCOMPLETE; + } + else +#endif + { + waitmask = 0; + if ((eventset & SDIOWAIT_CMDDONE) != 0) + { + waitmask |= SDIO_CMDDONE_MASK; + } + + if ((eventset & SDIOWAIT_RESPONSEDONE) != 0) + { + waitmask |= SDIO_RESPDONE_MASK; + } + + if ((eventset & SDIOWAIT_TRANSFERDONE) != 0) + { + waitmask |= SDIO_XFRDONE_MASK; + } + + /* Enable event-related interrupts */ + + putreg32(SDIO_WAITALL_ICR, STM32_SDMMC1_ICR); + } + + stm32_configwaitints(priv, waitmask, eventset, 0); +} + +/**************************************************************************** + * Name: stm32_eventwait + * + * Description: + * Wait for one of the enabled events to occur (or a timeout). Note that + * all events enabled by SDIO_WAITEVENTS are disabled when stm32_eventwait + * returns. SDIO_WAITEVENTS must be called again before stm32_eventwait + * can be used again. + * + * Input Parameters: + * dev - An instance of the SDIO device interface + * timeout - Maximum time in milliseconds to wait. Zero means immediate + * timeout with no wait. The timeout value is ignored if + * SDIOWAIT_TIMEOUT is not included in the waited-for eventset. + * + * Returned Value: + * Event set containing the event(s) that ended the wait. Should always + * be non-zero. All events are disabled after the wait concludes. + * + ****************************************************************************/ + +static sdio_eventset_t stm32_eventwait(FAR struct sdio_dev_s *dev, + uint32_t timeout) +{ + struct stm32_dev_s *priv = (struct stm32_dev_s *)dev; + sdio_eventset_t wkupevent = 0; + irqstate_t flags; + int ret; + + /* There is a race condition here... the event may have completed before + * we get here. In this case waitevents will be zero, but wkupevents will + * be non-zero (and, hopefully, the semaphore count will also be non-zero. + */ + + flags = enter_critical_section(); + DEBUGASSERT(priv->waitevents != 0 || priv->wkupevent != 0); + + /* Check if the timeout event is specified in the event set */ + + if ((priv->waitevents & SDIOWAIT_TIMEOUT) != 0) + { + int delay; + + /* Yes.. Handle a cornercase: The user request a timeout event but + * with timeout == 0? + */ + + if (!timeout) + { + /* Then just tell the caller that we already timed out */ + + wkupevent = SDIOWAIT_TIMEOUT; + goto errout; + } + + /* Start the watchdog timer */ + + delay = MSEC2TICK(timeout); + ret = wd_start(priv->waitwdog, delay, (wdentry_t)stm32_eventtimeout, + 1, (uint32_t)priv); + if (ret != OK) + { + ferr("ERROR: wd_start failed: %d\n", ret); + } + } + +#if defined(CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE) + if ((priv->waitevents & SDIOWAIT_WRCOMPLETE) != 0) + { + /* Atomically read pin to see if ready (true) and determine if ISR fired + * If Pin is ready and if ISR did NOT fire end the wait here + */ + + if (stm32_gpioread(GPIO_SDMMC1_D0) && + (priv->wkupevent & SDIOWAIT_WRCOMPLETE) == 0) + { + stm32_endwait(priv, SDIOWAIT_WRCOMPLETE); + } + } +#endif + + /* Loop until the event (or the timeout occurs). Race conditions are avoided + * by calling stm32_waitenable prior to triggering the logic that will cause + * the wait to terminate. Under certain race conditions, the waited-for + * may have already occurred before this function was called! + */ + + for (; ; ) + { + /* Wait for an event in event set to occur. If this the event has already + * occurred, then the semaphore will already have been incremented and + * there will be no wait. + */ + + stm32_takesem(priv); + wkupevent = priv->wkupevent; + + /* Check if the event has occurred. When the event has occurred, then + * evenset will be set to 0 and wkupevent will be set to a nonzero value. + */ + + if (wkupevent != 0) + { + /* Yes... break out of the loop with wkupevent non-zero */ + + break; + } + } + + /* Disable event-related interrupts */ + + stm32_configwaitints(priv, 0, 0, 0); +#ifdef CONFIG_SDIO_DMA + priv->xfrflags = 0; +#endif + +errout: + leave_critical_section(flags); + stm32_dumpsamples(priv); + return wkupevent; +} + +/**************************************************************************** + * Name: stm32_callbackenable + * + * Description: + * Enable/disable of a set of SDIO callback events. This is part of the + * the SDIO callback sequence. The set of events is configured to enabled + * callbacks to the function provided in stm32_registercallback. + * + * Events are automatically disabled once the callback is performed and no + * further callback events will occur until they are again enabled by + * calling this methos. + * + * Input Parameters: + * dev - An instance of the SDIO device interface + * eventset - A bitset of events to enable or disable (see SDIOMEDIA_* + * definitions). 0=disable; 1=enable. + * + * Returned Value: + * None + * + ****************************************************************************/ + +static void stm32_callbackenable(FAR struct sdio_dev_s *dev, + sdio_eventset_t eventset) +{ + struct stm32_dev_s *priv = (struct stm32_dev_s *)dev; + + finfo("eventset: %02x\n", eventset); + DEBUGASSERT(priv != NULL); + + priv->cbevents = eventset; + stm32_callback(priv); +} + +/**************************************************************************** + * Name: stm32_registercallback + * + * Description: + * Register a callback that that will be invoked on any media status + * change. Callbacks should not be made from interrupt handlers, rather + * interrupt level events should be handled by calling back on the work + * thread. + * + * When this method is called, all callbacks should be disabled until they + * are enabled via a call to SDIO_CALLBACKENABLE + * + * Input Parameters: + * dev - Device-specific state data + * callback - The funtion to call on the media change + * arg - A caller provided value to return with the callback + * + * Returned Value: + * 0 on success; negated errno on failure. + * + ****************************************************************************/ + +static int stm32_registercallback(FAR struct sdio_dev_s *dev, + worker_t callback, void *arg) +{ + struct stm32_dev_s *priv = (struct stm32_dev_s *)dev; + + /* Disable callbacks and register this callback and is argument */ + + finfo("Register %p(%p)\n", callback, arg); + DEBUGASSERT(priv != NULL); + + priv->cbevents = 0; + priv->cbarg = arg; + priv->callback = callback; + return OK; +} + +/**************************************************************************** + * Name: stm32_dmasupported + * + * Description: + * Return true if the hardware can support DMA + * + * Input Parameters: + * dev - An instance of the SDIO device interface + * + * Returned Value: + * true if DMA is supported. + * + ****************************************************************************/ + +#ifdef CONFIG_SDIO_DMA +static bool stm32_dmasupported(FAR struct sdio_dev_s *dev) +{ + return true; +} +#endif + +/**************************************************************************** + * Name: stm32_dmapreflight + * + * Description: + * Preflight an SDIO DMA operation. If the buffer is not well-formed for + * SDIO DMA transfer (alignment, size, etc.) returns an error. + * + * Input Parameters: + * dev - An instance of the SDIO device interface + * buffer - The memory to DMA to/from + * buflen - The size of the DMA transfer in bytes + * + * Returned Value: + * OK on success; a negated errno on failure + ****************************************************************************/ + +#if defined(CONFIG_SDIO_DMA) && defined(CONFIG_SDIO_PREFLIGHT) +static int stm32_dmapreflight(FAR struct sdio_dev_s *dev, + FAR const uint8_t *buffer, size_t buflen) +{ + struct stm32_dev_s *priv = (struct stm32_dev_s *)dev; + + DEBUGASSERT(priv != NULL && buffer != NULL && buflen > 0); + + /* Wide bus operation is required for DMA */ + + if (!priv->widebus) + { + return -EINVAL; + } + + /* DMA must be possible to the buffer */ + + if (!stm32_dmacapable((uintptr_t)buffer, (buflen + 3) >> 2, SDIO_RXDMA32_CONFIG)) + { + return -EFAULT; + } + + return 0; +} +#endif + +/**************************************************************************** + * Name: stm32_dmarecvsetup + * + * Description: + * Setup to perform a read DMA. If the processor supports a data cache, + * then this method will also make sure that the contents of the DMA memory + * and the data cache are coherent. For read transfers this may mean + * invalidating the data cache. + * + * Input Parameters: + * dev - An instance of the SDIO device interface + * buffer - The memory to DMA from + * buflen - The size of the DMA transfer in bytes + * + * Returned Value: + * OK on success; a negated errno on failure + * + ****************************************************************************/ + +#ifdef CONFIG_SDIO_DMA +static int stm32_dmarecvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer, + size_t buflen) +{ + struct stm32_dev_s *priv = (struct stm32_dev_s *)dev; + uint32_t dblocksize; + + DEBUGASSERT(priv != NULL && buffer != NULL && buflen > 0); +#ifdef CONFIG_SDIO_PREFLIGHT + DEBUGASSERT(stm32_dmapreflight(dev, buffer, buflen) == 0); +#endif + +#ifdef CONFIG_ARMV7M_DCACHE + /* buffer alignment is required for DMA transfers with dcache */ + + if (((uintptr_t)buffer & (ARMV7M_DCACHE_LINESIZE-1)) != 0 || (buflen & (ARMV7M_DCACHE_LINESIZE-1)) != 0) + { + return -EFAULT; + } +#endif + + /* Reset the DPSM configuration */ + + stm32_datadisable(); + + /* Initialize register sampling */ + + stm32_sampleinit(); + stm32_sample(priv, SAMPLENDX_BEFORE_SETUP); + + /* Save the destination buffer information for use by the interrupt handler */ + + priv->buffer = (uint32_t *)buffer; + priv->remaining = buflen; + priv->dmamode = true; + + /* Then set up the SDIO data path */ + + dblocksize = stm32_log2(buflen) << SDIO_DCTRL_DBLOCKSIZE_SHIFT; + stm32_dataconfig(SDIO_DTIMER_DATATIMEOUT, buflen, dblocksize | SDIO_DCTRL_DTDIR); + + /* Configure the RX DMA */ + + stm32_configxfrints(priv, SDIO_DMARECV_MASK); + + stm32_dmasetup(priv->dma, STM32_SDMMC1_FIFO, (uint32_t)buffer, + (buflen + 3) >> 2, SDIO_RXDMA32_CONFIG); + + /* Force RAM reread */ + + arch_invalidate_dcache((uintptr_t)buffer,(uintptr_t)buffer + buflen); + + /* Start the DMA */ + + stm32_sample(priv, SAMPLENDX_BEFORE_ENABLE); + stm32_dmastart(priv->dma, stm32_dmacallback, priv, false); + stm32_sample(priv, SAMPLENDX_AFTER_SETUP); + + return OK; +} +#endif + +/**************************************************************************** + * Name: stm32_dmasendsetup + * + * Description: + * Setup to perform a write DMA. If the processor supports a data cache, + * then this method will also make sure that the contents of the DMA memory + * and the data cache are coherent. For write transfers, this may mean + * flushing the data cache. + * + * Input Parameters: + * dev - An instance of the SDIO device interface + * buffer - The memory to DMA into + * buflen - The size of the DMA transfer in bytes + * + * Returned Value: + * OK on success; a negated errno on failure + * + ****************************************************************************/ + +#ifdef CONFIG_SDIO_DMA +static int stm32_dmasendsetup(FAR struct sdio_dev_s *dev, + FAR const uint8_t *buffer, size_t buflen) +{ + struct stm32_dev_s *priv = (struct stm32_dev_s *)dev; + uint32_t dblocksize; + + DEBUGASSERT(priv != NULL && buffer != NULL && buflen > 0); +#ifdef CONFIG_SDIO_PREFLIGHT + DEBUGASSERT(stm32_dmapreflight(dev, buffer, buflen) == 0); +#endif + +#ifdef CONFIG_ARMV7M_DCACHE + /* buffer alignment is required for DMA transfers with dcache */ + + if (((uintptr_t)buffer & (ARMV7M_DCACHE_LINESIZE-1)) != 0 || (buflen & (ARMV7M_DCACHE_LINESIZE-1)) != 0) + { + return -EFAULT; + } +#endif + + /* Reset the DPSM configuration */ + + stm32_datadisable(); + + /* Initialize register sampling */ + + stm32_sampleinit(); + stm32_sample(priv, SAMPLENDX_BEFORE_SETUP); + + /* Flush cache to physical memory */ + + arch_flush_dcache((uintptr_t)buffer, (uintptr_t)buffer + buflen); + + /* Save the source buffer information for use by the interrupt handler */ + + priv->buffer = (uint32_t *)buffer; + priv->remaining = buflen; + priv->dmamode = true; + + /* Then set up the SDIO data path */ + + dblocksize = stm32_log2(buflen) << SDIO_DCTRL_DBLOCKSIZE_SHIFT; + stm32_dataconfig(SDIO_DTIMER_DATATIMEOUT, buflen, dblocksize); + + /* Configure the TX DMA */ + + stm32_dmasetup(priv->dma, STM32_SDMMC1_FIFO, (uint32_t)buffer, + (buflen + 3) >> 2, SDIO_TXDMA32_CONFIG); + + stm32_sample(priv, SAMPLENDX_BEFORE_ENABLE); + + /* Start the DMA */ + + stm32_dmastart(priv->dma, stm32_dmacallback, priv, false); + stm32_sample(priv, SAMPLENDX_AFTER_SETUP); + + /* Enable TX interrupts */ + + stm32_configxfrints(priv, SDIO_DMASEND_MASK); + + return OK; +} +#endif + +/**************************************************************************** + * Initialization/uninitialization/reset + ****************************************************************************/ +/**************************************************************************** + * Name: stm32_callback + * + * Description: + * Perform callback. + * + * Assumptions: + * This function does not execute in the context of an interrupt handler. + * It may be invoked on any user thread or scheduled on the work thread + * from an interrupt handler. + * + ****************************************************************************/ + +static void stm32_callback(void *arg) +{ + struct stm32_dev_s *priv = (struct stm32_dev_s *)arg; + + /* Is a callback registered? */ + + DEBUGASSERT(priv != NULL); + finfo("Callback %p(%p) cbevents: %02x cdstatus: %02x\n", + priv->callback, priv->cbarg, priv->cbevents, priv->cdstatus); + + if (priv->callback) + { + /* Yes.. Check for enabled callback events */ + + if ((priv->cdstatus & SDIO_STATUS_PRESENT) != 0) + { + /* Media is present. Is the media inserted event enabled? */ + + if ((priv->cbevents & SDIOMEDIA_INSERTED) == 0) + { + /* No... return without performing the callback */ + + return; + } + } + else + { + /* Media is not present. Is the media eject event enabled? */ + + if ((priv->cbevents & SDIOMEDIA_EJECTED) == 0) + { + /* No... return without performing the callback */ + + return; + } + } + + /* Perform the callback, disabling further callbacks. Of course, the + * the callback can (and probably should) re-enable callbacks. + */ + + priv->cbevents = 0; + + /* Callbacks cannot be performed in the context of an interrupt handler. + * If we are in an interrupt handler, then queue the callback to be + * performed later on the work thread. + */ + + if (up_interrupt_context()) + { + /* Yes.. queue it */ + + 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 */ + + finfo("Callback to %p(%p)\n", priv->callback, priv->cbarg); + priv->callback(priv->cbarg); + } + } +} + +/**************************************************************************** + * Name: stm32_default + * + * Description: + * Restore SDIO registers to their default, reset values + * + ****************************************************************************/ + +static void stm32_default(void) +{ + putreg32(SDIO_POWER_RESET, STM32_SDMMC1_POWER); + putreg32(SDIO_CLKCR_RESET, STM32_SDMMC1_CLKCR); + putreg32(SDIO_ARG_RESET, STM32_SDMMC1_ARG); + putreg32(SDIO_CMD_RESET, STM32_SDMMC1_CMD); + putreg32(SDIO_DTIMER_RESET, STM32_SDMMC1_DTIMER); + putreg32(SDIO_DLEN_RESET, STM32_SDMMC1_DLEN); + putreg32(SDIO_DCTRL_RESET, STM32_SDMMC1_DCTRL); + putreg32(SDIO_ICR_RESET, STM32_SDMMC1_ICR); + putreg32(SDIO_MASK_RESET, STM32_SDMMC1_MASK); +} + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: sdio_initialize + * + * Description: + * Initialize SDIO for operation. + * + * Input Parameters: + * slotno - Not used. + * + * Returned Values: + * A reference to an SDIO interface structure. NULL is returned on failures. + * + ****************************************************************************/ + +FAR struct sdio_dev_s *sdio_initialize(int slotno) +{ + /* There is only one slot */ + + struct stm32_dev_s *priv = &g_sdiodev; + + /* Initialize the SDIO slot structure */ + + sem_init(&priv->waitsem, 0, 0); + priv->waitwdog = wd_create(); + DEBUGASSERT(priv->waitwdog); + + /* Allocate a DMA channel */ + +#ifdef CONFIG_SDIO_DMA + priv->dma = stm32_dmachannel(SDIO_DMACHAN); + DEBUGASSERT(priv->dma); +#endif + + /* Configure GPIOs for 4-bit, wide-bus operation (the chip is capable of + * 8-bit wide bus operation but D4-D7 are not configured). + * + * If bus is multiplexed then there is a custom bus configuration utility + * in the scope of the board support package. + */ + +#ifndef CONFIG_SDIO_MUXBUS + stm32_configgpio(GPIO_SDMMC1_D0); +#ifndef CONFIG_SDIO_WIDTH_D1_ONLY + stm32_configgpio(GPIO_SDMMC1_D1); + stm32_configgpio(GPIO_SDMMC1_D2); + stm32_configgpio(GPIO_SDMMC1_D3); +#endif + stm32_configgpio(GPIO_SDMMC1_CK); + stm32_configgpio(GPIO_SDMMC1_CMD); +#endif + + /* Reset the card and assure that it is in the initial, unconfigured + * state. + */ + + stm32_reset(&priv->dev); + return &g_sdiodev.dev; +} + +/**************************************************************************** + * Name: sdio_mediachange + * + * Description: + * Called by board-specific logic -- posssible from an interrupt handler -- + * in order to signal to the driver that a card has been inserted or + * removed from the slot + * + * Input Parameters: + * dev - An instance of the SDIO driver device state structure. + * cardinslot - true is a card has been detected in the slot; false if a + * card has been removed from the slot. Only transitions + * (inserted->removed or removed->inserted should be reported) + * + * Returned Values: + * None + * + ****************************************************************************/ + +void sdio_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot) +{ + struct stm32_dev_s *priv = (struct stm32_dev_s *)dev; + uint8_t cdstatus; + irqstate_t flags; + + /* Update card status */ + + flags = enter_critical_section(); + cdstatus = priv->cdstatus; + if (cardinslot) + { + priv->cdstatus |= SDIO_STATUS_PRESENT; + } + else + { + priv->cdstatus &= ~SDIO_STATUS_PRESENT; + } + + leave_critical_section(flags); + + finfo("cdstatus OLD: %02x NEW: %02x\n", cdstatus, priv->cdstatus); + + /* Perform any requested callback if the status has changed */ + + if (cdstatus != priv->cdstatus) + { + stm32_callback(priv); + } +} + +/**************************************************************************** + * Name: sdio_wrprotect + * + * Description: + * Called by board-specific logic to report if the card in the slot is + * mechanically write protected. + * + * Input Parameters: + * dev - An instance of the SDIO driver device state structure. + * wrprotect - true is a card is writeprotected. + * + * Returned Values: + * None + * + ****************************************************************************/ + +void sdio_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect) +{ + struct stm32_dev_s *priv = (struct stm32_dev_s *)dev; + irqstate_t flags; + + /* Update card status */ + + flags = enter_critical_section(); + if (wrprotect) + { + priv->cdstatus |= SDIO_STATUS_WRPROTECTED; + } + else + { + priv->cdstatus &= ~SDIO_STATUS_WRPROTECTED; + } + finfo("cdstatus: %02x\n", priv->cdstatus); + leave_critical_section(flags); +} +#endif /* CONFIG_STM32F7_SDMMC1 */ -- GitLab From e45231ea131ecd09829d05152de98cbb8b1e4c69 Mon Sep 17 00:00:00 2001 From: Lok Tep Date: Wed, 22 Jun 2016 11:15:51 +0200 Subject: [PATCH 009/229] merge --- arch/arm/src/stm32f7/Make.defs | 12 +++ arch/arm/src/stm32f7/stm32_sdmmc.h | 129 +++++++++++++++++++++++++++++ 2 files changed, 141 insertions(+) create mode 100644 arch/arm/src/stm32f7/stm32_sdmmc.h diff --git a/arch/arm/src/stm32f7/Make.defs b/arch/arm/src/stm32f7/Make.defs index 0680d17cfb..4534212b63 100644 --- a/arch/arm/src/stm32f7/Make.defs +++ b/arch/arm/src/stm32f7/Make.defs @@ -147,6 +147,18 @@ ifeq ($(CONFIG_STM32F7_SPI),y) CHIP_CSRCS += stm32_spi.c endif +ifeq ($(CONFIG_STM32F7_SDMMC1),y) +CHIP_CSRCS += stm32_sdmmc.c +endif + +ifeq ($(CONFIG_USBDEV),y) +CHIP_CSRCS += stm32_otgdev.c +endif + +ifeq ($(CONFIG_USBHOST),y) +CHIP_CSRCS += stm32_otghost.c +endif + ifeq ($(CONFIG_STM32F7_TIM),y) CHIP_CSRCS += stm32_tim.c endif diff --git a/arch/arm/src/stm32f7/stm32_sdmmc.h b/arch/arm/src/stm32f7/stm32_sdmmc.h new file mode 100644 index 0000000000..12b6348559 --- /dev/null +++ b/arch/arm/src/stm32f7/stm32_sdmmc.h @@ -0,0 +1,129 @@ +/************************************************************************************ + * arch/arm/src/stm32f7/stm32_sdmmc.h + * + * Copyright (C) 2009, 2011, 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. + * + ************************************************************************************/ + +#ifndef __ARCH_ARM_SRC_STM32F7_STM32_SDMMC_H +#define __ARCH_ARM_SRC_STM32F7_STM32_SDMMC_H + +/************************************************************************************ + * Included Files + ************************************************************************************/ + +#include "chip/stm32_sdmmc.h" + +#include +#include +#include + +#include "chip.h" + +/************************************************************************************ + * Public Functions + ************************************************************************************/ + +#ifndef __ASSEMBLY__ + +#undef EXTERN +#if defined(__cplusplus) +#define EXTERN extern "C" +extern "C" +{ +#else +#define EXTERN extern +#endif + +/**************************************************************************** + * Name: sdio_initialize + * + * Description: + * Initialize SDIO for operation. + * + * Input Parameters: + * slotno - Not used. + * + * Returned Values: + * A reference to an SDIO interface structure. NULL is returned on failures. + * + ****************************************************************************/ + +struct sdio_dev_s; /* See include/nuttx/sdio.h */ +FAR struct sdio_dev_s *sdio_initialize(int slotno); + +/**************************************************************************** + * Name: sdio_mediachange + * + * Description: + * Called by board-specific logic -- posssible from an interrupt handler -- + * in order to signal to the driver that a card has been inserted or + * removed from the slot + * + * Input Parameters: + * dev - An instance of the SDIO driver device state structure. + * cardinslot - true is a card has been detected in the slot; false if a + * card has been removed from the slot. Only transitions + * (inserted->removed or removed->inserted should be reported) + * + * Returned Values: + * None + * + ****************************************************************************/ + +void sdio_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot); + +/**************************************************************************** + * Name: sdio_wrprotect + * + * Description: + * Called by board-specific logic to report if the card in the slot is + * mechanically write protected. + * + * Input Parameters: + * dev - An instance of the SDIO driver device state structure. + * wrprotect - true is a card is writeprotected. + * + * Returned Values: + * None + * + ****************************************************************************/ + +void sdio_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect); + +#undef EXTERN +#if defined(__cplusplus) +} +#endif + +#endif /* __ASSEMBLY__ */ +#endif /* __ARCH_ARM_SRC_STM32F7_STM32_SDMMC_H */ + -- GitLab From e83f3cf18e76df9d688408f79811028b4c37f6dc Mon Sep 17 00:00:00 2001 From: Lok Tep Date: Wed, 22 Jun 2016 11:17:33 +0200 Subject: [PATCH 010/229] merge --- arch/arm/src/stm32f7/Make.defs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/arch/arm/src/stm32f7/Make.defs b/arch/arm/src/stm32f7/Make.defs index 4534212b63..ba56b9aea4 100644 --- a/arch/arm/src/stm32f7/Make.defs +++ b/arch/arm/src/stm32f7/Make.defs @@ -151,14 +151,6 @@ ifeq ($(CONFIG_STM32F7_SDMMC1),y) CHIP_CSRCS += stm32_sdmmc.c endif -ifeq ($(CONFIG_USBDEV),y) -CHIP_CSRCS += stm32_otgdev.c -endif - -ifeq ($(CONFIG_USBHOST),y) -CHIP_CSRCS += stm32_otghost.c -endif - ifeq ($(CONFIG_STM32F7_TIM),y) CHIP_CSRCS += stm32_tim.c endif -- GitLab From e75a549423e454073464062015562ac5b4576706 Mon Sep 17 00:00:00 2001 From: Lok Tep Date: Wed, 22 Jun 2016 11:21:46 +0200 Subject: [PATCH 011/229] one more file --- arch/arm/src/stm32f7/chip/stm32_sdmmc.h | 52 +++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 arch/arm/src/stm32f7/chip/stm32_sdmmc.h diff --git a/arch/arm/src/stm32f7/chip/stm32_sdmmc.h b/arch/arm/src/stm32f7/chip/stm32_sdmmc.h new file mode 100644 index 0000000000..10ed29f238 --- /dev/null +++ b/arch/arm/src/stm32f7/chip/stm32_sdmmc.h @@ -0,0 +1,52 @@ +/************************************************************************************ + * arch/arm/src/stm32f7/chip/stm32_sdmmc.h + * + * 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. + * + ************************************************************************************/ + +#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_SDMMC_H +#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_SDMMC_H + +/************************************************************************************ + * Included Files + ************************************************************************************/ + +#include +#include "chip.h" + +#if defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX) +# include "stm32f74xx75xx_sdmmc.h" +#else +# error "Unsupported STM32 F7 part" +#endif + +#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_SDMMC_H */ -- GitLab From 82c890db235fc434b1d226f2f0b73a6d45c0a3e0 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 22 Jun 2016 05:57:59 -0600 Subject: [PATCH 012/229] syslog_dev_flush() needs to check if the inode is a mountpoint before calling the flush() method. Noted by David Sidrane. --- drivers/syslog/syslog_device.c | 4 +- fs/inode/inode.h | 72 +++++++--------------------------- include/nuttx/fs/fs.h | 46 ++++++++++++++++++++++ 3 files changed, 64 insertions(+), 58 deletions(-) diff --git a/drivers/syslog/syslog_device.c b/drivers/syslog/syslog_device.c index 25639e4b50..0364c603a2 100644 --- a/drivers/syslog/syslog_device.c +++ b/drivers/syslog/syslog_device.c @@ -583,7 +583,9 @@ int syslog_dev_flush(void) /* Is this a mountpoint? Does it support the sync method? */ - if (inode && inode->u.i_mops->sync) + if (inode != NULL && /* File opened (i.e., has inode)? */ + INODE_IS_MOUNTPT(inode) && /* Inode is a mountpoint? */ + inode->u.i_mops->sync != NULL) /* And supports synce method? */ { /* Yes... synchronize to the stream */ diff --git a/fs/inode/inode.h b/fs/inode/inode.h index 089bf67234..f909d74ef1 100644 --- a/fs/inode/inode.h +++ b/fs/inode/inode.h @@ -49,55 +49,6 @@ #include #include -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ -/* Inode i_flag values */ - -#define FSNODEFLAG_TYPE_MASK 0x00000007 /* Isolates type field */ -#define FSNODEFLAG_TYPE_DRIVER 0x00000000 /* Character driver */ -#define FSNODEFLAG_TYPE_BLOCK 0x00000001 /* Block driver */ -#define FSNODEFLAG_TYPE_MOUNTPT 0x00000002 /* Mount point */ -#define FSNODEFLAG_TYPE_SPECIAL 0x00000004 /* Special OS type */ -#define FSNODEFLAG_TYPE_NAMEDSEM 0x00000004 /* Named semaphore */ -#define FSNODEFLAG_TYPE_MQUEUE 0x00000005 /* Message Queue */ -#define FSNODEFLAG_TYPE_SHM 0x00000006 /* Shared memory region */ -#define FSNODEFLAG_DELETED 0x00000008 /* Unlinked */ - -#define INODE_IS_TYPE(i,t) \ - (((i)->i_flags & FSNODEFLAG_TYPE_MASK) == (t)) -#define INODE_IS_SPECIAL(i) \ - (((i)->i_flags & FSNODEFLAG_TYPE_SPECIAL) != 0) - -#define INODE_IS_DRIVER(i) INODE_IS_TYPE(i,FSNODEFLAG_TYPE_DRIVER) -#define INODE_IS_BLOCK(i) INODE_IS_TYPE(i,FSNODEFLAG_TYPE_BLOCK) -#define INODE_IS_MOUNTPT(i) INODE_IS_TYPE(i,FSNODEFLAG_TYPE_MOUNTPT) -#define INODE_IS_NAMEDSEM(i) INODE_IS_TYPE(i,FSNODEFLAG_TYPE_NAMEDSEM) -#define INODE_IS_MQUEUE(i) INODE_IS_TYPE(i,FSNODEFLAG_TYPE_MQUEUE) -#define INODE_IS_SHM(i) INODE_IS_TYPE(i,FSNODEFLAG_TYPE_SHM) - -#define INODE_GET_TYPE(i) ((i)->i_flags & FSNODEFLAG_TYPE_MASK) -#define INODE_SET_TYPE(i,t) \ - do \ - { \ - (i)->i_flags = ((i)->i_flags & ~FSNODEFLAG_TYPE_MASK) | (t); \ - } \ - while (0) - -#define INODE_SET_DRIVER(i) INODE_SET_TYPE(i,FSNODEFLAG_TYPE_DRIVER) -#define INODE_SET_BLOCK(i) INODE_SET_TYPE(i,FSNODEFLAG_TYPE_BLOCK) -#define INODE_SET_MOUNTPT(i) INODE_SET_TYPE(i,FSNODEFLAG_TYPE_MOUNTPT) -#define INODE_SET_NAMEDSEM(i) INODE_SET_TYPE(i,FSNODEFLAG_TYPE_NAMEDSEM) -#define INODE_SET_MQUEUE(i) INODE_SET_TYPE(i,FSNODEFLAG_TYPE_MQUEUE) -#define INODE_SET_SHM(i) INODE_SET_TYPE(i,FSNODEFLAG_TYPE_SHM) - -/* Mountpoint fd_flags values */ - -#define DIRENTFLAGS_PSEUDONODE 1 - -#define DIRENT_SETPSEUDONODE(f) do (f) |= DIRENTFLAGS_PSEUDONODE; while (0) -#define DIRENT_ISPSEUDONODE(f) (((f) & DIRENTFLAGS_PSEUDONODE) != 0) - /**************************************************************************** * Public Types ****************************************************************************/ @@ -129,7 +80,6 @@ EXTERN FAR struct inode *g_root_inode; * Public Function Prototypes ****************************************************************************/ -/* fs_inode.c ***************************************************************/ /**************************************************************************** * Name: inode_initialize * @@ -199,7 +149,6 @@ void inode_free(FAR struct inode *node); const char *inode_nextname(FAR const char *name); -/* fs_inodereserver.c *******************************************************/ /**************************************************************************** * Name: inode_reserve * @@ -224,7 +173,6 @@ const char *inode_nextname(FAR const char *name); int inode_reserve(FAR const char *path, FAR struct inode **inode); -/* fs_inoderemove.c *********************************************************/ /**************************************************************************** * Name: inode_unlink * @@ -256,7 +204,6 @@ FAR struct inode *inode_unlink(FAR const char *path); int inode_remove(FAR const char *path); -/* fs_inodefind.c ***********************************************************/ /**************************************************************************** * Name: inode_find * @@ -268,15 +215,27 @@ int inode_remove(FAR const char *path); FAR struct inode *inode_find(FAR const char *path, const char **relpath); -/* fs_inodeaddref.c *********************************************************/ +/**************************************************************************** + * Name: inode_addref + * + * Description: + * Increment the reference count on an inode (as when a file descriptor + * is dup'ed). + * + ****************************************************************************/ void inode_addref(FAR struct inode *inode); -/* fs_inoderelease.c ********************************************************/ +/**************************************************************************** + * Name: inode_release + * + * Description: + * This is called from close() logic when it no longer refers to the inode. + * + ****************************************************************************/ void inode_release(FAR struct inode *inode); -/* fs_foreachinode.c ********************************************************/ /**************************************************************************** * Name: foreach_inode * @@ -295,7 +254,6 @@ void inode_release(FAR struct inode *inode); int foreach_inode(foreach_inode_t handler, FAR void *arg); -/* fs_files.c ***************************************************************/ /**************************************************************************** * Name: files_initialize * diff --git a/include/nuttx/fs/fs.h b/include/nuttx/fs/fs.h index b415725ee8..f1bc737ffe 100644 --- a/include/nuttx/fs/fs.h +++ b/include/nuttx/fs/fs.h @@ -65,6 +65,52 @@ #define __FS_FLAG_EOF (1 << 0) /* EOF detected by a read operation */ #define __FS_FLAG_ERROR (1 << 1) /* Error detected by any operation */ +/* Inode i_flag values */ + +#define FSNODEFLAG_TYPE_MASK 0x00000007 /* Isolates type field */ +#define FSNODEFLAG_TYPE_DRIVER 0x00000000 /* Character driver */ +#define FSNODEFLAG_TYPE_BLOCK 0x00000001 /* Block driver */ +#define FSNODEFLAG_TYPE_MOUNTPT 0x00000002 /* Mount point */ +#define FSNODEFLAG_TYPE_SPECIAL 0x00000004 /* Special OS type */ +#define FSNODEFLAG_TYPE_NAMEDSEM 0x00000004 /* Named semaphore */ +#define FSNODEFLAG_TYPE_MQUEUE 0x00000005 /* Message Queue */ +#define FSNODEFLAG_TYPE_SHM 0x00000006 /* Shared memory region */ +#define FSNODEFLAG_DELETED 0x00000008 /* Unlinked */ + +#define INODE_IS_TYPE(i,t) \ + (((i)->i_flags & FSNODEFLAG_TYPE_MASK) == (t)) +#define INODE_IS_SPECIAL(i) \ + (((i)->i_flags & FSNODEFLAG_TYPE_SPECIAL) != 0) + +#define INODE_IS_DRIVER(i) INODE_IS_TYPE(i,FSNODEFLAG_TYPE_DRIVER) +#define INODE_IS_BLOCK(i) INODE_IS_TYPE(i,FSNODEFLAG_TYPE_BLOCK) +#define INODE_IS_MOUNTPT(i) INODE_IS_TYPE(i,FSNODEFLAG_TYPE_MOUNTPT) +#define INODE_IS_NAMEDSEM(i) INODE_IS_TYPE(i,FSNODEFLAG_TYPE_NAMEDSEM) +#define INODE_IS_MQUEUE(i) INODE_IS_TYPE(i,FSNODEFLAG_TYPE_MQUEUE) +#define INODE_IS_SHM(i) INODE_IS_TYPE(i,FSNODEFLAG_TYPE_SHM) + +#define INODE_GET_TYPE(i) ((i)->i_flags & FSNODEFLAG_TYPE_MASK) +#define INODE_SET_TYPE(i,t) \ + do \ + { \ + (i)->i_flags = ((i)->i_flags & ~FSNODEFLAG_TYPE_MASK) | (t); \ + } \ + while (0) + +#define INODE_SET_DRIVER(i) INODE_SET_TYPE(i,FSNODEFLAG_TYPE_DRIVER) +#define INODE_SET_BLOCK(i) INODE_SET_TYPE(i,FSNODEFLAG_TYPE_BLOCK) +#define INODE_SET_MOUNTPT(i) INODE_SET_TYPE(i,FSNODEFLAG_TYPE_MOUNTPT) +#define INODE_SET_NAMEDSEM(i) INODE_SET_TYPE(i,FSNODEFLAG_TYPE_NAMEDSEM) +#define INODE_SET_MQUEUE(i) INODE_SET_TYPE(i,FSNODEFLAG_TYPE_MQUEUE) +#define INODE_SET_SHM(i) INODE_SET_TYPE(i,FSNODEFLAG_TYPE_SHM) + +/* Mountpoint fd_flags values */ + +#define DIRENTFLAGS_PSEUDONODE 1 + +#define DIRENT_SETPSEUDONODE(f) do (f) |= DIRENTFLAGS_PSEUDONODE; while (0) +#define DIRENT_ISPSEUDONODE(f) (((f) & DIRENTFLAGS_PSEUDONODE) != 0) + /**************************************************************************** * Public Type Definitions ****************************************************************************/ -- GitLab From 16fe8ba342dc8530b9675fd393939d64d6d858be Mon Sep 17 00:00:00 2001 From: Sebastien Lorquet Date: Wed, 22 Jun 2016 06:33:04 -0600 Subject: [PATCH 013/229] Add some CAN mode IOCTL calls. These will be useful for device autotest when the application boots. They are redundant with the CONFIG_CAN_LOOPBACK option, which can now just be interpreted as a default setting. --- include/nuttx/can.h | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/include/nuttx/can.h b/include/nuttx/can.h index afcb8eb750..68f65b9703 100644 --- a/include/nuttx/can.h +++ b/include/nuttx/can.h @@ -74,6 +74,8 @@ * CONFIG_CAN_LOOPBACK - A CAN driver may or may not support a loopback * mode for testing. If the driver does support loopback mode, the setting * will enable it. (If the driver does not, this setting will have no effect). + * The loopback mode may be changed later by ioctl() if the driver supports the + * CANIOC_SET_CONNMODES ioctl command. * CONFIG_CAN_TXREADY - Add support for the can_txready() callback. This is needed * only for CAN hardware the supports an separate H/W TX message FIFO. The call * back is needed to keep the S/W FIFO and the H/W FIFO in sync. Work queue @@ -163,6 +165,24 @@ * is returned with the errno variable set to indicate the * nature of the error. * Dependencies: None + * + * CANIOC_GET_CONNMODES: + * Description: Get the current bus connection modes + * Argument: A pointer to a write-able instance of struct + * canioc_connmodes_s in which the new bus modes will be returned. + * Returned Value: Zero (OK) is returned on success. Otherwise -1 (ERROR) + * is returned with the errno variable set to indicate the + * nature of the error. + * Dependencies: None + * + * CANIOC_SET_CONNMODES: + * Description: Set new bus connection modes values + * Argument: A pointer to a read-able instance of struct + * canioc_connmodes_s in which the new bus modes are provided. + * Returned Value: Zero (OK) is returned on success. Otherwise -1 (ERROR) + * is returned with the errno variable set to indicate the + * nature of the error. + * Dependencies: None */ #define CANIOC_RTR _CANIOC(1) @@ -172,12 +192,14 @@ #define CANIOC_ADD_EXTFILTER _CANIOC(5) #define CANIOC_DEL_STDFILTER _CANIOC(6) #define CANIOC_DEL_EXTFILTER _CANIOC(7) +#define CANIOC_GET_CONNMODE _CANIOC(8) +#define CANIOC_SET_CONNMODE _CANIOC(9) /* CANIOC_USER: Device specific ioctl calls can be supported with cmds greater * than this value */ -#define CANIOC_USER _CANIOC(8) +#define CANIOC_USER _CANIOC(10) /* Convenience macros ***************************************************************/ @@ -547,6 +569,19 @@ struct canioc_bittiming_s uint8_t bt_sjw; /* Synchronization Jump Width in time quanta */ }; +/* CANIOC_GET_CONNMODES/CANIOC_SET_CONNMODES: */ +/* A CAN device may support loopback and silent mode. Both modes may not be + * settable independently. + */ + +struct canioc_connmodes_s +{ + uint8_t bm_loopback : 1; /* Enable reception of messages sent + * by this node.*/ + uint8_t bm_silent : 1; /* Disable transmission of messages. + * The node still receives messages. */ +}; + #ifdef CONFIG_CAN_EXTID /* CANIOC_ADD_EXTFILTER: */ -- GitLab From 8b922b1546a9b0f4fa2eeb692e1a304bfc0df5c7 Mon Sep 17 00:00:00 2001 From: Sebastien Lorquet Date: Wed, 22 Jun 2016 07:36:49 -0600 Subject: [PATCH 014/229] Enforce STM32L4 naming convention --- arch/arm/src/stm32l4/stm32l4_can.c | 486 +++++++++++++++-------------- 1 file changed, 259 insertions(+), 227 deletions(-) diff --git a/arch/arm/src/stm32l4/stm32l4_can.c b/arch/arm/src/stm32l4/stm32l4_can.c index 4d239c2fc3..c7808c8895 100644 --- a/arch/arm/src/stm32l4/stm32l4_can.c +++ b/arch/arm/src/stm32l4/stm32l4_can.c @@ -107,52 +107,66 @@ struct stm32l4_can_s /* CAN Register access */ -static uint32_t can_getreg(FAR struct stm32l4_can_s *priv, int offset); -static uint32_t can_getfreg(FAR struct stm32l4_can_s *priv, int offset); -static void can_putreg(FAR struct stm32l4_can_s *priv, int offset, uint32_t value); -static void can_putfreg(FAR struct stm32l4_can_s *priv, int offset, uint32_t value); +static uint32_t stm32l4_cangetreg(FAR struct stm32l4_can_s *priv, + int offset); +static uint32_t stm32l4_cangetfreg(FAR struct stm32l4_can_s *priv, + int offset); +static void stm32l4_canputreg(FAR struct stm32l4_can_s *priv, int offset, + uint32_t value); +static void stm32l4_canputfreg(FAR struct stm32l4_can_s *priv, int offset, + uint32_t value); #ifdef CONFIG_STM32L4_CAN_REGDEBUG -static void can_dumpctrlregs(FAR struct stm32l4_can_s *priv, FAR const char *msg); -static void can_dumpmbregs(FAR struct stm32l4_can_s *priv, FAR const char *msg); -static void can_dumpfiltregs(FAR struct stm32l4_can_s *priv, FAR const char *msg); +static void stm32l4_candumpctrlregs(FAR struct stm32l4_can_s *priv, + FAR const char *msg); +static void stm32l4_candumpmbregs(FAR struct stm32l4_can_s *priv, + FAR const char *msg); +static void stm32l4_candumpfiltregs(FAR struct stm32l4_can_s *priv, + FAR const char *msg); #else -# define can_dumpctrlregs(priv,msg) -# define can_dumpmbregs(priv,msg) -# define can_dumpfiltregs(priv,msg) +# define stm32l4_candumpctrlregs(priv,msg) +# define stm32l4_candumpmbregs(priv,msg) +# define stm32l4_candumpfiltregs(priv,msg) #endif /* CAN driver methods */ -static void can_reset(FAR struct can_dev_s *dev); -static int can_setup(FAR struct can_dev_s *dev); -static void can_shutdown(FAR struct can_dev_s *dev); -static void can_rxint(FAR struct can_dev_s *dev, bool enable); -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); -static int can_remoterequest(FAR struct can_dev_s *dev, uint16_t id); -static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg); -static bool can_txready(FAR struct can_dev_s *dev); -static bool can_txempty(FAR struct can_dev_s *dev); +static void stm32l4_canreset(FAR struct can_dev_s *dev); +static int stm32l4_cansetup(FAR struct can_dev_s *dev); +static void stm32l4_canshutdown(FAR struct can_dev_s *dev); +static void stm32l4_canrxint(FAR struct can_dev_s *dev, bool enable); +static void stm32l4_cantxint(FAR struct can_dev_s *dev, bool enable); +static int stm32l4_canioctl(FAR struct can_dev_s *dev, int cmd, + unsigned long arg); +static int stm32l4_canremoterequest(FAR struct can_dev_s *dev, + uint16_t id); +static int stm32l4_cansend(FAR struct can_dev_s *dev, + FAR struct can_msg_s *msg); +static bool stm32l4_cantxready(FAR struct can_dev_s *dev); +static bool stm32l4_cantxempty(FAR struct can_dev_s *dev); /* CAN interrupt handling */ -static int can_rx0interrupt(int irq, FAR void *context); -static int can_txinterrupt(int irq, FAR void *context); +static int stm32l4_canrx0interrupt(int irq, FAR void *context); +static int stm32l4_cantxinterrupt(int irq, FAR void *context); /* Initialization */ -static int can_enterinitmode(FAR struct stm32l4_can_s *priv); -static int can_exitinitmode(FAR struct stm32l4_can_s *priv); -static int can_bittiming(FAR struct stm32l4_can_s *priv); -static int can_cellinit(FAR struct stm32l4_can_s *priv); -static int can_filterinit(FAR struct stm32l4_can_s *priv); +static int stm32l4_canenterinitmode(FAR struct stm32l4_can_s *priv); +static int stm32l4_canexitinitmode(FAR struct stm32l4_can_s *priv); +static int stm32l4_canbittiming(FAR struct stm32l4_can_s *priv); +static int stm32l4_cancellinit(FAR struct stm32l4_can_s *priv); +static int stm32l4_canfilterinit(FAR struct stm32l4_can_s *priv); /* Filtering (todo) */ -static int stm32l4_can_addextfilter(FAR struct stm32l4_can_s *priv, FAR struct canioc_extfilter_s *arg); -static int stm32l4_can_delextfilter(FAR struct stm32l4_can_s *priv, int arg); -static int stm32l4_can_addstdfilter(FAR struct stm32l4_can_s *priv, FAR struct canioc_stdfilter_s *arg); -static int stm32l4_can_delstdfilter(FAR struct stm32l4_can_s *priv, int arg); +static int stm32l4_canaddextfilter(FAR struct stm32l4_can_s *priv, + FAR struct canioc_extfilter_s *arg); +static int stm32l4_candelextfilter(FAR struct stm32l4_can_s *priv, + int arg); +static int stm32l4_canaddstdfilter(FAR struct stm32l4_can_s *priv, + FAR struct canioc_stdfilter_s *arg); +static int stm32l4_candelstdfilter(FAR struct stm32l4_can_s *priv, + int arg); /**************************************************************************** * Private Data @@ -160,16 +174,16 @@ static int stm32l4_can_delstdfilter(FAR struct stm32l4_can_s *priv, int arg); static const struct can_ops_s g_canops = { - .co_reset = can_reset, - .co_setup = can_setup, - .co_shutdown = can_shutdown, - .co_rxint = can_rxint, - .co_txint = can_txint, - .co_ioctl = can_ioctl, - .co_remoterequest = can_remoterequest, - .co_send = can_send, - .co_txready = can_txready, - .co_txempty = can_txempty, + .co_reset = stm32l4_canreset, + .co_setup = stm32l4_cansetup, + .co_shutdown = stm32l4_canshutdown, + .co_rxint = stm32l4_canrxint, + .co_txint = stm32l4_cantxint, + .co_ioctl = stm32l4_canioctl, + .co_remoterequest = stm32l4_canremoterequest, + .co_send = stm32l4_cansend, + .co_txready = stm32l4_cantxready, + .co_txempty = stm32l4_cantxempty, }; #ifdef CONFIG_STM32L4_CAN1 @@ -196,8 +210,8 @@ static struct can_dev_s g_can1dev = ****************************************************************************/ /**************************************************************************** - * Name: can_getreg - * Name: can_getfreg + * Name: stm32l4_cangetreg + * Name: stm32l4_cangetfreg * * Description: * Read the value of a CAN register or filter block register. @@ -211,7 +225,7 @@ static struct can_dev_s g_can1dev = ****************************************************************************/ #ifdef CONFIG_STM32L4_CAN_REGDEBUG -static uint32_t can_vgetreg(uint32_t addr) +static uint32_t stm32l4_canvgetreg(uint32_t addr) { static uint32_t prevaddr = 0; static uint32_t preval = 0; @@ -264,23 +278,23 @@ static uint32_t can_vgetreg(uint32_t addr) return val; } -static uint32_t can_getreg(FAR struct stm32l4_can_s *priv, int offset) +static uint32_t stm32l4_cangetreg(FAR struct stm32l4_can_s *priv, int offset) { - return can_vgetreg(priv->base + offset); + return stm32l4_canvgetreg(priv->base + offset); } -static uint32_t can_getfreg(FAR struct stm32l4_can_s *priv, int offset) +static uint32_t stm32l4_cangetfreg(FAR struct stm32l4_can_s *priv, int offset) { - return can_vgetreg(priv->fbase + offset); + return stm32l4_canvgetreg(priv->fbase + offset); } #else -static uint32_t can_getreg(FAR struct stm32l4_can_s *priv, int offset) +static uint32_t stm32l4_cangetreg(FAR struct stm32l4_can_s *priv, int offset) { return getreg32(priv->base + offset); } -static uint32_t can_getfreg(FAR struct stm32l4_can_s *priv, int offset) +static uint32_t stm32l4_cangetfreg(FAR struct stm32l4_can_s *priv, int offset) { return getreg32(priv->fbase + offset); } @@ -288,8 +302,8 @@ static uint32_t can_getfreg(FAR struct stm32l4_can_s *priv, int offset) #endif /**************************************************************************** - * Name: can_putreg - * Name: can_putfreg + * Name: stm32l4_canputreg + * Name: stm32l4_canputfreg * * Description: * Set the value of a CAN register or filter block register. @@ -305,7 +319,7 @@ static uint32_t can_getfreg(FAR struct stm32l4_can_s *priv, int offset) ****************************************************************************/ #ifdef CONFIG_STM32L4_CAN_REGDEBUG -static void can_vputreg(uint32_t addr, uint32_t value) +static void stm32l4_canvputreg(uint32_t addr, uint32_t value) { /* Show the register value being written */ @@ -316,30 +330,34 @@ static void can_vputreg(uint32_t addr, uint32_t value) putreg32(value, addr); } -static void can_putreg(FAR struct stm32l4_can_s *priv, int offset, uint32_t value) +static void stm32l4_canputreg(FAR struct stm32l4_can_s *priv, int offset, + uint32_t value) { - can_vputreg(priv->base + offset, value); + stm32l4_canvputreg(priv->base + offset, value); } -static void can_putfreg(FAR struct stm32l4_can_s *priv, int offset, uint32_t value) +static void stm32l4_canputfreg(FAR struct stm32l4_can_s *priv, int offset, + uint32_t value) { - can_vputreg(priv->fbase + offset, value); + stm32l4_canvputreg(priv->fbase + offset, value); } #else -static void can_putreg(FAR struct stm32l4_can_s *priv, int offset, uint32_t value) +static void stm32l4_canputreg(FAR struct stm32l4_can_s *priv, int offset, + uint32_t value) { putreg32(value, priv->base + offset); } -static void can_putfreg(FAR struct stm32l4_can_s *priv, int offset, uint32_t value) +static void stm32l4_canputfreg(FAR struct stm32l4_can_s *priv, int offset, + uint32_t value) { putreg32(value, priv->fbase + offset); } #endif /**************************************************************************** - * Name: can_dumpctrlregs + * Name: stm32l4_candumpctrlregs * * Description: * Dump the contents of all CAN control registers @@ -353,7 +371,8 @@ static void can_putfreg(FAR struct stm32l4_can_s *priv, int offset, uint32_t val ****************************************************************************/ #ifdef CONFIG_STM32L4_CAN_REGDEBUG -static void can_dumpctrlregs(FAR struct stm32l4_can_s *priv, FAR const char *msg) +static void stm32l4_candumpctrlregs(FAR struct stm32l4_can_s *priv, + FAR const char *msg) { if (msg) { @@ -383,7 +402,7 @@ static void can_dumpctrlregs(FAR struct stm32l4_can_s *priv, FAR const char *msg #endif /**************************************************************************** - * Name: can_dumpmbregs + * Name: stm32l4_candumpmbregs * * Description: * Dump the contents of all CAN mailbox registers @@ -397,7 +416,8 @@ static void can_dumpctrlregs(FAR struct stm32l4_can_s *priv, FAR const char *msg ****************************************************************************/ #ifdef CONFIG_STM32L4_CAN_REGDEBUG -static void can_dumpmbregs(FAR struct stm32l4_can_s *priv, FAR const char *msg) +static void stm32l4_candumpmbregs(FAR struct stm32l4_can_s *priv, + FAR const char *msg) { if (msg) { @@ -443,7 +463,7 @@ static void can_dumpmbregs(FAR struct stm32l4_can_s *priv, FAR const char *msg) #endif /**************************************************************************** - * Name: can_dumpfiltregs + * Name: stm32l4_candumpfiltregs * * Description: * Dump the contents of all CAN filter registers @@ -457,7 +477,8 @@ static void can_dumpmbregs(FAR struct stm32l4_can_s *priv, FAR const char *msg) ****************************************************************************/ #ifdef CONFIG_STM32L4_CAN_REGDEBUG -static void can_dumpfiltregs(FAR struct stm32l4_can_s *priv, FAR const char *msg) +static void stm32l4_candumpfiltregs(FAR struct stm32l4_can_s *priv, + FAR const char *msg) { int i; @@ -487,11 +508,11 @@ static void can_dumpfiltregs(FAR struct stm32l4_can_s *priv, FAR const char *msg #endif /**************************************************************************** - * Name: can_reset + * Name: stm32l4_canreset * * Description: * Reset the CAN device. Called early to initialize the hardware. This - * function is called, before can_setup() and on error conditions. + * function is called, before stm32l4_cansetup() and on error conditions. * * Input Parameters: * dev - An instance of the "upper half" can driver state structure. @@ -501,7 +522,7 @@ static void can_dumpfiltregs(FAR struct stm32l4_can_s *priv, FAR const char *msg * ****************************************************************************/ -static void can_reset(FAR struct can_dev_s *dev) +static void stm32l4_canreset(FAR struct can_dev_s *dev) { FAR struct stm32l4_can_s *priv = dev->cd_priv; uint32_t regval; @@ -524,8 +545,8 @@ static void can_reset(FAR struct can_dev_s *dev) return; } - /* Disable interrupts momentary to stop any ongoing CAN event processing and - * to prevent any concurrent access to the AHB1RSTR1 register. + /* Disable interrupts momentary to stop any ongoing CAN event processing + * and to prevent any concurrent access to the AHB1RSTR1 register. */ flags = enter_critical_section(); @@ -542,7 +563,7 @@ static void can_reset(FAR struct can_dev_s *dev) } /**************************************************************************** - * Name: can_setup + * Name: stm32l4_cansetup * * Description: * Configure the CAN. This method is called the first time that the CAN @@ -558,49 +579,56 @@ static void can_reset(FAR struct can_dev_s *dev) * ****************************************************************************/ -static int can_setup(FAR struct can_dev_s *dev) +static int stm32l4_cansetup(FAR struct can_dev_s *dev) { FAR struct stm32l4_can_s *priv = dev->cd_priv; int ret; - caninfo("CAN%d RX0 irq: %d TX irq: %d\n", priv->port, priv->canrx0, priv->cantx); + caninfo("CAN%d RX0 irq: %d TX irq: %d\n", + priv->port, priv->canrx0, priv->cantx); /* CAN cell initialization */ - ret = can_cellinit(priv); + ret = stm32l4_cancellinit(priv); if (ret < 0) { - canerr("ERROR: CAN%d cell initialization failed: %d\n", priv->port, ret); + canerr("ERROR: CAN%d cell initialization failed: %d\n", + priv->port, ret); return ret; } - can_dumpctrlregs(priv, "After cell initialization"); - can_dumpmbregs(priv, NULL); + stm32l4_candumpctrlregs(priv, "After cell initialization"); + stm32l4_candumpmbregs(priv, NULL); /* CAN filter initialization */ - ret = can_filterinit(priv); + ret = stm32l4_canfilterinit(priv); if (ret < 0) { - canerr("ERROR: CAN%d filter initialization failed: %d\n", priv->port, ret); + canerr("ERROR: CAN%d filter initialization failed: %d\n", + priv->port, ret); return ret; } - can_dumpfiltregs(priv, "After filter initialization"); + stm32l4_candumpfiltregs(priv, "After filter initialization"); - /* Attach the CAN RX FIFO 0 interrupt and TX interrupts. The others are not used */ + /* Attach the CAN RX FIFO 0 interrupt and TX interrupts. The others are + * not used. + */ - ret = irq_attach(priv->canrx0, can_rx0interrupt); + ret = irq_attach(priv->canrx0, stm32l4_canrx0interrupt); if (ret < 0) { - canerr("ERROR: Failed to attach CAN%d RX0 IRQ (%d)", priv->port, priv->canrx0); + canerr("ERROR: Failed to attach CAN%d RX0 IRQ (%d)", + priv->port, priv->canrx0); return ret; } - ret = irq_attach(priv->cantx, can_txinterrupt); + ret = irq_attach(priv->cantx, stm32l4_cantxinterrupt); if (ret < 0) { - canerr("ERROR: Failed to attach CAN%d TX IRQ (%d)", priv->port, priv->cantx); + canerr("ERROR: Failed to attach CAN%d TX IRQ (%d)", + priv->port, priv->cantx); return ret; } @@ -615,7 +643,7 @@ static int can_setup(FAR struct can_dev_s *dev) } /**************************************************************************** - * Name: can_shutdown + * Name: stm32l4_canshutdown * * Description: * Disable the CAN. This method is called when the CAN device is closed. @@ -629,7 +657,7 @@ static int can_setup(FAR struct can_dev_s *dev) * ****************************************************************************/ -static void can_shutdown(FAR struct can_dev_s *dev) +static void stm32l4_canshutdown(FAR struct can_dev_s *dev) { FAR struct stm32l4_can_s *priv = dev->cd_priv; @@ -647,11 +675,11 @@ static void can_shutdown(FAR struct can_dev_s *dev) /* And reset the hardware */ - can_reset(dev); + stm32l4_canreset(dev); } /**************************************************************************** - * Name: can_rxint + * Name: stm32l4_canrxint * * Description: * Call to enable or disable RX interrupts. @@ -664,7 +692,7 @@ static void can_shutdown(FAR struct can_dev_s *dev) * ****************************************************************************/ -static void can_rxint(FAR struct can_dev_s *dev, bool enable) +static void stm32l4_canrxint(FAR struct can_dev_s *dev, bool enable) { FAR struct stm32l4_can_s *priv = dev->cd_priv; uint32_t regval; @@ -673,7 +701,7 @@ static void can_rxint(FAR struct can_dev_s *dev, bool enable) /* Enable/disable the FIFO 0 message pending interrupt */ - regval = can_getreg(priv, STM32L4_CAN_IER_OFFSET); + regval = stm32l4_cangetreg(priv, STM32L4_CAN_IER_OFFSET); if (enable) { regval |= CAN_IER_FMPIE0; @@ -683,11 +711,11 @@ static void can_rxint(FAR struct can_dev_s *dev, bool enable) regval &= ~CAN_IER_FMPIE0; } - can_putreg(priv, STM32L4_CAN_IER_OFFSET, regval); + stm32l4_canputreg(priv, STM32L4_CAN_IER_OFFSET, regval); } /**************************************************************************** - * Name: can_txint + * Name: stm32l4_cantxint * * Description: * Call to enable or disable TX interrupts. @@ -700,7 +728,7 @@ static void can_rxint(FAR struct can_dev_s *dev, bool enable) * ****************************************************************************/ -static void can_txint(FAR struct can_dev_s *dev, bool enable) +static void stm32l4_cantxint(FAR struct can_dev_s *dev, bool enable) { FAR struct stm32l4_can_s *priv = dev->cd_priv; uint32_t regval; @@ -711,14 +739,14 @@ static void can_txint(FAR struct can_dev_s *dev, bool enable) if (!enable) { - regval = can_getreg(priv, STM32L4_CAN_IER_OFFSET); + regval = stm32l4_cangetreg(priv, STM32L4_CAN_IER_OFFSET); regval &= ~CAN_IER_TMEIE; - can_putreg(priv, STM32L4_CAN_IER_OFFSET, regval); + stm32l4_canputreg(priv, STM32L4_CAN_IER_OFFSET, regval); } } /**************************************************************************** - * Name: can_ioctl + * Name: stm32l4_canioctl * * Description: * All ioctl calls will be routed through this method @@ -731,7 +759,8 @@ 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) +static int stm32l4_canioctl(FAR struct can_dev_s *dev, int cmd, + unsigned long arg) { FAR struct stm32l4_can_s *priv; int ret = -ENOTTY; @@ -748,11 +777,11 @@ static int can_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg) /* CANIOC_GET_BITTIMING: * Description: Return the current bit timing settings * Argument: A pointer to a write-able instance of struct - * canioc_bittiming_s in which current bit timing values - * will be returned. - * Returned Value: Zero (OK) is returned on success. Otherwise -1 (ERROR) - * is returned with the errno variable set to indicate the - * nature of the error. + * canioc_bittiming_s in which current bit timing + * values will be returned. + * Returned Value: Zero (OK) is returned on success. Otherwise -1 + * (ERROR) is returned with the errno variable set + * to indicate the nature of the error. * Dependencies: None */ @@ -764,7 +793,7 @@ static int can_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg) uint32_t brp; DEBUGASSERT(bt != NULL); - regval = can_getreg(priv, STM32L4_CAN_BTR_OFFSET); + regval = stm32l4_cangetreg(priv, STM32L4_CAN_BTR_OFFSET); bt->bt_sjw = ((regval & CAN_BTR_SJW_MASK) >> CAN_BTR_SJW_SHIFT) + 1; bt->bt_tseg1 = ((regval & CAN_BTR_TS1_MASK) >> CAN_BTR_TS1_SHIFT) + 1; bt->bt_tseg2 = ((regval & CAN_BTR_TS2_MASK) >> CAN_BTR_TS2_SHIFT) + 1; @@ -779,18 +808,18 @@ static int can_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg) /* CANIOC_SET_BITTIMING: * Description: Set new current bit timing values * Argument: A pointer to a read-able instance of struct - * canioc_bittiming_s in which the new bit timing values - * are provided. - * Returned Value: Zero (OK) is returned on success. Otherwise -1 (ERROR) - * is returned with the errno variable set to indicate the - * nature of the error. + * canioc_bittiming_s in which the new bit timing + * valuesare provided. + * Returned Value: Zero (OK) is returned on success. Otherwise -1 + * (ERROR)is returned with the errno variable set + * to indicate thenature of the error. * Dependencies: None * * REVISIT: There is probably a limitation here: If there are multiple - * threads trying to send CAN packets, when one of these threads reconfigures - * the bitrate, the MCAN hardware will be reset and the context of operation - * will be lost. Hence, this IOCTL can only safely be executed in quiescent - * time periods. + * threads trying to send CAN packets, when one of these threads + * reconfigures the bitrate, the MCAN hardware will be reset and the + * context of operation will be lost. Hence, this IOCTL can only safely + * be executed in quiescent time periods. */ case CANIOC_SET_BITTIMING: @@ -798,7 +827,7 @@ static int can_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg) FAR const struct canioc_bittiming_s *bt = (FAR const struct canioc_bittiming_s *)arg; uint32_t brp; - uint32_t can_bit_quanta; + uint32_t stm32l4_canbit_quanta; uint32_t tmp; DEBUGASSERT(bt != NULL); @@ -814,9 +843,9 @@ static int can_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg) /* This value is dynamic as requested by user */ - can_bit_quanta = bt->bt_tseg1 + bt->bt_tseg2 + 1; + stm32l4_canbit_quanta = bt->bt_tseg1 + bt->bt_tseg2 + 1; - if (tmp < can_bit_quanta) + if (tmp < stm32l4_canbit_quanta) { #if 0 /* At the smallest brp value (1), there are already too few @@ -845,14 +874,14 @@ static int can_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg) #endif } - /* Otherwise, nquanta is can_bit_quanta, ts1 and ts2 are provided - * by the user and we calculate brp to achieve can_bit_quanta - * quanta in the bit time + /* Otherwise, nquanta is stm32l4_canbit_quanta, ts1 and ts2 are + * provided by the user and we calculate brp to achieve + * stm32l4_canbit_quanta quanta in the bit times */ else { - brp = (tmp + (can_bit_quanta/2)) / can_bit_quanta; + brp = (tmp + (stm32l4_canbit_quanta/2)) / stm32l4_canbit_quanta; DEBUGASSERT(brp >= 1 && brp <= CAN_BTR_BRP_MAX); } @@ -878,14 +907,14 @@ static int can_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg) * No registers are changed. */ - ret = can_enterinitmode(priv); + ret = stm32l4_canenterinitmode(priv); if (ret != 0) { break; } - can_putreg(priv, STM32L4_CAN_BTR_OFFSET, tmp); - ret = can_exitinitmode(priv); + stm32l4_canputreg(priv, STM32L4_CAN_BTR_OFFSET, tmp); + ret = stm32l4_canexitinitmode(priv); if (ret == 0) { @@ -907,23 +936,24 @@ static int can_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg) case CANIOC_ADD_EXTFILTER: { DEBUGASSERT(arg != 0); - ret = stm32l4_can_addextfilter(priv, (FAR struct canioc_extfilter_s *)arg); + ret = stm32l4_canaddextfilter(priv, (FAR struct canioc_extfilter_s *)arg); } break; /* CANIOC_DEL_EXTFILTER: - * Description: Remove an address filter for a standard 29 bit address. + * Description: Remove an address filter for a standard 29 bit + * address. * Argument: The filter index previously returned by the * CANIOC_ADD_EXTFILTER command - * Returned Value: Zero (OK) is returned on success. Otherwise -1 (ERROR) - * is returned with the errno variable set to indicate the - * nature of the error. + * Returned Value: Zero (OK) is returned on success. Otherwise -1 + * (ERROR)is returned with the errno variable set + * to indicate the nature of the error. */ case CANIOC_DEL_EXTFILTER: { DEBUGASSERT(arg <= priv->config->nextfilters); - ret = stm32l4_can_delextfilter(priv, (int)arg); + ret = stm32l4_candelextfilter(priv, (int)arg); } break; #endif @@ -940,23 +970,24 @@ static int can_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg) case CANIOC_ADD_STDFILTER: { DEBUGASSERT(arg != 0); - ret = stm32l4_can_addstdfilter(priv, (FAR struct canioc_stdfilter_s *)arg); + ret = stm32l4_canaddstdfilter(priv, (FAR struct canioc_stdfilter_s *)arg); } break; /* CANIOC_DEL_STDFILTER: - * Description: Remove an address filter for a standard 11 bit address. + * Description: Remove an address filter for a standard 11 bit + * address. * Argument: The filter index previously returned by the * CANIOC_ADD_STDFILTER command - * Returned Value: Zero (OK) is returned on success. Otherwise -1 (ERROR) - * is returned with the errno variable set to indicate the - * nature of the error. + * Returned Value: Zero (OK) is returned on success. Otherwise -1 + * (ERROR) is returned with the errno variable set + * to indicate the nature of the error. */ case CANIOC_DEL_STDFILTER: { DEBUGASSERT(arg <= priv->config->nstdfilters); - ret = stm32l4_can_delstdfilter(priv, (int)arg); + ret = stm32l4_candelstdfilter(priv, (int)arg); } break; @@ -971,7 +1002,7 @@ static int can_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg) } /**************************************************************************** - * Name: can_remoterequest + * Name: stm32l4_canremoterequest * * Description: * Send a remote request @@ -984,14 +1015,14 @@ 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) +static int stm32l4_canremoterequest(FAR struct can_dev_s *dev, uint16_t id) { #warning "Remote request not implemented" return -ENOSYS; } /**************************************************************************** - * Name: can_send + * Name: stm32l4_cansend * * Description: * Send one can message. @@ -1013,7 +1044,8 @@ static int can_remoterequest(FAR struct can_dev_s *dev, uint16_t id) * ****************************************************************************/ -static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg) +static int stm32l4_cansend(FAR struct can_dev_s *dev, + FAR struct can_msg_s *msg) { FAR struct stm32l4_can_s *priv = dev->cd_priv; FAR uint8_t *ptr; @@ -1027,7 +1059,7 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg) /* Select one empty transmit mailbox */ - regval = can_getreg(priv, STM32L4_CAN_TSR_OFFSET); + regval = stm32l4_cangetreg(priv, STM32L4_CAN_TSR_OFFSET); if ((regval & CAN_TSR_TME0) != 0 && (regval & CAN_TSR_RQCP0) == 0) { txmb = 0; @@ -1048,9 +1080,10 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg) /* Clear TXRQ, RTR, IDE, EXID, and STID fields */ - regval = can_getreg(priv, STM32L4_CAN_TIR_OFFSET(txmb)); - regval &= ~(CAN_TIR_TXRQ | CAN_TIR_RTR | CAN_TIR_IDE | CAN_TIR_EXID_MASK | CAN_TIR_STID_MASK); - can_putreg(priv, STM32L4_CAN_TIR_OFFSET(txmb), regval); + regval = stm32l4_cangetreg(priv, STM32L4_CAN_TIR_OFFSET(txmb)); + regval &= ~(CAN_TIR_TXRQ | CAN_TIR_RTR | CAN_TIR_IDE | CAN_TIR_EXID_MASK | + CAN_TIR_STID_MASK); + stm32l4_canputreg(priv, STM32L4_CAN_TIR_OFFSET(txmb), regval); /* Set up the ID, standard 11-bit or extended 29-bit. */ @@ -1070,15 +1103,15 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg) regval &= ~CAN_TIR_STID_MASK; regval |= (uint32_t)msg->cm_hdr.ch_id << CAN_TIR_STID_SHIFT; #endif - can_putreg(priv, STM32L4_CAN_TIR_OFFSET(txmb), regval); + stm32l4_canputreg(priv, STM32L4_CAN_TIR_OFFSET(txmb), regval); /* Set up the DLC */ dlc = msg->cm_hdr.ch_dlc; - regval = can_getreg(priv, STM32L4_CAN_TDTR_OFFSET(txmb)); + regval = stm32l4_cangetreg(priv, STM32L4_CAN_TDTR_OFFSET(txmb)); regval &= ~(CAN_TDTR_DLC_MASK | CAN_TDTR_TGT); regval |= (uint32_t)dlc << CAN_TDTR_DLC_SHIFT; - can_putreg(priv, STM32L4_CAN_TDTR_OFFSET(txmb), regval); + stm32l4_canputreg(priv, STM32L4_CAN_TDTR_OFFSET(txmb), regval); /* Set up the data fields */ @@ -1109,7 +1142,7 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg) } } - can_putreg(priv, STM32L4_CAN_TDLR_OFFSET(txmb), regval); + stm32l4_canputreg(priv, STM32L4_CAN_TDLR_OFFSET(txmb), regval); regval = 0; if (dlc > 4) @@ -1136,26 +1169,26 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg) } } - can_putreg(priv, STM32L4_CAN_TDHR_OFFSET(txmb), regval); + stm32l4_canputreg(priv, STM32L4_CAN_TDHR_OFFSET(txmb), regval); /* Enable the transmit mailbox empty interrupt (may already be enabled) */ - regval = can_getreg(priv, STM32L4_CAN_IER_OFFSET); + regval = stm32l4_cangetreg(priv, STM32L4_CAN_IER_OFFSET); regval |= CAN_IER_TMEIE; - can_putreg(priv, STM32L4_CAN_IER_OFFSET, regval); + stm32l4_canputreg(priv, STM32L4_CAN_IER_OFFSET, regval); /* Request transmission */ - regval = can_getreg(priv, STM32L4_CAN_TIR_OFFSET(txmb)); + regval = stm32l4_cangetreg(priv, STM32L4_CAN_TIR_OFFSET(txmb)); regval |= CAN_TIR_TXRQ; /* Transmit Mailbox Request */ - can_putreg(priv, STM32L4_CAN_TIR_OFFSET(txmb), regval); + stm32l4_canputreg(priv, STM32L4_CAN_TIR_OFFSET(txmb), regval); - can_dumpmbregs(priv, "After send"); + stm32l4_candumpmbregs(priv, "After send"); return OK; } /**************************************************************************** - * Name: can_txready + * Name: stm32l4_cantxready * * Description: * Return true if the CAN hardware can accept another TX message. @@ -1168,14 +1201,14 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg) * ****************************************************************************/ -static bool can_txready(FAR struct can_dev_s *dev) +static bool stm32l4_cantxready(FAR struct can_dev_s *dev) { FAR struct stm32l4_can_s *priv = dev->cd_priv; uint32_t regval; /* Return true if any mailbox is available */ - regval = can_getreg(priv, STM32L4_CAN_TSR_OFFSET); + regval = stm32l4_cangetreg(priv, STM32L4_CAN_TSR_OFFSET); caninfo("CAN%d TSR: %08x\n", priv->port, regval); if ((regval & CAN_ALL_MAILBOXES) != 0) @@ -1187,7 +1220,7 @@ static bool can_txready(FAR struct can_dev_s *dev) } /**************************************************************************** - * Name: can_txempty + * Name: stm32l4_cantxempty * * Description: * Return true if all message have been sent. If for example, the CAN @@ -1204,14 +1237,14 @@ static bool can_txready(FAR struct can_dev_s *dev) * ****************************************************************************/ -static bool can_txempty(FAR struct can_dev_s *dev) +static bool stm32l4_cantxempty(FAR struct can_dev_s *dev) { FAR struct stm32l4_can_s *priv = dev->cd_priv; uint32_t regval; /* Return true if all mailboxes are available */ - regval = can_getreg(priv, STM32L4_CAN_TSR_OFFSET); + regval = stm32l4_cangetreg(priv, STM32L4_CAN_TSR_OFFSET); caninfo("CAN%d TSR: %08x\n", priv->port, regval); if ((regval & CAN_ALL_MAILBOXES) == CAN_ALL_MAILBOXES) @@ -1223,7 +1256,7 @@ static bool can_txempty(FAR struct can_dev_s *dev) } /**************************************************************************** - * Name: can_rx0interrupt + * Name: stm32l4_canrx0interrupt * * Description: * CAN RX FIFO 0 interrupt handler @@ -1237,7 +1270,7 @@ static bool can_txempty(FAR struct can_dev_s *dev) * ****************************************************************************/ -static int can_rx0interrupt(int irq, FAR void *context) +static int stm32l4_canrx0interrupt(int irq, FAR void *context) { FAR struct can_dev_s *dev = NULL; FAR struct stm32l4_can_s *priv; @@ -1252,7 +1285,7 @@ static int can_rx0interrupt(int irq, FAR void *context) /* Verify that a message is pending in FIFO 0 */ - regval = can_getreg(priv, STM32L4_CAN_RF0R_OFFSET); + regval = stm32l4_cangetreg(priv, STM32L4_CAN_RF0R_OFFSET); npending = (regval & CAN_RFR_FMP_MASK) >> CAN_RFR_FMP_SHIFT; if (npending < 1) { @@ -1260,11 +1293,11 @@ static int can_rx0interrupt(int irq, FAR void *context) return OK; } - can_dumpmbregs(priv, "RX0 interrupt"); + stm32l4_candumpmbregs(priv, "RX0 interrupt"); /* Get the CAN identifier. */ - regval = can_getreg(priv, STM32L4_CAN_RI0R_OFFSET); + regval = stm32l4_cangetreg(priv, STM32L4_CAN_RI0R_OFFSET); #ifdef CONFIG_CAN_EXTID if ((regval & CAN_RIR_IDE) != 0) @@ -1301,18 +1334,18 @@ static int can_rx0interrupt(int irq, FAR void *context) /* Get the DLC */ - regval = can_getreg(priv, STM32L4_CAN_RDT0R_OFFSET); + regval = stm32l4_cangetreg(priv, STM32L4_CAN_RDT0R_OFFSET); hdr.ch_dlc = (regval & CAN_RDTR_DLC_MASK) >> CAN_RDTR_DLC_SHIFT; /* Save the message data */ - regval = can_getreg(priv, STM32L4_CAN_RDL0R_OFFSET); + regval = stm32l4_cangetreg(priv, STM32L4_CAN_RDL0R_OFFSET); data[0] = (regval & CAN_RDLR_DATA0_MASK) >> CAN_RDLR_DATA0_SHIFT; data[1] = (regval & CAN_RDLR_DATA1_MASK) >> CAN_RDLR_DATA1_SHIFT; data[2] = (regval & CAN_RDLR_DATA2_MASK) >> CAN_RDLR_DATA2_SHIFT; data[3] = (regval & CAN_RDLR_DATA3_MASK) >> CAN_RDLR_DATA3_SHIFT; - regval = can_getreg(priv, STM32L4_CAN_RDH0R_OFFSET); + regval = stm32l4_cangetreg(priv, STM32L4_CAN_RDH0R_OFFSET); data[4] = (regval & CAN_RDHR_DATA4_MASK) >> CAN_RDHR_DATA4_SHIFT; data[5] = (regval & CAN_RDHR_DATA5_MASK) >> CAN_RDHR_DATA5_SHIFT; data[6] = (regval & CAN_RDHR_DATA6_MASK) >> CAN_RDHR_DATA6_SHIFT; @@ -1327,14 +1360,14 @@ static int can_rx0interrupt(int irq, FAR void *context) #ifndef CONFIG_CAN_EXTID errout: #endif - regval = can_getreg(priv, STM32L4_CAN_RF0R_OFFSET); + regval = stm32l4_cangetreg(priv, STM32L4_CAN_RF0R_OFFSET); regval |= CAN_RFR_RFOM; - can_putreg(priv, STM32L4_CAN_RF0R_OFFSET, regval); + stm32l4_canputreg(priv, STM32L4_CAN_RF0R_OFFSET, regval); return ret; } /**************************************************************************** - * Name: can_txinterrupt + * Name: stm32l4_cantxinterrupt * * Description: * CAN TX mailbox complete interrupt handler @@ -1348,7 +1381,7 @@ errout: * ****************************************************************************/ -static int can_txinterrupt(int irq, FAR void *context) +static int stm32l4_cantxinterrupt(int irq, FAR void *context) { FAR struct can_dev_s *dev = NULL; FAR struct stm32l4_can_s *priv; @@ -1359,7 +1392,7 @@ static int can_txinterrupt(int irq, FAR void *context) /* Get the transmit status */ - regval = can_getreg(priv, STM32L4_CAN_TSR_OFFSET); + regval = stm32l4_cangetreg(priv, STM32L4_CAN_TSR_OFFSET); /* Check for RQCP0: Request completed mailbox 0 */ @@ -1369,7 +1402,7 @@ static int can_txinterrupt(int irq, FAR void *context) * ALST0 and TERR0) for Mailbox 0. */ - can_putreg(priv, STM32L4_CAN_TSR_OFFSET, CAN_TSR_RQCP0); + stm32l4_canputreg(priv, STM32L4_CAN_TSR_OFFSET, CAN_TSR_RQCP0); /* Check for errors */ @@ -1389,7 +1422,7 @@ static int can_txinterrupt(int irq, FAR void *context) * ALST1 and TERR1) for Mailbox 1. */ - can_putreg(priv, STM32L4_CAN_TSR_OFFSET, CAN_TSR_RQCP1); + stm32l4_canputreg(priv, STM32L4_CAN_TSR_OFFSET, CAN_TSR_RQCP1); /* Check for errors */ @@ -1409,7 +1442,7 @@ static int can_txinterrupt(int irq, FAR void *context) * ALST2 and TERR2) for Mailbox 2. */ - can_putreg(priv, STM32L4_CAN_TSR_OFFSET, CAN_TSR_RQCP2); + stm32l4_canputreg(priv, STM32L4_CAN_TSR_OFFSET, CAN_TSR_RQCP2); /* Check for errors */ @@ -1425,7 +1458,7 @@ static int can_txinterrupt(int irq, FAR void *context) } /**************************************************************************** - * Name: can_bittiming + * Name: stm32l4_canbittiming * * Description: * Set the CAN bit timing register (BTR) based on the configured BAUD. @@ -1481,7 +1514,7 @@ static int can_txinterrupt(int irq, FAR void *context) * ****************************************************************************/ -static int can_bittiming(FAR struct stm32l4_can_s *priv) +static int stm32l4_canbittiming(FAR struct stm32l4_can_s *priv) { uint32_t tmp; uint32_t brp; @@ -1561,12 +1594,12 @@ static int can_bittiming(FAR struct stm32l4_can_s *priv) tmp |= CAN_BTR_LBKM; #endif - can_putreg(priv, STM32L4_CAN_BTR_OFFSET, tmp); + stm32l4_canputreg(priv, STM32L4_CAN_BTR_OFFSET, tmp); return OK; } /**************************************************************************** - * Name: can_enterinitmode + * Name: stm32l4_canenterinitmode * * Description: * Put the CAN cell in Initialization mode. This only disconnects the CAN @@ -1581,25 +1614,24 @@ static int can_bittiming(FAR struct stm32l4_can_s *priv) * ****************************************************************************/ -static int can_enterinitmode(FAR struct stm32l4_can_s *priv) +static int stm32l4_canenterinitmode(FAR struct stm32l4_can_s *priv) { uint32_t regval; volatile uint32_t timeout; - int ret; caninfo("CAN%d\n", priv->port); /* Enter initialization mode */ - regval = can_getreg(priv, STM32L4_CAN_MCR_OFFSET); + regval = stm32l4_cangetreg(priv, STM32L4_CAN_MCR_OFFSET); regval |= CAN_MCR_INRQ; - can_putreg(priv, STM32L4_CAN_MCR_OFFSET, regval); + stm32l4_canputreg(priv, STM32L4_CAN_MCR_OFFSET, regval); /* Wait until initialization mode is acknowledged */ for (timeout = INAK_TIMEOUT; timeout > 0; timeout--) { - regval = can_getreg(priv, STM32L4_CAN_MSR_OFFSET); + regval = stm32l4_cangetreg(priv, STM32L4_CAN_MSR_OFFSET); if ((regval & CAN_MSR_INAK) != 0) { /* We are in initialization mode */ @@ -1620,7 +1652,7 @@ static int can_enterinitmode(FAR struct stm32l4_can_s *priv) } /**************************************************************************** - * Name: can_exitinitmode + * Name: stm32l4_canexitinitmode * * Description: * Put the CAN cell out of the Initialization mode (to Normal mode) @@ -1633,22 +1665,22 @@ static int can_enterinitmode(FAR struct stm32l4_can_s *priv) * ****************************************************************************/ -static int can_exitinitmode(FAR struct stm32l4_can_s *priv) +static int stm32l4_canexitinitmode(FAR struct stm32l4_can_s *priv) { uint32_t regval; volatile uint32_t timeout; /* Exit Initialization mode, enter Normal mode */ - regval = can_getreg(priv, STM32L4_CAN_MCR_OFFSET); + regval = stm32l4_cangetreg(priv, STM32L4_CAN_MCR_OFFSET); regval &= ~CAN_MCR_INRQ; - can_putreg(priv, STM32L4_CAN_MCR_OFFSET, regval); + stm32l4_canputreg(priv, STM32L4_CAN_MCR_OFFSET, regval); /* Wait until the initialization mode exit is acknowledged */ for (timeout = INAK_TIMEOUT; timeout > 0; timeout--) { - regval = can_getreg(priv, STM32L4_CAN_MSR_OFFSET); + regval = stm32l4_cangetreg(priv, STM32L4_CAN_MSR_OFFSET); if ((regval & CAN_MSR_INAK) == 0) { /* We are out of initialization mode */ @@ -1669,7 +1701,7 @@ static int can_exitinitmode(FAR struct stm32l4_can_s *priv) } /**************************************************************************** - * Name: can_cellinit + * Name: stm32l4_cancellinit * * Description: * CAN cell initialization @@ -1682,7 +1714,7 @@ static int can_exitinitmode(FAR struct stm32l4_can_s *priv) * ****************************************************************************/ -static int can_cellinit(FAR struct stm32l4_can_s *priv) +static int stm32l4_cancellinit(FAR struct stm32l4_can_s *priv) { uint32_t regval; int ret; @@ -1691,16 +1723,16 @@ static int can_cellinit(FAR struct stm32l4_can_s *priv) /* Exit from sleep mode */ - regval = can_getreg(priv, STM32L4_CAN_MCR_OFFSET); + regval = stm32l4_cangetreg(priv, STM32L4_CAN_MCR_OFFSET); regval &= ~CAN_MCR_SLEEP; - can_putreg(priv, STM32L4_CAN_MCR_OFFSET, regval); + stm32l4_canputreg(priv, STM32L4_CAN_MCR_OFFSET, regval); /* Configure CAN behavior. Priority driven request order, not message ID. */ regval |= CAN_MCR_TXFP; - can_putreg(priv, STM32L4_CAN_MCR_OFFSET, regval); + stm32l4_canputreg(priv, STM32L4_CAN_MCR_OFFSET, regval); - ret = can_enterinitmode(priv); + ret = stm32l4_canenterinitmode(priv); if(ret != 0) { return ret; @@ -1716,25 +1748,25 @@ static int can_cellinit(FAR struct stm32l4_can_s *priv) * - Transmit FIFO priority */ - regval = can_getreg(priv, STM32L4_CAN_MCR_OFFSET); + regval = stm32l4_cangetreg(priv, STM32L4_CAN_MCR_OFFSET); regval &= ~(CAN_MCR_TXFP | CAN_MCR_RFLM | CAN_MCR_NART | CAN_MCR_AWUM | CAN_MCR_ABOM | CAN_MCR_TTCM); - can_putreg(priv, STM32L4_CAN_MCR_OFFSET, regval); + stm32l4_canputreg(priv, STM32L4_CAN_MCR_OFFSET, regval); /* Configure bit timing. */ - ret = can_bittiming(priv); + ret = stm32l4_canbittiming(priv); if (ret < 0) { canerr("ERROR: Failed to set bit timing: %d\n", ret); return ret; } - return can_exitinitmode(priv); + return stm32l4_canexitinitmode(priv); } /**************************************************************************** - * Name: can_filterinit + * Name: stm32l4_canfilterinit * * Description: * CAN filter initialization. CAN filters are not currently used by this @@ -1765,7 +1797,7 @@ static int can_cellinit(FAR struct stm32l4_can_s *priv) * ****************************************************************************/ -static int can_filterinit(FAR struct stm32l4_can_s *priv) +static int stm32l4_canfilterinit(FAR struct stm32l4_can_s *priv) { uint32_t regval; uint32_t bitmask; @@ -1778,57 +1810,57 @@ static int can_filterinit(FAR struct stm32l4_can_s *priv) /* Enter filter initialization mode */ - regval = can_getfreg(priv, STM32L4_CAN_FMR_OFFSET); + regval = stm32l4_cangetfreg(priv, STM32L4_CAN_FMR_OFFSET); regval |= CAN_FMR_FINIT; - can_putfreg(priv, STM32L4_CAN_FMR_OFFSET, regval); + stm32l4_canputfreg(priv, STM32L4_CAN_FMR_OFFSET, regval); /* Disable the filter */ - regval = can_getfreg(priv, STM32L4_CAN_FA1R_OFFSET); + regval = stm32l4_cangetfreg(priv, STM32L4_CAN_FA1R_OFFSET); regval &= ~bitmask; - can_putfreg(priv, STM32L4_CAN_FA1R_OFFSET, regval); + stm32l4_canputfreg(priv, STM32L4_CAN_FA1R_OFFSET, regval); /* Select the 32-bit scale for the filter */ - regval = can_getfreg(priv, STM32L4_CAN_FS1R_OFFSET); + regval = stm32l4_cangetfreg(priv, STM32L4_CAN_FS1R_OFFSET); regval |= bitmask; - can_putfreg(priv, STM32L4_CAN_FS1R_OFFSET, regval); + stm32l4_canputfreg(priv, STM32L4_CAN_FS1R_OFFSET, regval); /* There are 14 or 28 filter banks (depending) on the device. Each filter bank is * composed of two 32-bit registers, CAN_FiR: */ - can_putfreg(priv, STM32L4_CAN_FIR_OFFSET(priv->filter, 1), 0); - can_putfreg(priv, STM32L4_CAN_FIR_OFFSET(priv->filter, 2), 0); + stm32l4_canputfreg(priv, STM32L4_CAN_FIR_OFFSET(priv->filter, 1), 0); + stm32l4_canputfreg(priv, STM32L4_CAN_FIR_OFFSET(priv->filter, 2), 0); /* Set Id/Mask mode for the filter */ - regval = can_getfreg(priv, STM32L4_CAN_FM1R_OFFSET); + regval = stm32l4_cangetfreg(priv, STM32L4_CAN_FM1R_OFFSET); regval &= ~bitmask; - can_putfreg(priv, STM32L4_CAN_FM1R_OFFSET, regval); + stm32l4_canputfreg(priv, STM32L4_CAN_FM1R_OFFSET, regval); /* Assign FIFO 0 for the filter */ - regval = can_getfreg(priv, STM32L4_CAN_FFA1R_OFFSET); + regval = stm32l4_cangetfreg(priv, STM32L4_CAN_FFA1R_OFFSET); regval &= ~bitmask; - can_putfreg(priv, STM32L4_CAN_FFA1R_OFFSET, regval); + stm32l4_canputfreg(priv, STM32L4_CAN_FFA1R_OFFSET, regval); /* Enable the filter */ - regval = can_getfreg(priv, STM32L4_CAN_FA1R_OFFSET); + regval = stm32l4_cangetfreg(priv, STM32L4_CAN_FA1R_OFFSET); regval |= bitmask; - can_putfreg(priv, STM32L4_CAN_FA1R_OFFSET, regval); + stm32l4_canputfreg(priv, STM32L4_CAN_FA1R_OFFSET, regval); /* Exit filter initialization mode */ - regval = can_getfreg(priv, STM32L4_CAN_FMR_OFFSET); + regval = stm32l4_cangetfreg(priv, STM32L4_CAN_FMR_OFFSET); regval &= ~CAN_FMR_FINIT; - can_putfreg(priv, STM32L4_CAN_FMR_OFFSET, regval); + stm32l4_canputfreg(priv, STM32L4_CAN_FMR_OFFSET, regval); return OK; } /**************************************************************************** - * Name: stm32l4_can_addextfilter + * Name: stm32l4_canaddextfilter * * Description: * Add a filter for extended CAN IDs @@ -1844,14 +1876,14 @@ static int can_filterinit(FAR struct stm32l4_can_s *priv) * ****************************************************************************/ -static int stm32l4_can_addextfilter(FAR struct stm32l4_can_s *priv, - FAR struct canioc_extfilter_s *arg) +static int stm32l4_canaddextfilter(FAR struct stm32l4_can_s *priv, + FAR struct canioc_extfilter_s *arg) { return -ENOTTY; } /**************************************************************************** - * Name: stm32l4_can_delextfilter + * Name: stm32l4_candelextfilter * * Description: * Remove a filter for extended CAN IDs @@ -1868,13 +1900,13 @@ static int stm32l4_can_addextfilter(FAR struct stm32l4_can_s *priv, * ****************************************************************************/ -static int stm32l4_can_delextfilter(FAR struct stm32l4_can_s *priv, int arg) +static int stm32l4_candelextfilter(FAR struct stm32l4_can_s *priv, int arg) { return -ENOTTY; } /**************************************************************************** - * Name: stm32l4_can_addextfilter + * Name: stm32l4_canaddextfilter * * Description: * Add a filter for standard CAN IDs @@ -1890,14 +1922,14 @@ static int stm32l4_can_delextfilter(FAR struct stm32l4_can_s *priv, int arg) * ****************************************************************************/ -static int stm32l4_can_addstdfilter(FAR struct stm32l4_can_s *priv, - FAR struct canioc_stdfilter_s *arg) +static int stm32l4_canaddstdfilter(FAR struct stm32l4_can_s *priv, + FAR struct canioc_stdfilter_s *arg) { return -ENOTTY; } /**************************************************************************** - * Name: stm32l4_can_delstdfilter + * Name: stm32l4_candelstdfilter * * Description: * Remove a filter for standard CAN IDs @@ -1914,7 +1946,7 @@ static int stm32l4_can_addstdfilter(FAR struct stm32l4_can_s *priv, * ****************************************************************************/ -static int stm32l4_can_delstdfilter(FAR struct stm32l4_can_s *priv, int arg) +static int stm32l4_candelstdfilter(FAR struct stm32l4_can_s *priv, int arg) { return -ENOTTY; } -- GitLab From 91b82dcae3f2756943789437628dd884dcf83289 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 22 Jun 2016 08:36:50 -0600 Subject: [PATCH 015/229] SYSLOG character device channel will now expand LF to CR-LF --- drivers/syslog/syslog_devchannel.c | 41 ++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/drivers/syslog/syslog_devchannel.c b/drivers/syslog/syslog_devchannel.c index fc6c439d83..62472a4b96 100644 --- a/drivers/syslog/syslog_devchannel.c +++ b/drivers/syslog/syslog_devchannel.c @@ -61,7 +61,8 @@ /* SYSLOG channel methods */ -static int syslog_dev_force(int ch); +static int syslog_devchan_putc(int ch); +static int syslog_devchan_force(int ch); /**************************************************************************** * Private Data @@ -71,8 +72,8 @@ static int syslog_dev_force(int ch); static const struct syslog_channel_s g_syslog_dev_channel = { - syslog_dev_putc, - syslog_dev_force, + syslog_devchan_putc, + syslog_devchan_force, syslog_dev_flush, }; @@ -81,14 +82,44 @@ static const struct syslog_channel_s g_syslog_dev_channel = ****************************************************************************/ /**************************************************************************** - * Name: syslog_dev_force + * Name: syslog_devchan_putc + * + * Description: + * A front-end to syslog_dev_putc that does LF -> CR-LF expansion + * + ****************************************************************************/ + +static int syslog_devchan_putc(int ch) +{ + int ret; + + /* Check for a linefeed */ + + if (ch == '/n') + { + /* Pre-pend a carriage return */ + + ret = syslog_dev_putc('/r'); + if (ret < 0) + { + return ret; + } + } + + /* Output the provided character */ + + return syslog_dev_putc(ch); +} + +/**************************************************************************** + * Name: syslog_devchan_force * * Description: * A dummy FORCE method * ****************************************************************************/ -static int syslog_dev_force(int ch) +static int syslog_devchan_force(int ch) { return ch; } -- GitLab From 82d746ec3551aa9a418b06222d71fe316bad12a3 Mon Sep 17 00:00:00 2001 From: Sebastien Lorquet Date: Wed, 22 Jun 2016 10:02:20 -0600 Subject: [PATCH 016/229] STM32L4 CAN: Implementation of loopback IOCTLs --- arch/arm/src/stm32l4/stm32l4_can.c | 146 +++++++++++++++++++---------- include/nuttx/can.h | 4 +- 2 files changed, 101 insertions(+), 49 deletions(-) diff --git a/arch/arm/src/stm32l4/stm32l4_can.c b/arch/arm/src/stm32l4/stm32l4_can.c index c7808c8895..3821055760 100644 --- a/arch/arm/src/stm32l4/stm32l4_can.c +++ b/arch/arm/src/stm32l4/stm32l4_can.c @@ -809,7 +809,7 @@ static int stm32l4_canioctl(FAR struct can_dev_s *dev, int cmd, * Description: Set new current bit timing values * Argument: A pointer to a read-able instance of struct * canioc_bittiming_s in which the new bit timing - * valuesare provided. + * values are provided. * Returned Value: Zero (OK) is returned on success. Otherwise -1 * (ERROR)is returned with the errno variable set * to indicate thenature of the error. @@ -827,8 +827,9 @@ static int stm32l4_canioctl(FAR struct can_dev_s *dev, int cmd, FAR const struct canioc_bittiming_s *bt = (FAR const struct canioc_bittiming_s *)arg; uint32_t brp; - uint32_t stm32l4_canbit_quanta; + uint32_t can_bit_quanta; uint32_t tmp; + uint32_t regval; DEBUGASSERT(bt != NULL); DEBUGASSERT(bt->bt_baud < STM32L4_PCLK1_FREQUENCY); @@ -836,6 +837,8 @@ static int stm32l4_canioctl(FAR struct can_dev_s *dev, int cmd, DEBUGASSERT(bt->bt_tseg1 > 0 && bt->bt_tseg1 <= 16); DEBUGASSERT(bt->bt_tseg2 > 0 && bt->bt_tseg2 <= 8); + regval = stm32l4_cangetreg(priv, STM32L4_CAN_BTR_OFFSET); + /* Extract bit timing data */ /* tmp is in clocks per bit time */ @@ -843,35 +846,13 @@ static int stm32l4_canioctl(FAR struct can_dev_s *dev, int cmd, /* This value is dynamic as requested by user */ - stm32l4_canbit_quanta = bt->bt_tseg1 + bt->bt_tseg2 + 1; + can_bit_quanta = bt->bt_tseg1 + bt->bt_tseg2 + 1; - if (tmp < stm32l4_canbit_quanta) + if (tmp < can_bit_quanta) { -#if 0 - /* At the smallest brp value (1), there are already too few - * bit times (PCLK1 / baud) to meet our goal. brp must be one - * and we need make some reasonable guesses about ts1 and ts2. - */ - - brp = 1; - - /* In this case, we have to guess a good value for ts1 and ts2 */ - - tseg1 = (tmp - 1) >> 1; /* cut available time in half */ - tseg2 = tmp - tseg1 - 1; /* ts2 uses the rest minus one */ + /* This timing is not possible */ - /* if we can, try to approximate the CAN requirements, - * which are not exactly "cut baud time in half" - */ - - if (tseg1 == tseg2 && tseg1 > 1 && tseg2 < CAN_BTR_TSEG2_MAX) - { - tseg1--; - tseg2++; - } -#else ret = -EINVAL; -#endif } /* Otherwise, nquanta is stm32l4_canbit_quanta, ts1 and ts2 are @@ -881,31 +862,21 @@ static int stm32l4_canioctl(FAR struct can_dev_s *dev, int cmd, else { - brp = (tmp + (stm32l4_canbit_quanta/2)) / stm32l4_canbit_quanta; + brp = (tmp + (can_bit_quanta/2)) / can_bit_quanta; DEBUGASSERT(brp >= 1 && brp <= CAN_BTR_BRP_MAX); } caninfo("TS1: %d TS2: %d BRP: %d\n", bt->bt_tseg1, bt->bt_tseg2, brp); - /* Configure bit timing. This also does the following, less obvious - * things. Unless loopback mode is enabled, it: - * - * - Disables silent mode. - * - Disables loopback mode. - * - */ - - tmp = ((brp - 1) << CAN_BTR_BRP_SHIFT) | - ((bt->bt_tseg1 - 1) << CAN_BTR_TS1_SHIFT) | - ((bt->bt_tseg2 - 1) << CAN_BTR_TS2_SHIFT) | - ((bt->bt_sjw - 1) << CAN_BTR_SJW_SHIFT); -#ifdef CONFIG_CAN_LOOPBACK - tmp |= CAN_BTR_LBKM; -#endif + /* Configure bit timing. */ - /* Bit timing can only be configured in init mode. - * No registers are changed. - */ + regval &= ~(CAN_BTR_BRP_MASK | CAN_BTR_TS1_MASK | CAN_BTR_TS2_MASK | CAN_BTR_SJW_MASK); + regval |= ((brp - 1) << CAN_BTR_BRP_SHIFT) | + ((bt->bt_tseg1 - 1) << CAN_BTR_TS1_SHIFT) | + ((bt->bt_tseg2 - 1) << CAN_BTR_TS2_SHIFT) | + ((bt->bt_sjw - 1) << CAN_BTR_SJW_SHIFT); + + /* Bit timing can only be configured in init mode. */ ret = stm32l4_canenterinitmode(priv); if (ret != 0) @@ -913,7 +884,8 @@ static int stm32l4_canioctl(FAR struct can_dev_s *dev, int cmd, break; } - stm32l4_canputreg(priv, STM32L4_CAN_BTR_OFFSET, tmp); + stm32l4_canputreg(priv, STM32L4_CAN_BTR_OFFSET, regval); + ret = stm32l4_canexitinitmode(priv); if (ret == 0) @@ -923,6 +895,86 @@ static int stm32l4_canioctl(FAR struct can_dev_s *dev, int cmd, } break; + /* CANIOC_GET_CONNMODES: + * Description: Get the current bus connection modes + * Argument: A pointer to a write-able instance of struct + * canioc_connmodes_s in which the new bus modes will + * be returned. + * Returned Value: Zero (OK) is returned on success. Otherwise -1 + * (ERROR)is returned with the errno variable set + * to indicate the nature of the error. + * Dependencies: None + */ + + case CANIOC_GET_CONNMODES: + { + FAR struct canioc_connmodes_s *bm = + (FAR struct canioc_connmodes_s *)arg; + uint32_t regval; + + DEBUGASSERT(bm != NULL); + + regval = stm32l4_cangetreg(priv, STM32L4_CAN_BTR_OFFSET); + + bm->bm_loopback = ((regval & CAN_BTR_LBKM) == CAN_BTR_LBKM); + bm->bm_silent = ((regval & CAN_BTR_SILM) == CAN_BTR_SILM); + ret = OK; + break; + } + + /* CANIOC_SET_CONNMODES: + * Description: Set new bus connection modes values + * Argument: A pointer to a read-able instance of struct + * canioc_connmodes_s in which the new bus modes + * are provided. + * Returned Value: Zero (OK) is returned on success. Otherwise -1 + * (ERROR) is returned with the errno variable set + * to indicate the nature of the error. + * Dependencies: None + */ + + case CANIOC_SET_CONNMODES: + { + FAR struct canioc_connmodes_s *bm = + (FAR struct canioc_connmodes_s *)arg; + uint32_t regval; + + DEBUGASSERT(bm != NULL); + + regval = stm32l4_cangetreg(priv, STM32L4_CAN_BTR_OFFSET); + + if (bm->bm_loopback) + { + regval |= CAN_BTR_LBKM; + } + else + { + regval &= ~CAN_BTR_LBKM; + } + + if (bm->bm_silent) + { + regval |= CAN_BTR_SILM; + } + else + { + regval &= ~CAN_BTR_SILM; + } + + /* This register can only be configured in init mode. */ + + ret = stm32l4_canenterinitmode(priv); + if (ret != 0) + { + break; + } + + stm32l4_canputreg(priv, STM32L4_CAN_BTR_OFFSET, regval); + + ret = stm32l4_canexitinitmode(priv); + } + break; + #ifdef CONFIG_CAN_EXTID /* CANIOC_ADD_EXTFILTER: * Description: Add an address filter for a extended 29 bit diff --git a/include/nuttx/can.h b/include/nuttx/can.h index 68f65b9703..27ef01d77c 100644 --- a/include/nuttx/can.h +++ b/include/nuttx/can.h @@ -192,8 +192,8 @@ #define CANIOC_ADD_EXTFILTER _CANIOC(5) #define CANIOC_DEL_STDFILTER _CANIOC(6) #define CANIOC_DEL_EXTFILTER _CANIOC(7) -#define CANIOC_GET_CONNMODE _CANIOC(8) -#define CANIOC_SET_CONNMODE _CANIOC(9) +#define CANIOC_GET_CONNMODES _CANIOC(8) +#define CANIOC_SET_CONNMODES _CANIOC(9) /* CANIOC_USER: Device specific ioctl calls can be supported with cmds greater * than this value -- GitLab From 9c87749afce5d9b26b9f94025049a0b75f5d13c2 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 22 Jun 2016 10:08:20 -0600 Subject: [PATCH 017/229] SYSLOG device channel: Pre-pending CR to LF is now a configuration option --- drivers/syslog/Kconfig | 11 ++++++++++- drivers/syslog/syslog_devchannel.c | 8 ++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/drivers/syslog/Kconfig b/drivers/syslog/Kconfig index f3ab33f9eb..07a7f92a4c 100644 --- a/drivers/syslog/Kconfig +++ b/drivers/syslog/Kconfig @@ -48,7 +48,8 @@ config RAMLOG_CRLF bool "RAMLOG CR/LF" default n ---help--- - Pre-pend a carriage return before every linefeed that goes into the RAM log. + Pre-pend a carriage return before every linefeed that goes into the + RAM log. config RAMLOG_NONBLOCKING bool "RAMLOG non-block reads" @@ -161,6 +162,14 @@ config CONSOLE_SYSLOG example, if the only console is a Telnet console. Then in that case, console output from non-Telnet threads will go to the syslog output. +config SYSLOG_CHAR_CRLF + bool "SYSLOG device CR/LF" + default y + depends on SYSLOG_CHAR + ---help--- + Pre-pend a carriage return before every linefeed that goes to the + character device. + config SYSLOG_DEVPATH string "System log device" default "/dev/syslog" diff --git a/drivers/syslog/syslog_devchannel.c b/drivers/syslog/syslog_devchannel.c index 62472a4b96..fbc912ad78 100644 --- a/drivers/syslog/syslog_devchannel.c +++ b/drivers/syslog/syslog_devchannel.c @@ -61,7 +61,9 @@ /* SYSLOG channel methods */ +#ifdef CONFIG_SYSLOG_CHAR_CRLF static int syslog_devchan_putc(int ch); +#endif static int syslog_devchan_force(int ch); /**************************************************************************** @@ -72,7 +74,11 @@ static int syslog_devchan_force(int ch); static const struct syslog_channel_s g_syslog_dev_channel = { +#ifdef CONFIG_SYSLOG_CHAR_CRLF syslog_devchan_putc, +#else + syslog_dev_putc, +#endif syslog_devchan_force, syslog_dev_flush, }; @@ -89,6 +95,7 @@ static const struct syslog_channel_s g_syslog_dev_channel = * ****************************************************************************/ +#ifdef CONFIG_SYSLOG_CHAR_CRLF static int syslog_devchan_putc(int ch) { int ret; @@ -110,6 +117,7 @@ static int syslog_devchan_putc(int ch) return syslog_dev_putc(ch); } +#endif /**************************************************************************** * Name: syslog_devchan_force -- GitLab From b3acebd292aa44e118990dd41feaf581071b8728 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 22 Jun 2016 10:47:27 -0600 Subject: [PATCH 018/229] Update/replace drivers/syslog/README.txt --- drivers/syslog/README.txt | 502 +++++++++++++++++++++++++++++++++----- 1 file changed, 440 insertions(+), 62 deletions(-) diff --git a/drivers/syslog/README.txt b/drivers/syslog/README.txt index 479251a00b..9133dcaeed 100644 --- a/drivers/syslog/README.txt +++ b/drivers/syslog/README.txt @@ -1,74 +1,452 @@ drivers/syslog README File ========================== -This README file discusses the SYLOG drivers that can be found in the -drivers/syslog directory. The syslogging interfaces are defined in the -header file include/syslog.h. In NuttX, "syslog output" is really -synonymous to "debug output" and, therefore, the debugging interfaces -defined in the header file include/debug.h are also sysloggin interfaces. - -All SYSLOG output gots to syslog_putc. What syslog_putc does, however, -depends on the configuration. By default, all system log output will go -to the console device (/dev/console). But that behavior can be changed -reconfiguring NuttX. - -One version of syslog_putc() is defined in fs/fs_syslog.c; that version is -used when CONFIG_SYSLOG_CHAR is defined. That version of syslog_putc() -just integrates with the file system to re-direct debug output to a -character device or to a file. A disadvantage of using the generic character -device for the SYSLOG is that it cannot handle debug output generated from -interrupt level handles. - -If CONFIG_SYSLOG_CHAR is not defined, then other custom SYSLOG drivers -can be used. These custom SYSLOG drivers can do things like handle -unusual logging media and since they can avoid the general file system -interfaces, can be designed to support debug output from interrupt handlers. - -Those custom SYSLOG drivers reside in this directory. - -ramlog.c --------- +SYSLOG Interfaces +================= + + Standard SYSLOG Interfaces + -------------------------- + The NuttX SYSLOG is an architecture for getting debug and status + information from the system. The syslogging interfaces are defined in the + header file include/syslog.h. The primary interface to SYSLOG sub-system + is the function syslog() and, to a lesser extent, its companion vsyslog(): + + syslog() and vsyslog() + ---------------------- + Prototypes: + + int syslog(int priority, FAR const IPTR char *format, ...); + int vsyslog(int priority, FAR const IPTR char *src, va_list ap); + + Description: + + syslog() generates a log message. The priority argument is formed by + ORing the facility and the level values (see include/syslog.h). The + remaining arguments are a format, as in printf and any arguments to the + format. + + The NuttX implementation does not support any special formatting + characters beyond those supported by printf. + + The function vsyslog() performs the same task as syslog() with the + difference that it takes a set of arguments which have been obtained + using the stdarg variable argument list macros. + + setlogmask() + ------------ + The additional setlogmask() interface can use use to filter SYSLOG output: + + Prototypes: + + int setlogmask(int mask); + + Description: + + The setlogmask() function sets the logmask and returns the previous + mask. If the mask argument is 0, the current logmask is not modified. + + The SYSLOG priorities are: LOG_EMERG, LOG_ALERT, LOG_CRIT, LOG_ERR, + LOG_WARNING, LOG_NOTICE, LOG_INFO, and LOG_DEBUG. The bit corresponding + 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: + + * Flat Build: There is one, global SYSLOG mask that controls all output. + Protected Build: There are two SYSLOG masks. One within the kernel + that controls only kernel output. And one in user-space that controls + only user SYSLOG output. + * Kernel Build: The kernel build is compliant with the POSIX requirement: + There will be one mask for for each user process, controlling the + SYSLOG output only form that process. There will be a separate mask + accessable only in the kernel code to control kernel SYSLOG output. + * + + These are all standard interfaces as defined at http://pubs.opengroup.org/onlinepubs/009695399/functions/closelog.html + + Debug Interfaces + ---------------- + In NuttX, syslog output is really synonymous to debug output and, + therefore, the debugging interface macros defined in the header file + include/debug.h are also syslogging interfaces. Those macros are simply + wrappers around syslog(). The debugging interfaces differ from the syslog + interfaces in that: + + * They do not take a priority parameter; the priority is inherent in the + debug macro name. + * They decorate the output stream with information such as the file name + * They can each be disabled via configuration options. + + Each debug macro has a base name that represents the priority and a prefix + that represents the sub-system. Each macro is individually initialized by + both priority and sub-system. For example, uerr() is the macro used for + error level messages from the USB subsystem and is enabled with + CONFIG_DEBUG_USB_ERROR. + + The base debug macro names, their priority, and configuration variable are + summarized below: + + * info(). The info() macro is the lowest priority (LOG_INFO) and is + intended to provide general information about the flow of program + execution so that you can get an overview of the behavior of the + program. info() is often very chatty and voluminous and usually more + information than you may want to see. The info() macro is controlled + via CONFIG_DEBUG_subsystem_INFO + * warn(). The warn() macro has medium priority (LOG_WARN) and is + controlled by CONFIG_DEBUG_subsystem_WARN. The warn() is intended to + note exceptional or unexpected conditions that meigh be potential + errors or, perhaps, minor errors that easily recovered. + * err(). This is a high priority debug macro (LOG_ERROR) and controlled + by CONFIG_DEBUG_subsystem_ERROR. The err() is reserved to indicate + important error conditions. + * alert(). The highest priority debug macro (LOG_EMERG) and is + controlled by CONFIG_DEBUG_ALERT. The alert() macro is reserved for + use solely by assertion and crash handling logic. It also differs + from the other macros in that there it cannot be enabled per + subsystem. + +SYSLOG Channels +=============== + + SYSLOG Channel Interfaces + ------------------------- + In the NuttX SYSLOG implementation, the underlying device logic the + supports the SYSLOG output is referred to as a SYSLOG channel//. Each + SYSLOG channel is represented by an interface defined in + include/nuttx/syslog/syslog.h: + + /* This structure provides the interface to a SYSLOG device */ + + typedef CODE int (*syslog_putc_t)(int ch); + typedef CODE int (*syslog_flush_t)(void); + + struct syslog_channel_s + { + /* I/O redirection methods */ + + syslog_putc_t sc_putc; /* Normal buffered output */ + syslog_putc_t sc_force; /* Low-level output for interrupt handlers */ + syslog_flush_t sc_flush; /* Flush buffered output (on crash) */ + + /* Implementation specific logic may follow */ + }; + + The channel interface is instantiated by calling syslog_channel(): + + syslog_channel() + ---------------- + Prototype: + + int syslog_channel(FAR const struct syslog_channel_s *channel); + + Description: + + Configure the SYSLOGging function to use the provided channel to + generate SYSLOG output. + + Input Parmeters: + + * channel - Provides the interface to the channel to be used. + + Returned Value: + + Zero (OK)is returned on success. A negated errno value is returned + on any failure. + + syslog_channel() is a non-standard, internal OS interface and is not + avaiable to applications. It may be called numerous times as necessary to + change channel interfaces. + + By default, all system log output goes to console (/dev/console). But + that behavior can be changed by the defining CONFIG_SYSLOG in the NuttX + configuration. In that, case all low-level debug output will go through + syslog_putc(). + + NOTE: Using the NuttX configuration tool, you will need to enable basic + SYSLOG features under the File System menu. Later we will talk about the + RAMLOG device. That device is configured in the SYSLOG section under the + Device Drivers menu. But you will only see the options there if you + enable the basic SYSLOG capability in the File System menu first. + + SYSLOG Channel Initialization + ----------------------------- + The initial, default SYSLOG channel is established with statically + initialized global variables so that some level of SYSLOG output may be + available immediately upon reset. This initialized data is in the file + drivers/syslog/syslog_channel.c. The initial SYSLOG capability is + determined by the selected SYSLOG channel: + + * In-Memory Buffer (RAMLOG). Full SYSLOG capability as available at + reset. + * Serial Console. If the serial implementation provides the low-level + character output function up_putc(), then that low level serial output + is available as soon as the serial device has been configured. + * For all other SYSLOG channels, all SYSLOG output goes to the bit- + bucket until the SYSLOG channel device has been initialized. + + The syslog channel device is initialized when the bring-up logic calls + syslog_intialize(): + + syslog_initialize() + ------------------- + Prototype: + + #ifndef CONFIG_ARCH_SYSLOG + int syslog_initialize(enum syslog_init_e phase); + #else + # define syslog_initialize(phase) + #endif + + Description: + + One power up, the SYSLOG facility is non-existent or limited to very + low-level output. This function is called later in the initialization + sequence after full driver support has been initialized. It installs + the configured SYSLOG drivers and enables full SYSLOGing capability. + + This function performs these basic operations: + + * Initialize the SYSLOG device + * Call syslog_channel() to begin using that device. + * If CONFIG_ARCH_SYSLOG is selected, then the architecture-specific + logic will provide its own SYSLOG device initialize which must include + as a minimum a call to syslog_channel() to use the device. + + Input Parameters: + * phase - One of {SYSLOG_INIT_EARLY, SYSLOG_INIT_LATE} + + Returned Value: + Zero (OK) is returned on success; a negated errno value is returned on + any failure. + + Different types of SYSLOG devices have different OS initialization + requirements. Some are available immediately at reset, some are available + after some basic OS initialization, and some only after OS is fully + initialized. In order to satisfy these different initialization + requirements, syslog_initialize() is called twice from the boot-up logic: + + * syslog_initialize() is called from the architecture-specific + up_initialize() function as some as basic hardware resources have been + initialized: Timers, interrupts, etc. In this case, + syslog_initialize() is called with the argument SYSLOG_INIT_EARLY. + * syslog_initialize() is called again from os_start() when the full OS + initialization has completed, just before the application main entry + point is spawned. In this case, syslog_initialize() is called with + the argument SYSLOG_INIT_LATE. + + There are other types of SYSLOG channel devices that may require even + further initialization. For example, the file SYSLOG channel (described + below) cannot be initialized until the necessary file systems have been + mounted. + +SYSLOG Channel Options +====================== + + SYSLOG Console Device + --------------------- + The typical SYSLOG device is the system console. If you are using a + serial console, for example, then the SYSLOG output will appear on that + serial port. + + This SYSLOG channel is automatically selected by syslog_initialize() in + the LATE initialization phase based on configuration options. The + configuration options that affect this channel selection include: + + * CONFIG_DEV_CONSOLE. This setting indicates that the system supports a + console device, i.e., that the character device /dev/console exists. + * CONFIG_SERIAL_CONSOLE. This configuration option is automatically + selected when a UART or USART is configured as the system console. + There is no user selection. + * CONFIG_SYSLOG_CONSOLE. This configuration option is manually selected + from the SYSLOG menu. This is the option that acutally enables the + SYSLOG console device. It depends on CONFIG_DEV_CONSOLE and it will + automatically select CONFIG_SYSLOG_SERIAL_CONSOLE if + CONFIG_SERIAL_CONSOLE is selected. + * CONFIG_ARCH_LOWPUTC. This is an indication from the architecture + configuration that the platform supports the up_putc() interface. + up_putc() is a very low level UART interface that can even be used from + interrupt handling. + * CONFIG_SYSLOG_SERIAL_CONSOLE. This enables certain features of the + SYSLOG operation that depend on a serial console. If + CONFIG_ARCH_LOWPUTC is also selected, for example, then up_putc() will + be used for the forced SYSLOG output. + + Interrupt level SYSLOG output will be lost unless: (1) the interrupt buffer + is enabled to support serialization, or (2) a serial console is used and + up_putc() is supported. + + NOTE: The console channel uses the fixed character device at /dev/console. + The console channel is not synonymous with stdout (or file descriptor 1). + stdout is the current output from a task when, say, printf() if used. + Initially, stdout does, indeed, use the /dev/console device. However, + stdout may subsequently be redirected to some other device or file. This + is always the case, for example, when a transient device is used for a + console -- such as a USB console or a Telnet console. The SYSLOG channel + is not redirected as stdout is; the SYSLOG channel will stayed fixed (unless + it is explicitly changed via syslog_channel()). + + References: drivers/syslog/syslog_consolechannel.c and + drivers/syslog/syslog_device.c + + SYSLOG Character Device + ----------------------- + The system console device, /dev/console, is a character driver with some + special properties. However, any character driver may be used as the + SYSLOG output channel. For example, suppose you have a serial console on + /dev/ttyS0 and you want SYSLOG output on /dev/ttyS1. Or suppose you + support only a Telnet console but want to capture debug output + /dev/ttyS0. + + This SYSLOG device chhannl is selected with CONFIG_SYSLOG_CHAR and has no + other dependencies. Differences fromthe SYSLOG console channel include: + + * CONFIG_SYSLOG_DEVPATH. This configuration option string must be set + provide the full path to the character device to be used. + * The forced SYSLOG output always goes to the bit-bucket. This means + that interrupt level SYSLOG output will be lost unless the interrupt + buffer is enabled to support serialization. + * CONFIG_SYSLOG_CHAR_CRLF. If CONFIG_SYSLOG_CHAR_CRLF is selected, then + linefeeds in the SYSLOG output will be expanded to Carriage Return + + Linefeed. Since the character device is not a console device, the + addition of carriage returns to line feeds would not be performed + otherwise. You would probably want this expansion if you use a serial + terminal program with the character device output. + + References: drivers/syslog/syslog_devchannel.c and + drivers/syslog/syslog_device.c + + SYSLOG File Device + ------------------ + Files can also be used as the sink for SYSLOG output. There is, however, + a very fundamental difference in using a file as opposed the system + console, a RAM buffer, or character device: You must first mount the + file system that supports the SYSLOG file. That difference means that + the file SYSLOG channel cannot be supported during the boot-up phase but + can be instantiated later when board level logic configures the application + environment, including mounting of the file systems. + + The interface syslog_file_channal() is used to configure the SYSLOG file + channel: + + syslog_file_channel() + --------------------- + Prototype: + + #ifdef CONFIG_SYSLOG_FILE + int syslog_file_channel(FAR const char *devpath); + #endif + + Description: + + Configure to use a file in a mounted file system at 'devpath' as the + SYSLOG channel. + + This tiny function is simply a wrapper around syslog_dev_initialize() + and syslog_channel(). It calls syslog_dev_initialize() to configure + the character file at 'devpath then calls syslog_channel() to use that + device as the SYSLOG output channel. + + File SYSLOG channels differ from other SYSLOG channels in that they + cannot be established until after fully booting and mounting the target + file system. This function would need to be called from board-specific + bring-up logic AFTER mounting the file system containing 'devpath'. + + SYSLOG data generated prior to calling syslog_file_channel will, of + course, not be included in the file. + + NOTE interrupt level SYSLOG output will be lost in this case unless + the interrupt buffer is used. + + Input Parameters: + * devpath - The full path to the file to be used for SYSLOG output. + This may be an existing file or not. If the file exists, + syslog_file_channel() will append new SYSLOG data to the end of the + file. If it does not, then syslog_file_channel() will create the + file. + + Returned Value: + Zero (OK) is returned on success; a negated errno value is returned on + any failure. + + References: drivers/syslog/syslog_filechannel.c, + drivers/syslog/syslog_device.c, and include/nuttx/syslog/syslog.h. + + SYSLOG RAMLOG Device + -------------------- + The RAMLOG is a standalone feature that can be used to buffer any + character data in memory. There are, however, special configurations + that can be used to configure the RAMLOG as a SYSLOG channel. The RAMLOG + functionality is described in a more general way in the following + paragraphs. + +RAM Logging Device +================== + The RAM logging driver is a driver that was intended to support debugging - output (aka, syslogging). It might be used when the normal serial output - is not available. For example, if you are using a Telnet or USB serial - console, the debug output will get lost since the USB Telnet session does - not use the serial console. - - The RAM logginc driver is also useful when debug output on the serial - console would interfere with performance or with usability. The debug - output is write to RAM very quickly and so interferes less with realtime - performance. And since the output does not appear on the serial console - until you want it to, it does not interfere with the usability of the - serial console. The NuttShell (NSH), for eample, supports a 'dmesg' - command that can be used to dump the buffered output when you want to - see it. - - The RAM logging driver is similar to a pipe in that it saves the - debugging output in a FIFO in RAM. It differs from a pipe in numerous + output (SYSLOG) when the normal serial output is not available. For + example, if you are using a Telnet or USB serial console, the debug output + will get lost -- or worse. For example, what if you want to debug the + network over Telnet? + + The RAM logging driver can also accept debug output data from interrupt + handler with no special serialization buffering. As an added benefit, the + RAM logging driver is much less invasive. Since no actual I/O is performed + with the debug output is generated, the RAM logger tends to be much faster + and will interfere much less when used with time critical drivers. + + The RAM logging driver is similar to a pipe in that it saves the debugging + output in a circular buffer in RAM. It differs from a pipe in numerous details as needed to support logging. This driver is built when CONFIG_RAMLOG is defined in the Nuttx configuration. - Configuration options: - - CONFIG_RAMLOG - Enables the RAM logging feature - CONFIG_RAMLOG_CONSOLE - Use the RAM logging device as a system console. - If this feature is enabled (along with CONFIG_DEV_CONSOLE), then all - console output will be re-directed to a circular buffer in RAM. This - is useful, for example, if the only console is a Telnet console. Then - in that case, console output from non-Telnet threads will go to the - circular buffer and can be viewed using the NSH 'dmesg' command. - CONFIG_RAMLOG_SYSLOG - Use the RAM logging device for the syslogging - interface. If this feature is enabled then all debug output (only) - will be re-directed to the circular buffer in RAM. This RAM log can - be view from NSH using the 'dmesg' command. NOTE: Unlike the - limited, generic character driver SYSLOG device, the RAMLOG *can* - be used to generate debug output from interrupt level handlers. - CONFIG_RAMLOG_NPOLLWAITERS - The number of threads than can be waiting + dmesg + ----- + When the RAMLOG (with SYSLOG) is enabled, a new NuttShell (NSH) command + will appear: dmesg. The dmsg command will dump the contents of the + circular buffer to the console (and also clear the circular buffer). + + RAMLOG Configuration options + ---------------------------- + + * CONFIG_RAMLOG - Enables the RAM logging feature + * CONFIG_RAMLOG_CONSOLE - Use the RAM logging device as a system + console. If this feature is enabled (along with CONFIG_DEV_CONSOLE), + then all console output will be re-directed to a circular buffer in + RAM. This might be useful, for example, if the only console is a + Telnet console. Then in that case, console output from non-Telnet + threads will go to the circular buffer and can be viewed using the NSH + dmesg command. This optional is not useful in other scenarios. + * CONFIG_RAMLOG_SYSLOG - Use the RAM logging device for the syslogging + interface. If this feature is enabled (along with CONFIG_SYSLOG), + then all debug output (only) will be re-directed to the circular + buffer in RAM. This RAM log can be viewed from NSH using the 'dmesg' + command. NOTE: Unlike the limited, generic character driver SYSLOG + device, the RAMLOG *can* be used to capture debug output from + interrupt level handlers. + * CONFIG_RAMLOG_NPOLLWAITERS - The number of threads than can be waiting for this driver on poll(). Default: 4 - If CONFIG_RAMLOG_CONSOLE or CONFIG_RAMLOG_SYSLOG is selected, then the - following may also be provided: + If CONFIG_RAMLOG_CONSOLE or CONFIG_RAMLOG_SYSLOG is selected, then the + following must also be provided: + + * CONFIG_RAMLOG_BUFSIZE - The size of the circular buffer to use. + Default: 1024 bytes. + + Other miscellaneous settings - CONFIG_RAMLOG_BUFSIZE - Size of the console RAM log. Default: 1024 + * CONFIG_RAMLOG_CRLF - Pre-pend a carriage return before every linefeed + that goes into the RAM log. + * CONFIG_RAMLOG_NONBLOCKING - Reading from the RAMLOG will never block + if the RAMLOG is empty. If the RAMLOG is empty, then zero is returned + (usually interpreted as end-of-file). If you do not define this, the + NSH 'dmsg' command will lock up when called! So you probably do want + this! + * CONFIG_RAMLOG_NPOLLWAITERS - The maximum number of threads that may be + waiting on the poll method. -- GitLab From 1774ff2ed95cd5d83669330d7002c627526104be Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 22 Jun 2016 12:26:54 -0600 Subject: [PATCH 019/229] Add SYSLOG documentation to the porting guide --- Documentation/NuttxPortingGuide.html | 476 ++++++++++++++++++++++++++- drivers/syslog/README.txt | 37 +-- 2 files changed, 474 insertions(+), 39 deletions(-) diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html index b067a8c139..c56acbbf20 100644 --- a/Documentation/NuttxPortingGuide.html +++ b/Documentation/NuttxPortingGuide.html @@ -12,7 +12,7 @@

NuttX RTOS Porting Guide

-

Last Updated: May 12, 2016

+

Last Updated: June 22, 2016

@@ -208,11 +208,18 @@ 6.3.8 USB Host-Side Drivers
6.3.9 USB Device-Side Drivers
- 6.4 Power Management + 6.4 SYSLOG + 6.5 Power Management + Appendix A: NuttX Configuration Settings
@@ -5546,9 +5553,446 @@ int kbd_decode(FAR struct lib_instream_s *stream, FAR struct kbd_getstate_s *sta -

6.4 Power Management

+

6.4 SYSLOG

+ +

6.4.1 SYSLOG Interfaces

+

6.4.1.1 Standard SYSLOG Interfaces

+ + The NuttX SYSLOG is an architecture for getting debug and status + information from the system. The syslogging interfaces are defined in the + header file include/syslog.h. The primary interface to SYSLOG sub-system + is the function syslog() and, to a lesser extent, its companion vsyslog(): + +

6.4.1.2 syslog() and vsyslog()

+

Function Prototypes:

+
    +int syslog(int priority, FAR const IPTR char *format, ...);
+int vsyslog(int priority, FAR const IPTR char *src, va_list ap);
+
+

Description: + syslog() generates a log message. The priority argument is formed by ORing the facility and the level values (see include/syslog.h). The remaining arguments are a format, as in printf() and any arguments to the format. +

+

+ The NuttX implementation does not support any special formatting characters beyond those supported by printf(). +

+

+ The function vsyslog() performs the same task as syslog() with the difference that it takes a set of arguments which have been obtained using the stdarg variable argument list macros. +

+ +

6.4.1.3 setlogmask()

+

+ The additional setlogmask() interface can use use to filter SYSLOG output: +

+

Function Prototype:

+
    +int setlogmask(int mask);
+
+

Description: + The setlogmask() function sets the logmask and returns the previous mask. If the mask argument is zerio, the current logmask is not modified. +

+

+ The SYSLOG priorities are: LOG_EMERG, LOG_ALERT, LOG_CRIT, LOG_ERR, LOG_WARNING, LOG_NOTICE, LOG_INFO, and LOG_DEBUG. The bit corresponding 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: +

+
    + +
  • +

    + Flat Build: There is one, global SYSLOG mask that controls all output. +

    • +
  • +

    + Protected Build: There are two SYSLOG masks. One within the kernel that controls only kernel output. And one in user-space that controls only user SYSLOG output. +

    • +
  • +

    + Kernel Build: The kernel build is compliant with the POSIX requirement: There will be one mask for for each user process, controlling the SYSLOG output only form that process. There will be a separate mask accessable only in the kernel code to control kernel SYSLOG output. +

+

+ These are all standard interfaces as defined at OpenGroup.org. +

+ +

6.4.1.4 Debug Interfaces

+

+ In NuttX, syslog output is really synonymous to debug output and, herefore, the debugging interface macros defined in the header file + include/debug.h are also syslogging interfaces. Those macros are simply wrappers around syslog(). The debugging interfaces differ from the syslog interfaces in that: +

+
    + +
  • +

    + They do not take a priority parameter; the priority is inherent in the + debug macro name. +

    • +
  • +

    + They decorate the output stream with information such as the file name +

    • +
  • +

    + They can each be disabled via configuration options. +

    • +
+

+ Each debug macro has a base name that represents the priority and a prefix that represents the sub-system. Each macro is individually initialized by both priority and sub-system. For example, uerr() is the macro used for error level messages from the USB subsystem and is enabled with CONFIG_DEBUG_USB_ERROR. +

+

+ The base debug macro names, their priority, and configuration variable are summarized below: +

+
    + +
  • +

    + info(). The info() macro is the lowest priority (LOG_INFO) and is intended to provide general information about the flow of program execution so that you can get an overview of the behavior of the program. info() is often very chatty and voluminous and usually more information than you may want to see. The info() macro is controlled via CONFIG_DEBUG_subsystem_INFO +

    • +
  • +

    + warn(). The warn() macro has medium priority (LOG_WARN) and is controlled by CONFIG_DEBUG_subsystem_WARN. The warn() is intended to + note exceptional or unexpected conditions that meigh be potential + errors or, perhaps, minor errors that easily recovered. +

    • +
  • +

    + err(). This is a high priority debug macro (LOG_ERROR) and controlled by CONFIG_DEBUG_subsystem_ERROR. The err() is reserved to indicate important error conditions. +

    • +
  • +

    + alert(). The highest priority debug macro (LOG_EMERG) and is controlled by CONFIG_DEBUG_ALERT. The alert() macro is reserved for use solely by assertion and crash handling logic. It also differs from the other macros in that there it cannot be enabled per subsystem. +

    • +
+ +

6.4.2 SYSLOG Channels

+

6.4.2.1 SYSLOG Channel Interfaces

+

+ In the NuttX SYSLOG implementation, the underlying device logic the supports the SYSLOG output is referred to as a SYSLOG channel. Each SYSLOG channel is represented by an interface defined in include/nuttx/syslog/syslog.h: +

+
    +    /* This structure provides the interface to a SYSLOG device */
+
+    typedef CODE int (*syslog_putc_t)(int ch);
+    typedef CODE int (*syslog_flush_t)(void);
+
+    struct syslog_channel_s
+    {
+      /* I/O redirection methods */
+
+      syslog_putc_t sc_putc;    /* Normal buffered output */
+      syslog_putc_t sc_force;   /* Low-level output for interrupt handlers */
+      syslog_flush_t sc_flush;  /* Flush buffered output (on crash) */
+
+      /* Implementation specific logic may follow */
+    };
+
+

+ The channel interface is instantiated by calling syslog_channel(): +

+ +

6.4.2.1 syslog_channel()

+

Function Prototype:

+
    +int syslog_channel(FAR const struct syslog_channel_s *channel);
+
+

Description: + Configure the SYSLOG function to use the provided channel to generate SYSLOG output. +

+

+ syslog_channel() is a non-standard, internal OS interface and is not available to applications. It may be called numerous times as necessary to change channel interfaces. + By default, all system log output goes to console (/dev/console). +

+

Input Parmeters: +

    +
  • +

    + channel: Describes the interface to the channel to be used. +

    • +
+

Returned Value: +

    +

    + Zero (OK)is returned on success. A negated errno value is returned on any failure. +

    +
+ +

6.4.2.2 SYSLOG Channel Initialization

+

+ The initial, default SYSLOG channel is established with statically initialized global variables so that some level of SYSLOG output may be available immediately upon reset. This initialized data is in the file drivers/syslog/syslog_channel.c. The initial SYSLOG capability is determined by the selected SYSLOG channel: +

+
    +
  • +

    + In-Memory Buffer (RAMLOG). Full SYSLOG capability as available at reset. +

    • +
  • +

    + Serial Console. If the serial implementation provides the low-level character output function up_putc(), then that low level serial output is available as soon as the serial device has been configured. +

    • +
  • +

    + For all other SYSLOG channels, all SYSLOG output goes to the bit- + bucket until the SYSLOG channel device has been initialized. +

    • +
+

+ The syslog channel device is initialized when the bring-up logic calls syslog_initialize(): +

+ +

6.4.2.3 syslog_initialize()

+

Function Prototype:

+
    +#ifndef CONFIG_ARCH_SYSLOG
+int syslog_initialize(enum syslog_init_e phase);
+#else
+#  define syslog_initialize(phase)
+#endif
+
+

Description: + One power up, the SYSLOG facility is non-existent or limited to very low-level output. This function is called later in the initialization sequence after full driver support has been initialized. It installs the configured SYSLOG drivers and enables full SYSLOG capability. +

+

+ This function performs these basic operations: +

+
    +
  • +

    + Initialize the SYSLOG device +

    • +
  • +

    + Call syslog_channel() to begin using that device. +

    • +
  • +

    + If CONFIG_ARCH_SYSLOG is selected, then the architecture-specific logic will provide its own SYSLOG device initialize which must include as a minimum a call to syslog_channel() to use the device. +

    • +
+

Input Parameters: +

    +
  • +

    + phase: One of {SYSLOG_INIT_EARLY, SYSLOG_INIT_LATE} +

    • +
+

Returned Value: + Zero (OK) is returned on success; a negated errno value is returned on any failure. +

+

+ Different types of SYSLOG devices have different OS initialization + requirements. Some are available immediately at reset, some are available + after some basic OS initialization, and some only after OS is fully + initialized. In order to satisfy these different initialization + requirements, syslog_initialize() is called twice from the boot-up logic: +

+
    +
  • +

    + syslog_initialize() is called from the architecture-specific up_initialize() function as some as basic hardware resources have been initialized: Timers, interrupts, etc. In this case, syslog_initialize() is called with the argument SYSLOG_INIT_EARLY. +

    • +
  • +

    + syslog_initialize() is called again from os_start() when the full OS initialization has completed, just before the application main entry point is spawned. In this case, syslog_initialize() is called with the argument SYSLOG_INIT_LATE. +

    • +
+

+ There are other types of SYSLOG channel devices that may require even further initialization. For example, the file SYSLOG channel (described below) cannot be initialized until the necessary file systems have been mounted. +

+ +

6.4.3 SYSLOG Channel Options

+

6.4.3.1 SYSLOG Console Device

+

+ The typical SYSLOG device is the system console. If you are using a serial console, for example, then the SYSLOG output will appear on that serial port. +

+

+ This SYSLOG channel is automatically selected by syslog_initialize() in the LATE initialization phase based on configuration options. The configuration options that affect this channel selection include: +

+
    +
  • +

    + CONFIG_DEV_CONSOLE. This setting indicates that the system supports a console device, i.e., that the character device /dev/console exists. +

    • +
  • +

    + CONFIG_SERIAL_CONSOLE. This configuration option is automatically selected when a UART or USART is configured as the system console. There is no user selection. +

    • +
  • +

    + CONFIG_SYSLOG_CONSOLE. This configuration option is manually selected from the SYSLOG menu. This is the option that acutally enables the SYSLOG console device. It depends on CONFIG_DEV_CONSOLE and it will automatically select CONFIG_SYSLOG_SERIAL_CONSOLE if CONFIG_SERIAL_CONSOLE is selected. +

    • +
  • +

    + CONFIG_ARCH_LOWPUTC. This is an indication from the architecture configuration that the platform supports the up_putc() interface. up_putc() is a very low level UART interface that can even be used from interrupt handling. +

    • +
  • +

    + CONFIG_SYSLOG_SERIAL_CONSOLE. This enables certain features of the SYSLOG operation that depend on a serial console. If CONFIG_ARCH_LOWPUTC is also selected, for example, then up_putc() will be used for the forced SYSLOG output. +

    • +
+

+ Interrupt level SYSLOG output will be lost unless: (1) the interrupt buffer + is enabled to support serialization, or (2) a serial console is used and + up_putc() is supported. +

+

+ NOTE: The console channel uses the fixed character device at /dev/console. The console channel is not synonymous with stdout (or file descriptor 1). stdout is the current output from a task when, say, printf() if used. Initially, stdout does, indeed, use the /dev/console device. However, stdout may subsequently be redirected to some other device or file. This is always the case, for example, when a transient device is used for a console -- such as a USB console or a Telnet console. The SYSLOG channel is not redirected as stdout is; the SYSLOG channel will stayed fixed (unless it is explicitly changed via syslog_channel()). +

+

+ References: drivers/syslog/syslog_consolechannel.c and + drivers/syslog/syslog_device.c +

+ +

6.4.3.2 SYSLOG Character Device

+

+ The system console device, /dev/console, is a character driver with some special properties. However, any character driver may be used as the SYSLOG output channel. For example, suppose you have a serial console on /dev/ttyS0 and you want SYSLOG output on /dev/ttyS1. Or suppose you support only a Telnet console but want to capture debug output /dev/ttyS0. +

+

+ This SYSLOG device channel is selected with CONFIG_SYSLOG_CHAR and has no other dependencies. Differences fromthe SYSLOG console channel include: +

+
    +
  • +

    + CONFIG_SYSLOG_DEVPATH. This configuration option string must be set provide the full path to the character device to be used. +

    • +
  • +

    + The forced SYSLOG output always goes to the bit-bucket. This means that interrupt level SYSLOG output will be lost unless the interrupt buffer is enabled to support serialization. +

    • +
  • +

    + CONFIG_SYSLOG_CHAR_CRLF. If CONFIG_SYSLOG_CHAR_CRLF is selected, then linefeeds in the SYSLOG output will be expanded to Carriage Return plus Linefeed. Since the character device is not a console device, the addition of carriage returns to line feeds would not be performed otherwise. You would probably want this expansion if you use a serial terminal program with the character device output. +

    • +
+

+ References: drivers/syslog/syslog_devchannel.c and drivers/syslog/syslog_device.c +

+ +

6.4.3.3 SYSLOG File Device

+

+ Files can also be used as the sink for SYSLOG output. There is, however, a very fundamental difference in using a file as opposed the system console, a RAM buffer, or character device: You must first mount the file system that supports the SYSLOG file. That difference means that the file SYSLOG channel cannot be supported during the boot-up phase but can be instantiated later when board level logic configures the application environment, including mounting of the file systems. +

+

+ The interface syslog_file_channel() is used to configure the SYSLOG file channel: +

+ +

6.4.3.4 syslog_file_channel()

+

Function Prototype:

+
    +#ifdef CONFIG_SYSLOG_FILE
+int syslog_file_channel(FAR const char *devpath);
+#endif
+
+

Description: + Configure to use a file in a mounted file system at devpath as the SYSLOG channel. +

+

+ This tiny function is simply a wrapper around syslog_dev_initialize() and syslog_channel(). It calls syslog_dev_initialize() to configure the character file at devpath then calls syslog_channel() to use that device as the SYSLOG output channel. +

+

+ File SYSLOG channels differ from other SYSLOG channels in that they cannot be established until after fully booting and mounting the target file system. This function would need to be called from board-specific bring-up logic AFTER mounting the file system containing devpath. +

+

+ SYSLOG data generated prior to calling syslog_file_channel() will, of course, not be included in the file. +

+

+ NOTE interrupt level SYSLOG output will be lost in this case unless the interrupt buffer is used. +

+ +

Input Parameters: +

    +
  • +

    + devpath: The full path to the file to be used for SYSLOG output. This may be an existing file or not. If the file exists, + syslog_file_channel() will append new SYSLOG data to the end of the file. If it does not, then syslog_file_channel() will create the file. +

    • +
+

Returned Value: + Zero (OK) is returned on success; a negated errno value is returned on any failure. +

+

+ References: drivers/syslog/syslog_filechannel.c, drivers/syslog/syslog_device.c, and include/nuttx/syslog/syslog.h. +

+ +

6.4.3.5 SYSLOG RAMLOG Device

+

+ The RAMLOG is a standalone feature that can be used to buffer any + character data in memory. There are, however, special configurations + that can be used to configure the RAMLOG as a SYSLOG channel. The RAMLOG + functionality is described in a more general way in the following + paragraphs. +

+ +

6.4.4 RAM Logging Device

+

+ The RAM logging driver is a driver that was intended to support debugging output (SYSLOG) when the normal serial output is not available. For example, if you are using a Telnet or USB serial console, the debug output will get lost -- or worse. For example, what if you want to debug the network over Telnet? +

+

+ The RAM logging driver can also accept debug output data from interrupt handler with no special serialization buffering. As an added benefit, the RAM logging driver is much less invasive. Since no actual I/O is performed with the debug output is generated, the RAM logger tends to be much faster and will interfere much less when used with time critical drivers. +

+

+ The RAM logging driver is similar to a pipe in that it saves the debugging output in a circular buffer in RAM. It differs from a pipe in numerous details as needed to support logging. +

+

+ This driver is built when CONFIG_RAMLOG is defined in the Nuttx configuration. +

+ +

6.4.4.1 dmesg

+

+ When the RAMLOG (with SYSLOG) is enabled, a new NuttShell (NSH) command will appear: dmesg. The dmesg command will dump the contents of the circular buffer to the console (and also clear the circular buffer). +

+ +

6.4.4.2 RAMLOG Configuration options

+
    +
  • +

    + CONFIG_RAMLOG: Enables the RAM logging feature +

    • +
  • +

    + CONFIG_RAMLOG_CONSOLE: Use the RAM logging device as a system console. If this feature is enabled (along with CONFIG_DEV_CONSOLE), then all console output will be re-directed to a circular buffer in RAM. This might be useful, for example, if the only console is a Telnet console. Then in that case, console output from non-Telnet threads will go to the circular buffer and can be viewed using the NSH dmesg command. This optional is not useful in other scenarios. +

    • +
  • +

    + CONFIG_RAMLOG_SYSLOG: Use the RAM logging device for the SYSLOG interface. If this feature is enabled, then all debug output will be re-directed to the circular buffer in RAM. This RAM log can be viewed from NSH using the dmesg command. NOTE: Unlike the limited, generic character driver SYSLOG device, the RAMLOG can be used to capture debug output from + interrupt level handlers. +

    • +
  • +

    + CONFIG_RAMLOG_NPOLLWAITERS: The number of threads than can be waiting for this driver on poll(). Default: 4 +

    • +
+

+ If CONFIG_RAMLOG_CONSOLE or CONFIG_RAMLOG_SYSLOG is selected, then the following must also be provided: +

+
    +
  • +

    + CONFIG_RAMLOG_BUFSIZE: The size of the circular buffer to use. Default: 1024 bytes. +

    • +
+

+ Other miscellaneous settings +

+
    +
  • +

    + CONFIG_RAMLOG_CRLF: Pre-pend a carriage return before every linefeed that goes into the RAM log. +

    • +
  • +

    + CONFIG_RAMLOG_NONBLOCKING: Reading from the RAMLOG will never block if the RAMLOG is empty. If the RAMLOG is empty, then zero is returned (usually interpreted as end-of-file). If you do not define this, the NSH dmesg command will lock up when called! So you probably do want this! +

    • +
  • +

    + CONFIG_RAMLOG_NPOLLWAITERS: The maximum number of threads that may be waiting on the poll method. +

    • +
+ +

6.5 Power Management

-

6.4.1 Overview

+

6.5.1 Overview

Power Management (PM) Sub-System. NuttX supports a simple power management (PM) sub-system. This sub-system: @@ -5632,12 +6076,12 @@ int kbd_decode(FAR struct lib_instream_s *stream, FAR struct kbd_getstate_s *sta Multiple PM domains might be useful, for example, if you would want to control power states associated with a network separately from power states associated with a user interface.

-

6.4.2 Interfaces

+

6.5.2 Interfaces

All PM interfaces are declared in the file include/nuttx/power/pm.h.

-

6.4.2.1 pm_initialize()

+

6.5.2.1 pm_initialize()

Function Prototype:

     #include <nuttx/power/pm.h>
@@ -5654,7 +6098,7 @@ None
 None
 
    
 
-
    6.4.2.2 pm_register()
    
+
    6.5.2.2 pm_register()
    
 
    Function Prototype:
    
 
       #include <nuttx/power/pm.h>
@@ -5674,7 +6118,7 @@ int pm_register(FAR struct pm_callback_s *callbacks);
 Zero (OK) on success; otherwise a negated errno value is returned.
 
      
 
-
      6.4.2.3 pm_activity()
      
+
      6.5.2.3 pm_activity()
      
 
      Function Prototype:
      
 
         #include <nuttx/power/pm.h>
@@ -5703,7 +6147,7 @@ void pm_activity(int domain, int priority);
   This function may be called from an interrupt handler (this is the ONLY PM function that may be called from an interrupt handler!).
 
        
 
-
        6.4.2.4 pm_checkstate()
        
+
        6.5.2.4 pm_checkstate()
        
 
        Function Prototype:
        
 
           #include <nuttx/power/pm.h>
@@ -5733,7 +6177,7 @@ enum pm_state_e pm_checkstate(int domain);
   The recommended power management state.
 
          
 
-
          6.4.2.5 pm_changestate()
          
+
          6.5.2.5 pm_changestate()
          
 
          Function Prototype:
          
 
             #include <nuttx/power/pm.h>
@@ -5763,14 +6207,14 @@ enum pm_state_e pm_checkstate(int domain);
    suspend the IDLE thread before it completes the entire state change unless interrupts are disabled throughout the state change.
 
            
 
-
            6.4.3 Callbacks
            
+
            6.5.3 Callbacks
            
 
            
   The struct pm_callback_s includes the pointers to the driver callback functions.
   This structure is defined include/nuttx/power/pm.h.
   These callback functions can be used to provide power management information to the driver.
 
            
 
-
            6.4.3.1 prepare()
            
+
            6.5.3.1 prepare()
            
 
            Function Prototype:
            
 
               int (*prepare)(FAR struct pm_callback_s *cb, int domain, enum pm_state_e pmstate);
@@ -5800,7 +6244,7 @@ int (*prepare)(FAR struct pm_callback_s *cb, int domain, enum pm_state_e pmstate
    consumption modes!
 
              
 
-
              6.4.3.1 notify()
              
+
              6.5.3.1 notify()
              
 
              Function Prototype:
              
 
                 #include <nuttx/power/pm.h>
diff --git a/drivers/syslog/README.txt b/drivers/syslog/README.txt
index 9133dcaeed..3d3da0bdc3 100644
--- a/drivers/syslog/README.txt
+++ b/drivers/syslog/README.txt
@@ -149,6 +149,10 @@ SYSLOG Channels
     Configure the SYSLOGging function to use the provided channel to
     generate SYSLOG output.
 
+    syslog_channel() is a non-standard, internal OS interface and is not
+    available to applications.  It may be called numerous times as
+    necessary to change channel interfaces.
+
   Input Parmeters:
 
      * channel - Provides the interface to the channel to be used.
@@ -158,21 +162,6 @@ SYSLOG Channels
     Zero (OK)is returned on  success.  A negated errno value is returned
     on any failure.
 
-  syslog_channel() is a non-standard, internal OS interface and is not
-  avaiable to applications.  It may be called numerous times as necessary to
-  change channel interfaces.
-
-  By default, all system log output goes to console (/dev/console).  But
-  that behavior can be changed by the defining CONFIG_SYSLOG in the NuttX
-  configuration.  In that, case all low-level debug output will go through
-  syslog_putc().
-
-  NOTE: Using the NuttX configuration tool, you will need to enable basic
-  SYSLOG features under the File System menu.  Later we will talk about the
-  RAMLOG device.  That device is configured in the SYSLOG section under the
-  Device Drivers menu.  But you will only see the options there if you
-  enable the basic SYSLOG capability in the File System menu first.
-
   SYSLOG Channel Initialization
   -----------------------------
   The initial, default SYSLOG channel is established with statically
@@ -218,6 +207,7 @@ SYSLOG Channels
       as a minimum a call to syslog_channel() to use the device.
 
   Input Parameters:
+
     * phase - One of {SYSLOG_INIT_EARLY, SYSLOG_INIT_LATE}
 
   Returned Value:
@@ -302,7 +292,7 @@ SYSLOG Channel Options
   support only a Telnet console but want to capture debug output
   /dev/ttyS0.
 
-  This SYSLOG device chhannl is selected with CONFIG_SYSLOG_CHAR and has no
+  This SYSLOG device channel is selected with CONFIG_SYSLOG_CHAR and has no
   other dependencies.  Differences fromthe SYSLOG console channel include:
 
     * CONFIG_SYSLOG_DEVPATH.  This configuration option string must be set
@@ -330,7 +320,7 @@ SYSLOG Channel Options
   can be instantiated later when board level logic configures the application
   environment, including mounting of the file systems.
 
-  The interface syslog_file_channal() is used to configure the SYSLOG file
+  The interface syslog_file_channel() is used to configure the SYSLOG file
   channel:
 
   syslog_file_channel()
@@ -363,6 +353,7 @@ SYSLOG Channel Options
     the interrupt buffer is used.
 
   Input Parameters:
+
     * devpath - The full path to the file to be used for SYSLOG output.
       This may be an existing file or not.  If the file exists,
       syslog_file_channel() will append new SYSLOG data to the end of the
@@ -370,6 +361,7 @@ SYSLOG Channel Options
       file.
 
   Returned Value:
+
     Zero (OK) is returned on success; a negated errno value is returned on
     any failure.
 
@@ -424,12 +416,11 @@ RAM Logging Device
       threads will go to the circular buffer and can be viewed using the NSH
       dmesg command.  This optional is not useful in other scenarios.
     * CONFIG_RAMLOG_SYSLOG - Use the RAM logging device for the syslogging
-      interface.  If this feature is enabled (along with CONFIG_SYSLOG),
-      then all debug output (only) will be re-directed to the circular
-      buffer in RAM.  This RAM log can be viewed from NSH using the 'dmesg'
-      command.  NOTE:  Unlike the limited, generic character driver SYSLOG
-      device, the RAMLOG *can* be used to capture debug output from
-      interrupt level handlers.
+      interface.  If this feature is enabled, then all debug output (only)
+      will be re-directed to the circular buffer in RAM.  This RAM log can
+      be viewed from NSH using the 'dmesg' command.  NOTE:  Unlike the
+      limited, generic character driver SYSLOG device, the RAMLOG *can* be
+      used to capture debug output from interrupt level handlers.
     * CONFIG_RAMLOG_NPOLLWAITERS - The number of threads than can be waiting
       for this driver on poll().  Default: 4
 
-- 
GitLab


From 0cb137d02169da83456f080e5f3c3a0f773dcb5a Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Wed, 22 Jun 2016 13:35:53 -0600
Subject: [PATCH 020/229] SYSLOG device flush logic not meaningful if SYSLOG
 file channels not supported

---
 drivers/syslog/syslog_device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/syslog/syslog_device.c b/drivers/syslog/syslog_device.c
index 0364c603a2..22bc08eb35 100644
--- a/drivers/syslog/syslog_device.c
+++ b/drivers/syslog/syslog_device.c
@@ -578,7 +578,7 @@ int syslog_dev_flush(void)
 {
   int ret = 0;;
 
-#ifndef CONFIG_DISABLE_MOUNTPOINT
+#if defined(CONFIG_SYSLOG_FILE) && !defined(CONFIG_DISABLE_MOUNTPOINT)
   FAR struct inode *inode = g_syslog_dev.sl_file.f_inode;
 
   /* Is this a mountpoint? Does it support the sync method? */
-- 
GitLab


From 31b8e522677a964812f9e0cf45aef6ca7c92cb31 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Wed, 22 Jun 2016 14:47:40 -0600
Subject: [PATCH 021/229] Update README and documentatino

---
 Documentation/NuttxPortingGuide.html | 56 +++++++++++++++++++++++++++
 drivers/syslog/README.txt            | 57 ++++++++++++++++++++++++++++
 2 files changed, 113 insertions(+)

diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index c56acbbf20..c19c544a79 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -5801,6 +5801,62 @@ int syslog_initialize(enum syslog_init_e phase);
   There are other types of SYSLOG channel devices that may require even further initialization.  For example, the file SYSLOG channel (described below) cannot be initialized until the necessary file systems have been mounted.
 
                
 
+
                6.4.2.3 Interrupt Level SYSLOG Output
                
+
                
+  As a general statement, SYSLOG output only supports //normal// output from NuttX tasks.  However, for debugging purposes, it is also useful to get SYSLOG output from interrupt level logic.  In an embedded system, that is often where the most critical operations are performed.
+
                
+
                
+  There are three conditions under which SYSLOG output generated from interrupt level processing can a included the SYSLOG output stream:
+
                
+
                  
+  
                1. 
+    
                  Low-Level Serial Output.
+      If you are using a SYSLOG console channel (CONFIG_SYSLOG_CONSOLE) with a serial console (CONFIG_SYSLOG_SERIAL_CONSOLE) and if the underlying architecture supports the low-level up_putc() interface(CONFIG_ARCH_LOWPUTC), then the SYLOG logic will direct the output to up_putc() which is capable of generating the serial output within the context of an interrupt handler.
+    
                  
+    
                  
+      There are a few issues in doing this however:
+    
                  
+    
                    
+      
                  • 
+        
                    
+          up_putc() is able to generate debug output in any context because it disables serial interrupts and polls the hardware directly.  These polls may take many milliseconds and during that time, all interrupts are disable within the interrupt handler.  This, of course, interferes with the real-time behavior of the RTOS.
+        
                    
+      
                    • 
+      
                  • 
+        
                    
+          The output generated by up_putc() is immediate and in real-time.  The normal SYSLOG output, on the other hand, is buffered in the serial driver and may be delayed with respect to the immediate output by many lines.  Therefore, the interrupt level SYSLOG ouput provided throug up_putc() is grossly out of synchronization with other debug output
+        
                    
+      
                    • 
+    
                  
+  
              
+
+
            • 
+  
              In-Memory Buffering.
+    If the RAMLOG SYSLOG channel is supported, then all SYSLOG output is buffered in memory.  Interrupt level SYSLOG output is no different than normal SYSLOG output in this case.
+  
              
+
              • 
+
            • 
+  
              Serialization Buffer.
+    A final option is the use the an interrupt buffer to buffer the interrupt level SYSLOG output.  In this case:
+  
              
+  
                
+    
              • 
+      
                
+        SYSLOG output generated from interrupt level process in not sent to the SYSLOG channel immediately.  Rather, it is buffered in the interrupt serialization buffer.
+      
                
+    
                • 
+    
              • 
+      
                
+        Later, when the next normal syslog output is generated, it will first empty the content of the interrupt buffer to the SYSLOG device in the proper context.  It will then be followed by the normal syslog output.  In this case, the interrupt level SYSLOG output will interrupt the normal output stream and the interrupt level SYSLOG output will be inserted into the correct position in the SYSLOG output when the next normal SYLOG output is generated.
+      
                
+    
                • 
+  
              
+  
              
+    The SYSLOG interrupt buffer is enabled with CONFIG_SYSLOG_INTBUFFER.  When the interrupt buffer is enabled, you must also provide the size of the interrupt buffer with CONFIG_SYSLOG_INTBUFSIZE.
+  
              
+
              • 
+
+
 
              6.4.3 SYSLOG Channel Options
              
 
              6.4.3.1 SYSLOG Console Device
              
 
              
diff --git a/drivers/syslog/README.txt b/drivers/syslog/README.txt
index 3d3da0bdc3..07ac0cf31e 100644
--- a/drivers/syslog/README.txt
+++ b/drivers/syslog/README.txt
@@ -234,6 +234,63 @@ SYSLOG Channels
   below) cannot be initialized until the necessary file systems have been
   mounted.
 
+  Interrupt Level SYSLOG Output
+  -----------------------------
+  As a general statement, SYSLOG output only supports //normal// output from
+  NuttX tasks.  However, for debugging purposes, it is also useful to get
+  SYSLOG output from interrupt level logic.  In an embedded system, that is
+  often where the most critical operations are performed.
+
+  There are three conditions under which SYSLOG output generated from interrupt level processing can a included the SYSLOG output stream:
+
+  1. Low-Level Serial Output
+  --------------------------
+  If you are using a SYSLOG console channel (CONFIG_SYSLOG_CONSOLE) with a
+  serial console (CONFIG_SYSLOG_SERIAL_CONSOLE) and if the underlying
+  architecture supports the low-level up_putc() interface
+  (CONFIG_ARCH_LOWPUTC), then the SYLOG logic will direct the output to
+  up_putc() which is capable of generating the serial output within the
+  context of an interrupt handler.
+
+  There are a few issues in doing this however:
+
+    * up_putc() is able to generate debug output in any context because it
+      disables serial interrupts and polls the hardware directly.  These
+      polls may take many milliseconds and during that time, all interrupts
+      are disable within the interrupt handler.  This, of course, interferes
+      with the real-time behavior of the RTOS.
+    * The output generated by up_putc() is immediate and in real-time.  The
+      normal SYSLOG output, on the other hand, is buffered in the serial
+      driver and may be delayed with respect to the immediate output by many
+      lines.  Therefore, the interrupt level SYSLOG ouput provided throug
+      up_putc() is grossly out of synchronization with other debug output
+
+  2. In-Memory Buffering
+  ----------------------
+  If the RAMLOG SYSLOG channel is supported, then all SYSLOG output is
+  buffered in memory.  Interrupt level SYSLOG output is no different than
+  normal SYSLOG output in this case.
+
+  3. Serialization Buffer
+  -----------------------
+  A final option is the use the an "interrupt buffer" to buffer the
+  interrupt level SYSLOG output.  In this case:
+
+    * SYSLOG output generated from interrupt level process in not sent to
+      the SYSLOG channel immediately.  Rather, it is buffered in the
+      interrupt serialization buffer.
+    * Later, when the next normal syslog output is generated, it will first
+      empty the content of the interrupt buffer to the SYSLOG device in the
+      proper context.  It will then be followed by the normal syslog output.
+      In this case, the interrupt level SYSLOG output will interrupt the
+      normal output stream and the interrupt level SYSLOG output will be
+      inserted into the correct position in the SYSLOG output when the next
+      normal SYLOG output is generated.
+
+  The SYSLOG interrupt buffer is enabled with CONFIG_SYSLOG_INTBUFFER.  When
+  the interrupt buffer is enabled, you must also provide the size of the
+  interrupt buffer with CONFIG_SYSLOG_INTBUFSIZE.
+
 SYSLOG Channel Options
 ======================
 
-- 
GitLab


From 8447f96ce5ae57e214dcf7f47636625a9270eac0 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Wed, 22 Jun 2016 16:02:07 -0600
Subject: [PATCH 022/229] Documentation update

---
 Documentation/NuttxPortingGuide.html | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index c19c544a79..6fb5c05cab 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -5566,6 +5566,7 @@ int kbd_decode(FAR struct lib_instream_s *stream, FAR struct kbd_getstate_s *sta
 
              6.4.1.2 syslog() and vsyslog()
              
 
              Function Prototypes:
              
 
                +#include <syslog.h>
 int syslog(int priority, FAR const IPTR char *format, ...);
 int vsyslog(int priority, FAR const IPTR char *src, va_list ap);
 
              
@@ -5585,6 +5586,7 @@ int vsyslog(int priority, FAR const IPTR char *src, va_list ap);
 
              
 
              Function Prototype:
              
 
                +#include <syslog.h>
 int setlogmask(int mask);
 
              
 
              Description:
@@ -5614,7 +5616,7 @@ int setlogmask(int mask);
       Kernel Build:  The kernel build is compliant with the POSIX requirement: There will be one mask for for each user process, controlling the SYSLOG output only form that process.  There will be a separate mask accessable only in the kernel code to control kernel SYSLOG output.
 
            
 
            
-  These are all standard interfaces as defined at OpenGroup.org.
+  The above are all standard interfaces as defined at OpenGroup.org.  Those interfaces are available for use by application software.  The remaining interfaces discussed in this section are non-standard, OS-internal interfaces.
 
            
 
 
            6.4.1.4 Debug Interfaces
            
@@ -5695,6 +5697,7 @@ int setlogmask(int mask);
 
            6.4.2.1 syslog_channel()
            
 
            Function Prototype:
            
 
              +#include <nuttx/syslog/syslog.h>
 int syslog_channel(FAR const struct syslog_channel_s *channel);
 
            
 
            Description:
@@ -5744,6 +5747,7 @@ int syslog_channel(FAR const struct syslog_channel_s *channel);
 
            6.4.2.3 syslog_initialize()
            
 
            Function Prototype:
            
 
              +#include <nuttx/syslog/syslog.h>
 #ifndef CONFIG_ARCH_SYSLOG
 int syslog_initialize(enum syslog_init_e phase);
 #else
@@ -5936,6 +5940,7 @@ int syslog_initialize(enum syslog_init_e phase);
 
              6.4.3.4 syslog_file_channel()
              
 
              Function Prototype:
              
 
                +#include <nuttx/syslog/syslog.h>
 #ifdef CONFIG_SYSLOG_FILE
 int syslog_file_channel(FAR const char *devpath);
 #endif
-- 
GitLab


From acf3b14fe21f9028898e063ff3b6dc3428d2652b Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Wed, 22 Jun 2016 16:17:57 -0600
Subject: [PATCH 023/229] Trivial typo fix in README and document

---
 Documentation/NuttxPortingGuide.html | 2 +-
 drivers/syslog/README.txt            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index 6fb5c05cab..d36ca6f210 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -5664,7 +5664,7 @@ int setlogmask(int mask);
   
   
              • 
     
                
-      alert(). The highest priority debug macro (LOG_EMERG) and is controlled by CONFIG_DEBUG_ALERT.  The alert() macro is reserved for use solely by assertion and crash handling logic.  It also differs from the other macros in that there it cannot be enabled per subsystem.
+      alert(). The highest priority debug macro (LOG_EMERG) and is controlled by CONFIG_DEBUG_ALERT.  The alert() macro is reserved for use solely by assertion and crash handling logic.  It also differs from the other macros in that it cannot be enabled or disabled per subsystem.
   
                • 
 
              
 
diff --git a/drivers/syslog/README.txt b/drivers/syslog/README.txt
index 07ac0cf31e..2764f0e2ad 100644
--- a/drivers/syslog/README.txt
+++ b/drivers/syslog/README.txt
@@ -107,7 +107,7 @@ SYSLOG Interfaces
     * alert(). The highest priority debug macro (LOG_EMERG) and is
       controlled by CONFIG_DEBUG_ALERT.  The alert() macro is reserved for
       use solely by assertion and crash handling logic.  It also differs
-      from the other macros in that there it cannot be enabled per
+      from the other macros in that it cannot be enabled or disabled per
       subsystem.
 
 SYSLOG Channels
-- 
GitLab


From 2cc6204c691059be3136672e035c58a81fee66e8 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Thu, 23 Jun 2016 15:55:35 -0600
Subject: [PATCH 024/229] Removed  stm32f746g-disco/knsh configuration it
 failed to refresh (via tools/refresh.sh).  I assume that it is a hand-edited
 configuration and, hence, must be removed from the repository

---
 configs/stm32f746g-disco/knsh/Make.defs | 113 ---
 configs/stm32f746g-disco/knsh/defconfig | 908 ------------------------
 configs/stm32f746g-disco/knsh/setenv.sh |  77 --
 3 files changed, 1098 deletions(-)
 delete mode 100644 configs/stm32f746g-disco/knsh/Make.defs
 delete mode 100644 configs/stm32f746g-disco/knsh/defconfig
 delete mode 100755 configs/stm32f746g-disco/knsh/setenv.sh

diff --git a/configs/stm32f746g-disco/knsh/Make.defs b/configs/stm32f746g-disco/knsh/Make.defs
deleted file mode 100644
index c3735a3848..0000000000
--- a/configs/stm32f746g-disco/knsh/Make.defs
+++ /dev/null
@@ -1,113 +0,0 @@
-############################################################################
-# configs/stm32f746g-disco/knsh/Make.defs
-#
-#   Copyright (C) 2015 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.
-#
-############################################################################
-
-include ${TOPDIR}/.config
-include ${TOPDIR}/tools/Config.mk
-include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-
-LDSCRIPT = flash.ld
-
-ifeq ($(WINTOOL),y)
-  # Windows-native toolchains
-  DIRLINK = $(TOPDIR)/tools/copydir.sh
-  DIRUNLINK = $(TOPDIR)/tools/unlink.sh
-  MKDEP = $(TOPDIR)/tools/mkwindeps.sh
-  ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
-  ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
-else
-  # Linux/Cygwin-native toolchain
-  MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
-  ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
-  ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-endif
-
-CC = $(CROSSDEV)gcc
-CXX = $(CROSSDEV)g++
-CPP = $(CROSSDEV)gcc -E
-LD = $(CROSSDEV)ld
-AR = $(ARCROSSDEV)ar rcs
-NM = $(ARCROSSDEV)nm
-OBJCOPY = $(CROSSDEV)objcopy
-OBJDUMP = $(CROSSDEV)objdump
-
-ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
-ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
-
-ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  ARCHOPTIMIZATION = -g
-endif
-
-ifneq ($(CONFIG_DEBUG_NOOPT),y)
-  ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
-endif
-
-ARCHCFLAGS = -fno-builtin
-ARCHCXXFLAGS = -fno-builtin -fno-exceptions -fno-rtti
-ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
-ARCHWARNINGSXX = -Wall -Wshadow -Wundef
-ARCHDEFINES =
-ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
-
-CFLAGS = $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
-AFLAGS = $(CFLAGS) -D__ASSEMBLY__
-
-NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
-LDNXFLATFLAGS = -e main -s 2048
-
-ASMEXT = .S
-OBJEXT = .o
-LIBEXT = .a
-EXEEXT =
-
-ifneq ($(CROSSDEV),arm-nuttx-elf-)
-  LDFLAGS += -nostartfiles -nodefaultlibs
-endif
-ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  LDFLAGS += -g
-endif
-
-
-HOSTCC = gcc
-HOSTINCLUDES = -I.
-HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe
-HOSTLDFLAGS =
-
diff --git a/configs/stm32f746g-disco/knsh/defconfig b/configs/stm32f746g-disco/knsh/defconfig
deleted file mode 100644
index d4d654a795..0000000000
--- a/configs/stm32f746g-disco/knsh/defconfig
+++ /dev/null
@@ -1,908 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Nuttx/ Configuration
-#
-
-#
-# Build Setup
-#
-# CONFIG_EXPERIMENTAL is not set
-# CONFIG_DEFAULT_SMALL is not set
-# CONFIG_HOST_LINUX is not set
-# CONFIG_HOST_OSX is not set
-CONFIG_HOST_WINDOWS=y
-# CONFIG_HOST_OTHER is not set
-# CONFIG_WINDOWS_NATIVE is not set
-CONFIG_WINDOWS_CYGWIN=y
-# CONFIG_WINDOWS_MSYS is not set
-# CONFIG_WINDOWS_OTHER is not set
-
-#
-# Build Configuration
-#
-# CONFIG_APPS_DIR="../apps"
-# CONFIG_BUILD_FLAT is not set
-CONFIG_BUILD_PROTECTED=y
-CONFIG_BUILD_2PASS=y
-CONFIG_PASS1_TARGET="all"
-CONFIG_PASS1_BUILDIR="configs/stm32f746g-disco/kernel"
-CONFIG_PASS1_OBJECT=""
-CONFIG_NUTTX_USERSPACE=0x08020000
-
-#
-# Binary Output Formats
-#
-# CONFIG_RRLOAD_BINARY is not set
-CONFIG_INTELHEX_BINARY=y
-# CONFIG_MOTOROLA_SREC is not set
-CONFIG_RAW_BINARY=y
-# CONFIG_UBOOT_UIMAGE is not set
-
-#
-# Customize Header Files
-#
-# CONFIG_ARCH_STDINT_H is not set
-# CONFIG_ARCH_STDBOOL_H is not set
-# CONFIG_ARCH_MATH_H is not set
-# CONFIG_ARCH_FLOAT_H is not set
-# CONFIG_ARCH_STDARG_H is not set
-# CONFIG_ARCH_DEBUG_H is not set
-
-#
-# Debug Options
-#
-# CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
-CONFIG_ARCH_HAVE_STACKCHECK=y
-# CONFIG_STACK_COLORATION is not set
-CONFIG_DEBUG_SYMBOLS=y
-CONFIG_ARCH_HAVE_CUSTOMOPT=y
-CONFIG_DEBUG_NOOPT=y
-# CONFIG_DEBUG_CUSTOMOPT is not set
-# CONFIG_DEBUG_FULLOPT is not set
-
-#
-# System Type
-#
-CONFIG_ARCH_ARM=y
-# CONFIG_ARCH_AVR is not set
-# CONFIG_ARCH_HC is not set
-# CONFIG_ARCH_MIPS is not set
-# CONFIG_ARCH_RGMP is not set
-# CONFIG_ARCH_SH is not set
-# CONFIG_ARCH_SIM is not set
-# CONFIG_ARCH_X86 is not set
-# CONFIG_ARCH_Z16 is not set
-# CONFIG_ARCH_Z80 is not set
-CONFIG_ARCH="arm"
-
-#
-# ARM Options
-#
-# CONFIG_ARCH_CHIP_A1X is not set
-# CONFIG_ARCH_CHIP_C5471 is not set
-# CONFIG_ARCH_CHIP_CALYPSO is not set
-# CONFIG_ARCH_CHIP_DM320 is not set
-# CONFIG_ARCH_CHIP_EFM32 is not set
-# CONFIG_ARCH_CHIP_IMX1 is not set
-# CONFIG_ARCH_CHIP_KINETIS is not set
-# CONFIG_ARCH_CHIP_KL is not set
-# CONFIG_ARCH_CHIP_LM is not set
-# CONFIG_ARCH_CHIP_TIVA is not set
-# CONFIG_ARCH_CHIP_LPC11XX is not set
-# CONFIG_ARCH_CHIP_LPC17XX is not set
-# CONFIG_ARCH_CHIP_LPC214X is not set
-# CONFIG_ARCH_CHIP_LPC2378 is not set
-# CONFIG_ARCH_CHIP_LPC31XX is not set
-# CONFIG_ARCH_CHIP_LPC43XX is not set
-# CONFIG_ARCH_CHIP_NUC1XX is not set
-# CONFIG_ARCH_CHIP_SAMA5 is not set
-# CONFIG_ARCH_CHIP_SAMD is not set
-# CONFIG_ARCH_CHIP_SAML is not set
-# CONFIG_ARCH_CHIP_SAM34 is not set
-# CONFIG_ARCH_CHIP_SAMV7 is not set
-# CONFIG_ARCH_CHIP_STM32 is not set
-CONFIG_ARCH_CHIP_STM32F7=y
-# CONFIG_ARCH_CHIP_STR71X is not set
-# CONFIG_ARCH_CHIP_TMS570 is not set
-# CONFIG_ARCH_CHIP_MOXART is not set
-# CONFIG_ARCH_ARM7TDMI is not set
-# CONFIG_ARCH_ARM926EJS is not set
-# CONFIG_ARCH_ARM920T is not set
-# CONFIG_ARCH_CORTEXM0 is not set
-# CONFIG_ARCH_CORTEXM3 is not set
-# CONFIG_ARCH_CORTEXM4 is not set
-CONFIG_ARCH_CORTEXM7=y
-# CONFIG_ARCH_CORTEXA5 is not set
-# CONFIG_ARCH_CORTEXA8 is not set
-# CONFIG_ARCH_CORTEXA9 is not set
-# CONFIG_ARCH_CORTEXR4 is not set
-# CONFIG_ARCH_CORTEXR4F is not set
-# CONFIG_ARCH_CORTEXR5 is not set
-# CONFIG_ARCH_CORTEX5F is not set
-# CONFIG_ARCH_CORTEXR7 is not set
-# CONFIG_ARCH_CORTEXR7F is not set
-CONFIG_ARCH_FAMILY="armv7-m"
-CONFIG_ARCH_CHIP="stm32f7"
-CONFIG_ARM_TOOLCHAIN_GNU=y
-# CONFIG_ARMV7M_USEBASEPRI is not set
-CONFIG_ARCH_HAVE_CMNVECTOR=y
-CONFIG_ARMV7M_CMNVECTOR=y
-# CONFIG_ARMV7M_LAZYFPU is not set
-CONFIG_ARCH_HAVE_FPU=y
-CONFIG_ARCH_HAVE_DPFPU=y
-# CONFIG_ARCH_FPU is not set
-CONFIG_ARM_HAVE_MPU_UNIFIED=y
-CONFIG_ARM_MPU=y
-CONFIG_ARM_MPU_NREGIONS=16
-
-#
-# ARMV7M Configuration Options
-#
-CONFIG_ARMV7M_HAVE_ICACHE=y
-CONFIG_ARMV7M_HAVE_DCACHE=y
-CONFIG_ARMV7M_ICACHE=y
-CONFIG_ARMV7M_DCACHE=y
-CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y
-CONFIG_ARMV7M_HAVE_ITCM=y
-CONFIG_ARMV7M_HAVE_DTCM=y
-# CONFIG_ARMV7M_ITCM is not set
-CONFIG_ARMV7M_DTCM=y
-# CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
-# CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
-# CONFIG_ARMV7M_TOOLCHAIN_CODEREDW is not set
-# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW is not set
-# CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM is not set
-# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
-CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y
-# CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE is not set
-CONFIG_ARMV7M_HAVE_STACKCHECK=y
-# CONFIG_ARMV7M_STACKCHECK is not set
-# CONFIG_ARMV7M_ITMSYSLOG is not set
-# CONFIG_SERIAL_TERMIOS is not set
-
-#
-# STM32 F7 Configuration Options
-#
-# CONFIG_ARCH_CHIP_STM32F745 is not set
-CONFIG_ARCH_CHIP_STM32F746=y
-# CONFIG_ARCH_CHIP_STM32F756 is not set
-CONFIG_STM32F7_STM32F74XX=y
-# CONFIG_STM32F7_STM32F75XX is not set
-# CONFIG_STM32F7_FLASH_512KB is not set
-CONFIG_STM32F7_FLASH_1024KB=y
-
-#
-# STM32 Peripheral Support
-#
-CONFIG_STM32F7_HAVE_LTDC=y
-# CONFIG_STM32F7_ADC is not set
-# CONFIG_STM32F7_CAN is not set
-# CONFIG_STM32F7_DAC is not set
-# CONFIG_STM32F7_DMA is not set
-# CONFIG_STM32F7_I2C is not set
-# CONFIG_STM32F7_SAI is not set
-# CONFIG_STM32F7_SPI is not set
-CONFIG_STM32F7_USART=y
-# CONFIG_STM32F7_ADC1 is not set
-# CONFIG_STM32F7_ADC2 is not set
-# CONFIG_STM32F7_ADC3 is not set
-# CONFIG_STM32F7_BKPSRAM is not set
-# CONFIG_STM32F7_CAN1 is not set
-# CONFIG_STM32F7_CAN2 is not set
-# CONFIG_STM32F7_CEC is not set
-# CONFIG_STM32F7_CRC is not set
-# CONFIG_STM32F7_CRYP is not set
-# CONFIG_STM32F7_DMA1 is not set
-# CONFIG_STM32F7_DMA2 is not set
-# CONFIG_STM32F7_DAC1 is not set
-# CONFIG_STM32F7_DAC2 is not set
-# CONFIG_STM32F7_DCMI is not set
-# CONFIG_STM32F7_ETHMAC is not set
-# CONFIG_STM32F7_FSMC is not set
-# CONFIG_STM32F7_I2C1 is not set
-# CONFIG_STM32F7_I2C2 is not set
-# CONFIG_STM32F7_I2C3 is not set
-# CONFIG_STM32F7_LPTIM1 is not set
-# CONFIG_STM32F7_LTDC is not set
-# CONFIG_STM32F7_DMA2D is not set
-# CONFIG_STM32F7_OTGFS is not set
-# CONFIG_STM32F7_OTGHS is not set
-# CONFIG_STM32F7_QUADSPI is not set
-# CONFIG_STM32F7_SAI1 is not set
-# CONFIG_STM32F7_RNG is not set
-# CONFIG_STM32F7_SAI2 is not set
-# CONFIG_STM32F7_SDMMC1 is not set
-# CONFIG_STM32F7_SPDIFRX is not set
-# CONFIG_STM32F7_SPI1 is not set
-# CONFIG_STM32F7_SPI2 is not set
-# CONFIG_STM32F7_SPI3 is not set
-# CONFIG_STM32F7_SPI4 is not set
-# CONFIG_STM32F7_SPI5 is not set
-# CONFIG_STM32F7_SPI6 is not set
-# CONFIG_STM32F7_TIM1 is not set
-# CONFIG_STM32F7_TIM2 is not set
-# CONFIG_STM32F7_TIM3 is not set
-# CONFIG_STM32F7_TIM4 is not set
-# CONFIG_STM32F7_TIM5 is not set
-# CONFIG_STM32F7_TIM6 is not set
-# CONFIG_STM32F7_TIM7 is not set
-# CONFIG_STM32F7_TIM8 is not set
-# CONFIG_STM32F7_TIM9 is not set
-# CONFIG_STM32F7_TIM10 is not set
-# CONFIG_STM32F7_TIM11 is not set
-# CONFIG_STM32F7_TIM12 is not set
-# CONFIG_STM32F7_TIM13 is not set
-# CONFIG_STM32F7_TIM14 is not set
-# CONFIG_STM32F7_TIM15 is not set
-# CONFIG_STM32F7_USART1 is not set
-# CONFIG_STM32F7_USART2 is not set
-# CONFIG_STM32F7_USART3 is not set
-# CONFIG_STM32F7_UART4 is not set
-# CONFIG_STM32F7_UART5 is not set
-CONFIG_STM32F7_USART6=y
-# CONFIG_STM32F7_UART7 is not set
-# CONFIG_STM32F7_UART8 is not set
-# CONFIG_STM32F7_IWDG is not set
-# CONFIG_STM32F7_WWDG is not set
-# CONFIG_STM32F7_CUSTOM_CLOCKCONFIG is not set
-
-#
-# Architecture Options
-#
-# CONFIG_ARCH_NOINTC is not set
-# CONFIG_ARCH_VECNOTIRQ is not set
-# CONFIG_ARCH_DMA is not set
-CONFIG_ARCH_HAVE_IRQPRIO=y
-# CONFIG_ARCH_L2CACHE is not set
-# CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
-# CONFIG_ARCH_HAVE_ADDRENV is not set
-# CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
-# CONFIG_ARCH_HAVE_MULTICPU is not set
-CONFIG_ARCH_HAVE_VFORK=y
-# CONFIG_ARCH_HAVE_MMU is not set
-CONFIG_ARCH_HAVE_MPU=y
-# CONFIG_ARCH_NAND_HWECC is not set
-# CONFIG_ARCH_HAVE_EXTCLK is not set
-# CONFIG_ARCH_HAVE_POWEROFF is not set
-# CONFIG_ARCH_HAVE_RESET is not set
-CONFIG_ARCH_USE_MPU=y
-# CONFIG_ARCH_IRQPRIO is not set
-CONFIG_ARCH_STACKDUMP=y
-# CONFIG_ENDIAN_BIG is not set
-# CONFIG_ARCH_IDLE_CUSTOM is not set
-# CONFIG_ARCH_HAVE_RAMFUNCS is not set
-CONFIG_ARCH_HAVE_RAMVECTORS=y
-# CONFIG_ARCH_RAMVECTORS is not set
-
-#
-# Board Settings
-#
-CONFIG_BOARD_LOOPSPERMSEC=43103
-# CONFIG_ARCH_CALIBRATION is not set
-
-#
-# Interrupt options
-#
-CONFIG_ARCH_HAVE_INTERRUPTSTACK=y
-CONFIG_ARCH_INTERRUPTSTACK=0
-CONFIG_ARCH_HAVE_HIPRI_INTERRUPT=y
-# CONFIG_ARCH_HIPRI_INTERRUPT is not set
-
-#
-# Boot options
-#
-# CONFIG_BOOT_RUNFROMEXTSRAM is not set
-CONFIG_BOOT_RUNFROMFLASH=y
-# CONFIG_BOOT_RUNFROMISRAM is not set
-# CONFIG_BOOT_RUNFROMSDRAM is not set
-# CONFIG_BOOT_COPYTORAM is not set
-
-#
-# Boot Memory Configuration
-#
-CONFIG_RAM_START=0x20010000
-CONFIG_RAM_SIZE=245760
-# CONFIG_ARCH_HAVE_SDRAM is not set
-
-#
-# Board Selection
-#
-CONFIG_ARCH_BOARD_STM32F746G_DISCO=y
-# CONFIG_ARCH_BOARD_CUSTOM is not set
-CONFIG_ARCH_BOARD="stm32f746g-disco"
-
-#
-# Common Board Options
-#
-CONFIG_ARCH_HAVE_LEDS=y
-CONFIG_ARCH_LEDS=y
-CONFIG_ARCH_HAVE_BUTTONS=y
-CONFIG_ARCH_BUTTONS=y
-CONFIG_ARCH_HAVE_IRQBUTTONS=y
-# CONFIG_ARCH_IRQBUTTONS is not set
-CONFIG_NSH_MMCSDMINOR=0
-
-#
-# Board-Specific Options
-#
-# CONFIG_LIB_BOARDCTL is not set
-
-#
-# RTOS Features
-#
-CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_POSIX_TIMERS is not set
-# CONFIG_DISABLE_PTHREAD is not set
-# CONFIG_DISABLE_SIGNALS is not set
-# CONFIG_DISABLE_MQUEUE is not set
-# CONFIG_DISABLE_ENVIRON is not set
-
-#
-# Clocks and Timers
-#
-CONFIG_USEC_PER_TICK=10000
-# CONFIG_SYSTEM_TIME64 is not set
-# CONFIG_CLOCK_MONOTONIC is not set
-# CONFIG_JULIAN_TIME is not set
-CONFIG_START_YEAR=2011
-CONFIG_START_MONTH=12
-CONFIG_START_DAY=6
-CONFIG_MAX_WDOGPARMS=2
-CONFIG_PREALLOC_WDOGS=4
-CONFIG_WDOG_INTRESERVE=0
-CONFIG_PREALLOC_TIMERS=4
-
-#
-# Tasks and Scheduling
-#
-# CONFIG_INIT_NONE is not set
-CONFIG_INIT_ENTRYPOINT=y
-# CONFIG_INIT_FILEPATH is not set
-CONFIG_USER_ENTRYPOINT="nsh_main"
-CONFIG_RR_INTERVAL=200
-# CONFIG_SCHED_SPORADIC is not set
-CONFIG_TASK_NAME_SIZE=0
-CONFIG_MAX_TASKS=16
-# CONFIG_SCHED_HAVE_PARENT is not set
-CONFIG_SCHED_WAITPID=y
-
-#
-# Pthread Options
-#
-# CONFIG_MUTEX_TYPES is not set
-CONFIG_NPTHREAD_KEYS=4
-
-#
-# Performance Monitoring
-#
-# CONFIG_SCHED_CPULOAD is not set
-# CONFIG_SCHED_INSTRUMENTATION is not set
-
-#
-# Files and I/O
-#
-CONFIG_DEV_CONSOLE=y
-# CONFIG_FDCLONE_DISABLE is not set
-# CONFIG_FDCLONE_STDIO is not set
-CONFIG_SDCLONE_DISABLE=y
-CONFIG_NFILE_DESCRIPTORS=8
-CONFIG_NFILE_STREAMS=8
-CONFIG_NAME_MAX=32
-# CONFIG_PRIORITY_INHERITANCE is not set
-
-#
-# RTOS hooks
-#
-# CONFIG_BOARD_INITIALIZE is not set
-# CONFIG_SCHED_STARTHOOK is not set
-# CONFIG_SCHED_ATEXIT is not set
-# CONFIG_SCHED_ONEXIT is not set
-
-#
-# Signal Numbers
-#
-CONFIG_SIG_SIGUSR1=1
-CONFIG_SIG_SIGUSR2=2
-CONFIG_SIG_SIGALARM=3
-CONFIG_SIG_SIGCONDTIMEDOUT=16
-
-#
-# POSIX Message Queue Options
-#
-CONFIG_PREALLOC_MQ_MSGS=4
-CONFIG_MQ_MAXMSGSIZE=32
-# CONFIG_MODULE is not set
-
-#
-# Work queue support
-#
-# CONFIG_SCHED_WORKQUEUE is not set
-# CONFIG_SCHED_HPWORK is not set
-# CONFIG_SCHED_LPWORK is not set
-
-#
-# Stack and heap information
-#
-CONFIG_IDLETHREAD_STACKSIZE=1024
-CONFIG_USERMAIN_STACKSIZE=2048
-CONFIG_PTHREAD_STACK_MIN=256
-CONFIG_PTHREAD_STACK_DEFAULT=2048
-CONFIG_LIB_SYSCALL=y
-CONFIG_SYS_RESERVED=8
-CONFIG_SYS_NNEST=2
-
-#
-# Device Drivers
-#
-CONFIG_DISABLE_POLL=y
-CONFIG_DEV_NULL=y
-# CONFIG_DEV_ZERO is not set
-# CONFIG_DEV_LOOP is not set
-
-#
-# Buffering
-#
-# CONFIG_DRVR_WRITEBUFFER is not set
-# CONFIG_DRVR_READAHEAD is not set
-# CONFIG_RAMDISK is not set
-# CONFIG_CAN is not set
-# CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
-# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
-# CONFIG_PWM is not set
-CONFIG_ARCH_HAVE_I2CRESET=y
-# CONFIG_I2C is not set
-CONFIG_SPI=y
-# CONFIG_SPI_SLAVE is not set
-CONFIG_SPI_EXCHANGE=y
-# CONFIG_SPI_CMDDATA is not set
-# CONFIG_SPI_CALLBACK is not set
-# CONFIG_SPI_BITBANG is not set
-# CONFIG_SPI_HWFEATURES is not set
-# CONFIG_SPI_CRCGENERATION is not set
-# CONFIG_I2S is not set
-
-#
-# Timer Driver Support
-#
-# CONFIG_TIMER is not set
-# CONFIG_RTC is not set
-# CONFIG_WATCHDOG is not set
-# CONFIG_ANALOG is not set
-# CONFIG_AUDIO_DEVICES is not set
-# CONFIG_VIDEO_DEVICES is not set
-# CONFIG_BCH is not set
-# CONFIG_INPUT is not set
-# CONFIG_IOEXPANDER is not set
-# CONFIG_LCD is not set
-
-#
-# LED Support
-#
-# CONFIG_USERLED is not set
-# CONFIG_RGBLED is not set
-# CONFIG_PCA9635PW is not set
-# CONFIG_MMCSD is not set
-# CONFIG_MODEM is not set
-# CONFIG_MTD is not set
-# CONFIG_EEPROM is not set
-# CONFIG_PIPES is not set
-# CONFIG_PM is not set
-# CONFIG_POWER is not set
-# CONFIG_SENSORS is not set
-# CONFIG_SERCOMM_CONSOLE is not set
-CONFIG_SERIAL=y
-# CONFIG_DEV_LOWCONSOLE is not set
-# CONFIG_16550_UART is not set
-# CONFIG_UART_SERIALDRIVER is not set
-# CONFIG_UART0_SERIALDRIVER is not set
-# CONFIG_UART1_SERIALDRIVER is not set
-# CONFIG_UART2_SERIALDRIVER is not set
-# CONFIG_UART3_SERIALDRIVER is not set
-# CONFIG_UART4_SERIALDRIVER is not set
-# CONFIG_UART5_SERIALDRIVER is not set
-# CONFIG_UART6_SERIALDRIVER is not set
-# CONFIG_UART7_SERIALDRIVER is not set
-# CONFIG_UART8_SERIALDRIVER is not set
-# CONFIG_SCI0_SERIALDRIVER is not set
-# CONFIG_SCI1_SERIALDRIVER is not set
-# CONFIG_USART0_SERIALDRIVER is not set
-# CONFIG_USART1_SERIALDRIVER is not set
-# CONFIG_USART2_SERIALDRIVER is not set
-# CONFIG_USART3_SERIALDRIVER is not set
-# CONFIG_USART4_SERIALDRIVER is not set
-# CONFIG_USART5_SERIALDRIVER is not set
-CONFIG_USART6_SERIALDRIVER=y
-# CONFIG_USART7_SERIALDRIVER is not set
-# CONFIG_USART8_SERIALDRIVER is not set
-# CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
-CONFIG_MCU_SERIAL=y
-CONFIG_STANDARD_SERIAL=y
-# CONFIG_SERIAL_IFLOWCONTROL is not set
-# CONFIG_SERIAL_OFLOWCONTROL is not set
-# CONFIG_SERIAL_DMA is not set
-CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
-CONFIG_USART6_SERIAL_CONSOLE=y
-# CONFIG_OTHER_SERIAL_CONSOLE is not set
-# CONFIG_NO_SERIAL_CONSOLE is not set
-
-#
-# USART6 Configuration
-#
-CONFIG_USART6_RXBUFSIZE=256
-CONFIG_USART6_TXBUFSIZE=256
-CONFIG_USART6_BAUD=115200
-CONFIG_USART6_BITS=8
-CONFIG_USART6_PARITY=0
-CONFIG_USART6_2STOP=0
-# CONFIG_USART6_IFLOWCONTROL is not set
-# CONFIG_USART6_OFLOWCONTROL is not set
-# CONFIG_USART6_DMA is not set
-# CONFIG_USBDEV is not set
-# CONFIG_USBHOST is not set
-# CONFIG_DRIVERS_WIRELESS is not set
-
-#
-# System Logging Device Options
-#
-
-#
-# System Logging
-#
-# CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
-
-#
-# Networking Support
-#
-# CONFIG_ARCH_HAVE_NET is not set
-# CONFIG_ARCH_HAVE_PHY is not set
-# CONFIG_NET is not set
-
-#
-# Crypto API
-#
-# CONFIG_CRYPTO is not set
-
-#
-# File Systems
-#
-
-#
-# File system configuration
-#
-# CONFIG_DISABLE_MOUNTPOINT is not set
-# CONFIG_FS_AUTOMOUNTER is not set
-# CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
-# CONFIG_FS_READABLE is not set
-# CONFIG_FS_WRITABLE is not set
-# CONFIG_FS_NAMED_SEMAPHORES is not set
-CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
-# CONFIG_FS_RAMMAP is not set
-# CONFIG_FS_FAT is not set
-# CONFIG_FS_NXFFS is not set
-# CONFIG_FS_ROMFS is not set
-# CONFIG_FS_TMPFS is not set
-# CONFIG_FS_SMARTFS is not set
-# CONFIG_FS_PROCFS is not set
-# CONFIG_FS_UNIONFS is not set
-
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
-#
-# Graphics Support
-#
-# CONFIG_NX is not set
-
-#
-# Memory Management
-#
-CONFIG_MM_KERNEL_HEAP=y
-CONFIG_MM_KERNEL_HEAPSIZE=8192
-# CONFIG_MM_SMALL is not set
-CONFIG_MM_REGIONS=2
-# CONFIG_ARCH_HAVE_HEAP2 is not set
-# CONFIG_GRAN is not set
-
-#
-# Audio Support
-#
-# CONFIG_AUDIO is not set
-
-#
-# Wireless Support
-#
-
-#
-# Binary Loader
-#
-# CONFIG_BINFMT_DISABLE is not set
-# CONFIG_BINFMT_EXEPATH is not set
-# CONFIG_NXFLAT is not set
-# CONFIG_ELF is not set
-# CONFIG_PIC is not set
-# CONFIG_SYMTAB_ORDEREDBYNAME is not set
-
-#
-# Library Routines
-#
-
-#
-# Standard C Library Options
-#
-CONFIG_STDIO_BUFFER_SIZE=64
-CONFIG_STDIO_LINEBUFFER=y
-CONFIG_NUNGET_CHARS=2
-CONFIG_LIB_HOMEDIR="/"
-# CONFIG_LIBM is not set
-# CONFIG_NOPRINTF_FIELDWIDTH is not set
-# CONFIG_LIBC_FLOATINGPOINT is not set
-CONFIG_LIBC_LONG_LONG=y
-# CONFIG_LIBC_IOCTL_VARIADIC is not set
-CONFIG_LIB_RAND_ORDER=1
-# CONFIG_EOL_IS_CR is not set
-# CONFIG_EOL_IS_LF is not set
-# CONFIG_EOL_IS_BOTH_CRLF is not set
-CONFIG_EOL_IS_EITHER_CRLF=y
-# CONFIG_LIBC_EXECFUNCS is not set
-CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
-CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
-# CONFIG_LIBC_STRERROR is not set
-# CONFIG_LIBC_PERROR_STDOUT is not set
-CONFIG_ARCH_LOWPUTC=y
-# CONFIG_LIBC_LOCALTIME is not set
-# CONFIG_TIME_EXTENDED is not set
-CONFIG_LIB_SENDFILE_BUFSIZE=512
-# CONFIG_ARCH_ROMGETC is not set
-# CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
-# CONFIG_LIBC_NETDB is not set
-
-#
-# Non-standard Library Support
-#
-# CONFIG_LIB_USRWORK is not set
-# CONFIG_LIB_KBDCODEC is not set
-# CONFIG_LIB_SLCDCODEC is not set
-
-#
-# Basic CXX Support
-#
-# CONFIG_C99_BOOL8 is not set
-CONFIG_HAVE_CXX=y
-CONFIG_HAVE_CXXINITIALIZE=y
-# CONFIG_CXX_NEWLONG is not set
-
-#
-# uClibc++ Standard C++ Library
-#
-# CONFIG_UCLIBCXX is not set
-
-#
-# Application Configuration
-#
-
-#
-# CAN Utilities
-#
-
-#
-# Examples
-#
-# CONFIG_EXAMPLES_CHAT is not set
-# CONFIG_EXAMPLES_CONFIGDATA is not set
-# CONFIG_EXAMPLES_CPUHOG is not set
-# CONFIG_EXAMPLES_CXXTEST is not set
-# CONFIG_EXAMPLES_DHCPD is not set
-# CONFIG_EXAMPLES_ELF is not set
-# CONFIG_EXAMPLES_FTPC is not set
-# CONFIG_EXAMPLES_FTPD is not set
-# CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
-# CONFIG_EXAMPLES_IGMP is not set
-# CONFIG_EXAMPLES_MEDIA is not set
-# CONFIG_EXAMPLES_MM is not set
-# CONFIG_EXAMPLES_MODBUS is not set
-# CONFIG_EXAMPLES_MOUNT is not set
-# CONFIG_EXAMPLES_NRF24L01TERM is not set
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
-# CONFIG_EXAMPLES_NULL is not set
-# CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
-# CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXHELLO is not set
-# CONFIG_EXAMPLES_NXIMAGE is not set
-# CONFIG_EXAMPLES_NXLINES is not set
-# CONFIG_EXAMPLES_NXTEXT is not set
-# CONFIG_EXAMPLES_OSTEST is not set
-# CONFIG_EXAMPLES_PCA9635 is not set
-# CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
-# CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_RGBLED is not set
-# CONFIG_EXAMPLES_RGMP is not set
-# CONFIG_EXAMPLES_SENDMAIL is not set
-# CONFIG_EXAMPLES_SERIALBLASTER is not set
-# CONFIG_EXAMPLES_SERIALRX is not set
-# CONFIG_EXAMPLES_SERLOOP is not set
-# CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART is not set
-# CONFIG_EXAMPLES_SMP is not set
-# CONFIG_EXAMPLES_TCPECHO is not set
-# CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_TIFF is not set
-# CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBTERM is not set
-# CONFIG_EXAMPLES_WATCHDOG is not set
-
-#
-# File System Utilities
-#
-# CONFIG_FSUTILS_INIFILE is not set
-
-#
-# GPS Utilities
-#
-# CONFIG_GPSUTILS_MINMEA_LIB is not set
-
-#
-# Graphics Support
-#
-# CONFIG_TIFF is not set
-# CONFIG_GRAPHICS_TRAVELER is not set
-
-#
-# Interpreters
-#
-# CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
-# CONFIG_INTERPRETERS_MICROPYTHON is not set
-
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
-#
-# Network Utilities
-#
-# CONFIG_NETUTILS_CODECS is not set
-# CONFIG_NETUTILS_FTPC is not set
-# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_SMTP is not set
-
-#
-# NSH Library
-#
-CONFIG_NSH_LIBRARY=y
-# CONFIG_NSH_MOTD is not set
-
-#
-# Command Line Configuration
-#
-CONFIG_NSH_READLINE=y
-# CONFIG_NSH_CLE is not set
-CONFIG_NSH_LINELEN=64
-# CONFIG_NSH_DISABLE_SEMICOLON is not set
-CONFIG_NSH_CMDPARMS=y
-CONFIG_NSH_MAXARGUMENTS=6
-CONFIG_NSH_ARGCAT=y
-CONFIG_NSH_NESTDEPTH=3
-# CONFIG_NSH_DISABLEBG is not set
-
-#
-# Disable Individual commands
-#
-# CONFIG_NSH_DISABLE_ADDROUTE is not set
-# CONFIG_NSH_DISABLE_BASENAME is not set
-# CONFIG_NSH_DISABLE_CAT is not set
-# CONFIG_NSH_DISABLE_CD is not set
-# CONFIG_NSH_DISABLE_CP is not set
-# CONFIG_NSH_DISABLE_CMP is not set
-CONFIG_NSH_DISABLE_DATE=y
-# CONFIG_NSH_DISABLE_DD is not set
-# CONFIG_NSH_DISABLE_DF is not set
-# CONFIG_NSH_DISABLE_DELROUTE is not set
-# CONFIG_NSH_DISABLE_DIRNAME is not set
-# CONFIG_NSH_DISABLE_ECHO is not set
-# CONFIG_NSH_DISABLE_EXEC is not set
-# CONFIG_NSH_DISABLE_EXIT is not set
-# CONFIG_NSH_DISABLE_FREE is not set
-# CONFIG_NSH_DISABLE_GET is not set
-# CONFIG_NSH_DISABLE_HELP is not set
-# CONFIG_NSH_DISABLE_HEXDUMP is not set
-# CONFIG_NSH_DISABLE_IFCONFIG is not set
-CONFIG_NSH_DISABLE_IFUPDOWN=y
-# CONFIG_NSH_DISABLE_KILL is not set
-# CONFIG_NSH_DISABLE_LOSETUP is not set
-CONFIG_NSH_DISABLE_LOSMART=y
-# CONFIG_NSH_DISABLE_LS is not set
-# CONFIG_NSH_DISABLE_MB is not set
-# CONFIG_NSH_DISABLE_MKDIR is not set
-# CONFIG_NSH_DISABLE_MKFIFO is not set
-# CONFIG_NSH_DISABLE_MKRD is not set
-# CONFIG_NSH_DISABLE_MH is not set
-# CONFIG_NSH_DISABLE_MOUNT is not set
-# CONFIG_NSH_DISABLE_MV is not set
-# CONFIG_NSH_DISABLE_MW is not set
-CONFIG_NSH_DISABLE_PS=y
-# CONFIG_NSH_DISABLE_PUT is not set
-# CONFIG_NSH_DISABLE_PWD is not set
-# CONFIG_NSH_DISABLE_RM is not set
-# CONFIG_NSH_DISABLE_RMDIR is not set
-# CONFIG_NSH_DISABLE_SET is not set
-# CONFIG_NSH_DISABLE_SH is not set
-# CONFIG_NSH_DISABLE_SLEEP is not set
-# CONFIG_NSH_DISABLE_TIME is not set
-# CONFIG_NSH_DISABLE_TEST is not set
-# CONFIG_NSH_DISABLE_UMOUNT is not set
-# CONFIG_NSH_DISABLE_UNAME is not set
-# CONFIG_NSH_DISABLE_UNSET is not set
-# CONFIG_NSH_DISABLE_USLEEP is not set
-# CONFIG_NSH_DISABLE_WGET is not set
-# CONFIG_NSH_DISABLE_XD is not set
-
-#
-# Configure Command Options
-#
-CONFIG_NSH_CMDOPT_DF_H=y
-CONFIG_NSH_CODECS_BUFSIZE=128
-CONFIG_NSH_CMDOPT_HEXDUMP=y
-CONFIG_NSH_FILEIOSIZE=512
-
-#
-# Scripting Support
-#
-# CONFIG_NSH_DISABLESCRIPT is not set
-# CONFIG_NSH_DISABLE_ITEF is not set
-# CONFIG_NSH_DISABLE_LOOPS is not set
-
-#
-# Console Configuration
-#
-CONFIG_NSH_CONSOLE=y
-# CONFIG_NSH_ALTCONDEV is not set
-# CONFIG_NSH_ARCHINIT is not set
-# CONFIG_NSH_LOGIN is not set
-# CONFIG_NSH_CONSOLE_LOGIN is not set
-
-#
-# NxWidgets/NxWM
-#
-
-#
-# Platform-specific Support
-#
-# CONFIG_PLATFORM_CONFIGDATA is not set
-
-#
-# System Libraries and NSH Add-Ons
-#
-# CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_CLE is not set
-# CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_SYSTEM_HEXED is not set
-# CONFIG_SYSTEM_RAMTEST is not set
-CONFIG_READLINE_HAVE_EXTMATCH=y
-CONFIG_SYSTEM_READLINE=y
-CONFIG_READLINE_ECHO=y
-# CONFIG_READLINE_TABCOMPLETION is not set
-# CONFIG_READLINE_CMD_HISTORY is not set
-# CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
-# CONFIG_SYSTEM_UBLOXMODEM is not set
-# CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm32f746g-disco/knsh/setenv.sh b/configs/stm32f746g-disco/knsh/setenv.sh
deleted file mode 100755
index 38d86c72e5..0000000000
--- a/configs/stm32f746g-disco/knsh/setenv.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-# configs/stm32f746g-disco/knsh/setenv.sh
-#
-#   Copyright (C) 2015 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.
-#
-
-if [ "$_" = "$0" ] ; then
-  echo "You must source this script, not run it!" 1>&2
-  exit 1
-fi
-
-WD=`pwd`
-if [ ! -x "setenv.sh" ]; then
-  echo "This script must be executed from the top-level NuttX build directory"
-  exit 1
-fi
-
-if [ -z "${PATH_ORIG}" ]; then
-  export PATH_ORIG="${PATH}"
-fi
-
-# This is the Cygwin path to the location where I installed the Atmel GCC
-# toolchain under Windows.  You will also have to edit this if you install
-# this toolchain in any other location
-#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Atmel/Atmel Toolchain/ARM GCC/Native/4.7.3.99/arm-gnu-toolchain/bin"
-
-# This is the Cygwin path to the location where I installed the CodeSourcery
-# toolchain under windows.  You will also have to edit this if you install
-# the CodeSourcery toolchain in any other location
-#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin"
-#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin"
-# export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin"
-
-# This is the location where I installed the ARM "GNU Tools for ARM Embedded Processors"
-# You can this free toolchain here https://launchpad.net/gcc-arm-embedded
-export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/GNU Tools ARM Embedded/4.9 2015q2/bin"
-
-# This is the path to the location where I installed the devkitARM toolchain
-# You can get this free toolchain from http://devkitpro.org/ or http://sourceforge.net/projects/devkitpro/
-#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/devkitARM/bin"
-
-# This is the Cygwin path to the location where I build the buildroot
-# toolchain.
-# export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
-
-# Add the path to the toolchain to the PATH varialble
-export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
-
-echo "PATH : ${PATH}"
-- 
GitLab


From 1377452394fa4865bcdf0ea62b6e338ffc47871a Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Thu, 23 Jun 2016 15:59:14 -0600
Subject: [PATCH 025/229] Refresh all ARM configurations

---
 configs/arduino-due/nsh/defconfig             |  64 +-
 configs/c5471evm/httpd/defconfig              | 275 ++++-----
 configs/c5471evm/nettest/defconfig            | 114 +++-
 configs/c5471evm/nsh/defconfig                |  25 +-
 configs/cc3200-launchpad/nsh/defconfig        | 375 +++++++-----
 configs/cloudctrl/nsh/defconfig               |  28 +-
 configs/compal_e86/nsh_highram/defconfig      | 152 +++--
 configs/compal_e88/nsh_highram/defconfig      | 152 +++--
 configs/compal_e99/nsh_compalram/defconfig    | 155 +++--
 configs/compal_e99/nsh_highram/defconfig      | 154 +++--
 configs/dk-tm4c129x/ipv6/defconfig            |  25 +-
 configs/dk-tm4c129x/nsh/defconfig             |  25 +-
 configs/ea3131/nsh/defconfig                  | 301 +++++-----
 configs/ea3131/pgnsh/defconfig                | 159 +++--
 configs/ea3131/usbserial/defconfig            |  54 +-
 configs/ea3152/ostest/defconfig               | 273 ++++-----
 configs/eagle100/httpd/defconfig              | 552 ++++++++++++------
 configs/eagle100/nettest/defconfig            | 118 +++-
 configs/eagle100/nsh/defconfig                |  27 +-
 configs/eagle100/nxflat/defconfig             | 436 +++++++++-----
 configs/eagle100/thttpd/defconfig             | 147 +++--
 configs/efm32-g8xx-stk/nsh/defconfig          | 288 +++++----
 configs/efm32gg-stk3700/nsh/defconfig         | 151 +++--
 configs/ekk-lm3s9b96/nsh/defconfig            |  27 +-
 configs/fire-stm32v2/nsh/defconfig            |  28 +-
 configs/freedom-kl25z/minnsh/defconfig        | 274 ++++-----
 configs/freedom-kl25z/nsh/defconfig           | 161 +++--
 configs/freedom-kl26z/minnsh/defconfig        | 278 ++++-----
 configs/freedom-kl26z/nsh/defconfig           | 161 +++--
 configs/hymini-stm32v/buttons/defconfig       |  62 +-
 configs/hymini-stm32v/nsh/defconfig           |  62 +-
 configs/hymini-stm32v/nsh2/defconfig          |  75 ++-
 configs/hymini-stm32v/usbmsc/defconfig        |  62 +-
 configs/hymini-stm32v/usbnsh/defconfig        |  66 ++-
 configs/hymini-stm32v/usbserial/defconfig     |  61 +-
 configs/kwikstik-k40/ostest/defconfig         | 141 +++--
 configs/launchxl-tms57004/nsh/defconfig       |  82 ++-
 configs/lincoln60/netnsh/defconfig            |  25 +-
 configs/lincoln60/nsh/defconfig               | 153 +++--
 configs/lincoln60/thttpd-binfs/defconfig      | 149 +++--
 configs/lm3s6432-s2e/nsh/defconfig            |  25 +-
 configs/lm3s6965-ek/discover/defconfig        |  27 +-
 configs/lm3s6965-ek/nsh/defconfig             |  27 +-
 configs/lm3s6965-ek/nx/defconfig              | 141 +++--
 configs/lm3s6965-ek/tcpecho/defconfig         | 115 +++-
 configs/lm3s8962-ek/nsh/defconfig             |  27 +-
 configs/lm3s8962-ek/nx/defconfig              | 141 +++--
 configs/lm4f120-launchpad/nsh/defconfig       | 483 +++++++++------
 configs/lpc4330-xplorer/nsh/defconfig         |  78 ++-
 configs/lpc4337-ws/nsh/defconfig              | 120 +++-
 configs/lpc4357-evb/nsh/defconfig             | 304 +++++-----
 configs/lpc4370-link2/nsh/defconfig           | 119 +++-
 configs/lpcxpresso-lpc1115/minnsh/defconfig   |  72 ++-
 configs/lpcxpresso-lpc1115/nsh/defconfig      |  76 ++-
 configs/lpcxpresso-lpc1768/dhcpd/defconfig    | 152 +++--
 configs/lpcxpresso-lpc1768/nsh/defconfig      |  28 +-
 configs/lpcxpresso-lpc1768/nx/defconfig       | 142 +++--
 configs/lpcxpresso-lpc1768/thttpd/defconfig   | 148 +++--
 configs/lpcxpresso-lpc1768/usbmsc/defconfig   | 150 +++--
 configs/maple/nsh/defconfig                   |  64 +-
 configs/maple/nx/defconfig                    |  75 ++-
 configs/maple/usbnsh/defconfig                |  65 ++-
 configs/mbed/hidkbd/defconfig                 | 414 +++++++------
 configs/mbed/nsh/defconfig                    | 313 +++++-----
 configs/mcu123-lpc214x/composite/defconfig    | 165 ++++--
 configs/mcu123-lpc214x/nsh/defconfig          | 154 +++--
 configs/mcu123-lpc214x/usbmsc/defconfig       | 152 +++--
 configs/mcu123-lpc214x/usbserial/defconfig    |  54 +-
 configs/mikroe-stm32f4/fulldemo/defconfig     |  64 +-
 configs/mikroe-stm32f4/kostest/defconfig      |  67 ++-
 configs/mikroe-stm32f4/nsh/defconfig          |  58 +-
 configs/mikroe-stm32f4/nx/defconfig           |  63 +-
 configs/mikroe-stm32f4/nxlines/defconfig      |  63 +-
 configs/mikroe-stm32f4/nxtext/defconfig       |  63 +-
 configs/mikroe-stm32f4/usbnsh/defconfig       |  59 +-
 configs/moxa/nsh/defconfig                    |  25 +-
 configs/mx1ads/ostest/defconfig               | 287 +++++----
 configs/ntosd-dm320/nettest/defconfig         | 119 +++-
 configs/ntosd-dm320/nsh/defconfig             |  25 +-
 configs/ntosd-dm320/poll/defconfig            | 144 +++--
 configs/ntosd-dm320/thttpd/defconfig          | 149 +++--
 configs/ntosd-dm320/udp/defconfig             | 334 ++++++-----
 configs/ntosd-dm320/webserver/defconfig       | 152 +++--
 configs/nucleo-144/f746-evalos/defconfig      |  62 +-
 configs/nucleo-144/f746-nsh/defconfig         |  62 +-
 configs/nucleo-144/f767-evalos/defconfig      |  63 +-
 configs/nucleo-144/f767-nsh/defconfig         |  63 +-
 configs/nucleo-f303re/adc/defconfig           |  50 +-
 configs/nucleo-f303re/can/defconfig           |  50 +-
 configs/nucleo-f303re/nxlines/defconfig       |  62 +-
 configs/nucleo-f303re/pwm/defconfig           |  55 +-
 configs/nucleo-f303re/serialrx/defconfig      |  60 +-
 configs/nucleo-f303re/uavcan/defconfig        |  50 +-
 configs/nucleo-f4x1re/f401-nsh/defconfig      |  66 ++-
 configs/nucleo-f4x1re/f411-nsh/defconfig      |  66 ++-
 configs/nucleo-l476rg/nsh/defconfig           |  68 ++-
 configs/nutiny-nuc120/nsh/defconfig           | 461 +++++++++++----
 .../olimex-efm32g880f128-stk/nsh/defconfig    | 294 +++++-----
 configs/olimex-lpc-h3131/nsh/defconfig        | 155 +++--
 configs/olimex-lpc1766stk/ftpc/defconfig      |  27 +-
 configs/olimex-lpc1766stk/hidkbd/defconfig    | 148 +++--
 configs/olimex-lpc1766stk/hidmouse/defconfig  |  25 +-
 configs/olimex-lpc1766stk/nettest/defconfig   | 119 +++-
 configs/olimex-lpc1766stk/nsh/defconfig       |  27 +-
 configs/olimex-lpc1766stk/nx/defconfig        | 138 +++--
 .../olimex-lpc1766stk/slip-httpd/defconfig    | 150 +++--
 .../olimex-lpc1766stk/thttpd-binfs/defconfig  | 150 +++--
 .../olimex-lpc1766stk/thttpd-nxflat/defconfig | 151 +++--
 configs/olimex-lpc1766stk/usbmsc/defconfig    | 149 +++--
 configs/olimex-lpc1766stk/usbserial/defconfig |  55 +-
 configs/olimex-lpc1766stk/zmodem/defconfig    |  27 +-
 configs/olimex-lpc2378/nsh/defconfig          |  74 ++-
 configs/olimex-stm32-h405/usbnsh/defconfig    |  63 +-
 configs/olimex-stm32-h407/nsh/defconfig       |  66 ++-
 configs/olimex-stm32-p107/nsh/defconfig       |  28 +-
 configs/olimex-stm32-p207/nsh/defconfig       |  28 +-
 configs/olimex-strp711/nettest/defconfig      | 124 +++-
 configs/olimex-strp711/nsh/defconfig          | 443 ++++++++------
 configs/olimexino-stm32/can/defconfig         |  71 ++-
 configs/olimexino-stm32/composite/defconfig   |  89 +--
 configs/olimexino-stm32/nsh/defconfig         |  68 ++-
 configs/olimexino-stm32/smallnsh/defconfig    |  69 ++-
 configs/olimexino-stm32/tiny/defconfig        |  67 ++-
 configs/open1788/knsh/defconfig               | 316 +++++-----
 configs/open1788/nsh/defconfig                | 112 +++-
 configs/open1788/nxlines/defconfig            | 529 ++++++++++++-----
 configs/pcduino-a10/nsh/defconfig             | 300 +++++-----
 configs/pirelli_dpl10/nsh_highram/defconfig   | 152 +++--
 configs/sabre-6quad/nsh/defconfig             |  62 +-
 configs/sabre-6quad/smp/defconfig             |  62 +-
 configs/sam3u-ek/knsh/defconfig               |  60 +-
 configs/sam3u-ek/nsh/defconfig                |  63 +-
 configs/sam3u-ek/nx/defconfig                 |  70 ++-
 configs/sam3u-ek/nxwm/defconfig               |  45 +-
 configs/sam4e-ek/nsh/defconfig                |  28 +-
 configs/sam4e-ek/nxwm/defconfig               |  28 +-
 configs/sam4e-ek/usbnsh/defconfig             |  29 +-
 configs/sam4l-xplained/nsh/defconfig          |  64 +-
 configs/sam4s-xplained-pro/nsh/defconfig      |  69 ++-
 configs/sam4s-xplained/nsh/defconfig          |  64 +-
 configs/sama5d2-xult/nsh/defconfig            |  68 ++-
 configs/sama5d3-xplained/bridge/defconfig     |  72 ++-
 configs/sama5d3-xplained/nsh/defconfig        |  66 ++-
 configs/sama5d3x-ek/demo/defconfig            |  72 ++-
 configs/sama5d3x-ek/hello/defconfig           |  64 +-
 configs/sama5d3x-ek/norboot/defconfig         |  64 +-
 configs/sama5d3x-ek/nsh/defconfig             |  66 ++-
 configs/sama5d3x-ek/nx/defconfig              |  65 ++-
 configs/sama5d3x-ek/nxplayer/defconfig        |  67 ++-
 configs/sama5d3x-ek/nxwm/defconfig            |  43 +-
 configs/sama5d3x-ek/ov2640/defconfig          |  66 ++-
 configs/sama5d4-ek/at25boot/defconfig         |  71 ++-
 configs/sama5d4-ek/bridge/defconfig           |  73 ++-
 configs/sama5d4-ek/dramboot/defconfig         |  65 ++-
 configs/sama5d4-ek/elf/defconfig              |  68 ++-
 configs/sama5d4-ek/ipv6/defconfig             |  27 +-
 configs/sama5d4-ek/knsh/defconfig             |  64 +-
 configs/sama5d4-ek/nsh/defconfig              |  27 +-
 configs/sama5d4-ek/nxwm/defconfig             |  27 +-
 configs/sama5d4-ek/ramtest/defconfig          |  67 ++-
 configs/samd20-xplained/nsh/defconfig         |  63 +-
 configs/samd21-xplained/nsh/defconfig         |  63 +-
 configs/same70-xplained/netnsh/defconfig      |  28 +-
 configs/same70-xplained/nsh/defconfig         |  79 ++-
 configs/saml21-xplained/nsh/defconfig         |  63 +-
 configs/samv71-xult/knsh/defconfig            |  66 ++-
 configs/samv71-xult/module/defconfig          |  62 +-
 configs/samv71-xult/mxtxplnd/defconfig        |  87 ++-
 configs/samv71-xult/netnsh/defconfig          |  28 +-
 configs/samv71-xult/nsh/defconfig             |  71 ++-
 configs/samv71-xult/nxwm/defconfig            |  50 +-
 configs/samv71-xult/vnc/defconfig             |  28 +-
 configs/samv71-xult/vnxwm/defconfig           |  28 +-
 configs/shenzhou/nsh/defconfig                |  28 +-
 configs/shenzhou/nxwm/defconfig               |  28 +-
 configs/shenzhou/thttpd/defconfig             |  40 +-
 configs/spark/composite/defconfig             |  92 +--
 configs/spark/nsh/defconfig                   |  74 ++-
 configs/spark/usbmsc/defconfig                |  71 ++-
 configs/spark/usbnsh/defconfig                |  68 ++-
 configs/spark/usbserial/defconfig             |  67 ++-
 configs/stm3210e-eval/buttons/defconfig       |  62 +-
 configs/stm3210e-eval/composite/defconfig     |  79 ++-
 configs/stm3210e-eval/nsh/defconfig           |  64 +-
 configs/stm3210e-eval/nsh2/defconfig          |  77 ++-
 configs/stm3210e-eval/nx/defconfig            |  69 ++-
 configs/stm3210e-eval/nxterm/defconfig        |  71 ++-
 configs/stm3210e-eval/pm/defconfig            |  71 ++-
 configs/stm3210e-eval/usbmsc/defconfig        |  62 +-
 configs/stm3210e-eval/usbserial/defconfig     |  61 +-
 configs/stm3220g-eval/dhcpd/defconfig         |  70 ++-
 configs/stm3220g-eval/nettest/defconfig       |  64 +-
 configs/stm3220g-eval/nsh/defconfig           |  27 +-
 configs/stm3220g-eval/nsh2/defconfig          |  28 +-
 configs/stm3220g-eval/nxwm/defconfig          |  26 +-
 configs/stm3220g-eval/telnetd/defconfig       |  64 +-
 configs/stm3240g-eval/dhcpd/defconfig         |  70 ++-
 configs/stm3240g-eval/discover/defconfig      |  94 +--
 configs/stm3240g-eval/knxwm/defconfig         |  45 +-
 configs/stm3240g-eval/nettest/defconfig       |  64 +-
 configs/stm3240g-eval/nsh/defconfig           |  26 +-
 configs/stm3240g-eval/nsh2/defconfig          |  28 +-
 configs/stm3240g-eval/nxterm/defconfig        |  26 +-
 configs/stm3240g-eval/nxwm/defconfig          |  26 +-
 configs/stm3240g-eval/telnetd/defconfig       |  64 +-
 configs/stm3240g-eval/webserver/defconfig     |  27 +-
 configs/stm3240g-eval/xmlrpc/defconfig        |  74 ++-
 configs/stm32_tiny/nsh/defconfig              |  66 ++-
 configs/stm32_tiny/usbnsh/defconfig           |  63 +-
 configs/stm32f103-minimum/minnsh/defconfig    |  48 +-
 configs/stm32f103-minimum/nsh/defconfig       |  64 +-
 configs/stm32f103-minimum/usbnsh/defconfig    |  63 +-
 configs/stm32f3discovery/nsh/defconfig        |  67 ++-
 configs/stm32f3discovery/usbnsh/defconfig     |  69 ++-
 configs/stm32f411e-disco/nsh/defconfig        |  64 +-
 configs/stm32f429i-disco/extflash/defconfig   |  56 +-
 configs/stm32f429i-disco/lcd/defconfig        |  71 ++-
 configs/stm32f429i-disco/ltdc/defconfig       |  75 ++-
 configs/stm32f429i-disco/nsh/defconfig        |  66 ++-
 configs/stm32f429i-disco/usbmsc/defconfig     |  68 ++-
 configs/stm32f429i-disco/usbnsh/defconfig     |  65 ++-
 configs/stm32f4discovery/cxxtest/defconfig    |  62 +-
 configs/stm32f4discovery/elf/defconfig        |  62 +-
 configs/stm32f4discovery/ipv6/defconfig       |  28 +-
 configs/stm32f4discovery/kostest/defconfig    |  60 +-
 configs/stm32f4discovery/netnsh/defconfig     |  28 +-
 configs/stm32f4discovery/nsh/defconfig        |  66 ++-
 configs/stm32f4discovery/nxlines/defconfig    |  71 ++-
 configs/stm32f4discovery/pm/defconfig         |  64 +-
 .../stm32f4discovery/posix_spawn/defconfig    |  62 +-
 configs/stm32f4discovery/rgbled/defconfig     |  75 ++-
 configs/stm32f4discovery/uavcan/defconfig     |  53 +-
 configs/stm32f4discovery/usbnsh/defconfig     |  69 ++-
 configs/stm32f746-ws/nsh/defconfig            |  43 +-
 configs/stm32f746g-disco/README.txt           |   8 -
 configs/stm32f746g-disco/netnsh/defconfig     |  38 +-
 configs/stm32f746g-disco/nsh/defconfig        |  27 +-
 configs/stm32l476vg-disco/nsh/defconfig       |  73 ++-
 configs/stm32ldiscovery/nsh/defconfig         |  62 +-
 configs/stm32vldiscovery/nsh/defconfig        |  67 ++-
 configs/teensy-3.x/nsh/defconfig              | 154 +++--
 configs/teensy-3.x/usbnsh/defconfig           |  26 +-
 configs/teensy-lc/nsh/defconfig               | 176 ++++--
 configs/tm4c123g-launchpad/nsh/defconfig      | 278 ++++-----
 configs/tm4c1294-launchpad/ipv6/defconfig     |  25 +-
 configs/tm4c1294-launchpad/nsh/defconfig      |  25 +-
 configs/twr-k60n512/nsh/defconfig             | 158 +++--
 configs/u-blox-c027/nsh/defconfig             |  35 +-
 configs/viewtool-stm32f107/highpri/defconfig  |  62 +-
 configs/viewtool-stm32f107/netnsh/defconfig   |  26 +-
 configs/viewtool-stm32f107/nsh/defconfig      |  64 +-
 configs/zkit-arm-1769/hello/defconfig         | 150 +++--
 configs/zkit-arm-1769/nsh/defconfig           |  27 +-
 configs/zkit-arm-1769/nxhello/defconfig       |  27 +-
 configs/zkit-arm-1769/thttpd/defconfig        | 151 +++--
 configs/zp214xpa/nsh/defconfig                | 137 +++--
 configs/zp214xpa/nxlines/defconfig            | 149 +++--
 257 files changed, 15916 insertions(+), 9018 deletions(-)

diff --git a/configs/arduino-due/nsh/defconfig b/configs/arduino-due/nsh/defconfig
index a14caa24fc..eb780c0556 100644
--- a/configs/arduino-due/nsh/defconfig
+++ b/configs/arduino-due/nsh/defconfig
@@ -42,10 +42,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -76,6 +77,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -94,6 +96,7 @@ CONFIG_ARCH_CHIP_SAM34=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -115,12 +118,15 @@ CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="sam34"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
@@ -131,6 +137,7 @@ CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
@@ -473,7 +480,12 @@ CONFIG_DEV_NULL=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -481,6 +493,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -492,6 +505,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -515,10 +530,6 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -545,15 +556,18 @@ CONFIG_UART0_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -585,11 +599,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -652,11 +661,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -699,10 +711,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -712,17 +724,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -730,17 +742,16 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -762,8 +773,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -774,6 +785,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -885,12 +897,12 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -898,6 +910,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/c5471evm/httpd/defconfig b/configs/c5471evm/httpd/defconfig
index faa36b2705..8407b01b8a 100644
--- a/configs/c5471evm/httpd/defconfig
+++ b/configs/c5471evm/httpd/defconfig
@@ -37,12 +37,15 @@ CONFIG_RRLOAD_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
+# CONFIG_STACK_COLORATION is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
@@ -74,10 +77,12 @@ CONFIG_ARCH_CHIP_C5471=y
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
 # CONFIG_ARCH_CHIP_TIVA is not set
+# CONFIG_ARCH_CHIP_LPC11XX is not set
 # CONFIG_ARCH_CHIP_LPC17XX is not set
 # CONFIG_ARCH_CHIP_LPC214X is not set
 # CONFIG_ARCH_CHIP_LPC2378 is not set
@@ -86,20 +91,39 @@ CONFIG_ARCH_CHIP_C5471=y
 # CONFIG_ARCH_CHIP_NUC1XX is not set
 # CONFIG_ARCH_CHIP_SAMA5 is not set
 # CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
 # CONFIG_ARCH_CHIP_SAM34 is not set
+# CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 CONFIG_ARCH_ARM7TDMI=y
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
 # CONFIG_ARCH_CORTEXM0 is not set
 # CONFIG_ARCH_CORTEXM3 is not set
 # CONFIG_ARCH_CORTEXM4 is not set
+# CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="arm"
 CONFIG_ARCH_CHIP="c5471"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
+# CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 # CONFIG_ARCH_LOWVECTORS is not set
 
@@ -153,11 +177,14 @@ CONFIG_C5471_AUTONEGOTIATION=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+# CONFIG_ARCH_HAVE_RESET is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
 # CONFIG_ARCH_IDLE_CUSTOM is not set
@@ -209,6 +236,7 @@ CONFIG_ARCH_LEDS=y
 #
 # Board-Specific Options
 #
+# CONFIG_LIB_BOARDCTL is not set
 
 #
 # RTOS Features
@@ -243,6 +271,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="webserver_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=64
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -287,9 +316,10 @@ CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
 CONFIG_SIG_SIGCONDTIMEDOUT=16
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -320,22 +350,42 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 # CONFIG_SPI is not set
 # CONFIG_I2S is not set
+
+#
+# Timer Driver Support
+#
+# CONFIG_TIMER is not set
 # CONFIG_RTC is not set
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_DEVPATH="/dev/watchdog0"
-# CONFIG_TIMER is not set
 # CONFIG_ANALOG is not set
 # CONFIG_AUDIO_DEVICES is not set
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_NETDEVICES is not set
@@ -347,6 +397,8 @@ CONFIG_WATCHDOG_DEVPATH="/dev/watchdog0"
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -370,14 +422,11 @@ CONFIG_SERIAL=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 CONFIG_OTHER_UART_SERIALDRIVER=y
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 # CONFIG_STANDARD_SERIAL is not set
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_OTHER_SERIAL_CONSOLE=y
 # CONFIG_NO_SERIAL_CONSOLE is not set
@@ -385,14 +434,18 @@ CONFIG_OTHER_SERIAL_CONSOLE=y
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -406,7 +459,6 @@ CONFIG_NET=y
 #
 # Driver buffer configuration
 #
-CONFIG_NET_IPv4=y
 # CONFIG_NET_MULTIBUFFER is not set
 CONFIG_NET_ETH_MTU=590
 CONFIG_NET_ETH_TCP_RECVWNDO=536
@@ -417,6 +469,19 @@ CONFIG_NET_GUARDSIZE=2
 #
 # CONFIG_NET_MULTILINK is not set
 CONFIG_NET_ETHERNET=y
+# CONFIG_NET_LOOPBACK is not set
+# CONFIG_NET_TUN is not set
+
+#
+# Network Device Operations
+#
+# CONFIG_NETDEV_PHY_IOCTL is not set
+
+#
+# Internet Protocol Selection
+#
+CONFIG_NET_IPv4=y
+# CONFIG_NET_IPv6 is not set
 
 #
 # Socket Support
@@ -427,14 +492,14 @@ CONFIG_NET_SOCKOPTS=y
 # CONFIG_NET_SOLINGER is not set
 
 #
-# Network Device Operations
+# Raw Socket Support
 #
-# CONFIG_NETDEV_PHY_IOCTL is not set
+# CONFIG_NET_PKT is not set
 
 #
-# Raw Socket Support
+# Unix Domain Socket Support
 #
-# CONFIG_NET_PKT is not set
+# CONFIG_NET_LOCAL is not set
 
 #
 # TCP/IP Networking
@@ -490,6 +555,7 @@ CONFIG_IOB_NCHAINS=8
 # Routing Table Configuration
 #
 # CONFIG_NET_ROUTE is not set
+CONFIG_NET_HOSTNAME=""
 
 #
 # Crypto API
@@ -510,11 +576,7 @@ CONFIG_DISABLE_MOUNTPOINT=y
 # CONFIG_FS_NAMED_SEMAPHORES is not set
 # CONFIG_FS_RAMMAP is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -534,6 +596,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -570,13 +636,18 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
 # CONFIG_LIBC_STRERROR is not set
 # CONFIG_LIBC_PERROR_STDOUT is not set
 CONFIG_ARCH_LOWPUTC=y
+# CONFIG_TIME_EXTENDED is not set
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -591,14 +662,13 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -606,11 +676,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -619,42 +689,50 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
-# CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_UDP is not set
+# CONFIG_EXAMPLES_USBTERM is not set
+# CONFIG_EXAMPLES_WATCHDOG is not set
 CONFIG_EXAMPLES_WEBSERVER=y
 CONFIG_EXAMPLES_WEBSERVER_IPADDR=0x0a000002
 CONFIG_EXAMPLES_WEBSERVER_DRIPADDR=0x0a000001
 CONFIG_EXAMPLES_WEBSERVER_NETMASK=0xffffff00
 CONFIG_EXAMPLES_WEBSERVER_NOMAC=y
-# CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBTERM is not set
-# CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WGET is not set
 
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
 #
 # Graphics Support
 #
@@ -665,25 +743,24 @@ CONFIG_EXAMPLES_WEBSERVER_NOMAC=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_MICROPYTHON is not set
 # CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
-# CONFIG_NETUTILS_DHCPD is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
-# CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TELNETD is not set
-# CONFIG_NETUTILS_TFTPC is not set
-# CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 CONFIG_NETUTILS_WEBSERVER=y
 # CONFIG_NETUTILS_HTTPD_SINGLECONNECT is not set
@@ -699,11 +776,6 @@ CONFIG_NETUTILS_HTTPD_CLASSIC=y
 CONFIG_NETUTILS_HTTPD_KEEPALIVE_DISABLE=y
 # CONFIG_NETUTILS_XMLRPC is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
@@ -721,115 +793,16 @@ CONFIG_NETUTILS_HTTPD_KEEPALIVE_DISABLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-
-#
-# Custom Free Memory Command
-#
-# CONFIG_SYSTEM_FREE is not set
-
-#
-# EMACS-like Command Line Editor
-#
 # CONFIG_SYSTEM_CLE is not set
-
-#
-# CU Minimal Terminal
-#
 # CONFIG_SYSTEM_CUTERM is not set
-
-#
-# FLASH Program Installation
-#
-# CONFIG_SYSTEM_INSTALL is not set
-
-#
-# FLASH Erase-all Command
-#
-
-#
-# Intel HEX to binary conversion
-#
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-
-#
-# I2C tool
-#
-
-#
-# INI File Parser
-#
-# CONFIG_FSUTILS_INIFILE is not set
-
-#
-# NxPlayer media player library / command Line
-#
-
-#
-# RAM test
-#
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
-
-#
-# readline()
-#
+# CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
-
-#
-# P-Code Support
-#
-
-#
-# PHY Tool
-#
-
-#
-# Power Off
-#
-# CONFIG_SYSTEM_POWEROFF is not set
-
-#
-# RAMTRON
-#
-
-#
-# SD Card
-#
-
-#
-# Sudoku
-#
 # CONFIG_SYSTEM_SUDOKU is not set
-
-#
-# Sysinfo
-#
-
-#
-# VI Work-Alike Editor
-#
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
-
-#
-# Stack Monitor
-#
-
-#
-# USB CDC/ACM Device Commands
-#
-
-#
-# USB Composite Device Commands
-#
-
-#
-# USB Mass Storage Device Commands
-#
-
-#
-# USB Monitor
-#
-
-#
-# Zmodem Commands
-#
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/c5471evm/nettest/defconfig b/configs/c5471evm/nettest/defconfig
index 3e8e22c61a..386d69a57d 100644
--- a/configs/c5471evm/nettest/defconfig
+++ b/configs/c5471evm/nettest/defconfig
@@ -37,14 +37,16 @@ CONFIG_RRLOAD_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,6 +77,7 @@ CONFIG_ARCH_CHIP_C5471=y
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -93,7 +96,9 @@ CONFIG_ARCH_CHIP_C5471=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
 CONFIG_ARCH_ARM7TDMI=y
 # CONFIG_ARCH_ARM926EJS is not set
@@ -104,10 +109,21 @@ CONFIG_ARCH_ARM7TDMI=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="arm"
 CONFIG_ARCH_CHIP="c5471"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 # CONFIG_ARCH_LOWVECTORS is not set
 
@@ -161,6 +177,7 @@ CONFIG_C5471_AUTONEGOTIATION=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
@@ -292,9 +309,10 @@ CONFIG_NAME_MAX=32
 CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -325,6 +343,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -344,8 +363,22 @@ CONFIG_WATCHDOG_DEVPATH="/dev/watchdog0"
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_NETDEVICES is not set
@@ -357,6 +390,8 @@ CONFIG_WATCHDOG_DEVPATH="/dev/watchdog0"
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -380,14 +415,11 @@ CONFIG_SERIAL=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 CONFIG_OTHER_UART_SERIALDRIVER=y
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 # CONFIG_STANDARD_SERIAL is not set
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_OTHER_SERIAL_CONSOLE=y
 # CONFIG_NO_SERIAL_CONSOLE is not set
@@ -395,15 +427,18 @@ CONFIG_OTHER_SERIAL_CONSOLE=y
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -536,11 +571,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -559,6 +589,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -599,11 +633,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -617,10 +654,14 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # Application Configuration
 #
 
+#
+# CAN Utilities
+#
+
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -628,11 +669,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -654,18 +695,19 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -673,16 +715,26 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_WGET is not set
 
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
 #
 # Graphics Support
 #
@@ -693,8 +745,8 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -705,11 +757,12 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TELNETD is not set
-CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
@@ -731,15 +784,16 @@ CONFIG_NETUTILS_NETLIB=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/c5471evm/nsh/defconfig b/configs/c5471evm/nsh/defconfig
index 01b1ff19f5..ea349bf244 100644
--- a/configs/c5471evm/nsh/defconfig
+++ b/configs/c5471evm/nsh/defconfig
@@ -42,10 +42,11 @@ CONFIG_RRLOAD_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -383,6 +384,7 @@ CONFIG_WATCHDOG_DEVPATH="/dev/watchdog0"
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -397,6 +399,8 @@ CONFIG_NETDEV_TELNET=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -432,15 +436,18 @@ CONFIG_OTHER_SERIAL_CONSOLE=y
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -578,11 +585,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -659,6 +661,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/cc3200-launchpad/nsh/defconfig b/configs/cc3200-launchpad/nsh/defconfig
index 8c019e3776..8fbff6d4eb 100644
--- a/configs/cc3200-launchpad/nsh/defconfig
+++ b/configs/cc3200-launchpad/nsh/defconfig
@@ -37,12 +37,15 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+# CONFIG_DEBUG_ALERT is not set
 # CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
+# CONFIG_STACK_COLORATION is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
@@ -72,11 +75,14 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_C5471 is not set
 # CONFIG_ARCH_CHIP_CALYPSO is not set
 # CONFIG_ARCH_CHIP_DM320 is not set
+# CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
 CONFIG_ARCH_CHIP_TIVA=y
+# CONFIG_ARCH_CHIP_LPC11XX is not set
 # CONFIG_ARCH_CHIP_LPC17XX is not set
 # CONFIG_ARCH_CHIP_LPC214X is not set
 # CONFIG_ARCH_CHIP_LPC2378 is not set
@@ -85,65 +91,137 @@ CONFIG_ARCH_CHIP_TIVA=y
 # CONFIG_ARCH_CHIP_NUC1XX is not set
 # CONFIG_ARCH_CHIP_SAMA5 is not set
 # CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
 # CONFIG_ARCH_CHIP_SAM34 is not set
+# CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
 # CONFIG_ARCH_CORTEXM0 is not set
 # CONFIG_ARCH_CORTEXM3 is not set
 CONFIG_ARCH_CORTEXM4=y
+# CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="tiva"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
+# CONFIG_ARMV7M_LAZYFPU is not set
 CONFIG_ARCH_HAVE_FPU=y
+# CONFIG_ARCH_HAVE_DPFPU is not set
 # CONFIG_ARCH_FPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
 #
 # ARMV7M Configuration Options
 #
+# CONFIG_ARMV7M_HAVE_ICACHE is not set
+# CONFIG_ARMV7M_HAVE_DCACHE is not set
+# CONFIG_ARMV7M_HAVE_ITCM is not set
+# CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
 CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y
+# CONFIG_ARMV7M_HAVE_STACKCHECK is not set
+# CONFIG_ARMV7M_ITMSYSLOG is not set
 
 #
 # Tiva/Stellaris Configuration Options
 #
 # CONFIG_ARCH_CHIP_TM4C123GH6ZRB is not set
 # CONFIG_ARCH_CHIP_TM4C123GH6PMI is not set
+# CONFIG_ARCH_CHIP_TM4C1294NC is not set
+# CONFIG_ARCH_CHIP_TM4C129XNC is not set
 CONFIG_ARCH_CHIP_CC3200=y
 CONFIG_TIVA_BOARD_EARLYINIT=y
 
 #
 # Tiva/Stellaris Peripheral Support
 #
+# CONFIG_TIVA_ADC is not set
+# CONFIG_TIVA_HAVE_ADC0 is not set
+# CONFIG_TIVA_HAVE_ADC1 is not set
+# CONFIG_TIVA_I2C is not set
+CONFIG_TIVA_HAVE_I2C1=y
+# CONFIG_TIVA_HAVE_I2C2 is not set
+# CONFIG_TIVA_HAVE_I2C3 is not set
+# CONFIG_TIVA_HAVE_I2C4 is not set
+# CONFIG_TIVA_HAVE_I2C5 is not set
+# CONFIG_TIVA_HAVE_I2C6 is not set
+# CONFIG_TIVA_HAVE_I2C7 is not set
+# CONFIG_TIVA_HAVE_I2C8 is not set
+# CONFIG_TIVA_HAVE_I2C9 is not set
+# CONFIG_TIVA_HAVE_UART3 is not set
+# CONFIG_TIVA_HAVE_UART4 is not set
+# CONFIG_TIVA_HAVE_UART5 is not set
+# CONFIG_TIVA_HAVE_UART6 is not set
+# CONFIG_TIVA_HAVE_UART7 is not set
+# CONFIG_TIVA_HAVE_SSI0 is not set
+# CONFIG_TIVA_HAVE_SSI1 is not set
+# CONFIG_TIVA_HAVE_SSI2 is not set
+# CONFIG_TIVA_HAVE_SSI3 is not set
+# CONFIG_TIVA_HAVE_ETHERNET is not set
+# CONFIG_TIVA_SSI is not set
+# CONFIG_TIVA_TIMER is not set
+# CONFIG_TIVA_HAVE_TIMER0 is not set
+# CONFIG_TIVA_HAVE_TIMER1 is not set
+# CONFIG_TIVA_HAVE_TIMER2 is not set
+# CONFIG_TIVA_HAVE_TIMER3 is not set
+# CONFIG_TIVA_HAVE_TIMER4 is not set
+# CONFIG_TIVA_HAVE_TIMER5 is not set
+# CONFIG_TIVA_HAVE_TIMER6 is not set
+# CONFIG_TIVA_HAVE_TIMER7 is not set
+# CONFIG_TIVA_ADC0 is not set
+# CONFIG_TIVA_I2C0 is not set
+# CONFIG_TIVA_I2C1 is not set
 CONFIG_TIVA_UART0=y
 # CONFIG_TIVA_UART1 is not set
 # CONFIG_TIVA_UART2 is not set
-# CONFIG_TIVA_SSI0 is not set
-# CONFIG_TIVA_SSI1 is not set
-# CONFIG_TIVA_ETHERNET is not set
 # CONFIG_TIVA_FLASH is not set
 
 #
-# Disable GPIO Interrupts
-#
-CONFIG_TIVA_GPIOA_IRQS=y
-CONFIG_TIVA_GPIOB_IRQS=y
-CONFIG_TIVA_GPIOC_IRQS=y
-CONFIG_TIVA_GPIOD_IRQS=y
-CONFIG_TIVA_GPIOE_IRQS=y
-# CONFIG_TIVA_GPIOF_IRQS is not set
-# CONFIG_TIVA_GPIOG_IRQS is not set
-# CONFIG_TIVA_GPIOH_IRQS is not set
-# CONFIG_TIVA_GPIOJ_IRQS is not set
+# Enable GPIO Interrupts
+#
+# CONFIG_TIVA_GPIO_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOA_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOB_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOC_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOD_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOE_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOF_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOG_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOH_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOJ_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOK_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOL_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOM_IRQS is not set
+# CONFIG_TIVA_HAVE_GPION_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOP_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOQ_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOR_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOS_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOT_IRQS is not set
 
 #
 # Architecture Options
@@ -156,11 +234,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
 # CONFIG_ARCH_USE_MPU is not set
 CONFIG_ARCH_IRQPRIO=y
 # CONFIG_ARCH_STACKDUMP is not set
@@ -220,6 +301,7 @@ CONFIG_NSH_MMCSDMINOR=0
 #
 # Board-Specific Options
 #
+# CONFIG_LIB_BOARDCTL is not set
 
 #
 # RTOS Features
@@ -249,11 +331,13 @@ CONFIG_PREALLOC_TIMERS=2
 #
 # Tasks and Scheduling
 #
+# CONFIG_SPINLOCK is not set
 # CONFIG_INIT_NONE is not set
 CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=100
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=8
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -304,6 +388,14 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=32
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
+
+#
+# Work queue support
+#
+# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_SCHED_HPWORK is not set
+# CONFIG_SCHED_LPWORK is not set
 
 #
 # Stack and heap information
@@ -330,22 +422,43 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 # CONFIG_SPI is not set
 # CONFIG_I2S is not set
+
+#
+# Timer Driver Support
+#
+# CONFIG_TIMER is not set
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
-# CONFIG_TIMER is not set
 # CONFIG_ANALOG is not set
 # CONFIG_AUDIO_DEVICES is not set
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
+# CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
@@ -353,6 +466,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -375,13 +490,15 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART6_SERIALDRIVER is not set
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
+# CONFIG_OTHER_UART_SERIALDRIVER is not set
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
+# CONFIG_SERIAL_IFLOWCONTROL is not set
+# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
+# CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
+# CONFIG_OTHER_SERIAL_CONSOLE is not set
 # CONFIG_NO_SERIAL_CONSOLE is not set
 
 #
@@ -395,20 +512,23 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
-# CONFIG_SERIAL_IFLOWCONTROL is not set
-# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -434,13 +554,17 @@ CONFIG_UART0_2STOP=0
 # CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
 CONFIG_FS_READABLE=y
 # CONFIG_FS_WRITABLE is not set
+# CONFIG_FS_NAMED_SEMAPHORES is not set
+CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_RAMMAP is not set
 # CONFIG_FS_FAT is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 CONFIG_FS_BINFS=y
 CONFIG_FS_PROCFS=y
+# CONFIG_FS_PROCFS_REGISTER is not set
 
 #
 # Exclude individual procfs entries
@@ -448,11 +572,7 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_PROCESS is not set
 # CONFIG_FS_PROCFS_EXCLUDE_UPTIME is not set
 # CONFIG_FS_PROCFS_EXCLUDE_MOUNTS is not set
-
-#
-# System Logging
-#
-
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -473,7 +593,12 @@ CONFIG_MM_REGIONS=2
 # CONFIG_AUDIO is not set
 
 #
-# Binary Formats
+# Wireless Support
+#
+# CONFIG_WIRELESS is not set
+
+#
+# Binary Loader
 #
 # CONFIG_BINFMT_DISABLE is not set
 # CONFIG_BINFMT_EXEPATH is not set
@@ -498,6 +623,7 @@ CONFIG_LIB_HOMEDIR="/"
 # CONFIG_NOPRINTF_FIELDWIDTH is not set
 # CONFIG_LIBC_FLOATINGPOINT is not set
 CONFIG_LIBC_LONG_LONG=y
+# CONFIG_LIBC_IOCTL_VARIADIC is not set
 CONFIG_LIB_RAND_ORDER=1
 # CONFIG_EOL_IS_CR is not set
 # CONFIG_EOL_IS_LF is not set
@@ -510,14 +636,19 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
 # CONFIG_LIBC_PERROR_STDOUT is not set
 CONFIG_ARCH_LOWPUTC=y
 # CONFIG_LIBC_LOCALTIME is not set
+# CONFIG_TIME_EXTENDED is not set
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
-# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -536,11 +667,14 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 CONFIG_BUILTIN_PROXY_STACKSIZE=512
 
+#
+# CAN Utilities
+#
+
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -548,11 +682,11 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -560,75 +694,80 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=512
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
-# CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_UDP is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
 #
 # CONFIG_TIFF is not set
+# CONFIG_GRAPHICS_TRAVELER is not set
 
 #
 # Interpreters
 #
+# CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_MICROPYTHON is not set
 # CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
-# CONFIG_NETUTILS_DHCPD is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
-# CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_TFTPC is not set
-# CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_NETLIB is not set
-# CONFIG_NETUTILS_WEBCLIENT is not set
-
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
 
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -638,7 +777,6 @@ CONFIG_NSH_READLINE=y
 CONFIG_NSH_LINELEN=64
 # CONFIG_NSH_DISABLE_SEMICOLON is not set
 CONFIG_NSH_CMDPARMS=y
-CONFIG_NSH_TMPDIR="/tmp"
 CONFIG_NSH_MAXARGUMENTS=6
 CONFIG_NSH_ARGCAT=y
 CONFIG_NSH_NESTDEPTH=3
@@ -649,13 +787,16 @@ CONFIG_NSH_BUILTIN_APPS=y
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
 # CONFIG_NSH_DISABLE_CMP is not set
+CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_DD is not set
 # CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -664,8 +805,10 @@ CONFIG_NSH_BUILTIN_APPS=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+# CONFIG_NSH_DISABLE_IFUPDOWN is not set
 # CONFIG_NSH_DISABLE_KILL is not set
 # CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -673,6 +816,7 @@ CONFIG_NSH_BUILTIN_APPS=y
 # CONFIG_NSH_DISABLE_MKRD is not set
 # CONFIG_NSH_DISABLE_MH is not set
 # CONFIG_NSH_DISABLE_MOUNT is not set
+# CONFIG_NSH_DISABLE_MV is not set
 # CONFIG_NSH_DISABLE_MW is not set
 # CONFIG_NSH_DISABLE_PS is not set
 # CONFIG_NSH_DISABLE_PUT is not set
@@ -682,8 +826,10 @@ CONFIG_NSH_BUILTIN_APPS=y
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
@@ -711,6 +857,8 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -724,112 +872,19 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-
-#
-# Custom Free Memory Command
-#
-# CONFIG_SYSTEM_FREE is not set
-
-#
-# EMACS-like Command Line Editor
-#
 # CONFIG_SYSTEM_CLE is not set
-
-#
-# FLASH Program Installation
-#
-# CONFIG_SYSTEM_INSTALL is not set
-
-#
-# FLASH Erase-all Command
-#
-
-#
-# Intel HEX to binary conversion
-#
+# CONFIG_SYSTEM_CUTERM is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-
-#
-# I2C tool
-#
-
-#
-# INI File Parser
-#
-# CONFIG_FSUTILS_INIFILE is not set
-
-#
-# NxPlayer media player library / command Line
-#
-# CONFIG_SYSTEM_NXPLAYER is not set
-
-#
-# RAM test
-#
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
-
-#
-# readline()
-#
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
-
-#
-# P-Code Support
-#
-
-#
-# PHY Tool
-#
-
-#
-# Power Off
-#
-# CONFIG_SYSTEM_POWEROFF is not set
-
-#
-# RAMTRON
-#
-
-#
-# SD Card
-#
-
-#
-# Sudoku
-#
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-
-#
-# Sysinfo
-#
-
-#
-# VI Work-Alike Editor
-#
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
-
-#
-# Stack Monitor
-#
-
-#
-# USB CDC/ACM Device Commands
-#
-
-#
-# USB Composite Device Commands
-#
-
-#
-# USB Mass Storage Device Commands
-#
-
-#
-# USB Monitor
-#
-
-#
-# Zmodem Commands
-#
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/cloudctrl/nsh/defconfig b/configs/cloudctrl/nsh/defconfig
index 523c5c2e59..ec0165b7f3 100644
--- a/configs/cloudctrl/nsh/defconfig
+++ b/configs/cloudctrl/nsh/defconfig
@@ -46,10 +46,12 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -719,6 +721,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -751,6 +755,7 @@ CONFIG_RTC=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -814,6 +819,8 @@ CONFIG_ETH0_PHY_DM9161=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -864,15 +871,18 @@ CONFIG_USART2_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -1026,11 +1036,6 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1114,6 +1119,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/compal_e86/nsh_highram/defconfig b/configs/compal_e86/nsh_highram/defconfig
index 5bfe73a0ad..4e47505113 100644
--- a/configs/compal_e86/nsh_highram/defconfig
+++ b/configs/compal_e86/nsh_highram/defconfig
@@ -37,14 +37,16 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,6 +77,7 @@ CONFIG_ARCH_CHIP_CALYPSO=y
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -92,7 +95,11 @@ CONFIG_ARCH_CHIP_CALYPSO=y
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 CONFIG_ARCH_ARM7TDMI=y
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -102,10 +109,21 @@ CONFIG_ARCH_ARM7TDMI=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="arm"
 CONFIG_ARCH_CHIP="calypso"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 # CONFIG_ARCH_LOWVECTORS is not set
 
@@ -158,12 +176,14 @@ CONFIG_SERIAL_CONSOLE_NONE=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
 CONFIG_ARCH_HAVE_POWEROFF=y
+# CONFIG_ARCH_HAVE_RESET is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
 # CONFIG_ARCH_IDLE_CUSTOM is not set
@@ -219,6 +239,7 @@ CONFIG_NSH_MMCSDMINOR=0
 #
 CONFIG_LIB_BOARDCTL=y
 CONFIG_BOARDCTL_POWEROFF=y
+# CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
 # CONFIG_BOARDCTL_ADCTEST is not set
 # CONFIG_BOARDCTL_PWMTEST is not set
@@ -258,6 +279,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -302,9 +324,10 @@ CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
 CONFIG_SIG_SIGCONDTIMEDOUT=16
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -335,14 +358,20 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 CONFIG_SPI=y
+# CONFIG_SPI_SLAVE is not set
 CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_CMDDATA is not set
 # CONFIG_SPI_CALLBACK is not set
 # CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_HWFEATURES is not set
+# CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -356,8 +385,22 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -367,6 +410,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -390,14 +435,11 @@ CONFIG_SERIAL=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 CONFIG_OTHER_UART_SERIALDRIVER=y
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 # CONFIG_STANDARD_SERIAL is not set
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_OTHER_SERIAL_CONSOLE=y
 # CONFIG_NO_SERIAL_CONSOLE is not set
@@ -405,15 +447,18 @@ CONFIG_OTHER_SERIAL_CONSOLE=y
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -444,16 +489,12 @@ CONFIG_OTHER_SERIAL_CONSOLE=y
 # CONFIG_FS_FAT is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_BINFS is not set
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -474,6 +515,10 @@ CONFIG_HEAP2_SIZE=0
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -517,10 +562,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -539,11 +588,14 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 
+#
+# CAN Utilities
+#
+
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -551,11 +603,13 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 CONFIG_EXAMPLES_HELLO=y
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
+CONFIG_EXAMPLES_HELLO_PRIORITY=100
+CONFIG_EXAMPLES_HELLO_STACKSIZE=2048
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -563,33 +617,45 @@ CONFIG_EXAMPLES_HELLO=y
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -601,30 +667,28 @@ CONFIG_EXAMPLES_NSH=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -644,6 +708,7 @@ CONFIG_NSH_BUILTIN_APPS=y
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
@@ -652,6 +717,7 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_DD is not set
 # CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -660,8 +726,10 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 # CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -671,6 +739,7 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_MOUNT is not set
 # CONFIG_NSH_DISABLE_MV is not set
 # CONFIG_NSH_DISABLE_MW is not set
+# CONFIG_NSH_DISABLE_POWEROFF is not set
 # CONFIG_NSH_DISABLE_PS is not set
 # CONFIG_NSH_DISABLE_PUT is not set
 # CONFIG_NSH_DISABLE_PWD is not set
@@ -678,9 +747,12 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_RMDIR is not set
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
+CONFIG_NSH_DISABLE_SHUTDOWN=y
 # CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
@@ -707,6 +779,8 @@ CONFIG_NSH_FILEIOSIZE=1024
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -720,15 +794,19 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/compal_e88/nsh_highram/defconfig b/configs/compal_e88/nsh_highram/defconfig
index 042107a100..41fd85249b 100644
--- a/configs/compal_e88/nsh_highram/defconfig
+++ b/configs/compal_e88/nsh_highram/defconfig
@@ -37,14 +37,16 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,6 +77,7 @@ CONFIG_ARCH_CHIP_CALYPSO=y
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -92,7 +95,11 @@ CONFIG_ARCH_CHIP_CALYPSO=y
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 CONFIG_ARCH_ARM7TDMI=y
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -102,10 +109,21 @@ CONFIG_ARCH_ARM7TDMI=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="arm"
 CONFIG_ARCH_CHIP="calypso"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 # CONFIG_ARCH_LOWVECTORS is not set
 
@@ -158,12 +176,14 @@ CONFIG_SERIAL_CONSOLE_NONE=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
 CONFIG_ARCH_HAVE_POWEROFF=y
+# CONFIG_ARCH_HAVE_RESET is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
 # CONFIG_ARCH_IDLE_CUSTOM is not set
@@ -219,6 +239,7 @@ CONFIG_NSH_MMCSDMINOR=0
 #
 CONFIG_LIB_BOARDCTL=y
 CONFIG_BOARDCTL_POWEROFF=y
+# CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
 # CONFIG_BOARDCTL_ADCTEST is not set
 # CONFIG_BOARDCTL_PWMTEST is not set
@@ -258,6 +279,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -302,9 +324,10 @@ CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
 CONFIG_SIG_SIGCONDTIMEDOUT=16
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -335,14 +358,20 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 CONFIG_SPI=y
+# CONFIG_SPI_SLAVE is not set
 CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_CMDDATA is not set
 # CONFIG_SPI_CALLBACK is not set
 # CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_HWFEATURES is not set
+# CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -356,8 +385,22 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -367,6 +410,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -390,14 +435,11 @@ CONFIG_SERIAL=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 CONFIG_OTHER_UART_SERIALDRIVER=y
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 # CONFIG_STANDARD_SERIAL is not set
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_OTHER_SERIAL_CONSOLE=y
 # CONFIG_NO_SERIAL_CONSOLE is not set
@@ -405,15 +447,18 @@ CONFIG_OTHER_SERIAL_CONSOLE=y
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -444,16 +489,12 @@ CONFIG_OTHER_SERIAL_CONSOLE=y
 # CONFIG_FS_FAT is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_BINFS is not set
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -474,6 +515,10 @@ CONFIG_HEAP2_SIZE=0
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -517,10 +562,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -539,11 +588,14 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 
+#
+# CAN Utilities
+#
+
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -551,11 +603,13 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 CONFIG_EXAMPLES_HELLO=y
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
+CONFIG_EXAMPLES_HELLO_PRIORITY=100
+CONFIG_EXAMPLES_HELLO_STACKSIZE=2048
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -563,33 +617,45 @@ CONFIG_EXAMPLES_HELLO=y
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -601,30 +667,28 @@ CONFIG_EXAMPLES_NSH=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -644,6 +708,7 @@ CONFIG_NSH_BUILTIN_APPS=y
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
@@ -652,6 +717,7 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_DD is not set
 # CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -660,8 +726,10 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 # CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -671,6 +739,7 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_MOUNT is not set
 # CONFIG_NSH_DISABLE_MV is not set
 # CONFIG_NSH_DISABLE_MW is not set
+# CONFIG_NSH_DISABLE_POWEROFF is not set
 # CONFIG_NSH_DISABLE_PS is not set
 # CONFIG_NSH_DISABLE_PUT is not set
 # CONFIG_NSH_DISABLE_PWD is not set
@@ -678,9 +747,12 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_RMDIR is not set
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
+CONFIG_NSH_DISABLE_SHUTDOWN=y
 # CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
@@ -707,6 +779,8 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -720,15 +794,19 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/compal_e99/nsh_compalram/defconfig b/configs/compal_e99/nsh_compalram/defconfig
index 103c7e3469..d2a8f010e5 100644
--- a/configs/compal_e99/nsh_compalram/defconfig
+++ b/configs/compal_e99/nsh_compalram/defconfig
@@ -37,14 +37,16 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,6 +77,7 @@ CONFIG_ARCH_CHIP_CALYPSO=y
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -92,7 +95,11 @@ CONFIG_ARCH_CHIP_CALYPSO=y
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 CONFIG_ARCH_ARM7TDMI=y
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -102,10 +109,21 @@ CONFIG_ARCH_ARM7TDMI=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="arm"
 CONFIG_ARCH_CHIP="calypso"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 # CONFIG_ARCH_LOWVECTORS is not set
 
@@ -159,12 +177,14 @@ CONFIG_SERIAL_CONSOLE_NONE=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
 CONFIG_ARCH_HAVE_POWEROFF=y
+# CONFIG_ARCH_HAVE_RESET is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
 # CONFIG_ARCH_IDLE_CUSTOM is not set
@@ -221,6 +241,7 @@ CONFIG_NSH_MMCSDMINOR=0
 CONFIG_COMPALE99_LCD_SSD1783=y
 CONFIG_LIB_BOARDCTL=y
 CONFIG_BOARDCTL_POWEROFF=y
+# CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
 # CONFIG_BOARDCTL_ADCTEST is not set
 # CONFIG_BOARDCTL_PWMTEST is not set
@@ -260,6 +281,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -304,9 +326,10 @@ CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
 CONFIG_SIG_SIGCONDTIMEDOUT=16
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -337,14 +360,20 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 CONFIG_SPI=y
+# CONFIG_SPI_SLAVE is not set
 CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_CMDDATA is not set
 # CONFIG_SPI_CALLBACK is not set
 # CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_HWFEATURES is not set
+# CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -358,10 +387,15 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 CONFIG_LCD=y
 
 #
-# Common LCD Settings
+# Common Graphic LCD Settings
 #
 # CONFIG_LCD_CONSOLE is not set
 # CONFIG_LCD_NOGETRUN is not set
@@ -378,6 +412,7 @@ CONFIG_LCD_MAXPOWER=1
 # CONFIG_LCD_UG9664HSWAG01 is not set
 # CONFIG_LCD_UG2864HSWEG01 is not set
 # CONFIG_LCD_UG2832HSWEG04 is not set
+# CONFIG_LCD_SSD1351 is not set
 # CONFIG_LCD_ST7565 is not set
 # CONFIG_LCD_ST7567 is not set
 # CONFIG_LCD_UG2864AMBAG01 is not set
@@ -389,12 +424,16 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_LCD_RLANDSCAPE is not set
 # CONFIG_LCD_ILI9341 is not set
 # CONFIG_LCD_RA8875 is not set
+# CONFIG_SLCD is not set
 
 #
-# Alphanumeric/Segment LCD Devices
+# LED Support
 #
-# CONFIG_LCD_LCD1602 is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -404,6 +443,8 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -427,14 +468,11 @@ CONFIG_SERIAL=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 CONFIG_OTHER_UART_SERIALDRIVER=y
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 # CONFIG_STANDARD_SERIAL is not set
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_OTHER_SERIAL_CONSOLE=y
 # CONFIG_NO_SERIAL_CONSOLE is not set
@@ -442,15 +480,18 @@ CONFIG_OTHER_SERIAL_CONSOLE=y
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -481,21 +522,16 @@ CONFIG_OTHER_SERIAL_CONSOLE=y
 # CONFIG_FS_FAT is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_BINFS is not set
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
 # CONFIG_NX is not set
-CONFIG_NX_LCDDRIVER=y
 
 #
 # Memory Management
@@ -512,6 +548,10 @@ CONFIG_HEAP2_SIZE=2097152
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -555,10 +595,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -577,11 +621,14 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 
+#
+# CAN Utilities
+#
+
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -589,11 +636,13 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 CONFIG_EXAMPLES_HELLO=y
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
+CONFIG_EXAMPLES_HELLO_PRIORITY=100
+CONFIG_EXAMPLES_HELLO_STACKSIZE=2048
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -601,33 +650,45 @@ CONFIG_EXAMPLES_HELLO=y
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -639,30 +700,28 @@ CONFIG_EXAMPLES_NSH=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -682,6 +741,7 @@ CONFIG_NSH_BUILTIN_APPS=y
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
@@ -690,6 +750,7 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_DD is not set
 # CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -698,8 +759,10 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 # CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -709,6 +772,7 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_MOUNT is not set
 # CONFIG_NSH_DISABLE_MV is not set
 # CONFIG_NSH_DISABLE_MW is not set
+# CONFIG_NSH_DISABLE_POWEROFF is not set
 # CONFIG_NSH_DISABLE_PS is not set
 # CONFIG_NSH_DISABLE_PUT is not set
 # CONFIG_NSH_DISABLE_PWD is not set
@@ -716,9 +780,12 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_RMDIR is not set
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
+CONFIG_NSH_DISABLE_SHUTDOWN=y
 # CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
@@ -745,6 +812,8 @@ CONFIG_NSH_FILEIOSIZE=1024
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -758,15 +827,19 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/compal_e99/nsh_highram/defconfig b/configs/compal_e99/nsh_highram/defconfig
index afd0172efb..778ad9d60e 100644
--- a/configs/compal_e99/nsh_highram/defconfig
+++ b/configs/compal_e99/nsh_highram/defconfig
@@ -37,14 +37,16 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,6 +77,7 @@ CONFIG_ARCH_CHIP_CALYPSO=y
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -92,7 +95,11 @@ CONFIG_ARCH_CHIP_CALYPSO=y
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 CONFIG_ARCH_ARM7TDMI=y
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -102,10 +109,21 @@ CONFIG_ARCH_ARM7TDMI=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="arm"
 CONFIG_ARCH_CHIP="calypso"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 # CONFIG_ARCH_LOWVECTORS is not set
 
@@ -158,12 +176,14 @@ CONFIG_SERIAL_CONSOLE_NONE=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
 CONFIG_ARCH_HAVE_POWEROFF=y
+# CONFIG_ARCH_HAVE_RESET is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
 # CONFIG_ARCH_IDLE_CUSTOM is not set
@@ -220,6 +240,7 @@ CONFIG_NSH_MMCSDMINOR=0
 CONFIG_COMPALE99_LCD_SSD1783=y
 CONFIG_LIB_BOARDCTL=y
 CONFIG_BOARDCTL_POWEROFF=y
+# CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
 # CONFIG_BOARDCTL_ADCTEST is not set
 # CONFIG_BOARDCTL_PWMTEST is not set
@@ -259,6 +280,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -303,9 +325,10 @@ CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
 CONFIG_SIG_SIGCONDTIMEDOUT=16
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -336,14 +359,20 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 CONFIG_SPI=y
+# CONFIG_SPI_SLAVE is not set
 CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_CMDDATA is not set
 # CONFIG_SPI_CALLBACK is not set
 # CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_HWFEATURES is not set
+# CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -357,10 +386,15 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 CONFIG_LCD=y
 
 #
-# Common LCD Settings
+# Common Graphic LCD Settings
 #
 # CONFIG_LCD_CONSOLE is not set
 CONFIG_LCD_NOGETRUN=y
@@ -377,6 +411,7 @@ CONFIG_LCD_MAXPOWER=1
 # CONFIG_LCD_UG9664HSWAG01 is not set
 # CONFIG_LCD_UG2864HSWEG01 is not set
 # CONFIG_LCD_UG2832HSWEG04 is not set
+# CONFIG_LCD_SSD1351 is not set
 # CONFIG_LCD_ST7565 is not set
 # CONFIG_LCD_ST7567 is not set
 # CONFIG_LCD_UG2864AMBAG01 is not set
@@ -388,12 +423,16 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_LCD_RLANDSCAPE is not set
 # CONFIG_LCD_ILI9341 is not set
 # CONFIG_LCD_RA8875 is not set
+# CONFIG_SLCD is not set
 
 #
-# Alphanumeric/Segment LCD Devices
+# LED Support
 #
-# CONFIG_LCD_LCD1602 is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -403,6 +442,8 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -426,14 +467,11 @@ CONFIG_SERIAL=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 CONFIG_OTHER_UART_SERIALDRIVER=y
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 # CONFIG_STANDARD_SERIAL is not set
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_OTHER_SERIAL_CONSOLE=y
 # CONFIG_NO_SERIAL_CONSOLE is not set
@@ -441,15 +479,18 @@ CONFIG_OTHER_SERIAL_CONSOLE=y
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -480,16 +521,12 @@ CONFIG_OTHER_SERIAL_CONSOLE=y
 # CONFIG_FS_FAT is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_BINFS is not set
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -498,6 +535,7 @@ CONFIG_NX_LCDDRIVER=y
 CONFIG_NX_NPLANES=1
 CONFIG_NX_BGCOLOR=0x0
 CONFIG_NX_WRITEONLY=y
+# CONFIG_NX_UPDATE is not set
 
 #
 # Supported Pixel Depths
@@ -595,6 +633,10 @@ CONFIG_HEAP2_SIZE=2097152
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -638,10 +680,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -660,11 +706,14 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 
+#
+# CAN Utilities
+#
+
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -672,14 +721,14 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
+# CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
 CONFIG_EXAMPLES_KEYPADTEST=y
 CONFIG_EXAMPLES_KEYPAD_DEVNAME="/dev/keypad"
 # CONFIG_EXAMPLES_KEYPADTEST_ENCODED is not set
-# CONFIG_EXAMPLES_IGMP is not set
 # CONFIG_EXAMPLES_LCDRW is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -687,7 +736,6 @@ CONFIG_EXAMPLES_KEYPAD_DEVNAME="/dev/keypad"
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 CONFIG_EXAMPLES_NXHELLO=y
 CONFIG_EXAMPLES_NXHELLO_VPLANE=0
@@ -708,6 +756,7 @@ CONFIG_EXAMPLES_NXIMAGE=y
 CONFIG_EXAMPLES_NXIMAGE_VPLANE=0
 CONFIG_EXAMPLES_NXIMAGE_DEVNO=0
 CONFIG_EXAMPLES_NXIMAGE_BPP=16
+# CONFIG_EXAMPLES_NXIMAGE_GREYSCALE is not set
 CONFIG_EXAMPLES_NXIMAGE_XSCALEp5=y
 CONFIG_EXAMPLES_NXIMAGE_XSCALE1p0=y
 # CONFIG_EXAMPLES_NXIMAGE_XSCALE1p5 is not set
@@ -724,6 +773,7 @@ CONFIG_EXAMPLES_NXLINES_LINEWIDTH=4
 CONFIG_EXAMPLES_NXLINES_BORDERWIDTH=2
 CONFIG_EXAMPLES_NXLINES_BPP=16
 # CONFIG_EXAMPLES_NXLINES_EXTERNINIT is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 CONFIG_EXAMPLES_NXTEXT=y
 
 #
@@ -748,26 +798,38 @@ CONFIG_EXAMPLES_NXTEXT_BGFONTID=14
 CONFIG_EXAMPLES_NXTEXT_PUFONTID=0
 # CONFIG_EXAMPLES_NXTEXT_EXTERNINIT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -779,30 +841,28 @@ CONFIG_EXAMPLES_NXTEXT_PUFONTID=0
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -822,6 +882,7 @@ CONFIG_NSH_BUILTIN_APPS=y
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
@@ -830,6 +891,7 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_DD is not set
 # CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -838,8 +900,10 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 # CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -849,6 +913,7 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_MOUNT is not set
 # CONFIG_NSH_DISABLE_MV is not set
 # CONFIG_NSH_DISABLE_MW is not set
+# CONFIG_NSH_DISABLE_POWEROFF is not set
 # CONFIG_NSH_DISABLE_PS is not set
 # CONFIG_NSH_DISABLE_PUT is not set
 # CONFIG_NSH_DISABLE_PWD is not set
@@ -856,9 +921,12 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_RMDIR is not set
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
+CONFIG_NSH_DISABLE_SHUTDOWN=y
 # CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
@@ -885,6 +953,8 @@ CONFIG_NSH_FILEIOSIZE=1024
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -898,15 +968,19 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/dk-tm4c129x/ipv6/defconfig b/configs/dk-tm4c129x/ipv6/defconfig
index 06a7977279..b67e6e377d 100644
--- a/configs/dk-tm4c129x/ipv6/defconfig
+++ b/configs/dk-tm4c129x/ipv6/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -528,6 +529,7 @@ CONFIG_I2C_DRIVER=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -580,6 +582,8 @@ CONFIG_LM75_I2C_FREQUENCY=100000
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -629,15 +633,18 @@ CONFIG_UART0_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -785,11 +792,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -863,6 +865,7 @@ CONFIG_LIBC_NETDB=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/dk-tm4c129x/nsh/defconfig b/configs/dk-tm4c129x/nsh/defconfig
index c01c46126a..aa70c473d9 100644
--- a/configs/dk-tm4c129x/nsh/defconfig
+++ b/configs/dk-tm4c129x/nsh/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -528,6 +529,7 @@ CONFIG_I2C_DRIVER=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -582,6 +584,8 @@ CONFIG_LM75_I2C_FREQUENCY=100000
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -631,15 +635,18 @@ CONFIG_UART0_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -789,11 +796,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -873,6 +875,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/ea3131/nsh/defconfig b/configs/ea3131/nsh/defconfig
index 8b5c909d71..b453649255 100644
--- a/configs/ea3131/nsh/defconfig
+++ b/configs/ea3131/nsh/defconfig
@@ -41,12 +41,15 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
+# CONFIG_STACK_COLORATION is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
@@ -76,11 +79,14 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_C5471 is not set
 # CONFIG_ARCH_CHIP_CALYPSO is not set
 # CONFIG_ARCH_CHIP_DM320 is not set
+# CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
 # CONFIG_ARCH_CHIP_TIVA is not set
+# CONFIG_ARCH_CHIP_LPC11XX is not set
 # CONFIG_ARCH_CHIP_LPC17XX is not set
 # CONFIG_ARCH_CHIP_LPC214X is not set
 # CONFIG_ARCH_CHIP_LPC2378 is not set
@@ -89,20 +95,39 @@ CONFIG_ARCH_CHIP_LPC31XX=y
 # CONFIG_ARCH_CHIP_NUC1XX is not set
 # CONFIG_ARCH_CHIP_SAMA5 is not set
 # CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
 # CONFIG_ARCH_CHIP_SAM34 is not set
+# CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 CONFIG_ARCH_ARM926EJS=y
 # CONFIG_ARCH_ARM920T is not set
 # CONFIG_ARCH_CORTEXM0 is not set
 # CONFIG_ARCH_CORTEXM3 is not set
 # CONFIG_ARCH_CORTEXM4 is not set
+# CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="arm"
 CONFIG_ARCH_CHIP="lpc31xx"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
+# CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 CONFIG_ARCH_LOWVECTORS=y
 CONFIG_ARCH_ROMPGTABLE=y
@@ -165,11 +190,14 @@ CONFIG_ARCH_HAVE_EXTSRAM1=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 CONFIG_ARCH_HAVE_MMU=y
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+# CONFIG_ARCH_HAVE_RESET is not set
 CONFIG_ARCH_USE_MMU=y
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
@@ -227,6 +255,13 @@ CONFIG_NSH_MMCSDMINOR=0
 #
 # Board-Specific Options
 #
+CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_UNIQUEID is not set
+# CONFIG_BOARDCTL_TSCTEST is not set
+# CONFIG_BOARDCTL_ADCTEST is not set
+# CONFIG_BOARDCTL_PWMTEST is not set
+# CONFIG_BOARDCTL_GRAPHICS is not set
+# CONFIG_BOARDCTL_IOCTL is not set
 
 #
 # RTOS Features
@@ -256,8 +291,12 @@ CONFIG_PREALLOC_TIMERS=4
 #
 # Tasks and Scheduling
 #
+# CONFIG_INIT_NONE is not set
+CONFIG_INIT_ENTRYPOINT=y
+# CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -308,6 +347,14 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
+
+#
+# Work queue support
+#
+# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_SCHED_HPWORK is not set
+# CONFIG_SCHED_LPWORK is not set
 
 #
 # Stack and heap information
@@ -334,22 +381,43 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 # CONFIG_SPI is not set
 # CONFIG_I2S is not set
+
+#
+# Timer Driver Support
+#
+# CONFIG_TIMER is not set
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
-# CONFIG_TIMER is not set
 # CONFIG_ANALOG is not set
 # CONFIG_AUDIO_DEVICES is not set
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
+# CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
@@ -357,6 +425,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 CONFIG_UART_SERIALDRIVER=y
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -379,13 +449,15 @@ CONFIG_UART_SERIALDRIVER=y
 # CONFIG_USART6_SERIALDRIVER is not set
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
+# CONFIG_OTHER_UART_SERIALDRIVER is not set
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
+# CONFIG_SERIAL_IFLOWCONTROL is not set
+# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
+# CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART_SERIAL_CONSOLE=y
+# CONFIG_OTHER_SERIAL_CONSOLE is not set
 # CONFIG_NO_SERIAL_CONSOLE is not set
 
 #
@@ -399,20 +471,23 @@ CONFIG_UART_PARITY=0
 CONFIG_UART_2STOP=0
 # CONFIG_UART_IFLOWCONTROL is not set
 # CONFIG_UART_OFLOWCONTROL is not set
-# CONFIG_SERIAL_IFLOWCONTROL is not set
-# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_UART_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -438,21 +513,22 @@ CONFIG_UART_2STOP=0
 # CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
 CONFIG_FS_READABLE=y
 CONFIG_FS_WRITABLE=y
+# CONFIG_FS_NAMED_SEMAPHORES is not set
+CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_RAMMAP is not set
 CONFIG_FS_FAT=y
 # CONFIG_FAT_LCNAMES is not set
 # CONFIG_FAT_LFN is not set
 # CONFIG_FS_FATTIME is not set
+# CONFIG_FAT_FORCE_INDIRECT is not set
 # CONFIG_FAT_DMAMEMORY is not set
+# CONFIG_FAT_DIRECT_RETRY is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
-
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -474,7 +550,11 @@ CONFIG_MM_REGIONS=1
 # CONFIG_AUDIO is not set
 
 #
-# Binary Formats
+# Wireless Support
+#
+
+#
+# Binary Loader
 #
 # CONFIG_BINFMT_DISABLE is not set
 # CONFIG_BINFMT_EXEPATH is not set
@@ -499,6 +579,7 @@ CONFIG_LIB_HOMEDIR="/"
 # CONFIG_NOPRINTF_FIELDWIDTH is not set
 # CONFIG_LIBC_FLOATINGPOINT is not set
 CONFIG_LIBC_LONG_LONG=y
+# CONFIG_LIBC_IOCTL_VARIADIC is not set
 CONFIG_LIB_RAND_ORDER=1
 # CONFIG_EOL_IS_CR is not set
 # CONFIG_EOL_IS_LF is not set
@@ -509,16 +590,23 @@ CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
 # CONFIG_LIBC_STRERROR is not set
 # CONFIG_LIBC_PERROR_STDOUT is not set
+CONFIG_LIBC_TMPDIR="/tmp"
+CONFIG_LIBC_MAX_TMPFILE=32
 CONFIG_ARCH_LOWPUTC=y
 # CONFIG_LIBC_LOCALTIME is not set
+# CONFIG_TIME_EXTENDED is not set
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
-# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -533,26 +621,26 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FSTEST is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -560,75 +648,80 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
-# CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_UDP is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
 #
 # CONFIG_TIFF is not set
+# CONFIG_GRAPHICS_TRAVELER is not set
 
 #
 # Interpreters
 #
+# CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_MICROPYTHON is not set
 # CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
-# CONFIG_NETUTILS_DHCPD is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
-# CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_TFTPC is not set
-# CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_NETLIB is not set
-# CONFIG_NETUTILS_WEBCLIENT is not set
-
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
 
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -647,13 +740,16 @@ CONFIG_NSH_NESTDEPTH=3
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
 # CONFIG_NSH_DISABLE_CMP is not set
+CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_DD is not set
 # CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -662,8 +758,10 @@ CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 # CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -672,6 +770,7 @@ CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLE_MKRD is not set
 # CONFIG_NSH_DISABLE_MH is not set
 # CONFIG_NSH_DISABLE_MOUNT is not set
+# CONFIG_NSH_DISABLE_MV is not set
 # CONFIG_NSH_DISABLE_MW is not set
 # CONFIG_NSH_DISABLE_PS is not set
 # CONFIG_NSH_DISABLE_PUT is not set
@@ -681,8 +780,10 @@ CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
@@ -709,7 +810,8 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
-CONFIG_LIB_BOARDCTL=y
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -723,112 +825,19 @@ CONFIG_LIB_BOARDCTL=y
 #
 # System Libraries and NSH Add-Ons
 #
-
-#
-# Custom Free Memory Command
-#
-# CONFIG_SYSTEM_FREE is not set
-
-#
-# EMACS-like Command Line Editor
-#
 # CONFIG_SYSTEM_CLE is not set
-
-#
-# FLASH Program Installation
-#
-# CONFIG_SYSTEM_INSTALL is not set
-
-#
-# FLASH Erase-all Command
-#
-
-#
-# Intel HEX to binary conversion
-#
+# CONFIG_SYSTEM_CUTERM is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-
-#
-# I2C tool
-#
-
-#
-# INI File Parser
-#
-# CONFIG_FSUTILS_INIFILE is not set
-
-#
-# NxPlayer media player library / command Line
-#
-# CONFIG_SYSTEM_NXPLAYER is not set
-
-#
-# RAM test
-#
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
-
-#
-# readline()
-#
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
-
-#
-# P-Code Support
-#
-
-#
-# PHY Tool
-#
-
-#
-# Power Off
-#
-# CONFIG_SYSTEM_POWEROFF is not set
-
-#
-# RAMTRON
-#
-
-#
-# SD Card
-#
-
-#
-# Sudoku
-#
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-
-#
-# Sysinfo
-#
-
-#
-# VI Work-Alike Editor
-#
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
-
-#
-# Stack Monitor
-#
-
-#
-# USB CDC/ACM Device Commands
-#
-
-#
-# USB Composite Device Commands
-#
-
-#
-# USB Mass Storage Device Commands
-#
-
-#
-# USB Monitor
-#
-
-#
-# Zmodem Commands
-#
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/ea3131/pgnsh/defconfig b/configs/ea3131/pgnsh/defconfig
index abb4c19f04..0be35cb7ec 100644
--- a/configs/ea3131/pgnsh/defconfig
+++ b/configs/ea3131/pgnsh/defconfig
@@ -44,14 +44,16 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -82,6 +84,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -99,7 +102,11 @@ CONFIG_ARCH_CHIP_LPC31XX=y
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 CONFIG_ARCH_ARM926EJS=y
 # CONFIG_ARCH_ARM920T is not set
@@ -109,10 +116,21 @@ CONFIG_ARCH_ARM926EJS=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="arm"
 CONFIG_ARCH_CHIP="lpc31xx"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 CONFIG_ARCH_LOWVECTORS=y
 # CONFIG_ARCH_ROMPGTABLE is not set
@@ -175,12 +193,14 @@ CONFIG_ARCH_HAVE_EXTSRAM1=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 CONFIG_ARCH_HAVE_MMU=y
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
 # CONFIG_ARCH_HAVE_POWEROFF is not set
+# CONFIG_ARCH_HAVE_RESET is not set
 CONFIG_ARCH_USE_MMU=y
 CONFIG_PAGING=y
 CONFIG_PAGING_PAGESIZE=1024
@@ -258,6 +278,7 @@ CONFIG_EA3131_PAGING_BINOFFSET=0
 CONFIG_EA3131_PAGING_SDSLOT=0
 CONFIG_EA3131_PAGING_SPIPORT=0
 CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
 # CONFIG_BOARDCTL_ADCTEST is not set
 # CONFIG_BOARDCTL_PWMTEST is not set
@@ -297,6 +318,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -347,9 +369,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -380,14 +403,20 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 CONFIG_SPI=y
+# CONFIG_SPI_SLAVE is not set
 CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_CMDDATA is not set
 CONFIG_SPI_CALLBACK=y
 # CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_HWFEATURES is not set
+# CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -401,7 +430,21 @@ CONFIG_SPI_CALLBACK=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -413,6 +456,7 @@ CONFIG_MMCSD_SPICLOCK=20000000
 CONFIG_MMCSD_SPIMODE=0
 # CONFIG_ARCH_HAVE_SDIO is not set
 # CONFIG_ARCH_HAVE_SDIOWAIT_WRCOMPLETE is not set
+# CONFIG_MODEM is not set
 CONFIG_MTD=y
 
 #
@@ -421,6 +465,7 @@ CONFIG_MTD=y
 # CONFIG_MTD_PARTITION is not set
 # CONFIG_MTD_SECT512 is not set
 # CONFIG_MTD_BYTE_WRITE is not set
+# CONFIG_MTD_PROGMEM is not set
 # CONFIG_MTD_CONFIG is not set
 
 #
@@ -428,18 +473,24 @@ CONFIG_MTD=y
 #
 # CONFIG_MTD_NAND is not set
 # CONFIG_RAMMTD is not set
+# CONFIG_FILEMTD is not set
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT25 is not set
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 CONFIG_MTD_M25P=y
 CONFIG_M25P_SPIMODE=3
+CONFIG_M25P_SPIFREQUENCY=20000000
 CONFIG_M25P_MANUFACTURER=0x20
 CONFIG_M25P_MEMORY_TYPE=0x20
 # CONFIG_M25P_SUBSECTOR_ERASE is not set
+# CONFIG_MTD_S25FL1 is not set
+# CONFIG_MTD_N25QXXX is not set
 # CONFIG_MTD_SMART is not set
 # CONFIG_MTD_RAMTRON is not set
 # CONFIG_MTD_SST25 is not set
 # CONFIG_MTD_SST25XX is not set
+# CONFIG_MTD_SST26 is not set
 # CONFIG_MTD_SST39FV is not set
 # CONFIG_MTD_W25 is not set
 # CONFIG_EEPROM is not set
@@ -450,6 +501,8 @@ CONFIG_M25P_MEMORY_TYPE=0x20
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 CONFIG_UART_SERIALDRIVER=y
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -473,14 +526,11 @@ CONFIG_UART_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -497,19 +547,23 @@ CONFIG_UART_PARITY=0
 CONFIG_UART_2STOP=0
 # CONFIG_UART_IFLOWCONTROL is not set
 # CONFIG_UART_OFLOWCONTROL is not set
+# CONFIG_UART_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -542,18 +596,16 @@ CONFIG_FS_FAT=y
 # CONFIG_FAT_LCNAMES is not set
 # CONFIG_FAT_LFN is not set
 # CONFIG_FS_FATTIME is not set
+# CONFIG_FAT_FORCE_INDIRECT is not set
 # CONFIG_FAT_DMAMEMORY is not set
+# CONFIG_FAT_DIRECT_RETRY is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -573,6 +625,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -618,10 +674,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -636,26 +697,26 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FSTEST is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -663,18 +724,19 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -682,14 +744,27 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_FLASH_ERASEALL is not set
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -702,30 +777,28 @@ CONFIG_EXAMPLES_NSH=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -744,6 +817,7 @@ CONFIG_NSH_NESTDEPTH=3
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
@@ -752,6 +826,7 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_DD is not set
 # CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -760,8 +835,10 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 # CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -780,8 +857,10 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
@@ -808,6 +887,8 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -821,15 +902,19 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/ea3131/usbserial/defconfig b/configs/ea3131/usbserial/defconfig
index cdab4df4bf..4af07a8c24 100644
--- a/configs/ea3131/usbserial/defconfig
+++ b/configs/ea3131/usbserial/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -121,6 +122,8 @@ CONFIG_ARCH_ARM926EJS=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="arm"
 CONFIG_ARCH_CHIP="lpc31xx"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
 # CONFIG_ARCH_HAVE_TRUSTZONE is not set
@@ -410,7 +413,12 @@ CONFIG_DEV_NULL=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -418,6 +426,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -430,6 +439,7 @@ CONFIG_DEV_NULL=y
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
 CONFIG_SERIAL_REMOVABLE=y
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 CONFIG_UART_SERIALDRIVER=y
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -453,10 +463,6 @@ CONFIG_UART_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
@@ -519,15 +525,18 @@ CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
 CONFIG_USBHOST_HAVE_ASYNCH=y
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -564,11 +573,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -639,6 +643,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -667,10 +672,10 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -679,18 +684,18 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -704,7 +709,6 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 CONFIG_EXAMPLES_USBSERIAL=y
 CONFIG_EXAMPLES_USBSERIAL_BUFSIZE=512
 # CONFIG_EXAMPLES_USBSERIAL_TRACEINIT is not set
@@ -714,6 +718,7 @@ CONFIG_EXAMPLES_USBSERIAL_BUFSIZE=512
 # CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -735,8 +740,8 @@ CONFIG_EXAMPLES_USBSERIAL_BUFSIZE=512
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -747,6 +752,7 @@ CONFIG_EXAMPLES_USBSERIAL_BUFSIZE=512
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -768,17 +774,17 @@ CONFIG_EXAMPLES_USBSERIAL_BUFSIZE=512
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_USBMONITOR is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/ea3152/ostest/defconfig b/configs/ea3152/ostest/defconfig
index 2aa4bcbbb2..7c590ebf44 100644
--- a/configs/ea3152/ostest/defconfig
+++ b/configs/ea3152/ostest/defconfig
@@ -41,12 +41,15 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
+# CONFIG_STACK_COLORATION is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
@@ -76,11 +79,14 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_C5471 is not set
 # CONFIG_ARCH_CHIP_CALYPSO is not set
 # CONFIG_ARCH_CHIP_DM320 is not set
+# CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
 # CONFIG_ARCH_CHIP_TIVA is not set
+# CONFIG_ARCH_CHIP_LPC11XX is not set
 # CONFIG_ARCH_CHIP_LPC17XX is not set
 # CONFIG_ARCH_CHIP_LPC214X is not set
 # CONFIG_ARCH_CHIP_LPC2378 is not set
@@ -89,20 +95,39 @@ CONFIG_ARCH_CHIP_LPC31XX=y
 # CONFIG_ARCH_CHIP_NUC1XX is not set
 # CONFIG_ARCH_CHIP_SAMA5 is not set
 # CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
 # CONFIG_ARCH_CHIP_SAM34 is not set
+# CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 CONFIG_ARCH_ARM926EJS=y
 # CONFIG_ARCH_ARM920T is not set
 # CONFIG_ARCH_CORTEXM0 is not set
 # CONFIG_ARCH_CORTEXM3 is not set
 # CONFIG_ARCH_CORTEXM4 is not set
+# CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="arm"
 CONFIG_ARCH_CHIP="lpc31xx"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
+# CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 CONFIG_ARCH_LOWVECTORS=y
 CONFIG_ARCH_ROMPGTABLE=y
@@ -166,11 +191,14 @@ CONFIG_ARCH_HAVE_EXTSRAM1=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 CONFIG_ARCH_HAVE_MMU=y
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+# CONFIG_ARCH_HAVE_RESET is not set
 CONFIG_ARCH_USE_MMU=y
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
@@ -226,6 +254,7 @@ CONFIG_ARCH_HAVE_BUTTONS=y
 #
 # Board-Specific Options
 #
+# CONFIG_LIB_BOARDCTL is not set
 
 #
 # RTOS Features
@@ -255,8 +284,12 @@ CONFIG_PREALLOC_TIMERS=4
 #
 # Tasks and Scheduling
 #
+# CONFIG_INIT_NONE is not set
+CONFIG_INIT_ENTRYPOINT=y
+# CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="ostest_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -307,6 +340,14 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
+
+#
+# Work queue support
+#
+# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_SCHED_HPWORK is not set
+# CONFIG_SCHED_LPWORK is not set
 
 #
 # Stack and heap information
@@ -333,22 +374,43 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 # CONFIG_SPI is not set
 # CONFIG_I2S is not set
+
+#
+# Timer Driver Support
+#
+# CONFIG_TIMER is not set
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
-# CONFIG_TIMER is not set
 # CONFIG_ANALOG is not set
 # CONFIG_AUDIO_DEVICES is not set
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
+# CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
@@ -356,6 +418,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 CONFIG_UART_SERIALDRIVER=y
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -378,12 +442,14 @@ CONFIG_UART_SERIALDRIVER=y
 # CONFIG_USART6_SERIALDRIVER is not set
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
+# CONFIG_OTHER_UART_SERIALDRIVER is not set
 CONFIG_MCU_SERIAL=y
+# CONFIG_SERIAL_IFLOWCONTROL is not set
+# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
+# CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART_SERIAL_CONSOLE=y
+# CONFIG_OTHER_SERIAL_CONSOLE is not set
 # CONFIG_NO_SERIAL_CONSOLE is not set
 
 #
@@ -397,20 +463,23 @@ CONFIG_UART_PARITY=0
 CONFIG_UART_2STOP=0
 # CONFIG_UART_IFLOWCONTROL is not set
 # CONFIG_UART_OFLOWCONTROL is not set
-# CONFIG_SERIAL_IFLOWCONTROL is not set
-# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_UART_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -435,13 +504,11 @@ CONFIG_DISABLE_MOUNTPOINT=y
 # CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
 # CONFIG_FS_READABLE is not set
 # CONFIG_FS_WRITABLE is not set
+# CONFIG_FS_NAMED_SEMAPHORES is not set
+CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_RAMMAP is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
-
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -463,7 +530,11 @@ CONFIG_MM_REGIONS=1
 # CONFIG_AUDIO is not set
 
 #
-# Binary Formats
+# Wireless Support
+#
+
+#
+# Binary Loader
 #
 # CONFIG_BINFMT_DISABLE is not set
 # CONFIG_NXFLAT is not set
@@ -486,6 +557,7 @@ CONFIG_NUNGET_CHARS=2
 # CONFIG_NOPRINTF_FIELDWIDTH is not set
 # CONFIG_LIBC_FLOATINGPOINT is not set
 CONFIG_LIBC_LONG_LONG=y
+# CONFIG_LIBC_IOCTL_VARIADIC is not set
 CONFIG_LIB_RAND_ORDER=1
 # CONFIG_EOL_IS_CR is not set
 # CONFIG_EOL_IS_LF is not set
@@ -497,14 +569,18 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
 # CONFIG_LIBC_STRERROR is not set
 # CONFIG_LIBC_PERROR_STDOUT is not set
 CONFIG_ARCH_LOWPUTC=y
+# CONFIG_TIME_EXTENDED is not set
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
-# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -519,14 +595,13 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -534,11 +609,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -546,12 +621,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 CONFIG_EXAMPLES_OSTEST=y
 CONFIG_EXAMPLES_OSTEST_LOOPS=1
@@ -559,62 +633,64 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 CONFIG_EXAMPLES_OSTEST_RR_RANGE=10000
 CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
-# CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_UDP is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
 #
 # CONFIG_TIFF is not set
+# CONFIG_GRAPHICS_TRAVELER is not set
 
 #
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_MICROPYTHON is not set
 # CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
-# CONFIG_NETUTILS_DHCPD is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
-# CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_TFTPC is not set
-# CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_NETLIB is not set
-# CONFIG_NETUTILS_WEBCLIENT is not set
-
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
 
 #
 # NSH Library
@@ -633,111 +709,16 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 #
 # System Libraries and NSH Add-Ons
 #
-
-#
-# Custom Free Memory Command
-#
-# CONFIG_SYSTEM_FREE is not set
-
-#
-# EMACS-like Command Line Editor
-#
 # CONFIG_SYSTEM_CLE is not set
-
-#
-# FLASH Program Installation
-#
-# CONFIG_SYSTEM_INSTALL is not set
-
-#
-# FLASH Erase-all Command
-#
-
-#
-# Intel HEX to binary conversion
-#
+# CONFIG_SYSTEM_CUTERM is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-
-#
-# I2C tool
-#
-
-#
-# INI File Parser
-#
-# CONFIG_FSUTILS_INIFILE is not set
-
-#
-# NxPlayer media player library / command Line
-#
-# CONFIG_SYSTEM_NXPLAYER is not set
-
-#
-# RAM test
-#
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
-
-#
-# readline()
-#
+# CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
-
-#
-# P-Code Support
-#
-
-#
-# PHY Tool
-#
-
-#
-# Power Off
-#
-# CONFIG_SYSTEM_POWEROFF is not set
-
-#
-# RAMTRON
-#
-
-#
-# SD Card
-#
-
-#
-# Sudoku
-#
 # CONFIG_SYSTEM_SUDOKU is not set
-
-#
-# Sysinfo
-#
-
-#
-# VI Work-Alike Editor
-#
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
-
-#
-# Stack Monitor
-#
-
-#
-# USB CDC/ACM Device Commands
-#
-
-#
-# USB Composite Device Commands
-#
-
-#
-# USB Mass Storage Device Commands
-#
-
-#
-# USB Monitor
-#
-
-#
-# Zmodem Commands
-#
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/eagle100/httpd/defconfig b/configs/eagle100/httpd/defconfig
index e3f52f0a1a..19ed517f66 100644
--- a/configs/eagle100/httpd/defconfig
+++ b/configs/eagle100/httpd/defconfig
@@ -21,6 +21,7 @@ CONFIG_WINDOWS_CYGWIN=y
 # Build Configuration
 #
 # CONFIG_APPS_DIR="../apps"
+CONFIG_BUILD_FLAT=y
 # CONFIG_BUILD_2PASS is not set
 
 #
@@ -30,20 +31,25 @@ CONFIG_WINDOWS_CYGWIN=y
 # CONFIG_INTELHEX_BINARY is not set
 # CONFIG_MOTOROLA_SREC is not set
 CONFIG_RAW_BINARY=y
+# CONFIG_UBOOT_UIMAGE is not set
 
 #
 # Customize Header Files
 #
+# CONFIG_ARCH_STDINT_H is not set
 # CONFIG_ARCH_STDBOOL_H is not set
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
+# CONFIG_STACK_COLORATION is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
@@ -73,10 +79,14 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_C5471 is not set
 # CONFIG_ARCH_CHIP_CALYPSO is not set
 # CONFIG_ARCH_CHIP_DM320 is not set
+# CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 CONFIG_ARCH_CHIP_LM=y
+# CONFIG_ARCH_CHIP_TIVA is not set
+# CONFIG_ARCH_CHIP_LPC11XX is not set
 # CONFIG_ARCH_CHIP_LPC17XX is not set
 # CONFIG_ARCH_CHIP_LPC214X is not set
 # CONFIG_ARCH_CHIP_LPC2378 is not set
@@ -85,28 +95,53 @@ CONFIG_ARCH_CHIP_LM=y
 # CONFIG_ARCH_CHIP_NUC1XX is not set
 # CONFIG_ARCH_CHIP_SAMA5 is not set
 # CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
 # CONFIG_ARCH_CHIP_SAM34 is not set
+# CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
 # CONFIG_ARCH_CORTEXM0 is not set
 CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXM4 is not set
+# CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="tiva"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
+# CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
-# CONFIG_ARCH_HAVE_MPU is not set
+# CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
+# CONFIG_ARM_MPU is not set
 
 #
 # ARMV7M Configuration Options
 #
+# CONFIG_ARMV7M_HAVE_ICACHE is not set
+# CONFIG_ARMV7M_HAVE_DCACHE is not set
+# CONFIG_ARMV7M_HAVE_ITCM is not set
+# CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARW is not set
 # CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
 # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDW is not set
@@ -115,9 +150,11 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
 # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW is not set
 # CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE is not set
+# CONFIG_ARMV7M_HAVE_STACKCHECK is not set
+# CONFIG_ARMV7M_ITMSYSLOG is not set
 
 #
-# Stellaris Configuration Options
+# Tiva/Stellaris Configuration Options
 #
 CONFIG_ARCH_CHIP_LM3S6918=y
 # CONFIG_ARCH_CHIP_LM3S9B96 is not set
@@ -126,23 +163,79 @@ CONFIG_ARCH_CHIP_LM3S6918=y
 # CONFIG_ARCH_CHIP_LM3S8962 is not set
 # CONFIG_ARCH_CHIP_LM4F120 is not set
 CONFIG_ARCH_CHIP_LM3S=y
-CONFIG_TIVA_HAVE_SSI1=y
 # CONFIG_LM_REVA2 is not set
-
-#
-# Stellaris Peripheral Support
-#
+# CONFIG_TIVA_BOARD_EARLYINIT is not set
+
+#
+# Tiva/Stellaris Peripheral Support
+#
+# CONFIG_TIVA_ADC is not set
+# CONFIG_TIVA_HAVE_ADC0 is not set
+# CONFIG_TIVA_HAVE_ADC1 is not set
+# CONFIG_TIVA_I2C is not set
+CONFIG_TIVA_HAVE_I2C1=y
+# CONFIG_TIVA_HAVE_I2C2 is not set
+# CONFIG_TIVA_HAVE_I2C3 is not set
+# CONFIG_TIVA_HAVE_I2C4 is not set
+# CONFIG_TIVA_HAVE_I2C5 is not set
+# CONFIG_TIVA_HAVE_I2C6 is not set
+# CONFIG_TIVA_HAVE_I2C7 is not set
+# CONFIG_TIVA_HAVE_I2C8 is not set
+# CONFIG_TIVA_HAVE_I2C9 is not set
+# CONFIG_TIVA_HAVE_UART3 is not set
+# CONFIG_TIVA_HAVE_UART4 is not set
+# CONFIG_TIVA_HAVE_UART5 is not set
+# CONFIG_TIVA_HAVE_UART6 is not set
+# CONFIG_TIVA_HAVE_UART7 is not set
+CONFIG_TIVA_HAVE_SSI0=y
+CONFIG_TIVA_HAVE_SSI1=y
+# CONFIG_TIVA_HAVE_SSI2 is not set
+# CONFIG_TIVA_HAVE_SSI3 is not set
+CONFIG_TIVA_HAVE_ETHERNET=y
+CONFIG_TIVA_SSI=y
+# CONFIG_TIVA_TIMER is not set
+# CONFIG_TIVA_HAVE_TIMER0 is not set
+# CONFIG_TIVA_HAVE_TIMER1 is not set
+# CONFIG_TIVA_HAVE_TIMER2 is not set
+CONFIG_TIVA_HAVE_TIMER3=y
+# CONFIG_TIVA_HAVE_TIMER4 is not set
+# CONFIG_TIVA_HAVE_TIMER5 is not set
+# CONFIG_TIVA_HAVE_TIMER6 is not set
+# CONFIG_TIVA_HAVE_TIMER7 is not set
+# CONFIG_TIVA_ADC0 is not set
+# CONFIG_TIVA_I2C0 is not set
+# CONFIG_TIVA_I2C1 is not set
 CONFIG_TIVA_UART0=y
 # CONFIG_TIVA_UART1 is not set
 # CONFIG_TIVA_UART2 is not set
 CONFIG_TIVA_SSI0=y
 # CONFIG_TIVA_SSI1 is not set
+# CONFIG_TIVA_TIMER3 is not set
 CONFIG_TIVA_ETHERNET=y
 # CONFIG_TIVA_FLASH is not set
 
 #
-# Disable GPIO Interrupts
-#
+# Enable GPIO Interrupts
+#
+CONFIG_TIVA_GPIO_IRQS=y
+CONFIG_TIVA_HAVE_GPIOA_IRQS=y
+CONFIG_TIVA_HAVE_GPIOB_IRQS=y
+CONFIG_TIVA_HAVE_GPIOC_IRQS=y
+CONFIG_TIVA_HAVE_GPIOD_IRQS=y
+CONFIG_TIVA_HAVE_GPIOE_IRQS=y
+CONFIG_TIVA_HAVE_GPIOF_IRQS=y
+CONFIG_TIVA_HAVE_GPIOG_IRQS=y
+# CONFIG_TIVA_HAVE_GPIOH_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOJ_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOK_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOL_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOM_IRQS is not set
+# CONFIG_TIVA_HAVE_GPION_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOP_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOQ_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOR_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOS_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOT_IRQS is not set
 CONFIG_TIVA_GPIOA_IRQS=y
 CONFIG_TIVA_GPIOB_IRQS=y
 CONFIG_TIVA_GPIOC_IRQS=y
@@ -150,14 +243,11 @@ CONFIG_TIVA_GPIOD_IRQS=y
 CONFIG_TIVA_GPIOE_IRQS=y
 CONFIG_TIVA_GPIOF_IRQS=y
 CONFIG_TIVA_GPIOG_IRQS=y
-CONFIG_TIVA_GPIOH_IRQS=y
-# CONFIG_TIVA_GPIOJ_IRQS is not set
 
 #
 # Stellaris Ethernet Configuration
 #
 # CONFIG_TIVA_ETHLEDS is not set
-CONFIG_TIVA_BOARDMAC=y
 # CONFIG_TIVA_ETHHDUPLEX is not set
 # CONFIG_TIVA_ETHNOAUTOCRC is not set
 # CONFIG_TIVA_ETHNOPAD is not set
@@ -165,10 +255,11 @@ CONFIG_TIVA_BOARDMAC=y
 # CONFIG_TIVA_PROMISCUOUS is not set
 # CONFIG_TIVA_TIMESTAMP is not set
 # CONFIG_TIVA_BADCRC is not set
-# CONFIG_M3S_DUMPPACKET is not set
+# CONFIG_TIVA_DUMPPACKET is not set
+CONFIG_TIVA_BOARDMAC=y
 
 #
-# Stellaris SSI Configuration
+# Tiva/Stellaris SSI Configuration
 #
 CONFIG_SSI_POLLWAIT=y
 CONFIG_SSI_TXLIMIT=4
@@ -180,10 +271,19 @@ CONFIG_SSI_TXLIMIT=4
 # CONFIG_ARCH_VECNOTIRQ is not set
 # CONFIG_ARCH_DMA is not set
 CONFIG_ARCH_HAVE_IRQPRIO=y
-# CONFIG_ARCH_ADDRENV is not set
+# CONFIG_ARCH_L2CACHE is not set
+# CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
+# CONFIG_ARCH_HAVE_ADDRENV is not set
+# CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
+CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARCH_NAND_HWECC is not set
+# CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
+# CONFIG_ARCH_USE_MPU is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
@@ -238,39 +338,78 @@ CONFIG_ARCH_LEDS=y
 #
 # Board-Specific Options
 #
+# CONFIG_LIB_BOARDCTL is not set
 
 #
 # RTOS Features
 #
-# CONFIG_BOARD_INITIALIZE is not set
+CONFIG_DISABLE_OS_API=y
+# CONFIG_DISABLE_POSIX_TIMERS is not set
+# CONFIG_DISABLE_PTHREAD is not set
+# CONFIG_DISABLE_SIGNALS is not set
+CONFIG_DISABLE_MQUEUE=y
+CONFIG_DISABLE_ENVIRON=y
+
+#
+# Clocks and Timers
+#
 CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
-CONFIG_RR_INTERVAL=200
-# CONFIG_SCHED_CPULOAD is not set
-# CONFIG_SCHED_INSTRUMENTATION is not set
-CONFIG_TASK_NAME_SIZE=0
-# CONFIG_SCHED_HAVE_PARENT is not set
+# CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
 CONFIG_START_YEAR=2009
 CONFIG_START_MONTH=5
 CONFIG_START_DAY=20
-CONFIG_DEV_CONSOLE=y
+CONFIG_MAX_WDOGPARMS=4
+CONFIG_PREALLOC_WDOGS=8
+CONFIG_WDOG_INTRESERVE=1
+CONFIG_PREALLOC_TIMERS=8
+
+#
+# Tasks and Scheduling
+#
+# CONFIG_INIT_NONE is not set
+CONFIG_INIT_ENTRYPOINT=y
+# CONFIG_INIT_FILEPATH is not set
+CONFIG_USER_ENTRYPOINT="webserver_main"
+CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
+CONFIG_TASK_NAME_SIZE=0
+CONFIG_MAX_TASKS=8
+# CONFIG_SCHED_HAVE_PARENT is not set
+# CONFIG_SCHED_WAITPID is not set
+
+#
+# Pthread Options
+#
 # CONFIG_MUTEX_TYPES is not set
-# CONFIG_PRIORITY_INHERITANCE is not set
+CONFIG_NPTHREAD_KEYS=0
+
+#
+# Performance Monitoring
+#
+# CONFIG_SCHED_CPULOAD is not set
+# CONFIG_SCHED_INSTRUMENTATION is not set
+
+#
+# Files and I/O
+#
+CONFIG_DEV_CONSOLE=y
 # CONFIG_FDCLONE_DISABLE is not set
 # CONFIG_FDCLONE_STDIO is not set
 CONFIG_SDCLONE_DISABLE=y
-# CONFIG_SCHED_WAITPID is not set
+CONFIG_NFILE_DESCRIPTORS=8
+CONFIG_NFILE_STREAMS=8
+CONFIG_NAME_MAX=32
+# CONFIG_PRIORITY_INHERITANCE is not set
+
+#
+# RTOS hooks
+#
+# CONFIG_BOARD_INITIALIZE is not set
 # CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
-CONFIG_USER_ENTRYPOINT="webserver_main"
-CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_POSIX_TIMERS is not set
-# CONFIG_DISABLE_PTHREAD is not set
-# CONFIG_DISABLE_SIGNALS is not set
-CONFIG_DISABLE_MQUEUE=y
-CONFIG_DISABLE_ENVIRON=y
 
 #
 # Signal Numbers
@@ -279,21 +418,14 @@ CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
 CONFIG_SIG_SIGCONDTIMEDOUT=16
+# CONFIG_MODULE is not set
 
 #
-# Sizes of configurable things (0 disables)
+# Work queue support
 #
-CONFIG_MAX_TASKS=8
-CONFIG_NPTHREAD_KEYS=0
-CONFIG_NFILE_DESCRIPTORS=8
-CONFIG_NFILE_STREAMS=8
-CONFIG_NAME_MAX=32
-CONFIG_PREALLOC_MQ_MSGS=0
-CONFIG_MQ_MAXMSGSIZE=0
-CONFIG_MAX_WDOGPARMS=4
-CONFIG_PREALLOC_WDOGS=8
-CONFIG_WDOG_INTRESERVE=1
-CONFIG_PREALLOC_TIMERS=8
+# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_SCHED_HPWORK is not set
+# CONFIG_SCHED_LPWORK is not set
 
 #
 # Stack and heap information
@@ -302,6 +434,7 @@ CONFIG_IDLETHREAD_STACKSIZE=1024
 CONFIG_USERMAIN_STACKSIZE=2048
 CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=2048
+# CONFIG_LIB_SYSCALL is not set
 
 #
 # Device Drivers
@@ -310,14 +443,26 @@ CONFIG_DISABLE_POLL=y
 CONFIG_DEV_NULL=y
 # CONFIG_DEV_ZERO is not set
 # CONFIG_DEV_LOOP is not set
+
+#
+# Buffering
+#
+# CONFIG_DRVR_WRITEBUFFER is not set
+# CONFIG_DRVR_READAHEAD is not set
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 # CONFIG_SPI is not set
 # CONFIG_I2S is not set
+
+#
+# Timer Driver Support
+#
+# CONFIG_TIMER is not set
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_ANALOG is not set
@@ -325,15 +470,36 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
+# CONFIG_EEPROM is not set
 CONFIG_NETDEVICES=y
 
 #
 # General Ethernet MAC Driver Options
 #
+# CONFIG_NETDEV_LOOPBACK is not set
+# CONFIG_NETDEV_TELNET is not set
 # CONFIG_NETDEV_MULTINIC is not set
+CONFIG_ARCH_HAVE_NETDEV_STATISTICS=y
+# CONFIG_NETDEV_STATISTICS is not set
+# CONFIG_NETDEV_LATEINIT is not set
 
 #
 # External Ethernet MAC Device Support
@@ -343,6 +509,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_ENCX24J600 is not set
 # CONFIG_NET_E1000 is not set
 # CONFIG_NET_SLIP is not set
+# CONFIG_NET_FTMAC100 is not set
 # CONFIG_NET_VNET is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
@@ -351,14 +518,38 @@ CONFIG_NETDEVICES=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
+# CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
-
-#
-# USART Configuration
-#
+# CONFIG_UART1_SERIALDRIVER is not set
+# CONFIG_UART2_SERIALDRIVER is not set
+# CONFIG_UART3_SERIALDRIVER is not set
+# CONFIG_UART4_SERIALDRIVER is not set
+# CONFIG_UART5_SERIALDRIVER is not set
+# CONFIG_UART6_SERIALDRIVER is not set
+# CONFIG_UART7_SERIALDRIVER is not set
+# CONFIG_UART8_SERIALDRIVER is not set
+# CONFIG_SCI0_SERIALDRIVER is not set
+# CONFIG_SCI1_SERIALDRIVER is not set
+# CONFIG_USART0_SERIALDRIVER is not set
+# CONFIG_USART1_SERIALDRIVER is not set
+# CONFIG_USART2_SERIALDRIVER is not set
+# CONFIG_USART3_SERIALDRIVER is not set
+# CONFIG_USART4_SERIALDRIVER is not set
+# CONFIG_USART5_SERIALDRIVER is not set
+# CONFIG_USART6_SERIALDRIVER is not set
+# CONFIG_USART7_SERIALDRIVER is not set
+# CONFIG_USART8_SERIALDRIVER is not set
+# CONFIG_OTHER_UART_SERIALDRIVER is not set
 CONFIG_MCU_SERIAL=y
+# CONFIG_SERIAL_IFLOWCONTROL is not set
+# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
+# CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
+# CONFIG_OTHER_SERIAL_CONSOLE is not set
 # CONFIG_NO_SERIAL_CONSOLE is not set
 
 #
@@ -372,20 +563,23 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
-# CONFIG_SERIAL_IFLOWCONTROL is not set
-# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -394,20 +588,58 @@ CONFIG_ARCH_HAVE_NET=y
 # CONFIG_ARCH_HAVE_PHY is not set
 CONFIG_NET=y
 # CONFIG_NET_NOINTS is not set
-CONFIG_NET_IPv4=y
-# CONFIG_NET_MULTIBUFFER is not set
 # CONFIG_NET_PROMISCUOUS is not set
+
+#
+# Driver buffer configuration
+#
+# CONFIG_NET_MULTIBUFFER is not set
+CONFIG_NET_ETH_MTU=590
+CONFIG_NET_ETH_TCP_RECVWNDO=536
+CONFIG_NET_GUARDSIZE=2
+
+#
+# Data link support
+#
+# CONFIG_NET_MULTILINK is not set
+CONFIG_NET_ETHERNET=y
+# CONFIG_NET_LOOPBACK is not set
+# CONFIG_NET_TUN is not set
+
+#
+# Network Device Operations
+#
+# CONFIG_NETDEV_PHY_IOCTL is not set
+
+#
+# Internet Protocol Selection
+#
+CONFIG_NET_IPv4=y
+# CONFIG_NET_IPv6 is not set
+
+#
+# Socket Support
+#
 CONFIG_NSOCKET_DESCRIPTORS=16
 CONFIG_NET_NACTIVESOCKETS=16
 CONFIG_NET_SOCKOPTS=y
 # CONFIG_NET_SOLINGER is not set
-CONFIG_NET_ETH_MTU=562
-# CONFIG_NET_TCPURGDATA is not set
+
+#
+# Raw Socket Support
+#
+# CONFIG_NET_PKT is not set
+
+#
+# Unix Domain Socket Support
+#
+# CONFIG_NET_LOCAL is not set
 
 #
 # TCP/IP Networking
 #
 CONFIG_NET_TCP=y
+# CONFIG_NET_TCPURGDATA is not set
 CONFIG_NET_TCP_CONNS=16
 CONFIG_NET_MAX_LISTENPORTS=8
 CONFIG_NET_TCP_READAHEAD=y
@@ -421,24 +653,48 @@ CONFIG_NET_TCPBACKLOG=y
 # UDP Networking
 #
 # CONFIG_NET_UDP is not set
+
+#
+# ICMP Networking Support
+#
 CONFIG_NET_ICMP=y
 # CONFIG_NET_ICMP_PING is not set
+
+#
+# IGMPv2 Client Support
+#
 # CONFIG_NET_IGMP is not set
-CONFIG_NET_STATISTICS=y
-CONFIG_NET_ETH_TCP_RECVWNDO=536
+
+#
+# ARP Configuration
+#
+CONFIG_NET_ARP=y
 CONFIG_NET_ARPTAB_SIZE=16
+CONFIG_NET_ARP_MAXAGE=120
 # CONFIG_NET_ARP_IPIN is not set
+# CONFIG_NET_ARP_SEND is not set
+
+#
+# Network I/O Buffer Support
+#
 CONFIG_NET_IOB=y
 CONFIG_IOB_NBUFFERS=24
 CONFIG_IOB_BUFSIZE=196
 CONFIG_IOB_NCHAINS=8
-CONFIG_IOB_THROTTLE=0
+# CONFIG_NET_ARCH_INCR32 is not set
+# CONFIG_NET_ARCH_CHKSUM is not set
+CONFIG_NET_STATISTICS=y
 
 #
 # Routing Table Configuration
 #
 # CONFIG_NET_ROUTE is not set
-CONFIG_NET_ETHERNET=y
+CONFIG_NET_HOSTNAME=""
+
+#
+# Crypto API
+#
+# CONFIG_CRYPTO is not set
 
 #
 # File Systems
@@ -451,13 +707,10 @@ CONFIG_DISABLE_MOUNTPOINT=y
 # CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
 # CONFIG_FS_READABLE is not set
 # CONFIG_FS_WRITABLE is not set
+# CONFIG_FS_NAMED_SEMAPHORES is not set
 # CONFIG_FS_RAMMAP is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
-
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -478,7 +731,11 @@ CONFIG_MM_REGIONS=1
 # CONFIG_AUDIO is not set
 
 #
-# Binary Formats
+# Wireless Support
+#
+
+#
+# Binary Loader
 #
 # CONFIG_BINFMT_DISABLE is not set
 # CONFIG_NXFLAT is not set
@@ -501,6 +758,7 @@ CONFIG_NUNGET_CHARS=0
 # CONFIG_NOPRINTF_FIELDWIDTH is not set
 # CONFIG_LIBC_FLOATINGPOINT is not set
 CONFIG_LIBC_LONG_LONG=y
+# CONFIG_LIBC_IOCTL_VARIADIC is not set
 CONFIG_LIB_RAND_ORDER=1
 # CONFIG_EOL_IS_CR is not set
 # CONFIG_EOL_IS_LF is not set
@@ -512,14 +770,18 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
 # CONFIG_LIBC_STRERROR is not set
 # CONFIG_LIBC_PERROR_STDOUT is not set
 CONFIG_ARCH_LOWPUTC=y
+# CONFIG_TIME_EXTENDED is not set
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
-# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -534,26 +796,25 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
+# CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
-# CONFIG_EXAMPLES_LCDRW is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -562,87 +823,93 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
-# CONFIG_EXAMPLES_PASHELLO is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
-# CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
+# CONFIG_EXAMPLES_SERIALBLASTER is not set
+# CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_UDP is not set
+# CONFIG_EXAMPLES_USBTERM is not set
+# CONFIG_EXAMPLES_WATCHDOG is not set
 CONFIG_EXAMPLES_WEBSERVER=y
 CONFIG_EXAMPLES_WEBSERVER_IPADDR=0x0a000002
 CONFIG_EXAMPLES_WEBSERVER_DRIPADDR=0x0a000001
 CONFIG_EXAMPLES_WEBSERVER_NETMASK=0xffffff00
 CONFIG_EXAMPLES_WEBSERVER_NOMAC=y
-# CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBTERM is not set
-# CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WGET is not set
 
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
 #
 # Graphics Support
 #
 # CONFIG_TIFF is not set
+# CONFIG_GRAPHICS_TRAVELER is not set
 
 #
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_MICROPYTHON is not set
 # CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
-# CONFIG_NETUTILS_DHCPD is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
-# CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TELNETD is not set
-# CONFIG_NETUTILS_TFTPC is not set
-# CONFIG_NETUTILS_THTTPD is not set
-CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 CONFIG_NETUTILS_WEBSERVER=y
 # CONFIG_NETUTILS_HTTPD_SINGLECONNECT is not set
 # CONFIG_NETUTILS_HTTPD_SCRIPT_DISABLE is not set
+CONFIG_NETUTILS_HTTPD_MAXPATH=64
 # CONFIG_NETUTILS_HTTPD_CGIPATH is not set
 CONFIG_NETUTILS_HTTPD_ERRPATH=""
 # CONFIG_NETUTILS_HTTPD_SERVERHEADER_DISABLE is not set
 CONFIG_NETUTILS_HTTPD_TIMEOUT=0
 CONFIG_NETUTILS_HTTPD_CLASSIC=y
 # CONFIG_NETUTILS_HTTPD_MMAP is not set
+# CONFIG_NETUTILS_HTTPD_SENDFILE is not set
 CONFIG_NETUTILS_HTTPD_KEEPALIVE_DISABLE=y
 # CONFIG_NETUTILS_XMLRPC is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
@@ -660,93 +927,16 @@ CONFIG_NETUTILS_HTTPD_KEEPALIVE_DISABLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-
-#
-# USB CDC/ACM Device Commands
-#
-
-#
-# USB Composite Device Commands
-#
-
-#
-# Custom Free Memory Command
-#
+# CONFIG_SYSTEM_CLE is not set
+# CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-
-#
-# I2C tool
-#
-
-#
-# INI File Parser
-#
-# CONFIG_FSUTILS_INIFILE is not set
-
-#
-# FLASH Program Installation
-#
+# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
-
-#
-# FLASH Erase-all Command
-#
-
-#
-# NxPlayer media player library / command Line
-#
-# CONFIG_SYSTEM_NXPLAYER is not set
-
-#
-# RAM test
-#
 # CONFIG_SYSTEM_RAMTEST is not set
-
-#
-# readline()
-#
+# CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
-
-#
-# Power Off
-#
-# CONFIG_SYSTEM_POWEROFF is not set
-
-#
-# RAMTRON
-#
-
-#
-# SD Card
-#
-
-#
-# Sysinfo
-#
-
-#
-# USB Monitor
-#
-
-#
-# EMACS-like Command Line Editor
-#
-# CONFIG_SYSTEM_CLE is not set
-
-#
-# VI Work-Alike Editor
-#
+# CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
-
-#
-# Stack Monitor
-#
-
-#
-# USB Mass Storage Device Commands
-#
-
-#
-# Zmodem Commands
-#
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/eagle100/nettest/defconfig b/configs/eagle100/nettest/defconfig
index 6d40060e9e..deb0cd9e48 100644
--- a/configs/eagle100/nettest/defconfig
+++ b/configs/eagle100/nettest/defconfig
@@ -41,14 +41,16 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -79,6 +81,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 CONFIG_ARCH_CHIP_LM=y
@@ -97,7 +100,9 @@ CONFIG_ARCH_CHIP_LM=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
@@ -108,14 +113,25 @@ CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="tiva"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
 #
@@ -125,6 +141,7 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARW is not set
 # CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
 # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDW is not set
@@ -258,6 +275,7 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 CONFIG_ARCH_HAVE_MPU=y
@@ -393,9 +411,10 @@ CONFIG_NAME_MAX=32
 CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -426,6 +445,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -444,8 +464,22 @@ CONFIG_DEV_NULL=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 CONFIG_NETDEVICES=y
@@ -454,7 +488,9 @@ CONFIG_NETDEVICES=y
 # General Ethernet MAC Driver Options
 #
 # CONFIG_NETDEV_LOOPBACK is not set
+# CONFIG_NETDEV_TELNET is not set
 # CONFIG_NETDEV_MULTINIC is not set
+CONFIG_ARCH_HAVE_NETDEV_STATISTICS=y
 # CONFIG_NETDEV_LATEINIT is not set
 
 #
@@ -474,6 +510,8 @@ CONFIG_NETDEVICES=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -497,13 +535,10 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -520,19 +555,23 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -665,11 +704,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -688,6 +722,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -728,11 +766,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -746,10 +787,14 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # Application Configuration
 #
 
+#
+# CAN Utilities
+#
+
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -757,11 +802,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -783,18 +828,19 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -802,16 +848,26 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_WGET is not set
 
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
 #
 # Graphics Support
 #
@@ -822,8 +878,8 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -834,11 +890,12 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TELNETD is not set
-CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
@@ -860,15 +917,16 @@ CONFIG_NETUTILS_NETLIB=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/eagle100/nsh/defconfig b/configs/eagle100/nsh/defconfig
index 96ac8e5c58..f39a61f2ae 100644
--- a/configs/eagle100/nsh/defconfig
+++ b/configs/eagle100/nsh/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -479,6 +480,8 @@ CONFIG_SPI_CALLBACK=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -506,6 +509,7 @@ CONFIG_SPI_CALLBACK=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -551,6 +555,8 @@ CONFIG_ARCH_HAVE_NETDEV_STATISTICS=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -600,15 +606,18 @@ CONFIG_UART0_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -760,11 +769,6 @@ CONFIG_FS_FAT=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -848,6 +852,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/eagle100/nxflat/defconfig b/configs/eagle100/nxflat/defconfig
index 81ac4c9046..00b4c87cf2 100644
--- a/configs/eagle100/nxflat/defconfig
+++ b/configs/eagle100/nxflat/defconfig
@@ -21,6 +21,7 @@ CONFIG_WINDOWS_CYGWIN=y
 # Build Configuration
 #
 # CONFIG_APPS_DIR="../apps"
+CONFIG_BUILD_FLAT=y
 # CONFIG_BUILD_2PASS is not set
 
 #
@@ -30,6 +31,7 @@ CONFIG_WINDOWS_CYGWIN=y
 # CONFIG_INTELHEX_BINARY is not set
 # CONFIG_MOTOROLA_SREC is not set
 CONFIG_RAW_BINARY=y
+# CONFIG_UBOOT_UIMAGE is not set
 
 #
 # Customize Header Files
@@ -39,12 +41,15 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
+# CONFIG_STACK_COLORATION is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
@@ -74,11 +79,14 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_C5471 is not set
 # CONFIG_ARCH_CHIP_CALYPSO is not set
 # CONFIG_ARCH_CHIP_DM320 is not set
+# CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 CONFIG_ARCH_CHIP_LM=y
 # CONFIG_ARCH_CHIP_TIVA is not set
+# CONFIG_ARCH_CHIP_LPC11XX is not set
 # CONFIG_ARCH_CHIP_LPC17XX is not set
 # CONFIG_ARCH_CHIP_LPC214X is not set
 # CONFIG_ARCH_CHIP_LPC2378 is not set
@@ -87,29 +95,53 @@ CONFIG_ARCH_CHIP_LM=y
 # CONFIG_ARCH_CHIP_NUC1XX is not set
 # CONFIG_ARCH_CHIP_SAMA5 is not set
 # CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
 # CONFIG_ARCH_CHIP_SAM34 is not set
+# CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
 # CONFIG_ARCH_CORTEXM0 is not set
 CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXM4 is not set
+# CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="tiva"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
+# CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
-CONFIG_ARCH_HAVE_MPU=y
+# CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
 #
 # ARMV7M Configuration Options
 #
+# CONFIG_ARMV7M_HAVE_ICACHE is not set
+# CONFIG_ARMV7M_HAVE_DCACHE is not set
+# CONFIG_ARMV7M_HAVE_ITCM is not set
+# CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARW is not set
 # CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
 # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDW is not set
@@ -118,6 +150,8 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
 # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW is not set
 # CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE is not set
+# CONFIG_ARMV7M_HAVE_STACKCHECK is not set
+# CONFIG_ARMV7M_ITMSYSLOG is not set
 
 #
 # Tiva/Stellaris Configuration Options
@@ -129,23 +163,79 @@ CONFIG_ARCH_CHIP_LM3S6918=y
 # CONFIG_ARCH_CHIP_LM3S8962 is not set
 # CONFIG_ARCH_CHIP_LM4F120 is not set
 CONFIG_ARCH_CHIP_LM3S=y
-CONFIG_TIVA_HAVE_SSI1=y
 # CONFIG_LM_REVA2 is not set
+# CONFIG_TIVA_BOARD_EARLYINIT is not set
 
 #
 # Tiva/Stellaris Peripheral Support
 #
+# CONFIG_TIVA_ADC is not set
+# CONFIG_TIVA_HAVE_ADC0 is not set
+# CONFIG_TIVA_HAVE_ADC1 is not set
+# CONFIG_TIVA_I2C is not set
+CONFIG_TIVA_HAVE_I2C1=y
+# CONFIG_TIVA_HAVE_I2C2 is not set
+# CONFIG_TIVA_HAVE_I2C3 is not set
+# CONFIG_TIVA_HAVE_I2C4 is not set
+# CONFIG_TIVA_HAVE_I2C5 is not set
+# CONFIG_TIVA_HAVE_I2C6 is not set
+# CONFIG_TIVA_HAVE_I2C7 is not set
+# CONFIG_TIVA_HAVE_I2C8 is not set
+# CONFIG_TIVA_HAVE_I2C9 is not set
+# CONFIG_TIVA_HAVE_UART3 is not set
+# CONFIG_TIVA_HAVE_UART4 is not set
+# CONFIG_TIVA_HAVE_UART5 is not set
+# CONFIG_TIVA_HAVE_UART6 is not set
+# CONFIG_TIVA_HAVE_UART7 is not set
+CONFIG_TIVA_HAVE_SSI0=y
+CONFIG_TIVA_HAVE_SSI1=y
+# CONFIG_TIVA_HAVE_SSI2 is not set
+# CONFIG_TIVA_HAVE_SSI3 is not set
+CONFIG_TIVA_HAVE_ETHERNET=y
+CONFIG_TIVA_SSI=y
+# CONFIG_TIVA_TIMER is not set
+# CONFIG_TIVA_HAVE_TIMER0 is not set
+# CONFIG_TIVA_HAVE_TIMER1 is not set
+# CONFIG_TIVA_HAVE_TIMER2 is not set
+CONFIG_TIVA_HAVE_TIMER3=y
+# CONFIG_TIVA_HAVE_TIMER4 is not set
+# CONFIG_TIVA_HAVE_TIMER5 is not set
+# CONFIG_TIVA_HAVE_TIMER6 is not set
+# CONFIG_TIVA_HAVE_TIMER7 is not set
+# CONFIG_TIVA_ADC0 is not set
+# CONFIG_TIVA_I2C0 is not set
+# CONFIG_TIVA_I2C1 is not set
 CONFIG_TIVA_UART0=y
 # CONFIG_TIVA_UART1 is not set
 # CONFIG_TIVA_UART2 is not set
 CONFIG_TIVA_SSI0=y
 # CONFIG_TIVA_SSI1 is not set
+# CONFIG_TIVA_TIMER3 is not set
 # CONFIG_TIVA_ETHERNET is not set
 # CONFIG_TIVA_FLASH is not set
 
 #
-# Disable GPIO Interrupts
-#
+# Enable GPIO Interrupts
+#
+CONFIG_TIVA_GPIO_IRQS=y
+CONFIG_TIVA_HAVE_GPIOA_IRQS=y
+CONFIG_TIVA_HAVE_GPIOB_IRQS=y
+CONFIG_TIVA_HAVE_GPIOC_IRQS=y
+CONFIG_TIVA_HAVE_GPIOD_IRQS=y
+CONFIG_TIVA_HAVE_GPIOE_IRQS=y
+CONFIG_TIVA_HAVE_GPIOF_IRQS=y
+CONFIG_TIVA_HAVE_GPIOG_IRQS=y
+# CONFIG_TIVA_HAVE_GPIOH_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOJ_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOK_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOL_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOM_IRQS is not set
+# CONFIG_TIVA_HAVE_GPION_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOP_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOQ_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOR_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOS_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOT_IRQS is not set
 CONFIG_TIVA_GPIOA_IRQS=y
 CONFIG_TIVA_GPIOB_IRQS=y
 CONFIG_TIVA_GPIOC_IRQS=y
@@ -153,8 +243,6 @@ CONFIG_TIVA_GPIOD_IRQS=y
 CONFIG_TIVA_GPIOE_IRQS=y
 CONFIG_TIVA_GPIOF_IRQS=y
 CONFIG_TIVA_GPIOG_IRQS=y
-CONFIG_TIVA_GPIOH_IRQS=y
-# CONFIG_TIVA_GPIOJ_IRQS is not set
 
 #
 # Tiva/Stellaris SSI Configuration
@@ -169,10 +257,19 @@ CONFIG_SSI_TXLIMIT=4
 # CONFIG_ARCH_VECNOTIRQ is not set
 # CONFIG_ARCH_DMA is not set
 CONFIG_ARCH_HAVE_IRQPRIO=y
-# CONFIG_ARCH_ADDRENV is not set
+# CONFIG_ARCH_L2CACHE is not set
+# CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
+# CONFIG_ARCH_HAVE_ADDRENV is not set
+# CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
+CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARCH_NAND_HWECC is not set
+# CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
+# CONFIG_ARCH_USE_MPU is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
@@ -227,39 +324,78 @@ CONFIG_ARCH_LEDS=y
 #
 # Board-Specific Options
 #
+# CONFIG_LIB_BOARDCTL is not set
 
 #
 # RTOS Features
 #
-# CONFIG_BOARD_INITIALIZE is not set
+CONFIG_DISABLE_OS_API=y
+# CONFIG_DISABLE_POSIX_TIMERS is not set
+# CONFIG_DISABLE_PTHREAD is not set
+# CONFIG_DISABLE_SIGNALS is not set
+# CONFIG_DISABLE_MQUEUE is not set
+CONFIG_DISABLE_ENVIRON=y
+
+#
+# Clocks and Timers
+#
 CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
-CONFIG_RR_INTERVAL=200
-# CONFIG_SCHED_CPULOAD is not set
-# CONFIG_SCHED_INSTRUMENTATION is not set
-CONFIG_TASK_NAME_SIZE=0
-# CONFIG_SCHED_HAVE_PARENT is not set
+# CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
 CONFIG_START_YEAR=2009
 CONFIG_START_MONTH=5
 CONFIG_START_DAY=6
-CONFIG_DEV_CONSOLE=y
+CONFIG_MAX_WDOGPARMS=2
+CONFIG_PREALLOC_WDOGS=4
+CONFIG_WDOG_INTRESERVE=0
+CONFIG_PREALLOC_TIMERS=4
+
+#
+# Tasks and Scheduling
+#
+# CONFIG_INIT_NONE is not set
+CONFIG_INIT_ENTRYPOINT=y
+# CONFIG_INIT_FILEPATH is not set
+CONFIG_USER_ENTRYPOINT="nxflat_main"
+CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
+CONFIG_TASK_NAME_SIZE=0
+CONFIG_MAX_TASKS=16
+# CONFIG_SCHED_HAVE_PARENT is not set
+# CONFIG_SCHED_WAITPID is not set
+
+#
+# Pthread Options
+#
 # CONFIG_MUTEX_TYPES is not set
-# CONFIG_PRIORITY_INHERITANCE is not set
+CONFIG_NPTHREAD_KEYS=4
+
+#
+# Performance Monitoring
+#
+# CONFIG_SCHED_CPULOAD is not set
+# CONFIG_SCHED_INSTRUMENTATION is not set
+
+#
+# Files and I/O
+#
+CONFIG_DEV_CONSOLE=y
 # CONFIG_FDCLONE_DISABLE is not set
 # CONFIG_FDCLONE_STDIO is not set
 CONFIG_SDCLONE_DISABLE=y
-# CONFIG_SCHED_WAITPID is not set
+CONFIG_NFILE_DESCRIPTORS=8
+CONFIG_NFILE_STREAMS=8
+CONFIG_NAME_MAX=32
+# CONFIG_PRIORITY_INHERITANCE is not set
+
+#
+# RTOS hooks
+#
+# CONFIG_BOARD_INITIALIZE is not set
 # CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
-CONFIG_USER_ENTRYPOINT="nxflat_main"
-CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_POSIX_TIMERS is not set
-# CONFIG_DISABLE_PTHREAD is not set
-# CONFIG_DISABLE_SIGNALS is not set
-# CONFIG_DISABLE_MQUEUE is not set
-CONFIG_DISABLE_ENVIRON=y
 
 #
 # Signal Numbers
@@ -270,19 +406,18 @@ CONFIG_SIG_SIGALARM=3
 CONFIG_SIG_SIGCONDTIMEDOUT=16
 
 #
-# Sizes of configurable things (0 disables)
+# POSIX Message Queue Options
 #
-CONFIG_MAX_TASKS=16
-CONFIG_NPTHREAD_KEYS=4
-CONFIG_NFILE_DESCRIPTORS=8
-CONFIG_NFILE_STREAMS=8
-CONFIG_NAME_MAX=32
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
-CONFIG_MAX_WDOGPARMS=2
-CONFIG_PREALLOC_WDOGS=4
-CONFIG_WDOG_INTRESERVE=0
-CONFIG_PREALLOC_TIMERS=4
+# CONFIG_MODULE is not set
+
+#
+# Work queue support
+#
+# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_SCHED_HPWORK is not set
+# CONFIG_SCHED_LPWORK is not set
 
 #
 # Stack and heap information
@@ -291,6 +426,7 @@ CONFIG_IDLETHREAD_STACKSIZE=1024
 CONFIG_USERMAIN_STACKSIZE=2048
 CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=2048
+# CONFIG_LIB_SYSCALL is not set
 
 #
 # Device Drivers
@@ -299,14 +435,26 @@ CONFIG_DISABLE_POLL=y
 CONFIG_DEV_NULL=y
 # CONFIG_DEV_ZERO is not set
 # CONFIG_DEV_LOOP is not set
+
+#
+# Buffering
+#
+# CONFIG_DRVR_WRITEBUFFER is not set
+# CONFIG_DRVR_READAHEAD is not set
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 # CONFIG_SPI is not set
 # CONFIG_I2S is not set
+
+#
+# Timer Driver Support
+#
+# CONFIG_TIMER is not set
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_ANALOG is not set
@@ -314,9 +462,25 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
+# CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
@@ -324,6 +488,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -346,12 +512,14 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART6_SERIALDRIVER is not set
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
+# CONFIG_OTHER_UART_SERIALDRIVER is not set
 CONFIG_MCU_SERIAL=y
+# CONFIG_SERIAL_IFLOWCONTROL is not set
+# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
+# CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
+# CONFIG_OTHER_SERIAL_CONSOLE is not set
 # CONFIG_NO_SERIAL_CONSOLE is not set
 
 #
@@ -365,20 +533,23 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
-# CONFIG_SERIAL_IFLOWCONTROL is not set
-# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -387,6 +558,11 @@ CONFIG_UART0_2STOP=0
 # CONFIG_ARCH_HAVE_PHY is not set
 # CONFIG_NET is not set
 
+#
+# Crypto API
+#
+# CONFIG_CRYPTO is not set
+
 #
 # File Systems
 #
@@ -395,20 +571,20 @@ CONFIG_UART0_2STOP=0
 # File system configuration
 #
 # CONFIG_DISABLE_MOUNTPOINT is not set
+# CONFIG_FS_AUTOMOUNTER is not set
 # CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
 CONFIG_FS_READABLE=y
 # CONFIG_FS_WRITABLE is not set
+# CONFIG_FS_NAMED_SEMAPHORES is not set
+CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_RAMMAP is not set
 # CONFIG_FS_FAT is not set
 # CONFIG_FS_NXFFS is not set
 CONFIG_FS_ROMFS=y
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
-
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -429,7 +605,11 @@ CONFIG_MM_REGIONS=1
 # CONFIG_AUDIO is not set
 
 #
-# Binary Formats
+# Wireless Support
+#
+
+#
+# Binary Loader
 #
 # CONFIG_BINFMT_DISABLE is not set
 CONFIG_NXFLAT=y
@@ -452,6 +632,7 @@ CONFIG_NUNGET_CHARS=2
 # CONFIG_NOPRINTF_FIELDWIDTH is not set
 # CONFIG_LIBC_FLOATINGPOINT is not set
 CONFIG_LIBC_LONG_LONG=y
+# CONFIG_LIBC_IOCTL_VARIADIC is not set
 CONFIG_LIB_RAND_ORDER=1
 # CONFIG_EOL_IS_CR is not set
 # CONFIG_EOL_IS_LF is not set
@@ -463,14 +644,19 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
 # CONFIG_LIBC_STRERROR is not set
 # CONFIG_LIBC_PERROR_STDOUT is not set
 CONFIG_ARCH_LOWPUTC=y
+# CONFIG_TIME_EXTENDED is not set
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
-# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -485,26 +671,25 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
+# CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
-# CONFIG_EXAMPLES_LCDRW is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -512,69 +697,77 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 CONFIG_EXAMPLES_NXFLAT=y
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
-# CONFIG_EXAMPLES_PASHELLO is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
+# CONFIG_EXAMPLES_SERIALBLASTER is not set
+# CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_UDP is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
+# CONFIG_EXAMPLES_UNIONFS is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
 #
 # CONFIG_TIFF is not set
+# CONFIG_GRAPHICS_TRAVELER is not set
 
 #
 # Interpreters
 #
+# CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_MICROPYTHON is not set
 # CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
-# CONFIG_NETUTILS_DHCPD is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
-# CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_TFTPC is not set
-# CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_NETLIB is not set
-# CONFIG_NETUTILS_WEBCLIENT is not set
-
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
 
 #
 # NSH Library
@@ -593,93 +786,16 @@ CONFIG_EXAMPLES_NXFLAT=y
 #
 # System Libraries and NSH Add-Ons
 #
-
-#
-# USB CDC/ACM Device Commands
-#
-
-#
-# USB Composite Device Commands
-#
-
-#
-# Custom Free Memory Command
-#
+# CONFIG_SYSTEM_CLE is not set
+# CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-
-#
-# I2C tool
-#
-
-#
-# INI File Parser
-#
-# CONFIG_FSUTILS_INIFILE is not set
-
-#
-# FLASH Program Installation
-#
+# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
-
-#
-# FLASH Erase-all Command
-#
-
-#
-# NxPlayer media player library / command Line
-#
-# CONFIG_SYSTEM_NXPLAYER is not set
-
-#
-# RAM test
-#
 # CONFIG_SYSTEM_RAMTEST is not set
-
-#
-# readline()
-#
+# CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
-
-#
-# Power Off
-#
-# CONFIG_SYSTEM_POWEROFF is not set
-
-#
-# RAMTRON
-#
-
-#
-# SD Card
-#
-
-#
-# Sysinfo
-#
-
-#
-# USB Monitor
-#
-
-#
-# EMACS-like Command Line Editor
-#
-# CONFIG_SYSTEM_CLE is not set
-
-#
-# VI Work-Alike Editor
-#
+# CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
-
-#
-# Stack Monitor
-#
-
-#
-# USB Mass Storage Device Commands
-#
-
-#
-# Zmodem Commands
-#
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/eagle100/thttpd/defconfig b/configs/eagle100/thttpd/defconfig
index a542cf2b7c..191ad33765 100644
--- a/configs/eagle100/thttpd/defconfig
+++ b/configs/eagle100/thttpd/defconfig
@@ -37,14 +37,16 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,6 +77,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 CONFIG_ARCH_CHIP_LM=y
@@ -92,7 +95,11 @@ CONFIG_ARCH_CHIP_LM=y
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -102,14 +109,25 @@ CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="tiva"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
 #
@@ -119,6 +137,7 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
@@ -249,11 +268,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
 # CONFIG_ARCH_USE_MPU is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
@@ -344,6 +366,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="thttp_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -381,9 +404,10 @@ CONFIG_NAME_MAX=32
 CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -414,6 +438,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -431,8 +456,23 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 CONFIG_NETDEVICES=y
@@ -440,7 +480,11 @@ CONFIG_NETDEVICES=y
 #
 # General Ethernet MAC Driver Options
 #
+# CONFIG_NETDEV_LOOPBACK is not set
+# CONFIG_NETDEV_TELNET is not set
 # CONFIG_NETDEV_MULTINIC is not set
+CONFIG_ARCH_HAVE_NETDEV_STATISTICS=y
+# CONFIG_NETDEV_LATEINIT is not set
 
 #
 # External Ethernet MAC Device Support
@@ -450,6 +494,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_ENCX24J600 is not set
 # CONFIG_NET_E1000 is not set
 # CONFIG_NET_SLIP is not set
+# CONFIG_NET_FTMAC100 is not set
 # CONFIG_NET_VNET is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
@@ -458,6 +503,8 @@ CONFIG_NETDEVICES=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -481,13 +528,10 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -504,19 +548,23 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -540,6 +588,7 @@ CONFIG_NET_GUARDSIZE=2
 #
 # CONFIG_NET_MULTILINK is not set
 CONFIG_NET_ETHERNET=y
+# CONFIG_NET_LOOPBACK is not set
 # CONFIG_NET_TUN is not set
 
 #
@@ -625,6 +674,7 @@ CONFIG_IOB_NCHAINS=8
 # Routing Table Configuration
 #
 # CONFIG_NET_ROUTE is not set
+CONFIG_NET_HOSTNAME=""
 
 #
 # Crypto API
@@ -648,13 +698,10 @@ CONFIG_FS_READABLE=y
 # CONFIG_FS_FAT is not set
 # CONFIG_FS_NXFFS is not set
 CONFIG_FS_ROMFS=y
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -674,6 +721,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -717,10 +768,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -735,14 +791,13 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -750,11 +805,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -763,19 +818,20 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -784,6 +840,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 CONFIG_EXAMPLES_THTTPD=y
@@ -792,13 +849,24 @@ CONFIG_EXAMPLES_THTTPD_DRIPADDR=0x0a000001
 CONFIG_EXAMPLES_THTTPD_NETMASK=0xffffff00
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
+# CONFIG_EXAMPLES_UNIONFS is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_WGET is not set
 # CONFIG_EXAMPLES_XMLRPC is not set
 
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
 #
 # Graphics Support
 #
@@ -810,20 +878,24 @@ CONFIG_EXAMPLES_THTTPD_NETMASK=0xffffff00
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
+# CONFIG_NETUTILS_CHAT is not set
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TELNETD is not set
 CONFIG_NETUTILS_THTTPD=y
@@ -858,16 +930,10 @@ CONFIG_THTTPD_IDLE_SEND_LIMIT_SEC=300
 CONFIG_THTTPD_TILDE_MAP_NONE=y
 # CONFIG_THTTPD_GENERATE_INDICES is not set
 # CONFIG_THTTPD_USE_URLPATTERN is not set
-CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
@@ -885,15 +951,16 @@ CONFIG_NETUTILS_NETLIB=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+# CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
-# CONFIG_SYSTEM_POWEROFF is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/efm32-g8xx-stk/nsh/defconfig b/configs/efm32-g8xx-stk/nsh/defconfig
index def34126e9..b641b4264e 100644
--- a/configs/efm32-g8xx-stk/nsh/defconfig
+++ b/configs/efm32-g8xx-stk/nsh/defconfig
@@ -41,12 +41,15 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
+# CONFIG_STACK_COLORATION is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
@@ -78,10 +81,12 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 CONFIG_ARCH_CHIP_EFM32=y
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
 # CONFIG_ARCH_CHIP_TIVA is not set
+# CONFIG_ARCH_CHIP_LPC11XX is not set
 # CONFIG_ARCH_CHIP_LPC17XX is not set
 # CONFIG_ARCH_CHIP_LPC214X is not set
 # CONFIG_ARCH_CHIP_LPC2378 is not set
@@ -90,27 +95,52 @@ CONFIG_ARCH_CHIP_EFM32=y
 # CONFIG_ARCH_CHIP_NUC1XX is not set
 # CONFIG_ARCH_CHIP_SAMA5 is not set
 # CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
 # CONFIG_ARCH_CHIP_SAM34 is not set
+# CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
 # CONFIG_ARCH_CORTEXM0 is not set
 CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXM4 is not set
+# CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="efm32"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 CONFIG_ARMV7M_CMNVECTOR=y
+# CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
+# CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 
 #
 # ARMV7M Configuration Options
 #
+# CONFIG_ARMV7M_HAVE_ICACHE is not set
+# CONFIG_ARMV7M_HAVE_DCACHE is not set
+# CONFIG_ARMV7M_HAVE_ITCM is not set
+# CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARW is not set
 # CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
 # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDW is not set
@@ -119,6 +149,7 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
 # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW is not set
 # CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE is not set
+# CONFIG_ARMV7M_HAVE_STACKCHECK is not set
 # CONFIG_ARMV7M_ITMSYSLOG is not set
 
 #
@@ -128,6 +159,7 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
 # CONFIG_ARCH_CHIP_EFM32G880F128 is not set
 CONFIG_ARCH_CHIP_EFM32G890F128=y
 # CONFIG_ARCH_CHIP_EFM32GG332F1024 is not set
+# CONFIG_ARCH_CHIP_EFM32GG990F1024 is not set
 # CONFIG_EFM32_EFM32TG is not set
 CONFIG_EFM32_EFM32G=y
 # CONFIG_EFM32_EFM32GG is not set
@@ -139,11 +171,17 @@ CONFIG_EFM32_HAVE_USART2=y
 CONFIG_EFM32_HAVE_UART0=y
 # CONFIG_EFM32_HAVE_UART1 is not set
 CONFIG_EFM32_HAVE_LEUART1=y
+# CONFIG_EFM32_HAVE_OTGFS is not set
 # CONFIG_EFM32_USART_ISUART is not set
 # CONFIG_EFM32_USART_ISSPI is not set
 # CONFIG_EFM32_UART is not set
 CONFIG_EFM32_LEUART=y
 # CONFIG_EFM32_DMA is not set
+# CONFIG_EFM32_RMU is not set
+# CONFIG_EFM32_FLASHPROG is not set
+# CONFIG_EFM32_I2C0 is not set
+# CONFIG_EFM32_I2C1 is not set
+# CONFIG_EFM32_BITBAND is not set
 # CONFIG_EFM32_USART0 is not set
 # CONFIG_EFM32_USART1 is not set
 # CONFIG_EFM32_USART2 is not set
@@ -151,7 +189,12 @@ CONFIG_EFM32_LEUART=y
 # CONFIG_EFM32_UART1 is not set
 CONFIG_EFM32_LEUART0=y
 # CONFIG_EFM32_LEUART1 is not set
+# CONFIG_EFM32_TIMER0 is not set
+# CONFIG_EFM32_TIMER1 is not set
+# CONFIG_EFM32_TIMER2 is not set
+# CONFIG_EFM32_TIMER3 is not set
 CONFIG_EFM32_GPIO_IRQ=y
+# CONFIG_EFM32_LECLOCK is not set
 CONFIG_LEUART0_SERIAL_CONSOLE=y
 # CONFIG_NO_LEUART_SERIAL_CONSOLE is not set
 
@@ -164,6 +207,7 @@ CONFIG_LEUART0_BAUD=2400
 CONFIG_LEUART0_BITS=8
 CONFIG_LEUART0_PARITY=0
 CONFIG_LEUART0_2STOP=0
+# CONFIG_EFM32_RTC_BURTC is not set
 
 #
 # Architecture Options
@@ -176,11 +220,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
@@ -243,6 +290,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # EFM32 G8XX STK Hardware Configuration
 #
 # CONFIG_EFM32G8STK_BCEN is not set
+# CONFIG_LIB_BOARDCTL is not set
 
 #
 # RTOS Features
@@ -277,6 +325,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -327,9 +376,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -360,22 +410,43 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 # CONFIG_SPI is not set
 # CONFIG_I2S is not set
+
+#
+# Timer Driver Support
+#
+# CONFIG_TIMER is not set
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
-# CONFIG_TIMER is not set
 # CONFIG_ANALOG is not set
 # CONFIG_AUDIO_DEVICES is not set
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
+# CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
@@ -383,6 +454,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -406,30 +479,30 @@ CONFIG_SERIAL=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 CONFIG_OTHER_UART_SERIALDRIVER=y
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
+# CONFIG_SERIAL_IFLOWCONTROL is not set
+# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
-# CONFIG_UART0_SERIAL_CONSOLE is not set
 CONFIG_OTHER_SERIAL_CONSOLE=y
 # CONFIG_NO_SERIAL_CONSOLE is not set
-# CONFIG_SERIAL_IFLOWCONTROL is not set
-# CONFIG_SERIAL_OFLOWCONTROL is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -458,10 +531,7 @@ CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_RAMMAP is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -481,6 +551,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -505,6 +579,7 @@ CONFIG_NUNGET_CHARS=2
 # CONFIG_NOPRINTF_FIELDWIDTH is not set
 # CONFIG_LIBC_FLOATINGPOINT is not set
 CONFIG_LIBC_LONG_LONG=y
+# CONFIG_LIBC_IOCTL_VARIADIC is not set
 CONFIG_LIB_RAND_ORDER=1
 # CONFIG_EOL_IS_CR is not set
 # CONFIG_EOL_IS_LF is not set
@@ -516,13 +591,18 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
 # CONFIG_LIBC_STRERROR is not set
 # CONFIG_LIBC_PERROR_STDOUT is not set
 CONFIG_ARCH_LOWPUTC=y
+# CONFIG_TIME_EXTENDED is not set
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -537,14 +617,13 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -552,11 +631,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -564,75 +643,77 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
-# CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_UDP is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
 #
 # CONFIG_TIFF is not set
+# CONFIG_GRAPHICS_TRAVELER is not set
 
 #
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_MICROPYTHON is not set
 # CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
-# CONFIG_NETUTILS_DHCPD is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
-# CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_TFTPC is not set
-# CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_NETLIB is not set
-# CONFIG_NETUTILS_WEBCLIENT is not set
-
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
 
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -650,13 +731,16 @@ CONFIG_NSH_NESTDEPTH=3
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
 # CONFIG_NSH_DISABLE_CMP is not set
+CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_DD is not set
 # CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -665,8 +749,10 @@ CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 # CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -674,6 +760,7 @@ CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLE_MKRD is not set
 # CONFIG_NSH_DISABLE_MH is not set
 # CONFIG_NSH_DISABLE_MOUNT is not set
+# CONFIG_NSH_DISABLE_MV is not set
 # CONFIG_NSH_DISABLE_MW is not set
 # CONFIG_NSH_DISABLE_PS is not set
 # CONFIG_NSH_DISABLE_PUT is not set
@@ -683,8 +770,10 @@ CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
@@ -711,6 +800,8 @@ CONFIG_NSH_FILEIOSIZE=256
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -724,113 +815,20 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-
-#
-# Custom Free Memory Command
-#
-# CONFIG_SYSTEM_FREE is not set
-
-#
-# EMACS-like Command Line Editor
-#
 CONFIG_SYSTEM_CLE=y
 CONFIG_SYSTEM_CLE_DEBUGLEVEL=0
-
-#
-# FLASH Program Installation
-#
-# CONFIG_SYSTEM_INSTALL is not set
-
-#
-# FLASH Erase-all Command
-#
-
-#
-# Intel HEX to binary conversion
-#
+# CONFIG_SYSTEM_CUTERM is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-
-#
-# I2C tool
-#
-
-#
-# INI File Parser
-#
-# CONFIG_FSUTILS_INIFILE is not set
-
-#
-# NxPlayer media player library / command Line
-#
-# CONFIG_SYSTEM_NXPLAYER is not set
-
-#
-# RAM test
-#
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
-
-#
-# readline()
-#
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
-
-#
-# P-Code Support
-#
-
-#
-# PHY Tool
-#
-
-#
-# Power Off
-#
-# CONFIG_SYSTEM_POWEROFF is not set
-
-#
-# RAMTRON
-#
-
-#
-# SD Card
-#
-
-#
-# Sudoku
-#
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-
-#
-# Sysinfo
-#
-
-#
-# VI Work-Alike Editor
-#
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
-
-#
-# Stack Monitor
-#
-
-#
-# USB CDC/ACM Device Commands
-#
-
-#
-# USB Composite Device Commands
-#
-
-#
-# USB Mass Storage Device Commands
-#
-
-#
-# USB Monitor
-#
-
-#
-# Zmodem Commands
-#
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/efm32gg-stk3700/nsh/defconfig b/configs/efm32gg-stk3700/nsh/defconfig
index c8fb878465..74c43841d3 100644
--- a/configs/efm32gg-stk3700/nsh/defconfig
+++ b/configs/efm32gg-stk3700/nsh/defconfig
@@ -41,14 +41,16 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -79,10 +81,12 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 CONFIG_ARCH_CHIP_EFM32=y
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
 # CONFIG_ARCH_CHIP_TIVA is not set
+# CONFIG_ARCH_CHIP_LPC11XX is not set
 # CONFIG_ARCH_CHIP_LPC17XX is not set
 # CONFIG_ARCH_CHIP_LPC214X is not set
 # CONFIG_ARCH_CHIP_LPC2378 is not set
@@ -91,10 +95,15 @@ CONFIG_ARCH_CHIP_EFM32=y
 # CONFIG_ARCH_CHIP_NUC1XX is not set
 # CONFIG_ARCH_CHIP_SAMA5 is not set
 # CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -104,14 +113,25 @@ CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="efm32"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 CONFIG_ARMV7M_CMNVECTOR=y
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 
 #
 # ARMV7M Configuration Options
@@ -120,6 +140,7 @@ CONFIG_ARMV7M_CMNVECTOR=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARW is not set
 # CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
 # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDW is not set
@@ -157,8 +178,10 @@ CONFIG_EFM32_HAVE_OTGFS=y
 CONFIG_EFM32_LEUART=y
 # CONFIG_EFM32_DMA is not set
 # CONFIG_EFM32_RMU is not set
+# CONFIG_EFM32_FLASHPROG is not set
 # CONFIG_EFM32_I2C0 is not set
 # CONFIG_EFM32_I2C1 is not set
+# CONFIG_EFM32_BITBAND is not set
 # CONFIG_EFM32_USART0 is not set
 # CONFIG_EFM32_USART1 is not set
 # CONFIG_EFM32_USART2 is not set
@@ -197,11 +220,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
@@ -299,6 +325,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -349,9 +376,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -382,6 +410,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -399,8 +428,23 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -410,6 +454,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -433,14 +479,11 @@ CONFIG_SERIAL=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 CONFIG_OTHER_UART_SERIALDRIVER=y
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_OTHER_SERIAL_CONSOLE=y
 # CONFIG_NO_SERIAL_CONSOLE is not set
@@ -448,15 +491,18 @@ CONFIG_OTHER_SERIAL_CONSOLE=y
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -485,11 +531,7 @@ CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_RAMMAP is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -509,6 +551,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -549,10 +595,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -567,14 +617,13 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -582,11 +631,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -594,19 +643,19 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -614,15 +663,24 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -634,32 +692,28 @@ CONFIG_EXAMPLES_NSH=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_PPPD is not set
-
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
 
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -677,6 +731,7 @@ CONFIG_NSH_NESTDEPTH=3
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
@@ -685,6 +740,7 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_DD is not set
 # CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -693,8 +749,10 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 # CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -712,8 +770,10 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
@@ -740,6 +800,8 @@ CONFIG_NSH_FILEIOSIZE=256
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -753,17 +815,20 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 CONFIG_SYSTEM_CLE=y
 CONFIG_SYSTEM_CLE_DEBUGLEVEL=0
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
-# CONFIG_SYSTEM_POWEROFF is not set
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/ekk-lm3s9b96/nsh/defconfig b/configs/ekk-lm3s9b96/nsh/defconfig
index 2b146ff6f7..ee98426b9e 100644
--- a/configs/ekk-lm3s9b96/nsh/defconfig
+++ b/configs/ekk-lm3s9b96/nsh/defconfig
@@ -42,10 +42,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -468,6 +469,8 @@ CONFIG_SPI_CALLBACK=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -495,6 +498,7 @@ CONFIG_SPI_CALLBACK=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=0
 # CONFIG_MMCSD_READONLY is not set
@@ -540,6 +544,8 @@ CONFIG_ARCH_HAVE_NETDEV_STATISTICS=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -589,15 +595,18 @@ CONFIG_UART0_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -750,11 +759,6 @@ CONFIG_NFS=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -838,6 +842,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/fire-stm32v2/nsh/defconfig b/configs/fire-stm32v2/nsh/defconfig
index a4ed137681..425af3af49 100644
--- a/configs/fire-stm32v2/nsh/defconfig
+++ b/configs/fire-stm32v2/nsh/defconfig
@@ -46,10 +46,12 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -734,6 +736,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -767,6 +771,7 @@ CONFIG_RTC=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -822,6 +827,8 @@ CONFIG_ENC28J60_FREQUENCY=20000000
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -920,15 +927,18 @@ CONFIG_USBMSC_SCSI_STACKSIZE=2048
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -1082,11 +1092,6 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1170,6 +1175,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/freedom-kl25z/minnsh/defconfig b/configs/freedom-kl25z/minnsh/defconfig
index 4e2ba76061..0b7545d9c1 100644
--- a/configs/freedom-kl25z/minnsh/defconfig
+++ b/configs/freedom-kl25z/minnsh/defconfig
@@ -37,12 +37,15 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+# CONFIG_DEBUG_ALERT is not set
 # CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
+# CONFIG_STACK_COLORATION is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
@@ -74,10 +77,12 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 CONFIG_ARCH_CHIP_KL=y
 # CONFIG_ARCH_CHIP_LM is not set
 # CONFIG_ARCH_CHIP_TIVA is not set
+# CONFIG_ARCH_CHIP_LPC11XX is not set
 # CONFIG_ARCH_CHIP_LPC17XX is not set
 # CONFIG_ARCH_CHIP_LPC214X is not set
 # CONFIG_ARCH_CHIP_LPC2378 is not set
@@ -86,22 +91,42 @@ CONFIG_ARCH_CHIP_KL=y
 # CONFIG_ARCH_CHIP_NUC1XX is not set
 # CONFIG_ARCH_CHIP_SAMA5 is not set
 # CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
 # CONFIG_ARCH_CHIP_SAM34 is not set
+# CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
 CONFIG_ARCH_CORTEXM0=y
 # CONFIG_ARCH_CORTEXM3 is not set
 # CONFIG_ARCH_CORTEXM4 is not set
+# CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv6-m"
 CONFIG_ARCH_CHIP="kl"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
+# CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
+# CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 
 #
 # ARMV6M Configuration Options
@@ -115,7 +140,9 @@ CONFIG_ARMV6M_TOOLCHAIN_GNU_EABIL=y
 #
 # Kinetis Configuration Options
 #
+# CONFIG_ARCH_CHIP_MKL25Z64 is not set
 CONFIG_ARCH_CHIP_MKL25Z128=y
+# CONFIG_ARCH_CHIP_MKL26Z128 is not set
 CONFIG_ARCH_FAMILY_KL2X=y
 
 #
@@ -174,11 +201,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
 # CONFIG_ARCH_IRQPRIO is not set
 # CONFIG_ARCH_STACKDUMP is not set
 # CONFIG_ENDIAN_BIG is not set
@@ -232,6 +262,7 @@ CONFIG_NSH_MMCSDMINOR=0
 #
 # Board-Specific Options
 #
+# CONFIG_LIB_BOARDCTL is not set
 
 #
 # RTOS Features
@@ -261,11 +292,13 @@ CONFIG_PREALLOC_TIMERS=0
 #
 # Tasks and Scheduling
 #
+# CONFIG_SPINLOCK is not set
 # CONFIG_INIT_NONE is not set
 CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=0
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=8
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -296,9 +329,10 @@ CONFIG_NAME_MAX=32
 # CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 
 #
@@ -326,24 +360,50 @@ CONFIG_DISABLE_POLL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 CONFIG_SPI=y
+# CONFIG_SPI_SLAVE is not set
 CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_CMDDATA is not set
+# CONFIG_SPI_CALLBACK is not set
 # CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_HWFEATURES is not set
+# CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
+
+#
+# Timer Driver Support
+#
+# CONFIG_TIMER is not set
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
-# CONFIG_TIMER is not set
 # CONFIG_ANALOG is not set
 # CONFIG_AUDIO_DEVICES is not set
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -352,6 +412,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SENSORS is not set
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -375,14 +437,11 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 # CONFIG_STANDARD_SERIAL is not set
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -399,18 +458,22 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_NONE=y
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -438,11 +501,7 @@ CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y
 # CONFIG_FS_NAMED_SEMAPHORES is not set
 # CONFIG_FS_RAMMAP is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -462,6 +521,11 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+# CONFIG_WIRELESS is not set
+
 #
 # Binary Loader
 #
@@ -498,13 +562,18 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
 # CONFIG_LIBC_STRERROR is not set
 # CONFIG_LIBC_PERROR_STDOUT is not set
 CONFIG_ARCH_LOWPUTC=y
+# CONFIG_TIME_EXTENDED is not set
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -519,14 +588,13 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -534,11 +602,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -546,36 +614,44 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
-# CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_UDP is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -587,35 +663,28 @@ CONFIG_EXAMPLES_NSH=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_MICROPYTHON is not set
 # CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
-# CONFIG_NETUTILS_DHCPD is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
-# CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_TFTPC is not set
-# CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_NETLIB is not set
-# CONFIG_NETUTILS_WEBCLIENT is not set
-
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
 
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -633,13 +702,16 @@ CONFIG_NSH_NESTDEPTH=3
 # Disable Individual commands
 #
 CONFIG_NSH_DISABLE_ADDROUTE=y
+CONFIG_NSH_DISABLE_BASENAME=y
 # CONFIG_NSH_DISABLE_CAT is not set
 CONFIG_NSH_DISABLE_CD=y
 CONFIG_NSH_DISABLE_CP=y
 # CONFIG_NSH_DISABLE_CMP is not set
+CONFIG_NSH_DISABLE_DATE=y
 CONFIG_NSH_DISABLE_DD=y
 CONFIG_NSH_DISABLE_DF=y
 CONFIG_NSH_DISABLE_DELROUTE=y
+CONFIG_NSH_DISABLE_DIRNAME=y
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -648,8 +720,10 @@ CONFIG_NSH_DISABLE_GET=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 CONFIG_NSH_DISABLE_IFCONFIG=y
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 CONFIG_NSH_DISABLE_LOSETUP=y
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 CONFIG_NSH_DISABLE_MKDIR=y
@@ -657,6 +731,7 @@ CONFIG_NSH_DISABLE_MKDIR=y
 CONFIG_NSH_DISABLE_MKRD=y
 # CONFIG_NSH_DISABLE_MH is not set
 CONFIG_NSH_DISABLE_MOUNT=y
+# CONFIG_NSH_DISABLE_MV is not set
 # CONFIG_NSH_DISABLE_MW is not set
 # CONFIG_NSH_DISABLE_PS is not set
 CONFIG_NSH_DISABLE_PUT=y
@@ -666,8 +741,10 @@ CONFIG_NSH_DISABLE_RMDIR=y
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+CONFIG_NSH_DISABLE_TIME=y
 # CONFIG_NSH_DISABLE_TEST is not set
 CONFIG_NSH_DISABLE_UMOUNT=y
+CONFIG_NSH_DISABLE_UNAME=y
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 CONFIG_NSH_DISABLE_WGET=y
@@ -691,6 +768,8 @@ CONFIG_NSH_DISABLESCRIPT=y
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -704,116 +783,19 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-
-#
-# Custom Free Memory Command
-#
-# CONFIG_SYSTEM_FREE is not set
-
-#
-# EMACS-like Command Line Editor
-#
 # CONFIG_SYSTEM_CLE is not set
-
-#
-# CU Minimal Terminal
-#
 # CONFIG_SYSTEM_CUTERM is not set
-
-#
-# FLASH Program Installation
-#
-# CONFIG_SYSTEM_INSTALL is not set
-
-#
-# FLASH Erase-all Command
-#
-
-#
-# Intel HEX to binary conversion
-#
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-
-#
-# I2C tool
-#
-
-#
-# INI File Parser
-#
-# CONFIG_FSUTILS_INIFILE is not set
-
-#
-# NxPlayer media player library / command Line
-#
-
-#
-# RAM test
-#
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
-
-#
-# readline()
-#
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
-
-#
-# P-Code Support
-#
-
-#
-# PHY Tool
-#
-
-#
-# Power Off
-#
-# CONFIG_SYSTEM_POWEROFF is not set
-
-#
-# RAMTRON
-#
-
-#
-# SD Card
-#
-
-#
-# Sudoku
-#
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-
-#
-# Sysinfo
-#
-
-#
-# VI Work-Alike Editor
-#
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
-
-#
-# Stack Monitor
-#
-
-#
-# USB CDC/ACM Device Commands
-#
-
-#
-# USB Composite Device Commands
-#
-
-#
-# USB Mass Storage Device Commands
-#
-
-#
-# USB Monitor
-#
-
-#
-# Zmodem Commands
-#
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/freedom-kl25z/nsh/defconfig b/configs/freedom-kl25z/nsh/defconfig
index debb15644d..932777e502 100644
--- a/configs/freedom-kl25z/nsh/defconfig
+++ b/configs/freedom-kl25z/nsh/defconfig
@@ -37,14 +37,16 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,10 +77,12 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 CONFIG_ARCH_CHIP_KL=y
 # CONFIG_ARCH_CHIP_LM is not set
 # CONFIG_ARCH_CHIP_TIVA is not set
+# CONFIG_ARCH_CHIP_LPC11XX is not set
 # CONFIG_ARCH_CHIP_LPC17XX is not set
 # CONFIG_ARCH_CHIP_LPC214X is not set
 # CONFIG_ARCH_CHIP_LPC2378 is not set
@@ -87,10 +91,15 @@ CONFIG_ARCH_CHIP_KL=y
 # CONFIG_ARCH_CHIP_NUC1XX is not set
 # CONFIG_ARCH_CHIP_SAMA5 is not set
 # CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -100,13 +109,24 @@ CONFIG_ARCH_CORTEXM0=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv6-m"
 CONFIG_ARCH_CHIP="kl"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 
 #
 # ARMV6M Configuration Options
@@ -120,6 +140,7 @@ CONFIG_ARMV6M_TOOLCHAIN_GNU_EABIL=y
 #
 # Kinetis Configuration Options
 #
+# CONFIG_ARCH_CHIP_MKL25Z64 is not set
 CONFIG_ARCH_CHIP_MKL25Z128=y
 # CONFIG_ARCH_CHIP_MKL26Z128 is not set
 CONFIG_ARCH_FAMILY_KL2X=y
@@ -182,11 +203,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
@@ -241,8 +265,11 @@ CONFIG_NSH_MMCSDMINOR=0
 # Board-Specific Options
 #
 CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_RESET is not set
+# CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
 # CONFIG_BOARDCTL_ADCTEST is not set
+CONFIG_BOARDCTL_PWMTEST=y
 # CONFIG_BOARDCTL_GRAPHICS is not set
 # CONFIG_BOARDCTL_IOCTL is not set
 
@@ -279,6 +306,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=8
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -323,9 +351,10 @@ CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
 CONFIG_SIG_SIGCONDTIMEDOUT=16
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -356,6 +385,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 CONFIG_PWM=y
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -373,8 +403,23 @@ CONFIG_PWM=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -384,6 +429,8 @@ CONFIG_PWM=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -407,14 +454,11 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -431,19 +475,23 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -472,11 +520,7 @@ CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y
 # CONFIG_FS_RAMMAP is not set
 # CONFIG_FS_BINFS is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -496,6 +540,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -536,10 +584,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -558,11 +610,14 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 
+#
+# CAN Utilities
+#
+
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -570,11 +625,11 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -582,40 +637,50 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
+# CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 CONFIG_EXAMPLES_PWM=y
 CONFIG_EXAMPLES_PWM_DEVPATH="/dev/pwm0"
 CONFIG_EXAMPLES_PWM_FREQUENCY=100
-CONFIG_EXAMPLES_PWM_DUTYPCT=50
 CONFIG_EXAMPLES_PWM_DURATION=5
-# CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+CONFIG_EXAMPLES_PWM_DUTYPCT=50
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
-# CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -627,32 +692,28 @@ CONFIG_EXAMPLES_PWM_DURATION=5
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_PPPD is not set
-
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
 
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -671,13 +732,16 @@ CONFIG_NSH_BUILTIN_APPS=y
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+CONFIG_NSH_DISABLE_BASENAME=y
 # CONFIG_NSH_DISABLE_CAT is not set
 CONFIG_NSH_DISABLE_CD=y
 CONFIG_NSH_DISABLE_CP=y
 # CONFIG_NSH_DISABLE_CMP is not set
+CONFIG_NSH_DISABLE_DATE=y
 CONFIG_NSH_DISABLE_DD=y
 CONFIG_NSH_DISABLE_DF=y
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+CONFIG_NSH_DISABLE_DIRNAME=y
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -686,8 +750,10 @@ CONFIG_NSH_DISABLE_GET=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 CONFIG_NSH_DISABLE_IFCONFIG=y
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 CONFIG_NSH_DISABLE_LOSETUP=y
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 CONFIG_NSH_DISABLE_MKDIR=y
@@ -705,8 +771,10 @@ CONFIG_NSH_DISABLE_RMDIR=y
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+CONFIG_NSH_DISABLE_TIME=y
 # CONFIG_NSH_DISABLE_TEST is not set
 CONFIG_NSH_DISABLE_UMOUNT=y
+CONFIG_NSH_DISABLE_UNAME=y
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 CONFIG_NSH_DISABLE_WGET=y
@@ -730,6 +798,8 @@ CONFIG_NSH_DISABLESCRIPT=y
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -743,16 +813,19 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
-# CONFIG_SYSTEM_POWEROFF is not set
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/freedom-kl26z/minnsh/defconfig b/configs/freedom-kl26z/minnsh/defconfig
index 12666fa8a7..d68ba77924 100644
--- a/configs/freedom-kl26z/minnsh/defconfig
+++ b/configs/freedom-kl26z/minnsh/defconfig
@@ -37,14 +37,16 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+# CONFIG_DEBUG_ALERT is not set
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,10 +77,12 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 CONFIG_ARCH_CHIP_KL=y
 # CONFIG_ARCH_CHIP_LM is not set
 # CONFIG_ARCH_CHIP_TIVA is not set
+# CONFIG_ARCH_CHIP_LPC11XX is not set
 # CONFIG_ARCH_CHIP_LPC17XX is not set
 # CONFIG_ARCH_CHIP_LPC214X is not set
 # CONFIG_ARCH_CHIP_LPC2378 is not set
@@ -87,22 +91,42 @@ CONFIG_ARCH_CHIP_KL=y
 # CONFIG_ARCH_CHIP_NUC1XX is not set
 # CONFIG_ARCH_CHIP_SAMA5 is not set
 # CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
 # CONFIG_ARCH_CHIP_SAM34 is not set
+# CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
 CONFIG_ARCH_CORTEXM0=y
 # CONFIG_ARCH_CORTEXM3 is not set
 # CONFIG_ARCH_CORTEXM4 is not set
+# CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv6-m"
 CONFIG_ARCH_CHIP="kl"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
+# CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
+# CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 
 #
 # ARMV6M Configuration Options
@@ -116,6 +140,7 @@ CONFIG_ARMV6M_TOOLCHAIN_GNU_EABIL=y
 #
 # Kinetis Configuration Options
 #
+# CONFIG_ARCH_CHIP_MKL25Z64 is not set
 # CONFIG_ARCH_CHIP_MKL25Z128 is not set
 CONFIG_ARCH_CHIP_MKL26Z128=y
 CONFIG_ARCH_FAMILY_KL2X=y
@@ -176,11 +201,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
 # CONFIG_ARCH_IRQPRIO is not set
 # CONFIG_ARCH_STACKDUMP is not set
 # CONFIG_ENDIAN_BIG is not set
@@ -220,7 +248,6 @@ CONFIG_RAM_SIZE=16384
 #
 # Board Selection
 #
-# CONFIG_ARCH_BOARD_FREEDOM_KL25Z is not set
 CONFIG_ARCH_BOARD_FREEDOM_KL26Z=y
 # CONFIG_ARCH_BOARD_CUSTOM is not set
 CONFIG_ARCH_BOARD="freedom-kl26z"
@@ -235,6 +262,7 @@ CONFIG_NSH_MMCSDMINOR=0
 #
 # Board-Specific Options
 #
+# CONFIG_LIB_BOARDCTL is not set
 
 #
 # RTOS Features
@@ -264,11 +292,13 @@ CONFIG_PREALLOC_TIMERS=0
 #
 # Tasks and Scheduling
 #
+# CONFIG_SPINLOCK is not set
 # CONFIG_INIT_NONE is not set
 CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=0
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=8
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -299,9 +329,10 @@ CONFIG_NAME_MAX=32
 # CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 
 #
@@ -329,24 +360,50 @@ CONFIG_DISABLE_POLL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 CONFIG_SPI=y
+# CONFIG_SPI_SLAVE is not set
 CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_CMDDATA is not set
+# CONFIG_SPI_CALLBACK is not set
 # CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_HWFEATURES is not set
+# CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
+
+#
+# Timer Driver Support
+#
+# CONFIG_TIMER is not set
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
-# CONFIG_TIMER is not set
 # CONFIG_ANALOG is not set
 # CONFIG_AUDIO_DEVICES is not set
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -355,6 +412,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SENSORS is not set
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -378,14 +437,11 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 # CONFIG_STANDARD_SERIAL is not set
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -402,18 +458,22 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_NONE=y
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -441,11 +501,7 @@ CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y
 # CONFIG_FS_NAMED_SEMAPHORES is not set
 # CONFIG_FS_RAMMAP is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -465,6 +521,11 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+# CONFIG_WIRELESS is not set
+
 #
 # Binary Loader
 #
@@ -501,13 +562,18 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
 # CONFIG_LIBC_STRERROR is not set
 # CONFIG_LIBC_PERROR_STDOUT is not set
 CONFIG_ARCH_LOWPUTC=y
+# CONFIG_TIME_EXTENDED is not set
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -522,14 +588,13 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -537,11 +602,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -549,35 +614,44 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
-# CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -589,35 +663,28 @@ CONFIG_EXAMPLES_NSH=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
-# CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_TFTPC is not set
-# CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_NETLIB is not set
-# CONFIG_NETUTILS_WEBCLIENT is not set
-
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
 
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -635,13 +702,16 @@ CONFIG_NSH_NESTDEPTH=3
 # Disable Individual commands
 #
 CONFIG_NSH_DISABLE_ADDROUTE=y
+CONFIG_NSH_DISABLE_BASENAME=y
 # CONFIG_NSH_DISABLE_CAT is not set
 CONFIG_NSH_DISABLE_CD=y
 CONFIG_NSH_DISABLE_CP=y
 # CONFIG_NSH_DISABLE_CMP is not set
+CONFIG_NSH_DISABLE_DATE=y
 CONFIG_NSH_DISABLE_DD=y
 CONFIG_NSH_DISABLE_DF=y
 CONFIG_NSH_DISABLE_DELROUTE=y
+CONFIG_NSH_DISABLE_DIRNAME=y
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -650,8 +720,10 @@ CONFIG_NSH_DISABLE_GET=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 CONFIG_NSH_DISABLE_IFCONFIG=y
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 CONFIG_NSH_DISABLE_LOSETUP=y
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 CONFIG_NSH_DISABLE_MKDIR=y
@@ -659,6 +731,7 @@ CONFIG_NSH_DISABLE_MKDIR=y
 CONFIG_NSH_DISABLE_MKRD=y
 # CONFIG_NSH_DISABLE_MH is not set
 CONFIG_NSH_DISABLE_MOUNT=y
+# CONFIG_NSH_DISABLE_MV is not set
 # CONFIG_NSH_DISABLE_MW is not set
 # CONFIG_NSH_DISABLE_PS is not set
 CONFIG_NSH_DISABLE_PUT=y
@@ -668,8 +741,10 @@ CONFIG_NSH_DISABLE_RMDIR=y
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+CONFIG_NSH_DISABLE_TIME=y
 # CONFIG_NSH_DISABLE_TEST is not set
 CONFIG_NSH_DISABLE_UMOUNT=y
+CONFIG_NSH_DISABLE_UNAME=y
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 CONFIG_NSH_DISABLE_WGET=y
@@ -693,6 +768,8 @@ CONFIG_NSH_DISABLESCRIPT=y
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -706,120 +783,19 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-
-#
-# Custom Free Memory Command
-#
-# CONFIG_SYSTEM_FREE is not set
-
-#
-# EMACS-like Command Line Editor
-#
 # CONFIG_SYSTEM_CLE is not set
-
-#
-# CU Minimal Terminal
-#
 # CONFIG_SYSTEM_CUTERM is not set
-
-#
-# FLASH Program Installation
-#
-# CONFIG_SYSTEM_INSTALL is not set
-
-#
-# FLASH Erase-all Command
-#
-
-#
-# Intel HEX to binary conversion
-#
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-
-#
-# I2C tool
-#
-
-#
-# INI File Parser
-#
-# CONFIG_FSUTILS_INIFILE is not set
-
-#
-# NxPlayer media player library / command Line
-#
-
-#
-# RAM test
-#
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
-
-#
-# readline()
-#
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
-
-#
-# P-Code Support
-#
-
-#
-# PHY Tool
-#
-
-#
-# Power Off
-#
-# CONFIG_SYSTEM_POWEROFF is not set
-
-#
-# RAMTRON
-#
-
-#
-# SD Card
-#
-
-#
-# Sudoku
-#
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-
-#
-# Sysinfo
-#
-
-#
-# Temperature
-#
-
-#
-# VI Work-Alike Editor
-#
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
-
-#
-# Stack Monitor
-#
-
-#
-# USB CDC/ACM Device Commands
-#
-
-#
-# USB Composite Device Commands
-#
-
-#
-# USB Mass Storage Device Commands
-#
-
-#
-# USB Monitor
-#
-
-#
-# Zmodem Commands
-#
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/freedom-kl26z/nsh/defconfig b/configs/freedom-kl26z/nsh/defconfig
index d22fc5bf08..c6c7dc985f 100644
--- a/configs/freedom-kl26z/nsh/defconfig
+++ b/configs/freedom-kl26z/nsh/defconfig
@@ -37,14 +37,16 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,10 +77,12 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 CONFIG_ARCH_CHIP_KL=y
 # CONFIG_ARCH_CHIP_LM is not set
 # CONFIG_ARCH_CHIP_TIVA is not set
+# CONFIG_ARCH_CHIP_LPC11XX is not set
 # CONFIG_ARCH_CHIP_LPC17XX is not set
 # CONFIG_ARCH_CHIP_LPC214X is not set
 # CONFIG_ARCH_CHIP_LPC2378 is not set
@@ -87,10 +91,15 @@ CONFIG_ARCH_CHIP_KL=y
 # CONFIG_ARCH_CHIP_NUC1XX is not set
 # CONFIG_ARCH_CHIP_SAMA5 is not set
 # CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -100,13 +109,24 @@ CONFIG_ARCH_CORTEXM0=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv6-m"
 CONFIG_ARCH_CHIP="kl"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 
 #
 # ARMV6M Configuration Options
@@ -120,6 +140,7 @@ CONFIG_ARMV6M_TOOLCHAIN_GNU_EABIL=y
 #
 # Kinetis Configuration Options
 #
+# CONFIG_ARCH_CHIP_MKL25Z64 is not set
 # CONFIG_ARCH_CHIP_MKL25Z128 is not set
 CONFIG_ARCH_CHIP_MKL26Z128=y
 CONFIG_ARCH_FAMILY_KL2X=y
@@ -182,11 +203,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
@@ -241,8 +265,11 @@ CONFIG_NSH_MMCSDMINOR=0
 # Board-Specific Options
 #
 CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_RESET is not set
+# CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
 # CONFIG_BOARDCTL_ADCTEST is not set
+CONFIG_BOARDCTL_PWMTEST=y
 # CONFIG_BOARDCTL_GRAPHICS is not set
 # CONFIG_BOARDCTL_IOCTL is not set
 
@@ -279,6 +306,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=8
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -323,9 +351,10 @@ CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
 CONFIG_SIG_SIGCONDTIMEDOUT=16
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -356,6 +385,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 CONFIG_PWM=y
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -373,8 +403,23 @@ CONFIG_PWM=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -384,6 +429,8 @@ CONFIG_PWM=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -407,14 +454,11 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -431,19 +475,23 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -472,11 +520,7 @@ CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y
 # CONFIG_FS_RAMMAP is not set
 # CONFIG_FS_BINFS is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -496,6 +540,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -536,10 +584,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -558,11 +610,14 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 
+#
+# CAN Utilities
+#
+
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -570,11 +625,11 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -582,40 +637,50 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
+# CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 CONFIG_EXAMPLES_PWM=y
 CONFIG_EXAMPLES_PWM_DEVPATH="/dev/pwm0"
 CONFIG_EXAMPLES_PWM_FREQUENCY=100
-CONFIG_EXAMPLES_PWM_DUTYPCT=50
 CONFIG_EXAMPLES_PWM_DURATION=5
-# CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+CONFIG_EXAMPLES_PWM_DUTYPCT=50
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
-# CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -627,32 +692,28 @@ CONFIG_EXAMPLES_PWM_DURATION=5
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_PPPD is not set
-
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
 
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -671,13 +732,16 @@ CONFIG_NSH_BUILTIN_APPS=y
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+CONFIG_NSH_DISABLE_BASENAME=y
 # CONFIG_NSH_DISABLE_CAT is not set
 CONFIG_NSH_DISABLE_CD=y
 CONFIG_NSH_DISABLE_CP=y
 # CONFIG_NSH_DISABLE_CMP is not set
+CONFIG_NSH_DISABLE_DATE=y
 CONFIG_NSH_DISABLE_DD=y
 CONFIG_NSH_DISABLE_DF=y
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+CONFIG_NSH_DISABLE_DIRNAME=y
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -686,8 +750,10 @@ CONFIG_NSH_DISABLE_GET=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 CONFIG_NSH_DISABLE_IFCONFIG=y
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 CONFIG_NSH_DISABLE_LOSETUP=y
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 CONFIG_NSH_DISABLE_MKDIR=y
@@ -705,8 +771,10 @@ CONFIG_NSH_DISABLE_RMDIR=y
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+CONFIG_NSH_DISABLE_TIME=y
 # CONFIG_NSH_DISABLE_TEST is not set
 CONFIG_NSH_DISABLE_UMOUNT=y
+CONFIG_NSH_DISABLE_UNAME=y
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 CONFIG_NSH_DISABLE_WGET=y
@@ -730,6 +798,8 @@ CONFIG_NSH_DISABLESCRIPT=y
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -743,16 +813,19 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
-# CONFIG_SYSTEM_POWEROFF is not set
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/hymini-stm32v/buttons/defconfig b/configs/hymini-stm32v/buttons/defconfig
index 84cf57940c..bed31efc27 100644
--- a/configs/hymini-stm32v/buttons/defconfig
+++ b/configs/hymini-stm32v/buttons/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -199,6 +201,7 @@ CONFIG_ARCH_CHIP_STM32F103VC=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -408,6 +411,10 @@ CONFIG_STM32_JTAG_DISABLE=y
 # CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG is not set
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -419,9 +426,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -667,7 +682,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -675,6 +695,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -686,6 +707,8 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -735,15 +758,18 @@ CONFIG_USART1_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -780,11 +806,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -852,6 +873,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -893,10 +915,10 @@ CONFIG_EXAMPLES_BUTTONS_NAME7="Button 7"
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -905,18 +927,18 @@ CONFIG_EXAMPLES_BUTTONS_NAME7="Button 7"
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -930,9 +952,9 @@ CONFIG_EXAMPLES_BUTTONS_NAME7="Button 7"
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -954,8 +976,8 @@ CONFIG_EXAMPLES_BUTTONS_NAME7="Button 7"
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -988,18 +1010,18 @@ CONFIG_EXAMPLES_BUTTONS_NAME7="Button 7"
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/hymini-stm32v/nsh/defconfig b/configs/hymini-stm32v/nsh/defconfig
index 1749a0acd0..44bc062c76 100644
--- a/configs/hymini-stm32v/nsh/defconfig
+++ b/configs/hymini-stm32v/nsh/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -201,6 +203,7 @@ CONFIG_ARCH_CHIP_STM32F103VC=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -411,6 +414,10 @@ CONFIG_STM32_JTAG_DISABLE=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_DMACAPABLE is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -422,9 +429,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -684,7 +699,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -692,6 +712,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -715,6 +736,8 @@ CONFIG_SDIO_PREFLIGHT=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -764,15 +787,18 @@ CONFIG_USART1_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -815,11 +841,6 @@ CONFIG_FAT_LCNAMES=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -890,6 +911,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -920,10 +942,10 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -932,18 +954,18 @@ CONFIG_ARCH_HAVE_TLS=y
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -957,10 +979,10 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -984,8 +1006,8 @@ CONFIG_EXAMPLES_NSH=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1109,12 +1131,12 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1122,6 +1144,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/hymini-stm32v/nsh2/defconfig b/configs/hymini-stm32v/nsh2/defconfig
index 9458de82ac..6613d88a84 100644
--- a/configs/hymini-stm32v/nsh2/defconfig
+++ b/configs/hymini-stm32v/nsh2/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -201,6 +203,7 @@ CONFIG_ARCH_CHIP_STM32F103VC=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -417,6 +420,10 @@ CONFIG_STM32_JTAG_DISABLE=y
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_DMACAPABLE is not set
 # CONFIG_STM32_FSMC_SRAM is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM3_PWM is not set
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
@@ -429,9 +436,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -694,6 +709,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -730,10 +747,14 @@ CONFIG_ADS7843E_THRESHY=12
 # CONFIG_DJOYSTICK is not set
 # CONFIG_AJOYSTICK is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 CONFIG_LCD=y
 
 #
-# Common LCD Settings
+# Common Graphic LCD Settings
 #
 # CONFIG_LCD_CONSOLE is not set
 # CONFIG_LCD_NOGETRUN is not set
@@ -765,11 +786,7 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_LCD_RLANDSCAPE is not set
 # CONFIG_LCD_ILI9341 is not set
 # CONFIG_LCD_RA8875 is not set
-
-#
-# Alphanumeric/Segment LCD Devices
-#
-# CONFIG_LCD_LCD1602 is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -777,6 +794,7 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -803,6 +821,8 @@ CONFIG_SDIO_PREFLIGHT=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -889,15 +909,18 @@ CONFIG_USBMSC_SCSI_STACKSIZE=2048
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -942,11 +965,6 @@ CONFIG_FS_ROMFS=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1108,6 +1126,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -1155,10 +1174,10 @@ CONFIG_EXAMPLES_BUTTONS_NAME7="Button 7"
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_LCDRW is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
@@ -1176,7 +1195,6 @@ CONFIG_EXAMPLES_NX_BPP=16
 # CONFIG_EXAMPLES_NX_RAWWINDOWS is not set
 CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 # CONFIG_EXAMPLES_NX_EXTERNINIT is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 CONFIG_EXAMPLES_NXHELLO=y
 CONFIG_EXAMPLES_NXHELLO_VPLANE=0
@@ -1207,12 +1225,13 @@ CONFIG_EXAMPLES_NXIMAGE_YSCALE1p0=y
 # CONFIG_EXAMPLES_NXIMAGE_YSCALE1p5 is not set
 # CONFIG_EXAMPLES_NXIMAGE_YSCALE2p0 is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_ROMFS is not set
@@ -1221,8 +1240,8 @@ CONFIG_EXAMPLES_NXIMAGE_YSCALE1p0=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
@@ -1233,11 +1252,11 @@ CONFIG_EXAMPLES_TOUCHSCREEN_MINOR=0
 CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0"
 # CONFIG_EXAMPLES_TOUCHSCREEN_MOUSE is not set
 CONFIG_EXAMPLES_TOUCHSCREEN_ARCHINIT=y
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_UNIONFS is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1261,8 +1280,8 @@ CONFIG_EXAMPLES_TOUCHSCREEN_ARCHINIT=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1393,12 +1412,12 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1406,8 +1425,8 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_USBMONITOR is not set
 CONFIG_SYSTEM_USBMSC=y
 CONFIG_SYSTEM_USBMSC_NLUNS=1
 CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
@@ -1419,5 +1438,5 @@ CONFIG_SYSTEM_USBMSC_DEVPATH3="/dev/mmcsd2"
 # CONFIG_SYSTEM_USBMSC_DEBUGMM is not set
 CONFIG_SYSTEM_USBMSC_CMD_STACKSIZE=768
 CONFIG_SYSTEM_USBMSC_CMD_PRIORITY=100
-# CONFIG_SYSTEM_USBMONITOR is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/hymini-stm32v/usbmsc/defconfig b/configs/hymini-stm32v/usbmsc/defconfig
index 6af83e6dc5..75652b23a6 100644
--- a/configs/hymini-stm32v/usbmsc/defconfig
+++ b/configs/hymini-stm32v/usbmsc/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -201,6 +203,7 @@ CONFIG_ARCH_CHIP_STM32F103VC=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -413,6 +416,10 @@ CONFIG_STM32_JTAG_DISABLE=y
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_DMACAPABLE is not set
 # CONFIG_STM32_FSMC_SRAM is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -424,12 +431,20 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
 CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -688,7 +703,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -696,6 +716,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -719,6 +740,8 @@ CONFIG_SDIO_PREFLIGHT=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -817,15 +840,18 @@ CONFIG_USBMSC_SCSI_STACKSIZE=2048
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -862,11 +888,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -942,6 +963,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -971,10 +993,10 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -983,18 +1005,18 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1008,10 +1030,10 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1035,8 +1057,8 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1069,17 +1091,16 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
 CONFIG_SYSTEM_USBMSC=y
 CONFIG_SYSTEM_USBMSC_NLUNS=1
@@ -1090,4 +1111,5 @@ CONFIG_SYSTEM_USBMSC_DEVPATH2="/dev/mmcsd1"
 CONFIG_SYSTEM_USBMSC_DEVMINOR3=2
 CONFIG_SYSTEM_USBMSC_DEVPATH3="/dev/mmcsd2"
 # CONFIG_SYSTEM_USBMSC_DEBUGMM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/hymini-stm32v/usbnsh/defconfig b/configs/hymini-stm32v/usbnsh/defconfig
index d44ec35f6c..5ac1d3cc08 100644
--- a/configs/hymini-stm32v/usbnsh/defconfig
+++ b/configs/hymini-stm32v/usbnsh/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -199,6 +201,7 @@ CONFIG_ARCH_CHIP_STM32F103VC=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -408,6 +411,10 @@ CONFIG_STM32_JTAG_DISABLE=y
 # CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG is not set
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -419,9 +426,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -676,7 +691,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -684,6 +704,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -696,6 +717,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
 CONFIG_SERIAL_REMOVABLE=y
+# CONFIG_SERIAL_CONSOLE is not set
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -785,15 +807,21 @@ CONFIG_CDCACM_PRODUCTSTR="CDC/ACM Serial"
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+CONFIG_SYSLOG_CHAR=y
+# CONFIG_SYSLOG_CONSOLE is not set
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 # CONFIG_CONSOLE_SYSLOG is not set
+CONFIG_SYSLOG_CHAR_CRLF=y
+CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
 
 #
 # Networking Support
@@ -830,13 +858,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-CONFIG_SYSLOG_CHAR=y
-CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
-
 #
 # Graphics Support
 #
@@ -904,6 +925,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -945,10 +967,10 @@ CONFIG_EXAMPLES_BUTTONS_NAME7="Button 7"
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -957,18 +979,18 @@ CONFIG_EXAMPLES_BUTTONS_NAME7="Button 7"
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -982,10 +1004,10 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1007,8 +1029,8 @@ CONFIG_EXAMPLES_NSH=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1132,12 +1154,13 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_CDCACM is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1145,7 +1168,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
-# CONFIG_SYSTEM_CDCACM is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/hymini-stm32v/usbserial/defconfig b/configs/hymini-stm32v/usbserial/defconfig
index 45d5325645..8f3d549fe2 100644
--- a/configs/hymini-stm32v/usbserial/defconfig
+++ b/configs/hymini-stm32v/usbserial/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -199,6 +201,7 @@ CONFIG_ARCH_CHIP_STM32F103VC=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -409,6 +412,10 @@ CONFIG_STM32_JTAG_DISABLE=y
 # CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG is not set
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -420,12 +427,20 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
 CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -674,7 +689,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -682,6 +702,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -694,6 +715,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
 CONFIG_SERIAL_REMOVABLE=y
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -791,15 +813,18 @@ CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -830,11 +855,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -907,6 +927,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -935,10 +956,10 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -947,18 +968,18 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -972,11 +993,11 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 CONFIG_EXAMPLES_USBSERIAL=y
 CONFIG_EXAMPLES_USBSERIAL_BUFSIZE=512
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -998,8 +1019,8 @@ CONFIG_EXAMPLES_USBSERIAL_BUFSIZE=512
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1032,16 +1053,16 @@ CONFIG_EXAMPLES_USBSERIAL_BUFSIZE=512
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/kwikstik-k40/ostest/defconfig b/configs/kwikstik-k40/ostest/defconfig
index 094b28af90..dcf0bda3c3 100644
--- a/configs/kwikstik-k40/ostest/defconfig
+++ b/configs/kwikstik-k40/ostest/defconfig
@@ -37,14 +37,16 @@ CONFIG_INTELHEX_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,6 +77,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 CONFIG_ARCH_CHIP_KINETIS=y
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -92,7 +95,11 @@ CONFIG_ARCH_CHIP_KINETIS=y
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -102,12 +109,23 @@ CONFIG_ARCH_CORTEXM4=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="kinetis"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARCH_HAVE_DPFPU is not set
 # CONFIG_ARCH_FPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
 #
@@ -117,6 +135,7 @@ CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
@@ -128,6 +147,14 @@ CONFIG_ARMV7M_OABI_TOOLCHAIN=y
 #
 # Kinetis Configuration Options
 #
+# CONFIG_ARCH_CHIP_MK20DN32VLH5 is not set
+# CONFIG_ARCH_CHIP_MK20DX32VLH5 is not set
+# CONFIG_ARCH_CHIP_MK20DN64VLH5 is not set
+# CONFIG_ARCH_CHIP_MK20DX64VLH5 is not set
+# CONFIG_ARCH_CHIP_MK20DN128VLH5 is not set
+# CONFIG_ARCH_CHIP_MK20DX128VLH5 is not set
+# CONFIG_ARCH_CHIP_MK20DX64VLH7 is not set
+# CONFIG_ARCH_CHIP_MK20DX128VLH7 is not set
 # CONFIG_ARCH_CHIP_MK20DX256VLH7 is not set
 # CONFIG_ARCH_CHIP_MK40N512VLQ100 is not set
 # CONFIG_ARCH_CHIP_MK40N512VMD100 is not set
@@ -137,6 +164,7 @@ CONFIG_ARCH_CHIP_MK40X256VLQ100=y
 # CONFIG_ARCH_CHIP_MK40X256VMD100 is not set
 # CONFIG_ARCH_CHIP_MK60N256VLQ100 is not set
 # CONFIG_ARCH_CHIP_MK60N256VMD100 is not set
+# CONFIG_ARCH_CHIP_MK60N512VLL100 is not set
 # CONFIG_ARCH_CHIP_MK60N512VLQ100 is not set
 # CONFIG_ARCH_CHIP_MK60N512VMD100 is not set
 # CONFIG_ARCH_CHIP_MK60X256VLQ100 is not set
@@ -209,11 +237,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
 # CONFIG_ARCH_USE_MPU is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
@@ -308,6 +339,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="ostest_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -358,9 +390,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -391,6 +424,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -408,8 +442,23 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -419,6 +468,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -442,13 +493,10 @@ CONFIG_UART5_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART5_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -465,19 +513,23 @@ CONFIG_UART5_PARITY=0
 CONFIG_UART5_2STOP=0
 # CONFIG_UART5_IFLOWCONTROL is not set
 # CONFIG_UART5_OFLOWCONTROL is not set
+# CONFIG_UART5_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -508,11 +560,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -531,6 +578,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -571,10 +622,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -589,14 +644,13 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -604,11 +658,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -616,11 +670,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 CONFIG_EXAMPLES_OSTEST=y
 CONFIG_EXAMPLES_OSTEST_LOOPS=1
@@ -628,11 +682,12 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
 CONFIG_EXAMPLES_OSTEST_RR_RANGE=10000
 CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -640,14 +695,24 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -659,26 +724,23 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
@@ -696,15 +758,16 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+# CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
-# CONFIG_SYSTEM_POWEROFF is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/launchxl-tms57004/nsh/defconfig b/configs/launchxl-tms57004/nsh/defconfig
index ed6cee7d90..ce89fc88bf 100644
--- a/configs/launchxl-tms57004/nsh/defconfig
+++ b/configs/launchxl-tms57004/nsh/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -80,6 +81,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -98,6 +100,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 CONFIG_ARCH_CHIP_TMS570=y
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -110,6 +113,7 @@ CONFIG_ARCH_CHIP_TMS570=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
 CONFIG_ARCH_CORTEXR4=y
 # CONFIG_ARCH_CORTEXR4F is not set
 # CONFIG_ARCH_CORTEXR5 is not set
@@ -118,8 +122,11 @@ CONFIG_ARCH_CORTEXR4=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-r"
 CONFIG_ARCH_CHIP="tms570"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 # CONFIG_ARM_MPU is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
@@ -178,6 +185,7 @@ CONFIG_TMS570_GIO_IRQ=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 CONFIG_ARCH_HAVE_MPU=y
@@ -390,6 +398,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -405,13 +415,20 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
 #
 # CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -423,6 +440,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -446,10 +465,6 @@ CONFIG_SCI1_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -473,15 +488,18 @@ CONFIG_SCI1_2STOP=1
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -515,7 +533,9 @@ CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
 CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_FATTIME is not set
+# CONFIG_FAT_FORCE_INDIRECT is not set
 # CONFIG_FAT_DMAMEMORY is not set
+# CONFIG_FAT_DIRECT_RETRY is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
 # CONFIG_FS_TMPFS is not set
@@ -532,11 +552,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_MOUNTS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -555,6 +570,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -600,12 +619,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 # CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -641,10 +663,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -653,33 +675,35 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -687,6 +711,11 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_FSUTILS_PASSWD is not set
 
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
 #
 # Graphics Support
 #
@@ -698,8 +727,8 @@ CONFIG_EXAMPLES_NSH=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -710,6 +739,7 @@ CONFIG_EXAMPLES_NSH=y
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -824,13 +854,13 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_SYSTEM_I2CTOOL is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_I2CTOOL is not set
+# CONFIG_SYSTEM_INSTALL is not set
 CONFIG_SYSTEM_RAMTEST=y
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -838,6 +868,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/lincoln60/netnsh/defconfig b/configs/lincoln60/netnsh/defconfig
index 2a824c20ad..265907de16 100644
--- a/configs/lincoln60/netnsh/defconfig
+++ b/configs/lincoln60/netnsh/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -480,6 +481,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -534,6 +536,8 @@ CONFIG_ETH0_PHY_KSZ8041=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -583,15 +587,18 @@ CONFIG_UART0_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -746,11 +753,6 @@ CONFIG_FS_FAT=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -834,6 +836,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/lincoln60/nsh/defconfig b/configs/lincoln60/nsh/defconfig
index e940e1f9d8..223015351e 100644
--- a/configs/lincoln60/nsh/defconfig
+++ b/configs/lincoln60/nsh/defconfig
@@ -37,14 +37,16 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,6 +77,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -92,7 +95,11 @@ CONFIG_ARCH_CHIP_LPC17XX=y
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -102,14 +109,25 @@ CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="lpc17xx"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
 #
@@ -119,6 +137,7 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y
@@ -212,11 +231,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
 # CONFIG_ARCH_USE_MPU is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
@@ -277,6 +299,8 @@ CONFIG_NSH_MMCSDMINOR=0
 # Board-Specific Options
 #
 CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_RESET is not set
+# CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
 # CONFIG_BOARDCTL_ADCTEST is not set
 # CONFIG_BOARDCTL_PWMTEST is not set
@@ -316,6 +340,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -366,9 +391,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -399,6 +425,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -416,8 +443,23 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -427,6 +469,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -450,14 +494,11 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -474,19 +515,23 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -519,16 +564,15 @@ CONFIG_FS_FAT=y
 # CONFIG_FAT_LCNAMES is not set
 # CONFIG_FAT_LFN is not set
 # CONFIG_FS_FATTIME is not set
+# CONFIG_FAT_FORCE_INDIRECT is not set
 # CONFIG_FAT_DMAMEMORY is not set
+# CONFIG_FAT_DIRECT_RETRY is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -548,6 +592,10 @@ CONFIG_MM_REGIONS=2
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -593,10 +641,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -611,26 +664,26 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FSTEST is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -638,19 +691,19 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -658,15 +711,26 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -679,30 +743,28 @@ CONFIG_EXAMPLES_NSH=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -721,6 +783,7 @@ CONFIG_NSH_NESTDEPTH=3
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
@@ -729,6 +792,7 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_DD is not set
 # CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -737,8 +801,10 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 # CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -757,8 +823,10 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
@@ -785,6 +853,8 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -798,16 +868,19 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
-# CONFIG_SYSTEM_POWEROFF is not set
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/lincoln60/thttpd-binfs/defconfig b/configs/lincoln60/thttpd-binfs/defconfig
index 85d237e6dc..a59c0d2ee5 100644
--- a/configs/lincoln60/thttpd-binfs/defconfig
+++ b/configs/lincoln60/thttpd-binfs/defconfig
@@ -41,14 +41,16 @@ CONFIG_INTELHEX_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -79,6 +81,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -96,7 +99,11 @@ CONFIG_ARCH_CHIP_LPC17XX=y
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -106,14 +113,25 @@ CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="lpc17xx"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
 #
@@ -123,6 +141,7 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARW is not set
 # CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
 # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDW is not set
@@ -231,11 +250,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
 # CONFIG_ARCH_USE_MPU is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
@@ -329,6 +351,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="thttp_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -359,6 +382,7 @@ CONFIG_NAME_MAX=32
 # CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
+# CONFIG_SIG_EVTHREAD is not set
 
 #
 # Signal Numbers
@@ -367,9 +391,10 @@ CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
 CONFIG_SIG_SIGWORK=17
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 CONFIG_SCHED_WORKQUEUE=y
 CONFIG_SCHED_HPWORK=y
@@ -403,6 +428,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -420,8 +446,23 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 CONFIG_NETDEVICES=y
@@ -429,7 +470,11 @@ CONFIG_NETDEVICES=y
 #
 # General Ethernet MAC Driver Options
 #
+# CONFIG_NETDEV_LOOPBACK is not set
+# CONFIG_NETDEV_TELNET is not set
 # CONFIG_NETDEV_MULTINIC is not set
+CONFIG_ARCH_HAVE_NETDEV_STATISTICS=y
+# CONFIG_NETDEV_LATEINIT is not set
 
 #
 # External Ethernet MAC Device Support
@@ -439,6 +484,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_ENCX24J600 is not set
 # CONFIG_NET_E1000 is not set
 # CONFIG_NET_SLIP is not set
+# CONFIG_NET_FTMAC100 is not set
 # CONFIG_NET_VNET is not set
 
 #
@@ -457,6 +503,7 @@ CONFIG_ETH0_PHY_KSZ8041=y
 # CONFIG_ETH0_PHY_LAN8720 is not set
 # CONFIG_ETH0_PHY_LAN8740 is not set
 # CONFIG_ETH0_PHY_LAN8740A is not set
+# CONFIG_ETH0_PHY_LAN8742A is not set
 # CONFIG_ETH0_PHY_DM9161 is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
@@ -465,6 +512,8 @@ CONFIG_ETH0_PHY_KSZ8041=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -488,13 +537,10 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -511,19 +557,23 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -547,6 +597,7 @@ CONFIG_NET_GUARDSIZE=2
 #
 # CONFIG_NET_MULTILINK is not set
 CONFIG_NET_ETHERNET=y
+# CONFIG_NET_LOOPBACK is not set
 # CONFIG_NET_TUN is not set
 
 #
@@ -635,6 +686,7 @@ CONFIG_IOB_THROTTLE=8
 # Routing Table Configuration
 #
 # CONFIG_NET_ROUTE is not set
+CONFIG_NET_HOSTNAME=""
 
 #
 # Crypto API
@@ -658,16 +710,12 @@ CONFIG_FS_READABLE=y
 # CONFIG_FS_FAT is not set
 # CONFIG_FS_NXFFS is not set
 CONFIG_FS_ROMFS=y
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 CONFIG_FS_BINFS=y
 # CONFIG_FS_PROCFS is not set
 CONFIG_FS_UNIONFS=y
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -686,6 +734,10 @@ CONFIG_MM_REGIONS=2
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -729,10 +781,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -751,11 +808,14 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 
+#
+# CAN Utilities
+#
+
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -763,11 +823,11 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -776,18 +836,19 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -796,6 +857,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 CONFIG_EXAMPLES_THTTPD=y
@@ -804,14 +866,24 @@ CONFIG_EXAMPLES_THTTPD_DRIPADDR=0x0a000001
 CONFIG_EXAMPLES_THTTPD_NETMASK=0xffffff00
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_UNIONFS is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_WGET is not set
 # CONFIG_EXAMPLES_XMLRPC is not set
 
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
 #
 # Graphics Support
 #
@@ -823,20 +895,24 @@ CONFIG_EXAMPLES_THTTPD_NETMASK=0xffffff00
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
+# CONFIG_NETUTILS_CHAT is not set
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TELNETD is not set
 CONFIG_NETUTILS_THTTPD=y
@@ -871,16 +947,10 @@ CONFIG_THTTPD_IDLE_SEND_LIMIT_SEC=300
 CONFIG_THTTPD_TILDE_MAP_NONE=y
 # CONFIG_THTTPD_GENERATE_INDICES is not set
 # CONFIG_THTTPD_USE_URLPATTERN is not set
-CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
@@ -898,15 +968,16 @@ CONFIG_NETUTILS_NETLIB=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+# CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
-# CONFIG_SYSTEM_POWEROFF is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/lm3s6432-s2e/nsh/defconfig b/configs/lm3s6432-s2e/nsh/defconfig
index 14e14ef254..36f502dc4d 100644
--- a/configs/lm3s6432-s2e/nsh/defconfig
+++ b/configs/lm3s6432-s2e/nsh/defconfig
@@ -42,10 +42,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -481,6 +482,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -516,6 +518,8 @@ CONFIG_ARCH_HAVE_NETDEV_STATISTICS=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -579,15 +583,18 @@ CONFIG_UART1_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -733,11 +740,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -817,6 +819,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/lm3s6965-ek/discover/defconfig b/configs/lm3s6965-ek/discover/defconfig
index f8a687f604..a7c640c03d 100644
--- a/configs/lm3s6965-ek/discover/defconfig
+++ b/configs/lm3s6965-ek/discover/defconfig
@@ -42,10 +42,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -473,6 +474,8 @@ CONFIG_SPI_CALLBACK=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -500,6 +503,7 @@ CONFIG_SPI_CALLBACK=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -545,6 +549,8 @@ CONFIG_ARCH_HAVE_NETDEV_STATISTICS=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -594,15 +600,18 @@ CONFIG_UART0_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -754,11 +763,6 @@ CONFIG_FS_FAT=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -842,6 +846,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/lm3s6965-ek/nsh/defconfig b/configs/lm3s6965-ek/nsh/defconfig
index f8a687f604..a7c640c03d 100644
--- a/configs/lm3s6965-ek/nsh/defconfig
+++ b/configs/lm3s6965-ek/nsh/defconfig
@@ -42,10 +42,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -473,6 +474,8 @@ CONFIG_SPI_CALLBACK=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -500,6 +503,7 @@ CONFIG_SPI_CALLBACK=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -545,6 +549,8 @@ CONFIG_ARCH_HAVE_NETDEV_STATISTICS=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -594,15 +600,18 @@ CONFIG_UART0_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -754,11 +763,6 @@ CONFIG_FS_FAT=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -842,6 +846,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/lm3s6965-ek/nx/defconfig b/configs/lm3s6965-ek/nx/defconfig
index eaccaa9a27..25f91bb2a3 100644
--- a/configs/lm3s6965-ek/nx/defconfig
+++ b/configs/lm3s6965-ek/nx/defconfig
@@ -37,14 +37,16 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,6 +77,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 CONFIG_ARCH_CHIP_LM=y
@@ -92,7 +95,11 @@ CONFIG_ARCH_CHIP_LM=y
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -102,14 +109,25 @@ CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="tiva"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
 #
@@ -119,6 +137,7 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
@@ -236,11 +255,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
 # CONFIG_ARCH_USE_MPU is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
@@ -297,6 +319,8 @@ CONFIG_ARCH_LEDS=y
 # Board-Specific Options
 #
 CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_RESET is not set
+# CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
 # CONFIG_BOARDCTL_ADCTEST is not set
 # CONFIG_BOARDCTL_PWMTEST is not set
@@ -336,6 +360,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nx_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -386,9 +411,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -419,14 +445,20 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 CONFIG_SPI=y
+# CONFIG_SPI_SLAVE is not set
 CONFIG_SPI_EXCHANGE=y
 CONFIG_SPI_CMDDATA=y
 # CONFIG_SPI_CALLBACK is not set
 # CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_HWFEATURES is not set
+# CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -440,10 +472,15 @@ CONFIG_SPI_CMDDATA=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 CONFIG_LCD=y
 
 #
-# Common LCD Settings
+# Common Graphic LCD Settings
 #
 # CONFIG_LCD_CONSOLE is not set
 # CONFIG_LCD_NOGETRUN is not set
@@ -464,6 +501,7 @@ CONFIG_P14201_FRAMEBUFFER=y
 # CONFIG_LCD_UG9664HSWAG01 is not set
 # CONFIG_LCD_UG2864HSWEG01 is not set
 # CONFIG_LCD_UG2832HSWEG04 is not set
+# CONFIG_LCD_SSD1351 is not set
 # CONFIG_LCD_ST7565 is not set
 # CONFIG_LCD_ST7567 is not set
 # CONFIG_LCD_UG2864AMBAG01 is not set
@@ -475,12 +513,17 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_LCD_RLANDSCAPE is not set
 # CONFIG_LCD_ILI9341 is not set
 # CONFIG_LCD_RA8875 is not set
+# CONFIG_SLCD is not set
 
 #
-# Alphanumeric/Segment LCD Devices
+# LED Support
 #
-# CONFIG_LCD_LCD1602 is not set
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -490,6 +533,8 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -513,14 +558,11 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -537,19 +579,23 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -580,11 +626,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -593,6 +634,7 @@ CONFIG_NX_LCDDRIVER=y
 CONFIG_NX_NPLANES=1
 CONFIG_NX_BGCOLOR=0x0
 # CONFIG_NX_WRITEONLY is not set
+# CONFIG_NX_UPDATE is not set
 
 #
 # Supported Pixel Depths
@@ -691,6 +733,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -731,10 +777,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -749,14 +799,13 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -764,12 +813,12 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_LCDRW is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -790,18 +839,19 @@ CONFIG_EXAMPLES_NX_BPP=4
 # CONFIG_EXAMPLES_NX_RAWWINDOWS is not set
 CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 CONFIG_EXAMPLES_NX_EXTERNINIT=y
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -809,14 +859,25 @@ CONFIG_EXAMPLES_NX_EXTERNINIT=y
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -828,26 +889,23 @@ CONFIG_EXAMPLES_NX_EXTERNINIT=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
@@ -865,15 +923,16 @@ CONFIG_EXAMPLES_NX_EXTERNINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+# CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
-# CONFIG_SYSTEM_POWEROFF is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/lm3s6965-ek/tcpecho/defconfig b/configs/lm3s6965-ek/tcpecho/defconfig
index b9ba2269e9..a0b8bd8847 100644
--- a/configs/lm3s6965-ek/tcpecho/defconfig
+++ b/configs/lm3s6965-ek/tcpecho/defconfig
@@ -37,14 +37,16 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,6 +77,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 CONFIG_ARCH_CHIP_LM=y
@@ -93,7 +96,9 @@ CONFIG_ARCH_CHIP_LM=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
@@ -104,14 +109,25 @@ CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="tiva"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
 #
@@ -121,6 +137,7 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y
@@ -251,6 +268,7 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 CONFIG_ARCH_HAVE_MPU=y
@@ -394,9 +412,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -445,8 +464,23 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 CONFIG_NETDEVICES=y
@@ -480,6 +514,8 @@ CONFIG_ARCH_HAVE_NETDEV_STATISTICS=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -503,10 +539,6 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 CONFIG_SERIAL_NPOLLWAITERS=2
@@ -534,15 +566,18 @@ CONFIG_UART0_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -683,7 +718,9 @@ CONFIG_FS_FAT=y
 # CONFIG_FAT_LCNAMES is not set
 # CONFIG_FAT_LFN is not set
 # CONFIG_FS_FATTIME is not set
+# CONFIG_FAT_FORCE_INDIRECT is not set
 # CONFIG_FAT_DMAMEMORY is not set
+# CONFIG_FAT_DIRECT_RETRY is not set
 # CONFIG_NFS is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
@@ -692,11 +729,6 @@ CONFIG_FS_FAT=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -715,6 +747,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -760,6 +796,8 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 CONFIG_LIBC_NETDB=y
 # CONFIG_NETDB_HOSTFILE is not set
 CONFIG_NETDB_DNSCLIENT=y
@@ -767,12 +805,14 @@ CONFIG_NETDB_DNSCLIENT_ENTRIES=4
 CONFIG_NETDB_DNSCLIENT_NAMESIZE=32
 CONFIG_NETDB_DNSCLIENT_LIFESEC=3600
 CONFIG_NETDB_DNSCLIENT_MAXRESPONSE=96
+# CONFIG_NETDB_RESOLVCONF is not set
 CONFIG_NETDB_DNSSERVER_NOADDR=y
 # CONFIG_NETDB_DNSSERVER_IPv4 is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -793,18 +833,20 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Examples
 #
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
+# CONFIG_EXAMPLES_DISCOVER is not set
 # CONFIG_EXAMPLES_ELF is not set
 # CONFIG_EXAMPLES_FSTEST is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -814,18 +856,19 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -833,6 +876,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 CONFIG_EXAMPLES_TCPECHO=y
 CONFIG_EXAMPLES_TCPECHO_PORT=80
 CONFIG_EXAMPLES_TCPECHO_BACKLOG=8
@@ -847,17 +891,22 @@ CONFIG_EXAMPLES_TCPECHO_NETMASK=0xffffff00
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UDPBLASTER is not set
-# CONFIG_EXAMPLES_DISCOVER is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_WGET is not set
 # CONFIG_EXAMPLES_XMLRPC is not set
 
 #
 # File System Utilities
 #
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -870,8 +919,8 @@ CONFIG_EXAMPLES_TCPECHO_NETMASK=0xffffff00
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -881,24 +930,26 @@ CONFIG_EXAMPLES_TCPECHO_NETMASK=0xffffff00
 #
 # Network Utilities
 #
+# CONFIG_NETUTILS_CHAT is not set
 # CONFIG_NETUTILS_CODECS is not set
 CONFIG_NETUTILS_DHCPC=y
 # CONFIG_NETUTILS_DHCPD is not set
+# CONFIG_NETUTILS_DISCOVER is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
+CONFIG_NETUTILS_NETLIB=y
+# CONFIG_NETUTILS_NTPCLIENT is not set
+# CONFIG_NETUTILS_PPPD is not set
 # CONFIG_NETUTILS_SMTP is not set
 CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_TFTPC=y
-CONFIG_NETUTILS_NETLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 CONFIG_WEBCLIENT_TIMEOUT=10
 # CONFIG_NETUTILS_WEBSERVER is not set
-# CONFIG_NETUTILS_NTPCLIENT is not set
-# CONFIG_NETUTILS_DISCOVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
-# CONFIG_NETUTILS_PPPD is not set
 
 #
 # NSH Library
@@ -917,13 +968,12 @@ CONFIG_WEBCLIENT_TIMEOUT=10
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
@@ -931,5 +981,6 @@ CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/lm3s8962-ek/nsh/defconfig b/configs/lm3s8962-ek/nsh/defconfig
index a751de477d..6cf80ae026 100644
--- a/configs/lm3s8962-ek/nsh/defconfig
+++ b/configs/lm3s8962-ek/nsh/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -483,6 +484,8 @@ CONFIG_SPI_CALLBACK=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -510,6 +513,7 @@ CONFIG_SPI_CALLBACK=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -555,6 +559,8 @@ CONFIG_ARCH_HAVE_NETDEV_STATISTICS=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -604,15 +610,18 @@ CONFIG_UART0_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -764,11 +773,6 @@ CONFIG_FS_FAT=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -852,6 +856,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/lm3s8962-ek/nx/defconfig b/configs/lm3s8962-ek/nx/defconfig
index 3726d932ee..30bf76afc8 100644
--- a/configs/lm3s8962-ek/nx/defconfig
+++ b/configs/lm3s8962-ek/nx/defconfig
@@ -41,14 +41,16 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -79,6 +81,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 CONFIG_ARCH_CHIP_LM=y
@@ -96,7 +99,11 @@ CONFIG_ARCH_CHIP_LM=y
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -106,14 +113,25 @@ CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="tiva"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
 #
@@ -123,6 +141,7 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARW is not set
 # CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
 CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDW is not set
@@ -246,11 +265,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
 # CONFIG_ARCH_USE_MPU is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
@@ -307,6 +329,8 @@ CONFIG_ARCH_LEDS=y
 # Board-Specific Options
 #
 CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_RESET is not set
+# CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
 # CONFIG_BOARDCTL_ADCTEST is not set
 # CONFIG_BOARDCTL_PWMTEST is not set
@@ -346,6 +370,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nx_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -396,9 +421,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -429,14 +455,20 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 CONFIG_SPI=y
+# CONFIG_SPI_SLAVE is not set
 CONFIG_SPI_EXCHANGE=y
 CONFIG_SPI_CMDDATA=y
 # CONFIG_SPI_CALLBACK is not set
 # CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_HWFEATURES is not set
+# CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -450,10 +482,15 @@ CONFIG_SPI_CMDDATA=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 CONFIG_LCD=y
 
 #
-# Common LCD Settings
+# Common Graphic LCD Settings
 #
 # CONFIG_LCD_CONSOLE is not set
 # CONFIG_LCD_NOGETRUN is not set
@@ -474,6 +511,7 @@ CONFIG_P14201_FRAMEBUFFER=y
 # CONFIG_LCD_UG9664HSWAG01 is not set
 # CONFIG_LCD_UG2864HSWEG01 is not set
 # CONFIG_LCD_UG2832HSWEG04 is not set
+# CONFIG_LCD_SSD1351 is not set
 # CONFIG_LCD_ST7565 is not set
 # CONFIG_LCD_ST7567 is not set
 # CONFIG_LCD_UG2864AMBAG01 is not set
@@ -485,12 +523,17 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_LCD_RLANDSCAPE is not set
 # CONFIG_LCD_ILI9341 is not set
 # CONFIG_LCD_RA8875 is not set
+# CONFIG_SLCD is not set
 
 #
-# Alphanumeric/Segment LCD Devices
+# LED Support
 #
-# CONFIG_LCD_LCD1602 is not set
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -500,6 +543,8 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -523,14 +568,11 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -547,19 +589,23 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -590,11 +636,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -603,6 +644,7 @@ CONFIG_NX_LCDDRIVER=y
 CONFIG_NX_NPLANES=1
 CONFIG_NX_BGCOLOR=0x0
 # CONFIG_NX_WRITEONLY is not set
+# CONFIG_NX_UPDATE is not set
 
 #
 # Supported Pixel Depths
@@ -701,6 +743,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -741,10 +787,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -759,14 +809,13 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -774,12 +823,12 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_LCDRW is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -800,18 +849,19 @@ CONFIG_EXAMPLES_NX_BPP=4
 # CONFIG_EXAMPLES_NX_RAWWINDOWS is not set
 CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 CONFIG_EXAMPLES_NX_EXTERNINIT=y
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -819,14 +869,25 @@ CONFIG_EXAMPLES_NX_EXTERNINIT=y
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -838,26 +899,23 @@ CONFIG_EXAMPLES_NX_EXTERNINIT=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
@@ -875,15 +933,16 @@ CONFIG_EXAMPLES_NX_EXTERNINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+# CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
-# CONFIG_SYSTEM_POWEROFF is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/lm4f120-launchpad/nsh/defconfig b/configs/lm4f120-launchpad/nsh/defconfig
index 52b8f0257c..6d41ced7f3 100644
--- a/configs/lm4f120-launchpad/nsh/defconfig
+++ b/configs/lm4f120-launchpad/nsh/defconfig
@@ -17,6 +17,7 @@ CONFIG_HOST_LINUX=y
 # Build Configuration
 #
 # CONFIG_APPS_DIR="../apps"
+CONFIG_BUILD_FLAT=y
 # CONFIG_BUILD_2PASS is not set
 
 #
@@ -26,6 +27,7 @@ CONFIG_HOST_LINUX=y
 # CONFIG_INTELHEX_BINARY is not set
 # CONFIG_MOTOROLA_SREC is not set
 CONFIG_RAW_BINARY=y
+# CONFIG_UBOOT_UIMAGE is not set
 
 #
 # Customize Header Files
@@ -35,12 +37,15 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
+# CONFIG_STACK_COLORATION is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
@@ -70,11 +75,14 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_C5471 is not set
 # CONFIG_ARCH_CHIP_CALYPSO is not set
 # CONFIG_ARCH_CHIP_DM320 is not set
+# CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 CONFIG_ARCH_CHIP_LM=y
 # CONFIG_ARCH_CHIP_TIVA is not set
+# CONFIG_ARCH_CHIP_LPC11XX is not set
 # CONFIG_ARCH_CHIP_LPC17XX is not set
 # CONFIG_ARCH_CHIP_LPC214X is not set
 # CONFIG_ARCH_CHIP_LPC2378 is not set
@@ -83,35 +91,61 @@ CONFIG_ARCH_CHIP_LM=y
 # CONFIG_ARCH_CHIP_NUC1XX is not set
 # CONFIG_ARCH_CHIP_SAMA5 is not set
 # CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
 # CONFIG_ARCH_CHIP_SAM34 is not set
+# CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
 # CONFIG_ARCH_CORTEXM0 is not set
 # CONFIG_ARCH_CORTEXM3 is not set
 CONFIG_ARCH_CORTEXM4=y
+# CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="tiva"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
+# CONFIG_ARMV7M_LAZYFPU is not set
 CONFIG_ARCH_HAVE_FPU=y
+# CONFIG_ARCH_HAVE_DPFPU is not set
 # CONFIG_ARCH_FPU is not set
-CONFIG_ARCH_HAVE_MPU=y
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
 #
 # ARMV7M Configuration Options
 #
+# CONFIG_ARMV7M_HAVE_ICACHE is not set
+# CONFIG_ARMV7M_HAVE_DCACHE is not set
+# CONFIG_ARMV7M_HAVE_ITCM is not set
+# CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
 CONFIG_ARMV7M_OABI_TOOLCHAIN=y
+# CONFIG_ARMV7M_HAVE_STACKCHECK is not set
+# CONFIG_ARMV7M_ITMSYSLOG is not set
 
 #
 # Tiva/Stellaris Configuration Options
@@ -124,10 +158,49 @@ CONFIG_ARMV7M_OABI_TOOLCHAIN=y
 CONFIG_ARCH_CHIP_LM4F120=y
 CONFIG_ARCH_CHIP_LM4F=y
 # CONFIG_LM_REVA2 is not set
+# CONFIG_TIVA_BOARD_EARLYINIT is not set
 
 #
 # Tiva/Stellaris Peripheral Support
 #
+# CONFIG_TIVA_ADC is not set
+# CONFIG_TIVA_HAVE_ADC0 is not set
+# CONFIG_TIVA_HAVE_ADC1 is not set
+# CONFIG_TIVA_I2C is not set
+CONFIG_TIVA_HAVE_I2C1=y
+CONFIG_TIVA_HAVE_I2C2=y
+CONFIG_TIVA_HAVE_I2C3=y
+# CONFIG_TIVA_HAVE_I2C4 is not set
+# CONFIG_TIVA_HAVE_I2C5 is not set
+# CONFIG_TIVA_HAVE_I2C6 is not set
+# CONFIG_TIVA_HAVE_I2C7 is not set
+# CONFIG_TIVA_HAVE_I2C8 is not set
+# CONFIG_TIVA_HAVE_I2C9 is not set
+CONFIG_TIVA_HAVE_UART3=y
+CONFIG_TIVA_HAVE_UART4=y
+CONFIG_TIVA_HAVE_UART5=y
+CONFIG_TIVA_HAVE_UART6=y
+CONFIG_TIVA_HAVE_UART7=y
+CONFIG_TIVA_HAVE_SSI0=y
+CONFIG_TIVA_HAVE_SSI1=y
+CONFIG_TIVA_HAVE_SSI2=y
+CONFIG_TIVA_HAVE_SSI3=y
+# CONFIG_TIVA_HAVE_ETHERNET is not set
+CONFIG_TIVA_SSI=y
+# CONFIG_TIVA_TIMER is not set
+# CONFIG_TIVA_HAVE_TIMER0 is not set
+# CONFIG_TIVA_HAVE_TIMER1 is not set
+# CONFIG_TIVA_HAVE_TIMER2 is not set
+CONFIG_TIVA_HAVE_TIMER3=y
+CONFIG_TIVA_HAVE_TIMER4=y
+CONFIG_TIVA_HAVE_TIMER5=y
+# CONFIG_TIVA_HAVE_TIMER6 is not set
+# CONFIG_TIVA_HAVE_TIMER7 is not set
+# CONFIG_TIVA_ADC0 is not set
+# CONFIG_TIVA_I2C0 is not set
+# CONFIG_TIVA_I2C1 is not set
+# CONFIG_TIVA_I2C2 is not set
+# CONFIG_TIVA_I2C3 is not set
 CONFIG_TIVA_UART0=y
 # CONFIG_TIVA_UART1 is not set
 # CONFIG_TIVA_UART2 is not set
@@ -138,12 +211,35 @@ CONFIG_TIVA_UART0=y
 # CONFIG_TIVA_UART7 is not set
 CONFIG_TIVA_SSI0=y
 # CONFIG_TIVA_SSI1 is not set
-# CONFIG_TIVA_ETHERNET is not set
+# CONFIG_TIVA_SSI2 is not set
+# CONFIG_TIVA_SSI3 is not set
+# CONFIG_TIVA_TIMER3 is not set
+# CONFIG_TIVA_TIMER4 is not set
+# CONFIG_TIVA_TIMER5 is not set
 # CONFIG_TIVA_FLASH is not set
 
 #
-# Disable GPIO Interrupts
-#
+# Enable GPIO Interrupts
+#
+CONFIG_TIVA_GPIO_IRQS=y
+CONFIG_TIVA_HAVE_GPIOA_IRQS=y
+CONFIG_TIVA_HAVE_GPIOB_IRQS=y
+CONFIG_TIVA_HAVE_GPIOC_IRQS=y
+CONFIG_TIVA_HAVE_GPIOD_IRQS=y
+CONFIG_TIVA_HAVE_GPIOE_IRQS=y
+CONFIG_TIVA_HAVE_GPIOF_IRQS=y
+CONFIG_TIVA_HAVE_GPIOG_IRQS=y
+CONFIG_TIVA_HAVE_GPIOH_IRQS=y
+# CONFIG_TIVA_HAVE_GPIOJ_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOK_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOL_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOM_IRQS is not set
+# CONFIG_TIVA_HAVE_GPION_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOP_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOQ_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOR_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOS_IRQS is not set
+# CONFIG_TIVA_HAVE_GPIOT_IRQS is not set
 CONFIG_TIVA_GPIOA_IRQS=y
 CONFIG_TIVA_GPIOB_IRQS=y
 CONFIG_TIVA_GPIOC_IRQS=y
@@ -152,7 +248,6 @@ CONFIG_TIVA_GPIOE_IRQS=y
 CONFIG_TIVA_GPIOF_IRQS=y
 CONFIG_TIVA_GPIOG_IRQS=y
 # CONFIG_TIVA_GPIOH_IRQS is not set
-# CONFIG_TIVA_GPIOJ_IRQS is not set
 
 #
 # Tiva/Stellaris SSI Configuration
@@ -167,10 +262,19 @@ CONFIG_SSI_TXLIMIT=4
 # CONFIG_ARCH_VECNOTIRQ is not set
 # CONFIG_ARCH_DMA is not set
 CONFIG_ARCH_HAVE_IRQPRIO=y
-# CONFIG_ARCH_ADDRENV is not set
+# CONFIG_ARCH_L2CACHE is not set
+# CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
+# CONFIG_ARCH_HAVE_ADDRENV is not set
+# CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
+CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARCH_NAND_HWECC is not set
+# CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
+# CONFIG_ARCH_USE_MPU is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
@@ -229,39 +333,78 @@ CONFIG_NSH_MMCSDMINOR=0
 #
 # Board-Specific Options
 #
+# CONFIG_LIB_BOARDCTL is not set
 
 #
 # RTOS Features
 #
-# CONFIG_BOARD_INITIALIZE is not set
+CONFIG_DISABLE_OS_API=y
+# CONFIG_DISABLE_POSIX_TIMERS is not set
+# CONFIG_DISABLE_PTHREAD is not set
+# CONFIG_DISABLE_SIGNALS is not set
+# CONFIG_DISABLE_MQUEUE is not set
+# CONFIG_DISABLE_ENVIRON is not set
+
+#
+# Clocks and Timers
+#
 CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
-CONFIG_RR_INTERVAL=200
-# CONFIG_SCHED_CPULOAD is not set
-# CONFIG_SCHED_INSTRUMENTATION is not set
-CONFIG_TASK_NAME_SIZE=0
-# CONFIG_SCHED_HAVE_PARENT is not set
+# CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
 CONFIG_START_YEAR=2013
 CONFIG_START_MONTH=3
 CONFIG_START_DAY=24
-CONFIG_DEV_CONSOLE=y
+CONFIG_MAX_WDOGPARMS=2
+CONFIG_PREALLOC_WDOGS=4
+CONFIG_WDOG_INTRESERVE=0
+CONFIG_PREALLOC_TIMERS=4
+
+#
+# Tasks and Scheduling
+#
+# CONFIG_INIT_NONE is not set
+CONFIG_INIT_ENTRYPOINT=y
+# CONFIG_INIT_FILEPATH is not set
+CONFIG_USER_ENTRYPOINT="nsh_main"
+CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
+CONFIG_TASK_NAME_SIZE=0
+CONFIG_MAX_TASKS=16
+# CONFIG_SCHED_HAVE_PARENT is not set
+CONFIG_SCHED_WAITPID=y
+
+#
+# Pthread Options
+#
 # CONFIG_MUTEX_TYPES is not set
-# CONFIG_PRIORITY_INHERITANCE is not set
+CONFIG_NPTHREAD_KEYS=4
+
+#
+# Performance Monitoring
+#
+# CONFIG_SCHED_CPULOAD is not set
+# CONFIG_SCHED_INSTRUMENTATION is not set
+
+#
+# Files and I/O
+#
+CONFIG_DEV_CONSOLE=y
 # CONFIG_FDCLONE_DISABLE is not set
 # CONFIG_FDCLONE_STDIO is not set
 # CONFIG_SDCLONE_DISABLE is not set
-CONFIG_SCHED_WAITPID=y
+CONFIG_NFILE_DESCRIPTORS=8
+CONFIG_NFILE_STREAMS=8
+CONFIG_NAME_MAX=32
+# CONFIG_PRIORITY_INHERITANCE is not set
+
+#
+# RTOS hooks
+#
+# CONFIG_BOARD_INITIALIZE is not set
 # CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
-CONFIG_USER_ENTRYPOINT="nsh_main"
-CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_POSIX_TIMERS is not set
-# CONFIG_DISABLE_PTHREAD is not set
-# CONFIG_DISABLE_SIGNALS is not set
-# CONFIG_DISABLE_MQUEUE is not set
-# CONFIG_DISABLE_ENVIRON is not set
 
 #
 # Signal Numbers
@@ -272,19 +415,18 @@ CONFIG_SIG_SIGALARM=3
 CONFIG_SIG_SIGCONDTIMEDOUT=16
 
 #
-# Sizes of configurable things (0 disables)
+# POSIX Message Queue Options
 #
-CONFIG_MAX_TASKS=16
-CONFIG_NPTHREAD_KEYS=4
-CONFIG_NFILE_DESCRIPTORS=8
-CONFIG_NFILE_STREAMS=8
-CONFIG_NAME_MAX=32
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
-CONFIG_MAX_WDOGPARMS=2
-CONFIG_PREALLOC_WDOGS=4
-CONFIG_WDOG_INTRESERVE=0
-CONFIG_PREALLOC_TIMERS=4
+# CONFIG_MODULE is not set
+
+#
+# Work queue support
+#
+# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_SCHED_HPWORK is not set
+# CONFIG_SCHED_LPWORK is not set
 
 #
 # Stack and heap information
@@ -293,6 +435,7 @@ CONFIG_IDLETHREAD_STACKSIZE=1024
 CONFIG_USERMAIN_STACKSIZE=2048
 CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=2048
+# CONFIG_LIB_SYSCALL is not set
 
 #
 # Device Drivers
@@ -301,14 +444,26 @@ CONFIG_DISABLE_POLL=y
 CONFIG_DEV_NULL=y
 # CONFIG_DEV_ZERO is not set
 # CONFIG_DEV_LOOP is not set
+
+#
+# Buffering
+#
+# CONFIG_DRVR_WRITEBUFFER is not set
+# CONFIG_DRVR_READAHEAD is not set
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 # CONFIG_SPI is not set
 # CONFIG_I2S is not set
+
+#
+# Timer Driver Support
+#
+# CONFIG_TIMER is not set
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_ANALOG is not set
@@ -316,9 +471,25 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
+# CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
@@ -326,6 +497,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -348,13 +521,15 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART6_SERIALDRIVER is not set
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
+# CONFIG_OTHER_UART_SERIALDRIVER is not set
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
+# CONFIG_SERIAL_IFLOWCONTROL is not set
+# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
+# CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
+# CONFIG_OTHER_SERIAL_CONSOLE is not set
 # CONFIG_NO_SERIAL_CONSOLE is not set
 
 #
@@ -368,20 +543,23 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
-# CONFIG_SERIAL_IFLOWCONTROL is not set
-# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -390,6 +568,11 @@ CONFIG_UART0_2STOP=0
 # CONFIG_ARCH_HAVE_PHY is not set
 # CONFIG_NET is not set
 
+#
+# Crypto API
+#
+# CONFIG_CRYPTO is not set
+
 #
 # File Systems
 #
@@ -398,21 +581,21 @@ CONFIG_UART0_2STOP=0
 # File system configuration
 #
 # CONFIG_DISABLE_MOUNTPOINT is not set
+# CONFIG_FS_AUTOMOUNTER is not set
 # CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
 # CONFIG_FS_READABLE is not set
 # CONFIG_FS_WRITABLE is not set
+# CONFIG_FS_NAMED_SEMAPHORES is not set
+CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_RAMMAP is not set
 # CONFIG_FS_FAT is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_BINFS is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
-
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -433,7 +616,11 @@ CONFIG_MM_REGIONS=1
 # CONFIG_AUDIO is not set
 
 #
-# Binary Formats
+# Wireless Support
+#
+
+#
+# Binary Loader
 #
 # CONFIG_BINFMT_DISABLE is not set
 # CONFIG_BINFMT_EXEPATH is not set
@@ -458,6 +645,7 @@ CONFIG_LIB_HOMEDIR="/"
 # CONFIG_NOPRINTF_FIELDWIDTH is not set
 # CONFIG_LIBC_FLOATINGPOINT is not set
 CONFIG_LIBC_LONG_LONG=y
+# CONFIG_LIBC_IOCTL_VARIADIC is not set
 CONFIG_LIB_RAND_ORDER=1
 # CONFIG_EOL_IS_CR is not set
 # CONFIG_EOL_IS_LF is not set
@@ -469,14 +657,19 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
 # CONFIG_LIBC_STRERROR is not set
 # CONFIG_LIBC_PERROR_STDOUT is not set
 CONFIG_ARCH_LOWPUTC=y
+# CONFIG_LIBC_LOCALTIME is not set
+# CONFIG_TIME_EXTENDED is not set
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
-# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -495,23 +688,26 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 
+#
+# CAN Utilities
+#
+
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
+# CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
-# CONFIG_EXAMPLES_LCDRW is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -519,89 +715,106 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
-# CONFIG_EXAMPLES_PASHELLO is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
-# CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
+# CONFIG_EXAMPLES_SERIALBLASTER is not set
+# CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_UDP is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
 #
 # CONFIG_TIFF is not set
+# CONFIG_GRAPHICS_TRAVELER is not set
 
 #
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_MICROPYTHON is not set
 # CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
-# CONFIG_NETUTILS_DHCPD is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
-# CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_TFTPC is not set
-# CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_NETLIB is not set
-# CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
-# FreeModBus
+# NSH Library
 #
-# CONFIG_MODBUS is not set
+CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
-# NSH Library
+# Command Line Configuration
 #
-CONFIG_NSH_LIBRARY=y
 CONFIG_NSH_READLINE=y
 # CONFIG_NSH_CLE is not set
+CONFIG_NSH_LINELEN=64
+# CONFIG_NSH_DISABLE_SEMICOLON is not set
+CONFIG_NSH_CMDPARMS=y
+CONFIG_NSH_MAXARGUMENTS=6
+CONFIG_NSH_ARGCAT=y
+CONFIG_NSH_NESTDEPTH=3
+# CONFIG_NSH_DISABLEBG is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
 # CONFIG_NSH_DISABLE_CMP is not set
+CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_DD is not set
 # CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -610,8 +823,10 @@ CONFIG_NSH_BUILTIN_APPS=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 # CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -619,6 +834,7 @@ CONFIG_NSH_BUILTIN_APPS=y
 # CONFIG_NSH_DISABLE_MKRD is not set
 # CONFIG_NSH_DISABLE_MH is not set
 # CONFIG_NSH_DISABLE_MOUNT is not set
+# CONFIG_NSH_DISABLE_MV is not set
 # CONFIG_NSH_DISABLE_MW is not set
 # CONFIG_NSH_DISABLE_PS is not set
 # CONFIG_NSH_DISABLE_PUT is not set
@@ -628,8 +844,10 @@ CONFIG_NSH_BUILTIN_APPS=y
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
@@ -642,24 +860,22 @@ CONFIG_NSH_CMDOPT_DF_H=y
 CONFIG_NSH_CODECS_BUFSIZE=128
 CONFIG_NSH_CMDOPT_HEXDUMP=y
 CONFIG_NSH_FILEIOSIZE=512
-CONFIG_NSH_LINELEN=64
-# CONFIG_NSH_DISABLE_SEMICOLON is not set
-CONFIG_NSH_CMDPARMS=y
-CONFIG_NSH_TMPDIR="/tmp"
-CONFIG_NSH_MAXARGUMENTS=6
-CONFIG_NSH_ARGCAT=y
-CONFIG_NSH_NESTDEPTH=3
+
+#
+# Scripting Support
+#
 # CONFIG_NSH_DISABLESCRIPT is not set
 # CONFIG_NSH_DISABLE_ITEF is not set
 # CONFIG_NSH_DISABLE_LOOPS is not set
-# CONFIG_NSH_DISABLEBG is not set
-CONFIG_NSH_CONSOLE=y
 
 #
-# USB Trace Support
+# Console Configuration
 #
+CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -673,94 +889,19 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-
-#
-# USB CDC/ACM Device Commands
-#
-
-#
-# USB Composite Device Commands
-#
-
-#
-# Custom Free Memory Command
-#
+# CONFIG_SYSTEM_CLE is not set
+# CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-
-#
-# I2C tool
-#
-
-#
-# INI File Parser
-#
-# CONFIG_FSUTILS_INIFILE is not set
-
-#
-# FLASH Program Installation
-#
+# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
-
-#
-# FLASH Erase-all Command
-#
-
-#
-# NxPlayer media player library / command Line
-#
-# CONFIG_SYSTEM_NXPLAYER is not set
-
-#
-# RAM test
-#
 # CONFIG_SYSTEM_RAMTEST is not set
-
-#
-# readline()
-#
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
-
-#
-# Power Off
-#
-# CONFIG_SYSTEM_POWEROFF is not set
-
-#
-# RAMTRON
-#
-
-#
-# SD Card
-#
-
-#
-# Sysinfo
-#
-
-#
-# USB Monitor
-#
-
-#
-# EMACS-like Command Line Editor
-#
-# CONFIG_SYSTEM_CLE is not set
-
-#
-# VI Work-Alike Editor
-#
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
+# CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
-
-#
-# Stack Monitor
-#
-
-#
-# USB Mass Storage Device Commands
-#
-
-#
-# Zmodem Commands
-#
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/lpc4330-xplorer/nsh/defconfig b/configs/lpc4330-xplorer/nsh/defconfig
index d27d7cd0a3..045cd709d0 100644
--- a/configs/lpc4330-xplorer/nsh/defconfig
+++ b/configs/lpc4330-xplorer/nsh/defconfig
@@ -46,10 +46,11 @@ CONFIG_ARCH_STDARG_H=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -80,6 +81,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -98,6 +100,7 @@ CONFIG_ARCH_CHIP_LPC43XX=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -110,6 +113,7 @@ CONFIG_ARCH_CORTEXM4=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
 # CONFIG_ARCH_CORTEXR4 is not set
 # CONFIG_ARCH_CORTEXR4F is not set
 # CONFIG_ARCH_CORTEXR5 is not set
@@ -118,6 +122,8 @@ CONFIG_ARCH_CORTEXM4=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="lpc43xx"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 CONFIG_ARMV7M_CMNVECTOR=y
@@ -125,6 +131,7 @@ CONFIG_ARMV7M_CMNVECTOR=y
 CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARCH_HAVE_DPFPU is not set
 # CONFIG_ARCH_FPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
@@ -135,6 +142,7 @@ CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARW is not set
 # CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
 # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
 CONFIG_ARMV7M_TOOLCHAIN_CODEREDW=y
@@ -159,6 +167,7 @@ CONFIG_ARCH_CHIP_LPC4330FET100=y
 # CONFIG_ARCH_CHIP_LPC4330FET180 is not set
 # CONFIG_ARCH_CHIP_LPC4330FET256 is not set
 # CONFIG_ARCH_CHIP_LPC4337JBD144 is not set
+# CONFIG_ARCH_CHIP_LPC4337JET100 is not set
 # CONFIG_ARCH_CHIP_LPC4350FBD208 is not set
 # CONFIG_ARCH_CHIP_LPC4350FET180 is not set
 # CONFIG_ARCH_CHIP_LPC4350FET256 is not set
@@ -219,6 +228,7 @@ CONFIG_LPC43_USART0=y
 # CONFIG_LPC43_USB0 is not set
 # CONFIG_LPC43_USB1 is not set
 # CONFIG_LPC43_WWDT is not set
+# CONFIG_LPC43_GPIO_IRQ is not set
 
 #
 # RS-485 Configuration
@@ -452,13 +462,20 @@ CONFIG_DEV_NULL=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
 #
 # CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -470,6 +487,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -493,10 +512,6 @@ CONFIG_USART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 CONFIG_SERIAL_NPOLLWAITERS=2
@@ -524,15 +539,18 @@ CONFIG_USART0_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -566,7 +584,9 @@ CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
 CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_FATTIME is not set
+# CONFIG_FAT_FORCE_INDIRECT is not set
 # CONFIG_FAT_DMAMEMORY is not set
+# CONFIG_FAT_DIRECT_RETRY is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
 # CONFIG_FS_TMPFS is not set
@@ -574,11 +594,6 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -597,6 +612,10 @@ CONFIG_MM_REGIONS=2
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -642,12 +661,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 # CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -677,10 +699,10 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -689,18 +711,19 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -708,14 +731,15 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -723,6 +747,11 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_FSUTILS_PASSWD is not set
 
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
 #
 # Graphics Support
 #
@@ -734,8 +763,8 @@ CONFIG_EXAMPLES_NSH=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -747,6 +776,7 @@ CONFIG_EXAMPLES_NSH=y
 #
 # CONFIG_NETUTILS_CHAT is not set
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -859,12 +889,12 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -872,6 +902,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/lpc4337-ws/nsh/defconfig b/configs/lpc4337-ws/nsh/defconfig
index c11c4afae0..ebe47a6fc9 100644
--- a/configs/lpc4337-ws/nsh/defconfig
+++ b/configs/lpc4337-ws/nsh/defconfig
@@ -42,10 +42,11 @@ CONFIG_ARCH_STDARG_H=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -76,6 +77,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -94,6 +96,7 @@ CONFIG_ARCH_CHIP_LPC43XX=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -106,6 +109,7 @@ CONFIG_ARCH_CORTEXM4=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
 # CONFIG_ARCH_CORTEXR4 is not set
 # CONFIG_ARCH_CORTEXR4F is not set
 # CONFIG_ARCH_CORTEXR5 is not set
@@ -114,6 +118,8 @@ CONFIG_ARCH_CORTEXM4=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="lpc43xx"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 CONFIG_ARMV7M_CMNVECTOR=y
@@ -121,6 +127,7 @@ CONFIG_ARMV7M_CMNVECTOR=y
 CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARCH_HAVE_DPFPU is not set
 # CONFIG_ARCH_FPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
@@ -131,6 +138,7 @@ CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
@@ -151,6 +159,7 @@ CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y
 # CONFIG_ARCH_CHIP_LPC4330FET180 is not set
 # CONFIG_ARCH_CHIP_LPC4330FET256 is not set
 CONFIG_ARCH_CHIP_LPC4337JBD144=y
+# CONFIG_ARCH_CHIP_LPC4337JET100 is not set
 # CONFIG_ARCH_CHIP_LPC4350FBD208 is not set
 # CONFIG_ARCH_CHIP_LPC4350FET180 is not set
 # CONFIG_ARCH_CHIP_LPC4350FET256 is not set
@@ -185,7 +194,6 @@ CONFIG_LPC43_ADC0=y
 # CONFIG_LPC43_EVNTMNTR is not set
 # CONFIG_LPC43_GPDMA is not set
 CONFIG_LPC43_I2C0=y
-# CONFIG_LPC43_I2C0_SUPERFAST is not set
 # CONFIG_LPC43_I2C1 is not set
 # CONFIG_LPC43_I2S0 is not set
 # CONFIG_LPC43_I2S1 is not set
@@ -212,6 +220,23 @@ CONFIG_LPC43_USART2=y
 CONFIG_LPC43_USB0=y
 # CONFIG_LPC43_USB1 is not set
 # CONFIG_LPC43_WWDT is not set
+# CONFIG_LPC43_GPIO_IRQ is not set
+
+#
+# RS-485 Configuration
+#
+# CONFIG_USART2_RS485MODE is not set
+# CONFIG_USART2_RS485_DTRDIR is not set
+
+#
+# I2C Configution
+#
+# CONFIG_LPC43_I2C0_SUPERFAST is not set
+
+#
+# USB device controller driver (DCD) options
+#
+# CONFIG_LPC43_USB0DEV_NOVBUS is not set
 
 #
 # Architecture Options
@@ -224,6 +249,7 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 CONFIG_ARCH_HAVE_MPU=y
@@ -424,12 +450,17 @@ CONFIG_I2C=y
 # CONFIG_I2C_SLAVE is not set
 # CONFIG_I2C_POLLED is not set
 # CONFIG_I2C_TRACE is not set
+CONFIG_I2C_DRIVER=y
 CONFIG_SPI=y
 # CONFIG_SPI_SLAVE is not set
 CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_CMDDATA is not set
 # CONFIG_SPI_CALLBACK is not set
 # CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_HWFEATURES is not set
+# CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -442,6 +473,7 @@ CONFIG_SPI_EXCHANGE=y
 CONFIG_ANALOG=y
 CONFIG_ADC=y
 CONFIG_ADC_FIFOSIZE=8
+# CONFIG_ADC_ADS1242 is not set
 # CONFIG_ADC_ADS125X is not set
 # CONFIG_ADC_PGA11X is not set
 # CONFIG_DAC is not set
@@ -450,13 +482,21 @@ CONFIG_ADC_FIFOSIZE=8
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
 #
+# CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -467,6 +507,7 @@ CONFIG_ADC_FIFOSIZE=8
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
 CONFIG_SERIAL_REMOVABLE=y
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -490,10 +531,6 @@ CONFIG_USART2_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 CONFIG_SERIAL_NPOLLWAITERS=2
@@ -548,8 +585,8 @@ CONFIG_CDCACM_EPBULKOUT_HSSIZE=512
 CONFIG_CDCACM_EPBULKIN=2
 CONFIG_CDCACM_EPBULKIN_FSSIZE=64
 CONFIG_CDCACM_EPBULKIN_HSSIZE=512
-CONFIG_CDCACM_NWRREQS=4
 CONFIG_CDCACM_NRDREQS=4
+CONFIG_CDCACM_NWRREQS=4
 CONFIG_CDCACM_BULKIN_REQLEN=96
 CONFIG_CDCACM_RXBUFSIZE=512
 CONFIG_CDCACM_TXBUFSIZE=2048
@@ -561,15 +598,18 @@ CONFIG_CDCACM_PRODUCTSTR="lpc4337-ws"
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -603,7 +643,9 @@ CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
 CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_FATTIME is not set
+# CONFIG_FAT_FORCE_INDIRECT is not set
 # CONFIG_FAT_DMAMEMORY is not set
+# CONFIG_FAT_DIRECT_RETRY is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
 # CONFIG_FS_TMPFS is not set
@@ -612,11 +654,6 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -635,6 +672,10 @@ CONFIG_MM_REGIONS=2
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -680,12 +721,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 # CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -712,6 +756,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # Examples
 #
 # CONFIG_EXAMPLES_ADC is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -720,10 +765,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -732,38 +777,46 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -776,8 +829,8 @@ CONFIG_EXAMPLES_NSH=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -787,7 +840,9 @@ CONFIG_EXAMPLES_NSH=y
 #
 # Network Utilities
 #
+# CONFIG_NETUTILS_CHAT is not set
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -796,6 +851,7 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -886,6 +942,8 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_USBCONSOLE is not set
 # CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -899,11 +957,13 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
+CONFIG_SYSTEM_CDCACM=y
+CONFIG_SYSTEM_CDCACM_DEVMINOR=0
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=0
 CONFIG_I2CTOOL_MAXBUS=1
@@ -911,8 +971,7 @@ CONFIG_I2CTOOL_MINADDR=0x03
 CONFIG_I2CTOOL_MAXADDR=0x77
 CONFIG_I2CTOOL_MAXREGADDR=0xff
 CONFIG_I2CTOOL_DEFFREQ=100000
-# CONFIG_FSUTILS_INIFILE is not set
-# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -920,7 +979,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
-CONFIG_SYSTEM_CDCACM=y
-CONFIG_SYSTEM_CDCACM_DEVMINOR=0
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/lpc4357-evb/nsh/defconfig b/configs/lpc4357-evb/nsh/defconfig
index fabc0b794d..a94de720c8 100644
--- a/configs/lpc4357-evb/nsh/defconfig
+++ b/configs/lpc4357-evb/nsh/defconfig
@@ -37,12 +37,15 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 CONFIG_ARCH_STDARG_H=y
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
+# CONFIG_STACK_COLORATION is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
@@ -74,10 +77,12 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
 # CONFIG_ARCH_CHIP_TIVA is not set
+# CONFIG_ARCH_CHIP_LPC11XX is not set
 # CONFIG_ARCH_CHIP_LPC17XX is not set
 # CONFIG_ARCH_CHIP_LPC214X is not set
 # CONFIG_ARCH_CHIP_LPC2378 is not set
@@ -86,34 +91,61 @@ CONFIG_ARCH_CHIP_LPC43XX=y
 # CONFIG_ARCH_CHIP_NUC1XX is not set
 # CONFIG_ARCH_CHIP_SAMA5 is not set
 # CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
 # CONFIG_ARCH_CHIP_SAM34 is not set
+# CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
 # CONFIG_ARCH_CORTEXM0 is not set
 # CONFIG_ARCH_CORTEXM3 is not set
 CONFIG_ARCH_CORTEXM4=y
+# CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="lpc43xx"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 CONFIG_ARMV7M_CMNVECTOR=y
+# CONFIG_ARMV7M_LAZYFPU is not set
 CONFIG_ARCH_HAVE_FPU=y
+# CONFIG_ARCH_HAVE_DPFPU is not set
 # CONFIG_ARCH_FPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
 #
 # ARMV7M Configuration Options
 #
+# CONFIG_ARMV7M_HAVE_ICACHE is not set
+# CONFIG_ARMV7M_HAVE_DCACHE is not set
+# CONFIG_ARMV7M_HAVE_ITCM is not set
+# CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
 CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y
+# CONFIG_ARMV7M_HAVE_STACKCHECK is not set
 # CONFIG_ARMV7M_ITMSYSLOG is not set
+# CONFIG_SERIAL_TERMIOS is not set
 
 #
 # LPC43xx Configuration Options
@@ -126,6 +158,8 @@ CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y
 # CONFIG_ARCH_CHIP_LPC4330FET100 is not set
 # CONFIG_ARCH_CHIP_LPC4330FET180 is not set
 # CONFIG_ARCH_CHIP_LPC4330FET256 is not set
+# CONFIG_ARCH_CHIP_LPC4337JBD144 is not set
+# CONFIG_ARCH_CHIP_LPC4337JET100 is not set
 # CONFIG_ARCH_CHIP_LPC4350FBD208 is not set
 # CONFIG_ARCH_CHIP_LPC4350FET180 is not set
 # CONFIG_ARCH_CHIP_LPC4350FET256 is not set
@@ -135,6 +169,7 @@ CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y
 # CONFIG_ARCH_CHIP_LPC4357FET180 is not set
 # CONFIG_ARCH_CHIP_LPC4357FBD208 is not set
 CONFIG_ARCH_CHIP_LPC4357FET256=y
+# CONFIG_ARCH_CHIP_LPC4370FET100 is not set
 CONFIG_ARCH_FAMILY_LPC4357=y
 # CONFIG_LPC43_BOOT_SRAM is not set
 # CONFIG_LPC43_BOOT_SPIFI is not set
@@ -181,9 +216,17 @@ CONFIG_LPC43_USART0=y
 # CONFIG_LPC43_UART1 is not set
 # CONFIG_LPC43_USART2 is not set
 # CONFIG_LPC43_USART3 is not set
+# CONFIG_LPC43_USBOTG is not set
 # CONFIG_LPC43_USB0 is not set
 # CONFIG_LPC43_USB1 is not set
 # CONFIG_LPC43_WWDT is not set
+# CONFIG_LPC43_GPIO_IRQ is not set
+
+#
+# RS-485 Configuration
+#
+# CONFIG_USART0_RS485MODE is not set
+# CONFIG_USART0_RS485_DTRDIR is not set
 
 #
 # Architecture Options
@@ -196,11 +239,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
 # CONFIG_ARCH_USE_MPU is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
@@ -260,6 +306,14 @@ CONFIG_NSH_MMCSDMINOR=0
 #
 # Board-Specific Options
 #
+CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_RESET is not set
+# CONFIG_BOARDCTL_UNIQUEID is not set
+# CONFIG_BOARDCTL_TSCTEST is not set
+# CONFIG_BOARDCTL_ADCTEST is not set
+# CONFIG_BOARDCTL_PWMTEST is not set
+# CONFIG_BOARDCTL_GRAPHICS is not set
+# CONFIG_BOARDCTL_IOCTL is not set
 
 #
 # RTOS Features
@@ -296,6 +350,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -346,9 +401,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -379,22 +435,43 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 # CONFIG_SPI is not set
 # CONFIG_I2S is not set
+
+#
+# Timer Driver Support
+#
+# CONFIG_TIMER is not set
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
-# CONFIG_TIMER is not set
 # CONFIG_ANALOG is not set
 # CONFIG_AUDIO_DEVICES is not set
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
+# CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
@@ -402,6 +479,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -425,15 +504,13 @@ CONFIG_USART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 CONFIG_SERIAL_NPOLLWAITERS=2
+# CONFIG_SERIAL_IFLOWCONTROL is not set
+# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
-# CONFIG_SERIAL_TERMIOS is not set
 CONFIG_USART0_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
 # CONFIG_NO_SERIAL_CONSOLE is not set
@@ -449,20 +526,23 @@ CONFIG_USART0_PARITY=0
 CONFIG_USART0_2STOP=0
 # CONFIG_USART0_IFLOWCONTROL is not set
 # CONFIG_USART0_OFLOWCONTROL is not set
-# CONFIG_SERIAL_IFLOWCONTROL is not set
-# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_USART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -496,16 +576,15 @@ CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
 CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_FATTIME is not set
+# CONFIG_FAT_FORCE_INDIRECT is not set
 # CONFIG_FAT_DMAMEMORY is not set
+# CONFIG_FAT_DIRECT_RETRY is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -525,6 +604,10 @@ CONFIG_MM_REGIONS=2
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -551,6 +634,7 @@ CONFIG_LIB_HOMEDIR="/"
 # CONFIG_NOPRINTF_FIELDWIDTH is not set
 # CONFIG_LIBC_FLOATINGPOINT is not set
 CONFIG_LIBC_LONG_LONG=y
+# CONFIG_LIBC_IOCTL_VARIADIC is not set
 CONFIG_LIB_RAND_ORDER=1
 # CONFIG_EOL_IS_CR is not set
 # CONFIG_EOL_IS_LF is not set
@@ -565,13 +649,19 @@ CONFIG_LIBC_TMPDIR="/tmp"
 CONFIG_LIBC_MAX_TMPFILE=32
 CONFIG_ARCH_LOWPUTC=y
 # CONFIG_LIBC_LOCALTIME is not set
+# CONFIG_TIME_EXTENDED is not set
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -586,26 +676,26 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FSTEST is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -613,76 +703,81 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
-# CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_UDP is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
 #
 # CONFIG_TIFF is not set
+# CONFIG_GRAPHICS_TRAVELER is not set
 
 #
 # Interpreters
 #
-# CONFIG_INTERPRETERS_FICL is not set
 # CONFIG_INTERPRETERS_BAS is not set
+# CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_MICROPYTHON is not set
 # CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
+# CONFIG_NETUTILS_CHAT is not set
 # CONFIG_NETUTILS_CODECS is not set
-# CONFIG_NETUTILS_DHCPD is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
-# CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_TFTPC is not set
-# CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_NETLIB is not set
-# CONFIG_NETUTILS_WEBCLIENT is not set
-
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
 
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -701,13 +796,16 @@ CONFIG_NSH_NESTDEPTH=3
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
 # CONFIG_NSH_DISABLE_CMP is not set
+CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_DD is not set
 # CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -716,8 +814,10 @@ CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 # CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -726,6 +826,7 @@ CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLE_MKRD is not set
 # CONFIG_NSH_DISABLE_MH is not set
 # CONFIG_NSH_DISABLE_MOUNT is not set
+# CONFIG_NSH_DISABLE_MV is not set
 # CONFIG_NSH_DISABLE_MW is not set
 # CONFIG_NSH_DISABLE_PS is not set
 # CONFIG_NSH_DISABLE_PUT is not set
@@ -735,8 +836,10 @@ CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
@@ -763,7 +866,8 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
-CONFIG_LIB_BOARDCTL=y
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -777,111 +881,19 @@ CONFIG_LIB_BOARDCTL=y
 #
 # System Libraries and NSH Add-Ons
 #
-
-#
-# Custom Free Memory Command
-#
-# CONFIG_SYSTEM_FREE is not set
-
-#
-# EMACS-like Command Line Editor
-#
 # CONFIG_SYSTEM_CLE is not set
-
-#
-# FLASH Program Installation
-#
-# CONFIG_SYSTEM_INSTALL is not set
-
-#
-# FLASH Erase-all Command
-#
-
-#
-# Intel HEX to binary conversion
-#
+# CONFIG_SYSTEM_CUTERM is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-
-#
-# I2C tool
-#
-
-#
-# INI File Parser
-#
-# CONFIG_FSUTILS_INIFILE is not set
-
-#
-# NxPlayer media player library / command Line
-#
-
-#
-# RAM test
-#
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
-
-#
-# readline()
-#
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
-
-#
-# P-Code Support
-#
-
-#
-# PHY Tool
-#
-
-#
-# Power Off
-#
-# CONFIG_SYSTEM_POWEROFF is not set
-
-#
-# RAMTRON
-#
-
-#
-# SD Card
-#
-
-#
-# Sudoku
-#
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-
-#
-# Sysinfo
-#
-
-#
-# VI Work-Alike Editor
-#
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
-
-#
-# Stack Monitor
-#
-
-#
-# USB CDC/ACM Device Commands
-#
-
-#
-# USB Composite Device Commands
-#
-
-#
-# USB Mass Storage Device Commands
-#
-
-#
-# USB Monitor
-#
-
-#
-# Zmodem Commands
-#
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/lpc4370-link2/nsh/defconfig b/configs/lpc4370-link2/nsh/defconfig
index 34ae243ed8..96822e9ab2 100644
--- a/configs/lpc4370-link2/nsh/defconfig
+++ b/configs/lpc4370-link2/nsh/defconfig
@@ -42,10 +42,11 @@ CONFIG_ARCH_STDARG_H=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -76,6 +77,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -94,6 +96,7 @@ CONFIG_ARCH_CHIP_LPC43XX=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -106,6 +109,7 @@ CONFIG_ARCH_CORTEXM4=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
 # CONFIG_ARCH_CORTEXR4 is not set
 # CONFIG_ARCH_CORTEXR4F is not set
 # CONFIG_ARCH_CORTEXR5 is not set
@@ -114,6 +118,8 @@ CONFIG_ARCH_CORTEXM4=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="lpc43xx"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 CONFIG_ARMV7M_CMNVECTOR=y
@@ -121,6 +127,7 @@ CONFIG_ARMV7M_CMNVECTOR=y
 CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARCH_HAVE_DPFPU is not set
 # CONFIG_ARCH_FPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
@@ -131,6 +138,7 @@ CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
@@ -151,6 +159,7 @@ CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y
 # CONFIG_ARCH_CHIP_LPC4330FET180 is not set
 # CONFIG_ARCH_CHIP_LPC4330FET256 is not set
 # CONFIG_ARCH_CHIP_LPC4337JBD144 is not set
+# CONFIG_ARCH_CHIP_LPC4337JET100 is not set
 # CONFIG_ARCH_CHIP_LPC4350FBD208 is not set
 # CONFIG_ARCH_CHIP_LPC4350FET180 is not set
 # CONFIG_ARCH_CHIP_LPC4350FET256 is not set
@@ -185,7 +194,6 @@ CONFIG_LPC43_BOOT_SPIFI=y
 # CONFIG_LPC43_EVNTMNTR is not set
 # CONFIG_LPC43_GPDMA is not set
 CONFIG_LPC43_I2C0=y
-# CONFIG_LPC43_I2C0_SUPERFAST is not set
 # CONFIG_LPC43_I2C1 is not set
 # CONFIG_LPC43_I2S0 is not set
 # CONFIG_LPC43_I2S1 is not set
@@ -212,6 +220,23 @@ CONFIG_LPC43_USART2=y
 CONFIG_LPC43_USB0=y
 # CONFIG_LPC43_USB1 is not set
 # CONFIG_LPC43_WWDT is not set
+# CONFIG_LPC43_GPIO_IRQ is not set
+
+#
+# RS-485 Configuration
+#
+# CONFIG_USART2_RS485MODE is not set
+# CONFIG_USART2_RS485_DTRDIR is not set
+
+#
+# I2C Configution
+#
+# CONFIG_LPC43_I2C0_SUPERFAST is not set
+
+#
+# USB device controller driver (DCD) options
+#
+# CONFIG_LPC43_USB0DEV_NOVBUS is not set
 
 #
 # Architecture Options
@@ -224,6 +249,7 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 CONFIG_ARCH_HAVE_MPU=y
@@ -426,12 +452,17 @@ CONFIG_I2C=y
 # CONFIG_I2C_SLAVE is not set
 # CONFIG_I2C_POLLED is not set
 # CONFIG_I2C_TRACE is not set
+CONFIG_I2C_DRIVER=y
 CONFIG_SPI=y
 # CONFIG_SPI_SLAVE is not set
 # CONFIG_SPI_EXCHANGE is not set
 # CONFIG_SPI_CMDDATA is not set
 # CONFIG_SPI_CALLBACK is not set
 # CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_HWFEATURES is not set
+# CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -447,14 +478,22 @@ CONFIG_SPI=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
 #
 # CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -465,6 +504,7 @@ CONFIG_SPI=y
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
 CONFIG_SERIAL_REMOVABLE=y
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -488,10 +528,6 @@ CONFIG_USART2_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 CONFIG_SERIAL_NPOLLWAITERS=2
@@ -546,8 +582,8 @@ CONFIG_CDCACM_EPBULKOUT_HSSIZE=512
 CONFIG_CDCACM_EPBULKIN=2
 CONFIG_CDCACM_EPBULKIN_FSSIZE=64
 CONFIG_CDCACM_EPBULKIN_HSSIZE=512
-CONFIG_CDCACM_NWRREQS=4
 CONFIG_CDCACM_NRDREQS=4
+CONFIG_CDCACM_NWRREQS=4
 CONFIG_CDCACM_BULKIN_REQLEN=96
 CONFIG_CDCACM_RXBUFSIZE=512
 CONFIG_CDCACM_TXBUFSIZE=2048
@@ -559,15 +595,18 @@ CONFIG_CDCACM_PRODUCTSTR="lpc4370-link2"
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -601,7 +640,9 @@ CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
 CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_FATTIME is not set
+# CONFIG_FAT_FORCE_INDIRECT is not set
 # CONFIG_FAT_DMAMEMORY is not set
+# CONFIG_FAT_DIRECT_RETRY is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
 # CONFIG_FS_TMPFS is not set
@@ -610,11 +651,6 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -633,6 +669,10 @@ CONFIG_MM_REGIONS=2
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -678,12 +718,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 # CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -709,6 +752,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 #
 # Examples
 #
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -717,10 +761,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -729,38 +773,46 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -773,8 +825,8 @@ CONFIG_EXAMPLES_NSH=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -784,7 +836,9 @@ CONFIG_EXAMPLES_NSH=y
 #
 # Network Utilities
 #
+# CONFIG_NETUTILS_CHAT is not set
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -793,6 +847,7 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -883,6 +938,8 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_USBCONSOLE is not set
 # CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -896,11 +953,13 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
+CONFIG_SYSTEM_CDCACM=y
+CONFIG_SYSTEM_CDCACM_DEVMINOR=0
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=0
 CONFIG_I2CTOOL_MAXBUS=1
@@ -908,8 +967,7 @@ CONFIG_I2CTOOL_MINADDR=0x03
 CONFIG_I2CTOOL_MAXADDR=0x77
 CONFIG_I2CTOOL_MAXREGADDR=0xff
 CONFIG_I2CTOOL_DEFFREQ=100000
-# CONFIG_FSUTILS_INIFILE is not set
-# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -917,7 +975,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
-CONFIG_SYSTEM_CDCACM=y
-CONFIG_SYSTEM_CDCACM_DEVMINOR=0
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/lpcxpresso-lpc1115/minnsh/defconfig b/configs/lpcxpresso-lpc1115/minnsh/defconfig
index 43b4aa9e6a..6a1ef9c5e3 100644
--- a/configs/lpcxpresso-lpc1115/minnsh/defconfig
+++ b/configs/lpcxpresso-lpc1115/minnsh/defconfig
@@ -42,10 +42,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+# CONFIG_DEBUG_ALERT is not set
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -76,6 +77,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -94,6 +96,7 @@ CONFIG_ARCH_CHIP_LPC11XX=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -106,6 +109,7 @@ CONFIG_ARCH_CORTEXM0=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
 # CONFIG_ARCH_CORTEXR4 is not set
 # CONFIG_ARCH_CORTEXR4F is not set
 # CONFIG_ARCH_CORTEXR5 is not set
@@ -114,11 +118,14 @@ CONFIG_ARCH_CORTEXM0=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv6-m"
 CONFIG_ARCH_CHIP="lpc11xx"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 
 #
@@ -173,6 +180,7 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
@@ -349,13 +357,20 @@ CONFIG_DISABLE_POLL=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
 #
 # CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -366,6 +381,8 @@ CONFIG_DISABLE_POLL=y
 # CONFIG_SENSORS is not set
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -389,10 +406,6 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 # CONFIG_STANDARD_SERIAL is not set
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -419,14 +432,17 @@ CONFIG_UART0_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_NONE=y
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -456,11 +472,6 @@ CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -479,6 +490,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -519,11 +534,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -552,10 +570,10 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -564,18 +582,19 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -583,20 +602,25 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
 # CONFIG_FSUTILS_INIFILE is not set
 
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
 #
 # Graphics Support
 #
@@ -607,8 +631,8 @@ CONFIG_EXAMPLES_NSH=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -619,6 +643,7 @@ CONFIG_EXAMPLES_NSH=y
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -726,12 +751,12 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -739,5 +764,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/lpcxpresso-lpc1115/nsh/defconfig b/configs/lpcxpresso-lpc1115/nsh/defconfig
index b684acd779..26382b3c07 100644
--- a/configs/lpcxpresso-lpc1115/nsh/defconfig
+++ b/configs/lpcxpresso-lpc1115/nsh/defconfig
@@ -42,10 +42,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -76,6 +77,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -94,6 +96,7 @@ CONFIG_ARCH_CHIP_LPC11XX=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -106,6 +109,7 @@ CONFIG_ARCH_CORTEXM0=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
 # CONFIG_ARCH_CORTEXR4 is not set
 # CONFIG_ARCH_CORTEXR4F is not set
 # CONFIG_ARCH_CORTEXR5 is not set
@@ -114,11 +118,14 @@ CONFIG_ARCH_CORTEXM0=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv6-m"
 CONFIG_ARCH_CHIP="lpc11xx"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 
 #
@@ -173,6 +180,7 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
@@ -366,13 +374,20 @@ CONFIG_DEV_NULL=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
 #
 # CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -384,6 +399,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -407,10 +424,6 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -437,15 +450,18 @@ CONFIG_UART0_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -476,11 +492,6 @@ CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -499,6 +510,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -539,11 +554,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -577,10 +595,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -589,39 +607,45 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
 # CONFIG_FSUTILS_INIFILE is not set
 
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
 #
 # Graphics Support
 #
@@ -632,8 +656,8 @@ CONFIG_EXAMPLES_NSH=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -644,6 +668,7 @@ CONFIG_EXAMPLES_NSH=y
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -753,12 +778,12 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -766,5 +791,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/lpcxpresso-lpc1768/dhcpd/defconfig b/configs/lpcxpresso-lpc1768/dhcpd/defconfig
index f88c0eaa4f..1ab45ab5e9 100644
--- a/configs/lpcxpresso-lpc1768/dhcpd/defconfig
+++ b/configs/lpcxpresso-lpc1768/dhcpd/defconfig
@@ -37,14 +37,16 @@ CONFIG_INTELHEX_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,6 +77,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -92,7 +95,11 @@ CONFIG_ARCH_CHIP_LPC17XX=y
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -102,14 +109,25 @@ CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="lpc17xx"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
 #
@@ -119,6 +137,7 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
 CONFIG_ARMV7M_TOOLCHAIN_CODEREDL=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
@@ -223,11 +242,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
 # CONFIG_ARCH_USE_MPU is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
@@ -272,6 +294,7 @@ CONFIG_RAM_SIZE=32768
 #
 CONFIG_ARCH_BOARD_LPCXPRESSO=y
 # CONFIG_ARCH_BOARD_MBED is not set
+# CONFIG_ARCH_BOARD_U_BLOX_C027 is not set
 # CONFIG_ARCH_BOARD_ZKITARM is not set
 # CONFIG_ARCH_BOARD_CUSTOM is not set
 CONFIG_ARCH_BOARD="lpcxpresso-lpc1768"
@@ -320,6 +343,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="dhcpd_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=8
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -350,6 +374,7 @@ CONFIG_NAME_MAX=32
 # CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
+# CONFIG_SIG_EVTHREAD is not set
 
 #
 # Signal Numbers
@@ -358,9 +383,10 @@ CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
 CONFIG_SIG_SIGWORK=17
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 CONFIG_SCHED_WORKQUEUE=y
 CONFIG_SCHED_HPWORK=y
@@ -394,6 +420,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -411,8 +438,23 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 CONFIG_NETDEVICES=y
@@ -420,7 +462,10 @@ CONFIG_NETDEVICES=y
 #
 # General Ethernet MAC Driver Options
 #
+# CONFIG_NETDEV_LOOPBACK is not set
 # CONFIG_NETDEV_MULTINIC is not set
+CONFIG_ARCH_HAVE_NETDEV_STATISTICS=y
+# CONFIG_NETDEV_LATEINIT is not set
 
 #
 # External Ethernet MAC Device Support
@@ -430,6 +475,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_ENCX24J600 is not set
 # CONFIG_NET_E1000 is not set
 # CONFIG_NET_SLIP is not set
+# CONFIG_NET_FTMAC100 is not set
 # CONFIG_NET_VNET is not set
 
 #
@@ -448,6 +494,7 @@ CONFIG_NETDEVICES=y
 CONFIG_ETH0_PHY_LAN8720=y
 # CONFIG_ETH0_PHY_LAN8740 is not set
 # CONFIG_ETH0_PHY_LAN8740A is not set
+# CONFIG_ETH0_PHY_LAN8742A is not set
 # CONFIG_ETH0_PHY_DM9161 is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
@@ -456,6 +503,8 @@ CONFIG_ETH0_PHY_LAN8720=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -479,14 +528,11 @@ CONFIG_UART3_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_UART3_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -503,19 +549,23 @@ CONFIG_UART3_PARITY=0
 CONFIG_UART3_2STOP=0
 # CONFIG_UART3_IFLOWCONTROL is not set
 # CONFIG_UART3_OFLOWCONTROL is not set
+# CONFIG_UART3_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -538,6 +588,7 @@ CONFIG_NET_GUARDSIZE=2
 #
 # CONFIG_NET_MULTILINK is not set
 CONFIG_NET_ETHERNET=y
+# CONFIG_NET_LOOPBACK is not set
 # CONFIG_NET_TUN is not set
 
 #
@@ -619,6 +670,7 @@ CONFIG_IOB_NCHAINS=8
 # Routing Table Configuration
 #
 # CONFIG_NET_ROUTE is not set
+CONFIG_NET_HOSTNAME=""
 
 #
 # Crypto API
@@ -641,11 +693,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -664,6 +711,10 @@ CONFIG_MM_REGIONS=2
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -704,10 +755,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_DNSCLIENT is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -722,14 +778,13 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 CONFIG_EXAMPLES_DHCPD=y
@@ -737,15 +792,16 @@ CONFIG_EXAMPLES_DHCPD_NOMAC=y
 CONFIG_EXAMPLES_DHCPD_IPADDR=0x0a000001
 CONFIG_EXAMPLES_DHCPD_DRIPADDR=0x0a000001
 CONFIG_EXAMPLES_DHCPD_NETMASK=0xffffff00
+# CONFIG_EXAMPLES_DISCOVER is not set
 # CONFIG_EXAMPLES_ELF is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -753,18 +809,19 @@ CONFIG_EXAMPLES_DHCPD_NETMASK=0xffffff00
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -772,16 +829,26 @@ CONFIG_EXAMPLES_DHCPD_NETMASK=0xffffff00
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
 # CONFIG_EXAMPLES_UDP is not set
-# CONFIG_EXAMPLES_DISCOVER is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
+# CONFIG_EXAMPLES_UDPBLASTER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -793,15 +860,16 @@ CONFIG_EXAMPLES_DHCPD_NETMASK=0xffffff00
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
 # CONFIG_NETUTILS_DHCPC is not set
@@ -818,20 +886,15 @@ CONFIG_NETUTILS_DHCPD_NETMASK=0xffffff00
 CONFIG_NETUTILS_DHCPD_DNSIP=0x08080808
 CONFIG_NETUTILS_DHCPD_OFFERTIME=3600
 CONFIG_NETUTILS_DHCPD_DECLINETIME=3600
+# CONFIG_NETUTILS_DISCOVER is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETDB_DNSCLIENT is not set
-# CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_TFTPC is not set
 CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_NTPCLIENT is not set
-# CONFIG_NETUTILS_DISCOVER is not set
 # CONFIG_NETUTILS_PPPD is not set
-
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
+# CONFIG_NETUTILS_SMTP is not set
+# CONFIG_NETUTILS_TFTPC is not set
 
 #
 # NSH Library
@@ -850,15 +913,16 @@ CONFIG_NETUTILS_NETLIB=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+# CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
-# CONFIG_SYSTEM_POWEROFF is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/lpcxpresso-lpc1768/nsh/defconfig b/configs/lpcxpresso-lpc1768/nsh/defconfig
index 345c2275b8..d50765a428 100644
--- a/configs/lpcxpresso-lpc1768/nsh/defconfig
+++ b/configs/lpcxpresso-lpc1768/nsh/defconfig
@@ -42,10 +42,11 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -454,6 +455,8 @@ CONFIG_SPI=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -481,6 +484,7 @@ CONFIG_SPI=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -513,6 +517,7 @@ CONFIG_MTD=y
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT25 is not set
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
 # CONFIG_MTD_N25QXXX is not set
@@ -574,6 +579,8 @@ CONFIG_ETH0_PHY_LAN8720=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -623,15 +630,18 @@ CONFIG_UART3_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -783,11 +793,6 @@ CONFIG_FS_FAT=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -871,6 +876,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/lpcxpresso-lpc1768/nx/defconfig b/configs/lpcxpresso-lpc1768/nx/defconfig
index 6036f0b1ae..62553fce52 100644
--- a/configs/lpcxpresso-lpc1768/nx/defconfig
+++ b/configs/lpcxpresso-lpc1768/nx/defconfig
@@ -37,14 +37,16 @@ CONFIG_INTELHEX_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,6 +77,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -92,7 +95,11 @@ CONFIG_ARCH_CHIP_LPC17XX=y
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -102,14 +109,25 @@ CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="lpc17xx"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
 #
@@ -119,6 +137,7 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
 CONFIG_ARMV7M_TOOLCHAIN_CODEREDL=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
@@ -212,11 +231,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
 # CONFIG_ARCH_USE_MPU is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
@@ -261,6 +283,7 @@ CONFIG_RAM_SIZE=32768
 #
 CONFIG_ARCH_BOARD_LPCXPRESSO=y
 # CONFIG_ARCH_BOARD_MBED is not set
+# CONFIG_ARCH_BOARD_U_BLOX_C027 is not set
 # CONFIG_ARCH_BOARD_ZKITARM is not set
 # CONFIG_ARCH_BOARD_CUSTOM is not set
 CONFIG_ARCH_BOARD="lpcxpresso-lpc1768"
@@ -275,6 +298,8 @@ CONFIG_ARCH_LEDS=y
 # Board-Specific Options
 #
 CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_RESET is not set
+# CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
 # CONFIG_BOARDCTL_ADCTEST is not set
 # CONFIG_BOARDCTL_PWMTEST is not set
@@ -314,6 +339,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nx_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -364,9 +390,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -397,14 +424,20 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 CONFIG_SPI=y
+# CONFIG_SPI_SLAVE is not set
 # CONFIG_SPI_EXCHANGE is not set
 CONFIG_SPI_CMDDATA=y
 # CONFIG_SPI_CALLBACK is not set
 # CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_HWFEATURES is not set
+# CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -418,10 +451,15 @@ CONFIG_SPI_CMDDATA=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 CONFIG_LCD=y
 
 #
-# Common LCD Settings
+# Common Graphic LCD Settings
 #
 # CONFIG_LCD_CONSOLE is not set
 # CONFIG_LCD_NOGETRUN is not set
@@ -442,6 +480,7 @@ CONFIG_UG9664HSWAG01_NINTERFACES=1
 CONFIG_UG9664HSWAG01_POWER=y
 # CONFIG_LCD_UG2864HSWEG01 is not set
 # CONFIG_LCD_UG2832HSWEG04 is not set
+# CONFIG_LCD_SSD1351 is not set
 # CONFIG_LCD_ST7565 is not set
 # CONFIG_LCD_ST7567 is not set
 # CONFIG_LCD_UG2864AMBAG01 is not set
@@ -453,12 +492,17 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_LCD_RLANDSCAPE is not set
 # CONFIG_LCD_ILI9341 is not set
 # CONFIG_LCD_RA8875 is not set
+# CONFIG_SLCD is not set
 
 #
-# Alphanumeric/Segment LCD Devices
+# LED Support
 #
-# CONFIG_LCD_LCD1602 is not set
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -468,6 +512,8 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -491,14 +537,11 @@ CONFIG_UART3_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_UART3_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -515,19 +558,23 @@ CONFIG_UART3_PARITY=0
 CONFIG_UART3_2STOP=0
 # CONFIG_UART3_IFLOWCONTROL is not set
 # CONFIG_UART3_OFLOWCONTROL is not set
+# CONFIG_UART3_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -558,11 +605,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -571,6 +613,7 @@ CONFIG_NX_LCDDRIVER=y
 CONFIG_NX_NPLANES=1
 CONFIG_NX_BGCOLOR=0x0
 # CONFIG_NX_WRITEONLY is not set
+# CONFIG_NX_UPDATE is not set
 
 #
 # Supported Pixel Depths
@@ -669,6 +712,10 @@ CONFIG_MM_REGIONS=2
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -709,10 +756,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -727,14 +778,13 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -742,12 +792,12 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_LCDRW is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -768,18 +818,19 @@ CONFIG_EXAMPLES_NX_BPP=1
 # CONFIG_EXAMPLES_NX_RAWWINDOWS is not set
 CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=4
 CONFIG_EXAMPLES_NX_EXTERNINIT=y
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -787,14 +838,25 @@ CONFIG_EXAMPLES_NX_EXTERNINIT=y
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -806,26 +868,23 @@ CONFIG_EXAMPLES_NX_EXTERNINIT=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
@@ -843,15 +902,16 @@ CONFIG_EXAMPLES_NX_EXTERNINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+# CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
-# CONFIG_SYSTEM_POWEROFF is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/lpcxpresso-lpc1768/thttpd/defconfig b/configs/lpcxpresso-lpc1768/thttpd/defconfig
index dfe3556a78..be0fb5fbaf 100644
--- a/configs/lpcxpresso-lpc1768/thttpd/defconfig
+++ b/configs/lpcxpresso-lpc1768/thttpd/defconfig
@@ -37,14 +37,16 @@ CONFIG_INTELHEX_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,6 +77,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -92,7 +95,11 @@ CONFIG_ARCH_CHIP_LPC17XX=y
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -102,14 +109,25 @@ CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="lpc17xx"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
 #
@@ -119,6 +137,7 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
 CONFIG_ARMV7M_TOOLCHAIN_CODEREDL=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
@@ -223,11 +242,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
 # CONFIG_ARCH_USE_MPU is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
@@ -272,6 +294,7 @@ CONFIG_RAM_SIZE=32768
 #
 CONFIG_ARCH_BOARD_LPCXPRESSO=y
 # CONFIG_ARCH_BOARD_MBED is not set
+# CONFIG_ARCH_BOARD_U_BLOX_C027 is not set
 # CONFIG_ARCH_BOARD_ZKITARM is not set
 # CONFIG_ARCH_BOARD_CUSTOM is not set
 CONFIG_ARCH_BOARD="lpcxpresso-lpc1768"
@@ -320,6 +343,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="thttp_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -350,6 +374,7 @@ CONFIG_NAME_MAX=32
 # CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
+# CONFIG_SIG_EVTHREAD is not set
 
 #
 # Signal Numbers
@@ -358,9 +383,10 @@ CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
 CONFIG_SIG_SIGWORK=17
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 CONFIG_SCHED_WORKQUEUE=y
 CONFIG_SCHED_HPWORK=y
@@ -394,6 +420,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -411,8 +438,23 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 CONFIG_NETDEVICES=y
@@ -420,7 +462,11 @@ CONFIG_NETDEVICES=y
 #
 # General Ethernet MAC Driver Options
 #
+# CONFIG_NETDEV_LOOPBACK is not set
+# CONFIG_NETDEV_TELNET is not set
 # CONFIG_NETDEV_MULTINIC is not set
+CONFIG_ARCH_HAVE_NETDEV_STATISTICS=y
+# CONFIG_NETDEV_LATEINIT is not set
 
 #
 # External Ethernet MAC Device Support
@@ -430,6 +476,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_ENCX24J600 is not set
 # CONFIG_NET_E1000 is not set
 # CONFIG_NET_SLIP is not set
+# CONFIG_NET_FTMAC100 is not set
 # CONFIG_NET_VNET is not set
 
 #
@@ -448,6 +495,7 @@ CONFIG_NETDEVICES=y
 CONFIG_ETH0_PHY_LAN8720=y
 # CONFIG_ETH0_PHY_LAN8740 is not set
 # CONFIG_ETH0_PHY_LAN8740A is not set
+# CONFIG_ETH0_PHY_LAN8742A is not set
 # CONFIG_ETH0_PHY_DM9161 is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
@@ -456,6 +504,8 @@ CONFIG_ETH0_PHY_LAN8720=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -479,13 +529,10 @@ CONFIG_UART3_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_UART3_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -502,19 +549,23 @@ CONFIG_UART3_PARITY=0
 CONFIG_UART3_2STOP=0
 # CONFIG_UART3_IFLOWCONTROL is not set
 # CONFIG_UART3_OFLOWCONTROL is not set
+# CONFIG_UART3_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -538,6 +589,7 @@ CONFIG_NET_GUARDSIZE=2
 #
 # CONFIG_NET_MULTILINK is not set
 CONFIG_NET_ETHERNET=y
+# CONFIG_NET_LOOPBACK is not set
 # CONFIG_NET_TUN is not set
 
 #
@@ -623,6 +675,7 @@ CONFIG_IOB_NCHAINS=8
 # Routing Table Configuration
 #
 # CONFIG_NET_ROUTE is not set
+CONFIG_NET_HOSTNAME=""
 
 #
 # Crypto API
@@ -646,15 +699,11 @@ CONFIG_FS_READABLE=y
 # CONFIG_FS_FAT is not set
 # CONFIG_FS_NXFFS is not set
 CONFIG_FS_ROMFS=y
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -673,6 +722,10 @@ CONFIG_MM_REGIONS=2
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -716,10 +769,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -734,14 +792,13 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -749,11 +806,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -762,19 +819,20 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -783,6 +841,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 CONFIG_EXAMPLES_THTTPD=y
@@ -791,14 +850,24 @@ CONFIG_EXAMPLES_THTTPD_DRIPADDR=0x0a000001
 CONFIG_EXAMPLES_THTTPD_NETMASK=0xffffff00
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_UNIONFS is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_WGET is not set
 # CONFIG_EXAMPLES_XMLRPC is not set
 
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
 #
 # Graphics Support
 #
@@ -810,20 +879,24 @@ CONFIG_EXAMPLES_THTTPD_NETMASK=0xffffff00
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
+# CONFIG_NETUTILS_CHAT is not set
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TELNETD is not set
 CONFIG_NETUTILS_THTTPD=y
@@ -858,16 +931,10 @@ CONFIG_THTTPD_IDLE_SEND_LIMIT_SEC=300
 CONFIG_THTTPD_TILDE_MAP_NONE=y
 # CONFIG_THTTPD_GENERATE_INDICES is not set
 # CONFIG_THTTPD_USE_URLPATTERN is not set
-CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
@@ -885,15 +952,16 @@ CONFIG_NETUTILS_NETLIB=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+# CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
-# CONFIG_SYSTEM_POWEROFF is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/lpcxpresso-lpc1768/usbmsc/defconfig b/configs/lpcxpresso-lpc1768/usbmsc/defconfig
index 0e18fd3a3e..405c185791 100644
--- a/configs/lpcxpresso-lpc1768/usbmsc/defconfig
+++ b/configs/lpcxpresso-lpc1768/usbmsc/defconfig
@@ -37,14 +37,16 @@ CONFIG_INTELHEX_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,6 +77,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -92,7 +95,11 @@ CONFIG_ARCH_CHIP_LPC17XX=y
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -102,14 +109,25 @@ CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="lpc17xx"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
 #
@@ -119,6 +137,7 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
 CONFIG_ARMV7M_TOOLCHAIN_CODEREDL=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
@@ -223,11 +242,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
 # CONFIG_ARCH_USE_MPU is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
@@ -272,6 +294,7 @@ CONFIG_RAM_SIZE=32768
 #
 CONFIG_ARCH_BOARD_LPCXPRESSO=y
 # CONFIG_ARCH_BOARD_MBED is not set
+# CONFIG_ARCH_BOARD_U_BLOX_C027 is not set
 # CONFIG_ARCH_BOARD_ZKITARM is not set
 # CONFIG_ARCH_BOARD_CUSTOM is not set
 CONFIG_ARCH_BOARD="lpcxpresso-lpc1768"
@@ -286,7 +309,14 @@ CONFIG_ARCH_LEDS=y
 # Board-Specific Options
 #
 CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_RESET is not set
+# CONFIG_BOARDCTL_UNIQUEID is not set
 CONFIG_BOARDCTL_USBDEVCTRL=y
+# CONFIG_BOARDCTL_TSCTEST is not set
+# CONFIG_BOARDCTL_ADCTEST is not set
+# CONFIG_BOARDCTL_PWMTEST is not set
+# CONFIG_BOARDCTL_GRAPHICS is not set
+# CONFIG_BOARDCTL_IOCTL is not set
 
 #
 # RTOS Features
@@ -321,6 +351,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="msconn_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -371,9 +402,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -404,14 +436,20 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 CONFIG_SPI=y
+# CONFIG_SPI_SLAVE is not set
 # CONFIG_SPI_EXCHANGE is not set
 # CONFIG_SPI_CMDDATA is not set
 # CONFIG_SPI_CALLBACK is not set
 # CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_HWFEATURES is not set
+# CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -425,7 +463,21 @@ CONFIG_SPI=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -437,6 +489,7 @@ CONFIG_MMCSD_SPICLOCK=12500000
 CONFIG_MMCSD_SPIMODE=0
 # CONFIG_ARCH_HAVE_SDIO is not set
 # CONFIG_ARCH_HAVE_SDIOWAIT_WRCOMPLETE is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -446,6 +499,8 @@ CONFIG_MMCSD_SPIMODE=0
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -469,14 +524,11 @@ CONFIG_UART3_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_UART3_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -493,6 +545,7 @@ CONFIG_UART3_PARITY=0
 CONFIG_UART3_2STOP=0
 # CONFIG_UART3_IFLOWCONTROL is not set
 # CONFIG_UART3_OFLOWCONTROL is not set
+# CONFIG_UART3_DMA is not set
 CONFIG_USBDEV=y
 
 #
@@ -532,15 +585,18 @@ CONFIG_USBMSC_SCSI_STACKSIZE=2048
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -572,15 +628,11 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_FAT is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -599,6 +651,10 @@ CONFIG_MM_REGIONS=2
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -644,10 +700,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -662,26 +723,26 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FSTEST is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -689,18 +750,19 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -708,14 +770,26 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -728,26 +802,23 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
@@ -765,17 +836,17 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+# CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
-# CONFIG_SYSTEM_POWEROFF is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 CONFIG_SYSTEM_USBMSC=y
 CONFIG_SYSTEM_USBMSC_NLUNS=1
 CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
@@ -785,4 +856,5 @@ CONFIG_SYSTEM_USBMSC_DEVPATH2="/dev/mmcsd1"
 CONFIG_SYSTEM_USBMSC_DEVMINOR3=2
 CONFIG_SYSTEM_USBMSC_DEVPATH3="/dev/mmcsd2"
 # CONFIG_SYSTEM_USBMSC_DEBUGMM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/maple/nsh/defconfig b/configs/maple/nsh/defconfig
index b348746c15..47b1e70d77 100644
--- a/configs/maple/nsh/defconfig
+++ b/configs/maple/nsh/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -199,6 +201,7 @@ CONFIG_ARCH_CHIP_STM32F103CB=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -405,6 +408,10 @@ CONFIG_STM32_JTAG_DISABLE=y
 # CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG is not set
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -416,9 +423,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -657,7 +672,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -665,6 +685,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -676,6 +697,8 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -747,15 +770,18 @@ CONFIG_USBDEV_TRACE_NRECORDS=32
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -793,11 +819,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -870,6 +891,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -903,10 +925,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -915,17 +937,17 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -933,16 +955,16 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -964,8 +986,8 @@ CONFIG_EXAMPLES_NSH=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1093,12 +1115,12 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1106,7 +1128,7 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_USBMONITOR is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/maple/nx/defconfig b/configs/maple/nx/defconfig
index ab045784c6..8b16664414 100644
--- a/configs/maple/nx/defconfig
+++ b/configs/maple/nx/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -199,6 +201,7 @@ CONFIG_ARCH_CHIP_STM32F103CB=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -413,6 +416,10 @@ CONFIG_STM32_JTAG_DISABLE=y
 # CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG is not set
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM2_PWM is not set
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
@@ -425,9 +432,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -688,6 +703,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -703,10 +720,14 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 CONFIG_LCD=y
 
 #
-# Common LCD Settings
+# Common Graphic LCD Settings
 #
 # CONFIG_LCD_CONSOLE is not set
 # CONFIG_LCD_NOGETRUN is not set
@@ -740,12 +761,7 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_LCD_RLANDSCAPE is not set
 # CONFIG_LCD_ILI9341 is not set
 # CONFIG_LCD_RA8875 is not set
-
-#
-# Alphanumeric/Segment LCD Devices
-#
-# CONFIG_LCD_LCD1602 is not set
-# CONFIG_LCD_BACKPACK is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -753,6 +769,7 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -764,6 +781,7 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_SERIAL_REMOVABLE=y
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -855,14 +873,17 @@ CONFIG_CDCACM_PRODUCTSTR="CDC/ACM Serial"
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_NONE=y
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -900,11 +921,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1063,6 +1079,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -1096,10 +1113,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_LCDRW is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
@@ -1117,7 +1134,6 @@ CONFIG_EXAMPLES_NX_BPP=1
 # CONFIG_EXAMPLES_NX_RAWWINDOWS is not set
 CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 # CONFIG_EXAMPLES_NX_EXTERNINIT is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 CONFIG_EXAMPLES_NXHELLO=y
 CONFIG_EXAMPLES_NXHELLO_VPLANE=0
@@ -1136,12 +1152,13 @@ CONFIG_EXAMPLES_NXHELLO_DEFAULT_FONT=y
 # CONFIG_EXAMPLES_NXHELLO_EXTERNINIT is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1149,17 +1166,17 @@ CONFIG_EXAMPLES_NXHELLO_DEFAULT_FONT=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1181,8 +1198,8 @@ CONFIG_EXAMPLES_NXHELLO_DEFAULT_FONT=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1312,13 +1329,14 @@ CONFIG_USBDEV_MINOR=0
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_CDCACM is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_SYSTEM_I2CTOOL is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_I2CTOOL is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1326,8 +1344,7 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
-# CONFIG_SYSTEM_CDCACM is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_USBMONITOR is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/maple/usbnsh/defconfig b/configs/maple/usbnsh/defconfig
index bea93df83d..4976608c7f 100644
--- a/configs/maple/usbnsh/defconfig
+++ b/configs/maple/usbnsh/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -199,6 +201,7 @@ CONFIG_ARCH_CHIP_STM32F103CB=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -405,6 +408,10 @@ CONFIG_STM32_JTAG_DISABLE=y
 # CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG is not set
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -416,9 +423,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -671,7 +686,12 @@ CONFIG_I2C=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -679,6 +699,7 @@ CONFIG_I2C=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -690,6 +711,7 @@ CONFIG_I2C=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_SERIAL_REMOVABLE=y
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -781,14 +803,17 @@ CONFIG_CDCACM_PRODUCTSTR="CDC/ACM Serial"
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_NONE=y
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -826,11 +851,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -903,6 +923,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -936,10 +957,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -948,17 +969,17 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -966,17 +987,17 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -998,8 +1019,8 @@ CONFIG_EXAMPLES_NSH=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1129,13 +1150,14 @@ CONFIG_USBDEV_MINOR=0
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_CDCACM is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_SYSTEM_I2CTOOL is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_I2CTOOL is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1143,8 +1165,7 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
-# CONFIG_SYSTEM_CDCACM is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_USBMONITOR is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/mbed/hidkbd/defconfig b/configs/mbed/hidkbd/defconfig
index 0a18516161..58136eab01 100644
--- a/configs/mbed/hidkbd/defconfig
+++ b/configs/mbed/hidkbd/defconfig
@@ -7,6 +7,7 @@
 # Build Setup
 #
 # CONFIG_EXPERIMENTAL is not set
+# CONFIG_DEFAULT_SMALL is not set
 CONFIG_HOST_LINUX=y
 # CONFIG_HOST_OSX is not set
 # CONFIG_HOST_WINDOWS is not set
@@ -16,6 +17,7 @@ CONFIG_HOST_LINUX=y
 # Build Configuration
 #
 # CONFIG_APPS_DIR="../apps"
+CONFIG_BUILD_FLAT=y
 # CONFIG_BUILD_2PASS is not set
 
 #
@@ -25,20 +27,25 @@ CONFIG_HOST_LINUX=y
 # CONFIG_INTELHEX_BINARY is not set
 # CONFIG_MOTOROLA_SREC is not set
 CONFIG_RAW_BINARY=y
+# CONFIG_UBOOT_UIMAGE is not set
 
 #
 # Customize Header Files
 #
+# CONFIG_ARCH_STDINT_H is not set
 # CONFIG_ARCH_STDBOOL_H is not set
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
+# CONFIG_STACK_COLORATION is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
@@ -68,10 +75,14 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_C5471 is not set
 # CONFIG_ARCH_CHIP_CALYPSO is not set
 # CONFIG_ARCH_CHIP_DM320 is not set
+# CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
+# CONFIG_ARCH_CHIP_TIVA is not set
+# CONFIG_ARCH_CHIP_LPC11XX is not set
 CONFIG_ARCH_CHIP_LPC17XX=y
 # CONFIG_ARCH_CHIP_LPC214X is not set
 # CONFIG_ARCH_CHIP_LPC2378 is not set
@@ -80,35 +91,62 @@ CONFIG_ARCH_CHIP_LPC17XX=y
 # CONFIG_ARCH_CHIP_NUC1XX is not set
 # CONFIG_ARCH_CHIP_SAMA5 is not set
 # CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
 # CONFIG_ARCH_CHIP_SAM34 is not set
+# CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
 # CONFIG_ARCH_CORTEXM0 is not set
 CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXM4 is not set
+# CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="lpc17xx"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
+# CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
-CONFIG_ARCH_HAVE_MPU=y
+# CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
 #
 # ARMV7M Configuration Options
 #
+# CONFIG_ARMV7M_HAVE_ICACHE is not set
+# CONFIG_ARMV7M_HAVE_DCACHE is not set
+# CONFIG_ARMV7M_HAVE_ITCM is not set
+# CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
 # CONFIG_ARMV7M_OABI_TOOLCHAIN is not set
+# CONFIG_ARMV7M_HAVE_STACKCHECK is not set
+# CONFIG_ARMV7M_ITMSYSLOG is not set
 # CONFIG_GPIO_IRQ is not set
+# CONFIG_SERIAL_TERMIOS is not set
 
 #
 # LPC17xx Configuration Options
@@ -165,6 +203,7 @@ CONFIG_LPC17_UART0=y
 # CONFIG_LPC17_TMR3 is not set
 # CONFIG_LPC17_RIT is not set
 # CONFIG_LPC17_PWM0 is not set
+# CONFIG_LPC17_PWM1 is not set
 # CONFIG_LPC17_MCPWM is not set
 # CONFIG_LPC17_QEI is not set
 # CONFIG_LPC17_RTC is not set
@@ -181,7 +220,6 @@ CONFIG_LPC17_UART0=y
 #
 # Serial driver options
 #
-# CONFIG_SERIAL_TERMIOS is not set
 
 #
 # USB host driver options
@@ -192,6 +230,7 @@ CONFIG_USBHOST_NTDS=3
 CONFIG_USBHOST_TDBUFFERS=3
 CONFIG_USBHOST_TDBUFSIZE=128
 CONFIG_USBHOST_IOBUFSIZE=512
+CONFIG_LPC17_USBHOST_NPREALLOC=4
 CONFIG_USBHOST_BULK_DISABLE=y
 # CONFIG_USBHOST_INT_DISABLE is not set
 CONFIG_USBHOST_ISOC_DISABLE=y
@@ -203,13 +242,23 @@ CONFIG_USBHOST_ISOC_DISABLE=y
 # CONFIG_ARCH_VECNOTIRQ is not set
 # CONFIG_ARCH_DMA is not set
 CONFIG_ARCH_HAVE_IRQPRIO=y
-# CONFIG_ARCH_ADDRENV is not set
+# CONFIG_ARCH_L2CACHE is not set
+# CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
+# CONFIG_ARCH_HAVE_ADDRENV is not set
+# CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
+CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARCH_NAND_HWECC is not set
+# CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
+# CONFIG_ARCH_USE_MPU is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
+# CONFIG_ARCH_IDLE_CUSTOM is not set
 # CONFIG_ARCH_HAVE_RAMFUNCS is not set
 CONFIG_ARCH_HAVE_RAMVECTORS=y
 # CONFIG_ARCH_RAMVECTORS is not set
@@ -249,6 +298,7 @@ CONFIG_RAM_SIZE=32768
 #
 # CONFIG_ARCH_BOARD_LPCXPRESSO is not set
 CONFIG_ARCH_BOARD_MBED=y
+# CONFIG_ARCH_BOARD_U_BLOX_C027 is not set
 # CONFIG_ARCH_BOARD_ZKITARM is not set
 # CONFIG_ARCH_BOARD_CUSTOM is not set
 CONFIG_ARCH_BOARD="mbed"
@@ -262,38 +312,79 @@ CONFIG_ARCH_LEDS=y
 #
 # Board-Specific Options
 #
+# CONFIG_LIB_BOARDCTL is not set
 
 #
 # RTOS Features
 #
-# CONFIG_BOARD_INITIALIZE is not set
+CONFIG_DISABLE_OS_API=y
+# CONFIG_DISABLE_POSIX_TIMERS is not set
+# CONFIG_DISABLE_PTHREAD is not set
+# CONFIG_DISABLE_SIGNALS is not set
+# CONFIG_DISABLE_MQUEUE is not set
+# CONFIG_DISABLE_ENVIRON is not set
+
+#
+# Clocks and Timers
+#
 CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
-CONFIG_RR_INTERVAL=200
-# CONFIG_SCHED_INSTRUMENTATION is not set
-CONFIG_TASK_NAME_SIZE=0
-# CONFIG_SCHED_HAVE_PARENT is not set
+# CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
 CONFIG_START_YEAR=2010
 CONFIG_START_MONTH=11
 CONFIG_START_DAY=10
-CONFIG_DEV_CONSOLE=y
+CONFIG_MAX_WDOGPARMS=2
+CONFIG_PREALLOC_WDOGS=8
+CONFIG_WDOG_INTRESERVE=1
+CONFIG_PREALLOC_TIMERS=4
+
+#
+# Tasks and Scheduling
+#
+# CONFIG_INIT_NONE is not set
+CONFIG_INIT_ENTRYPOINT=y
+# CONFIG_INIT_FILEPATH is not set
+CONFIG_USER_ENTRYPOINT="hidkbd_main"
+CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
+CONFIG_TASK_NAME_SIZE=0
+CONFIG_MAX_TASKS=16
+# CONFIG_SCHED_HAVE_PARENT is not set
+# CONFIG_SCHED_WAITPID is not set
+
+#
+# Pthread Options
+#
 # CONFIG_MUTEX_TYPES is not set
-# CONFIG_PRIORITY_INHERITANCE is not set
+CONFIG_NPTHREAD_KEYS=4
+
+#
+# Performance Monitoring
+#
+# CONFIG_SCHED_CPULOAD is not set
+# CONFIG_SCHED_INSTRUMENTATION is not set
+
+#
+# Files and I/O
+#
+CONFIG_DEV_CONSOLE=y
 # CONFIG_FDCLONE_DISABLE is not set
 # CONFIG_FDCLONE_STDIO is not set
 CONFIG_SDCLONE_DISABLE=y
-# CONFIG_SCHED_WAITPID is not set
+CONFIG_NFILE_DESCRIPTORS=8
+CONFIG_NFILE_STREAMS=8
+CONFIG_NAME_MAX=32
+# CONFIG_PRIORITY_INHERITANCE is not set
+
+#
+# RTOS hooks
+#
+# CONFIG_BOARD_INITIALIZE is not set
 # CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
-CONFIG_USER_ENTRYPOINT="hidkbd_main"
-CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_POSIX_TIMERS is not set
-# CONFIG_DISABLE_PTHREAD is not set
-# CONFIG_DISABLE_SIGNALS is not set
-# CONFIG_DISABLE_MQUEUE is not set
-# CONFIG_DISABLE_ENVIRON is not set
+# CONFIG_SIG_EVTHREAD is not set
 
 #
 # Signal Numbers
@@ -305,19 +396,21 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 CONFIG_SIG_SIGWORK=17
 
 #
-# Sizes of configurable things (0 disables)
+# POSIX Message Queue Options
 #
-CONFIG_MAX_TASKS=16
-CONFIG_NPTHREAD_KEYS=4
-CONFIG_NFILE_DESCRIPTORS=8
-CONFIG_NFILE_STREAMS=8
-CONFIG_NAME_MAX=32
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
-CONFIG_MAX_WDOGPARMS=2
-CONFIG_PREALLOC_WDOGS=8
-CONFIG_WDOG_INTRESERVE=1
-CONFIG_PREALLOC_TIMERS=4
+# CONFIG_MODULE is not set
+
+#
+# Work queue support
+#
+CONFIG_SCHED_WORKQUEUE=y
+CONFIG_SCHED_HPWORK=y
+CONFIG_SCHED_HPWORKPRIORITY=192
+CONFIG_SCHED_HPWORKPERIOD=50000
+CONFIG_SCHED_HPWORKSTACKSIZE=1024
+# CONFIG_SCHED_LPWORK is not set
 
 #
 # Stack and heap information
@@ -326,6 +419,7 @@ CONFIG_IDLETHREAD_STACKSIZE=1024
 CONFIG_USERMAIN_STACKSIZE=2048
 CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=2048
+# CONFIG_LIB_SYSCALL is not set
 
 #
 # Device Drivers
@@ -334,14 +428,26 @@ CONFIG_PTHREAD_STACK_DEFAULT=2048
 CONFIG_DEV_NULL=y
 # CONFIG_DEV_ZERO is not set
 # CONFIG_DEV_LOOP is not set
+
+#
+# Buffering
+#
+# CONFIG_DRVR_WRITEBUFFER is not set
+# CONFIG_DRVR_READAHEAD is not set
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 # CONFIG_SPI is not set
 # CONFIG_I2S is not set
+
+#
+# Timer Driver Support
+#
+# CONFIG_TIMER is not set
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_ANALOG is not set
@@ -349,9 +455,25 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
+# CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
@@ -359,16 +481,40 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
+# CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
-
-#
-# USART Configuration
-#
+# CONFIG_UART1_SERIALDRIVER is not set
+# CONFIG_UART2_SERIALDRIVER is not set
+# CONFIG_UART3_SERIALDRIVER is not set
+# CONFIG_UART4_SERIALDRIVER is not set
+# CONFIG_UART5_SERIALDRIVER is not set
+# CONFIG_UART6_SERIALDRIVER is not set
+# CONFIG_UART7_SERIALDRIVER is not set
+# CONFIG_UART8_SERIALDRIVER is not set
+# CONFIG_SCI0_SERIALDRIVER is not set
+# CONFIG_SCI1_SERIALDRIVER is not set
+# CONFIG_USART0_SERIALDRIVER is not set
+# CONFIG_USART1_SERIALDRIVER is not set
+# CONFIG_USART2_SERIALDRIVER is not set
+# CONFIG_USART3_SERIALDRIVER is not set
+# CONFIG_USART4_SERIALDRIVER is not set
+# CONFIG_USART5_SERIALDRIVER is not set
+# CONFIG_USART6_SERIALDRIVER is not set
+# CONFIG_USART7_SERIALDRIVER is not set
+# CONFIG_USART8_SERIALDRIVER is not set
+# CONFIG_OTHER_UART_SERIALDRIVER is not set
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 CONFIG_SERIAL_NPOLLWAITERS=2
+# CONFIG_SERIAL_IFLOWCONTROL is not set
+# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
+CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_UART0_SERIAL_CONSOLE=y
+# CONFIG_OTHER_SERIAL_CONSOLE is not set
 # CONFIG_NO_SERIAL_CONSOLE is not set
 
 #
@@ -382,11 +528,13 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
-# CONFIG_SERIAL_IFLOWCONTROL is not set
-# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 CONFIG_USBHOST=y
 CONFIG_USBHOST_NPREALLOC=0
+CONFIG_USBHOST_HAVE_ASYNCH=y
+# CONFIG_USBHOST_ASYNCH is not set
+# CONFIG_USBHOST_HUB is not set
 # CONFIG_USBHOST_MSC is not set
 CONFIG_USBHOST_HIDKBD=y
 CONFIG_HIDKBD_POLLUSEC=100000
@@ -401,14 +549,18 @@ CONFIG_HIDKBD_NPOLLWAITERS=2
 # CONFIG_USBHOST_TRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -417,6 +569,11 @@ CONFIG_HIDKBD_NPOLLWAITERS=2
 # CONFIG_ARCH_HAVE_PHY is not set
 # CONFIG_NET is not set
 
+#
+# Crypto API
+#
+# CONFIG_CRYPTO is not set
+
 #
 # File Systems
 #
@@ -425,19 +582,20 @@ CONFIG_HIDKBD_NPOLLWAITERS=2
 # File system configuration
 #
 # CONFIG_DISABLE_MOUNTPOINT is not set
+# CONFIG_FS_AUTOMOUNTER is not set
+# CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
 # CONFIG_FS_READABLE is not set
 # CONFIG_FS_WRITABLE is not set
+# CONFIG_FS_NAMED_SEMAPHORES is not set
+CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_RAMMAP is not set
 # CONFIG_FS_FAT is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
-
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -458,7 +616,11 @@ CONFIG_MM_REGIONS=2
 # CONFIG_AUDIO is not set
 
 #
-# Binary Formats
+# Wireless Support
+#
+
+#
+# Binary Loader
 #
 # CONFIG_BINFMT_DISABLE is not set
 # CONFIG_BINFMT_EXEPATH is not set
@@ -483,6 +645,7 @@ CONFIG_LIB_HOMEDIR="/"
 # CONFIG_NOPRINTF_FIELDWIDTH is not set
 # CONFIG_LIBC_FLOATINGPOINT is not set
 CONFIG_LIBC_LONG_LONG=y
+# CONFIG_LIBC_IOCTL_VARIADIC is not set
 CONFIG_LIB_RAND_ORDER=1
 # CONFIG_EOL_IS_CR is not set
 # CONFIG_EOL_IS_LF is not set
@@ -494,19 +657,19 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
 # CONFIG_LIBC_STRERROR is not set
 # CONFIG_LIBC_PERROR_STDOUT is not set
 CONFIG_ARCH_LOWPUTC=y
+# CONFIG_LIBC_LOCALTIME is not set
+# CONFIG_TIME_EXTENDED is not set
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
-CONFIG_SCHED_WORKQUEUE=y
-CONFIG_SCHED_HPWORK=y
-CONFIG_SCHED_HPWORKPRIORITY=192
-CONFIG_SCHED_HPWORKPERIOD=50000
-CONFIG_SCHED_HPWORKSTACKSIZE=1024
-# CONFIG_SCHED_LPWORK is not set
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -521,29 +684,28 @@ CONFIG_SCHED_HPWORKSTACKSIZE=1024
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
+# CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 CONFIG_EXAMPLES_HIDKBD=y
 CONFIG_EXAMPLES_HIDKBD_DEFPRIO=50
 CONFIG_EXAMPLES_HIDKBD_STACKSIZE=1024
 CONFIG_EXAMPLES_HIDKBD_DEVNAME="/dev/kbda"
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
-# CONFIG_EXAMPLES_LCDRW is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -551,69 +713,72 @@ CONFIG_EXAMPLES_HIDKBD_DEVNAME="/dev/kbda"
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
-# CONFIG_EXAMPLES_PASHELLO is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
-# CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
+# CONFIG_EXAMPLES_SERIALBLASTER is not set
+# CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_UDP is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
 #
 # CONFIG_TIFF is not set
+# CONFIG_GRAPHICS_TRAVELER is not set
 
 #
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_MICROPYTHON is not set
 # CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
+# CONFIG_NETUTILS_CHAT is not set
 # CONFIG_NETUTILS_CODECS is not set
-# CONFIG_NETUTILS_DHCPD is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
-# CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_TFTPC is not set
-# CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_NETLIB is not set
-# CONFIG_NETUTILS_WEBCLIENT is not set
-
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
 
 #
 # NSH Library
@@ -632,93 +797,16 @@ CONFIG_EXAMPLES_HIDKBD_DEVNAME="/dev/kbda"
 #
 # System Libraries and NSH Add-Ons
 #
-
-#
-# USB CDC/ACM Device Commands
-#
-
-#
-# USB Composite Device Commands
-#
-
-#
-# Custom Free Memory Command
-#
+# CONFIG_SYSTEM_CLE is not set
+# CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-
-#
-# I2C tool
-#
-
-#
-# INI File Parser
-#
-# CONFIG_FSUTILS_INIFILE is not set
-
-#
-# FLASH Program Installation
-#
+# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
-
-#
-# FLASH Erase-all Command
-#
-
-#
-# NxPlayer media player library / command Line
-#
-# CONFIG_SYSTEM_NXPLAYER is not set
-
-#
-# RAM test
-#
 # CONFIG_SYSTEM_RAMTEST is not set
-
-#
-# readline()
-#
+# CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
-
-#
-# Power Off
-#
-# CONFIG_SYSTEM_POWEROFF is not set
-
-#
-# RAMTRON
-#
-
-#
-# SD Card
-#
-
-#
-# Sysinfo
-#
-
-#
-# USB Monitor
-#
-
-#
-# EMACS-like Command Line Editor
-#
-# CONFIG_SYSTEM_CLE is not set
-
-#
-# VI Work-Alike Editor
-#
+# CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
-
-#
-# Stack Monitor
-#
-
-#
-# USB Mass Storage Device Commands
-#
-
-#
-# Zmodem Commands
-#
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/mbed/nsh/defconfig b/configs/mbed/nsh/defconfig
index a94ba59b53..95999a5e56 100644
--- a/configs/mbed/nsh/defconfig
+++ b/configs/mbed/nsh/defconfig
@@ -12,10 +12,6 @@ CONFIG_HOST_LINUX=y
 # CONFIG_HOST_OSX is not set
 # CONFIG_HOST_WINDOWS is not set
 # CONFIG_HOST_OTHER is not set
-# CONFIG_WINDOWS_NATIVE is not set
-# CONFIG_WINDOWS_CYGWIN is not set
-# CONFIG_WINDOWS_MSYS is not set
-# CONFIG_WINDOWS_OTHER is not set
 
 #
 # Build Configuration
@@ -41,12 +37,15 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
+# CONFIG_STACK_COLORATION is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
@@ -78,10 +77,12 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
 # CONFIG_ARCH_CHIP_TIVA is not set
+# CONFIG_ARCH_CHIP_LPC11XX is not set
 CONFIG_ARCH_CHIP_LPC17XX=y
 # CONFIG_ARCH_CHIP_LPC214X is not set
 # CONFIG_ARCH_CHIP_LPC2378 is not set
@@ -90,41 +91,62 @@ CONFIG_ARCH_CHIP_LPC17XX=y
 # CONFIG_ARCH_CHIP_NUC1XX is not set
 # CONFIG_ARCH_CHIP_SAMA5 is not set
 # CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
 # CONFIG_ARCH_CHIP_SAM34 is not set
+# CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
 # CONFIG_ARCH_CORTEXM0 is not set
 CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXM4 is not set
+# CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="lpc17xx"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
+# CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
+# CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
 #
 # ARMV7M Configuration Options
 #
-# CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
+# CONFIG_ARMV7M_HAVE_ICACHE is not set
+# CONFIG_ARMV7M_HAVE_DCACHE is not set
+# CONFIG_ARMV7M_HAVE_ITCM is not set
+# CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
-# CONFIG_ARMV7M_TOOLCHAIN_CODEREDW is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
-# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW is not set
-# CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM is not set
 # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
-# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW is not set
-# CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE is not set
 # CONFIG_ARMV7M_OABI_TOOLCHAIN is not set
+# CONFIG_ARMV7M_HAVE_STACKCHECK is not set
 # CONFIG_ARMV7M_ITMSYSLOG is not set
 # CONFIG_GPIO_IRQ is not set
+# CONFIG_SERIAL_TERMIOS is not set
 
 #
 # LPC17xx Configuration Options
@@ -210,11 +232,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
 # CONFIG_ARCH_USE_MPU is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
@@ -259,6 +284,7 @@ CONFIG_RAM_SIZE=32768
 #
 # CONFIG_ARCH_BOARD_LPCXPRESSO is not set
 CONFIG_ARCH_BOARD_MBED=y
+# CONFIG_ARCH_BOARD_U_BLOX_C027 is not set
 # CONFIG_ARCH_BOARD_ZKITARM is not set
 # CONFIG_ARCH_BOARD_CUSTOM is not set
 CONFIG_ARCH_BOARD="mbed"
@@ -275,6 +301,14 @@ CONFIG_NSH_MMCSDSPIPORTNO=0
 #
 # Board-Specific Options
 #
+CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_RESET is not set
+# CONFIG_BOARDCTL_UNIQUEID is not set
+# CONFIG_BOARDCTL_TSCTEST is not set
+# CONFIG_BOARDCTL_ADCTEST is not set
+# CONFIG_BOARDCTL_PWMTEST is not set
+# CONFIG_BOARDCTL_GRAPHICS is not set
+# CONFIG_BOARDCTL_IOCTL is not set
 
 #
 # RTOS Features
@@ -309,6 +343,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -359,9 +394,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -392,23 +428,48 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 CONFIG_SPI=y
+# CONFIG_SPI_SLAVE is not set
 # CONFIG_SPI_EXCHANGE is not set
 # CONFIG_SPI_CMDDATA is not set
+CONFIG_SPI_CALLBACK=y
 # CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_HWFEATURES is not set
+# CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
+
+#
+# Timer Driver Support
+#
+# CONFIG_TIMER is not set
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
-# CONFIG_TIMER is not set
 # CONFIG_ANALOG is not set
 # CONFIG_AUDIO_DEVICES is not set
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -419,6 +480,8 @@ CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SPICLOCK=12500000
 CONFIG_MMCSD_SPIMODE=0
 # CONFIG_ARCH_HAVE_SDIO is not set
+# CONFIG_ARCH_HAVE_SDIOWAIT_WRCOMPLETE is not set
+# CONFIG_MODEM is not set
 CONFIG_MTD=y
 
 #
@@ -427,6 +490,7 @@ CONFIG_MTD=y
 # CONFIG_MTD_PARTITION is not set
 # CONFIG_MTD_SECT512 is not set
 # CONFIG_MTD_BYTE_WRITE is not set
+# CONFIG_MTD_PROGMEM is not set
 # CONFIG_MTD_CONFIG is not set
 
 #
@@ -434,14 +498,19 @@ CONFIG_MTD=y
 #
 # CONFIG_MTD_NAND is not set
 # CONFIG_RAMMTD is not set
+# CONFIG_FILEMTD is not set
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT25 is not set
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
+# CONFIG_MTD_S25FL1 is not set
+# CONFIG_MTD_N25QXXX is not set
 # CONFIG_MTD_SMART is not set
 # CONFIG_MTD_RAMTRON is not set
 # CONFIG_MTD_SST25 is not set
 # CONFIG_MTD_SST25XX is not set
+# CONFIG_MTD_SST26 is not set
 # CONFIG_MTD_SST39FV is not set
 # CONFIG_MTD_W25 is not set
 # CONFIG_EEPROM is not set
@@ -452,6 +521,8 @@ CONFIG_MTD=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -475,16 +546,12 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
-# CONFIG_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
 # CONFIG_NO_SERIAL_CONSOLE is not set
@@ -500,18 +567,23 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -544,16 +616,15 @@ CONFIG_FS_FAT=y
 # CONFIG_FAT_LCNAMES is not set
 # CONFIG_FAT_LFN is not set
 # CONFIG_FS_FATTIME is not set
+# CONFIG_FAT_FORCE_INDIRECT is not set
 # CONFIG_FAT_DMAMEMORY is not set
+# CONFIG_FAT_DIRECT_RETRY is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -573,6 +644,10 @@ CONFIG_MM_REGIONS=2
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -614,13 +689,19 @@ CONFIG_LIBC_TMPDIR="/tmp"
 CONFIG_LIBC_MAX_TMPFILE=32
 CONFIG_ARCH_LOWPUTC=y
 # CONFIG_LIBC_LOCALTIME is not set
+# CONFIG_TIME_EXTENDED is not set
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -635,26 +716,26 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FSTEST is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -662,36 +743,47 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
-# CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_UDP is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_FLASH_ERASEALL is not set
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -702,37 +794,30 @@ CONFIG_EXAMPLES_NSH=y
 #
 # Interpreters
 #
-# CONFIG_INTERPRETERS_FICL is not set
 # CONFIG_INTERPRETERS_BAS is not set
+# CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_MICROPYTHON is not set
 # CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
-# CONFIG_NETUTILS_DHCPD is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
-# CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_TFTPC is not set
-# CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_NETLIB is not set
-# CONFIG_NETUTILS_WEBCLIENT is not set
-
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
 
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -751,13 +836,16 @@ CONFIG_NSH_NESTDEPTH=3
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
 # CONFIG_NSH_DISABLE_CMP is not set
+CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_DD is not set
 # CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -766,8 +854,10 @@ CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 # CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -776,6 +866,7 @@ CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLE_MKRD is not set
 # CONFIG_NSH_DISABLE_MH is not set
 # CONFIG_NSH_DISABLE_MOUNT is not set
+# CONFIG_NSH_DISABLE_MV is not set
 # CONFIG_NSH_DISABLE_MW is not set
 # CONFIG_NSH_DISABLE_PS is not set
 # CONFIG_NSH_DISABLE_PUT is not set
@@ -785,8 +876,10 @@ CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
@@ -813,7 +906,8 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
-CONFIG_LIB_BOARDCTL=y
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -827,116 +921,19 @@ CONFIG_LIB_BOARDCTL=y
 #
 # System Libraries and NSH Add-Ons
 #
-
-#
-# Custom Free Memory Command
-#
-# CONFIG_SYSTEM_FREE is not set
-
-#
-# EMACS-like Command Line Editor
-#
 # CONFIG_SYSTEM_CLE is not set
-
-#
-# CU Minimal Terminal
-#
 # CONFIG_SYSTEM_CUTERM is not set
-
-#
-# FLASH Program Installation
-#
-# CONFIG_SYSTEM_INSTALL is not set
-
-#
-# FLASH Erase-all Command
-#
-
-#
-# Intel HEX to binary conversion
-#
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-
-#
-# I2C tool
-#
-
-#
-# INI File Parser
-#
-# CONFIG_FSUTILS_INIFILE is not set
-
-#
-# NxPlayer media player library / command Line
-#
-
-#
-# RAM test
-#
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
-
-#
-# readline()
-#
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
-
-#
-# P-Code Support
-#
-
-#
-# PHY Tool
-#
-
-#
-# Power Off
-#
-# CONFIG_SYSTEM_POWEROFF is not set
-
-#
-# RAMTRON
-#
-
-#
-# SD Card
-#
-
-#
-# Sudoku
-#
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-
-#
-# Sysinfo
-#
-
-#
-# VI Work-Alike Editor
-#
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
-
-#
-# Stack Monitor
-#
-
-#
-# USB CDC/ACM Device Commands
-#
-
-#
-# USB Composite Device Commands
-#
-
-#
-# USB Mass Storage Device Commands
-#
-
-#
-# USB Monitor
-#
-
-#
-# Zmodem Commands
-#
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/mcu123-lpc214x/composite/defconfig b/configs/mcu123-lpc214x/composite/defconfig
index bba97d42c1..f98119041d 100644
--- a/configs/mcu123-lpc214x/composite/defconfig
+++ b/configs/mcu123-lpc214x/composite/defconfig
@@ -37,14 +37,16 @@ CONFIG_INTELHEX_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,6 +77,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -92,7 +95,11 @@ CONFIG_ARCH_CHIP_LPC214X=y
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 CONFIG_ARCH_ARM7TDMI=y
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -102,10 +109,21 @@ CONFIG_ARCH_ARM7TDMI=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="arm"
 CONFIG_ARCH_CHIP="lpc214x"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 # CONFIG_ARCH_LOWVECTORS is not set
 
@@ -167,11 +185,14 @@ CONFIG_LPC214X_USBDEV=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+# CONFIG_ARCH_HAVE_RESET is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ARCH_USBDUMP is not set
 # CONFIG_ENDIAN_BIG is not set
@@ -226,7 +247,13 @@ CONFIG_ARCH_LEDS=y
 # Board-Specific Options
 #
 CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_UNIQUEID is not set
 CONFIG_BOARDCTL_USBDEVCTRL=y
+# CONFIG_BOARDCTL_TSCTEST is not set
+# CONFIG_BOARDCTL_ADCTEST is not set
+# CONFIG_BOARDCTL_PWMTEST is not set
+# CONFIG_BOARDCTL_GRAPHICS is not set
+# CONFIG_BOARDCTL_IOCTL is not set
 
 #
 # RTOS Features
@@ -261,6 +288,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="conn_main"
 CONFIG_RR_INTERVAL=0
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -311,9 +339,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -344,14 +373,20 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 CONFIG_SPI=y
+# CONFIG_SPI_SLAVE is not set
 # CONFIG_SPI_EXCHANGE is not set
 # CONFIG_SPI_CMDDATA is not set
 CONFIG_SPI_CALLBACK=y
 # CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_HWFEATURES is not set
+# CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -365,7 +400,21 @@ CONFIG_SPI_CALLBACK=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -377,6 +426,7 @@ CONFIG_MMCSD_SPICLOCK=20000000
 CONFIG_MMCSD_SPIMODE=0
 # CONFIG_ARCH_HAVE_SDIO is not set
 # CONFIG_ARCH_HAVE_SDIOWAIT_WRCOMPLETE is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -387,6 +437,7 @@ CONFIG_MMCSD_SPIMODE=0
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
 CONFIG_SERIAL_REMOVABLE=y
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -410,14 +461,11 @@ CONFIG_UART1_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_UART1_SERIAL_CONSOLE is not set
@@ -435,6 +483,7 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 
 #
 # UART1 Configuration
@@ -447,6 +496,7 @@ CONFIG_UART1_PARITY=0
 CONFIG_UART1_2STOP=0
 # CONFIG_UART1_IFLOWCONTROL is not set
 # CONFIG_UART1_OFLOWCONTROL is not set
+# CONFIG_UART1_DMA is not set
 CONFIG_USBDEV=y
 
 #
@@ -461,7 +511,7 @@ CONFIG_USBDEV_MAXPOWER=100
 # CONFIG_ARCH_USBDEV_STALLQUEUE is not set
 CONFIG_USBDEV_TRACE=y
 CONFIG_USBDEV_TRACE_NRECORDS=128
-# CONFIG_USBDEV_TRACE_STRINGS is not set
+# CONFIG_USBDEV_TRACE_INITIALIDSET is not set
 
 #
 # USB Device Class Driver Options
@@ -492,8 +542,8 @@ CONFIG_CDCACM_EPBULKOUT_HSSIZE=512
 CONFIG_CDCACM_EPBULKIN=2
 CONFIG_CDCACM_EPBULKIN_FSSIZE=64
 CONFIG_CDCACM_EPBULKIN_HSSIZE=512
-CONFIG_CDCACM_NWRREQS=4
 CONFIG_CDCACM_NRDREQS=4
+CONFIG_CDCACM_NWRREQS=4
 CONFIG_CDCACM_BULKIN_REQLEN=96
 CONFIG_CDCACM_RXBUFSIZE=256
 CONFIG_CDCACM_TXBUFSIZE=256
@@ -523,15 +573,18 @@ CONFIG_USBMSC_SCSI_STACKSIZE=2048
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -563,15 +616,11 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_FAT is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -590,6 +639,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -635,10 +688,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -653,26 +711,26 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FSTEST is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -680,18 +738,19 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -699,14 +758,26 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -719,26 +790,23 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
@@ -756,18 +824,8 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_CLE is not set
-# CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
-# CONFIG_SYSTEM_RAMTEST is not set
-# CONFIG_SYSTEM_READLINE is not set
-# CONFIG_SYSTEM_POWEROFF is not set
-# CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_CDCACM is not set
+# CONFIG_SYSTEM_CLE is not set
 CONFIG_SYSTEM_COMPOSITE=y
 CONFIG_SYSTEM_COMPOSITE_NLUNS=1
 CONFIG_SYSTEM_COMPOSITE_DEVMINOR1=0
@@ -785,6 +843,17 @@ CONFIG_SYSTEM_COMPOSITE_BUFSIZE=256
 # CONFIG_SYSTEM_COMPOSITE_TRACECONTROLLER is not set
 # CONFIG_SYSTEM_COMPOSITE_TRACEINTERRUPTS is not set
 # CONFIG_SYSTEM_COMPOSITE_DEBUGMM is not set
-# CONFIG_SYSTEM_USBMSC is not set
+# CONFIG_SYSTEM_CUTERM is not set
+# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_RAMTEST is not set
+# CONFIG_READLINE_HAVE_EXTMATCH is not set
+# CONFIG_SYSTEM_READLINE is not set
+# CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_USBMONITOR is not set
+# CONFIG_SYSTEM_USBMSC is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/mcu123-lpc214x/nsh/defconfig b/configs/mcu123-lpc214x/nsh/defconfig
index 128167e687..9b7c8536ea 100644
--- a/configs/mcu123-lpc214x/nsh/defconfig
+++ b/configs/mcu123-lpc214x/nsh/defconfig
@@ -37,14 +37,16 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,6 +77,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -92,7 +95,11 @@ CONFIG_ARCH_CHIP_LPC214X=y
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 CONFIG_ARCH_ARM7TDMI=y
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -102,10 +109,21 @@ CONFIG_ARCH_ARM7TDMI=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="arm"
 CONFIG_ARCH_CHIP="lpc214x"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 # CONFIG_ARCH_LOWVECTORS is not set
 
@@ -159,11 +177,14 @@ CONFIG_LPC214X_UART1=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+# CONFIG_ARCH_HAVE_RESET is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
 # CONFIG_ARCH_IDLE_CUSTOM is not set
@@ -220,6 +241,7 @@ CONFIG_NSH_MMCSDSPIPORTNO=1
 # Board-Specific Options
 #
 CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
 # CONFIG_BOARDCTL_ADCTEST is not set
 # CONFIG_BOARDCTL_PWMTEST is not set
@@ -259,6 +281,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=0
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -309,9 +332,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -342,14 +366,20 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 CONFIG_SPI=y
+# CONFIG_SPI_SLAVE is not set
 # CONFIG_SPI_EXCHANGE is not set
 # CONFIG_SPI_CMDDATA is not set
 CONFIG_SPI_CALLBACK=y
 # CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_HWFEATURES is not set
+# CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -363,7 +393,21 @@ CONFIG_SPI_CALLBACK=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -375,6 +419,7 @@ CONFIG_MMCSD_SPICLOCK=20000000
 CONFIG_MMCSD_SPIMODE=0
 # CONFIG_ARCH_HAVE_SDIO is not set
 # CONFIG_ARCH_HAVE_SDIOWAIT_WRCOMPLETE is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -384,6 +429,8 @@ CONFIG_MMCSD_SPIMODE=0
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -407,14 +454,11 @@ CONFIG_UART1_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_UART1_SERIAL_CONSOLE is not set
@@ -432,6 +476,7 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 
 #
 # UART1 Configuration
@@ -444,19 +489,23 @@ CONFIG_UART1_PARITY=0
 CONFIG_UART1_2STOP=0
 # CONFIG_UART1_IFLOWCONTROL is not set
 # CONFIG_UART1_OFLOWCONTROL is not set
+# CONFIG_UART1_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -490,18 +539,16 @@ CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
 CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_FATTIME is not set
+# CONFIG_FAT_FORCE_INDIRECT is not set
 # CONFIG_FAT_DMAMEMORY is not set
+# CONFIG_FAT_DIRECT_RETRY is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -520,6 +567,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -565,10 +616,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -583,26 +639,26 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FSTEST is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -610,18 +666,19 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -629,14 +686,26 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -649,30 +718,28 @@ CONFIG_EXAMPLES_NSH=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -691,6 +758,7 @@ CONFIG_NSH_NESTDEPTH=3
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
@@ -699,6 +767,7 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_DD is not set
 # CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -707,8 +776,10 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 # CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -727,8 +798,10 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
@@ -755,6 +828,8 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -768,16 +843,19 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
-# CONFIG_SYSTEM_POWEROFF is not set
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/mcu123-lpc214x/usbmsc/defconfig b/configs/mcu123-lpc214x/usbmsc/defconfig
index 8a6ea1a428..250bab2762 100644
--- a/configs/mcu123-lpc214x/usbmsc/defconfig
+++ b/configs/mcu123-lpc214x/usbmsc/defconfig
@@ -37,14 +37,16 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,6 +77,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -92,7 +95,11 @@ CONFIG_ARCH_CHIP_LPC214X=y
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 CONFIG_ARCH_ARM7TDMI=y
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -102,10 +109,21 @@ CONFIG_ARCH_ARM7TDMI=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="arm"
 CONFIG_ARCH_CHIP="lpc214x"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 # CONFIG_ARCH_LOWVECTORS is not set
 
@@ -167,11 +185,14 @@ CONFIG_LPC214X_USBDEV=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+# CONFIG_ARCH_HAVE_RESET is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ARCH_USBDUMP is not set
 # CONFIG_ENDIAN_BIG is not set
@@ -226,7 +247,13 @@ CONFIG_ARCH_LEDS=y
 # Board-Specific Options
 #
 CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_UNIQUEID is not set
 CONFIG_BOARDCTL_USBDEVCTRL=y
+# CONFIG_BOARDCTL_TSCTEST is not set
+# CONFIG_BOARDCTL_ADCTEST is not set
+# CONFIG_BOARDCTL_PWMTEST is not set
+# CONFIG_BOARDCTL_GRAPHICS is not set
+# CONFIG_BOARDCTL_IOCTL is not set
 
 #
 # RTOS Features
@@ -261,6 +288,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="msconn_main"
 CONFIG_RR_INTERVAL=0
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -311,9 +339,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -344,14 +373,20 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 CONFIG_SPI=y
+# CONFIG_SPI_SLAVE is not set
 # CONFIG_SPI_EXCHANGE is not set
 # CONFIG_SPI_CMDDATA is not set
 # CONFIG_SPI_CALLBACK is not set
 # CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_HWFEATURES is not set
+# CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -365,7 +400,21 @@ CONFIG_SPI=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -377,6 +426,7 @@ CONFIG_MMCSD_SPICLOCK=20000000
 CONFIG_MMCSD_SPIMODE=0
 # CONFIG_ARCH_HAVE_SDIO is not set
 # CONFIG_ARCH_HAVE_SDIOWAIT_WRCOMPLETE is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -386,6 +436,8 @@ CONFIG_MMCSD_SPIMODE=0
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -409,14 +461,11 @@ CONFIG_UART1_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_UART1_SERIAL_CONSOLE is not set
@@ -434,6 +483,7 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 
 #
 # UART1 Configuration
@@ -446,6 +496,7 @@ CONFIG_UART1_PARITY=0
 CONFIG_UART1_2STOP=0
 # CONFIG_UART1_IFLOWCONTROL is not set
 # CONFIG_UART1_OFLOWCONTROL is not set
+# CONFIG_UART1_DMA is not set
 CONFIG_USBDEV=y
 
 #
@@ -460,7 +511,7 @@ CONFIG_USBDEV_MAXPOWER=100
 # CONFIG_ARCH_USBDEV_STALLQUEUE is not set
 CONFIG_USBDEV_TRACE=y
 CONFIG_USBDEV_TRACE_NRECORDS=128
-# CONFIG_USBDEV_TRACE_STRINGS is not set
+# CONFIG_USBDEV_TRACE_INITIALIDSET is not set
 
 #
 # USB Device Class Driver Options
@@ -487,15 +538,18 @@ CONFIG_USBMSC_SCSI_STACKSIZE=2048
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -527,15 +581,11 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_FAT is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -554,6 +604,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -599,10 +653,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -617,26 +676,26 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FSTEST is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -644,18 +703,19 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -663,14 +723,26 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -683,26 +755,23 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
@@ -720,17 +789,18 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+# CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
-# CONFIG_SYSTEM_POWEROFF is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_USBMONITOR is not set
 CONFIG_SYSTEM_USBMSC=y
 CONFIG_SYSTEM_USBMSC_NLUNS=1
 CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
@@ -741,5 +811,5 @@ CONFIG_SYSTEM_USBMSC_DEVMINOR3=2
 CONFIG_SYSTEM_USBMSC_DEVPATH3="/dev/mmcsd2"
 # CONFIG_SYSTEM_USBMSC_DEBUGMM is not set
 # CONFIG_SYSTEM_USBMSC_TRACE is not set
-# CONFIG_SYSTEM_USBMONITOR is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/mcu123-lpc214x/usbserial/defconfig b/configs/mcu123-lpc214x/usbserial/defconfig
index b445b24704..f682875dd6 100644
--- a/configs/mcu123-lpc214x/usbserial/defconfig
+++ b/configs/mcu123-lpc214x/usbserial/defconfig
@@ -42,10 +42,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -117,6 +118,8 @@ CONFIG_ARCH_ARM7TDMI=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="arm"
 CONFIG_ARCH_CHIP="lpc214x"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
 # CONFIG_ARCH_HAVE_TRUSTZONE is not set
@@ -388,7 +391,12 @@ CONFIG_DEV_NULL=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -396,6 +404,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -408,6 +417,7 @@ CONFIG_DEV_NULL=y
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
 CONFIG_SERIAL_REMOVABLE=y
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -431,10 +441,6 @@ CONFIG_UART1_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -509,15 +515,18 @@ CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -548,11 +557,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -625,6 +629,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -653,10 +658,10 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -665,18 +670,18 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -690,11 +695,11 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 CONFIG_EXAMPLES_USBSERIAL=y
 CONFIG_EXAMPLES_USBSERIAL_BUFSIZE=512
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -716,8 +721,8 @@ CONFIG_EXAMPLES_USBSERIAL_BUFSIZE=512
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -728,6 +733,7 @@ CONFIG_EXAMPLES_USBSERIAL_BUFSIZE=512
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -749,16 +755,16 @@ CONFIG_EXAMPLES_USBSERIAL_BUFSIZE=512
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/mikroe-stm32f4/fulldemo/defconfig b/configs/mikroe-stm32f4/fulldemo/defconfig
index 6d2cd51f37..828f56c1aa 100644
--- a/configs/mikroe-stm32f4/fulldemo/defconfig
+++ b/configs/mikroe-stm32f4/fulldemo/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 CONFIG_DEBUG_NOOPT=y
@@ -200,6 +202,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -430,6 +433,10 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y
 CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG=y
 # CONFIG_STM32_CCMEXCLUDE is not set
 CONFIG_STM32_DMACAPABLE=y
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_PWM is not set
 # CONFIG_STM32_TIM1_ADC is not set
 # CONFIG_STM32_TIM1_CAP is not set
@@ -728,6 +735,8 @@ CONFIG_SPI_CALLBACK=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -768,7 +777,7 @@ CONFIG_INPUT=y
 CONFIG_LCD=y
 
 #
-# Common Graphipc LCD Settings
+# Common Graphic LCD Settings
 #
 # CONFIG_LCD_CONSOLE is not set
 # CONFIG_LCD_NOGETRUN is not set
@@ -804,6 +813,7 @@ CONFIG_LCD_LANDSCAPE=y
 #
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -842,6 +852,7 @@ CONFIG_RAMMTD_ERASESTATE=0xff
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT25 is not set
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 CONFIG_MTD_M25P=y
 CONFIG_M25P_SPIMODE=0
 CONFIG_M25P_SPIFREQUENCY=20000000
@@ -873,6 +884,7 @@ CONFIG_MTD_SMART_WEAR_LEVEL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_SERIAL_REMOVABLE=y
+# CONFIG_SERIAL_CONSOLE is not set
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -962,14 +974,19 @@ CONFIG_CDCACM_PRODUCTSTR="CDC/ACM Serial"
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+CONFIG_SYSLOG_CHAR=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+CONFIG_SYSLOG_CHAR_CRLF=y
+CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
 
 #
 # Networking Support
@@ -1017,13 +1034,6 @@ CONFIG_FS_BINFS=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-CONFIG_SYSLOG_CHAR=y
-CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
-
 #
 # Graphics Support
 #
@@ -1243,6 +1253,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -1281,15 +1292,16 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_CXXTEST is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FLASH_TEST is not set
 # CONFIG_EXAMPLES_FSTEST is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_LCDRW is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
@@ -1318,17 +1330,17 @@ CONFIG_EXAMPLES_NX_CLIENTPRIO=100
 CONFIG_EXAMPLES_NX_SERVERPRIO=120
 CONFIG_EXAMPLES_NX_LISTENERPRIO=80
 CONFIG_EXAMPLES_NX_NOTIFYSIGNO=4
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RANDOM is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
@@ -1338,9 +1350,8 @@ CONFIG_EXAMPLES_NX_NOTIFYSIGNO=4
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_FLASH_TEST is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
@@ -1351,11 +1362,11 @@ CONFIG_EXAMPLES_TOUCHSCREEN_MINOR=0
 CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0"
 # CONFIG_EXAMPLES_TOUCHSCREEN_MOUSE is not set
 CONFIG_EXAMPLES_TOUCHSCREEN_ARCHINIT=y
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_UNIONFS is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1381,8 +1392,8 @@ CONFIG_FSUTILS_MKSMARTFS=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1719,20 +1730,18 @@ CONFIG_NXWM_MEDIAPLAYER_MINVOLUMEHEIGHT=6
 # Platform-specific Support
 #
 CONFIG_PLATFORM_CONFIGDATA=y
-CONFIG_MIKROE_STM32F4_CONFIGDATA_PART=y
-# CONFIG_MIKROE_STM32F4_CONFIGDATA_FS is not set
-# CONFIG_MIKROE_STM32F4_CONFIGDATA_ROM is not set
 
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_CDCACM is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 CONFIG_SYSTEM_FLASH_ERASEALL=y
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 CONFIG_SYSTEM_NXPLAYER=y
 CONFIG_NXPLAYER_PLAYTHREAD_STACKSIZE=1500
 CONFIG_NXPLAYER_COMMAND_LINE=y
@@ -1752,7 +1761,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
-# CONFIG_SYSTEM_CDCACM is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/mikroe-stm32f4/kostest/defconfig b/configs/mikroe-stm32f4/kostest/defconfig
index c28a02bc75..a190dc6c56 100644
--- a/configs/mikroe-stm32f4/kostest/defconfig
+++ b/configs/mikroe-stm32f4/kostest/defconfig
@@ -47,10 +47,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 CONFIG_DEBUG_NOOPT=y
@@ -206,6 +208,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -435,6 +438,10 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y
 # CONFIG_STM32_FORCEPOWER is not set
 CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG=y
 # CONFIG_STM32_CCMEXCLUDE is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_PWM is not set
 # CONFIG_STM32_TIM1_ADC is not set
 # CONFIG_STM32_TIM1_CAP is not set
@@ -459,9 +466,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -723,6 +738,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -742,13 +759,19 @@ CONFIG_RTC_NALARMS=1
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
 #
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -785,6 +808,7 @@ CONFIG_RAMMTD_ERASESTATE=0xff
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT25 is not set
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 CONFIG_MTD_M25P=y
 CONFIG_M25P_SPIMODE=0
 CONFIG_M25P_SPIFREQUENCY=20000000
@@ -816,6 +840,7 @@ CONFIG_MTD_SMART_WEAR_LEVEL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_SERIAL_REMOVABLE=y
+# CONFIG_SERIAL_CONSOLE is not set
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -905,14 +930,19 @@ CONFIG_CDCACM_PRODUCTSTR="CDC/ACM Serial"
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+CONFIG_SYSLOG_CHAR=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+CONFIG_SYSLOG_CHAR_CRLF=y
+CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
 
 #
 # Networking Support
@@ -959,13 +989,6 @@ CONFIG_SMARTFS_MAXNAMLEN=16
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-CONFIG_SYSLOG_CHAR=y
-CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
-
 #
 # Graphics Support
 #
@@ -1043,6 +1066,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_USRWORK is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
@@ -1082,9 +1106,9 @@ CONFIG_HAVE_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
+# CONFIG_EXAMPLES_IGMP is not set
 # CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_KEYPADTEST is not set
-# CONFIG_EXAMPLES_IGMP is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -1094,11 +1118,11 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NSH_CXXINITIALIZE is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 CONFIG_EXAMPLES_OSTEST=y
 CONFIG_EXAMPLES_OSTEST_LOOPS=1
@@ -1110,8 +1134,8 @@ CONFIG_EXAMPLES_OSTEST_WAITRESULT=y
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RANDOM is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
@@ -1126,14 +1150,15 @@ CONFIG_EXAMPLES_OSTEST_WAITRESULT=y
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
+# CONFIG_FSUTILS_FLASH_ERASEALL is not set
 # CONFIG_FSUTILS_INIFILE is not set
 CONFIG_FSUTILS_MKSMARTFS=y
 # CONFIG_FSUTILS_PASSWD is not set
@@ -1154,8 +1179,8 @@ CONFIG_FSUTILS_MKSMARTFS=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1283,12 +1308,13 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_CDCACM is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1296,7 +1322,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
-# CONFIG_SYSTEM_CDCACM is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/mikroe-stm32f4/nsh/defconfig b/configs/mikroe-stm32f4/nsh/defconfig
index 596b4b78a0..75d7044bea 100644
--- a/configs/mikroe-stm32f4/nsh/defconfig
+++ b/configs/mikroe-stm32f4/nsh/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -200,6 +202,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -428,6 +431,10 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y
 # CONFIG_STM32_FORCEPOWER is not set
 CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG=y
 # CONFIG_STM32_CCMEXCLUDE is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM2_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
@@ -703,6 +710,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -729,6 +738,7 @@ CONFIG_SPI_EXCHANGE=y
 #
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -765,6 +775,7 @@ CONFIG_RAMMTD_ERASESTATE=0xff
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT25 is not set
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 CONFIG_MTD_M25P=y
 CONFIG_M25P_SPIMODE=0
 CONFIG_M25P_SPIFREQUENCY=20000000
@@ -795,6 +806,8 @@ CONFIG_MTD_SMART_WEAR_LEVEL=y
 # CONFIG_SENSORS is not set
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -844,14 +857,19 @@ CONFIG_USART2_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+CONFIG_SYSLOG_CHAR=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+CONFIG_SYSLOG_CHAR_CRLF=y
+CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
 
 #
 # Networking Support
@@ -899,13 +917,6 @@ CONFIG_SMARTFS_MAXNAMLEN=16
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-CONFIG_SYSLOG_CHAR=y
-CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
-
 #
 # Graphics Support
 #
@@ -982,6 +993,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -1020,15 +1032,16 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_CXXTEST is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FLASH_TEST is not set
 # CONFIG_EXAMPLES_FSTEST is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -1039,17 +1052,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RANDOM is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
@@ -1059,20 +1072,19 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_FLASH_TEST is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_UNIONFS is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1098,8 +1110,8 @@ CONFIG_FSUTILS_MKSMARTFS=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1227,13 +1239,13 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 CONFIG_SYSTEM_FLASH_ERASEALL=y
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1241,6 +1253,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/mikroe-stm32f4/nx/defconfig b/configs/mikroe-stm32f4/nx/defconfig
index 1d29349a7e..461a9672d0 100644
--- a/configs/mikroe-stm32f4/nx/defconfig
+++ b/configs/mikroe-stm32f4/nx/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -199,6 +201,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -426,6 +429,10 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y
 # CONFIG_STM32_FORCEPOWER is not set
 CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG=y
 # CONFIG_STM32_CCMEXCLUDE is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM2_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
@@ -679,10 +686,14 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 CONFIG_LCD=y
 
 #
-# Common LCD Settings
+# Common Graphic LCD Settings
 #
 # CONFIG_LCD_CONSOLE is not set
 # CONFIG_LCD_NOGETRUN is not set
@@ -710,17 +721,14 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_LCD_RLANDSCAPE is not set
 # CONFIG_LCD_ILI9341 is not set
 # CONFIG_LCD_RA8875 is not set
-
-#
-# Alphanumeric/Segment LCD Devices
-#
-# CONFIG_LCD_LCD1602 is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
 #
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -735,14 +743,19 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+CONFIG_SYSLOG_CHAR=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+CONFIG_SYSLOG_CHAR_CRLF=y
+CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
 
 #
 # Networking Support
@@ -780,13 +793,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-CONFIG_SYSLOG_CHAR=y
-CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
-
 #
 # Graphics Support
 #
@@ -949,6 +955,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -991,10 +998,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_LCDRW is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
@@ -1012,17 +1019,17 @@ CONFIG_EXAMPLES_NX_BPP=16
 # CONFIG_EXAMPLES_NX_RAWWINDOWS is not set
 CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 # CONFIG_EXAMPLES_NX_EXTERNINIT is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1030,17 +1037,17 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1062,8 +1069,8 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1189,12 +1196,12 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1202,6 +1209,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/mikroe-stm32f4/nxlines/defconfig b/configs/mikroe-stm32f4/nxlines/defconfig
index e910925c58..e290831de8 100644
--- a/configs/mikroe-stm32f4/nxlines/defconfig
+++ b/configs/mikroe-stm32f4/nxlines/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -199,6 +201,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -426,6 +429,10 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y
 # CONFIG_STM32_FORCEPOWER is not set
 CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG=y
 # CONFIG_STM32_CCMEXCLUDE is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM2_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
@@ -679,10 +686,14 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 CONFIG_LCD=y
 
 #
-# Common LCD Settings
+# Common Graphic LCD Settings
 #
 # CONFIG_LCD_CONSOLE is not set
 CONFIG_LCD_NOGETRUN=y
@@ -710,17 +721,14 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_LCD_RLANDSCAPE is not set
 # CONFIG_LCD_ILI9341 is not set
 # CONFIG_LCD_RA8875 is not set
-
-#
-# Alphanumeric/Segment LCD Devices
-#
-# CONFIG_LCD_LCD1602 is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
 #
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -735,14 +743,19 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+CONFIG_SYSLOG_CHAR=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+CONFIG_SYSLOG_CHAR_CRLF=y
+CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
 
 #
 # Networking Support
@@ -780,13 +793,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-CONFIG_SYSLOG_CHAR=y
-CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
-
 #
 # Graphics Support
 #
@@ -948,6 +954,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -990,10 +997,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_LCDRW is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
@@ -1003,7 +1010,6 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
@@ -1019,12 +1025,13 @@ CONFIG_EXAMPLES_NXLINES_BORDERCOLOR=0xFFE0
 CONFIG_EXAMPLES_NXLINES_CIRCLECOLOR=0x87F0
 CONFIG_EXAMPLES_NXLINES_BPP=16
 # CONFIG_EXAMPLES_NXLINES_EXTERNINIT is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1032,17 +1039,17 @@ CONFIG_EXAMPLES_NXLINES_BPP=16
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1064,8 +1071,8 @@ CONFIG_EXAMPLES_NXLINES_BPP=16
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1190,12 +1197,12 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1203,6 +1210,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/mikroe-stm32f4/nxtext/defconfig b/configs/mikroe-stm32f4/nxtext/defconfig
index fa83fa73d4..d2cd5abd8b 100644
--- a/configs/mikroe-stm32f4/nxtext/defconfig
+++ b/configs/mikroe-stm32f4/nxtext/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 CONFIG_DEBUG_NOOPT=y
@@ -199,6 +201,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -426,6 +429,10 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y
 # CONFIG_STM32_FORCEPOWER is not set
 CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG=y
 # CONFIG_STM32_CCMEXCLUDE is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM2_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
@@ -679,10 +686,14 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 CONFIG_LCD=y
 
 #
-# Common LCD Settings
+# Common Graphic LCD Settings
 #
 # CONFIG_LCD_CONSOLE is not set
 # CONFIG_LCD_NOGETRUN is not set
@@ -710,17 +721,14 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_LCD_RLANDSCAPE is not set
 # CONFIG_LCD_ILI9341 is not set
 # CONFIG_LCD_RA8875 is not set
-
-#
-# Alphanumeric/Segment LCD Devices
-#
-# CONFIG_LCD_LCD1602 is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
 #
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -735,14 +743,19 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+CONFIG_SYSLOG_CHAR=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+CONFIG_SYSLOG_CHAR_CRLF=y
+CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
 
 #
 # Networking Support
@@ -780,13 +793,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-CONFIG_SYSLOG_CHAR=y
-CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
-
 #
 # Graphics Support
 #
@@ -948,6 +954,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -990,10 +997,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_LCDRW is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
@@ -1003,11 +1010,11 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 CONFIG_EXAMPLES_NXTEXT=y
 
 #
@@ -1032,8 +1039,8 @@ CONFIG_EXAMPLES_NXTEXT_DEFAULT_FONT=y
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1041,17 +1048,17 @@ CONFIG_EXAMPLES_NXTEXT_DEFAULT_FONT=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1073,8 +1080,8 @@ CONFIG_EXAMPLES_NXTEXT_DEFAULT_FONT=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1199,12 +1206,12 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1212,6 +1219,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/mikroe-stm32f4/usbnsh/defconfig b/configs/mikroe-stm32f4/usbnsh/defconfig
index 771a1c9fce..8f1a390106 100644
--- a/configs/mikroe-stm32f4/usbnsh/defconfig
+++ b/configs/mikroe-stm32f4/usbnsh/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -200,6 +202,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -428,6 +431,10 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y
 # CONFIG_STM32_FORCEPOWER is not set
 CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG=y
 # CONFIG_STM32_CCMEXCLUDE is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM2_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
@@ -711,6 +718,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -737,6 +746,7 @@ CONFIG_SPI_EXCHANGE=y
 #
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -773,6 +783,7 @@ CONFIG_RAMMTD_ERASESTATE=0xff
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT25 is not set
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 CONFIG_MTD_M25P=y
 CONFIG_M25P_SPIMODE=0
 CONFIG_M25P_SPIFREQUENCY=20000000
@@ -804,6 +815,7 @@ CONFIG_MTD_SMART_WEAR_LEVEL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_SERIAL_REMOVABLE=y
+# CONFIG_SERIAL_CONSOLE is not set
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -893,14 +905,19 @@ CONFIG_CDCACM_PRODUCTSTR="CDC/ACM Serial"
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+CONFIG_SYSLOG_CHAR=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+CONFIG_SYSLOG_CHAR_CRLF=y
+CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
 
 #
 # Networking Support
@@ -948,13 +965,6 @@ CONFIG_SMARTFS_MAXNAMLEN=16
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-CONFIG_SYSLOG_CHAR=y
-CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
-
 #
 # Graphics Support
 #
@@ -1031,6 +1041,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -1069,15 +1080,16 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_CXXTEST is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FLASH_TEST is not set
 # CONFIG_EXAMPLES_FSTEST is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -1088,17 +1100,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RANDOM is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
@@ -1108,20 +1120,19 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_FLASH_TEST is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_UNIONFS is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1147,8 +1158,8 @@ CONFIG_FSUTILS_MKSMARTFS=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1277,13 +1288,14 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_CDCACM is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 CONFIG_SYSTEM_FLASH_ERASEALL=y
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1291,7 +1303,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
-# CONFIG_SYSTEM_CDCACM is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/moxa/nsh/defconfig b/configs/moxa/nsh/defconfig
index 1ad986a2c8..2408d18fdb 100644
--- a/configs/moxa/nsh/defconfig
+++ b/configs/moxa/nsh/defconfig
@@ -42,10 +42,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -378,6 +379,7 @@ CONFIG_DEV_NULL=y
 #
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -418,6 +420,8 @@ CONFIG_FTMAC100_MAC0_ENV_ADDR=0x80000050
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 CONFIG_16550_UART=y
 CONFIG_16550_UART0=y
 CONFIG_16550_UART0_BASE=0x98200000
@@ -474,15 +478,18 @@ CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -629,11 +636,6 @@ CONFIG_FS_BINFS=y
 # CONFIG_FS_PROCFS is not set
 CONFIG_FS_UNIONFS=y
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -708,6 +710,7 @@ CONFIG_LIBC_NETDB=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/mx1ads/ostest/defconfig b/configs/mx1ads/ostest/defconfig
index 6e555f7cdd..6c09f16ac8 100644
--- a/configs/mx1ads/ostest/defconfig
+++ b/configs/mx1ads/ostest/defconfig
@@ -37,12 +37,15 @@ CONFIG_BUILD_FLAT=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
+# CONFIG_STACK_COLORATION is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
@@ -72,11 +75,14 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_C5471 is not set
 # CONFIG_ARCH_CHIP_CALYPSO is not set
 # CONFIG_ARCH_CHIP_DM320 is not set
+# CONFIG_ARCH_CHIP_EFM32 is not set
 CONFIG_ARCH_CHIP_IMX1=y
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
 # CONFIG_ARCH_CHIP_TIVA is not set
+# CONFIG_ARCH_CHIP_LPC11XX is not set
 # CONFIG_ARCH_CHIP_LPC17XX is not set
 # CONFIG_ARCH_CHIP_LPC214X is not set
 # CONFIG_ARCH_CHIP_LPC2378 is not set
@@ -85,24 +91,51 @@ CONFIG_ARCH_CHIP_IMX1=y
 # CONFIG_ARCH_CHIP_NUC1XX is not set
 # CONFIG_ARCH_CHIP_SAMA5 is not set
 # CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
 # CONFIG_ARCH_CHIP_SAM34 is not set
+# CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 CONFIG_ARCH_ARM920T=y
 # CONFIG_ARCH_CORTEXM0 is not set
 # CONFIG_ARCH_CORTEXM3 is not set
 # CONFIG_ARCH_CORTEXM4 is not set
+# CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="arm"
 CONFIG_ARCH_CHIP="imx1"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
+# CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 CONFIG_ARCH_LOWVECTORS=y
 # CONFIG_ARCH_ROMPGTABLE is not set
 
+#
+# ARM Configuration Options
+#
+# CONFIG_ARM_TOOLCHAIN_BUILDROOT is not set
+# CONFIG_ARM_TOOLCHAIN_CODESOURCERYL is not set
+CONFIG_ARM_TOOLCHAIN_GNU_EABIL=y
+# CONFIG_ARM_TOOLCHAIN_GNU_OABI is not set
+
 #
 # iMX.1 Peripheral Selection
 #
@@ -124,11 +157,14 @@ CONFIG_RAM_NUTTXENTRY=0x01004000
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 CONFIG_ARCH_HAVE_MMU=y
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+# CONFIG_ARCH_HAVE_RESET is not set
 CONFIG_ARCH_USE_MMU=y
 # CONFIG_PAGING is not set
 CONFIG_ARCH_STACKDUMP=y
@@ -186,6 +222,7 @@ CONFIG_ARCH_LEDS=y
 #
 # Board-Specific Options
 #
+# CONFIG_LIB_BOARDCTL is not set
 
 #
 # RTOS Features
@@ -215,8 +252,12 @@ CONFIG_PREALLOC_TIMERS=8
 #
 # Tasks and Scheduling
 #
+# CONFIG_INIT_NONE is not set
+CONFIG_INIT_ENTRYPOINT=y
+# CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="ostest_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=64
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -267,6 +308,14 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=32
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
+
+#
+# Work queue support
+#
+# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_SCHED_HPWORK is not set
+# CONFIG_SCHED_LPWORK is not set
 
 #
 # Stack and heap information
@@ -293,25 +342,52 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 CONFIG_SPI=y
+# CONFIG_SPI_SLAVE is not set
 # CONFIG_SPI_EXCHANGE is not set
 # CONFIG_SPI_CMDDATA is not set
+# CONFIG_SPI_CALLBACK is not set
 # CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_HWFEATURES is not set
+# CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
+
+#
+# Timer Driver Support
+#
+# CONFIG_TIMER is not set
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
-# CONFIG_TIMER is not set
 # CONFIG_ANALOG is not set
 # CONFIG_AUDIO_DEVICES is not set
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
+# CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
@@ -319,6 +395,8 @@ CONFIG_SPI=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -341,13 +419,15 @@ CONFIG_UART1_SERIALDRIVER=y
 # CONFIG_USART6_SERIALDRIVER is not set
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
+# CONFIG_OTHER_UART_SERIALDRIVER is not set
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
+# CONFIG_SERIAL_IFLOWCONTROL is not set
+# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
+# CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART1_SERIAL_CONSOLE=y
+# CONFIG_OTHER_SERIAL_CONSOLE is not set
 # CONFIG_NO_SERIAL_CONSOLE is not set
 
 #
@@ -361,20 +441,23 @@ CONFIG_UART1_PARITY=0
 CONFIG_UART1_2STOP=0
 # CONFIG_UART1_IFLOWCONTROL is not set
 # CONFIG_UART1_OFLOWCONTROL is not set
-# CONFIG_SERIAL_IFLOWCONTROL is not set
-# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_UART1_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -399,13 +482,11 @@ CONFIG_DISABLE_MOUNTPOINT=y
 # CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
 # CONFIG_FS_READABLE is not set
 # CONFIG_FS_WRITABLE is not set
+# CONFIG_FS_NAMED_SEMAPHORES is not set
+CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_RAMMAP is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
-
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -429,7 +510,11 @@ CONFIG_HEAP2_SIZE=0
 # CONFIG_AUDIO is not set
 
 #
-# Binary Formats
+# Wireless Support
+#
+
+#
+# Binary Loader
 #
 # CONFIG_BINFMT_DISABLE is not set
 # CONFIG_NXFLAT is not set
@@ -452,6 +537,7 @@ CONFIG_NUNGET_CHARS=2
 # CONFIG_NOPRINTF_FIELDWIDTH is not set
 # CONFIG_LIBC_FLOATINGPOINT is not set
 CONFIG_LIBC_LONG_LONG=y
+# CONFIG_LIBC_IOCTL_VARIADIC is not set
 CONFIG_LIB_RAND_ORDER=1
 # CONFIG_EOL_IS_CR is not set
 # CONFIG_EOL_IS_LF is not set
@@ -463,14 +549,18 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
 # CONFIG_LIBC_STRERROR is not set
 # CONFIG_LIBC_PERROR_STDOUT is not set
 CONFIG_ARCH_LOWPUTC=y
+# CONFIG_TIME_EXTENDED is not set
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
-# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -485,14 +575,13 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -500,11 +589,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -512,12 +601,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 CONFIG_EXAMPLES_OSTEST=y
 CONFIG_EXAMPLES_OSTEST_LOOPS=1
@@ -525,62 +613,64 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=8
 CONFIG_EXAMPLES_OSTEST_RR_RANGE=10000
 CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
-# CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_UDP is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
 #
 # CONFIG_TIFF is not set
+# CONFIG_GRAPHICS_TRAVELER is not set
 
 #
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_MICROPYTHON is not set
 # CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
-# CONFIG_NETUTILS_DHCPD is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
-# CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_TFTPC is not set
-# CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_NETLIB is not set
-# CONFIG_NETUTILS_WEBCLIENT is not set
-
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
 
 #
 # NSH Library
@@ -599,111 +689,16 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 #
 # System Libraries and NSH Add-Ons
 #
-
-#
-# Custom Free Memory Command
-#
-# CONFIG_SYSTEM_FREE is not set
-
-#
-# EMACS-like Command Line Editor
-#
 # CONFIG_SYSTEM_CLE is not set
-
-#
-# FLASH Program Installation
-#
-# CONFIG_SYSTEM_INSTALL is not set
-
-#
-# FLASH Erase-all Command
-#
-
-#
-# Intel HEX to binary conversion
-#
+# CONFIG_SYSTEM_CUTERM is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-
-#
-# I2C tool
-#
-
-#
-# INI File Parser
-#
-# CONFIG_FSUTILS_INIFILE is not set
-
-#
-# NxPlayer media player library / command Line
-#
-# CONFIG_SYSTEM_NXPLAYER is not set
-
-#
-# RAM test
-#
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
-
-#
-# readline()
-#
+# CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
-
-#
-# P-Code Support
-#
-
-#
-# PHY Tool
-#
-
-#
-# Power Off
-#
-# CONFIG_SYSTEM_POWEROFF is not set
-
-#
-# RAMTRON
-#
-
-#
-# SD Card
-#
-
-#
-# Sudoku
-#
 # CONFIG_SYSTEM_SUDOKU is not set
-
-#
-# Sysinfo
-#
-
-#
-# VI Work-Alike Editor
-#
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
-
-#
-# Stack Monitor
-#
-
-#
-# USB CDC/ACM Device Commands
-#
-
-#
-# USB Composite Device Commands
-#
-
-#
-# USB Mass Storage Device Commands
-#
-
-#
-# USB Monitor
-#
-
-#
-# Zmodem Commands
-#
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/ntosd-dm320/nettest/defconfig b/configs/ntosd-dm320/nettest/defconfig
index 66a56c48d7..560e82a279 100644
--- a/configs/ntosd-dm320/nettest/defconfig
+++ b/configs/ntosd-dm320/nettest/defconfig
@@ -37,14 +37,16 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+# CONFIG_DEBUG_ALERT is not set
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,6 +77,7 @@ CONFIG_ARCH="arm"
 CONFIG_ARCH_CHIP_DM320=y
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -93,7 +96,9 @@ CONFIG_ARCH_CHIP_DM320=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 CONFIG_ARCH_ARM926EJS=y
@@ -104,10 +109,21 @@ CONFIG_ARCH_ARM926EJS=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="arm"
 CONFIG_ARCH_CHIP="dm320"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 # CONFIG_ARCH_LOWVECTORS is not set
 # CONFIG_ARCH_ROMPGTABLE is not set
@@ -141,6 +157,7 @@ CONFIG_DM320_UART1=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 CONFIG_ARCH_HAVE_MMU=y
 # CONFIG_ARCH_HAVE_MPU is not set
@@ -275,9 +292,10 @@ CONFIG_NAME_MAX=32
 CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -308,6 +326,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -326,8 +345,22 @@ CONFIG_DEV_NULL=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 CONFIG_NETDEVICES=y
@@ -336,7 +369,9 @@ CONFIG_NETDEVICES=y
 # General Ethernet MAC Driver Options
 #
 # CONFIG_NETDEV_LOOPBACK is not set
+# CONFIG_NETDEV_TELNET is not set
 # CONFIG_NETDEV_MULTINIC is not set
+CONFIG_ARCH_HAVE_NETDEV_STATISTICS=y
 # CONFIG_NETDEV_LATEINIT is not set
 
 #
@@ -355,7 +390,6 @@ CONFIG_DM9X_MODE_AUTO=y
 # CONFIG_DM9X_MODE_10MFD is not set
 # CONFIG_DM9X_MODE_100MHD is not set
 # CONFIG_DM9X_MODE_100MFD is not set
-# CONFIG_DM9X_STATS is not set
 # CONFIG_ENC28J60 is not set
 # CONFIG_ENCX24J600 is not set
 # CONFIG_NET_E1000 is not set
@@ -369,6 +403,8 @@ CONFIG_DM9X_MODE_AUTO=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -392,14 +428,11 @@ CONFIG_UART1_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_UART1_SERIAL_CONSOLE is not set
@@ -417,6 +450,7 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 
 #
 # UART1 Configuration
@@ -429,19 +463,23 @@ CONFIG_UART1_PARITY=0
 CONFIG_UART1_2STOP=0
 # CONFIG_UART1_IFLOWCONTROL is not set
 # CONFIG_UART1_OFLOWCONTROL is not set
+# CONFIG_UART1_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -574,11 +612,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -598,6 +631,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -638,11 +675,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -656,10 +696,14 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # Application Configuration
 #
 
+#
+# CAN Utilities
+#
+
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -667,11 +711,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -693,18 +737,19 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -712,16 +757,26 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_WGET is not set
 
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
 #
 # Graphics Support
 #
@@ -732,8 +787,8 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -744,11 +799,12 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TELNETD is not set
-CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
@@ -770,15 +826,16 @@ CONFIG_NETUTILS_NETLIB=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/ntosd-dm320/nsh/defconfig b/configs/ntosd-dm320/nsh/defconfig
index 19b759f998..7ec57fecca 100644
--- a/configs/ntosd-dm320/nsh/defconfig
+++ b/configs/ntosd-dm320/nsh/defconfig
@@ -42,10 +42,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+# CONFIG_DEBUG_ALERT is not set
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -366,6 +367,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -419,6 +421,8 @@ CONFIG_DM9X_MODE_AUTO=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -482,15 +486,18 @@ CONFIG_UART1_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -641,11 +648,6 @@ CONFIG_FS_ROMFS=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -730,6 +732,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/ntosd-dm320/poll/defconfig b/configs/ntosd-dm320/poll/defconfig
index ca965d06f4..4bf627a38a 100644
--- a/configs/ntosd-dm320/poll/defconfig
+++ b/configs/ntosd-dm320/poll/defconfig
@@ -37,14 +37,16 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+# CONFIG_DEBUG_ALERT is not set
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,6 +77,7 @@ CONFIG_ARCH="arm"
 CONFIG_ARCH_CHIP_DM320=y
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -92,7 +95,11 @@ CONFIG_ARCH_CHIP_DM320=y
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 CONFIG_ARCH_ARM926EJS=y
 # CONFIG_ARCH_ARM920T is not set
@@ -102,10 +109,21 @@ CONFIG_ARCH_ARM926EJS=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="arm"
 CONFIG_ARCH_CHIP="dm320"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 # CONFIG_ARCH_LOWVECTORS is not set
 # CONFIG_ARCH_ROMPGTABLE is not set
@@ -139,11 +157,14 @@ CONFIG_DM320_UART1=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 CONFIG_ARCH_HAVE_MMU=y
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+# CONFIG_ARCH_HAVE_RESET is not set
 CONFIG_ARCH_USE_MMU=y
 # CONFIG_PAGING is not set
 # CONFIG_ARCH_STACKDUMP is not set
@@ -233,6 +254,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="poll_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=64
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -277,9 +299,10 @@ CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
 CONFIG_SIG_SIGCONDTIMEDOUT=16
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -310,6 +333,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -327,8 +351,23 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 CONFIG_NETDEVICES=y
@@ -336,7 +375,11 @@ CONFIG_NETDEVICES=y
 #
 # General Ethernet MAC Driver Options
 #
+# CONFIG_NETDEV_LOOPBACK is not set
+# CONFIG_NETDEV_TELNET is not set
 # CONFIG_NETDEV_MULTINIC is not set
+CONFIG_ARCH_HAVE_NETDEV_STATISTICS=y
+# CONFIG_NETDEV_LATEINIT is not set
 
 #
 # External Ethernet MAC Device Support
@@ -354,11 +397,11 @@ CONFIG_DM9X_MODE_AUTO=y
 # CONFIG_DM9X_MODE_10MFD is not set
 # CONFIG_DM9X_MODE_100MHD is not set
 # CONFIG_DM9X_MODE_100MFD is not set
-# CONFIG_DM9X_STATS is not set
 # CONFIG_ENC28J60 is not set
 # CONFIG_ENCX24J600 is not set
 # CONFIG_NET_E1000 is not set
 # CONFIG_NET_SLIP is not set
+# CONFIG_NET_FTMAC100 is not set
 # CONFIG_NET_VNET is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
@@ -367,6 +410,8 @@ CONFIG_DM9X_MODE_AUTO=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -390,15 +435,12 @@ CONFIG_UART1_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 CONFIG_SERIAL_NPOLLWAITERS=2
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_UART1_SERIAL_CONSOLE is not set
@@ -416,6 +458,7 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 
 #
 # UART1 Configuration
@@ -428,19 +471,23 @@ CONFIG_UART1_PARITY=0
 CONFIG_UART1_2STOP=0
 # CONFIG_UART1_IFLOWCONTROL is not set
 # CONFIG_UART1_OFLOWCONTROL is not set
+# CONFIG_UART1_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -464,6 +511,7 @@ CONFIG_NET_GUARDSIZE=2
 #
 # CONFIG_NET_MULTILINK is not set
 CONFIG_NET_ETHERNET=y
+# CONFIG_NET_LOOPBACK is not set
 # CONFIG_NET_TUN is not set
 
 #
@@ -549,6 +597,7 @@ CONFIG_IOB_NCHAINS=8
 # Routing Table Configuration
 #
 # CONFIG_NET_ROUTE is not set
+CONFIG_NET_HOSTNAME=""
 
 #
 # Crypto API
@@ -571,11 +620,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -595,6 +639,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -635,10 +683,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -653,14 +705,13 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -668,11 +719,12 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_LEDS is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -681,22 +733,23 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 CONFIG_EXAMPLES_POLL=y
 # CONFIG_EXAMPLES_POLL_NOMAC is not set
 CONFIG_EXAMPLES_POLL_IPADDR=0x0a000002
 CONFIG_EXAMPLES_POLL_DRIPADDR=0x0a000001
 CONFIG_EXAMPLES_POLL_NETMASK=0xffffff00
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -704,17 +757,27 @@ CONFIG_EXAMPLES_POLL_NETMASK=0xffffff00
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_WGET is not set
 # CONFIG_EXAMPLES_XMLRPC is not set
 
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
 #
 # Graphics Support
 #
@@ -725,32 +788,30 @@ CONFIG_EXAMPLES_POLL_NETMASK=0xffffff00
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
+# CONFIG_NETUTILS_CHAT is not set
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TELNETD is not set
-CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
@@ -768,15 +829,16 @@ CONFIG_NETUTILS_NETLIB=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+# CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
-# CONFIG_SYSTEM_POWEROFF is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/ntosd-dm320/thttpd/defconfig b/configs/ntosd-dm320/thttpd/defconfig
index bec6c696fc..04dcca72bd 100644
--- a/configs/ntosd-dm320/thttpd/defconfig
+++ b/configs/ntosd-dm320/thttpd/defconfig
@@ -37,14 +37,16 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+# CONFIG_DEBUG_ALERT is not set
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,6 +77,7 @@ CONFIG_ARCH="arm"
 CONFIG_ARCH_CHIP_DM320=y
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -92,7 +95,11 @@ CONFIG_ARCH_CHIP_DM320=y
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 CONFIG_ARCH_ARM926EJS=y
 # CONFIG_ARCH_ARM920T is not set
@@ -102,10 +109,21 @@ CONFIG_ARCH_ARM926EJS=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="arm"
 CONFIG_ARCH_CHIP="dm320"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 # CONFIG_ARCH_LOWVECTORS is not set
 # CONFIG_ARCH_ROMPGTABLE is not set
@@ -139,11 +157,14 @@ CONFIG_DM320_UART1=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 CONFIG_ARCH_HAVE_MMU=y
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+# CONFIG_ARCH_HAVE_RESET is not set
 CONFIG_ARCH_USE_MMU=y
 # CONFIG_PAGING is not set
 # CONFIG_ARCH_STACKDUMP is not set
@@ -233,6 +254,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="thttp_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=64
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -270,9 +292,10 @@ CONFIG_NAME_MAX=32
 CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -303,6 +326,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -320,8 +344,23 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 CONFIG_NETDEVICES=y
@@ -329,7 +368,11 @@ CONFIG_NETDEVICES=y
 #
 # General Ethernet MAC Driver Options
 #
+# CONFIG_NETDEV_LOOPBACK is not set
+# CONFIG_NETDEV_TELNET is not set
 # CONFIG_NETDEV_MULTINIC is not set
+CONFIG_ARCH_HAVE_NETDEV_STATISTICS=y
+# CONFIG_NETDEV_LATEINIT is not set
 
 #
 # External Ethernet MAC Device Support
@@ -347,11 +390,11 @@ CONFIG_DM9X_MODE_AUTO=y
 # CONFIG_DM9X_MODE_10MFD is not set
 # CONFIG_DM9X_MODE_100MHD is not set
 # CONFIG_DM9X_MODE_100MFD is not set
-# CONFIG_DM9X_STATS is not set
 # CONFIG_ENC28J60 is not set
 # CONFIG_ENCX24J600 is not set
 # CONFIG_NET_E1000 is not set
 # CONFIG_NET_SLIP is not set
+# CONFIG_NET_FTMAC100 is not set
 # CONFIG_NET_VNET is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
@@ -360,6 +403,8 @@ CONFIG_DM9X_MODE_AUTO=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -383,15 +428,12 @@ CONFIG_UART1_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 CONFIG_SERIAL_NPOLLWAITERS=2
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_UART1_SERIAL_CONSOLE is not set
@@ -409,6 +451,7 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 
 #
 # UART1 Configuration
@@ -421,19 +464,23 @@ CONFIG_UART1_PARITY=0
 CONFIG_UART1_2STOP=0
 # CONFIG_UART1_IFLOWCONTROL is not set
 # CONFIG_UART1_OFLOWCONTROL is not set
+# CONFIG_UART1_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -457,6 +504,7 @@ CONFIG_NET_GUARDSIZE=2
 #
 # CONFIG_NET_MULTILINK is not set
 CONFIG_NET_ETHERNET=y
+# CONFIG_NET_LOOPBACK is not set
 # CONFIG_NET_TUN is not set
 
 #
@@ -542,6 +590,7 @@ CONFIG_IOB_NCHAINS=8
 # Routing Table Configuration
 #
 # CONFIG_NET_ROUTE is not set
+CONFIG_NET_HOSTNAME=""
 
 #
 # Crypto API
@@ -565,13 +614,10 @@ CONFIG_FS_READABLE=y
 # CONFIG_FS_FAT is not set
 # CONFIG_FS_NXFFS is not set
 CONFIG_FS_ROMFS=y
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -592,6 +638,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -635,10 +685,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -653,14 +708,13 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -668,11 +722,12 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_LEDS is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -681,19 +736,20 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -702,6 +758,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 CONFIG_EXAMPLES_THTTPD=y
@@ -710,13 +767,24 @@ CONFIG_EXAMPLES_THTTPD_DRIPADDR=0x0a000001
 CONFIG_EXAMPLES_THTTPD_NETMASK=0xffffff00
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
+# CONFIG_EXAMPLES_UNIONFS is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_WGET is not set
 # CONFIG_EXAMPLES_XMLRPC is not set
 
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
 #
 # Graphics Support
 #
@@ -728,20 +796,24 @@ CONFIG_EXAMPLES_THTTPD_NETMASK=0xffffff00
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
+# CONFIG_NETUTILS_CHAT is not set
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TELNETD is not set
 CONFIG_NETUTILS_THTTPD=y
@@ -776,16 +848,10 @@ CONFIG_THTTPD_IDLE_SEND_LIMIT_SEC=300
 CONFIG_THTTPD_TILDE_MAP_NONE=y
 # CONFIG_THTTPD_GENERATE_INDICES is not set
 # CONFIG_THTTPD_USE_URLPATTERN is not set
-CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
@@ -803,15 +869,16 @@ CONFIG_NETUTILS_NETLIB=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+# CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
-# CONFIG_SYSTEM_POWEROFF is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/ntosd-dm320/udp/defconfig b/configs/ntosd-dm320/udp/defconfig
index 44a24d4208..6b37219e68 100644
--- a/configs/ntosd-dm320/udp/defconfig
+++ b/configs/ntosd-dm320/udp/defconfig
@@ -37,12 +37,15 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+# CONFIG_DEBUG_ALERT is not set
 # CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
+# CONFIG_STACK_COLORATION is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
@@ -72,11 +75,14 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_C5471 is not set
 # CONFIG_ARCH_CHIP_CALYPSO is not set
 CONFIG_ARCH_CHIP_DM320=y
+# CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
 # CONFIG_ARCH_CHIP_TIVA is not set
+# CONFIG_ARCH_CHIP_LPC11XX is not set
 # CONFIG_ARCH_CHIP_LPC17XX is not set
 # CONFIG_ARCH_CHIP_LPC214X is not set
 # CONFIG_ARCH_CHIP_LPC2378 is not set
@@ -85,20 +91,39 @@ CONFIG_ARCH_CHIP_DM320=y
 # CONFIG_ARCH_CHIP_NUC1XX is not set
 # CONFIG_ARCH_CHIP_SAMA5 is not set
 # CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
 # CONFIG_ARCH_CHIP_SAM34 is not set
+# CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 CONFIG_ARCH_ARM926EJS=y
 # CONFIG_ARCH_ARM920T is not set
 # CONFIG_ARCH_CORTEXM0 is not set
 # CONFIG_ARCH_CORTEXM3 is not set
 # CONFIG_ARCH_CORTEXM4 is not set
+# CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="arm"
 CONFIG_ARCH_CHIP="dm320"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
+# CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 # CONFIG_ARCH_LOWVECTORS is not set
 # CONFIG_ARCH_ROMPGTABLE is not set
@@ -132,11 +157,14 @@ CONFIG_DM320_UART1=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 CONFIG_ARCH_HAVE_MMU=y
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+# CONFIG_ARCH_HAVE_RESET is not set
 CONFIG_ARCH_USE_MMU=y
 # CONFIG_PAGING is not set
 # CONFIG_ARCH_STACKDUMP is not set
@@ -191,6 +219,7 @@ CONFIG_ARCH_HAVE_LEDS=y
 #
 # Board-Specific Options
 #
+# CONFIG_LIB_BOARDCTL is not set
 
 #
 # RTOS Features
@@ -225,6 +254,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="udp_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=64
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -262,6 +292,14 @@ CONFIG_NAME_MAX=32
 CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
+# CONFIG_MODULE is not set
+
+#
+# Work queue support
+#
+# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_SCHED_HPWORK is not set
+# CONFIG_SCHED_LPWORK is not set
 
 #
 # Stack and heap information
@@ -288,28 +326,52 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 # CONFIG_SPI is not set
 # CONFIG_I2S is not set
+
+#
+# Timer Driver Support
+#
+# CONFIG_TIMER is not set
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
-# CONFIG_TIMER is not set
 # CONFIG_ANALOG is not set
 # CONFIG_AUDIO_DEVICES is not set
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
+# CONFIG_EEPROM is not set
 CONFIG_NETDEVICES=y
 
 #
 # General Ethernet MAC Driver Options
 #
+# CONFIG_NETDEV_LOOPBACK is not set
 # CONFIG_NETDEV_MULTINIC is not set
+CONFIG_ARCH_HAVE_NETDEV_STATISTICS=y
+# CONFIG_NETDEV_LATEINIT is not set
 
 #
 # External Ethernet MAC Device Support
@@ -327,11 +389,11 @@ CONFIG_DM9X_MODE_AUTO=y
 # CONFIG_DM9X_MODE_10MFD is not set
 # CONFIG_DM9X_MODE_100MHD is not set
 # CONFIG_DM9X_MODE_100MFD is not set
-# CONFIG_DM9X_STATS is not set
 # CONFIG_ENC28J60 is not set
 # CONFIG_ENCX24J600 is not set
 # CONFIG_NET_E1000 is not set
 # CONFIG_NET_SLIP is not set
+# CONFIG_NET_FTMAC100 is not set
 # CONFIG_NET_VNET is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
@@ -340,6 +402,8 @@ CONFIG_DM9X_MODE_AUTO=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -362,14 +426,16 @@ CONFIG_UART1_SERIALDRIVER=y
 # CONFIG_USART6_SERIALDRIVER is not set
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
+# CONFIG_OTHER_UART_SERIALDRIVER is not set
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
+# CONFIG_SERIAL_IFLOWCONTROL is not set
+# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
+# CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_UART1_SERIAL_CONSOLE is not set
+# CONFIG_OTHER_SERIAL_CONSOLE is not set
 # CONFIG_NO_SERIAL_CONSOLE is not set
 
 #
@@ -383,6 +449,7 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 
 #
 # UART1 Configuration
@@ -395,20 +462,23 @@ CONFIG_UART1_PARITY=0
 CONFIG_UART1_2STOP=0
 # CONFIG_UART1_IFLOWCONTROL is not set
 # CONFIG_UART1_OFLOWCONTROL is not set
-# CONFIG_SERIAL_IFLOWCONTROL is not set
-# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_UART1_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -417,13 +487,34 @@ CONFIG_ARCH_HAVE_NET=y
 # CONFIG_ARCH_HAVE_PHY is not set
 CONFIG_NET=y
 # CONFIG_NET_NOINTS is not set
-CONFIG_NET_IPv4=y
-# CONFIG_NET_MULTIBUFFER is not set
 # CONFIG_NET_PROMISCUOUS is not set
-CONFIG_NET_ETH_MTU=562
-CONFIG_NET_ETH_TCP_RECVWNDO=536
+
+#
+# Driver buffer configuration
+#
+# CONFIG_NET_MULTIBUFFER is not set
+CONFIG_NET_ETH_MTU=590
 CONFIG_NET_GUARDSIZE=2
 
+#
+# Data link support
+#
+# CONFIG_NET_MULTILINK is not set
+CONFIG_NET_ETHERNET=y
+# CONFIG_NET_LOOPBACK is not set
+# CONFIG_NET_TUN is not set
+
+#
+# Network Device Operations
+#
+# CONFIG_NETDEV_PHY_IOCTL is not set
+
+#
+# Internet Protocol Selection
+#
+CONFIG_NET_IPv4=y
+# CONFIG_NET_IPv6 is not set
+
 #
 # Socket Support
 #
@@ -433,14 +524,14 @@ CONFIG_NET_SOCKOPTS=y
 # CONFIG_NET_SOLINGER is not set
 
 #
-# Network Device Operations
+# Raw Socket Support
 #
-# CONFIG_NETDEV_PHY_IOCTL is not set
+# CONFIG_NET_PKT is not set
 
 #
-# Raw Socket Support
+# Unix Domain Socket Support
 #
-# CONFIG_NET_PKT is not set
+# CONFIG_NET_LOCAL is not set
 
 #
 # TCP/IP Networking
@@ -455,6 +546,7 @@ CONFIG_NET_UDP_CHECKSUMS=y
 CONFIG_NET_UDP_CONNS=8
 CONFIG_NET_BROADCAST=y
 # CONFIG_NET_RXAVAIL is not set
+CONFIG_NET_UDP_READAHEAD=y
 
 #
 # ICMP Networking Support
@@ -479,7 +571,10 @@ CONFIG_NET_ARP_MAXAGE=120
 #
 # Network I/O Buffer Support
 #
-# CONFIG_NET_IOB is not set
+CONFIG_NET_IOB=y
+CONFIG_IOB_NBUFFERS=8
+CONFIG_IOB_BUFSIZE=196
+CONFIG_IOB_NCHAINS=8
 # CONFIG_NET_ARCH_INCR32 is not set
 # CONFIG_NET_ARCH_CHKSUM is not set
 # CONFIG_NET_STATISTICS is not set
@@ -488,7 +583,7 @@ CONFIG_NET_ARP_MAXAGE=120
 # Routing Table Configuration
 #
 # CONFIG_NET_ROUTE is not set
-CONFIG_NET_ETHERNET=y
+CONFIG_NET_HOSTNAME=""
 
 #
 # Crypto API
@@ -506,13 +601,10 @@ CONFIG_DISABLE_MOUNTPOINT=y
 # CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
 # CONFIG_FS_READABLE is not set
 # CONFIG_FS_WRITABLE is not set
+# CONFIG_FS_NAMED_SEMAPHORES is not set
 # CONFIG_FS_RAMMAP is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
-
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -534,7 +626,11 @@ CONFIG_MM_REGIONS=1
 # CONFIG_AUDIO is not set
 
 #
-# Binary Formats
+# Wireless Support
+#
+
+#
+# Binary Loader
 #
 # CONFIG_BINFMT_DISABLE is not set
 # CONFIG_NXFLAT is not set
@@ -557,6 +653,7 @@ CONFIG_NUNGET_CHARS=2
 # CONFIG_NOPRINTF_FIELDWIDTH is not set
 # CONFIG_LIBC_FLOATINGPOINT is not set
 CONFIG_LIBC_LONG_LONG=y
+# CONFIG_LIBC_IOCTL_VARIADIC is not set
 CONFIG_LIB_RAND_ORDER=1
 # CONFIG_EOL_IS_CR is not set
 # CONFIG_EOL_IS_LF is not set
@@ -568,14 +665,19 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
 # CONFIG_LIBC_STRERROR is not set
 # CONFIG_LIBC_PERROR_STDOUT is not set
 CONFIG_ARCH_LOWPUTC=y
+# CONFIG_TIME_EXTENDED is not set
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_DNSCLIENT is not set
 
 #
 # Non-standard Library Support
 #
-# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -590,26 +692,27 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
+# CONFIG_EXAMPLES_DISCOVER is not set
 # CONFIG_EXAMPLES_ELF is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_LEDS is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -617,80 +720,90 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
-# CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
 CONFIG_EXAMPLES_UDP=y
 # CONFIG_EXAMPLES_UDP_SERVER is not set
+CONFIG_EXAMPLES_UDP_IPv4=y
+
+#
+# IPv4 addresses
+#
 CONFIG_EXAMPLES_UDP_IPADDR=0x0a000002
 CONFIG_EXAMPLES_UDP_DRIPADDR=0x0a000001
 CONFIG_EXAMPLES_UDP_NETMASK=0xffffff00
 CONFIG_EXAMPLES_UDP_SERVERIP=0x0a000001
-# CONFIG_EXAMPLES_DISCOVER is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
+# CONFIG_EXAMPLES_UDPBLASTER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
 #
 # CONFIG_TIFF is not set
+# CONFIG_GRAPHICS_TRAVELER is not set
 
 #
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_MICROPYTHON is not set
 # CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
 # CONFIG_NETUTILS_DHCPC is not set
 # CONFIG_NETUTILS_DHCPD is not set
+# CONFIG_NETUTILS_DISCOVER is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
-# CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETDB_DNSCLIENT is not set
-# CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_TFTPC is not set
-# CONFIG_NETUTILS_THTTPD is not set
 CONFIG_NETUTILS_NETLIB=y
-# CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_NTPCLIENT is not set
-# CONFIG_NETUTILS_DISCOVER is not set
-
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
+# CONFIG_NETUTILS_PPPD is not set
+# CONFIG_NETUTILS_SMTP is not set
+# CONFIG_NETUTILS_TFTPC is not set
 
 #
 # NSH Library
@@ -709,111 +822,16 @@ CONFIG_NETUTILS_NETLIB=y
 #
 # System Libraries and NSH Add-Ons
 #
-
-#
-# Custom Free Memory Command
-#
-# CONFIG_SYSTEM_FREE is not set
-
-#
-# EMACS-like Command Line Editor
-#
 # CONFIG_SYSTEM_CLE is not set
-
-#
-# FLASH Program Installation
-#
-# CONFIG_SYSTEM_INSTALL is not set
-
-#
-# FLASH Erase-all Command
-#
-
-#
-# Intel HEX to binary conversion
-#
+# CONFIG_SYSTEM_CUTERM is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-
-#
-# I2C tool
-#
-
-#
-# INI File Parser
-#
-# CONFIG_FSUTILS_INIFILE is not set
-
-#
-# NxPlayer media player library / command Line
-#
-# CONFIG_SYSTEM_NXPLAYER is not set
-
-#
-# RAM test
-#
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
-
-#
-# readline()
-#
+# CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
-
-#
-# P-Code Support
-#
-
-#
-# PHY Tool
-#
-
-#
-# Power Off
-#
-# CONFIG_SYSTEM_POWEROFF is not set
-
-#
-# RAMTRON
-#
-
-#
-# SD Card
-#
-
-#
-# Sudoku
-#
 # CONFIG_SYSTEM_SUDOKU is not set
-
-#
-# Sysinfo
-#
-
-#
-# VI Work-Alike Editor
-#
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
-
-#
-# Stack Monitor
-#
-
-#
-# USB CDC/ACM Device Commands
-#
-
-#
-# USB Composite Device Commands
-#
-
-#
-# USB Mass Storage Device Commands
-#
-
-#
-# USB Monitor
-#
-
-#
-# Zmodem Commands
-#
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/ntosd-dm320/webserver/defconfig b/configs/ntosd-dm320/webserver/defconfig
index ef35dd42fc..dd23e42cf9 100644
--- a/configs/ntosd-dm320/webserver/defconfig
+++ b/configs/ntosd-dm320/webserver/defconfig
@@ -12,10 +12,6 @@ CONFIG_HOST_LINUX=y
 # CONFIG_HOST_OSX is not set
 # CONFIG_HOST_WINDOWS is not set
 # CONFIG_HOST_OTHER is not set
-# CONFIG_WINDOWS_NATIVE is not set
-# CONFIG_WINDOWS_CYGWIN is not set
-# CONFIG_WINDOWS_MSYS is not set
-# CONFIG_WINDOWS_OTHER is not set
 
 #
 # Build Configuration
@@ -41,14 +37,16 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+# CONFIG_DEBUG_ALERT is not set
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -79,6 +77,7 @@ CONFIG_ARCH="arm"
 CONFIG_ARCH_CHIP_DM320=y
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -96,7 +95,11 @@ CONFIG_ARCH_CHIP_DM320=y
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 CONFIG_ARCH_ARM926EJS=y
 # CONFIG_ARCH_ARM920T is not set
@@ -106,10 +109,21 @@ CONFIG_ARCH_ARM926EJS=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="arm"
 CONFIG_ARCH_CHIP="dm320"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 # CONFIG_ARCH_LOWVECTORS is not set
 # CONFIG_ARCH_ROMPGTABLE is not set
@@ -119,10 +133,7 @@ CONFIG_ARCH_HAVE_LOWVECTORS=y
 #
 # CONFIG_ARM_TOOLCHAIN_BUILDROOT is not set
 CONFIG_ARM_TOOLCHAIN_CODESOURCERYL=y
-# CONFIG_ARM_TOOLCHAIN_CODESOURCERYW is not set
-# CONFIG_ARM_TOOLCHAIN_DEVKITARM is not set
 # CONFIG_ARM_TOOLCHAIN_GNU_EABIL is not set
-# CONFIG_ARM_TOOLCHAIN_GNU_EABIW is not set
 # CONFIG_ARM_TOOLCHAIN_GNU_OABI is not set
 
 #
@@ -146,11 +157,14 @@ CONFIG_DM320_UART1=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 CONFIG_ARCH_HAVE_MMU=y
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+# CONFIG_ARCH_HAVE_RESET is not set
 CONFIG_ARCH_USE_MMU=y
 # CONFIG_PAGING is not set
 # CONFIG_ARCH_STACKDUMP is not set
@@ -240,6 +254,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="webserver_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -284,9 +299,10 @@ CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
 CONFIG_SIG_SIGCONDTIMEDOUT=16
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -317,6 +333,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -334,8 +351,23 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 CONFIG_NETDEVICES=y
@@ -343,7 +375,11 @@ CONFIG_NETDEVICES=y
 #
 # General Ethernet MAC Driver Options
 #
+# CONFIG_NETDEV_LOOPBACK is not set
+# CONFIG_NETDEV_TELNET is not set
 # CONFIG_NETDEV_MULTINIC is not set
+CONFIG_ARCH_HAVE_NETDEV_STATISTICS=y
+# CONFIG_NETDEV_LATEINIT is not set
 
 #
 # External Ethernet MAC Device Support
@@ -361,11 +397,11 @@ CONFIG_DM9X_MODE_AUTO=y
 # CONFIG_DM9X_MODE_10MFD is not set
 # CONFIG_DM9X_MODE_100MHD is not set
 # CONFIG_DM9X_MODE_100MFD is not set
-# CONFIG_DM9X_STATS is not set
 # CONFIG_ENC28J60 is not set
 # CONFIG_ENCX24J600 is not set
 # CONFIG_NET_E1000 is not set
 # CONFIG_NET_SLIP is not set
+# CONFIG_NET_FTMAC100 is not set
 # CONFIG_NET_VNET is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
@@ -374,6 +410,8 @@ CONFIG_DM9X_MODE_AUTO=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -397,14 +435,11 @@ CONFIG_UART1_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_UART1_SERIAL_CONSOLE is not set
@@ -422,6 +457,7 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 
 #
 # UART1 Configuration
@@ -434,19 +470,23 @@ CONFIG_UART1_PARITY=0
 CONFIG_UART1_2STOP=0
 # CONFIG_UART1_IFLOWCONTROL is not set
 # CONFIG_UART1_OFLOWCONTROL is not set
+# CONFIG_UART1_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -470,6 +510,7 @@ CONFIG_NET_GUARDSIZE=2
 #
 # CONFIG_NET_MULTILINK is not set
 CONFIG_NET_ETHERNET=y
+# CONFIG_NET_LOOPBACK is not set
 # CONFIG_NET_TUN is not set
 
 #
@@ -555,6 +596,7 @@ CONFIG_IOB_NCHAINS=8
 # Routing Table Configuration
 #
 # CONFIG_NET_ROUTE is not set
+CONFIG_NET_HOSTNAME=""
 
 #
 # Crypto API
@@ -577,11 +619,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -601,6 +638,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -641,10 +682,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -659,14 +704,13 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -674,11 +718,12 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_LEDS is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -687,18 +732,19 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -706,20 +752,30 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
+# CONFIG_EXAMPLES_USBTERM is not set
+# CONFIG_EXAMPLES_WATCHDOG is not set
 CONFIG_EXAMPLES_WEBSERVER=y
 CONFIG_EXAMPLES_WEBSERVER_IPADDR=0x0a000002
 CONFIG_EXAMPLES_WEBSERVER_DRIPADDR=0x0a000001
 CONFIG_EXAMPLES_WEBSERVER_NETMASK=0xffffff00
 CONFIG_EXAMPLES_WEBSERVER_NOMAC=y
-# CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBTERM is not set
-# CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WGET is not set
 
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
 #
 # Graphics Support
 #
@@ -730,22 +786,24 @@ CONFIG_EXAMPLES_WEBSERVER_NOMAC=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TELNETD is not set
-CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 CONFIG_NETUTILS_WEBSERVER=y
 # CONFIG_NETUTILS_HTTPD_SINGLECONNECT is not set
@@ -761,11 +819,6 @@ CONFIG_NETUTILS_HTTPD_CLASSIC=y
 CONFIG_NETUTILS_HTTPD_KEEPALIVE_DISABLE=y
 # CONFIG_NETUTILS_XMLRPC is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
@@ -783,15 +836,16 @@ CONFIG_NETUTILS_HTTPD_KEEPALIVE_DISABLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+# CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
-# CONFIG_SYSTEM_POWEROFF is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/nucleo-144/f746-evalos/defconfig b/configs/nucleo-144/f746-evalos/defconfig
index f8c9ad8868..e95085b7c8 100644
--- a/configs/nucleo-144/f746-evalos/defconfig
+++ b/configs/nucleo-144/f746-evalos/defconfig
@@ -16,7 +16,7 @@ CONFIG_HOST_LINUX=y
 #
 # Build Configuration
 #
-CONFIG_APPS_DIR="../apps"
+# CONFIG_APPS_DIR="../apps"
 CONFIG_BUILD_FLAT=y
 # CONFIG_BUILD_2PASS is not set
 
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 CONFIG_STACK_COLORATION=y
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 CONFIG_DEBUG_NOOPT=y
@@ -255,6 +257,9 @@ CONFIG_STM32F7_HAVE_RNG=y
 CONFIG_STM32F7_HAVE_SPI5=y
 CONFIG_STM32F7_HAVE_SPI6=y
 # CONFIG_STM32F7_HAVE_SDMMC2 is not set
+# CONFIG_STM32F7_HAVE_ADC1_DMA is not set
+# CONFIG_STM32F7_HAVE_ADC2_DMA is not set
+# CONFIG_STM32F7_HAVE_ADC3_DMA is not set
 # CONFIG_STM32F7_HAVE_CAN3 is not set
 CONFIG_STM32F7_HAVE_DCMI=y
 # CONFIG_STM32F7_HAVE_DSIHOST is not set
@@ -270,6 +275,7 @@ CONFIG_STM32F7_HAVE_DMA2D=y
 # CONFIG_STM32F7_I2C is not set
 # CONFIG_STM32F7_SAI is not set
 # CONFIG_STM32F7_SPI is not set
+# CONFIG_STM32F7_TIM is not set
 CONFIG_STM32F7_USART=y
 # CONFIG_STM32F7_ADC1 is not set
 # CONFIG_STM32F7_ADC2 is not set
@@ -290,6 +296,7 @@ CONFIG_STM32F7_USART=y
 # CONFIG_STM32F7_I2C1 is not set
 # CONFIG_STM32F7_I2C2 is not set
 # CONFIG_STM32F7_I2C3 is not set
+# CONFIG_STM32F7_I2C4 is not set
 # CONFIG_STM32F7_LPTIM1 is not set
 # CONFIG_STM32F7_LTDC is not set
 # CONFIG_STM32F7_OTGFS is not set
@@ -320,7 +327,6 @@ CONFIG_STM32F7_USART=y
 # CONFIG_STM32F7_TIM12 is not set
 # CONFIG_STM32F7_TIM13 is not set
 # CONFIG_STM32F7_TIM14 is not set
-# CONFIG_STM32F7_TIM15 is not set
 # CONFIG_STM32F7_USART1 is not set
 # CONFIG_STM32F7_USART2 is not set
 CONFIG_STM32F7_USART3=y
@@ -340,6 +346,10 @@ CONFIG_STM32F7_USART_BREAKS=y
 CONFIG_STM32F7_SERIALBRK_BSDCOMPAT=y
 # CONFIG_STM32F7_CUSTOM_CLOCKCONFIG is not set
 
+#
+# Timer Configuration
+#
+
 #
 # Architecture Options
 #
@@ -569,6 +579,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -597,6 +609,7 @@ CONFIG_USERLED=y
 CONFIG_USERLED_LOWER=y
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -608,6 +621,8 @@ CONFIG_USERLED_LOWER=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -657,15 +672,18 @@ CONFIG_USART3_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -704,11 +722,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -781,6 +794,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -825,10 +839,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_HELLO is not set
 CONFIG_EXAMPLES_HELLOXX=y
 CONFIG_EXAMPLES_HELLOXX_CXXINITIALIZE=y
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 CONFIG_EXAMPLES_LEDS=y
 CONFIG_EXAMPLES_LEDS_PRIORITY=100
 CONFIG_EXAMPLES_LEDS_STACKSIZE=2048
@@ -843,17 +857,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -861,17 +875,17 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -893,8 +907,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1018,12 +1032,12 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1034,8 +1048,8 @@ CONFIG_READLINE_MAX_EXTCMDS=64
 CONFIG_READLINE_CMD_HISTORY=y
 CONFIG_READLINE_CMD_HISTORY_LINELEN=80
 CONFIG_READLINE_CMD_HISTORY_LEN=16
-# CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_STACKMONITOR is not set
+# CONFIG_SYSTEM_SUDOKU is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/nucleo-144/f746-nsh/defconfig b/configs/nucleo-144/f746-nsh/defconfig
index 7cbeb67093..d20123a2f0 100644
--- a/configs/nucleo-144/f746-nsh/defconfig
+++ b/configs/nucleo-144/f746-nsh/defconfig
@@ -16,7 +16,7 @@ CONFIG_HOST_LINUX=y
 #
 # Build Configuration
 #
-CONFIG_APPS_DIR="../apps"
+# CONFIG_APPS_DIR="../apps"
 CONFIG_BUILD_FLAT=y
 # CONFIG_BUILD_2PASS is not set
 
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 CONFIG_STACK_COLORATION=y
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 CONFIG_DEBUG_NOOPT=y
@@ -255,6 +257,9 @@ CONFIG_STM32F7_HAVE_RNG=y
 CONFIG_STM32F7_HAVE_SPI5=y
 CONFIG_STM32F7_HAVE_SPI6=y
 # CONFIG_STM32F7_HAVE_SDMMC2 is not set
+# CONFIG_STM32F7_HAVE_ADC1_DMA is not set
+# CONFIG_STM32F7_HAVE_ADC2_DMA is not set
+# CONFIG_STM32F7_HAVE_ADC3_DMA is not set
 # CONFIG_STM32F7_HAVE_CAN3 is not set
 CONFIG_STM32F7_HAVE_DCMI=y
 # CONFIG_STM32F7_HAVE_DSIHOST is not set
@@ -270,6 +275,7 @@ CONFIG_STM32F7_HAVE_DMA2D=y
 # CONFIG_STM32F7_I2C is not set
 # CONFIG_STM32F7_SAI is not set
 # CONFIG_STM32F7_SPI is not set
+# CONFIG_STM32F7_TIM is not set
 CONFIG_STM32F7_USART=y
 # CONFIG_STM32F7_ADC1 is not set
 # CONFIG_STM32F7_ADC2 is not set
@@ -290,6 +296,7 @@ CONFIG_STM32F7_USART=y
 # CONFIG_STM32F7_I2C1 is not set
 # CONFIG_STM32F7_I2C2 is not set
 # CONFIG_STM32F7_I2C3 is not set
+# CONFIG_STM32F7_I2C4 is not set
 # CONFIG_STM32F7_LPTIM1 is not set
 # CONFIG_STM32F7_LTDC is not set
 # CONFIG_STM32F7_OTGFS is not set
@@ -320,7 +327,6 @@ CONFIG_STM32F7_USART=y
 # CONFIG_STM32F7_TIM12 is not set
 # CONFIG_STM32F7_TIM13 is not set
 # CONFIG_STM32F7_TIM14 is not set
-# CONFIG_STM32F7_TIM15 is not set
 # CONFIG_STM32F7_USART1 is not set
 # CONFIG_STM32F7_USART2 is not set
 # CONFIG_STM32F7_USART3 is not set
@@ -340,6 +346,10 @@ CONFIG_STM32F7_USART_BREAKS=y
 CONFIG_STM32F7_SERIALBRK_BSDCOMPAT=y
 # CONFIG_STM32F7_CUSTOM_CLOCKCONFIG is not set
 
+#
+# Timer Configuration
+#
+
 #
 # Architecture Options
 #
@@ -556,6 +566,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -583,6 +595,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -594,6 +607,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -643,15 +658,18 @@ CONFIG_USART6_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -689,11 +707,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -766,6 +779,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -809,10 +823,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -822,17 +836,17 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NSH_CXXINITIALIZE is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -840,16 +854,16 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -871,8 +885,8 @@ CONFIG_EXAMPLES_NSH=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -996,20 +1010,20 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
-# CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_STACKMONITOR is not set
+# CONFIG_SYSTEM_SUDOKU is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/nucleo-144/f767-evalos/defconfig b/configs/nucleo-144/f767-evalos/defconfig
index d1b95c6d2b..6393ea7d18 100644
--- a/configs/nucleo-144/f767-evalos/defconfig
+++ b/configs/nucleo-144/f767-evalos/defconfig
@@ -16,7 +16,7 @@ CONFIG_HOST_LINUX=y
 #
 # Build Configuration
 #
-CONFIG_APPS_DIR="../apps"
+# CONFIG_APPS_DIR="../apps"
 CONFIG_BUILD_FLAT=y
 # CONFIG_BUILD_2PASS is not set
 
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 CONFIG_STACK_COLORATION=y
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 CONFIG_DEBUG_NOOPT=y
@@ -255,6 +257,9 @@ CONFIG_STM32F7_HAVE_RNG=y
 CONFIG_STM32F7_HAVE_SPI5=y
 CONFIG_STM32F7_HAVE_SPI6=y
 CONFIG_STM32F7_HAVE_SDMMC2=y
+# CONFIG_STM32F7_HAVE_ADC1_DMA is not set
+# CONFIG_STM32F7_HAVE_ADC2_DMA is not set
+# CONFIG_STM32F7_HAVE_ADC3_DMA is not set
 CONFIG_STM32F7_HAVE_CAN3=y
 CONFIG_STM32F7_HAVE_DCMI=y
 # CONFIG_STM32F7_HAVE_DSIHOST is not set
@@ -270,6 +275,7 @@ CONFIG_STM32F7_HAVE_DFSDM1=y
 # CONFIG_STM32F7_I2C is not set
 # CONFIG_STM32F7_SAI is not set
 # CONFIG_STM32F7_SPI is not set
+# CONFIG_STM32F7_TIM is not set
 CONFIG_STM32F7_USART=y
 # CONFIG_STM32F7_ADC1 is not set
 # CONFIG_STM32F7_ADC2 is not set
@@ -293,6 +299,7 @@ CONFIG_STM32F7_USART=y
 # CONFIG_STM32F7_I2C1 is not set
 # CONFIG_STM32F7_I2C2 is not set
 # CONFIG_STM32F7_I2C3 is not set
+# CONFIG_STM32F7_I2C4 is not set
 # CONFIG_STM32F7_LPTIM1 is not set
 # CONFIG_STM32F7_LTDC is not set
 # CONFIG_STM32F7_OTGFS is not set
@@ -324,7 +331,6 @@ CONFIG_STM32F7_USART=y
 # CONFIG_STM32F7_TIM12 is not set
 # CONFIG_STM32F7_TIM13 is not set
 # CONFIG_STM32F7_TIM14 is not set
-# CONFIG_STM32F7_TIM15 is not set
 # CONFIG_STM32F7_USART1 is not set
 # CONFIG_STM32F7_USART2 is not set
 CONFIG_STM32F7_USART3=y
@@ -344,6 +350,10 @@ CONFIG_STM32F7_USART_BREAKS=y
 CONFIG_STM32F7_SERIALBRK_BSDCOMPAT=y
 # CONFIG_STM32F7_CUSTOM_CLOCKCONFIG is not set
 
+#
+# Timer Configuration
+#
+
 #
 # Architecture Options
 #
@@ -573,6 +583,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -601,6 +613,7 @@ CONFIG_USERLED=y
 CONFIG_USERLED_LOWER=y
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -612,6 +625,8 @@ CONFIG_USERLED_LOWER=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -642,7 +657,6 @@ CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_DMA is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_USART3_SERIAL_CONSOLE=y
-# CONFIG_UART8_SERIAL_CONSOLE is not set
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
 # CONFIG_NO_SERIAL_CONSOLE is not set
 
@@ -662,15 +676,18 @@ CONFIG_USART3_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -709,11 +726,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -786,6 +798,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -830,10 +843,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_HELLO is not set
 CONFIG_EXAMPLES_HELLOXX=y
 CONFIG_EXAMPLES_HELLOXX_CXXINITIALIZE=y
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 CONFIG_EXAMPLES_LEDS=y
 CONFIG_EXAMPLES_LEDS_PRIORITY=100
 CONFIG_EXAMPLES_LEDS_STACKSIZE=2048
@@ -848,17 +861,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -866,17 +879,17 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -898,8 +911,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1023,12 +1036,12 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1039,8 +1052,8 @@ CONFIG_READLINE_MAX_EXTCMDS=64
 CONFIG_READLINE_CMD_HISTORY=y
 CONFIG_READLINE_CMD_HISTORY_LINELEN=80
 CONFIG_READLINE_CMD_HISTORY_LEN=16
-# CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_STACKMONITOR is not set
+# CONFIG_SYSTEM_SUDOKU is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/nucleo-144/f767-nsh/defconfig b/configs/nucleo-144/f767-nsh/defconfig
index 8b1e83fad4..c7eb54a599 100644
--- a/configs/nucleo-144/f767-nsh/defconfig
+++ b/configs/nucleo-144/f767-nsh/defconfig
@@ -16,7 +16,7 @@ CONFIG_HOST_LINUX=y
 #
 # Build Configuration
 #
-CONFIG_APPS_DIR="../apps"
+# CONFIG_APPS_DIR="../apps"
 CONFIG_BUILD_FLAT=y
 # CONFIG_BUILD_2PASS is not set
 
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 CONFIG_STACK_COLORATION=y
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 CONFIG_DEBUG_NOOPT=y
@@ -255,6 +257,9 @@ CONFIG_STM32F7_HAVE_RNG=y
 CONFIG_STM32F7_HAVE_SPI5=y
 CONFIG_STM32F7_HAVE_SPI6=y
 CONFIG_STM32F7_HAVE_SDMMC2=y
+# CONFIG_STM32F7_HAVE_ADC1_DMA is not set
+# CONFIG_STM32F7_HAVE_ADC2_DMA is not set
+# CONFIG_STM32F7_HAVE_ADC3_DMA is not set
 CONFIG_STM32F7_HAVE_CAN3=y
 CONFIG_STM32F7_HAVE_DCMI=y
 # CONFIG_STM32F7_HAVE_DSIHOST is not set
@@ -270,6 +275,7 @@ CONFIG_STM32F7_HAVE_DFSDM1=y
 # CONFIG_STM32F7_I2C is not set
 # CONFIG_STM32F7_SAI is not set
 # CONFIG_STM32F7_SPI is not set
+# CONFIG_STM32F7_TIM is not set
 CONFIG_STM32F7_USART=y
 # CONFIG_STM32F7_ADC1 is not set
 # CONFIG_STM32F7_ADC2 is not set
@@ -293,6 +299,7 @@ CONFIG_STM32F7_USART=y
 # CONFIG_STM32F7_I2C1 is not set
 # CONFIG_STM32F7_I2C2 is not set
 # CONFIG_STM32F7_I2C3 is not set
+# CONFIG_STM32F7_I2C4 is not set
 # CONFIG_STM32F7_LPTIM1 is not set
 # CONFIG_STM32F7_LTDC is not set
 # CONFIG_STM32F7_OTGFS is not set
@@ -324,7 +331,6 @@ CONFIG_STM32F7_USART=y
 # CONFIG_STM32F7_TIM12 is not set
 # CONFIG_STM32F7_TIM13 is not set
 # CONFIG_STM32F7_TIM14 is not set
-# CONFIG_STM32F7_TIM15 is not set
 # CONFIG_STM32F7_USART1 is not set
 # CONFIG_STM32F7_USART2 is not set
 # CONFIG_STM32F7_USART3 is not set
@@ -344,6 +350,10 @@ CONFIG_STM32F7_USART_BREAKS=y
 CONFIG_STM32F7_SERIALBRK_BSDCOMPAT=y
 # CONFIG_STM32F7_CUSTOM_CLOCKCONFIG is not set
 
+#
+# Timer Configuration
+#
+
 #
 # Architecture Options
 #
@@ -560,6 +570,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -587,6 +599,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -598,6 +611,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -628,7 +643,6 @@ CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_DMA is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_USART6_SERIAL_CONSOLE=y
-# CONFIG_UART8_SERIAL_CONSOLE is not set
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
 # CONFIG_NO_SERIAL_CONSOLE is not set
 
@@ -648,15 +662,18 @@ CONFIG_USART6_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -694,11 +711,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -771,6 +783,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -814,10 +827,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -827,17 +840,17 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NSH_CXXINITIALIZE is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -845,16 +858,16 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -876,8 +889,8 @@ CONFIG_EXAMPLES_NSH=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1001,20 +1014,20 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
-# CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_STACKMONITOR is not set
+# CONFIG_SYSTEM_SUDOKU is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/nucleo-f303re/adc/defconfig b/configs/nucleo-f303re/adc/defconfig
index 372d811224..d8aeb57c28 100644
--- a/configs/nucleo-f303re/adc/defconfig
+++ b/configs/nucleo-f303re/adc/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -199,6 +201,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -415,6 +418,10 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 CONFIG_STM32_CCMEXCLUDE=y
 # CONFIG_STM32_DMACAPABLE is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -674,7 +681,12 @@ CONFIG_ADC_FIFOSIZE=8
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -682,6 +694,7 @@ CONFIG_ADC_FIFOSIZE=8
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -696,14 +709,17 @@ CONFIG_ADC_FIFOSIZE=8
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_NONE=y
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -740,11 +756,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -817,6 +828,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -851,10 +863,10 @@ CONFIG_EXAMPLES_ADC_SWTRIG=y
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -863,18 +875,18 @@ CONFIG_EXAMPLES_ADC_SWTRIG=y
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -888,10 +900,10 @@ CONFIG_EXAMPLES_ADC_SWTRIG=y
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -913,8 +925,8 @@ CONFIG_EXAMPLES_ADC_SWTRIG=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -947,16 +959,16 @@ CONFIG_EXAMPLES_ADC_SWTRIG=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/nucleo-f303re/can/defconfig b/configs/nucleo-f303re/can/defconfig
index 9d8f635d96..d25a894c12 100644
--- a/configs/nucleo-f303re/can/defconfig
+++ b/configs/nucleo-f303re/can/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -204,6 +206,7 @@ CONFIG_CAN_TSEG2=7
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -419,6 +422,10 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_CCMEXCLUDE is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -676,7 +683,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -684,6 +696,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -698,14 +711,17 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_NONE=y
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -742,11 +758,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -819,6 +830,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -853,10 +865,10 @@ CONFIG_EXAMPLES_CAN_READWRITE=y
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -865,18 +877,18 @@ CONFIG_EXAMPLES_CAN_READWRITE=y
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -890,10 +902,10 @@ CONFIG_EXAMPLES_CAN_READWRITE=y
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -915,8 +927,8 @@ CONFIG_EXAMPLES_CAN_READWRITE=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -949,16 +961,16 @@ CONFIG_EXAMPLES_CAN_READWRITE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/nucleo-f303re/nxlines/defconfig b/configs/nucleo-f303re/nxlines/defconfig
index 265a518bbc..aa42977bb4 100644
--- a/configs/nucleo-f303re/nxlines/defconfig
+++ b/configs/nucleo-f303re/nxlines/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -201,6 +203,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -416,6 +419,10 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_CCMEXCLUDE is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -668,6 +675,8 @@ CONFIG_SPI_CMDDATA=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -682,10 +691,14 @@ CONFIG_SPI_CMDDATA=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 CONFIG_LCD=y
 
 #
-# Common LCD Settings
+# Common Graphic LCD Settings
 #
 # CONFIG_LCD_CONSOLE is not set
 # CONFIG_LCD_NOGETRUN is not set
@@ -738,11 +751,7 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_LCD_RLANDSCAPE is not set
 # CONFIG_LCD_ILI9341 is not set
 # CONFIG_LCD_RA8875 is not set
-
-#
-# Alphanumeric/Segment LCD Devices
-#
-# CONFIG_LCD_LCD1602 is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -750,6 +759,7 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -764,18 +774,21 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 CONFIG_RAMLOG=y
-CONFIG_RAMLOG_SYSLOG=y
 CONFIG_RAMLOG_BUFSIZE=1024
 # CONFIG_RAMLOG_CRLF is not set
 CONFIG_RAMLOG_NONBLOCKING=y
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_RAMLOG_SYSLOG=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -812,12 +825,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-# CONFIG_SYSLOG_CHAR is not set
-
 #
 # Graphics Support
 #
@@ -976,6 +983,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -1006,10 +1014,10 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_LCDRW is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
@@ -1019,7 +1027,6 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
@@ -1031,13 +1038,14 @@ CONFIG_EXAMPLES_NXLINES_LINEWIDTH=16
 CONFIG_EXAMPLES_NXLINES_BORDERWIDTH=16
 CONFIG_EXAMPLES_NXLINES_BPP=8
 CONFIG_EXAMPLES_NXLINES_EXTERNINIT=y
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1051,10 +1059,10 @@ CONFIG_EXAMPLES_NXLINES_EXTERNINIT=y
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1076,8 +1084,8 @@ CONFIG_EXAMPLES_NXLINES_EXTERNINIT=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1110,16 +1118,16 @@ CONFIG_EXAMPLES_NXLINES_EXTERNINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/nucleo-f303re/pwm/defconfig b/configs/nucleo-f303re/pwm/defconfig
index 18a81bc377..bb9fdd5178 100644
--- a/configs/nucleo-f303re/pwm/defconfig
+++ b/configs/nucleo-f303re/pwm/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -199,6 +201,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -413,6 +416,10 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_CCMEXCLUDE is not set
+
+#
+# Timer Configuration
+#
 CONFIG_STM32_TIM3_PWM=y
 CONFIG_STM32_TIM3_MODE=0
 CONFIG_STM32_TIM3_CHANNEL1=y
@@ -675,7 +682,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -683,6 +695,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -697,18 +710,21 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 CONFIG_RAMLOG=y
-CONFIG_RAMLOG_SYSLOG=y
 CONFIG_RAMLOG_BUFSIZE=1024
 # CONFIG_RAMLOG_CRLF is not set
 CONFIG_RAMLOG_NONBLOCKING=y
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_RAMLOG_SYSLOG=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -746,12 +762,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-# CONFIG_SYSLOG_CHAR is not set
-
 #
 # Graphics Support
 #
@@ -824,6 +834,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -858,10 +869,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -870,15 +881,16 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
+# CONFIG_EXAMPLES_POSIXSPAWN is not set
 # CONFIG_EXAMPLES_PPPD is not set
 CONFIG_EXAMPLES_PWM=y
 CONFIG_EXAMPLES_PWM_DEVPATH="/dev/pwm0"
@@ -888,7 +900,6 @@ CONFIG_EXAMPLES_PWM_DUTYPCT1=50
 CONFIG_EXAMPLES_PWM_CHANNEL1=1
 CONFIG_EXAMPLES_PWM_DUTYPCT2=50
 CONFIG_EXAMPLES_PWM_CHANNEL2=2
-# CONFIG_EXAMPLES_POSIXSPAWN is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -896,17 +907,17 @@ CONFIG_EXAMPLES_PWM_CHANNEL2=2
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -928,8 +939,8 @@ CONFIG_EXAMPLES_PWM_CHANNEL2=2
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1053,17 +1064,17 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 CONFIG_SYSTEM_CLE=y
 CONFIG_SYSTEM_CLE_DEBUGLEVEL=0
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/nucleo-f303re/serialrx/defconfig b/configs/nucleo-f303re/serialrx/defconfig
index 3445026005..e758d84d1f 100644
--- a/configs/nucleo-f303re/serialrx/defconfig
+++ b/configs/nucleo-f303re/serialrx/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -200,6 +202,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -414,6 +417,10 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_CCMEXCLUDE is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -424,9 +431,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_UART4_SERIALDRIVER=y
 # CONFIG_STM32_UART4_1WIREDRIVER is not set
 # CONFIG_UART4_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -681,7 +696,12 @@ CONFIG_ADC_FIFOSIZE=8
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -689,6 +709,7 @@ CONFIG_ADC_FIFOSIZE=8
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -699,6 +720,8 @@ CONFIG_ADC_FIFOSIZE=8
 # CONFIG_SENSORS is not set
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
+# CONFIG_SERIAL_REMOVABLE is not set
+# CONFIG_SERIAL_CONSOLE is not set
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -748,14 +771,17 @@ CONFIG_UART4_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_NONE=y
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -792,11 +818,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -869,6 +890,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -899,10 +921,10 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -911,18 +933,18 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -944,10 +966,10 @@ CONFIG_EXAMPLES_SERIALRX_PRINTSTR=y
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -969,8 +991,8 @@ CONFIG_EXAMPLES_SERIALRX_PRINTSTR=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1003,16 +1025,16 @@ CONFIG_EXAMPLES_SERIALRX_PRINTSTR=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/nucleo-f303re/uavcan/defconfig b/configs/nucleo-f303re/uavcan/defconfig
index 4f53df4555..9dd992e89d 100644
--- a/configs/nucleo-f303re/uavcan/defconfig
+++ b/configs/nucleo-f303re/uavcan/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -199,6 +201,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -413,6 +416,10 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_CCMEXCLUDE is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -653,7 +660,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -661,6 +673,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -675,14 +688,17 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_NONE=y
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -719,11 +735,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -796,6 +807,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -864,10 +876,10 @@ CONFIG_LIBUAVCAN_INIT_RETRIES=0
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -876,18 +888,18 @@ CONFIG_LIBUAVCAN_INIT_RETRIES=0
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -905,9 +917,9 @@ CONFIG_EXAMPLES_UAVCAN=y
 CONFIG_EXAMPLES_UAVCAN_NODE_MEM_POOL_SIZE=4096
 CONFIG_EXAMPLES_UAVCAN_NODE_ID=1
 CONFIG_EXAMPLES_UAVCAN_NODE_NAME="org.nuttx.apps.examples.uavcan"
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -929,8 +941,8 @@ CONFIG_EXAMPLES_UAVCAN_NODE_NAME="org.nuttx.apps.examples.uavcan"
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -964,16 +976,16 @@ CONFIG_EXAMPLES_UAVCAN_NODE_NAME="org.nuttx.apps.examples.uavcan"
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/nucleo-f4x1re/f401-nsh/defconfig b/configs/nucleo-f4x1re/f401-nsh/defconfig
index 6f84c5fa5b..e52ef7184c 100644
--- a/configs/nucleo-f4x1re/f401-nsh/defconfig
+++ b/configs/nucleo-f4x1re/f401-nsh/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -200,6 +202,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -408,6 +411,10 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 # CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG is not set
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -421,9 +428,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -658,6 +673,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -672,7 +689,12 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -680,6 +702,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -691,6 +714,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -740,15 +765,18 @@ CONFIG_USART2_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -786,11 +814,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -863,6 +886,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -906,10 +930,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -919,17 +943,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -937,16 +961,16 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -968,8 +992,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1093,12 +1117,12 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1106,6 +1130,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/nucleo-f4x1re/f411-nsh/defconfig b/configs/nucleo-f4x1re/f411-nsh/defconfig
index e30e31814c..fa44765d45 100644
--- a/configs/nucleo-f4x1re/f411-nsh/defconfig
+++ b/configs/nucleo-f4x1re/f411-nsh/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -200,6 +202,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -410,6 +413,10 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 # CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG is not set
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -423,9 +430,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -660,6 +675,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -674,7 +691,12 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -682,6 +704,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -693,6 +716,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -742,15 +767,18 @@ CONFIG_USART2_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -788,11 +816,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -865,6 +888,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -908,10 +932,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -921,17 +945,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -939,16 +963,16 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -970,8 +994,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1095,12 +1119,12 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1108,6 +1132,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/nucleo-l476rg/nsh/defconfig b/configs/nucleo-l476rg/nsh/defconfig
index b512cf5fe2..4556a51c97 100644
--- a/configs/nucleo-l476rg/nsh/defconfig
+++ b/configs/nucleo-l476rg/nsh/defconfig
@@ -42,9 +42,14 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 CONFIG_DEBUG_FEATURES=y
-CONFIG_ARCH_HAVE_HEAPCHECK=y
-CONFIG_DEBUG_INFO=y
+
+#
+# Debug SYSLOG Output Controls
+#
+# CONFIG_DEBUG_ERROR is not set
+# CONFIG_DEBUG_ASSERTIONS is not set
 
 #
 # Subsystem Debug Options
@@ -60,19 +65,19 @@ CONFIG_DEBUG_LIB=y
 # OS Function Debug Options
 #
 # CONFIG_DEBUG_DMA is not set
-# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_IRQ is not set
 
 #
 # Driver Debug Options
 #
 CONFIG_DEBUG_LEDS=y
-CONFIG_DEBUG_ANALOG=y
 CONFIG_DEBUG_GPIO=y
 # CONFIG_DEBUG_RTC is not set
 CONFIG_DEBUG_SPI=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 CONFIG_DEBUG_NOOPT=y
@@ -519,6 +524,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -539,7 +546,12 @@ CONFIG_RTC_IOCTL=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -547,6 +559,7 @@ CONFIG_RTC_IOCTL=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -558,6 +571,8 @@ CONFIG_RTC_IOCTL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -581,10 +596,6 @@ CONFIG_USART2_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -612,15 +623,18 @@ CONFIG_USART2_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -658,11 +672,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -735,6 +744,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -782,10 +792,10 @@ CONFIG_EXAMPLES_ALARM_SIGNO=1
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -795,11 +805,11 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 CONFIG_EXAMPLES_OSTEST=y
 CONFIG_EXAMPLES_OSTEST_LOOPS=1
@@ -810,8 +820,8 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 CONFIG_EXAMPLES_OSTEST_WAITRESULT=y
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 CONFIG_EXAMPLES_RANDOM=y
 CONFIG_EXAMPLES_MAXSAMPLES=64
 CONFIG_EXAMPLES_NSAMPLES=8
@@ -822,17 +832,17 @@ CONFIG_EXAMPLES_NSAMPLES=8
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -854,8 +864,8 @@ CONFIG_EXAMPLES_NSAMPLES=8
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -866,6 +876,7 @@ CONFIG_EXAMPLES_NSAMPLES=8
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -978,12 +989,12 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -991,7 +1002,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
-# CONFIG_SYSTEM_DISCOTEST is not set
diff --git a/configs/nutiny-nuc120/nsh/defconfig b/configs/nutiny-nuc120/nsh/defconfig
index 2091e561dc..f86db749b4 100644
--- a/configs/nutiny-nuc120/nsh/defconfig
+++ b/configs/nutiny-nuc120/nsh/defconfig
@@ -21,6 +21,7 @@ CONFIG_WINDOWS_CYGWIN=y
 # Build Configuration
 #
 # CONFIG_APPS_DIR="../apps"
+CONFIG_BUILD_FLAT=y
 # CONFIG_BUILD_2PASS is not set
 
 #
@@ -30,20 +31,31 @@ CONFIG_WINDOWS_CYGWIN=y
 CONFIG_INTELHEX_BINARY=y
 # CONFIG_MOTOROLA_SREC is not set
 CONFIG_RAW_BINARY=y
+# CONFIG_UBOOT_UIMAGE is not set
 
 #
 # Customize Header Files
 #
+# CONFIG_ARCH_STDINT_H is not set
 # CONFIG_ARCH_STDBOOL_H is not set
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
+CONFIG_ARCH_HAVE_STACKCHECK=y
+# CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
+CONFIG_ARCH_HAVE_CUSTOMOPT=y
+# CONFIG_DEBUG_NOOPT is not set
+# CONFIG_DEBUG_CUSTOMOPT is not set
+CONFIG_DEBUG_FULLOPT=y
 
 #
 # System Type
@@ -63,27 +75,62 @@ CONFIG_ARCH="arm"
 #
 # ARM Options
 #
+# CONFIG_ARCH_CHIP_A1X is not set
 # CONFIG_ARCH_CHIP_C5471 is not set
 # CONFIG_ARCH_CHIP_CALYPSO is not set
 # CONFIG_ARCH_CHIP_DM320 is not set
+# CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
+# CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
+# CONFIG_ARCH_CHIP_TIVA is not set
+# CONFIG_ARCH_CHIP_LPC11XX is not set
 # CONFIG_ARCH_CHIP_LPC17XX is not set
 # CONFIG_ARCH_CHIP_LPC214X is not set
 # CONFIG_ARCH_CHIP_LPC2378 is not set
 # CONFIG_ARCH_CHIP_LPC31XX is not set
 # CONFIG_ARCH_CHIP_LPC43XX is not set
 CONFIG_ARCH_CHIP_NUC1XX=y
-# CONFIG_ARCH_CHIP_SAM3U is not set
+# CONFIG_ARCH_CHIP_SAMA5 is not set
+# CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
+# CONFIG_ARCH_CHIP_SAM34 is not set
+# CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
+# CONFIG_ARCH_ARM7TDMI is not set
+# CONFIG_ARCH_ARM926EJS is not set
+# CONFIG_ARCH_ARM920T is not set
 CONFIG_ARCH_CORTEXM0=y
+# CONFIG_ARCH_CORTEXM3 is not set
+# CONFIG_ARCH_CORTEXM4 is not set
+# CONFIG_ARCH_CORTEXM7 is not set
+# CONFIG_ARCH_CORTEXA5 is not set
+# CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv6-m"
 CONFIG_ARCH_CHIP="nuc1xx"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
-# CONFIG_ARCH_HAVE_MPU is not set
+# CONFIG_ARMV7M_LAZYFPU is not set
+# CONFIG_ARCH_HAVE_FPU is not set
+# CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 
 #
 # ARMV6M Configuration Options
@@ -94,6 +141,8 @@ CONFIG_ARMV6M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV6M_TOOLCHAIN_CODESOURCERYW is not set
 # CONFIG_ARMV6M_TOOLCHAIN_DEVKITARM is not set
 # CONFIG_ARMV6M_TOOLCHAIN_GNU_EABIL is not set
+# CONFIG_ARMV6M_TOOLCHAIN_GNU_EABIW is not set
+# CONFIG_SERIAL_TERMIOS is not set
 
 #
 # NUC100/120 Configuration Options
@@ -171,32 +220,44 @@ CONFIG_NUC_SYSTICK_CORECLK=y
 # CONFIG_NUC_UARTCLK_PLL is not set
 CONFIG_NUC_UARTCLK_INTHI=y
 
-#
-# External Memory Configuration
-#
-
 #
 # Architecture Options
 #
 # CONFIG_ARCH_NOINTC is not set
 # CONFIG_ARCH_VECNOTIRQ is not set
 # CONFIG_ARCH_DMA is not set
-# CONFIG_ARCH_IRQPRIO is not set
-# CONFIG_ARCH_ADDRENV is not set
+CONFIG_ARCH_HAVE_IRQPRIO=y
+# CONFIG_ARCH_L2CACHE is not set
+# CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
+# CONFIG_ARCH_HAVE_ADDRENV is not set
+# CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
+# CONFIG_ARCH_HAVE_MMU is not set
+# CONFIG_ARCH_HAVE_MPU is not set
+# CONFIG_ARCH_NAND_HWECC is not set
+# CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
+# CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
+# CONFIG_ARCH_IDLE_CUSTOM is not set
 # CONFIG_ARCH_HAVE_RAMFUNCS is not set
+# CONFIG_ARCH_HAVE_RAMVECTORS is not set
 
 #
 # Board Settings
 #
 CONFIG_BOARD_LOOPSPERMSEC=2988
 # CONFIG_ARCH_CALIBRATION is not set
-CONFIG_RAM_START=0x20000000
-CONFIG_RAM_SIZE=16384
+
+#
+# Interrupt options
+#
 CONFIG_ARCH_HAVE_INTERRUPTSTACK=y
 CONFIG_ARCH_INTERRUPTSTACK=0
+# CONFIG_ARCH_HAVE_HIPRI_INTERRUPT is not set
 
 #
 # Boot options
@@ -207,6 +268,13 @@ CONFIG_BOOT_RUNFROMFLASH=y
 # CONFIG_BOOT_RUNFROMSDRAM is not set
 # CONFIG_BOOT_COPYTORAM is not set
 
+#
+# Boot Memory Configuration
+#
+CONFIG_RAM_START=0x20000000
+CONFIG_RAM_SIZE=16384
+# CONFIG_ARCH_HAVE_SDRAM is not set
+
 #
 # Board Selection
 #
@@ -224,38 +292,77 @@ CONFIG_NSH_MMCSDMINOR=0
 #
 # Board-Specific Options
 #
+# CONFIG_LIB_BOARDCTL is not set
 
 #
 # RTOS Features
 #
-# CONFIG_BOARD_INITIALIZE is not set
+CONFIG_DISABLE_OS_API=y
+CONFIG_DISABLE_POSIX_TIMERS=y
+# CONFIG_DISABLE_PTHREAD is not set
+# CONFIG_DISABLE_SIGNALS is not set
+CONFIG_DISABLE_MQUEUE=y
+CONFIG_DISABLE_ENVIRON=y
+
+#
+# Clocks and Timers
+#
 CONFIG_USEC_PER_TICK=10000
-CONFIG_RR_INTERVAL=200
-# CONFIG_SCHED_INSTRUMENTATION is not set
-CONFIG_TASK_NAME_SIZE=0
-# CONFIG_SCHED_HAVE_PARENT is not set
+# CONFIG_SYSTEM_TIME64 is not set
+# CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
 CONFIG_START_YEAR=2013
 CONFIG_START_MONTH=2
 CONFIG_START_DAY=26
-CONFIG_DEV_CONSOLE=y
+CONFIG_MAX_WDOGPARMS=2
+CONFIG_PREALLOC_WDOGS=4
+CONFIG_WDOG_INTRESERVE=0
+CONFIG_PREALLOC_TIMERS=0
+
+#
+# Tasks and Scheduling
+#
+# CONFIG_INIT_NONE is not set
+CONFIG_INIT_ENTRYPOINT=y
+CONFIG_USER_ENTRYPOINT="nsh_main"
+CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
+CONFIG_TASK_NAME_SIZE=0
+CONFIG_MAX_TASKS=8
+# CONFIG_SCHED_HAVE_PARENT is not set
+CONFIG_SCHED_WAITPID=y
+
+#
+# Pthread Options
+#
 # CONFIG_MUTEX_TYPES is not set
-# CONFIG_PRIORITY_INHERITANCE is not set
+CONFIG_NPTHREAD_KEYS=0
+
+#
+# Performance Monitoring
+#
+# CONFIG_SCHED_CPULOAD is not set
+# CONFIG_SCHED_INSTRUMENTATION is not set
+
+#
+# Files and I/O
+#
+CONFIG_DEV_CONSOLE=y
 # CONFIG_FDCLONE_DISABLE is not set
 # CONFIG_FDCLONE_STDIO is not set
 CONFIG_SDCLONE_DISABLE=y
-# CONFIG_SCHED_WORKQUEUE is not set
-CONFIG_SCHED_WAITPID=y
+CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_STREAMS=6
+CONFIG_NAME_MAX=32
+# CONFIG_PRIORITY_INHERITANCE is not set
+
+#
+# RTOS hooks
+#
+# CONFIG_BOARD_INITIALIZE is not set
 # CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
-CONFIG_USER_ENTRYPOINT="nsh_main"
-CONFIG_DISABLE_OS_API=y
-CONFIG_DISABLE_POSIX_TIMERS=y
-# CONFIG_DISABLE_PTHREAD is not set
-# CONFIG_DISABLE_SIGNALS is not set
-CONFIG_DISABLE_MQUEUE=y
-CONFIG_DISABLE_ENVIRON=y
 
 #
 # Signal Numbers
@@ -264,21 +371,14 @@ CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
 CONFIG_SIG_SIGCONDTIMEDOUT=16
+# CONFIG_MODULE is not set
 
 #
-# Sizes of configurable things (0 disables)
+# Work queue support
 #
-CONFIG_MAX_TASKS=8
-CONFIG_NPTHREAD_KEYS=0
-CONFIG_NFILE_DESCRIPTORS=6
-CONFIG_NFILE_STREAMS=6
-CONFIG_NAME_MAX=32
-CONFIG_PREALLOC_MQ_MSGS=0
-CONFIG_MQ_MAXMSGSIZE=0
-CONFIG_MAX_WDOGPARMS=2
-CONFIG_PREALLOC_WDOGS=4
-CONFIG_WDOG_INTRESERVE=0
-CONFIG_PREALLOC_TIMERS=0
+# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_SCHED_HPWORK is not set
+# CONFIG_SCHED_LPWORK is not set
 
 #
 # Stack and heap information
@@ -287,6 +387,7 @@ CONFIG_IDLETHREAD_STACKSIZE=1024
 CONFIG_USERMAIN_STACKSIZE=1536
 CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=1536
+# CONFIG_LIB_SYSCALL is not set
 
 #
 # Device Drivers
@@ -295,19 +396,52 @@ CONFIG_DISABLE_POLL=y
 CONFIG_DEV_NULL=y
 # CONFIG_DEV_ZERO is not set
 # CONFIG_DEV_LOOP is not set
+
+#
+# Buffering
+#
+# CONFIG_DRVR_WRITEBUFFER is not set
+# CONFIG_DRVR_READAHEAD is not set
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
+# CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
+# CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 # CONFIG_SPI is not set
+# CONFIG_I2S is not set
+
+#
+# Timer Driver Support
+#
+# CONFIG_TIMER is not set
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_ANALOG is not set
+# CONFIG_AUDIO_DEVICES is not set
+# CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
+# CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
@@ -315,11 +449,39 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
+# CONFIG_UART_SERIALDRIVER is not set
+# CONFIG_UART0_SERIALDRIVER is not set
 CONFIG_UART1_SERIALDRIVER=y
+# CONFIG_UART2_SERIALDRIVER is not set
+# CONFIG_UART3_SERIALDRIVER is not set
+# CONFIG_UART4_SERIALDRIVER is not set
+# CONFIG_UART5_SERIALDRIVER is not set
+# CONFIG_UART6_SERIALDRIVER is not set
+# CONFIG_UART7_SERIALDRIVER is not set
+# CONFIG_UART8_SERIALDRIVER is not set
+# CONFIG_SCI0_SERIALDRIVER is not set
+# CONFIG_SCI1_SERIALDRIVER is not set
+# CONFIG_USART0_SERIALDRIVER is not set
+# CONFIG_USART1_SERIALDRIVER is not set
+# CONFIG_USART2_SERIALDRIVER is not set
+# CONFIG_USART3_SERIALDRIVER is not set
+# CONFIG_USART4_SERIALDRIVER is not set
+# CONFIG_USART5_SERIALDRIVER is not set
+# CONFIG_USART6_SERIALDRIVER is not set
+# CONFIG_USART7_SERIALDRIVER is not set
+# CONFIG_USART8_SERIALDRIVER is not set
+# CONFIG_OTHER_UART_SERIALDRIVER is not set
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
+# CONFIG_SERIAL_IFLOWCONTROL is not set
+# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
+CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_UART1_SERIAL_CONSOLE=y
+# CONFIG_OTHER_SERIAL_CONSOLE is not set
 # CONFIG_NO_SERIAL_CONSOLE is not set
 
 #
@@ -331,24 +493,38 @@ CONFIG_UART1_BAUD=115200
 CONFIG_UART1_BITS=8
 CONFIG_UART1_PARITY=0
 CONFIG_UART1_2STOP=0
+# CONFIG_UART1_IFLOWCONTROL is not set
+# CONFIG_UART1_OFLOWCONTROL is not set
+# CONFIG_UART1_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
 #
+# CONFIG_ARCH_HAVE_NET is not set
+# CONFIG_ARCH_HAVE_PHY is not set
 # CONFIG_NET is not set
 
+#
+# Crypto API
+#
+# CONFIG_CRYPTO is not set
+
 #
 # File Systems
 #
@@ -357,12 +533,13 @@ CONFIG_UART1_2STOP=0
 # File system configuration
 #
 CONFIG_DISABLE_MOUNTPOINT=y
+CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y
+# CONFIG_FS_READABLE is not set
+# CONFIG_FS_WRITABLE is not set
+# CONFIG_FS_NAMED_SEMAPHORES is not set
 # CONFIG_FS_RAMMAP is not set
-
-#
-# System Logging
-#
-
+# CONFIG_FS_PROCFS is not set
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -374,10 +551,20 @@ CONFIG_DISABLE_MOUNTPOINT=y
 #
 CONFIG_MM_SMALL=y
 CONFIG_MM_REGIONS=1
+# CONFIG_ARCH_HAVE_HEAP2 is not set
 # CONFIG_GRAN is not set
 
 #
-# Binary Formats
+# Audio Support
+#
+# CONFIG_AUDIO is not set
+
+#
+# Wireless Support
+#
+
+#
+# Binary Loader
 #
 CONFIG_BINFMT_DISABLE=y
 # CONFIG_PIC is not set
@@ -397,6 +584,8 @@ CONFIG_NUNGET_CHARS=0
 # CONFIG_NOPRINTF_FIELDWIDTH is not set
 # CONFIG_LIBC_FLOATINGPOINT is not set
 # CONFIG_LIBC_LONG_LONG is not set
+# CONFIG_LIBC_IOCTL_VARIADIC is not set
+CONFIG_LIB_RAND_ORDER=1
 # CONFIG_EOL_IS_CR is not set
 # CONFIG_EOL_IS_LF is not set
 # CONFIG_EOL_IS_BOTH_CRLF is not set
@@ -406,14 +595,20 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
 # CONFIG_LIBC_STRERROR is not set
 # CONFIG_LIBC_PERROR_STDOUT is not set
 CONFIG_ARCH_LOWPUTC=y
+# CONFIG_TIME_EXTENDED is not set
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
-# Non-standard Helper Functions
+# Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
+# CONFIG_LIB_SLCDCODEC is not set
 
 #
 # Basic CXX Support
@@ -426,106 +621,130 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
-# CONFIG_SYSTEM_COMPOSITE is not set
+# CONFIG_EXAMPLES_CHAT is not set
+# CONFIG_EXAMPLES_CONFIGDATA is not set
+# CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
-# CONFIG_EXAMPLES_LCDRW is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
-# CONFIG_EXAMPLES_MOUNT is not set
 # CONFIG_EXAMPLES_MODBUS is not set
+# CONFIG_EXAMPLES_MOUNT is not set
+# CONFIG_EXAMPLES_NRF24L01TERM is not set
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
-# CONFIG_EXAMPLES_PASHELLO is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
-# CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
+# CONFIG_EXAMPLES_SERIALBLASTER is not set
+# CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
+# CONFIG_EXAMPLES_SLCD is not set
+# CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
+# CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_UDP is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
+#
+# Graphics Support
+#
+# CONFIG_TIFF is not set
+# CONFIG_GRAPHICS_TRAVELER is not set
 
 #
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_MICROPYTHON is not set
 # CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
-# CONFIG_NETUTILS_DHCPC is not set
-# CONFIG_NETUTILS_DHCPD is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
-# CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETDB_DNSCLIENT is not set
 # CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_TELNETD is not set
-# CONFIG_NETUTILS_TFTPC is not set
-# CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_NETLIB is not set
-# CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
-# FreeModBus
+# NSH Library
 #
-# CONFIG_MODBUS is not set
+CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
-# NSH Library
+# Command Line Configuration
 #
-CONFIG_NSH_LIBRARY=y
 CONFIG_NSH_READLINE=y
 # CONFIG_NSH_CLE is not set
+CONFIG_NSH_LINELEN=80
+CONFIG_NSH_DISABLE_SEMICOLON=y
+CONFIG_NSH_MAXARGUMENTS=6
+# CONFIG_NSH_ARGCAT is not set
+CONFIG_NSH_NESTDEPTH=3
+# CONFIG_NSH_DISABLEBG is not set
 
 #
 # Disable Individual commands
 #
+CONFIG_NSH_DISABLE_ADDROUTE=y
+CONFIG_NSH_DISABLE_BASENAME=y
 # CONFIG_NSH_DISABLE_CAT is not set
 CONFIG_NSH_DISABLE_CD=y
 CONFIG_NSH_DISABLE_CP=y
+CONFIG_NSH_DISABLE_CMP=y
+CONFIG_NSH_DISABLE_DATE=y
 CONFIG_NSH_DISABLE_DD=y
+CONFIG_NSH_DISABLE_DF=y
+CONFIG_NSH_DISABLE_DELROUTE=y
+CONFIG_NSH_DISABLE_DIRNAME=y
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -534,20 +753,20 @@ CONFIG_NSH_DISABLE_GET=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 CONFIG_NSH_DISABLE_IFCONFIG=y
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 CONFIG_NSH_DISABLE_LOSETUP=y
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 CONFIG_NSH_DISABLE_MKDIR=y
-CONFIG_NSH_DISABLE_MKFATFS=y
 # CONFIG_NSH_DISABLE_MKFIFO is not set
 CONFIG_NSH_DISABLE_MKRD=y
 # CONFIG_NSH_DISABLE_MH is not set
 CONFIG_NSH_DISABLE_MOUNT=y
+# CONFIG_NSH_DISABLE_MV is not set
 # CONFIG_NSH_DISABLE_MW is not set
-CONFIG_NSH_DISABLE_NSFMOUNT=y
 # CONFIG_NSH_DISABLE_PS is not set
-CONFIG_NSH_DISABLE_PING=y
 CONFIG_NSH_DISABLE_PUT=y
 # CONFIG_NSH_DISABLE_PWD is not set
 CONFIG_NSH_DISABLE_RM=y
@@ -555,71 +774,61 @@ CONFIG_NSH_DISABLE_RMDIR=y
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+CONFIG_NSH_DISABLE_TIME=y
 # CONFIG_NSH_DISABLE_TEST is not set
 CONFIG_NSH_DISABLE_UMOUNT=y
+CONFIG_NSH_DISABLE_UNAME=y
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 CONFIG_NSH_DISABLE_WGET=y
 # CONFIG_NSH_DISABLE_XD is not set
+
+#
+# Configure Command Options
+#
 CONFIG_NSH_CODECS_BUFSIZE=128
+# CONFIG_NSH_CMDOPT_HEXDUMP is not set
 CONFIG_NSH_FILEIOSIZE=64
-CONFIG_NSH_LINELEN=80
-CONFIG_NSH_NESTDEPTH=3
+
+#
+# Scripting Support
+#
 CONFIG_NSH_DISABLESCRIPT=y
-# CONFIG_NSH_DISABLEBG is not set
-CONFIG_NSH_CONSOLE=y
 
 #
-# USB Trace Support
+# Console Configuration
 #
+CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
 #
 
 #
-# System NSH Add-Ons
+# Platform-specific Support
 #
+# CONFIG_PLATFORM_CONFIGDATA is not set
 
 #
-# Custom Free Memory Command
+# System Libraries and NSH Add-Ons
 #
+# CONFIG_SYSTEM_CLE is not set
+# CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-
-#
-# I2C tool
-#
-
-#
-# FLASH Program Installation
-#
+# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
-
-#
-# readline()
-#
+# CONFIG_SYSTEM_RAMTEST is not set
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
-
-#
-# Power Off
-#
-# CONFIG_SYSTEM_POWEROFF is not set
-
-#
-# RAMTRON
-#
-
-#
-# SD Card
-#
-
-#
-# Sysinfo
-#
-
-#
-# USB Monitor
-#
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
+# CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
+# CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/olimex-efm32g880f128-stk/nsh/defconfig b/configs/olimex-efm32g880f128-stk/nsh/defconfig
index c91ce75524..0949f6717c 100644
--- a/configs/olimex-efm32g880f128-stk/nsh/defconfig
+++ b/configs/olimex-efm32g880f128-stk/nsh/defconfig
@@ -41,12 +41,15 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
+# CONFIG_STACK_COLORATION is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
@@ -78,10 +81,12 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 CONFIG_ARCH_CHIP_EFM32=y
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
 # CONFIG_ARCH_CHIP_TIVA is not set
+# CONFIG_ARCH_CHIP_LPC11XX is not set
 # CONFIG_ARCH_CHIP_LPC17XX is not set
 # CONFIG_ARCH_CHIP_LPC214X is not set
 # CONFIG_ARCH_CHIP_LPC2378 is not set
@@ -90,27 +95,52 @@ CONFIG_ARCH_CHIP_EFM32=y
 # CONFIG_ARCH_CHIP_NUC1XX is not set
 # CONFIG_ARCH_CHIP_SAMA5 is not set
 # CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
 # CONFIG_ARCH_CHIP_SAM34 is not set
+# CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
 # CONFIG_ARCH_CORTEXM0 is not set
 CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXM4 is not set
+# CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="efm32"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 CONFIG_ARMV7M_CMNVECTOR=y
+# CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
+# CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 
 #
 # ARMV7M Configuration Options
 #
+# CONFIG_ARMV7M_HAVE_ICACHE is not set
+# CONFIG_ARMV7M_HAVE_DCACHE is not set
+# CONFIG_ARMV7M_HAVE_ITCM is not set
+# CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARW is not set
 # CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
 # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDW is not set
@@ -119,6 +149,8 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
 # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW is not set
 # CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE is not set
+# CONFIG_ARMV7M_HAVE_STACKCHECK is not set
+# CONFIG_ARMV7M_ITMSYSLOG is not set
 
 #
 # EFM32 Configuration Options
@@ -127,6 +159,7 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
 CONFIG_ARCH_CHIP_EFM32G880F128=y
 # CONFIG_ARCH_CHIP_EFM32G890F128 is not set
 # CONFIG_ARCH_CHIP_EFM32GG332F1024 is not set
+# CONFIG_ARCH_CHIP_EFM32GG990F1024 is not set
 # CONFIG_EFM32_EFM32TG is not set
 CONFIG_EFM32_EFM32G=y
 # CONFIG_EFM32_EFM32GG is not set
@@ -138,9 +171,17 @@ CONFIG_EFM32_HAVE_USART2=y
 CONFIG_EFM32_HAVE_UART0=y
 # CONFIG_EFM32_HAVE_UART1 is not set
 CONFIG_EFM32_HAVE_LEUART1=y
-# CONFIG_EFM32_USART is not set
+# CONFIG_EFM32_HAVE_OTGFS is not set
+# CONFIG_EFM32_USART_ISUART is not set
+# CONFIG_EFM32_USART_ISSPI is not set
 # CONFIG_EFM32_UART is not set
 CONFIG_EFM32_LEUART=y
+# CONFIG_EFM32_DMA is not set
+# CONFIG_EFM32_RMU is not set
+# CONFIG_EFM32_FLASHPROG is not set
+# CONFIG_EFM32_I2C0 is not set
+# CONFIG_EFM32_I2C1 is not set
+# CONFIG_EFM32_BITBAND is not set
 # CONFIG_EFM32_USART0 is not set
 # CONFIG_EFM32_USART1 is not set
 # CONFIG_EFM32_USART2 is not set
@@ -148,7 +189,12 @@ CONFIG_EFM32_LEUART=y
 # CONFIG_EFM32_UART1 is not set
 # CONFIG_EFM32_LEUART0 is not set
 CONFIG_EFM32_LEUART1=y
+# CONFIG_EFM32_TIMER0 is not set
+# CONFIG_EFM32_TIMER1 is not set
+# CONFIG_EFM32_TIMER2 is not set
+# CONFIG_EFM32_TIMER3 is not set
 CONFIG_EFM32_GPIO_IRQ=y
+# CONFIG_EFM32_LECLOCK is not set
 CONFIG_LEUART1_SERIAL_CONSOLE=y
 # CONFIG_NO_LEUART_SERIAL_CONSOLE is not set
 
@@ -161,6 +207,7 @@ CONFIG_LEUART1_BAUD=2400
 CONFIG_LEUART1_BITS=8
 CONFIG_LEUART1_PARITY=0
 CONFIG_LEUART1_2STOP=0
+# CONFIG_EFM32_RTC_BURTC is not set
 
 #
 # Architecture Options
@@ -173,11 +220,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
@@ -228,11 +278,13 @@ CONFIG_ARCH_BOARD="olimex-efm32g880f128-stk"
 #
 CONFIG_ARCH_HAVE_BUTTONS=y
 # CONFIG_ARCH_BUTTONS is not set
+CONFIG_ARCH_HAVE_IRQBUTTONS=y
 CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Board-Specific Options
 #
+# CONFIG_LIB_BOARDCTL is not set
 
 #
 # RTOS Features
@@ -267,6 +319,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -317,9 +370,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -350,22 +404,42 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 # CONFIG_SPI is not set
 # CONFIG_I2S is not set
+
+#
+# Timer Driver Support
+#
+# CONFIG_TIMER is not set
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
-# CONFIG_TIMER is not set
 # CONFIG_ANALOG is not set
 # CONFIG_AUDIO_DEVICES is not set
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
+# CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
@@ -373,6 +447,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -396,29 +472,30 @@ CONFIG_SERIAL=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 CONFIG_OTHER_UART_SERIALDRIVER=y
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
-# CONFIG_UART0_SERIAL_CONSOLE is not set
-CONFIG_OTHER_SERIAL_CONSOLE=y
-# CONFIG_NO_SERIAL_CONSOLE is not set
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
+# CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
+CONFIG_OTHER_SERIAL_CONSOLE=y
+# CONFIG_NO_SERIAL_CONSOLE is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -447,10 +524,7 @@ CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_RAMMAP is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -470,6 +544,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -494,6 +572,7 @@ CONFIG_NUNGET_CHARS=2
 # CONFIG_NOPRINTF_FIELDWIDTH is not set
 # CONFIG_LIBC_FLOATINGPOINT is not set
 CONFIG_LIBC_LONG_LONG=y
+# CONFIG_LIBC_IOCTL_VARIADIC is not set
 CONFIG_LIB_RAND_ORDER=1
 # CONFIG_EOL_IS_CR is not set
 # CONFIG_EOL_IS_LF is not set
@@ -505,13 +584,18 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
 # CONFIG_LIBC_STRERROR is not set
 # CONFIG_LIBC_PERROR_STDOUT is not set
 CONFIG_ARCH_LOWPUTC=y
+# CONFIG_TIME_EXTENDED is not set
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -526,14 +610,13 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -541,11 +624,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -553,75 +636,77 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
-# CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_UDP is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
 #
 # CONFIG_TIFF is not set
+# CONFIG_GRAPHICS_TRAVELER is not set
 
 #
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_MICROPYTHON is not set
 # CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
-# CONFIG_NETUTILS_DHCPD is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
-# CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_TFTPC is not set
-# CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_NETLIB is not set
-# CONFIG_NETUTILS_WEBCLIENT is not set
-
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
 
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -639,13 +724,16 @@ CONFIG_NSH_NESTDEPTH=3
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
 # CONFIG_NSH_DISABLE_CMP is not set
+CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_DD is not set
 # CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -654,8 +742,10 @@ CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 # CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -663,6 +753,7 @@ CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLE_MKRD is not set
 # CONFIG_NSH_DISABLE_MH is not set
 # CONFIG_NSH_DISABLE_MOUNT is not set
+# CONFIG_NSH_DISABLE_MV is not set
 # CONFIG_NSH_DISABLE_MW is not set
 # CONFIG_NSH_DISABLE_PS is not set
 # CONFIG_NSH_DISABLE_PUT is not set
@@ -672,8 +763,10 @@ CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
@@ -700,6 +793,8 @@ CONFIG_NSH_FILEIOSIZE=256
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -713,113 +808,20 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-
-#
-# Custom Free Memory Command
-#
-# CONFIG_SYSTEM_FREE is not set
-
-#
-# EMACS-like Command Line Editor
-#
 CONFIG_SYSTEM_CLE=y
 CONFIG_SYSTEM_CLE_DEBUGLEVEL=0
-
-#
-# FLASH Program Installation
-#
-# CONFIG_SYSTEM_INSTALL is not set
-
-#
-# FLASH Erase-all Command
-#
-
-#
-# Intel HEX to binary conversion
-#
+# CONFIG_SYSTEM_CUTERM is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-
-#
-# I2C tool
-#
-
-#
-# INI File Parser
-#
-# CONFIG_FSUTILS_INIFILE is not set
-
-#
-# NxPlayer media player library / command Line
-#
-# CONFIG_SYSTEM_NXPLAYER is not set
-
-#
-# RAM test
-#
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
-
-#
-# readline()
-#
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
-
-#
-# P-Code Support
-#
-
-#
-# PHY Tool
-#
-
-#
-# Power Off
-#
-# CONFIG_SYSTEM_POWEROFF is not set
-
-#
-# RAMTRON
-#
-
-#
-# SD Card
-#
-
-#
-# Sudoku
-#
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-
-#
-# Sysinfo
-#
-
-#
-# VI Work-Alike Editor
-#
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
-
-#
-# Stack Monitor
-#
-
-#
-# USB CDC/ACM Device Commands
-#
-
-#
-# USB Composite Device Commands
-#
-
-#
-# USB Mass Storage Device Commands
-#
-
-#
-# USB Monitor
-#
-
-#
-# Zmodem Commands
-#
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/olimex-lpc-h3131/nsh/defconfig b/configs/olimex-lpc-h3131/nsh/defconfig
index 071fc46095..fa56b2ff44 100644
--- a/configs/olimex-lpc-h3131/nsh/defconfig
+++ b/configs/olimex-lpc-h3131/nsh/defconfig
@@ -41,14 +41,16 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -79,10 +81,12 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
 # CONFIG_ARCH_CHIP_TIVA is not set
+# CONFIG_ARCH_CHIP_LPC11XX is not set
 # CONFIG_ARCH_CHIP_LPC17XX is not set
 # CONFIG_ARCH_CHIP_LPC214X is not set
 # CONFIG_ARCH_CHIP_LPC2378 is not set
@@ -91,10 +95,15 @@ CONFIG_ARCH_CHIP_LPC31XX=y
 # CONFIG_ARCH_CHIP_NUC1XX is not set
 # CONFIG_ARCH_CHIP_SAMA5 is not set
 # CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 CONFIG_ARCH_ARM926EJS=y
 # CONFIG_ARCH_ARM920T is not set
@@ -104,10 +113,21 @@ CONFIG_ARCH_ARM926EJS=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="arm"
 CONFIG_ARCH_CHIP="lpc31xx"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 CONFIG_ARCH_LOWVECTORS=y
 CONFIG_ARCH_ROMPGTABLE=y
@@ -170,11 +190,14 @@ CONFIG_ARCH_HAVE_EXTSRAM1=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 CONFIG_ARCH_HAVE_MMU=y
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+# CONFIG_ARCH_HAVE_RESET is not set
 CONFIG_ARCH_USE_MMU=y
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
@@ -231,6 +254,7 @@ CONFIG_NSH_MMCSDMINOR=0
 # Board-Specific Options
 #
 CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
 # CONFIG_BOARDCTL_ADCTEST is not set
 # CONFIG_BOARDCTL_PWMTEST is not set
@@ -270,6 +294,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -320,9 +345,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -353,6 +379,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -370,8 +397,23 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -381,6 +423,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 CONFIG_UART_SERIALDRIVER=y
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -404,14 +448,11 @@ CONFIG_UART_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -428,19 +469,23 @@ CONFIG_UART_PARITY=0
 CONFIG_UART_2STOP=0
 # CONFIG_UART_IFLOWCONTROL is not set
 # CONFIG_UART_OFLOWCONTROL is not set
+# CONFIG_UART_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -474,16 +519,15 @@ CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
 CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_FATTIME is not set
+# CONFIG_FAT_FORCE_INDIRECT is not set
 # CONFIG_FAT_DMAMEMORY is not set
+# CONFIG_FAT_DIRECT_RETRY is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -504,6 +548,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -549,10 +597,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -567,26 +620,26 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FSTEST is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -594,19 +647,19 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -614,15 +667,26 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -635,32 +699,28 @@ CONFIG_EXAMPLES_NSH=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_PPPD is not set
-
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
 
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -679,6 +739,7 @@ CONFIG_NSH_NESTDEPTH=3
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
@@ -687,6 +748,7 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_DD is not set
 # CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -695,8 +757,10 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 # CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -715,8 +779,10 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
@@ -743,6 +809,8 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -756,16 +824,19 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
-# CONFIG_SYSTEM_POWEROFF is not set
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/olimex-lpc1766stk/ftpc/defconfig b/configs/olimex-lpc1766stk/ftpc/defconfig
index 4d49742817..441fb62dbf 100644
--- a/configs/olimex-lpc1766stk/ftpc/defconfig
+++ b/configs/olimex-lpc1766stk/ftpc/defconfig
@@ -42,10 +42,11 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -454,6 +455,8 @@ CONFIG_SPI_CALLBACK=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -481,6 +484,7 @@ CONFIG_SPI_CALLBACK=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -542,6 +546,8 @@ CONFIG_ETH0_PHY_KS8721=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -592,15 +598,18 @@ CONFIG_UART0_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -754,11 +763,6 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -843,6 +847,7 @@ CONFIG_NETDB_DNSSERVER_IPv4ADDR=0x0a000001
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/olimex-lpc1766stk/hidkbd/defconfig b/configs/olimex-lpc1766stk/hidkbd/defconfig
index 184f698cf5..5d8034a214 100644
--- a/configs/olimex-lpc1766stk/hidkbd/defconfig
+++ b/configs/olimex-lpc1766stk/hidkbd/defconfig
@@ -41,14 +41,16 @@ CONFIG_INTELHEX_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -79,10 +81,12 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
 # CONFIG_ARCH_CHIP_TIVA is not set
+# CONFIG_ARCH_CHIP_LPC11XX is not set
 CONFIG_ARCH_CHIP_LPC17XX=y
 # CONFIG_ARCH_CHIP_LPC214X is not set
 # CONFIG_ARCH_CHIP_LPC2378 is not set
@@ -91,10 +95,15 @@ CONFIG_ARCH_CHIP_LPC17XX=y
 # CONFIG_ARCH_CHIP_NUC1XX is not set
 # CONFIG_ARCH_CHIP_SAMA5 is not set
 # CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -104,14 +113,25 @@ CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="lpc17xx"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
 #
@@ -121,6 +141,7 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARW is not set
 # CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
 # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDW is not set
@@ -132,6 +153,7 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
 # CONFIG_ARMV7M_HAVE_STACKCHECK is not set
 # CONFIG_ARMV7M_ITMSYSLOG is not set
 # CONFIG_GPIO_IRQ is not set
+# CONFIG_SERIAL_TERMIOS is not set
 
 #
 # LPC17xx Configuration Options
@@ -215,6 +237,7 @@ CONFIG_USBHOST_NTDS=3
 CONFIG_USBHOST_TDBUFFERS=3
 CONFIG_USBHOST_TDBUFSIZE=128
 CONFIG_USBHOST_IOBUFSIZE=512
+CONFIG_LPC17_USBHOST_NPREALLOC=4
 CONFIG_USBHOST_BULK_DISABLE=y
 # CONFIG_USBHOST_INT_DISABLE is not set
 CONFIG_USBHOST_ISOC_DISABLE=y
@@ -230,11 +253,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
 # CONFIG_ARCH_USE_MPU is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
@@ -293,6 +319,8 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 #
 # Board-Specific Options
 #
+CONFIG_LPC1766STK_USBHOST_STACKSIZE=1024
+CONFIG_LPC1766STK_USBHOST_PRIO=100
 # CONFIG_LIB_BOARDCTL is not set
 
 #
@@ -328,6 +356,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="hidkbd_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -364,6 +393,7 @@ CONFIG_NAME_MAX=32
 # CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
+# CONFIG_SIG_EVTHREAD is not set
 
 #
 # Signal Numbers
@@ -379,9 +409,10 @@ CONFIG_SIG_SIGWORK=17
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 CONFIG_SCHED_WORKQUEUE=y
 CONFIG_SCHED_HPWORK=y
@@ -415,6 +446,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -438,9 +470,24 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_ADS7843E is not set
 # CONFIG_INPUT_MXT is not set
 # CONFIG_INPUT_STMPE811 is not set
+# CONFIG_BUTTONS is not set
 # CONFIG_DJOYSTICK is not set
 # CONFIG_AJOYSTICK is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -449,6 +496,7 @@ CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_HAVECARDDETECT is not set
 # CONFIG_ARCH_HAVE_SDIO is not set
 # CONFIG_ARCH_HAVE_SDIOWAIT_WRCOMPLETE is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -458,6 +506,8 @@ CONFIG_MMCSD_NSLOTS=1
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -481,17 +531,13 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 CONFIG_SERIAL_NPOLLWAITERS=2
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
-# CONFIG_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
 # CONFIG_NO_SERIAL_CONSOLE is not set
@@ -507,6 +553,7 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 CONFIG_USBHOST=y
 CONFIG_USBHOST_NPREALLOC=0
@@ -528,15 +575,18 @@ CONFIG_HIDKBD_ENCODED=y
 # CONFIG_USBHOST_TRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -568,13 +618,10 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_FAT is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -594,6 +641,10 @@ CONFIG_MM_REGIONS=2
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -637,10 +688,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 CONFIG_LIB_KBDCODEC=y
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -655,14 +710,13 @@ CONFIG_LIB_KBDCODEC=y
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -670,15 +724,15 @@ CONFIG_LIB_KBDCODEC=y
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 CONFIG_EXAMPLES_HIDKBD=y
 CONFIG_EXAMPLES_HIDKBD_DEFPRIO=50
 CONFIG_EXAMPLES_HIDKBD_STACKSIZE=1024
 CONFIG_EXAMPLES_HIDKBD_DEVNAME="/dev/kbda"
 CONFIG_EXAMPLES_HIDKBD_ENCODED=y
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -686,19 +740,19 @@ CONFIG_EXAMPLES_HIDKBD_ENCODED=y
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -706,15 +760,24 @@ CONFIG_EXAMPLES_HIDKBD_ENCODED=y
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -726,27 +789,23 @@ CONFIG_EXAMPLES_HIDKBD_ENCODED=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
+# CONFIG_NETUTILS_CHAT is not set
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_PPPD is not set
-
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
 
 #
 # NSH Library
@@ -765,15 +824,16 @@ CONFIG_EXAMPLES_HIDKBD_ENCODED=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+# CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
-# CONFIG_SYSTEM_POWEROFF is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/olimex-lpc1766stk/hidmouse/defconfig b/configs/olimex-lpc1766stk/hidmouse/defconfig
index caf3e88bb3..1f504dd9d8 100644
--- a/configs/olimex-lpc1766stk/hidmouse/defconfig
+++ b/configs/olimex-lpc1766stk/hidmouse/defconfig
@@ -46,10 +46,11 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -495,6 +496,7 @@ CONFIG_MOUSE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -509,6 +511,8 @@ CONFIG_NETDEV_TELNET=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -579,15 +583,18 @@ CONFIG_HIDMOUSE_THRESHY=12
 # CONFIG_USBHOST_TRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -742,11 +749,6 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -830,6 +832,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/olimex-lpc1766stk/nettest/defconfig b/configs/olimex-lpc1766stk/nettest/defconfig
index a28a773290..90de87d3f0 100644
--- a/configs/olimex-lpc1766stk/nettest/defconfig
+++ b/configs/olimex-lpc1766stk/nettest/defconfig
@@ -37,14 +37,16 @@ CONFIG_INTELHEX_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,6 +77,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -93,7 +96,9 @@ CONFIG_ARCH_CHIP_LPC17XX=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
@@ -104,14 +109,25 @@ CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="lpc17xx"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
 #
@@ -121,6 +137,7 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
@@ -226,6 +243,7 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 CONFIG_ARCH_HAVE_MPU=y
@@ -357,6 +375,7 @@ CONFIG_NAME_MAX=32
 # CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
+# CONFIG_SIG_EVTHREAD is not set
 
 #
 # Signal Numbers
@@ -365,9 +384,10 @@ CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
 CONFIG_SIG_SIGWORK=17
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 CONFIG_SCHED_WORKQUEUE=y
 CONFIG_SCHED_HPWORK=y
@@ -401,6 +421,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -419,8 +440,22 @@ CONFIG_DEV_NULL=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 CONFIG_NETDEVICES=y
@@ -429,7 +464,9 @@ CONFIG_NETDEVICES=y
 # General Ethernet MAC Driver Options
 #
 # CONFIG_NETDEV_LOOPBACK is not set
+# CONFIG_NETDEV_TELNET is not set
 # CONFIG_NETDEV_MULTINIC is not set
+CONFIG_ARCH_HAVE_NETDEV_STATISTICS=y
 # CONFIG_NETDEV_LATEINIT is not set
 
 #
@@ -468,6 +505,8 @@ CONFIG_ETH0_PHY_KS8721=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -491,13 +530,10 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -514,19 +550,23 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -659,11 +699,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -682,6 +717,10 @@ CONFIG_MM_REGIONS=2
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -722,11 +761,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -740,10 +782,14 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # Application Configuration
 #
 
+#
+# CAN Utilities
+#
+
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -751,11 +797,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -777,18 +823,19 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -796,16 +843,26 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_WGET is not set
 
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
 #
 # Graphics Support
 #
@@ -816,8 +873,8 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -828,11 +885,12 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TELNETD is not set
-CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
@@ -854,15 +912,16 @@ CONFIG_NETUTILS_NETLIB=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/olimex-lpc1766stk/nsh/defconfig b/configs/olimex-lpc1766stk/nsh/defconfig
index 0d4bd8ed6b..0a6e134afc 100644
--- a/configs/olimex-lpc1766stk/nsh/defconfig
+++ b/configs/olimex-lpc1766stk/nsh/defconfig
@@ -42,10 +42,11 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -455,6 +456,8 @@ CONFIG_SPI=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -482,6 +485,7 @@ CONFIG_SPI=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -545,6 +549,8 @@ CONFIG_ETH0_PHY_KS8721=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -594,15 +600,18 @@ CONFIG_UART0_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -757,11 +766,6 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -845,6 +849,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/olimex-lpc1766stk/nx/defconfig b/configs/olimex-lpc1766stk/nx/defconfig
index e4e545d18d..ccad8743ea 100644
--- a/configs/olimex-lpc1766stk/nx/defconfig
+++ b/configs/olimex-lpc1766stk/nx/defconfig
@@ -41,14 +41,16 @@ CONFIG_INTELHEX_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -79,6 +81,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -96,7 +99,11 @@ CONFIG_ARCH_CHIP_LPC17XX=y
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -106,14 +113,25 @@ CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="lpc17xx"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
 #
@@ -123,6 +141,7 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARW is not set
 # CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
 CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDW is not set
@@ -221,11 +240,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
 # CONFIG_ARCH_USE_MPU is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
@@ -285,6 +307,8 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # Board-Specific Options
 #
 CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_RESET is not set
+# CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
 # CONFIG_BOARDCTL_ADCTEST is not set
 # CONFIG_BOARDCTL_PWMTEST is not set
@@ -324,6 +348,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nx_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -374,9 +399,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -407,6 +433,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -424,10 +451,15 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 CONFIG_LCD=y
 
 #
-# Common LCD Settings
+# Common Graphic LCD Settings
 #
 # CONFIG_LCD_CONSOLE is not set
 # CONFIG_LCD_NOGETRUN is not set
@@ -454,6 +486,9 @@ CONFIG_NOKIA6100_ML=0
 CONFIG_NOKIA6100_RGBORD=0
 # CONFIG_LCD_MIO283QT2 is not set
 # CONFIG_LCD_MIO283QT9A is not set
+# CONFIG_LCD_UG2864HSWEG01 is not set
+# CONFIG_LCD_UG2832HSWEG04 is not set
+# CONFIG_LCD_SSD1351 is not set
 # CONFIG_LCD_ST7565 is not set
 # CONFIG_LCD_ST7567 is not set
 # CONFIG_LCD_UG2864AMBAG01 is not set
@@ -465,12 +500,17 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_LCD_RLANDSCAPE is not set
 # CONFIG_LCD_ILI9341 is not set
 # CONFIG_LCD_RA8875 is not set
+# CONFIG_SLCD is not set
 
 #
-# Alphanumeric/Segment LCD Devices
+# LED Support
 #
-# CONFIG_LCD_LCD1602 is not set
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -480,6 +520,8 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -503,14 +545,11 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -527,19 +566,23 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -570,11 +613,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -583,6 +621,7 @@ CONFIG_NX_LCDDRIVER=y
 CONFIG_NX_NPLANES=1
 CONFIG_NX_BGCOLOR=0x0
 # CONFIG_NX_WRITEONLY is not set
+# CONFIG_NX_UPDATE is not set
 
 #
 # Supported Pixel Depths
@@ -681,6 +720,10 @@ CONFIG_MM_REGIONS=2
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -721,10 +764,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -739,14 +786,13 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -754,12 +800,12 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_LCDRW is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -780,18 +826,19 @@ CONFIG_EXAMPLES_NX_BPP=8
 # CONFIG_EXAMPLES_NX_RAWWINDOWS is not set
 CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 CONFIG_EXAMPLES_NX_EXTERNINIT=y
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -799,14 +846,25 @@ CONFIG_EXAMPLES_NX_EXTERNINIT=y
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -818,26 +876,23 @@ CONFIG_EXAMPLES_NX_EXTERNINIT=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
@@ -855,15 +910,16 @@ CONFIG_EXAMPLES_NX_EXTERNINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+# CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
-# CONFIG_SYSTEM_POWEROFF is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/olimex-lpc1766stk/slip-httpd/defconfig b/configs/olimex-lpc1766stk/slip-httpd/defconfig
index 74d36bad22..a19664a5ed 100644
--- a/configs/olimex-lpc1766stk/slip-httpd/defconfig
+++ b/configs/olimex-lpc1766stk/slip-httpd/defconfig
@@ -37,14 +37,16 @@ CONFIG_INTELHEX_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,6 +77,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -92,7 +95,11 @@ CONFIG_ARCH_CHIP_LPC17XX=y
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -102,14 +109,25 @@ CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="lpc17xx"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
 #
@@ -119,6 +137,7 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
@@ -202,7 +221,6 @@ CONFIG_LPC17_UART1=y
 # Serial driver options
 #
 # CONFIG_UART1_RINGINDICATOR is not set
-# CONFIG_LPC17_MULTICAST is not set
 
 #
 # Architecture Options
@@ -215,11 +233,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
 # CONFIG_ARCH_USE_MPU is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
@@ -313,6 +334,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="thttp_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -350,9 +372,10 @@ CONFIG_NAME_MAX=32
 CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -383,6 +406,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -400,8 +424,23 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_NETDEVICES is not set
@@ -413,6 +452,8 @@ CONFIG_NET_SLIP=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -436,15 +477,12 @@ CONFIG_UART1_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 CONFIG_SERIAL_NPOLLWAITERS=2
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_UART1_SERIAL_CONSOLE is not set
@@ -462,6 +500,7 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 
 #
 # UART1 Configuration
@@ -474,19 +513,23 @@ CONFIG_UART1_PARITY=0
 CONFIG_UART1_2STOP=0
 # CONFIG_UART1_IFLOWCONTROL is not set
 # CONFIG_UART1_OFLOWCONTROL is not set
+# CONFIG_UART1_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -510,9 +553,10 @@ CONFIG_NET_GUARDSIZE=2
 #
 # CONFIG_NET_MULTILINK is not set
 # CONFIG_NET_ETHERNET is not set
-CONFIG_NET_SLIPNINTERFACES=1
-CONFIG_NET_SLIPSTACKSIZE=2048
-CONFIG_NET_SLIPDEFPRIO=128
+# CONFIG_NET_LOOPBACK is not set
+CONFIG_SLIP_NINTERFACES=1
+CONFIG_SLIP_STACKSIZE=2048
+CONFIG_SLIP_DEFPRIO=128
 # CONFIG_NET_TUN is not set
 
 #
@@ -593,6 +637,7 @@ CONFIG_IOB_NCHAINS=8
 # Routing Table Configuration
 #
 # CONFIG_NET_ROUTE is not set
+CONFIG_NET_HOSTNAME=""
 
 #
 # Crypto API
@@ -616,13 +661,10 @@ CONFIG_FS_READABLE=y
 # CONFIG_FS_FAT is not set
 # CONFIG_FS_NXFFS is not set
 CONFIG_FS_ROMFS=y
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -642,6 +684,10 @@ CONFIG_MM_REGIONS=2
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -685,10 +731,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -703,14 +754,13 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -718,11 +768,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -731,19 +781,20 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -752,6 +803,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 CONFIG_EXAMPLES_THTTPD=y
@@ -760,13 +812,24 @@ CONFIG_EXAMPLES_THTTPD_DRIPADDR=0x0a000001
 CONFIG_EXAMPLES_THTTPD_NETMASK=0xffffff00
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
+# CONFIG_EXAMPLES_UNIONFS is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_WGET is not set
 # CONFIG_EXAMPLES_XMLRPC is not set
 
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
 #
 # Graphics Support
 #
@@ -778,20 +841,24 @@ CONFIG_EXAMPLES_THTTPD_NETMASK=0xffffff00
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
+# CONFIG_NETUTILS_CHAT is not set
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TELNETD is not set
 CONFIG_NETUTILS_THTTPD=y
@@ -826,16 +893,10 @@ CONFIG_THTTPD_IDLE_SEND_LIMIT_SEC=300
 CONFIG_THTTPD_TILDE_MAP_NONE=y
 # CONFIG_THTTPD_GENERATE_INDICES is not set
 # CONFIG_THTTPD_USE_URLPATTERN is not set
-CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
@@ -853,15 +914,16 @@ CONFIG_NETUTILS_NETLIB=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+# CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
-# CONFIG_SYSTEM_POWEROFF is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/olimex-lpc1766stk/thttpd-binfs/defconfig b/configs/olimex-lpc1766stk/thttpd-binfs/defconfig
index 657ee24075..ed2da29d9e 100644
--- a/configs/olimex-lpc1766stk/thttpd-binfs/defconfig
+++ b/configs/olimex-lpc1766stk/thttpd-binfs/defconfig
@@ -41,14 +41,16 @@ CONFIG_INTELHEX_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -79,6 +81,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -96,7 +99,11 @@ CONFIG_ARCH_CHIP_LPC17XX=y
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -106,14 +113,25 @@ CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="lpc17xx"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
 #
@@ -123,6 +141,7 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARW is not set
 # CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
 # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDW is not set
@@ -231,11 +250,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
 # CONFIG_ARCH_USE_MPU is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
@@ -329,6 +351,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="thttp_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -359,6 +382,7 @@ CONFIG_NAME_MAX=32
 # CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
+# CONFIG_SIG_EVTHREAD is not set
 
 #
 # Signal Numbers
@@ -367,9 +391,10 @@ CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
 CONFIG_SIG_SIGWORK=17
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 CONFIG_SCHED_WORKQUEUE=y
 CONFIG_SCHED_HPWORK=y
@@ -403,6 +428,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -420,8 +446,23 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 CONFIG_NETDEVICES=y
@@ -429,7 +470,11 @@ CONFIG_NETDEVICES=y
 #
 # General Ethernet MAC Driver Options
 #
+# CONFIG_NETDEV_LOOPBACK is not set
+# CONFIG_NETDEV_TELNET is not set
 # CONFIG_NETDEV_MULTINIC is not set
+CONFIG_ARCH_HAVE_NETDEV_STATISTICS=y
+# CONFIG_NETDEV_LATEINIT is not set
 
 #
 # External Ethernet MAC Device Support
@@ -439,6 +484,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_ENCX24J600 is not set
 # CONFIG_NET_E1000 is not set
 # CONFIG_NET_SLIP is not set
+# CONFIG_NET_FTMAC100 is not set
 # CONFIG_NET_VNET is not set
 
 #
@@ -457,6 +503,7 @@ CONFIG_ETH0_PHY_KS8721=y
 # CONFIG_ETH0_PHY_LAN8720 is not set
 # CONFIG_ETH0_PHY_LAN8740 is not set
 # CONFIG_ETH0_PHY_LAN8740A is not set
+# CONFIG_ETH0_PHY_LAN8742A is not set
 # CONFIG_ETH0_PHY_DM9161 is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
@@ -465,6 +512,8 @@ CONFIG_ETH0_PHY_KS8721=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -488,13 +537,10 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -511,19 +557,23 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -547,6 +597,7 @@ CONFIG_NET_GUARDSIZE=2
 #
 # CONFIG_NET_MULTILINK is not set
 CONFIG_NET_ETHERNET=y
+# CONFIG_NET_LOOPBACK is not set
 # CONFIG_NET_TUN is not set
 
 #
@@ -632,6 +683,7 @@ CONFIG_IOB_NCHAINS=8
 # Routing Table Configuration
 #
 # CONFIG_NET_ROUTE is not set
+CONFIG_NET_HOSTNAME=""
 
 #
 # Crypto API
@@ -655,16 +707,12 @@ CONFIG_FS_READABLE=y
 # CONFIG_FS_FAT is not set
 # CONFIG_FS_NXFFS is not set
 CONFIG_FS_ROMFS=y
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 CONFIG_FS_BINFS=y
 # CONFIG_FS_PROCFS is not set
 CONFIG_FS_UNIONFS=y
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -683,6 +731,10 @@ CONFIG_MM_REGIONS=2
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -726,10 +778,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -748,11 +805,14 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 
+#
+# CAN Utilities
+#
+
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -760,11 +820,11 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -773,19 +833,19 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -794,6 +854,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 CONFIG_EXAMPLES_THTTPD=y
@@ -802,14 +863,24 @@ CONFIG_EXAMPLES_THTTPD_DRIPADDR=0x0a000001
 CONFIG_EXAMPLES_THTTPD_NETMASK=0xffffff00
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_UNIONFS is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_WGET is not set
 # CONFIG_EXAMPLES_XMLRPC is not set
 
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
 #
 # Graphics Support
 #
@@ -821,20 +892,24 @@ CONFIG_EXAMPLES_THTTPD_NETMASK=0xffffff00
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
+# CONFIG_NETUTILS_CHAT is not set
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TELNETD is not set
 CONFIG_NETUTILS_THTTPD=y
@@ -869,16 +944,10 @@ CONFIG_THTTPD_IDLE_SEND_LIMIT_SEC=300
 CONFIG_THTTPD_TILDE_MAP_NONE=y
 # CONFIG_THTTPD_GENERATE_INDICES is not set
 # CONFIG_THTTPD_USE_URLPATTERN is not set
-CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
@@ -896,15 +965,16 @@ CONFIG_NETUTILS_NETLIB=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+# CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
-# CONFIG_SYSTEM_POWEROFF is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/olimex-lpc1766stk/thttpd-nxflat/defconfig b/configs/olimex-lpc1766stk/thttpd-nxflat/defconfig
index b917444cef..2db964db32 100644
--- a/configs/olimex-lpc1766stk/thttpd-nxflat/defconfig
+++ b/configs/olimex-lpc1766stk/thttpd-nxflat/defconfig
@@ -37,14 +37,16 @@ CONFIG_INTELHEX_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,6 +77,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -92,7 +95,11 @@ CONFIG_ARCH_CHIP_LPC17XX=y
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -102,14 +109,25 @@ CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="lpc17xx"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
 #
@@ -119,6 +137,7 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
@@ -224,11 +243,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
 # CONFIG_ARCH_USE_MPU is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
@@ -322,6 +344,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="thttp_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -352,6 +375,7 @@ CONFIG_NAME_MAX=32
 # CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
+# CONFIG_SIG_EVTHREAD is not set
 
 #
 # Signal Numbers
@@ -360,9 +384,10 @@ CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
 CONFIG_SIG_SIGWORK=17
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 CONFIG_SCHED_WORKQUEUE=y
 CONFIG_SCHED_HPWORK=y
@@ -396,6 +421,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -413,8 +439,23 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 CONFIG_NETDEVICES=y
@@ -422,7 +463,11 @@ CONFIG_NETDEVICES=y
 #
 # General Ethernet MAC Driver Options
 #
+# CONFIG_NETDEV_LOOPBACK is not set
+# CONFIG_NETDEV_TELNET is not set
 # CONFIG_NETDEV_MULTINIC is not set
+CONFIG_ARCH_HAVE_NETDEV_STATISTICS=y
+# CONFIG_NETDEV_LATEINIT is not set
 
 #
 # External Ethernet MAC Device Support
@@ -432,6 +477,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_ENCX24J600 is not set
 # CONFIG_NET_E1000 is not set
 # CONFIG_NET_SLIP is not set
+# CONFIG_NET_FTMAC100 is not set
 # CONFIG_NET_VNET is not set
 
 #
@@ -441,6 +487,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_ETH0_PHY_NONE is not set
 # CONFIG_ETH0_PHY_AM79C874 is not set
 CONFIG_ETH0_PHY_KS8721=y
+# CONFIG_ETH0_PHY_KSZ8041 is not set
 # CONFIG_ETH0_PHY_KSZ8051 is not set
 # CONFIG_ETH0_PHY_KSZ8061 is not set
 # CONFIG_ETH0_PHY_KSZ8081 is not set
@@ -449,6 +496,7 @@ CONFIG_ETH0_PHY_KS8721=y
 # CONFIG_ETH0_PHY_LAN8720 is not set
 # CONFIG_ETH0_PHY_LAN8740 is not set
 # CONFIG_ETH0_PHY_LAN8740A is not set
+# CONFIG_ETH0_PHY_LAN8742A is not set
 # CONFIG_ETH0_PHY_DM9161 is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
@@ -457,6 +505,8 @@ CONFIG_ETH0_PHY_KS8721=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -480,13 +530,10 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -503,19 +550,23 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -539,6 +590,7 @@ CONFIG_NET_GUARDSIZE=2
 #
 # CONFIG_NET_MULTILINK is not set
 CONFIG_NET_ETHERNET=y
+# CONFIG_NET_LOOPBACK is not set
 # CONFIG_NET_TUN is not set
 
 #
@@ -624,6 +676,7 @@ CONFIG_IOB_NCHAINS=8
 # Routing Table Configuration
 #
 # CONFIG_NET_ROUTE is not set
+CONFIG_NET_HOSTNAME=""
 
 #
 # Crypto API
@@ -647,13 +700,10 @@ CONFIG_FS_READABLE=y
 # CONFIG_FS_FAT is not set
 # CONFIG_FS_NXFFS is not set
 CONFIG_FS_ROMFS=y
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -673,6 +723,10 @@ CONFIG_MM_REGIONS=2
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -716,10 +770,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -734,14 +793,13 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -749,11 +807,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -762,19 +820,20 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -783,6 +842,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 CONFIG_EXAMPLES_THTTPD=y
@@ -791,13 +851,24 @@ CONFIG_EXAMPLES_THTTPD_DRIPADDR=0x0a000001
 CONFIG_EXAMPLES_THTTPD_NETMASK=0xffffff00
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
+# CONFIG_EXAMPLES_UNIONFS is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_WGET is not set
 # CONFIG_EXAMPLES_XMLRPC is not set
 
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
 #
 # Graphics Support
 #
@@ -809,20 +880,24 @@ CONFIG_EXAMPLES_THTTPD_NETMASK=0xffffff00
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
+# CONFIG_NETUTILS_CHAT is not set
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TELNETD is not set
 CONFIG_NETUTILS_THTTPD=y
@@ -830,6 +905,7 @@ CONFIG_THTTPD_PORT=80
 CONFIG_THTTPD_IPADDR=0x0a000002
 CONFIG_THTTPD_SERVER_ADDRESS="http://www.nuttx.org"
 CONFIG_THTTPD_SERVER_SOFTWARE="thttpd/2.25b 29dec2003-NuttX"
+CONFIG_THTTPD_NXFLAT=y
 CONFIG_THTTPD_PATH="/mnt/www"
 CONFIG_THTTPD_CGI_PATH="/mnt/www/cgi-bin"
 CONFIG_THTTPD_CGI_PATTERN="/mnt/www/cgi-bin/*"
@@ -856,16 +932,10 @@ CONFIG_THTTPD_IDLE_SEND_LIMIT_SEC=300
 CONFIG_THTTPD_TILDE_MAP_NONE=y
 # CONFIG_THTTPD_GENERATE_INDICES is not set
 # CONFIG_THTTPD_USE_URLPATTERN is not set
-CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
@@ -883,15 +953,16 @@ CONFIG_NETUTILS_NETLIB=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+# CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
-# CONFIG_SYSTEM_POWEROFF is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/olimex-lpc1766stk/usbmsc/defconfig b/configs/olimex-lpc1766stk/usbmsc/defconfig
index 946feef1a2..35799df910 100644
--- a/configs/olimex-lpc1766stk/usbmsc/defconfig
+++ b/configs/olimex-lpc1766stk/usbmsc/defconfig
@@ -37,14 +37,16 @@ CONFIG_INTELHEX_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,6 +77,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -92,7 +95,11 @@ CONFIG_ARCH_CHIP_LPC17XX=y
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -102,14 +109,25 @@ CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="lpc17xx"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
 #
@@ -119,6 +137,7 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
@@ -224,11 +243,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
 # CONFIG_ARCH_USE_MPU is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
@@ -288,7 +310,14 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # Board-Specific Options
 #
 CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_RESET is not set
+# CONFIG_BOARDCTL_UNIQUEID is not set
 CONFIG_BOARDCTL_USBDEVCTRL=y
+# CONFIG_BOARDCTL_TSCTEST is not set
+# CONFIG_BOARDCTL_ADCTEST is not set
+# CONFIG_BOARDCTL_PWMTEST is not set
+# CONFIG_BOARDCTL_GRAPHICS is not set
+# CONFIG_BOARDCTL_IOCTL is not set
 
 #
 # RTOS Features
@@ -323,6 +352,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="msconn_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -373,9 +403,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -406,14 +437,20 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 CONFIG_SPI=y
+# CONFIG_SPI_SLAVE is not set
 # CONFIG_SPI_EXCHANGE is not set
 # CONFIG_SPI_CMDDATA is not set
 # CONFIG_SPI_CALLBACK is not set
 # CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_HWFEATURES is not set
+# CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -427,7 +464,21 @@ CONFIG_SPI=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -439,6 +490,7 @@ CONFIG_MMCSD_SPICLOCK=12500000
 CONFIG_MMCSD_SPIMODE=0
 # CONFIG_ARCH_HAVE_SDIO is not set
 # CONFIG_ARCH_HAVE_SDIOWAIT_WRCOMPLETE is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -448,6 +500,8 @@ CONFIG_MMCSD_SPIMODE=0
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -471,14 +525,11 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -495,6 +546,7 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 CONFIG_USBDEV=y
 
 #
@@ -534,15 +586,18 @@ CONFIG_USBMSC_SCSI_STACKSIZE=2048
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -574,15 +629,11 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_FAT is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -601,6 +652,10 @@ CONFIG_MM_REGIONS=2
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -646,10 +701,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -664,26 +724,26 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FSTEST is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -691,18 +751,19 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -710,14 +771,26 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -730,26 +803,23 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
@@ -767,17 +837,17 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+# CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
-# CONFIG_SYSTEM_POWEROFF is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 CONFIG_SYSTEM_USBMSC=y
 CONFIG_SYSTEM_USBMSC_NLUNS=1
 CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
@@ -787,4 +857,5 @@ CONFIG_SYSTEM_USBMSC_DEVPATH2="/dev/mmcsd1"
 CONFIG_SYSTEM_USBMSC_DEVMINOR3=2
 CONFIG_SYSTEM_USBMSC_DEVPATH3="/dev/mmcsd2"
 # CONFIG_SYSTEM_USBMSC_DEBUGMM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/olimex-lpc1766stk/usbserial/defconfig b/configs/olimex-lpc1766stk/usbserial/defconfig
index a2ce7be2d3..2daf97a61c 100644
--- a/configs/olimex-lpc1766stk/usbserial/defconfig
+++ b/configs/olimex-lpc1766stk/usbserial/defconfig
@@ -42,10 +42,11 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -117,6 +118,8 @@ CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="lpc17xx"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
@@ -134,6 +137,7 @@ CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
@@ -452,7 +456,12 @@ CONFIG_DEV_NULL=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -460,6 +469,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -472,6 +482,7 @@ CONFIG_DEV_NULL=y
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
 CONFIG_SERIAL_REMOVABLE=y
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -495,10 +506,6 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -559,15 +566,18 @@ CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -598,11 +608,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -675,6 +680,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -703,10 +709,10 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -715,18 +721,18 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -740,11 +746,11 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 CONFIG_EXAMPLES_USBSERIAL=y
 CONFIG_EXAMPLES_USBSERIAL_BUFSIZE=512
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -766,8 +772,8 @@ CONFIG_EXAMPLES_USBSERIAL_BUFSIZE=512
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -778,6 +784,7 @@ CONFIG_EXAMPLES_USBSERIAL_BUFSIZE=512
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -799,16 +806,16 @@ CONFIG_EXAMPLES_USBSERIAL_BUFSIZE=512
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/olimex-lpc1766stk/zmodem/defconfig b/configs/olimex-lpc1766stk/zmodem/defconfig
index 676ad0c00e..fbcfccd144 100644
--- a/configs/olimex-lpc1766stk/zmodem/defconfig
+++ b/configs/olimex-lpc1766stk/zmodem/defconfig
@@ -42,10 +42,11 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -456,6 +457,8 @@ CONFIG_SPI=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -483,6 +486,7 @@ CONFIG_SPI=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -546,6 +550,8 @@ CONFIG_ETH0_PHY_KS8721=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -609,15 +615,18 @@ CONFIG_UART1_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -772,11 +781,6 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -860,6 +864,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/olimex-lpc2378/nsh/defconfig b/configs/olimex-lpc2378/nsh/defconfig
index 772fd0cf02..226f178aae 100644
--- a/configs/olimex-lpc2378/nsh/defconfig
+++ b/configs/olimex-lpc2378/nsh/defconfig
@@ -42,10 +42,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -76,6 +77,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -94,6 +96,7 @@ CONFIG_ARCH_CHIP_LPC2378=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -106,6 +109,7 @@ CONFIG_ARCH_ARM7TDMI=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
 # CONFIG_ARCH_CORTEXR4 is not set
 # CONFIG_ARCH_CORTEXR4F is not set
 # CONFIG_ARCH_CORTEXR5 is not set
@@ -114,8 +118,11 @@ CONFIG_ARCH_ARM7TDMI=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="arm"
 CONFIG_ARCH_CHIP="lpc2378"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 # CONFIG_ARCH_LOWVECTORS is not set
@@ -162,6 +169,7 @@ CONFIG_LPC2378_UART2=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
@@ -360,13 +368,20 @@ CONFIG_DEV_NULL=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
 #
 # CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -378,6 +393,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -401,10 +418,6 @@ CONFIG_UART2_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -445,15 +458,18 @@ CONFIG_UART2_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -490,11 +506,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -513,6 +524,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -556,11 +571,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -589,10 +607,10 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -601,18 +619,19 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -620,20 +639,25 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
 # CONFIG_FSUTILS_INIFILE is not set
 
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
 #
 # Graphics Support
 #
@@ -644,8 +668,8 @@ CONFIG_EXAMPLES_NSH=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -656,6 +680,7 @@ CONFIG_EXAMPLES_NSH=y
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -767,12 +792,12 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -780,5 +805,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/olimex-stm32-h405/usbnsh/defconfig b/configs/olimex-stm32-h405/usbnsh/defconfig
index 7d51694232..ef7d128fb9 100644
--- a/configs/olimex-stm32-h405/usbnsh/defconfig
+++ b/configs/olimex-stm32-h405/usbnsh/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 CONFIG_DEBUG_NOOPT=y
@@ -206,6 +208,7 @@ CONFIG_CAN_TSEG2=8
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -434,6 +437,10 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_CCMEXCLUDE is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_PWM is not set
 CONFIG_STM32_TIM1_ADC=y
 CONFIG_STM32_TIM1_ADC1=y
@@ -461,9 +468,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART3_SERIALDRIVER=y
 # CONFIG_STM32_USART3_1WIREDRIVER is not set
 # CONFIG_USART3_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -736,7 +751,12 @@ CONFIG_ADC_FIFOSIZE=8
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -744,6 +764,7 @@ CONFIG_ADC_FIFOSIZE=8
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -755,6 +776,7 @@ CONFIG_ADC_FIFOSIZE=8
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_SERIAL_REMOVABLE=y
+# CONFIG_SERIAL_CONSOLE is not set
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -844,14 +866,17 @@ CONFIG_CDCACM_PRODUCTSTR="CDC/ACM Serial"
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_NONE=y
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -889,11 +914,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -966,6 +986,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -1031,10 +1052,10 @@ CONFIG_EXAMPLES_CAN_READWRITE=y
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -1044,17 +1065,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1062,17 +1083,17 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1094,8 +1115,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1220,12 +1241,13 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_CDCACM is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1233,7 +1255,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
-# CONFIG_SYSTEM_CDCACM is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/olimex-stm32-h407/nsh/defconfig b/configs/olimex-stm32-h407/nsh/defconfig
index 5bee168710..4acf5a553f 100644
--- a/configs/olimex-stm32-h407/nsh/defconfig
+++ b/configs/olimex-stm32-h407/nsh/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -200,6 +202,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -427,6 +430,10 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_CCMEXCLUDE is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM2_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
@@ -445,9 +452,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -682,6 +697,8 @@ CONFIG_SPI=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -696,7 +713,12 @@ CONFIG_SPI=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -704,6 +726,7 @@ CONFIG_SPI=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -715,6 +738,8 @@ CONFIG_SPI=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -764,15 +789,18 @@ CONFIG_USART2_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -818,11 +846,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_MOUNTS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -896,6 +919,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -939,10 +963,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -952,17 +976,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -970,16 +994,16 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1003,8 +1027,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1129,12 +1153,12 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1142,6 +1166,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/olimex-stm32-p107/nsh/defconfig b/configs/olimex-stm32-p107/nsh/defconfig
index cbffc5aebb..1065df7ce9 100644
--- a/configs/olimex-stm32-p107/nsh/defconfig
+++ b/configs/olimex-stm32-p107/nsh/defconfig
@@ -42,10 +42,12 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -683,6 +685,7 @@ CONFIG_CAN=y
 CONFIG_CAN_FIFOSIZE=8
 CONFIG_CAN_NPENDINGRTR=4
 # CONFIG_CAN_TXREADY is not set
+CONFIG_CAN_NPOLLWAITERS=2
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
 # CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
@@ -715,6 +718,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 #
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -744,6 +748,7 @@ CONFIG_MTD=y
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT25 is not set
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
 # CONFIG_MTD_N25QXXX is not set
@@ -802,6 +807,8 @@ CONFIG_ETH0_PHY_KS8721=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -852,15 +859,18 @@ CONFIG_USART2_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -1007,11 +1017,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1092,6 +1097,7 @@ CONFIG_NETDB_DNSSERVER_IPv4ADDR=0x0a000001
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/olimex-stm32-p207/nsh/defconfig b/configs/olimex-stm32-p207/nsh/defconfig
index e7daab78ec..ec99e3837a 100644
--- a/configs/olimex-stm32-p207/nsh/defconfig
+++ b/configs/olimex-stm32-p207/nsh/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 CONFIG_DEBUG_NOOPT=y
@@ -521,8 +523,6 @@ CONFIG_STM32_OTGFS_DESCSIZE=128
 #
 # USB Host Debug Configuration
 #
-# CONFIG_STM32_USBHOST_REGDEBUG is not set
-# CONFIG_STM32_USBHOST_PKTDUMP is not set
 
 #
 # USB Device Configuration
@@ -789,6 +789,7 @@ CONFIG_ADC_FIFOSIZE=8
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -840,6 +841,8 @@ CONFIG_ETH0_PHY_KS8721=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -899,15 +902,18 @@ CONFIG_USBHOST_HAVE_ASYNCH=y
 # CONFIG_USBHOST_TRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -1054,11 +1060,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1139,6 +1140,7 @@ CONFIG_NETDB_DNSSERVER_IPv4ADDR=0x0a000001
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/olimex-strp711/nettest/defconfig b/configs/olimex-strp711/nettest/defconfig
index 6ceeed7374..1dc0270463 100644
--- a/configs/olimex-strp711/nettest/defconfig
+++ b/configs/olimex-strp711/nettest/defconfig
@@ -37,14 +37,16 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,6 +77,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -93,7 +96,9 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 CONFIG_ARCH_CHIP_STR71X=y
+# CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
 CONFIG_ARCH_ARM7TDMI=y
 # CONFIG_ARCH_ARM926EJS is not set
@@ -104,10 +109,21 @@ CONFIG_ARCH_ARM7TDMI=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="arm"
 CONFIG_ARCH_CHIP="str71x"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 # CONFIG_ARCH_LOWVECTORS is not set
 
@@ -170,6 +186,7 @@ CONFIG_STR71X_XTI=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
@@ -302,6 +319,7 @@ CONFIG_NAME_MAX=32
 # CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
+# CONFIG_SIG_EVTHREAD is not set
 
 #
 # Signal Numbers
@@ -317,9 +335,10 @@ CONFIG_SIG_SIGWORK=17
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 CONFIG_SCHED_WORKQUEUE=y
 CONFIG_SCHED_HPWORK=y
@@ -353,6 +372,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -362,6 +382,10 @@ CONFIG_SPI=y
 # CONFIG_SPI_CMDDATA is not set
 # CONFIG_SPI_CALLBACK is not set
 # CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_HWFEATURES is not set
+# CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -376,8 +400,22 @@ CONFIG_SPI=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 CONFIG_NETDEVICES=y
@@ -386,7 +424,10 @@ CONFIG_NETDEVICES=y
 # General Ethernet MAC Driver Options
 #
 # CONFIG_NETDEV_LOOPBACK is not set
+# CONFIG_NETDEV_TELNET is not set
 # CONFIG_NETDEV_MULTINIC is not set
+CONFIG_ARCH_HAVE_NETDEV_STATISTICS=y
+# CONFIG_NETDEV_STATISTICS is not set
 # CONFIG_NETDEV_LATEINIT is not set
 
 #
@@ -397,7 +438,6 @@ CONFIG_ENC28J60=y
 CONFIG_ENC28J60_NINTERFACES=1
 CONFIG_ENC28J60_SPIMODE=0
 CONFIG_ENC28J60_FREQUENCY=20000000
-CONFIG_ENC28J60_STATS=y
 # CONFIG_ENC28J60_HALFDUPPLEX is not set
 # CONFIG_ENC28J60_DUMPPACKET is not set
 # CONFIG_ENCX24J600 is not set
@@ -412,6 +452,8 @@ CONFIG_ENC28J60_STATS=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -435,13 +477,10 @@ CONFIG_UART1_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_UART1_SERIAL_CONSOLE is not set
@@ -459,6 +498,7 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 
 #
 # UART1 Configuration
@@ -471,19 +511,23 @@ CONFIG_UART1_PARITY=0
 CONFIG_UART1_2STOP=0
 # CONFIG_UART1_IFLOWCONTROL is not set
 # CONFIG_UART1_OFLOWCONTROL is not set
+# CONFIG_UART1_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -617,11 +661,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -640,6 +679,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -680,11 +723,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -698,10 +744,15 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # Application Configuration
 #
 
+#
+# CAN Utilities
+#
+
 #
 # Examples
 #
 # CONFIG_EXAMPLES_BUTTONS is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -709,11 +760,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -735,18 +786,19 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -754,16 +806,26 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_WGET is not set
 
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
 #
 # Graphics Support
 #
@@ -774,8 +836,8 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -786,11 +848,12 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TELNETD is not set
-CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
@@ -812,15 +875,16 @@ CONFIG_NETUTILS_NETLIB=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/olimex-strp711/nsh/defconfig b/configs/olimex-strp711/nsh/defconfig
index 574f15003b..ed9e622b0d 100644
--- a/configs/olimex-strp711/nsh/defconfig
+++ b/configs/olimex-strp711/nsh/defconfig
@@ -17,6 +17,7 @@ CONFIG_HOST_LINUX=y
 # Build Configuration
 #
 # CONFIG_APPS_DIR="../apps"
+CONFIG_BUILD_FLAT=y
 # CONFIG_BUILD_2PASS is not set
 
 #
@@ -26,20 +27,25 @@ CONFIG_HOST_LINUX=y
 # CONFIG_INTELHEX_BINARY is not set
 # CONFIG_MOTOROLA_SREC is not set
 CONFIG_RAW_BINARY=y
+# CONFIG_UBOOT_UIMAGE is not set
 
 #
 # Customize Header Files
 #
+# CONFIG_ARCH_STDINT_H is not set
 # CONFIG_ARCH_STDBOOL_H is not set
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
+# CONFIG_STACK_COLORATION is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
@@ -69,10 +75,14 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_C5471 is not set
 # CONFIG_ARCH_CHIP_CALYPSO is not set
 # CONFIG_ARCH_CHIP_DM320 is not set
+# CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
+# CONFIG_ARCH_CHIP_TIVA is not set
+# CONFIG_ARCH_CHIP_LPC11XX is not set
 # CONFIG_ARCH_CHIP_LPC17XX is not set
 # CONFIG_ARCH_CHIP_LPC214X is not set
 # CONFIG_ARCH_CHIP_LPC2378 is not set
@@ -81,21 +91,39 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_NUC1XX is not set
 # CONFIG_ARCH_CHIP_SAMA5 is not set
 # CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
 # CONFIG_ARCH_CHIP_SAM34 is not set
+# CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 CONFIG_ARCH_CHIP_STR71X=y
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 CONFIG_ARCH_ARM7TDMI=y
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
 # CONFIG_ARCH_CORTEXM0 is not set
 # CONFIG_ARCH_CORTEXM3 is not set
 # CONFIG_ARCH_CORTEXM4 is not set
+# CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="arm"
 CONFIG_ARCH_CHIP="str71x"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
-# CONFIG_ARCH_HAVE_MPU is not set
+# CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 # CONFIG_ARCH_LOWVECTORS is not set
 
@@ -154,10 +182,18 @@ CONFIG_STR71X_UART1=y
 # CONFIG_ARCH_VECNOTIRQ is not set
 # CONFIG_ARCH_DMA is not set
 # CONFIG_ARCH_HAVE_IRQPRIO is not set
-# CONFIG_ARCH_ADDRENV is not set
+# CONFIG_ARCH_L2CACHE is not set
+# CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
+# CONFIG_ARCH_HAVE_ADDRENV is not set
+# CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
+# CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
+# CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+# CONFIG_ARCH_HAVE_RESET is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
 # CONFIG_ARCH_IDLE_CUSTOM is not set
@@ -214,39 +250,84 @@ CONFIG_NSH_MMCSDSPIPORTNO=1
 #
 # Board-Specific Options
 #
+CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_UNIQUEID is not set
+# CONFIG_BOARDCTL_TSCTEST is not set
+# CONFIG_BOARDCTL_ADCTEST is not set
+# CONFIG_BOARDCTL_PWMTEST is not set
+# CONFIG_BOARDCTL_GRAPHICS is not set
+# CONFIG_BOARDCTL_IOCTL is not set
 
 #
 # RTOS Features
 #
-# CONFIG_BOARD_INITIALIZE is not set
+CONFIG_DISABLE_OS_API=y
+# CONFIG_DISABLE_POSIX_TIMERS is not set
+# CONFIG_DISABLE_PTHREAD is not set
+# CONFIG_DISABLE_SIGNALS is not set
+# CONFIG_DISABLE_MQUEUE is not set
+# CONFIG_DISABLE_ENVIRON is not set
+
+#
+# Clocks and Timers
+#
 CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
-CONFIG_RR_INTERVAL=0
-# CONFIG_SCHED_CPULOAD is not set
-# CONFIG_SCHED_INSTRUMENTATION is not set
-CONFIG_TASK_NAME_SIZE=0
-# CONFIG_SCHED_HAVE_PARENT is not set
+# CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
 CONFIG_START_YEAR=2009
 CONFIG_START_MONTH=6
 CONFIG_START_DAY=5
-CONFIG_DEV_CONSOLE=y
+CONFIG_MAX_WDOGPARMS=2
+CONFIG_PREALLOC_WDOGS=4
+CONFIG_WDOG_INTRESERVE=0
+CONFIG_PREALLOC_TIMERS=4
+
+#
+# Tasks and Scheduling
+#
+# CONFIG_INIT_NONE is not set
+CONFIG_INIT_ENTRYPOINT=y
+# CONFIG_INIT_FILEPATH is not set
+CONFIG_USER_ENTRYPOINT="nsh_main"
+CONFIG_RR_INTERVAL=0
+# CONFIG_SCHED_SPORADIC is not set
+CONFIG_TASK_NAME_SIZE=0
+CONFIG_MAX_TASKS=16
+# CONFIG_SCHED_HAVE_PARENT is not set
+# CONFIG_SCHED_WAITPID is not set
+
+#
+# Pthread Options
+#
 # CONFIG_MUTEX_TYPES is not set
-# CONFIG_PRIORITY_INHERITANCE is not set
+CONFIG_NPTHREAD_KEYS=4
+
+#
+# Performance Monitoring
+#
+# CONFIG_SCHED_CPULOAD is not set
+# CONFIG_SCHED_INSTRUMENTATION is not set
+
+#
+# Files and I/O
+#
+CONFIG_DEV_CONSOLE=y
 # CONFIG_FDCLONE_DISABLE is not set
 # CONFIG_FDCLONE_STDIO is not set
 CONFIG_SDCLONE_DISABLE=y
-# CONFIG_SCHED_WAITPID is not set
+CONFIG_NFILE_DESCRIPTORS=8
+CONFIG_NFILE_STREAMS=8
+CONFIG_NAME_MAX=32
+# CONFIG_PRIORITY_INHERITANCE is not set
+
+#
+# RTOS hooks
+#
+# CONFIG_BOARD_INITIALIZE is not set
 # CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
-CONFIG_USER_ENTRYPOINT="nsh_main"
-CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_POSIX_TIMERS is not set
-# CONFIG_DISABLE_PTHREAD is not set
-# CONFIG_DISABLE_SIGNALS is not set
-# CONFIG_DISABLE_MQUEUE is not set
-# CONFIG_DISABLE_ENVIRON is not set
 
 #
 # Signal Numbers
@@ -257,19 +338,18 @@ CONFIG_SIG_SIGALARM=3
 CONFIG_SIG_SIGCONDTIMEDOUT=16
 
 #
-# Sizes of configurable things (0 disables)
+# POSIX Message Queue Options
 #
-CONFIG_MAX_TASKS=16
-CONFIG_NPTHREAD_KEYS=4
-CONFIG_NFILE_DESCRIPTORS=8
-CONFIG_NFILE_STREAMS=8
-CONFIG_NAME_MAX=32
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
-CONFIG_MAX_WDOGPARMS=2
-CONFIG_PREALLOC_WDOGS=4
-CONFIG_WDOG_INTRESERVE=0
-CONFIG_PREALLOC_TIMERS=4
+# CONFIG_MODULE is not set
+
+#
+# Work queue support
+#
+# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_SCHED_HPWORK is not set
+# CONFIG_SCHED_LPWORK is not set
 
 #
 # Stack and heap information
@@ -278,6 +358,7 @@ CONFIG_IDLETHREAD_STACKSIZE=2048
 CONFIG_USERMAIN_STACKSIZE=2048
 CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=2048
+# CONFIG_LIB_SYSCALL is not set
 
 #
 # Device Drivers
@@ -286,17 +367,35 @@ CONFIG_DISABLE_POLL=y
 CONFIG_DEV_NULL=y
 # CONFIG_DEV_ZERO is not set
 # CONFIG_DEV_LOOP is not set
+
+#
+# Buffering
+#
+# CONFIG_DRVR_WRITEBUFFER is not set
+# CONFIG_DRVR_READAHEAD is not set
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 CONFIG_SPI=y
+# CONFIG_SPI_SLAVE is not set
 # CONFIG_SPI_EXCHANGE is not set
 # CONFIG_SPI_CMDDATA is not set
+CONFIG_SPI_CALLBACK=y
 # CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_HWFEATURES is not set
+# CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
+
+#
+# Timer Driver Support
+#
+# CONFIG_TIMER is not set
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_ANALOG is not set
@@ -304,7 +403,21 @@ CONFIG_SPI=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -315,7 +428,10 @@ CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SPICLOCK=20000000
 CONFIG_MMCSD_SPIMODE=0
 # CONFIG_ARCH_HAVE_SDIO is not set
+# CONFIG_ARCH_HAVE_SDIOWAIT_WRCOMPLETE is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
+# CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
@@ -323,17 +439,40 @@ CONFIG_MMCSD_SPIMODE=0
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
+# CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
 CONFIG_UART1_SERIALDRIVER=y
-
-#
-# USART Configuration
-#
+# CONFIG_UART2_SERIALDRIVER is not set
+# CONFIG_UART3_SERIALDRIVER is not set
+# CONFIG_UART4_SERIALDRIVER is not set
+# CONFIG_UART5_SERIALDRIVER is not set
+# CONFIG_UART6_SERIALDRIVER is not set
+# CONFIG_UART7_SERIALDRIVER is not set
+# CONFIG_UART8_SERIALDRIVER is not set
+# CONFIG_SCI0_SERIALDRIVER is not set
+# CONFIG_SCI1_SERIALDRIVER is not set
+# CONFIG_USART0_SERIALDRIVER is not set
+# CONFIG_USART1_SERIALDRIVER is not set
+# CONFIG_USART2_SERIALDRIVER is not set
+# CONFIG_USART3_SERIALDRIVER is not set
+# CONFIG_USART4_SERIALDRIVER is not set
+# CONFIG_USART5_SERIALDRIVER is not set
+# CONFIG_USART6_SERIALDRIVER is not set
+# CONFIG_USART7_SERIALDRIVER is not set
+# CONFIG_USART8_SERIALDRIVER is not set
+# CONFIG_OTHER_UART_SERIALDRIVER is not set
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
+# CONFIG_SERIAL_IFLOWCONTROL is not set
+# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
+# CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_UART1_SERIAL_CONSOLE is not set
+# CONFIG_OTHER_SERIAL_CONSOLE is not set
 # CONFIG_NO_SERIAL_CONSOLE is not set
 
 #
@@ -347,6 +486,7 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 
 #
 # UART1 Configuration
@@ -359,20 +499,23 @@ CONFIG_UART1_PARITY=0
 CONFIG_UART1_2STOP=0
 # CONFIG_UART1_IFLOWCONTROL is not set
 # CONFIG_UART1_OFLOWCONTROL is not set
-# CONFIG_SERIAL_IFLOWCONTROL is not set
-# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_UART1_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -381,6 +524,11 @@ CONFIG_UART1_2STOP=0
 # CONFIG_ARCH_HAVE_PHY is not set
 # CONFIG_NET is not set
 
+#
+# Crypto API
+#
+# CONFIG_CRYPTO is not set
+
 #
 # File Systems
 #
@@ -389,24 +537,26 @@ CONFIG_UART1_2STOP=0
 # File system configuration
 #
 # CONFIG_DISABLE_MOUNTPOINT is not set
+# CONFIG_FS_AUTOMOUNTER is not set
 # CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
 CONFIG_FS_READABLE=y
 CONFIG_FS_WRITABLE=y
+# CONFIG_FS_NAMED_SEMAPHORES is not set
+CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_RAMMAP is not set
 CONFIG_FS_FAT=y
 # CONFIG_FAT_LCNAMES is not set
 # CONFIG_FAT_LFN is not set
 # CONFIG_FS_FATTIME is not set
+# CONFIG_FAT_FORCE_INDIRECT is not set
 # CONFIG_FAT_DMAMEMORY is not set
+# CONFIG_FAT_DIRECT_RETRY is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
-
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -427,7 +577,11 @@ CONFIG_MM_REGIONS=1
 # CONFIG_AUDIO is not set
 
 #
-# Binary Formats
+# Wireless Support
+#
+
+#
+# Binary Loader
 #
 # CONFIG_BINFMT_DISABLE is not set
 # CONFIG_BINFMT_EXEPATH is not set
@@ -452,6 +606,7 @@ CONFIG_LIB_HOMEDIR="/"
 # CONFIG_NOPRINTF_FIELDWIDTH is not set
 # CONFIG_LIBC_FLOATINGPOINT is not set
 CONFIG_LIBC_LONG_LONG=y
+# CONFIG_LIBC_IOCTL_VARIADIC is not set
 CONFIG_LIB_RAND_ORDER=1
 # CONFIG_EOL_IS_CR is not set
 # CONFIG_EOL_IS_LF is not set
@@ -462,15 +617,23 @@ CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
 # CONFIG_LIBC_STRERROR is not set
 # CONFIG_LIBC_PERROR_STDOUT is not set
+CONFIG_LIBC_TMPDIR="/tmp"
+CONFIG_LIBC_MAX_TMPFILE=32
 CONFIG_ARCH_LOWPUTC=y
+# CONFIG_LIBC_LOCALTIME is not set
+# CONFIG_TIME_EXTENDED is not set
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
-# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -485,26 +648,27 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
 # CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
+# CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FSTEST is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
-# CONFIG_EXAMPLES_LCDRW is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -512,88 +676,108 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
-# CONFIG_EXAMPLES_PASHELLO is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
-# CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
+# CONFIG_EXAMPLES_SERIALBLASTER is not set
+# CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_UDP is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
 #
 # CONFIG_TIFF is not set
+# CONFIG_GRAPHICS_TRAVELER is not set
 
 #
 # Interpreters
 #
+# CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_MICROPYTHON is not set
 # CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
-# CONFIG_NETUTILS_DHCPD is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
-# CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_TFTPC is not set
-# CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_NETLIB is not set
-# CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
-# FreeModBus
+# NSH Library
 #
-# CONFIG_MODBUS is not set
+CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
-# NSH Library
+# Command Line Configuration
 #
-CONFIG_NSH_LIBRARY=y
 CONFIG_NSH_READLINE=y
 # CONFIG_NSH_CLE is not set
+CONFIG_NSH_LINELEN=64
+# CONFIG_NSH_DISABLE_SEMICOLON is not set
+CONFIG_NSH_CMDPARMS=y
+CONFIG_NSH_MAXARGUMENTS=6
+CONFIG_NSH_ARGCAT=y
+CONFIG_NSH_NESTDEPTH=3
+# CONFIG_NSH_DISABLEBG is not set
 
 #
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
 # CONFIG_NSH_DISABLE_CMP is not set
+CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_DD is not set
 # CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -602,8 +786,10 @@ CONFIG_NSH_READLINE=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 # CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -612,6 +798,7 @@ CONFIG_NSH_READLINE=y
 # CONFIG_NSH_DISABLE_MKRD is not set
 # CONFIG_NSH_DISABLE_MH is not set
 # CONFIG_NSH_DISABLE_MOUNT is not set
+# CONFIG_NSH_DISABLE_MV is not set
 # CONFIG_NSH_DISABLE_MW is not set
 # CONFIG_NSH_DISABLE_PS is not set
 # CONFIG_NSH_DISABLE_PUT is not set
@@ -621,8 +808,10 @@ CONFIG_NSH_READLINE=y
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
@@ -635,25 +824,22 @@ CONFIG_NSH_CMDOPT_DF_H=y
 CONFIG_NSH_CODECS_BUFSIZE=128
 CONFIG_NSH_CMDOPT_HEXDUMP=y
 CONFIG_NSH_FILEIOSIZE=512
-CONFIG_NSH_LINELEN=64
-# CONFIG_NSH_DISABLE_SEMICOLON is not set
-CONFIG_NSH_CMDPARMS=y
-CONFIG_NSH_TMPDIR="/tmp"
-CONFIG_NSH_MAXARGUMENTS=6
-CONFIG_NSH_ARGCAT=y
-CONFIG_NSH_NESTDEPTH=3
+
+#
+# Scripting Support
+#
 # CONFIG_NSH_DISABLESCRIPT is not set
 # CONFIG_NSH_DISABLE_ITEF is not set
 # CONFIG_NSH_DISABLE_LOOPS is not set
-# CONFIG_NSH_DISABLEBG is not set
-CONFIG_NSH_CONSOLE=y
 
 #
-# USB Trace Support
+# Console Configuration
 #
+CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
-CONFIG_LIB_BOARDCTL=y
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -667,94 +853,19 @@ CONFIG_LIB_BOARDCTL=y
 #
 # System Libraries and NSH Add-Ons
 #
-
-#
-# USB CDC/ACM Device Commands
-#
-
-#
-# USB Composite Device Commands
-#
-
-#
-# Custom Free Memory Command
-#
+# CONFIG_SYSTEM_CLE is not set
+# CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-
-#
-# I2C tool
-#
-
-#
-# INI File Parser
-#
-# CONFIG_FSUTILS_INIFILE is not set
-
-#
-# FLASH Program Installation
-#
+# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
-
-#
-# FLASH Erase-all Command
-#
-
-#
-# NxPlayer media player library / command Line
-#
-# CONFIG_SYSTEM_NXPLAYER is not set
-
-#
-# RAM test
-#
 # CONFIG_SYSTEM_RAMTEST is not set
-
-#
-# readline()
-#
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
-
-#
-# Power Off
-#
-# CONFIG_SYSTEM_POWEROFF is not set
-
-#
-# RAMTRON
-#
-
-#
-# SD Card
-#
-
-#
-# Sysinfo
-#
-
-#
-# USB Monitor
-#
-
-#
-# EMACS-like Command Line Editor
-#
-# CONFIG_SYSTEM_CLE is not set
-
-#
-# VI Work-Alike Editor
-#
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
+# CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
-
-#
-# Stack Monitor
-#
-
-#
-# USB Mass Storage Device Commands
-#
-
-#
-# Zmodem Commands
-#
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/olimexino-stm32/can/defconfig b/configs/olimexino-stm32/can/defconfig
index e9b76b079a..9366accf05 100644
--- a/configs/olimexino-stm32/can/defconfig
+++ b/configs/olimexino-stm32/can/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 CONFIG_STACK_COLORATION=y
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -204,6 +206,7 @@ CONFIG_ARCH_CHIP_STM32F103RB=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -423,6 +426,10 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y
 CONFIG_STM32_FORCEPOWER=y
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_PWM is not set
 # CONFIG_STM32_TIM3_PWM is not set
 # CONFIG_STM32_TIM1_ADC is not set
@@ -442,9 +449,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 CONFIG_SERIAL_DISABLE_REORDERING=y
 CONFIG_STM32_FLOWCONTROL_BROKEN=y
 # CONFIG_STM32_USART_BREAKS is not set
@@ -698,6 +713,7 @@ CONFIG_CAN=y
 CONFIG_CAN_FIFOSIZE=8
 CONFIG_CAN_NPENDINGRTR=4
 # CONFIG_CAN_TXREADY is not set
+CONFIG_CAN_NPOLLWAITERS=2
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
 # CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
@@ -716,6 +732,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -733,7 +751,12 @@ CONFIG_ANALOG=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -741,6 +764,7 @@ CONFIG_ANALOG=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -752,6 +776,8 @@ CONFIG_ANALOG=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -802,15 +828,18 @@ CONFIG_USART1_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -856,11 +885,6 @@ CONFIG_FS_FATTIME=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -936,6 +960,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -988,10 +1013,10 @@ CONFIG_EXAMPLES_CAN_READWRITE=y
 # CONFIG_EXAMPLES_HELLO is not set
 CONFIG_EXAMPLES_HELLOXX=y
 CONFIG_EXAMPLES_HELLOXX_CXXINITIALIZE=y
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -1001,17 +1026,17 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NSH_CXXINITIALIZE is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1019,17 +1044,17 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1053,8 +1078,8 @@ CONFIG_EXAMPLES_NSH=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1178,21 +1203,21 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_SYSTEM_I2CTOOL is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_I2CTOOL is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
-# CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_STACKMONITOR is not set
+# CONFIG_SYSTEM_SUDOKU is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/olimexino-stm32/composite/defconfig b/configs/olimexino-stm32/composite/defconfig
index 7152e530fc..a58f83346f 100644
--- a/configs/olimexino-stm32/composite/defconfig
+++ b/configs/olimexino-stm32/composite/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 CONFIG_STACK_COLORATION=y
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -199,6 +201,7 @@ CONFIG_ARCH_CHIP_STM32F103RB=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -417,6 +420,10 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y
 CONFIG_STM32_FORCEPOWER=y
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 CONFIG_STM32_DMACAPABLE=y
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_PWM is not set
 # CONFIG_STM32_TIM3_PWM is not set
 # CONFIG_STM32_TIM1_ADC is not set
@@ -437,6 +444,10 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
@@ -445,6 +456,10 @@ CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
 # CONFIG_USART2_RXDMA is not set
+
+#
+# Serial Driver Configuration
+#
 CONFIG_SERIAL_DISABLE_REORDERING=y
 CONFIG_STM32_FLOWCONTROL_BROKEN=y
 # CONFIG_STM32_USART_BREAKS is not set
@@ -704,6 +719,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -726,7 +743,12 @@ CONFIG_ANALOG=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -734,6 +756,7 @@ CONFIG_ANALOG=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -756,6 +779,7 @@ CONFIG_MMCSD_SPIMODE=0
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
 CONFIG_SERIAL_REMOVABLE=y
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -890,15 +914,18 @@ CONFIG_USBMSC_SCSI_STACKSIZE=340
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -944,11 +971,6 @@ CONFIG_FS_FATTIME=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1024,6 +1046,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -1082,10 +1105,10 @@ CONFIG_EXAMPLES_BUTTONS_NAME7="Button 7"
 # CONFIG_EXAMPLES_HELLO is not set
 CONFIG_EXAMPLES_HELLOXX=y
 CONFIG_EXAMPLES_HELLOXX_CXXINITIALIZE=y
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -1095,17 +1118,17 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NSH_CXXINITIALIZE is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1113,17 +1136,17 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1147,8 +1170,8 @@ CONFIG_EXAMPLES_NSH=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1275,22 +1298,8 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-CONFIG_SYSTEM_FREE=y
-# CONFIG_SYSTEM_CLE is not set
-# CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_SYSTEM_HEXED is not set
-# CONFIG_SYSTEM_RAMTEST is not set
-CONFIG_READLINE_HAVE_EXTMATCH=y
-CONFIG_SYSTEM_READLINE=y
-CONFIG_READLINE_ECHO=y
-# CONFIG_READLINE_TABCOMPLETION is not set
-# CONFIG_READLINE_CMD_HISTORY is not set
-# CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
-# CONFIG_SYSTEM_STACKMONITOR is not set
 # CONFIG_SYSTEM_CDCACM is not set
+# CONFIG_SYSTEM_CLE is not set
 CONFIG_SYSTEM_COMPOSITE=y
 CONFIG_SYSTEM_COMPOSITE_NLUNS=1
 CONFIG_SYSTEM_COMPOSITE_DEVMINOR1=0
@@ -1303,6 +1312,20 @@ CONFIG_SYSTEM_COMPOSITE_TTYUSB=0
 CONFIG_SYSTEM_COMPOSITE_SERDEV="/dev/ttyACM0"
 CONFIG_SYSTEM_COMPOSITE_BUFSIZE=256
 # CONFIG_SYSTEM_COMPOSITE_DEBUGMM is not set
+# CONFIG_SYSTEM_CUTERM is not set
+CONFIG_SYSTEM_FREE=y
+# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_RAMTEST is not set
+CONFIG_READLINE_HAVE_EXTMATCH=y
+CONFIG_SYSTEM_READLINE=y
+CONFIG_READLINE_ECHO=y
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
+# CONFIG_SYSTEM_STACKMONITOR is not set
+# CONFIG_SYSTEM_SUDOKU is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_USBMSC is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/olimexino-stm32/nsh/defconfig b/configs/olimexino-stm32/nsh/defconfig
index 096fdb9fc6..e963472cb3 100644
--- a/configs/olimexino-stm32/nsh/defconfig
+++ b/configs/olimexino-stm32/nsh/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 CONFIG_STACK_COLORATION=y
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -199,6 +201,7 @@ CONFIG_ARCH_CHIP_STM32F103RB=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -417,6 +420,10 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y
 CONFIG_STM32_FORCEPOWER=y
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 CONFIG_STM32_DMACAPABLE=y
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_PWM is not set
 # CONFIG_STM32_TIM3_PWM is not set
 # CONFIG_STM32_TIM1_ADC is not set
@@ -437,6 +444,10 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
@@ -445,6 +456,10 @@ CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
 # CONFIG_USART2_RXDMA is not set
+
+#
+# Serial Driver Configuration
+#
 CONFIG_SERIAL_DISABLE_REORDERING=y
 CONFIG_STM32_FLOWCONTROL_BROKEN=y
 # CONFIG_STM32_USART_BREAKS is not set
@@ -703,6 +718,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -725,7 +742,12 @@ CONFIG_ANALOG=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -733,6 +755,7 @@ CONFIG_ANALOG=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -754,6 +777,8 @@ CONFIG_MMCSD_SPIMODE=0
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -818,15 +843,18 @@ CONFIG_USART2_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -872,11 +900,6 @@ CONFIG_FS_FATTIME=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -952,6 +975,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -1010,10 +1034,10 @@ CONFIG_EXAMPLES_BUTTONS_NAME7="Button 7"
 # CONFIG_EXAMPLES_HELLO is not set
 CONFIG_EXAMPLES_HELLOXX=y
 CONFIG_EXAMPLES_HELLOXX_CXXINITIALIZE=y
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -1023,17 +1047,17 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NSH_CXXINITIALIZE is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1041,17 +1065,17 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1075,8 +1099,8 @@ CONFIG_EXAMPLES_NSH=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1202,20 +1226,20 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-CONFIG_SYSTEM_FREE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+CONFIG_SYSTEM_FREE=y
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
-# CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_STACKMONITOR is not set
+# CONFIG_SYSTEM_SUDOKU is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/olimexino-stm32/smallnsh/defconfig b/configs/olimexino-stm32/smallnsh/defconfig
index 0612dbbeed..6a870a7f6e 100644
--- a/configs/olimexino-stm32/smallnsh/defconfig
+++ b/configs/olimexino-stm32/smallnsh/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 CONFIG_STACK_COLORATION=y
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -204,6 +206,7 @@ CONFIG_ARCH_CHIP_STM32F103RB=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -421,6 +424,10 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y
 CONFIG_STM32_FORCEPOWER=y
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_PWM is not set
 # CONFIG_STM32_TIM3_PWM is not set
 # CONFIG_STM32_TIM1_CAP is not set
@@ -434,9 +441,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 CONFIG_SERIAL_DISABLE_REORDERING=y
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -684,6 +699,7 @@ CONFIG_CAN=y
 CONFIG_CAN_FIFOSIZE=8
 CONFIG_CAN_NPENDINGRTR=4
 # CONFIG_CAN_TXREADY is not set
+CONFIG_CAN_NPOLLWAITERS=2
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
 # CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
@@ -697,6 +713,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -711,7 +729,12 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -719,6 +742,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -730,6 +754,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -780,15 +806,18 @@ CONFIG_USART1_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -826,11 +855,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -903,6 +927,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -952,10 +977,10 @@ CONFIG_EXAMPLES_CAN_READWRITE=y
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -965,17 +990,17 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NSH_CXXINITIALIZE is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -983,17 +1008,17 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1015,8 +1040,8 @@ CONFIG_EXAMPLES_NSH=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1138,20 +1163,20 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
-# CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_STACKMONITOR is not set
+# CONFIG_SYSTEM_SUDOKU is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/olimexino-stm32/tiny/defconfig b/configs/olimexino-stm32/tiny/defconfig
index ffd31cfd9f..0e5679272c 100644
--- a/configs/olimexino-stm32/tiny/defconfig
+++ b/configs/olimexino-stm32/tiny/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 CONFIG_STACK_COLORATION=y
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -204,6 +206,7 @@ CONFIG_ARCH_CHIP_STM32F103RB=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -421,6 +424,10 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y
 CONFIG_STM32_FORCEPOWER=y
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_PWM is not set
 # CONFIG_STM32_TIM3_PWM is not set
 # CONFIG_STM32_TIM1_CAP is not set
@@ -434,9 +441,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 CONFIG_SERIAL_DISABLE_REORDERING=y
 CONFIG_STM32_FLOWCONTROL_BROKEN=y
 # CONFIG_STM32_USART_BREAKS is not set
@@ -688,6 +703,7 @@ CONFIG_CAN=y
 CONFIG_CAN_FIFOSIZE=8
 CONFIG_CAN_NPENDINGRTR=4
 # CONFIG_CAN_TXREADY is not set
+CONFIG_CAN_NPOLLWAITERS=2
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
 # CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
@@ -701,6 +717,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -715,7 +733,12 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -723,6 +746,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -734,6 +758,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -782,15 +808,18 @@ CONFIG_USART1_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -823,11 +852,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -900,6 +924,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -948,10 +973,10 @@ CONFIG_EXAMPLES_CAN_READWRITE=y
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_LEDS is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
@@ -961,18 +986,18 @@ CONFIG_EXAMPLES_CAN_READWRITE=y
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -986,10 +1011,10 @@ CONFIG_EXAMPLES_CAN_READWRITE=y
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1011,8 +1036,8 @@ CONFIG_EXAMPLES_CAN_READWRITE=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1046,20 +1071,20 @@ CONFIG_EXAMPLES_CAN_READWRITE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
-# CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_STACKMONITOR is not set
+# CONFIG_SYSTEM_SUDOKU is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/open1788/knsh/defconfig b/configs/open1788/knsh/defconfig
index bfb8b87700..aa2c88fd4a 100644
--- a/configs/open1788/knsh/defconfig
+++ b/configs/open1788/knsh/defconfig
@@ -42,12 +42,15 @@ CONFIG_INTELHEX_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
+# CONFIG_STACK_COLORATION is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
@@ -77,11 +80,14 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_C5471 is not set
 # CONFIG_ARCH_CHIP_CALYPSO is not set
 # CONFIG_ARCH_CHIP_DM320 is not set
+# CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
 # CONFIG_ARCH_CHIP_TIVA is not set
+# CONFIG_ARCH_CHIP_LPC11XX is not set
 CONFIG_ARCH_CHIP_LPC17XX=y
 # CONFIG_ARCH_CHIP_LPC214X is not set
 # CONFIG_ARCH_CHIP_LPC2378 is not set
@@ -90,35 +96,63 @@ CONFIG_ARCH_CHIP_LPC17XX=y
 # CONFIG_ARCH_CHIP_NUC1XX is not set
 # CONFIG_ARCH_CHIP_SAMA5 is not set
 # CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
 # CONFIG_ARCH_CHIP_SAM34 is not set
+# CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
 # CONFIG_ARCH_CORTEXM0 is not set
 CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXM4 is not set
+# CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="lpc17xx"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
+# CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
+# CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
 CONFIG_ARM_MPU=y
 CONFIG_ARM_MPU_NREGIONS=8
 
 #
 # ARMV7M Configuration Options
 #
+# CONFIG_ARMV7M_HAVE_ICACHE is not set
+# CONFIG_ARMV7M_HAVE_DCACHE is not set
+# CONFIG_ARMV7M_HAVE_ITCM is not set
+# CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
 CONFIG_ARMV7M_OABI_TOOLCHAIN=y
+# CONFIG_ARMV7M_HAVE_STACKCHECK is not set
+# CONFIG_ARMV7M_ITMSYSLOG is not set
 # CONFIG_GPIO_IRQ is not set
+# CONFIG_SERIAL_TERMIOS is not set
 
 #
 # LPC17xx Configuration Options
@@ -196,13 +230,11 @@ CONFIG_LPC17_GPDMA=y
 #
 # Serial driver options
 #
-# CONFIG_SERIAL_TERMIOS is not set
 
 #
 # SDIO Configuration
 #
 CONFIG_SDIO_DMA=y
-CONFIG_SDIO_DMAPRIO=0x0
 # CONFIG_SDIO_WIDTH_D1_ONLY is not set
 
 #
@@ -216,11 +248,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
 CONFIG_ARCH_USE_MPU=y
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
@@ -282,6 +317,7 @@ CONFIG_NSH_MMCSDSLOTNO=0
 #
 # Board-Specific Options
 #
+# CONFIG_LIB_BOARDCTL is not set
 
 #
 # RTOS Features
@@ -311,8 +347,12 @@ CONFIG_PREALLOC_TIMERS=4
 #
 # Tasks and Scheduling
 #
+# CONFIG_INIT_NONE is not set
+CONFIG_INIT_ENTRYPOINT=y
+# CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -346,6 +386,7 @@ CONFIG_NAME_MAX=32
 # RTOS hooks
 #
 CONFIG_BOARD_INITIALIZE=y
+# CONFIG_BOARD_INITTHREAD is not set
 # CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
@@ -364,6 +405,17 @@ CONFIG_SIG_SIGWORK=17
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
+
+#
+# Work queue support
+#
+CONFIG_SCHED_WORKQUEUE=y
+CONFIG_SCHED_HPWORK=y
+CONFIG_SCHED_HPWORKPRIORITY=192
+CONFIG_SCHED_HPWORKPERIOD=50000
+CONFIG_SCHED_HPWORKSTACKSIZE=2048
+# CONFIG_SCHED_LPWORK is not set
 
 #
 # Stack and heap information
@@ -392,20 +444,39 @@ CONFIG_DEV_LOOP=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 # CONFIG_SPI is not set
 # CONFIG_I2S is not set
+
+#
+# Timer Driver Support
+#
+# CONFIG_TIMER is not set
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
-# CONFIG_TIMER is not set
 # CONFIG_ANALOG is not set
 # CONFIG_AUDIO_DEVICES is not set
 # CONFIG_VIDEO_DEVICES is not set
 CONFIG_BCH=y
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -413,11 +484,14 @@ CONFIG_MMCSD_NSLOTS=1
 CONFIG_MMCSD_MMCSUPPORT=y
 CONFIG_MMCSD_HAVECARDDETECT=y
 CONFIG_ARCH_HAVE_SDIO=y
+# CONFIG_ARCH_HAVE_SDIOWAIT_WRCOMPLETE is not set
 CONFIG_MMCSD_SDIO=y
 # CONFIG_SDIO_PREFLIGHT is not set
 # CONFIG_SDIO_MUXBUS is not set
 CONFIG_SDIO_BLOCKSETUP=y
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
+# CONFIG_EEPROM is not set
 CONFIG_PIPES=y
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
@@ -425,6 +499,8 @@ CONFIG_PIPES=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -447,13 +523,15 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART6_SERIALDRIVER is not set
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
+# CONFIG_OTHER_UART_SERIALDRIVER is not set
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
+# CONFIG_SERIAL_IFLOWCONTROL is not set
+# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
+CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_UART0_SERIAL_CONSOLE=y
+# CONFIG_OTHER_SERIAL_CONSOLE is not set
 # CONFIG_NO_SERIAL_CONSOLE is not set
 
 #
@@ -467,20 +545,23 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
-# CONFIG_SERIAL_IFLOWCONTROL is not set
-# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -506,22 +587,23 @@ CONFIG_UART0_2STOP=0
 # CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
 CONFIG_FS_READABLE=y
 CONFIG_FS_WRITABLE=y
+# CONFIG_FS_NAMED_SEMAPHORES is not set
+CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_RAMMAP is not set
 CONFIG_FS_FAT=y
 CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
 CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_FATTIME is not set
+# CONFIG_FAT_FORCE_INDIRECT is not set
 # CONFIG_FAT_DMAMEMORY is not set
+# CONFIG_FAT_DIRECT_RETRY is not set
 # CONFIG_FS_NXFFS is not set
 CONFIG_FS_ROMFS=y
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
-
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -544,7 +626,11 @@ CONFIG_MM_REGIONS=2
 # CONFIG_AUDIO is not set
 
 #
-# Binary Formats
+# Wireless Support
+#
+
+#
+# Binary Loader
 #
 # CONFIG_BINFMT_DISABLE is not set
 # CONFIG_BINFMT_EXEPATH is not set
@@ -568,6 +654,7 @@ CONFIG_LIB_HOMEDIR="/"
 # CONFIG_NOPRINTF_FIELDWIDTH is not set
 # CONFIG_LIBC_FLOATINGPOINT is not set
 CONFIG_LIBC_LONG_LONG=y
+# CONFIG_LIBC_IOCTL_VARIADIC is not set
 CONFIG_LIB_RAND_ORDER=1
 # CONFIG_EOL_IS_CR is not set
 # CONFIG_EOL_IS_LF is not set
@@ -578,21 +665,23 @@ CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
 # CONFIG_LIBC_STRERROR is not set
 # CONFIG_LIBC_PERROR_STDOUT is not set
+CONFIG_LIBC_TMPDIR="/tmp"
+CONFIG_LIBC_MAX_TMPFILE=32
 CONFIG_ARCH_LOWPUTC=y
 # CONFIG_LIBC_LOCALTIME is not set
+# CONFIG_TIME_EXTENDED is not set
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
-CONFIG_SCHED_WORKQUEUE=y
-CONFIG_SCHED_HPWORK=y
-CONFIG_SCHED_HPWORKPRIORITY=192
-CONFIG_SCHED_HPWORKPERIOD=50000
-CONFIG_SCHED_HPWORKSTACKSIZE=2048
-# CONFIG_SCHED_LPWORK is not set
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_USRWORK is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
@@ -608,26 +697,25 @@ CONFIG_SCHED_HPWORKSTACKSIZE=2048
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FSTEST is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
+# CONFIG_EXAMPLES_IGMP is not set
 # CONFIG_EXAMPLES_JSON is not set
-# CONFIG_EXAMPLES_HIDKBD is not set
 # CONFIG_EXAMPLES_KEYPADTEST is not set
-# CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -635,75 +723,79 @@ CONFIG_SCHED_HPWORKSTACKSIZE=2048
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
-# CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_UDP is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
 #
 # CONFIG_TIFF is not set
+# CONFIG_GRAPHICS_TRAVELER is not set
 
 #
 # Interpreters
 #
+# CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_MICROPYTHON is not set
 # CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
-# CONFIG_NETUTILS_DHCPD is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
-# CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_TFTPC is not set
-# CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_NETLIB is not set
-# CONFIG_NETUTILS_WEBCLIENT is not set
-
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
 
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -722,13 +814,16 @@ CONFIG_NSH_NESTDEPTH=3
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
 # CONFIG_NSH_DISABLE_CMP is not set
+CONFIG_NSH_DISABLE_DATE=y
 CONFIG_NSH_DISABLE_DD=y
 # CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -737,8 +832,10 @@ CONFIG_NSH_DISABLE_DD=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 CONFIG_NSH_DISABLE_LOSETUP=y
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -747,7 +844,9 @@ CONFIG_NSH_DISABLE_MKFATFS=y
 CONFIG_NSH_DISABLE_MKRD=y
 # CONFIG_NSH_DISABLE_MH is not set
 # CONFIG_NSH_DISABLE_MOUNT is not set
+# CONFIG_NSH_DISABLE_MV is not set
 # CONFIG_NSH_DISABLE_MW is not set
+CONFIG_NSH_DISABLE_PS=y
 # CONFIG_NSH_DISABLE_PUT is not set
 # CONFIG_NSH_DISABLE_PWD is not set
 # CONFIG_NSH_DISABLE_RM is not set
@@ -755,8 +854,10 @@ CONFIG_NSH_DISABLE_MKRD=y
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
@@ -784,6 +885,8 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -797,112 +900,19 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-
-#
-# Custom Free Memory Command
-#
-# CONFIG_SYSTEM_FREE is not set
-
-#
-# EMACS-like Command Line Editor
-#
 # CONFIG_SYSTEM_CLE is not set
-
-#
-# FLASH Program Installation
-#
-# CONFIG_SYSTEM_INSTALL is not set
-
-#
-# FLASH Erase-all Command
-#
-
-#
-# Intel HEX to binary conversion
-#
+# CONFIG_SYSTEM_CUTERM is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-
-#
-# I2C tool
-#
-
-#
-# INI File Parser
-#
-# CONFIG_FSUTILS_INIFILE is not set
-
-#
-# NxPlayer media player library / command Line
-#
-# CONFIG_SYSTEM_NXPLAYER is not set
-
-#
-# RAM test
-#
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
-
-#
-# readline()
-#
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
-
-#
-# P-Code Support
-#
-
-#
-# PHY Tool
-#
-
-#
-# Power Off
-#
-# CONFIG_SYSTEM_POWEROFF is not set
-
-#
-# RAMTRON
-#
-
-#
-# SD Card
-#
-
-#
-# Sudoku
-#
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-
-#
-# Sysinfo
-#
-
-#
-# VI Work-Alike Editor
-#
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
-
-#
-# Stack Monitor
-#
-
-#
-# USB CDC/ACM Device Commands
-#
-
-#
-# USB Composite Device Commands
-#
-
-#
-# USB Mass Storage Device Commands
-#
-
-#
-# USB Monitor
-#
-
-#
-# Zmodem Commands
-#
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/open1788/nsh/defconfig b/configs/open1788/nsh/defconfig
index aa96bf089c..53981b180c 100644
--- a/configs/open1788/nsh/defconfig
+++ b/configs/open1788/nsh/defconfig
@@ -37,14 +37,16 @@ CONFIG_INTELHEX_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,6 +77,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -93,7 +96,9 @@ CONFIG_ARCH_CHIP_LPC17XX=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
@@ -104,14 +109,25 @@ CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="lpc17xx"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
 #
@@ -121,6 +137,7 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
@@ -225,6 +242,7 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 CONFIG_ARCH_HAVE_MPU=y
@@ -371,6 +389,7 @@ CONFIG_NAME_MAX=32
 # CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
+# CONFIG_SIG_EVTHREAD is not set
 
 #
 # Signal Numbers
@@ -386,9 +405,10 @@ CONFIG_SIG_SIGWORK=17
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 CONFIG_SCHED_WORKQUEUE=y
 CONFIG_SCHED_HPWORK=y
@@ -440,7 +460,21 @@ CONFIG_DEV_LOOP=y
 # CONFIG_VIDEO_DEVICES is not set
 CONFIG_BCH=y
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -453,6 +487,7 @@ CONFIG_MMCSD_SDIO=y
 # CONFIG_SDIO_PREFLIGHT is not set
 # CONFIG_SDIO_MUXBUS is not set
 # CONFIG_SDIO_BLOCKSETUP is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 CONFIG_PIPES=y
@@ -462,6 +497,8 @@ CONFIG_PIPES=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -485,10 +522,6 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 CONFIG_SERIAL_NPOLLWAITERS=2
@@ -516,15 +549,18 @@ CONFIG_UART0_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -558,7 +594,9 @@ CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
 CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_FATTIME is not set
+# CONFIG_FAT_FORCE_INDIRECT is not set
 # CONFIG_FAT_DMAMEMORY is not set
+# CONFIG_FAT_DIRECT_RETRY is not set
 # CONFIG_FS_NXFFS is not set
 CONFIG_FS_ROMFS=y
 # CONFIG_FS_TMPFS is not set
@@ -567,11 +605,6 @@ CONFIG_FS_ROMFS=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -590,6 +623,10 @@ CONFIG_MM_REGIONS=2
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -635,12 +672,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 # CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -666,6 +706,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 #
 # Examples
 #
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -674,10 +715,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -686,17 +727,18 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -704,22 +746,30 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_UNIONFS is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -732,8 +782,8 @@ CONFIG_EXAMPLES_NSH=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -743,7 +793,9 @@ CONFIG_EXAMPLES_NSH=y
 #
 # Network Utilities
 #
+# CONFIG_NETUTILS_CHAT is not set
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -752,6 +804,7 @@ CONFIG_EXAMPLES_NSH=y
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -789,8 +842,10 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 # CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -809,6 +864,7 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
 # CONFIG_NSH_DISABLE_UNAME is not set
@@ -839,6 +895,8 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -852,13 +910,12 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -866,5 +923,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/open1788/nxlines/defconfig b/configs/open1788/nxlines/defconfig
index 4ebc2d874e..38f0eb053d 100644
--- a/configs/open1788/nxlines/defconfig
+++ b/configs/open1788/nxlines/defconfig
@@ -7,6 +7,7 @@
 # Build Setup
 #
 # CONFIG_EXPERIMENTAL is not set
+# CONFIG_DEFAULT_SMALL is not set
 CONFIG_HOST_LINUX=y
 # CONFIG_HOST_OSX is not set
 # CONFIG_HOST_WINDOWS is not set
@@ -16,6 +17,7 @@ CONFIG_HOST_LINUX=y
 # Build Configuration
 #
 # CONFIG_APPS_DIR="../apps"
+CONFIG_BUILD_FLAT=y
 # CONFIG_BUILD_2PASS is not set
 
 #
@@ -25,20 +27,31 @@ CONFIG_HOST_LINUX=y
 CONFIG_INTELHEX_BINARY=y
 # CONFIG_MOTOROLA_SREC is not set
 # CONFIG_RAW_BINARY is not set
+# CONFIG_UBOOT_UIMAGE is not set
 
 #
 # Customize Header Files
 #
+# CONFIG_ARCH_STDINT_H is not set
 # CONFIG_ARCH_STDBOOL_H is not set
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
+CONFIG_ARCH_HAVE_STACKCHECK=y
+# CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
+CONFIG_ARCH_HAVE_CUSTOMOPT=y
+# CONFIG_DEBUG_NOOPT is not set
+# CONFIG_DEBUG_CUSTOMOPT is not set
+CONFIG_DEBUG_FULLOPT=y
 
 #
 # System Type
@@ -58,39 +71,82 @@ CONFIG_ARCH="arm"
 #
 # ARM Options
 #
+# CONFIG_ARCH_CHIP_A1X is not set
 # CONFIG_ARCH_CHIP_C5471 is not set
 # CONFIG_ARCH_CHIP_CALYPSO is not set
 # CONFIG_ARCH_CHIP_DM320 is not set
+# CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
+# CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
+# CONFIG_ARCH_CHIP_TIVA is not set
+# CONFIG_ARCH_CHIP_LPC11XX is not set
 CONFIG_ARCH_CHIP_LPC17XX=y
 # CONFIG_ARCH_CHIP_LPC214X is not set
 # CONFIG_ARCH_CHIP_LPC2378 is not set
 # CONFIG_ARCH_CHIP_LPC31XX is not set
 # CONFIG_ARCH_CHIP_LPC43XX is not set
 # CONFIG_ARCH_CHIP_NUC1XX is not set
-# CONFIG_ARCH_CHIP_SAM3U is not set
+# CONFIG_ARCH_CHIP_SAMA5 is not set
+# CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
+# CONFIG_ARCH_CHIP_SAM34 is not set
+# CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
+# CONFIG_ARCH_ARM7TDMI is not set
+# CONFIG_ARCH_ARM926EJS is not set
+# CONFIG_ARCH_ARM920T is not set
+# CONFIG_ARCH_CORTEXM0 is not set
 CONFIG_ARCH_CORTEXM3=y
+# CONFIG_ARCH_CORTEXM4 is not set
+# CONFIG_ARCH_CORTEXM7 is not set
+# CONFIG_ARCH_CORTEXA5 is not set
+# CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="lpc17xx"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
-CONFIG_ARCH_HAVE_MPU=y
+# CONFIG_ARMV7M_LAZYFPU is not set
+# CONFIG_ARCH_HAVE_FPU is not set
+# CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
 #
 # ARMV7M Configuration Options
 #
+# CONFIG_ARMV7M_HAVE_ICACHE is not set
+# CONFIG_ARMV7M_HAVE_DCACHE is not set
+# CONFIG_ARMV7M_HAVE_ITCM is not set
+# CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
 CONFIG_ARMV7M_OABI_TOOLCHAIN=y
+# CONFIG_ARMV7M_HAVE_STACKCHECK is not set
+# CONFIG_ARMV7M_ITMSYSLOG is not set
 # CONFIG_GPIO_IRQ is not set
+# CONFIG_SERIAL_TERMIOS is not set
 
 #
 # LPC17xx Configuration Options
@@ -117,7 +173,6 @@ CONFIG_ARMV7M_OABI_TOOLCHAIN=y
 # CONFIG_ARCH_CHIP_LPC1787 is not set
 CONFIG_ARCH_CHIP_LPC1788=y
 CONFIG_ARCH_FAMILY_LPC178X=y
-CONFIG_ARCH_HAVE_SDIO=y
 
 #
 # LPC17xx Peripheral Support
@@ -162,17 +217,31 @@ CONFIG_LPC17_GPDMA=y
 # CONFIG_LPC17_FLASH is not set
 # CONFIG_LPC17_EEPROM is not set
 
+#
+# External Memory Configuration
+#
+CONFIG_ARCH_HAVE_EXTNAND=y
+CONFIG_ARCH_HAVE_EXTNOR=y
+CONFIG_ARCH_HAVE_EXTDRAM=y
+CONFIG_ARCH_HAVE_EXTSRAM0=y
+# CONFIG_LPC17_EXTNAND is not set
+# CONFIG_LPC17_EXTNOR is not set
+CONFIG_LPC17_EXTDRAM=y
+CONFIG_LPC17_EXTDRAMSIZE=67108864
+# CONFIG_LPC17_SDRAM_8BIT is not set
+CONFIG_LPC17_SDRAM_16BIT=y
+# CONFIG_LPC17_SDRAM_32BIT is not set
+CONFIG_LPC17_EXTDRAMHEAP=y
+# CONFIG_LPC17_EXTSRAM0 is not set
+
 #
 # Serial driver options
 #
-# CONFIG_SERIAL_TERMIOS is not set
-# CONFIG_UART0_FLOWCONTROL is not set
 
 #
 # SDIO Configuration
 #
 # CONFIG_SDIO_DMA is not set
-CONFIG_SDIO_DMAPRIO=0x0
 # CONFIG_SDIO_WIDTH_D1_ONLY is not set
 
 #
@@ -200,31 +269,30 @@ CONFIG_LPC17_LCD_VPULSE=2
 CONFIG_LPC17_LCD_VFRONTPORCH=8
 CONFIG_LPC17_LCD_VBACKPORCH=8
 
-#
-# External Memory Configuration
-#
-CONFIG_ARCH_HAVE_EXTNAND=y
-CONFIG_ARCH_HAVE_EXTNOR=y
-CONFIG_ARCH_HAVE_EXTDRAM=y
-CONFIG_ARCH_HAVE_EXTSRAM0=y
-# CONFIG_LPC17_EXTNAND is not set
-# CONFIG_LPC17_EXTNOR is not set
-CONFIG_LPC17_EXTDRAM=y
-CONFIG_LPC17_EXTDRAMSIZE=67108864
-CONFIG_LPC17_EXTDRAMHEAP=y
-# CONFIG_LPC17_EXTSRAM0 is not set
-
 #
 # Architecture Options
 #
 # CONFIG_ARCH_NOINTC is not set
 # CONFIG_ARCH_VECNOTIRQ is not set
-# CONFIG_ARCH_DMA is not set
-# CONFIG_ARCH_IRQPRIO is not set
-# CONFIG_ARCH_ADDRENV is not set
+CONFIG_ARCH_DMA=y
+CONFIG_ARCH_HAVE_IRQPRIO=y
+# CONFIG_ARCH_L2CACHE is not set
+# CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
+# CONFIG_ARCH_HAVE_ADDRENV is not set
+# CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
+# CONFIG_ARCH_HAVE_MMU is not set
+CONFIG_ARCH_HAVE_MPU=y
+# CONFIG_ARCH_NAND_HWECC is not set
+# CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
+# CONFIG_ARCH_USE_MPU is not set
+# CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
+# CONFIG_ARCH_IDLE_CUSTOM is not set
 # CONFIG_ARCH_HAVE_RAMFUNCS is not set
 CONFIG_ARCH_HAVE_RAMVECTORS=y
 # CONFIG_ARCH_RAMVECTORS is not set
@@ -234,10 +302,14 @@ CONFIG_ARCH_HAVE_RAMVECTORS=y
 #
 CONFIG_BOARD_LOOPSPERMSEC=11934
 # CONFIG_ARCH_CALIBRATION is not set
-CONFIG_RAM_START=0x10000000
-CONFIG_RAM_SIZE=65536
+
+#
+# Interrupt options
+#
 CONFIG_ARCH_HAVE_INTERRUPTSTACK=y
 CONFIG_ARCH_INTERRUPTSTACK=0
+CONFIG_ARCH_HAVE_HIPRI_INTERRUPT=y
+# CONFIG_ARCH_HIPRI_INTERRUPT is not set
 
 #
 # Boot options
@@ -248,6 +320,14 @@ CONFIG_BOOT_RUNFROMFLASH=y
 # CONFIG_BOOT_RUNFROMSDRAM is not set
 # CONFIG_BOOT_COPYTORAM is not set
 
+#
+# Boot Memory Configuration
+#
+CONFIG_RAM_START=0x10000000
+CONFIG_RAM_SIZE=65536
+CONFIG_ARCH_HAVE_SDRAM=y
+# CONFIG_BOOT_SDRAM_DATA is not set
+
 #
 # Board Selection
 #
@@ -267,37 +347,79 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 #
 # Board-Specific Options
 #
+# CONFIG_LIB_BOARDCTL is not set
 
 #
 # RTOS Features
 #
-# CONFIG_BOARD_INITIALIZE is not set
+CONFIG_DISABLE_OS_API=y
+# CONFIG_DISABLE_POSIX_TIMERS is not set
+# CONFIG_DISABLE_PTHREAD is not set
+# CONFIG_DISABLE_SIGNALS is not set
+# CONFIG_DISABLE_MQUEUE is not set
+# CONFIG_DISABLE_ENVIRON is not set
+
+#
+# Clocks and Timers
+#
 CONFIG_USEC_PER_TICK=10000
-CONFIG_RR_INTERVAL=200
-# CONFIG_SCHED_INSTRUMENTATION is not set
-CONFIG_TASK_NAME_SIZE=0
-# CONFIG_SCHED_HAVE_PARENT is not set
+# CONFIG_SYSTEM_TIME64 is not set
+# CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
 CONFIG_START_YEAR=2013
 CONFIG_START_MONTH=3
 CONFIG_START_DAY=4
-CONFIG_DEV_CONSOLE=y
+CONFIG_MAX_WDOGPARMS=2
+CONFIG_PREALLOC_WDOGS=4
+CONFIG_WDOG_INTRESERVE=0
+CONFIG_PREALLOC_TIMERS=4
+
+#
+# Tasks and Scheduling
+#
+# CONFIG_INIT_NONE is not set
+CONFIG_INIT_ENTRYPOINT=y
+# CONFIG_INIT_FILEPATH is not set
+CONFIG_USER_ENTRYPOINT="nxlines_main"
+CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
+CONFIG_TASK_NAME_SIZE=0
+CONFIG_MAX_TASKS=16
+# CONFIG_SCHED_HAVE_PARENT is not set
+CONFIG_SCHED_WAITPID=y
+
+#
+# Pthread Options
+#
 # CONFIG_MUTEX_TYPES is not set
-# CONFIG_PRIORITY_INHERITANCE is not set
+CONFIG_NPTHREAD_KEYS=4
+
+#
+# Performance Monitoring
+#
+# CONFIG_SCHED_CPULOAD is not set
+# CONFIG_SCHED_INSTRUMENTATION is not set
+
+#
+# Files and I/O
+#
+CONFIG_DEV_CONSOLE=y
 # CONFIG_FDCLONE_DISABLE is not set
 # CONFIG_FDCLONE_STDIO is not set
 # CONFIG_SDCLONE_DISABLE is not set
-CONFIG_SCHED_WAITPID=y
+CONFIG_NFILE_DESCRIPTORS=8
+CONFIG_NFILE_STREAMS=8
+CONFIG_NAME_MAX=32
+# CONFIG_PRIORITY_INHERITANCE is not set
+
+#
+# RTOS hooks
+#
+# CONFIG_BOARD_INITIALIZE is not set
 # CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
-CONFIG_USER_ENTRYPOINT="nxlines_main"
-CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_POSIX_TIMERS is not set
-# CONFIG_DISABLE_PTHREAD is not set
-# CONFIG_DISABLE_SIGNALS is not set
-# CONFIG_DISABLE_MQUEUE is not set
-# CONFIG_DISABLE_ENVIRON is not set
+# CONFIG_SIG_EVTHREAD is not set
 
 #
 # Signal Numbers
@@ -309,19 +431,21 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 CONFIG_SIG_SIGWORK=17
 
 #
-# Sizes of configurable things (0 disables)
+# POSIX Message Queue Options
 #
-CONFIG_MAX_TASKS=16
-CONFIG_NPTHREAD_KEYS=4
-CONFIG_NFILE_DESCRIPTORS=8
-CONFIG_NFILE_STREAMS=8
-CONFIG_NAME_MAX=32
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
-CONFIG_MAX_WDOGPARMS=2
-CONFIG_PREALLOC_WDOGS=4
-CONFIG_WDOG_INTRESERVE=0
-CONFIG_PREALLOC_TIMERS=4
+# CONFIG_MODULE is not set
+
+#
+# Work queue support
+#
+CONFIG_SCHED_WORKQUEUE=y
+CONFIG_SCHED_HPWORK=y
+CONFIG_SCHED_HPWORKPRIORITY=192
+CONFIG_SCHED_HPWORKPERIOD=50000
+CONFIG_SCHED_HPWORKSTACKSIZE=2048
+# CONFIG_SCHED_LPWORK is not set
 
 #
 # Stack and heap information
@@ -330,6 +454,7 @@ CONFIG_IDLETHREAD_STACKSIZE=1024
 CONFIG_USERMAIN_STACKSIZE=2048
 CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=2048
+# CONFIG_LIB_SYSCALL is not set
 
 #
 # Device Drivers
@@ -338,27 +463,63 @@ CONFIG_PTHREAD_STACK_DEFAULT=2048
 CONFIG_DEV_NULL=y
 # CONFIG_DEV_ZERO is not set
 CONFIG_DEV_LOOP=y
+
+#
+# Buffering
+#
+# CONFIG_DRVR_WRITEBUFFER is not set
+# CONFIG_DRVR_READAHEAD is not set
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
+# CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
+# CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 # CONFIG_SPI is not set
+# CONFIG_I2S is not set
+
+#
+# Timer Driver Support
+#
+# CONFIG_TIMER is not set
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_ANALOG is not set
+# CONFIG_AUDIO_DEVICES is not set
+# CONFIG_VIDEO_DEVICES is not set
 CONFIG_BCH=y
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
 # CONFIG_MMCSD_MULTIBLOCK_DISABLE is not set
 CONFIG_MMCSD_MMCSUPPORT=y
 CONFIG_MMCSD_HAVECARDDETECT=y
+CONFIG_ARCH_HAVE_SDIO=y
+# CONFIG_ARCH_HAVE_SDIOWAIT_WRCOMPLETE is not set
 CONFIG_MMCSD_SDIO=y
+# CONFIG_SDIO_PREFLIGHT is not set
 # CONFIG_SDIO_MUXBUS is not set
 # CONFIG_SDIO_BLOCKSETUP is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
+# CONFIG_EEPROM is not set
 CONFIG_PIPES=y
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
@@ -366,12 +527,40 @@ CONFIG_PIPES=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
+# CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
+# CONFIG_UART1_SERIALDRIVER is not set
+# CONFIG_UART2_SERIALDRIVER is not set
+# CONFIG_UART3_SERIALDRIVER is not set
+# CONFIG_UART4_SERIALDRIVER is not set
+# CONFIG_UART5_SERIALDRIVER is not set
+# CONFIG_UART6_SERIALDRIVER is not set
+# CONFIG_UART7_SERIALDRIVER is not set
+# CONFIG_UART8_SERIALDRIVER is not set
+# CONFIG_SCI0_SERIALDRIVER is not set
+# CONFIG_SCI1_SERIALDRIVER is not set
+# CONFIG_USART0_SERIALDRIVER is not set
+# CONFIG_USART1_SERIALDRIVER is not set
+# CONFIG_USART2_SERIALDRIVER is not set
+# CONFIG_USART3_SERIALDRIVER is not set
+# CONFIG_USART4_SERIALDRIVER is not set
+# CONFIG_USART5_SERIALDRIVER is not set
+# CONFIG_USART6_SERIALDRIVER is not set
+# CONFIG_USART7_SERIALDRIVER is not set
+# CONFIG_USART8_SERIALDRIVER is not set
+# CONFIG_OTHER_UART_SERIALDRIVER is not set
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
-CONFIG_CONFIG_SERIAL_NPOLLWAITERS=2
+CONFIG_SERIAL_NPOLLWAITERS=2
+# CONFIG_SERIAL_IFLOWCONTROL is not set
+# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
+CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_UART0_SERIAL_CONSOLE=y
+# CONFIG_OTHER_SERIAL_CONSOLE is not set
 # CONFIG_NO_SERIAL_CONSOLE is not set
 
 #
@@ -383,24 +572,38 @@ CONFIG_UART0_BAUD=115200
 CONFIG_UART0_BITS=8
 CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
+# CONFIG_UART0_IFLOWCONTROL is not set
+# CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
 #
+# CONFIG_ARCH_HAVE_NET is not set
+# CONFIG_ARCH_HAVE_PHY is not set
 # CONFIG_NET is not set
 
+#
+# Crypto API
+#
+# CONFIG_CRYPTO is not set
+
 #
 # File Systems
 #
@@ -409,28 +612,38 @@ CONFIG_UART0_2STOP=0
 # File system configuration
 #
 # CONFIG_DISABLE_MOUNTPOINT is not set
+# CONFIG_FS_AUTOMOUNTER is not set
+# CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
+CONFIG_FS_READABLE=y
+CONFIG_FS_WRITABLE=y
+# CONFIG_FS_NAMED_SEMAPHORES is not set
+CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_RAMMAP is not set
 CONFIG_FS_FAT=y
 CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
 CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_FATTIME is not set
+# CONFIG_FAT_FORCE_INDIRECT is not set
 # CONFIG_FAT_DMAMEMORY is not set
+# CONFIG_FAT_DIRECT_RETRY is not set
 # CONFIG_FS_NXFFS is not set
 CONFIG_FS_ROMFS=y
+# CONFIG_FS_TMPFS is not set
+# CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_BINFS is not set
-
-#
-# System Logging
-#
-
+# CONFIG_FS_PROCFS is not set
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
 #
 CONFIG_NX=y
 CONFIG_NX_NPLANES=1
+CONFIG_NX_BGCOLOR=0x0
+# CONFIG_NX_ANTIALIASING is not set
 # CONFIG_NX_WRITEONLY is not set
+# CONFIG_NX_UPDATE is not set
 
 #
 # Supported Pixel Depths
@@ -448,15 +661,16 @@ CONFIG_NX_PACKEDMSFIRST=y
 # Input Devices
 #
 # CONFIG_NX_XYINPUT is not set
+CONFIG_NX_XYINPUT_NONE=y
+# CONFIG_NX_XYINPUT_MOUSE is not set
+# CONFIG_NX_XYINPUT_TOUCHSCREEN is not set
 # CONFIG_NX_KBD is not set
 
 #
 # Framed Window Borders
 #
 CONFIG_NXTK_BORDERWIDTH=4
-CONFIG_NXTK_BORDERCOLOR1=0
-CONFIG_NXTK_BORDERCOLOR2=0
-CONFIG_NXTK_BORDERCOLOR3=0
+CONFIG_NXTK_DEFAULT_BORDERCOLORS=y
 # CONFIG_NXTK_AUTORAISE is not set
 
 #
@@ -481,6 +695,30 @@ CONFIG_NXFONT_SANS28X37B=y
 # CONFIG_NXFONT_SERIF22X28B is not set
 # CONFIG_NXFONT_SERIF27X38B is not set
 # CONFIG_NXFONT_SERIF38X49B is not set
+# CONFIG_NXFONT_PIXEL_UNICODE is not set
+# CONFIG_NXFONT_PIXEL_LCD_MACHINE is not set
+# CONFIG_NXFONT_X11_MISC_FIXED_4X6 is not set
+# CONFIG_NXFONT_X11_MISC_FIXED_5X7 is not set
+# CONFIG_NXFONT_X11_MISC_FIXED_5X8 is not set
+# CONFIG_NXFONT_X11_MISC_FIXED_6X9 is not set
+# CONFIG_NXFONT_X11_MISC_FIXED_6X10 is not set
+# CONFIG_NXFONT_X11_MISC_FIXED_6X12 is not set
+# CONFIG_NXFONT_X11_MISC_FIXED_6X13 is not set
+# CONFIG_NXFONT_X11_MISC_FIXED_6X13B is not set
+# CONFIG_NXFONT_X11_MISC_FIXED_6X13O is not set
+# CONFIG_NXFONT_X11_MISC_FIXED_7X13 is not set
+# CONFIG_NXFONT_X11_MISC_FIXED_7X13B is not set
+# CONFIG_NXFONT_X11_MISC_FIXED_7X13O is not set
+# CONFIG_NXFONT_X11_MISC_FIXED_7X14 is not set
+# CONFIG_NXFONT_X11_MISC_FIXED_7X14B is not set
+# CONFIG_NXFONT_X11_MISC_FIXED_8X13 is not set
+# CONFIG_NXFONT_X11_MISC_FIXED_8X13B is not set
+# CONFIG_NXFONT_X11_MISC_FIXED_8X13O is not set
+# CONFIG_NXFONT_X11_MISC_FIXED_9X15 is not set
+# CONFIG_NXFONT_X11_MISC_FIXED_9X15B is not set
+# CONFIG_NXFONT_X11_MISC_FIXED_9X18 is not set
+# CONFIG_NXFONT_X11_MISC_FIXED_9X18B is not set
+# CONFIG_NXFONT_X11_MISC_FIXED_10X20 is not set
 # CONFIG_NXTERM is not set
 
 #
@@ -493,10 +731,20 @@ CONFIG_NXFONT_SANS28X37B=y
 #
 # CONFIG_MM_SMALL is not set
 CONFIG_MM_REGIONS=2
+# CONFIG_ARCH_HAVE_HEAP2 is not set
 # CONFIG_GRAN is not set
 
 #
-# Binary Formats
+# Audio Support
+#
+# CONFIG_AUDIO is not set
+
+#
+# Wireless Support
+#
+
+#
+# Binary Loader
 #
 # CONFIG_BINFMT_DISABLE is not set
 # CONFIG_BINFMT_EXEPATH is not set
@@ -521,6 +769,8 @@ CONFIG_LIB_HOMEDIR="/"
 # CONFIG_NOPRINTF_FIELDWIDTH is not set
 # CONFIG_LIBC_FLOATINGPOINT is not set
 CONFIG_LIBC_LONG_LONG=y
+# CONFIG_LIBC_IOCTL_VARIADIC is not set
+CONFIG_LIB_RAND_ORDER=1
 # CONFIG_EOL_IS_CR is not set
 # CONFIG_EOL_IS_LF is not set
 # CONFIG_EOL_IS_BOTH_CRLF is not set
@@ -530,21 +780,25 @@ CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
 # CONFIG_LIBC_STRERROR is not set
 # CONFIG_LIBC_PERROR_STDOUT is not set
+CONFIG_LIBC_TMPDIR="/tmp"
+CONFIG_LIBC_MAX_TMPFILE=32
 CONFIG_ARCH_LOWPUTC=y
+# CONFIG_LIBC_LOCALTIME is not set
+# CONFIG_TIME_EXTENDED is not set
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
-CONFIG_SCHED_WORKQUEUE=y
-CONFIG_SCHED_HPWORK=y
-CONFIG_SCHED_HPWORKPRIORITY=192
-CONFIG_SCHED_HPWORKPERIOD=50000
-CONFIG_SCHED_HPWORKSTACKSIZE=2048
-# CONFIG_SCHED_LPWORK is not set
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
+# CONFIG_LIB_SLCDCODEC is not set
 
 #
 # Basic CXX Support
@@ -561,103 +815,111 @@ CONFIG_SCHED_HPWORKSTACKSIZE=2048
 #
 CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 
+#
+# CAN Utilities
+#
+
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
-# CONFIG_SYSTEM_COMPOSITE is not set
+# CONFIG_EXAMPLES_CHAT is not set
+# CONFIG_EXAMPLES_CONFIGDATA is not set
+# CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FSTEST is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
-# CONFIG_EXAMPLES_LCDRW is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
-# CONFIG_EXAMPLES_MOUNT is not set
 # CONFIG_EXAMPLES_MODBUS is not set
+# CONFIG_EXAMPLES_MOUNT is not set
+# CONFIG_EXAMPLES_NRF24L01TERM is not set
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 CONFIG_EXAMPLES_NXLINES=y
 CONFIG_EXAMPLES_NXLINES_VPLANE=0
 CONFIG_EXAMPLES_NXLINES_DEVNO=0
-CONFIG_EXAMPLES_NXLINES_BGCOLOR=0x00006400
+CONFIG_EXAMPLES_NXLINES_DEFAULT_COLORS=y
 CONFIG_EXAMPLES_NXLINES_LINEWIDTH=16
-CONFIG_EXAMPLES_NXLINES_LINECOLOR=0x00ffff00
 CONFIG_EXAMPLES_NXLINES_BORDERWIDTH=16
-CONFIG_EXAMPLES_NXLINES_BORDERCOLOR=0x00ffff00
-CONFIG_EXAMPLES_NXLINES_CIRCLECOLOR=0x00f5f5dc
 CONFIG_EXAMPLES_NXLINES_BPP=32
-# CONFIG_EXAMPLES_NXLINES_EXTERNINIT is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
-# CONFIG_EXAMPLES_PASHELLO is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
+# CONFIG_EXAMPLES_SERIALBLASTER is not set
+# CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
+# CONFIG_EXAMPLES_SLCD is not set
+# CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
+# CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_UDP is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_SYSTEM_USBMSC is not set
+# CONFIG_EXAMPLES_UNIONFS is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
 #
 # CONFIG_TIFF is not set
+# CONFIG_GRAPHICS_TRAVELER is not set
 
 #
 # Interpreters
 #
+# CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_MICROPYTHON is not set
 # CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
+# CONFIG_NETUTILS_CHAT is not set
 # CONFIG_NETUTILS_CODECS is not set
-# CONFIG_NETUTILS_DHCPC is not set
-# CONFIG_NETUTILS_DHCPD is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
-# CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETDB_DNSCLIENT is not set
 # CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_TELNETD is not set
-# CONFIG_NETUTILS_TFTPC is not set
-# CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_NETLIB is not set
-# CONFIG_NETUTILS_WEBCLIENT is not set
-
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
 
 #
 # NSH Library
@@ -669,51 +931,26 @@ CONFIG_EXAMPLES_NXLINES_BPP=32
 #
 
 #
-# System NSH Add-Ons
+# Platform-specific Support
 #
+# CONFIG_PLATFORM_CONFIGDATA is not set
 
 #
-# Custom Free Memory Command
+# System Libraries and NSH Add-Ons
 #
+# CONFIG_SYSTEM_CLE is not set
+# CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-
-#
-# I2C tool
-#
-
-#
-# FLASH Program Installation
-#
+# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
-
-#
-# RAM Test
-#
 # CONFIG_SYSTEM_RAMTEST is not set
-
-#
-# readline()
-#
+# CONFIG_READLINE_HAVE_EXTMATCH is not set
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
-
-#
-# Power Off
-#
-# CONFIG_SYSTEM_POWEROFF is not set
-
-#
-# RAMTRON
-#
-
-#
-# SD Card
-#
-
-#
-# Sysinfo
-#
-
-#
-# USB Monitor
-#
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
+# CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
+# CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/pcduino-a10/nsh/defconfig b/configs/pcduino-a10/nsh/defconfig
index 158c989a87..3fbc6318cf 100644
--- a/configs/pcduino-a10/nsh/defconfig
+++ b/configs/pcduino-a10/nsh/defconfig
@@ -41,12 +41,15 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
+# CONFIG_STACK_COLORATION is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
@@ -76,11 +79,14 @@ CONFIG_ARCH_CHIP_A1X=y
 # CONFIG_ARCH_CHIP_C5471 is not set
 # CONFIG_ARCH_CHIP_CALYPSO is not set
 # CONFIG_ARCH_CHIP_DM320 is not set
+# CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
 # CONFIG_ARCH_CHIP_TIVA is not set
+# CONFIG_ARCH_CHIP_LPC11XX is not set
 # CONFIG_ARCH_CHIP_LPC17XX is not set
 # CONFIG_ARCH_CHIP_LPC214X is not set
 # CONFIG_ARCH_CHIP_LPC2378 is not set
@@ -89,21 +95,40 @@ CONFIG_ARCH_CHIP_A1X=y
 # CONFIG_ARCH_CHIP_NUC1XX is not set
 # CONFIG_ARCH_CHIP_SAMA5 is not set
 # CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
 # CONFIG_ARCH_CHIP_SAM34 is not set
+# CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
 # CONFIG_ARCH_CORTEXM0 is not set
 # CONFIG_ARCH_CORTEXM3 is not set
 # CONFIG_ARCH_CORTEXM4 is not set
+# CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 CONFIG_ARCH_CORTEXA8=y
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-a"
 CONFIG_ARCH_CHIP="a1x"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 CONFIG_ARCH_HAVE_FPU=y
+# CONFIG_ARCH_HAVE_DPFPU is not set
 CONFIG_ARCH_FPU=y
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 CONFIG_ARCH_LOWVECTORS=y
 # CONFIG_ARCH_ROMPGTABLE is not set
@@ -111,6 +136,9 @@ CONFIG_ARCH_LOWVECTORS=y
 #
 # ARMv7-A Configuration Options
 #
+# CONFIG_ARMV7A_HAVE_GICv2 is not set
+# CONFIG_ARMV7A_HAVE_GTM is not set
+# CONFIG_ARMV7A_HAVE_PTM is not set
 # CONFIG_ARMV7A_HAVE_L2CC is not set
 # CONFIG_ARMV7A_HAVE_L2CC_PL310 is not set
 # CONFIG_ARMV7A_TOOLCHAIN_BUILDROOT is not set
@@ -206,6 +234,7 @@ CONFIG_A1X_BOOT_SDCARD=y
 # CONFIG_A1X_BOOT_USB is not set
 CONFIG_A1X_DDR_MAPOFFSET=0
 CONFIG_A1X_DDR_MAPSIZE=1073741824
+# CONFIG_SERIAL_TERMIOS is not set
 
 #
 # Architecture Options
@@ -218,11 +247,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 CONFIG_ARCH_HAVE_ADDRENV=y
 CONFIG_ARCH_NEED_ADDRENV_MAPPING=y
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 CONFIG_ARCH_HAVE_MMU=y
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+# CONFIG_ARCH_HAVE_RESET is not set
 CONFIG_ARCH_USE_MMU=y
 # CONFIG_ARCH_ADDRENV is not set
 # CONFIG_PAGING is not set
@@ -283,6 +315,7 @@ CONFIG_NSH_MMCSDMINOR=0
 #
 # Board-Specific Options
 #
+# CONFIG_LIB_BOARDCTL is not set
 
 #
 # RTOS Features
@@ -312,10 +345,12 @@ CONFIG_PREALLOC_TIMERS=4
 #
 # Tasks and Scheduling
 #
+# CONFIG_INIT_NONE is not set
 CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=31
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -366,6 +401,14 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
+
+#
+# Work queue support
+#
+# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_SCHED_HPWORK is not set
+# CONFIG_SCHED_LPWORK is not set
 
 #
 # Stack and heap information
@@ -392,22 +435,43 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 # CONFIG_SPI is not set
 # CONFIG_I2S is not set
+
+#
+# Timer Driver Support
+#
+# CONFIG_TIMER is not set
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
-# CONFIG_TIMER is not set
 # CONFIG_ANALOG is not set
 # CONFIG_AUDIO_DEVICES is not set
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
+# CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
@@ -415,6 +479,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -437,13 +503,15 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART6_SERIALDRIVER is not set
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
+# CONFIG_OTHER_UART_SERIALDRIVER is not set
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
+# CONFIG_SERIAL_IFLOWCONTROL is not set
+# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
+CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_UART0_SERIAL_CONSOLE=y
+# CONFIG_OTHER_SERIAL_CONSOLE is not set
 # CONFIG_NO_SERIAL_CONSOLE is not set
 
 #
@@ -457,20 +525,23 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
-# CONFIG_SERIAL_IFLOWCONTROL is not set
-# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -496,23 +567,24 @@ CONFIG_UART0_2STOP=0
 # CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
 CONFIG_FS_READABLE=y
 CONFIG_FS_WRITABLE=y
+# CONFIG_FS_NAMED_SEMAPHORES is not set
+CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_RAMMAP is not set
 CONFIG_FS_FAT=y
 CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
 CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_FATTIME is not set
+# CONFIG_FAT_FORCE_INDIRECT is not set
 # CONFIG_FAT_DMAMEMORY is not set
+# CONFIG_FAT_DIRECT_RETRY is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_BINFS is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
-
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -534,7 +606,11 @@ CONFIG_MM_REGIONS=1
 # CONFIG_AUDIO is not set
 
 #
-# Binary Formats
+# Wireless Support
+#
+
+#
+# Binary Loader
 #
 # CONFIG_BINFMT_DISABLE is not set
 # CONFIG_NXFLAT is not set
@@ -557,6 +633,7 @@ CONFIG_NUNGET_CHARS=2
 # CONFIG_NOPRINTF_FIELDWIDTH is not set
 # CONFIG_LIBC_FLOATINGPOINT is not set
 CONFIG_LIBC_LONG_LONG=y
+# CONFIG_LIBC_IOCTL_VARIADIC is not set
 CONFIG_LIB_RAND_ORDER=1
 # CONFIG_EOL_IS_CR is not set
 # CONFIG_EOL_IS_LF is not set
@@ -567,15 +644,22 @@ CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
 # CONFIG_LIBC_STRERROR is not set
 # CONFIG_LIBC_PERROR_STDOUT is not set
+CONFIG_LIBC_TMPDIR="/tmp"
+CONFIG_LIBC_MAX_TMPFILE=32
 CONFIG_ARCH_LOWPUTC=y
+# CONFIG_TIME_EXTENDED is not set
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
-# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -601,24 +685,29 @@ CONFIG_HAVE_CXXINITIALIZE=y
 #
 CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 
+#
+# CAN Utilities
+#
+
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_CXXTEST is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FSTEST is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -627,75 +716,79 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
-# CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_UDP is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
 #
 # CONFIG_TIFF is not set
+# CONFIG_GRAPHICS_TRAVELER is not set
 
 #
 # Interpreters
 #
+# CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_MICROPYTHON is not set
 # CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
-# CONFIG_NETUTILS_DHCPD is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
-# CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_TFTPC is not set
-# CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_NETLIB is not set
-# CONFIG_NETUTILS_WEBCLIENT is not set
-
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
 
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -715,13 +808,16 @@ CONFIG_NSH_BUILTIN_APPS=y
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
 # CONFIG_NSH_DISABLE_CMP is not set
+CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_DD is not set
 # CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -730,8 +826,10 @@ CONFIG_NSH_BUILTIN_APPS=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 # CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -740,6 +838,7 @@ CONFIG_NSH_BUILTIN_APPS=y
 # CONFIG_NSH_DISABLE_MKRD is not set
 # CONFIG_NSH_DISABLE_MH is not set
 # CONFIG_NSH_DISABLE_MOUNT is not set
+# CONFIG_NSH_DISABLE_MV is not set
 # CONFIG_NSH_DISABLE_MW is not set
 # CONFIG_NSH_DISABLE_PS is not set
 # CONFIG_NSH_DISABLE_PUT is not set
@@ -749,8 +848,10 @@ CONFIG_NSH_BUILTIN_APPS=y
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
@@ -777,6 +878,8 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -790,112 +893,19 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-
-#
-# Custom Free Memory Command
-#
-# CONFIG_SYSTEM_FREE is not set
-
-#
-# EMACS-like Command Line Editor
-#
 # CONFIG_SYSTEM_CLE is not set
-
-#
-# FLASH Program Installation
-#
-# CONFIG_SYSTEM_INSTALL is not set
-
-#
-# FLASH Erase-all Command
-#
-
-#
-# Intel HEX to binary conversion
-#
+# CONFIG_SYSTEM_CUTERM is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-
-#
-# I2C tool
-#
-
-#
-# INI File Parser
-#
-# CONFIG_FSUTILS_INIFILE is not set
-
-#
-# NxPlayer media player library / command Line
-#
-# CONFIG_SYSTEM_NXPLAYER is not set
-
-#
-# RAM test
-#
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
-
-#
-# readline()
-#
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
-
-#
-# P-Code Support
-#
-
-#
-# PHY Tool
-#
-
-#
-# Power Off
-#
-# CONFIG_SYSTEM_POWEROFF is not set
-
-#
-# RAMTRON
-#
-
-#
-# SD Card
-#
-
-#
-# Sudoku
-#
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-
-#
-# Sysinfo
-#
-
-#
-# VI Work-Alike Editor
-#
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
-
-#
-# Stack Monitor
-#
-
-#
-# USB CDC/ACM Device Commands
-#
-
-#
-# USB Composite Device Commands
-#
-
-#
-# USB Mass Storage Device Commands
-#
-
-#
-# USB Monitor
-#
-
-#
-# Zmodem Commands
-#
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/pirelli_dpl10/nsh_highram/defconfig b/configs/pirelli_dpl10/nsh_highram/defconfig
index d538ebe7f3..a0008f818b 100644
--- a/configs/pirelli_dpl10/nsh_highram/defconfig
+++ b/configs/pirelli_dpl10/nsh_highram/defconfig
@@ -37,14 +37,16 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,6 +77,7 @@ CONFIG_ARCH_CHIP_CALYPSO=y
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -92,7 +95,11 @@ CONFIG_ARCH_CHIP_CALYPSO=y
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 CONFIG_ARCH_ARM7TDMI=y
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -102,10 +109,21 @@ CONFIG_ARCH_ARM7TDMI=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="arm"
 CONFIG_ARCH_CHIP="calypso"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 # CONFIG_ARCH_LOWVECTORS is not set
 
@@ -159,12 +177,14 @@ CONFIG_SERIAL_IRDA_CONSOLE=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
 CONFIG_ARCH_HAVE_POWEROFF=y
+# CONFIG_ARCH_HAVE_RESET is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
 # CONFIG_ARCH_IDLE_CUSTOM is not set
@@ -220,6 +240,7 @@ CONFIG_NSH_MMCSDMINOR=0
 #
 CONFIG_LIB_BOARDCTL=y
 CONFIG_BOARDCTL_POWEROFF=y
+# CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
 # CONFIG_BOARDCTL_ADCTEST is not set
 # CONFIG_BOARDCTL_PWMTEST is not set
@@ -259,6 +280,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -303,9 +325,10 @@ CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
 CONFIG_SIG_SIGCONDTIMEDOUT=16
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -336,14 +359,20 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 CONFIG_SPI=y
+# CONFIG_SPI_SLAVE is not set
 CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_CMDDATA is not set
 # CONFIG_SPI_CALLBACK is not set
 # CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_HWFEATURES is not set
+# CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -357,8 +386,22 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -368,6 +411,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -391,14 +436,11 @@ CONFIG_SERIAL=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 CONFIG_OTHER_UART_SERIALDRIVER=y
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 # CONFIG_STANDARD_SERIAL is not set
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_OTHER_SERIAL_CONSOLE=y
 # CONFIG_NO_SERIAL_CONSOLE is not set
@@ -406,15 +448,18 @@ CONFIG_OTHER_SERIAL_CONSOLE=y
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -445,16 +490,12 @@ CONFIG_OTHER_SERIAL_CONSOLE=y
 # CONFIG_FS_FAT is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_BINFS is not set
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -475,6 +516,10 @@ CONFIG_HEAP2_SIZE=0
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -518,10 +563,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -540,11 +589,14 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 
+#
+# CAN Utilities
+#
+
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -552,11 +604,13 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 CONFIG_EXAMPLES_HELLO=y
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
+CONFIG_EXAMPLES_HELLO_PRIORITY=100
+CONFIG_EXAMPLES_HELLO_STACKSIZE=2048
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -564,33 +618,45 @@ CONFIG_EXAMPLES_HELLO=y
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -602,30 +668,28 @@ CONFIG_EXAMPLES_NSH=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -645,6 +709,7 @@ CONFIG_NSH_BUILTIN_APPS=y
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
@@ -653,6 +718,7 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_DD is not set
 # CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -661,8 +727,10 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 # CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -672,6 +740,7 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_MOUNT is not set
 # CONFIG_NSH_DISABLE_MV is not set
 # CONFIG_NSH_DISABLE_MW is not set
+# CONFIG_NSH_DISABLE_POWEROFF is not set
 # CONFIG_NSH_DISABLE_PS is not set
 # CONFIG_NSH_DISABLE_PUT is not set
 # CONFIG_NSH_DISABLE_PWD is not set
@@ -679,9 +748,12 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_RMDIR is not set
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
+CONFIG_NSH_DISABLE_SHUTDOWN=y
 # CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
@@ -708,6 +780,8 @@ CONFIG_NSH_FILEIOSIZE=1024
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -721,15 +795,19 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sabre-6quad/nsh/defconfig b/configs/sabre-6quad/nsh/defconfig
index ad80c2600a..fe2e625a2d 100644
--- a/configs/sabre-6quad/nsh/defconfig
+++ b/configs/sabre-6quad/nsh/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -162,10 +163,16 @@ CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIW=y
 # CONFIG_ARCH_CHIP_IMX6_6DUAL is not set
 CONFIG_ARCH_CHIP_IMX6_6QUAD=y
 # CONFIG_IMX6_HAVE_HDCP is not set
+# CONFIG_IMX6_ECSPI is not set
 
 #
 # iMX.6 Peripheral Selection
 #
+# CONFIG_IMX6_ECSPI1 is not set
+# CONFIG_IMX6_ECSPI2 is not set
+# CONFIG_IMX6_ECSPI3 is not set
+# CONFIG_IMX6_ECSPI4 is not set
+# CONFIG_IMX6_ECSPI5 is not set
 CONFIG_IMX6_UART1=y
 # CONFIG_IMX6_UART2 is not set
 # CONFIG_IMX6_UART3 is not set
@@ -408,7 +415,12 @@ CONFIG_DEV_ZERO=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -416,6 +428,7 @@ CONFIG_DEV_ZERO=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -427,6 +440,8 @@ CONFIG_DEV_ZERO=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -450,10 +465,6 @@ CONFIG_UART1_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 CONFIG_SERIAL_NPOLLWAITERS=2
@@ -481,20 +492,24 @@ CONFIG_UART1_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 CONFIG_RAMLOG=y
-CONFIG_RAMLOG_SYSLOG=y
 # CONFIG_RAMLOG_CONSOLE is not set
 CONFIG_RAMLOG_BUFSIZE=16384
 # CONFIG_RAMLOG_CRLF is not set
 CONFIG_RAMLOG_NONBLOCKING=y
 CONFIG_RAMLOG_NPOLLWAITERS=4
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_RAMLOG_SYSLOG=y
+# CONFIG_SYSLOG_CONSOLE is not set
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 # CONFIG_CONSOLE_SYSLOG is not set
 
 #
@@ -541,12 +556,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_MOUNTS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-# CONFIG_SYSLOG_CHAR is not set
-
 #
 # Graphics Support
 #
@@ -621,6 +630,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -664,10 +674,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -677,17 +687,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -695,17 +705,17 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -729,8 +739,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -856,12 +866,12 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -869,6 +879,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sabre-6quad/smp/defconfig b/configs/sabre-6quad/smp/defconfig
index 22281fb345..6028bfb91c 100644
--- a/configs/sabre-6quad/smp/defconfig
+++ b/configs/sabre-6quad/smp/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -165,10 +166,16 @@ CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIW=y
 # CONFIG_ARCH_CHIP_IMX6_6DUAL is not set
 CONFIG_ARCH_CHIP_IMX6_6QUAD=y
 # CONFIG_IMX6_HAVE_HDCP is not set
+# CONFIG_IMX6_ECSPI is not set
 
 #
 # iMX.6 Peripheral Selection
 #
+# CONFIG_IMX6_ECSPI1 is not set
+# CONFIG_IMX6_ECSPI2 is not set
+# CONFIG_IMX6_ECSPI3 is not set
+# CONFIG_IMX6_ECSPI4 is not set
+# CONFIG_IMX6_ECSPI5 is not set
 CONFIG_IMX6_UART1=y
 # CONFIG_IMX6_UART2 is not set
 # CONFIG_IMX6_UART3 is not set
@@ -415,7 +422,12 @@ CONFIG_DEV_ZERO=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -423,6 +435,7 @@ CONFIG_DEV_ZERO=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -434,6 +447,8 @@ CONFIG_DEV_ZERO=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -457,10 +472,6 @@ CONFIG_UART1_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 CONFIG_SERIAL_NPOLLWAITERS=2
@@ -488,20 +499,24 @@ CONFIG_UART1_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 CONFIG_RAMLOG=y
-CONFIG_RAMLOG_SYSLOG=y
 # CONFIG_RAMLOG_CONSOLE is not set
 CONFIG_RAMLOG_BUFSIZE=16384
 # CONFIG_RAMLOG_CRLF is not set
 CONFIG_RAMLOG_NONBLOCKING=y
 CONFIG_RAMLOG_NPOLLWAITERS=4
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_RAMLOG_SYSLOG=y
+# CONFIG_SYSLOG_CONSOLE is not set
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 # CONFIG_CONSOLE_SYSLOG is not set
 
 #
@@ -548,12 +563,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_MOUNTS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-# CONFIG_SYSLOG_CHAR is not set
-
 #
 # Graphics Support
 #
@@ -629,6 +638,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -672,10 +682,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -685,17 +695,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -703,17 +713,17 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -737,8 +747,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -864,12 +874,12 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -877,6 +887,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sam3u-ek/knsh/defconfig b/configs/sam3u-ek/knsh/defconfig
index 561c67f6d8..a14dcebcab 100644
--- a/configs/sam3u-ek/knsh/defconfig
+++ b/configs/sam3u-ek/knsh/defconfig
@@ -47,10 +47,11 @@ CONFIG_NUTTX_USERSPACE=0x00090000
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -81,6 +82,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -99,6 +101,7 @@ CONFIG_ARCH_CHIP_SAM34=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -120,12 +123,15 @@ CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="sam34"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 CONFIG_ARM_HAVE_MPU_UNIFIED=y
 CONFIG_ARM_MPU=y
 CONFIG_ARM_MPU_NREGIONS=8
@@ -137,6 +143,7 @@ CONFIG_ARM_MPU_NREGIONS=8
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
@@ -477,7 +484,12 @@ CONFIG_DEV_NULL=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -485,6 +497,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -503,6 +516,8 @@ CONFIG_MMCSD_NSLOTS=1
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -526,10 +541,6 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -556,15 +567,18 @@ CONFIG_UART0_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -607,11 +621,6 @@ CONFIG_FS_FAT=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -680,12 +689,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 # CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_USRWORK is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
@@ -716,9 +728,9 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
+# CONFIG_EXAMPLES_IGMP is not set
 # CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_KEYPADTEST is not set
-# CONFIG_EXAMPLES_IGMP is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -727,18 +739,18 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -752,10 +764,9 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -779,8 +790,8 @@ CONFIG_EXAMPLES_NSH=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -791,6 +802,7 @@ CONFIG_EXAMPLES_NSH=y
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -903,12 +915,12 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -916,6 +928,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sam3u-ek/nsh/defconfig b/configs/sam3u-ek/nsh/defconfig
index 14d7c69f16..ceb2c36d2c 100644
--- a/configs/sam3u-ek/nsh/defconfig
+++ b/configs/sam3u-ek/nsh/defconfig
@@ -42,10 +42,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -76,6 +77,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -94,6 +96,7 @@ CONFIG_ARCH_CHIP_SAM34=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -115,12 +118,15 @@ CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="sam34"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
@@ -131,6 +137,7 @@ CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
@@ -471,7 +478,12 @@ CONFIG_DEV_NULL=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -479,6 +491,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -490,6 +503,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -513,10 +528,6 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -543,15 +554,18 @@ CONFIG_UART0_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -595,11 +609,6 @@ CONFIG_FS_FAT=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -667,12 +676,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 # CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -708,10 +720,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -720,17 +732,17 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -738,17 +750,17 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -772,8 +784,8 @@ CONFIG_EXAMPLES_NSH=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -784,6 +796,7 @@ CONFIG_EXAMPLES_NSH=y
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -897,12 +910,12 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -910,6 +923,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sam3u-ek/nx/defconfig b/configs/sam3u-ek/nx/defconfig
index e9161d210e..86a492c375 100644
--- a/configs/sam3u-ek/nx/defconfig
+++ b/configs/sam3u-ek/nx/defconfig
@@ -42,10 +42,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -76,6 +77,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -94,6 +96,7 @@ CONFIG_ARCH_CHIP_SAM34=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -115,12 +118,15 @@ CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="sam34"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
@@ -131,6 +137,7 @@ CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
@@ -463,10 +470,14 @@ CONFIG_DEV_NULL=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 CONFIG_LCD=y
 
 #
-# Common LCD Settings
+# Common Graphic LCD Settings
 #
 # CONFIG_LCD_CONSOLE is not set
 # CONFIG_LCD_NOGETRUN is not set
@@ -494,11 +505,7 @@ CONFIG_LCD_PORTRAIT=y
 # CONFIG_LCD_RLANDSCAPE is not set
 # CONFIG_LCD_ILI9341 is not set
 # CONFIG_LCD_RA8875 is not set
-
-#
-# Alphanumeric/Segment LCD Devices
-#
-# CONFIG_LCD_LCD1602 is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -506,6 +513,7 @@ CONFIG_LCD_PORTRAIT=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -517,6 +525,8 @@ CONFIG_LCD_PORTRAIT=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -540,10 +550,6 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -570,15 +576,18 @@ CONFIG_UART0_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -609,11 +618,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -622,6 +626,7 @@ CONFIG_NX_LCDDRIVER=y
 CONFIG_NX_NPLANES=1
 CONFIG_NX_BGCOLOR=0x0
 # CONFIG_NX_WRITEONLY is not set
+# CONFIG_NX_UPDATE is not set
 
 #
 # Supported Pixel Depths
@@ -761,11 +766,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -795,10 +803,10 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_LCDRW is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
@@ -820,18 +828,18 @@ CONFIG_EXAMPLES_NX_DEFAULT_FONT=y
 CONFIG_EXAMPLES_NX_BPP=16
 # CONFIG_EXAMPLES_NX_RAWWINDOWS is not set
 CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -845,10 +853,9 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -870,8 +877,8 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -882,6 +889,7 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -903,16 +911,16 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sam3u-ek/nxwm/defconfig b/configs/sam3u-ek/nxwm/defconfig
index 1a34f4d18e..3966522e3e 100644
--- a/configs/sam3u-ek/nxwm/defconfig
+++ b/configs/sam3u-ek/nxwm/defconfig
@@ -42,10 +42,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -483,6 +484,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -558,6 +561,7 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -569,6 +573,8 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -618,15 +624,18 @@ CONFIG_UART0_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -663,11 +672,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -847,6 +851,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -885,10 +890,10 @@ CONFIG_CXX_NEWLONG=y
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_LCDRW is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
@@ -898,18 +903,18 @@ CONFIG_CXX_NEWLONG=y
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -923,10 +928,10 @@ CONFIG_CXX_NEWLONG=y
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -948,8 +953,8 @@ CONFIG_CXX_NEWLONG=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1245,12 +1250,12 @@ CONFIG_NXWM_HEXCALCULATOR_FONTID=5
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1258,6 +1263,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sam4e-ek/nsh/defconfig b/configs/sam4e-ek/nsh/defconfig
index aa801205f4..8664c7d7a0 100644
--- a/configs/sam4e-ek/nsh/defconfig
+++ b/configs/sam4e-ek/nsh/defconfig
@@ -42,10 +42,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -519,6 +520,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -546,6 +549,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 CONFIG_MTD=y
@@ -570,6 +574,7 @@ CONFIG_MTD_AT25=y
 CONFIG_AT25_SPIMODE=0
 CONFIG_AT25_SPIFREQUENCY=20000000
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
 # CONFIG_MTD_N25QXXX is not set
@@ -630,6 +635,8 @@ CONFIG_ETH0_PHY_KSZ8051=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -693,15 +700,18 @@ CONFIG_USART1_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -858,11 +868,6 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -946,6 +951,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/sam4e-ek/nxwm/defconfig b/configs/sam4e-ek/nxwm/defconfig
index e6b54f6b12..5948ce08b8 100644
--- a/configs/sam4e-ek/nxwm/defconfig
+++ b/configs/sam4e-ek/nxwm/defconfig
@@ -42,10 +42,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -529,6 +530,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -604,6 +607,7 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 CONFIG_MTD=y
@@ -628,6 +632,7 @@ CONFIG_MTD_AT25=y
 CONFIG_AT25_SPIMODE=0
 CONFIG_AT25_SPIFREQUENCY=20000000
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
 # CONFIG_MTD_N25QXXX is not set
@@ -688,6 +693,8 @@ CONFIG_ETH0_PHY_KSZ8051=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -751,15 +758,18 @@ CONFIG_USART1_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -915,11 +925,6 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1110,6 +1115,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/sam4e-ek/usbnsh/defconfig b/configs/sam4e-ek/usbnsh/defconfig
index fe7aa0f9a3..0ea1481ce8 100644
--- a/configs/sam4e-ek/usbnsh/defconfig
+++ b/configs/sam4e-ek/usbnsh/defconfig
@@ -42,10 +42,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -520,6 +521,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -547,6 +550,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 CONFIG_MTD=y
@@ -571,6 +575,7 @@ CONFIG_MTD_AT25=y
 CONFIG_AT25_SPIMODE=0
 CONFIG_AT25_SPIFREQUENCY=20000000
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
 # CONFIG_MTD_N25QXXX is not set
@@ -631,6 +636,7 @@ CONFIG_ETH0_PHY_KSZ8051=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_SERIAL_REMOVABLE=y
+# CONFIG_SERIAL_CONSOLE is not set
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -734,14 +740,19 @@ CONFIG_CDCACM_PRODUCTSTR="CDC/ACM Serial"
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+CONFIG_SYSLOG_CHAR=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+CONFIG_SYSLOG_CHAR_CRLF=y
+CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
 
 #
 # Networking Support
@@ -895,13 +906,6 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-CONFIG_SYSLOG_CHAR=y
-CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
-
 #
 # Graphics Support
 #
@@ -985,6 +989,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/sam4l-xplained/nsh/defconfig b/configs/sam4l-xplained/nsh/defconfig
index 5857be0995..c848386d6b 100644
--- a/configs/sam4l-xplained/nsh/defconfig
+++ b/configs/sam4l-xplained/nsh/defconfig
@@ -42,10 +42,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -76,6 +77,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -94,6 +96,7 @@ CONFIG_ARCH_CHIP_SAM34=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -115,12 +118,15 @@ CONFIG_ARCH_CORTEXM4=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="sam34"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
@@ -131,6 +137,7 @@ CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
@@ -487,7 +494,12 @@ CONFIG_DEV_NULL=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -495,6 +507,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -506,6 +519,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -529,10 +544,6 @@ CONFIG_USART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -559,15 +570,18 @@ CONFIG_USART0_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -605,11 +619,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -672,11 +681,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -720,10 +732,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -733,17 +745,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -751,17 +763,16 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -783,8 +794,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -795,6 +806,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -907,12 +919,12 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -920,6 +932,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sam4s-xplained-pro/nsh/defconfig b/configs/sam4s-xplained-pro/nsh/defconfig
index 1758207123..eae881f10a 100644
--- a/configs/sam4s-xplained-pro/nsh/defconfig
+++ b/configs/sam4s-xplained-pro/nsh/defconfig
@@ -43,10 +43,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -77,6 +78,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -95,6 +97,7 @@ CONFIG_ARCH_CHIP_SAM34=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -116,12 +119,15 @@ CONFIG_ARCH_CORTEXM4=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="sam34"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 CONFIG_ARMV7M_USEBASEPRI=y
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 CONFIG_ARM_HAVE_MPU_UNIFIED=y
 CONFIG_ARM_MPU=y
 CONFIG_ARM_MPU_NREGIONS=8
@@ -133,6 +139,7 @@ CONFIG_ARM_MPU_NREGIONS=8
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
@@ -517,6 +524,7 @@ CONFIG_RTC=y
 CONFIG_RTC_HIRES=y
 CONFIG_RTC_FREQUENCY=32768
 CONFIG_RTC_ALARM=y
+CONFIG_RTC_NALARMS=1
 # CONFIG_RTC_DRIVER is not set
 # CONFIG_RTC_EXTERNAL is not set
 CONFIG_WATCHDOG=y
@@ -527,7 +535,12 @@ CONFIG_WATCHDOG_DEVPATH="/dev/watchdog0"
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -535,6 +548,7 @@ CONFIG_WATCHDOG_DEVPATH="/dev/watchdog0"
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -558,6 +572,7 @@ CONFIG_PIPES=y
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
 CONFIG_SERIAL_REMOVABLE=y
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -581,10 +596,6 @@ CONFIG_USART1_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -666,8 +677,8 @@ CONFIG_CDCACM_EPBULKOUT_HSSIZE=512
 CONFIG_CDCACM_EPBULKIN=2
 CONFIG_CDCACM_EPBULKIN_FSSIZE=64
 CONFIG_CDCACM_EPBULKIN_HSSIZE=512
-CONFIG_CDCACM_NWRREQS=4
 CONFIG_CDCACM_NRDREQS=4
+CONFIG_CDCACM_NWRREQS=4
 CONFIG_CDCACM_BULKIN_REQLEN=250
 CONFIG_CDCACM_RXBUFSIZE=1024
 CONFIG_CDCACM_TXBUFSIZE=1024
@@ -679,15 +690,18 @@ CONFIG_CDCACM_PRODUCTSTR="CDC/ACM Serial"
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -740,11 +754,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_MOUNTS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -810,12 +819,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 # CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -861,10 +873,10 @@ CONFIG_EXAMPLES_CPUHOG_PRIORITY=50
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -874,17 +886,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -902,18 +914,18 @@ CONFIG_EXAMPLES_SERIALRX_PRINTHEX=y
 # CONFIG_EXAMPLES_SERIALRX_PRINTSTR is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_TIMER is not set
 # CONFIG_EXAMPLES_TIFF is not set
+# CONFIG_EXAMPLES_TIMER is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -937,8 +949,8 @@ CONFIG_EXAMPLES_SERIALRX_PRINTHEX=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -949,6 +961,7 @@ CONFIG_EXAMPLES_SERIALRX_PRINTHEX=y
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -1065,12 +1078,13 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_CDCACM is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1078,7 +1092,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
-# CONFIG_SYSTEM_CDCACM is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sam4s-xplained/nsh/defconfig b/configs/sam4s-xplained/nsh/defconfig
index 1442a817eb..10afa826f1 100644
--- a/configs/sam4s-xplained/nsh/defconfig
+++ b/configs/sam4s-xplained/nsh/defconfig
@@ -42,10 +42,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -76,6 +77,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -94,6 +96,7 @@ CONFIG_ARCH_CHIP_SAM34=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -115,12 +118,15 @@ CONFIG_ARCH_CORTEXM4=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="sam34"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
@@ -131,6 +137,7 @@ CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
@@ -467,7 +474,12 @@ CONFIG_DEV_NULL=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -475,6 +487,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -486,6 +499,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -509,10 +524,6 @@ CONFIG_UART1_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -539,15 +550,18 @@ CONFIG_UART1_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -579,11 +593,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -646,11 +655,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -694,10 +706,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -707,17 +719,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -725,17 +737,16 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -757,8 +768,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -769,6 +780,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -880,12 +892,12 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -893,6 +905,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sama5d2-xult/nsh/defconfig b/configs/sama5d2-xult/nsh/defconfig
index b1d1190fc0..bbedda8697 100644
--- a/configs/sama5d2-xult/nsh/defconfig
+++ b/configs/sama5d2-xult/nsh/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -80,6 +81,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -98,6 +100,7 @@ CONFIG_ARCH_CHIP_SAMA5=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -119,9 +122,13 @@ CONFIG_ARCH_CORTEXA5=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-a"
 CONFIG_ARCH_CHIP="sama5"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARCH_HAVE_DPFPU is not set
 CONFIG_ARCH_FPU=y
+CONFIG_ARCH_HAVE_TRUSTZONE=y
+CONFIG_ARCH_TRUSTZONE_SECURE=y
 # CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 CONFIG_ARCH_LOWVECTORS=y
@@ -131,6 +138,8 @@ CONFIG_ARCH_LOWVECTORS=y
 # ARMv7-A Configuration Options
 #
 # CONFIG_ARMV7A_HAVE_GICv2 is not set
+# CONFIG_ARMV7A_HAVE_GTM is not set
+# CONFIG_ARMV7A_HAVE_PTM is not set
 CONFIG_ARMV7A_HAVE_L2CC=y
 CONFIG_ARMV7A_HAVE_L2CC_PL310=y
 
@@ -189,7 +198,6 @@ CONFIG_SAMA5_HAVE_SPI2=y
 # CONFIG_SAMA5_HAVE_TC is not set
 CONFIG_SAMA5_HAVE_TC1=y
 # CONFIG_SAMA5_HAVE_TC2 is not set
-CONFIG_ARCH_HAVE_TRUSTZONE=y
 # CONFIG_SAMA5_HAVE_TWI3 is not set
 # CONFIG_SAMA5_HAVE_VDEC is not set
 CONFIG_SAMA5_FLEXCOM=y
@@ -551,7 +559,12 @@ CONFIG_RTC_DATETIME=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -559,6 +572,7 @@ CONFIG_RTC_DATETIME=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -570,6 +584,8 @@ CONFIG_RTC_DATETIME=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -593,10 +609,6 @@ CONFIG_USART4_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 CONFIG_SERIAL_NPOLLWAITERS=2
@@ -641,20 +653,24 @@ CONFIG_HIDKBD_NPOLLWAITERS=2
 # CONFIG_USBHOST_TRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 CONFIG_RAMLOG=y
-CONFIG_RAMLOG_SYSLOG=y
 # CONFIG_RAMLOG_CONSOLE is not set
 CONFIG_RAMLOG_BUFSIZE=16384
 # CONFIG_RAMLOG_CRLF is not set
 CONFIG_RAMLOG_NONBLOCKING=y
 CONFIG_RAMLOG_NPOLLWAITERS=4
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_RAMLOG_SYSLOG=y
+# CONFIG_SYSLOG_CONSOLE is not set
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 # CONFIG_CONSOLE_SYSLOG is not set
 
 #
@@ -708,12 +724,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_MOUNTS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-# CONFIG_SYSLOG_CHAR is not set
-
 #
 # Graphics Support
 #
@@ -815,12 +825,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 # CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -865,10 +878,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -878,17 +891,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RANDOM is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
@@ -897,17 +910,17 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -931,8 +944,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -944,6 +957,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 #
 # CONFIG_NETUTILS_CHAT is not set
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -1059,12 +1073,12 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 CONFIG_SYSTEM_NXPLAYER=y
 CONFIG_NXPLAYER_PLAYTHREAD_STACKSIZE=1500
 CONFIG_NXPLAYER_COMMAND_LINE=y
@@ -1084,6 +1098,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sama5d3-xplained/bridge/defconfig b/configs/sama5d3-xplained/bridge/defconfig
index 53e4a4acef..a32be2985d 100644
--- a/configs/sama5d3-xplained/bridge/defconfig
+++ b/configs/sama5d3-xplained/bridge/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -80,6 +81,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -98,6 +100,7 @@ CONFIG_ARCH_CHIP_SAMA5=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -119,9 +122,12 @@ CONFIG_ARCH_CORTEXA5=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-a"
 CONFIG_ARCH_CHIP="sama5"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARCH_HAVE_DPFPU is not set
 CONFIG_ARCH_FPU=y
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 CONFIG_ARCH_LOWVECTORS=y
@@ -131,6 +137,8 @@ CONFIG_ARCH_LOWVECTORS=y
 # ARMv7-A Configuration Options
 #
 # CONFIG_ARMV7A_HAVE_GICv2 is not set
+# CONFIG_ARMV7A_HAVE_GTM is not set
+# CONFIG_ARMV7A_HAVE_PTM is not set
 # CONFIG_ARMV7A_HAVE_L2CC is not set
 # CONFIG_ARMV7A_HAVE_L2CC_PL310 is not set
 # CONFIG_ARMV7A_TOOLCHAIN_BUILDROOT is not set
@@ -181,7 +189,6 @@ CONFIG_SAMA5_HAVE_PIOE=y
 # CONFIG_SAMA5_HAVE_TC is not set
 CONFIG_SAMA5_HAVE_TC1=y
 # CONFIG_SAMA5_HAVE_TC2 is not set
-# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_SAMA5_HAVE_TWI3 is not set
 # CONFIG_SAMA5_HAVE_VDEC is not set
 # CONFIG_SAMA5_FLEXCOM is not set
@@ -537,7 +544,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -545,6 +557,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -605,6 +618,8 @@ CONFIG_ETH1_PHY_KSZ8081=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -628,10 +643,6 @@ CONFIG_SERIAL=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 CONFIG_OTHER_UART_SERIALDRIVER=y
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 CONFIG_SERIAL_NPOLLWAITERS=2
@@ -645,15 +656,18 @@ CONFIG_OTHER_SERIAL_CONSOLE=y
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -796,11 +810,6 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -869,6 +878,8 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 # CONFIG_NETDB_HOSTFILE is not set
 # CONFIG_NETDB_DNSCLIENT is not set
@@ -876,6 +887,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -948,16 +960,17 @@ CONFIG_EXAMPLES_BRIDGE_NET2_PRIORITY=100
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_CXXTEST is not set
 # CONFIG_EXAMPLES_DHCPD is not set
+# CONFIG_EXAMPLES_DISCOVER is not set
 # CONFIG_EXAMPLES_ELF is not set
 # CONFIG_EXAMPLES_FSTEST is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -966,18 +979,18 @@ CONFIG_EXAMPLES_BRIDGE_NET2_PRIORITY=100
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -993,11 +1006,9 @@ CONFIG_EXAMPLES_BRIDGE_NET2_PRIORITY=100
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UDPBLASTER is not set
-# CONFIG_EXAMPLES_DISCOVER is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1021,8 +1032,8 @@ CONFIG_EXAMPLES_BRIDGE_NET2_PRIORITY=100
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1036,14 +1047,15 @@ CONFIG_EXAMPLES_BRIDGE_NET2_PRIORITY=100
 # CONFIG_NETUTILS_CODECS is not set
 # CONFIG_NETUTILS_DHCPC is not set
 # CONFIG_NETUTILS_DHCPD is not set
+# CONFIG_NETUTILS_DISCOVER is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_TFTPC is not set
 CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_NTPCLIENT is not set
-# CONFIG_NETUTILS_DISCOVER is not set
 # CONFIG_NETUTILS_PPPD is not set
+# CONFIG_NETUTILS_SMTP is not set
+# CONFIG_NETUTILS_TFTPC is not set
 
 #
 # NSH Library
@@ -1062,12 +1074,12 @@ CONFIG_NETUTILS_NETLIB=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 CONFIG_SYSTEM_RAMTEST=y
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 CONFIG_SYSTEM_READLINE=y
@@ -1075,6 +1087,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sama5d3-xplained/nsh/defconfig b/configs/sama5d3-xplained/nsh/defconfig
index 56c0bf48e8..7733b5bd39 100644
--- a/configs/sama5d3-xplained/nsh/defconfig
+++ b/configs/sama5d3-xplained/nsh/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -80,6 +81,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -98,6 +100,7 @@ CONFIG_ARCH_CHIP_SAMA5=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -119,9 +122,12 @@ CONFIG_ARCH_CORTEXA5=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-a"
 CONFIG_ARCH_CHIP="sama5"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARCH_HAVE_DPFPU is not set
 CONFIG_ARCH_FPU=y
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 CONFIG_ARCH_LOWVECTORS=y
@@ -131,6 +137,8 @@ CONFIG_ARCH_LOWVECTORS=y
 # ARMv7-A Configuration Options
 #
 # CONFIG_ARMV7A_HAVE_GICv2 is not set
+# CONFIG_ARMV7A_HAVE_GTM is not set
+# CONFIG_ARMV7A_HAVE_PTM is not set
 # CONFIG_ARMV7A_HAVE_L2CC is not set
 # CONFIG_ARMV7A_HAVE_L2CC_PL310 is not set
 # CONFIG_ARMV7A_TOOLCHAIN_BUILDROOT is not set
@@ -181,7 +189,6 @@ CONFIG_SAMA5_HAVE_PIOE=y
 # CONFIG_SAMA5_HAVE_TC is not set
 CONFIG_SAMA5_HAVE_TC1=y
 # CONFIG_SAMA5_HAVE_TC2 is not set
-# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_SAMA5_HAVE_TWI3 is not set
 # CONFIG_SAMA5_HAVE_VDEC is not set
 # CONFIG_SAMA5_FLEXCOM is not set
@@ -505,7 +512,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -513,6 +525,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -524,6 +537,8 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -547,10 +562,6 @@ CONFIG_SERIAL=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 CONFIG_OTHER_UART_SERIALDRIVER=y
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -563,15 +574,18 @@ CONFIG_OTHER_SERIAL_CONSOLE=y
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -624,11 +638,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_MOUNTS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -694,12 +703,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 # CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -743,10 +755,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -756,17 +768,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -774,17 +786,16 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -808,8 +819,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -820,6 +831,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -934,12 +946,12 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -947,6 +959,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sama5d3x-ek/demo/defconfig b/configs/sama5d3x-ek/demo/defconfig
index 405ad536c4..318b920ec8 100644
--- a/configs/sama5d3x-ek/demo/defconfig
+++ b/configs/sama5d3x-ek/demo/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -80,6 +81,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -98,6 +100,7 @@ CONFIG_ARCH_CHIP_SAMA5=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -119,9 +122,12 @@ CONFIG_ARCH_CORTEXA5=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-a"
 CONFIG_ARCH_CHIP="sama5"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARCH_HAVE_DPFPU is not set
 CONFIG_ARCH_FPU=y
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 CONFIG_ARCH_LOWVECTORS=y
@@ -131,6 +137,8 @@ CONFIG_ARCH_LOWVECTORS=y
 # ARMv7-A Configuration Options
 #
 # CONFIG_ARMV7A_HAVE_GICv2 is not set
+# CONFIG_ARMV7A_HAVE_GTM is not set
+# CONFIG_ARMV7A_HAVE_PTM is not set
 # CONFIG_ARMV7A_HAVE_L2CC is not set
 # CONFIG_ARMV7A_HAVE_L2CC_PL310 is not set
 # CONFIG_ARMV7A_TOOLCHAIN_BUILDROOT is not set
@@ -187,7 +195,6 @@ CONFIG_SAMA5_HAVE_PIOE=y
 # CONFIG_SAMA5_HAVE_TC is not set
 # CONFIG_SAMA5_HAVE_TC1 is not set
 # CONFIG_SAMA5_HAVE_TC2 is not set
-# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_SAMA5_HAVE_TWI3 is not set
 # CONFIG_SAMA5_HAVE_VDEC is not set
 # CONFIG_SAMA5_FLEXCOM is not set
@@ -569,6 +576,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -587,7 +596,12 @@ CONFIG_RTC_DATETIME=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -595,6 +609,7 @@ CONFIG_RTC_DATETIME=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -631,12 +646,15 @@ CONFIG_MTD_AT25=y
 CONFIG_AT25_SPIMODE=0
 CONFIG_AT25_SPIFREQUENCY=10000000
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
+# CONFIG_MTD_N25QXXX is not set
 # CONFIG_MTD_SMART is not set
 # CONFIG_MTD_RAMTRON is not set
 # CONFIG_MTD_SST25 is not set
 # CONFIG_MTD_SST25XX is not set
+# CONFIG_MTD_SST26 is not set
 # CONFIG_MTD_SST39FV is not set
 # CONFIG_MTD_W25 is not set
 # CONFIG_EEPROM is not set
@@ -647,6 +665,8 @@ CONFIG_AT25_SPIFREQUENCY=10000000
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -670,10 +690,6 @@ CONFIG_USART1_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -752,15 +768,18 @@ CONFIG_HIDKBD_BUFSIZE=64
 # CONFIG_USBHOST_TRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -814,11 +833,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_MTD is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -884,12 +898,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 # CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -933,10 +950,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -946,17 +963,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RANDOM is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
@@ -965,21 +982,22 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
+# CONFIG_FSUTILS_FLASH_ERASEALL is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_FSUTILS_PASSWD is not set
 
@@ -999,8 +1017,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1011,6 +1029,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -1126,12 +1145,13 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FLASH_ERASEALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1139,7 +1159,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
 CONFIG_SYSTEM_USBMSC=y
 CONFIG_SYSTEM_USBMSC_NLUNS=1
@@ -1152,4 +1171,5 @@ CONFIG_SYSTEM_USBMSC_DEVPATH3="/dev/mmcsd2"
 # CONFIG_SYSTEM_USBMSC_DEBUGMM is not set
 CONFIG_SYSTEM_USBMSC_CMD_STACKSIZE=768
 CONFIG_SYSTEM_USBMSC_CMD_PRIORITY=100
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sama5d3x-ek/hello/defconfig b/configs/sama5d3x-ek/hello/defconfig
index d51c6393db..711ff3aab8 100644
--- a/configs/sama5d3x-ek/hello/defconfig
+++ b/configs/sama5d3x-ek/hello/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -80,6 +81,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -98,6 +100,7 @@ CONFIG_ARCH_CHIP_SAMA5=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -119,9 +122,12 @@ CONFIG_ARCH_CORTEXA5=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-a"
 CONFIG_ARCH_CHIP="sama5"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARCH_HAVE_DPFPU is not set
 CONFIG_ARCH_FPU=y
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 CONFIG_ARCH_LOWVECTORS=y
@@ -131,6 +137,8 @@ CONFIG_ARCH_LOWVECTORS=y
 # ARMv7-A Configuration Options
 #
 # CONFIG_ARMV7A_HAVE_GICv2 is not set
+# CONFIG_ARMV7A_HAVE_GTM is not set
+# CONFIG_ARMV7A_HAVE_PTM is not set
 # CONFIG_ARMV7A_HAVE_L2CC is not set
 # CONFIG_ARMV7A_HAVE_L2CC_PL310 is not set
 # CONFIG_ARMV7A_TOOLCHAIN_BUILDROOT is not set
@@ -182,7 +190,6 @@ CONFIG_SAMA5_HAVE_PIOE=y
 # CONFIG_SAMA5_HAVE_TC is not set
 # CONFIG_SAMA5_HAVE_TC1 is not set
 # CONFIG_SAMA5_HAVE_TC2 is not set
-# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_SAMA5_HAVE_TWI3 is not set
 # CONFIG_SAMA5_HAVE_VDEC is not set
 # CONFIG_SAMA5_FLEXCOM is not set
@@ -486,7 +493,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -494,6 +506,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -505,6 +518,8 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -528,10 +543,6 @@ CONFIG_USART1_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
@@ -557,15 +568,18 @@ CONFIG_USART1_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -596,11 +610,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -664,11 +673,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -699,10 +711,10 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 CONFIG_EXAMPLES_HELLO=y
 CONFIG_EXAMPLES_HELLO_PRIORITY=100
 CONFIG_EXAMPLES_HELLO_STACKSIZE=2048
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -711,18 +723,18 @@ CONFIG_EXAMPLES_HELLO_STACKSIZE=2048
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -736,10 +748,9 @@ CONFIG_EXAMPLES_HELLO_STACKSIZE=2048
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -761,8 +772,8 @@ CONFIG_EXAMPLES_HELLO_STACKSIZE=2048
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -773,6 +784,7 @@ CONFIG_EXAMPLES_HELLO_STACKSIZE=2048
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -794,16 +806,16 @@ CONFIG_EXAMPLES_HELLO_STACKSIZE=2048
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sama5d3x-ek/norboot/defconfig b/configs/sama5d3x-ek/norboot/defconfig
index 18868fd313..f097303188 100644
--- a/configs/sama5d3x-ek/norboot/defconfig
+++ b/configs/sama5d3x-ek/norboot/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -80,6 +81,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -98,6 +100,7 @@ CONFIG_ARCH_CHIP_SAMA5=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -119,9 +122,12 @@ CONFIG_ARCH_CORTEXA5=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-a"
 CONFIG_ARCH_CHIP="sama5"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARCH_HAVE_DPFPU is not set
 CONFIG_ARCH_FPU=y
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 CONFIG_ARCH_LOWVECTORS=y
@@ -131,6 +137,8 @@ CONFIG_ARCH_LOWVECTORS=y
 # ARMv7-A Configuration Options
 #
 # CONFIG_ARMV7A_HAVE_GICv2 is not set
+# CONFIG_ARMV7A_HAVE_GTM is not set
+# CONFIG_ARMV7A_HAVE_PTM is not set
 # CONFIG_ARMV7A_HAVE_L2CC is not set
 # CONFIG_ARMV7A_HAVE_L2CC_PL310 is not set
 # CONFIG_ARMV7A_TOOLCHAIN_BUILDROOT is not set
@@ -182,7 +190,6 @@ CONFIG_SAMA5_HAVE_PIOE=y
 # CONFIG_SAMA5_HAVE_TC is not set
 # CONFIG_SAMA5_HAVE_TC1 is not set
 # CONFIG_SAMA5_HAVE_TC2 is not set
-# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_SAMA5_HAVE_TWI3 is not set
 # CONFIG_SAMA5_HAVE_VDEC is not set
 # CONFIG_SAMA5_FLEXCOM is not set
@@ -500,7 +507,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -508,6 +520,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -519,6 +532,8 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -542,10 +557,6 @@ CONFIG_USART1_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
@@ -571,15 +582,18 @@ CONFIG_USART1_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -610,11 +624,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -678,11 +687,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -713,10 +725,10 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 CONFIG_EXAMPLES_HELLO=y
 CONFIG_EXAMPLES_HELLO_PRIORITY=100
 CONFIG_EXAMPLES_HELLO_STACKSIZE=2048
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -725,18 +737,18 @@ CONFIG_EXAMPLES_HELLO_STACKSIZE=2048
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -750,10 +762,9 @@ CONFIG_EXAMPLES_HELLO_STACKSIZE=2048
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -775,8 +786,8 @@ CONFIG_EXAMPLES_HELLO_STACKSIZE=2048
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -787,6 +798,7 @@ CONFIG_EXAMPLES_HELLO_STACKSIZE=2048
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -808,16 +820,16 @@ CONFIG_EXAMPLES_HELLO_STACKSIZE=2048
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sama5d3x-ek/nsh/defconfig b/configs/sama5d3x-ek/nsh/defconfig
index 34bd0f3f84..a83632746f 100644
--- a/configs/sama5d3x-ek/nsh/defconfig
+++ b/configs/sama5d3x-ek/nsh/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -80,6 +81,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -98,6 +100,7 @@ CONFIG_ARCH_CHIP_SAMA5=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -119,9 +122,12 @@ CONFIG_ARCH_CORTEXA5=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-a"
 CONFIG_ARCH_CHIP="sama5"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARCH_HAVE_DPFPU is not set
 CONFIG_ARCH_FPU=y
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 CONFIG_ARCH_LOWVECTORS=y
@@ -131,6 +137,8 @@ CONFIG_ARCH_LOWVECTORS=y
 # ARMv7-A Configuration Options
 #
 # CONFIG_ARMV7A_HAVE_GICv2 is not set
+# CONFIG_ARMV7A_HAVE_GTM is not set
+# CONFIG_ARMV7A_HAVE_PTM is not set
 # CONFIG_ARMV7A_HAVE_L2CC is not set
 # CONFIG_ARMV7A_HAVE_L2CC_PL310 is not set
 # CONFIG_ARMV7A_TOOLCHAIN_BUILDROOT is not set
@@ -182,7 +190,6 @@ CONFIG_SAMA5_HAVE_PIOE=y
 # CONFIG_SAMA5_HAVE_TC is not set
 # CONFIG_SAMA5_HAVE_TC1 is not set
 # CONFIG_SAMA5_HAVE_TC2 is not set
-# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_SAMA5_HAVE_TWI3 is not set
 # CONFIG_SAMA5_HAVE_VDEC is not set
 # CONFIG_SAMA5_FLEXCOM is not set
@@ -504,7 +511,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -512,6 +524,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -523,6 +536,8 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -546,10 +561,6 @@ CONFIG_USART1_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -576,15 +587,18 @@ CONFIG_USART1_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -637,11 +651,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_MOUNTS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -707,12 +716,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 # CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -756,10 +768,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -769,17 +781,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -787,17 +799,16 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -821,8 +832,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -833,6 +844,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -947,12 +959,12 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -960,6 +972,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sama5d3x-ek/nx/defconfig b/configs/sama5d3x-ek/nx/defconfig
index 8934b36bd1..a9110cb257 100644
--- a/configs/sama5d3x-ek/nx/defconfig
+++ b/configs/sama5d3x-ek/nx/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -80,6 +81,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -98,6 +100,7 @@ CONFIG_ARCH_CHIP_SAMA5=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -119,9 +122,12 @@ CONFIG_ARCH_CORTEXA5=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-a"
 CONFIG_ARCH_CHIP="sama5"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARCH_HAVE_DPFPU is not set
 CONFIG_ARCH_FPU=y
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 CONFIG_ARCH_LOWVECTORS=y
@@ -131,6 +137,8 @@ CONFIG_ARCH_LOWVECTORS=y
 # ARMv7-A Configuration Options
 #
 # CONFIG_ARMV7A_HAVE_GICv2 is not set
+# CONFIG_ARMV7A_HAVE_GTM is not set
+# CONFIG_ARMV7A_HAVE_PTM is not set
 # CONFIG_ARMV7A_HAVE_L2CC is not set
 # CONFIG_ARMV7A_HAVE_L2CC_PL310 is not set
 # CONFIG_ARMV7A_TOOLCHAIN_BUILDROOT is not set
@@ -182,7 +190,6 @@ CONFIG_SAMA5_HAVE_PIOE=y
 # CONFIG_SAMA5_HAVE_TC is not set
 # CONFIG_SAMA5_HAVE_TC1 is not set
 # CONFIG_SAMA5_HAVE_TC2 is not set
-# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_SAMA5_HAVE_TWI3 is not set
 # CONFIG_SAMA5_HAVE_VDEC is not set
 # CONFIG_SAMA5_FLEXCOM is not set
@@ -545,7 +552,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -553,6 +565,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -564,6 +577,8 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -587,10 +602,6 @@ CONFIG_USART1_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -617,15 +628,18 @@ CONFIG_USART1_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -663,11 +677,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -676,6 +685,7 @@ CONFIG_NX_NPLANES=1
 CONFIG_NX_BGCOLOR=0x0
 # CONFIG_NX_ANTIALIASING is not set
 # CONFIG_NX_WRITEONLY is not set
+# CONFIG_NX_UPDATE is not set
 
 #
 # Supported Pixel Depths
@@ -816,11 +826,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -863,10 +876,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -882,18 +895,18 @@ CONFIG_EXAMPLES_NX_DEFAULT_FONT=y
 CONFIG_EXAMPLES_NX_BPP=16
 # CONFIG_EXAMPLES_NX_RAWWINDOWS is not set
 CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -907,10 +920,9 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -932,8 +944,8 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -944,6 +956,7 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -966,12 +979,12 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 CONFIG_SYSTEM_READLINE=y
@@ -979,6 +992,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sama5d3x-ek/nxplayer/defconfig b/configs/sama5d3x-ek/nxplayer/defconfig
index f7317e9e8c..222d4832fe 100644
--- a/configs/sama5d3x-ek/nxplayer/defconfig
+++ b/configs/sama5d3x-ek/nxplayer/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -80,6 +81,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -98,6 +100,7 @@ CONFIG_ARCH_CHIP_SAMA5=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -119,9 +122,12 @@ CONFIG_ARCH_CORTEXA5=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-a"
 CONFIG_ARCH_CHIP="sama5"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARCH_HAVE_DPFPU is not set
 CONFIG_ARCH_FPU=y
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 CONFIG_ARCH_LOWVECTORS=y
@@ -131,6 +137,8 @@ CONFIG_ARCH_LOWVECTORS=y
 # ARMv7-A Configuration Options
 #
 # CONFIG_ARMV7A_HAVE_GICv2 is not set
+# CONFIG_ARMV7A_HAVE_GTM is not set
+# CONFIG_ARMV7A_HAVE_PTM is not set
 # CONFIG_ARMV7A_HAVE_L2CC is not set
 # CONFIG_ARMV7A_HAVE_L2CC_PL310 is not set
 # CONFIG_ARMV7A_TOOLCHAIN_BUILDROOT is not set
@@ -184,7 +192,6 @@ CONFIG_SAMA5_HAVE_PIOE=y
 # CONFIG_SAMA5_HAVE_TC is not set
 # CONFIG_SAMA5_HAVE_TC1 is not set
 # CONFIG_SAMA5_HAVE_TC2 is not set
-# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_SAMA5_HAVE_TWI3 is not set
 # CONFIG_SAMA5_HAVE_VDEC is not set
 # CONFIG_SAMA5_FLEXCOM is not set
@@ -592,7 +599,12 @@ CONFIG_WM8904_WORKER_STACKSIZE=1536
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -600,6 +612,7 @@ CONFIG_WM8904_WORKER_STACKSIZE=1536
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -622,6 +635,8 @@ CONFIG_SDIO_BLOCKSETUP=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -645,10 +660,6 @@ CONFIG_USART1_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -675,15 +686,18 @@ CONFIG_USART1_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -736,11 +750,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_MOUNTS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -839,12 +848,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 # CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -888,10 +900,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -901,17 +913,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -919,17 +931,17 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -953,8 +965,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -965,6 +977,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -1079,13 +1092,13 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_SYSTEM_I2CTOOL is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_I2CTOOL is not set
+# CONFIG_SYSTEM_INSTALL is not set
 CONFIG_SYSTEM_NXPLAYER=y
 CONFIG_NXPLAYER_PLAYTHREAD_STACKSIZE=1500
 CONFIG_NXPLAYER_COMMAND_LINE=y
@@ -1105,6 +1118,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sama5d3x-ek/nxwm/defconfig b/configs/sama5d3x-ek/nxwm/defconfig
index 9fcf1bfdce..d9ca7a5576 100644
--- a/configs/sama5d3x-ek/nxwm/defconfig
+++ b/configs/sama5d3x-ek/nxwm/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -622,6 +623,7 @@ CONFIG_INPUT=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -633,6 +635,8 @@ CONFIG_INPUT=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -682,15 +686,18 @@ CONFIG_USART1_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -736,11 +743,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_MOUNTS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -922,6 +924,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -965,10 +968,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -977,18 +980,18 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1002,10 +1005,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1029,8 +1032,8 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1335,12 +1338,12 @@ CONFIG_NXWM_HEXCALCULATOR_FONTID=6
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1348,6 +1351,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sama5d3x-ek/ov2640/defconfig b/configs/sama5d3x-ek/ov2640/defconfig
index 55dfeef000..62fc4177eb 100644
--- a/configs/sama5d3x-ek/ov2640/defconfig
+++ b/configs/sama5d3x-ek/ov2640/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -80,6 +81,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -98,6 +100,7 @@ CONFIG_ARCH_CHIP_SAMA5=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -119,9 +122,12 @@ CONFIG_ARCH_CORTEXA5=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-a"
 CONFIG_ARCH_CHIP="sama5"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARCH_HAVE_DPFPU is not set
 CONFIG_ARCH_FPU=y
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 CONFIG_ARCH_LOWVECTORS=y
@@ -131,6 +137,8 @@ CONFIG_ARCH_LOWVECTORS=y
 # ARMv7-A Configuration Options
 #
 # CONFIG_ARMV7A_HAVE_GICv2 is not set
+# CONFIG_ARMV7A_HAVE_GTM is not set
+# CONFIG_ARMV7A_HAVE_PTM is not set
 # CONFIG_ARMV7A_HAVE_L2CC is not set
 # CONFIG_ARMV7A_HAVE_L2CC_PL310 is not set
 # CONFIG_ARMV7A_TOOLCHAIN_BUILDROOT is not set
@@ -182,7 +190,6 @@ CONFIG_SAMA5_HAVE_PIOE=y
 # CONFIG_SAMA5_HAVE_TC is not set
 # CONFIG_SAMA5_HAVE_TC1 is not set
 # CONFIG_SAMA5_HAVE_TC2 is not set
-# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_SAMA5_HAVE_TWI3 is not set
 # CONFIG_SAMA5_HAVE_VDEC is not set
 # CONFIG_SAMA5_FLEXCOM is not set
@@ -571,7 +578,12 @@ CONFIG_OV2640_SVGA_RESOLUTION=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -579,6 +591,7 @@ CONFIG_OV2640_SVGA_RESOLUTION=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -590,6 +603,8 @@ CONFIG_OV2640_SVGA_RESOLUTION=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -613,10 +628,6 @@ CONFIG_USART1_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
@@ -642,15 +653,18 @@ CONFIG_USART1_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -681,11 +695,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -749,11 +758,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -782,10 +794,10 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -794,18 +806,18 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -819,10 +831,9 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -844,8 +855,8 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -856,6 +867,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -877,17 +889,17 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_SYSTEM_I2CTOOL is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_I2CTOOL is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sama5d4-ek/at25boot/defconfig b/configs/sama5d4-ek/at25boot/defconfig
index 1ef4c31c3b..7fec0ba4aa 100644
--- a/configs/sama5d4-ek/at25boot/defconfig
+++ b/configs/sama5d4-ek/at25boot/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -80,6 +81,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -98,6 +100,7 @@ CONFIG_ARCH_CHIP_SAMA5=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -119,9 +122,13 @@ CONFIG_ARCH_CORTEXA5=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-a"
 CONFIG_ARCH_CHIP="sama5"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARCH_HAVE_DPFPU is not set
 CONFIG_ARCH_FPU=y
+CONFIG_ARCH_HAVE_TRUSTZONE=y
+CONFIG_ARCH_TRUSTZONE_SECURE=y
 # CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 CONFIG_ARCH_LOWVECTORS=y
@@ -131,6 +138,8 @@ CONFIG_ARCH_LOWVECTORS=y
 # ARMv7-A Configuration Options
 #
 # CONFIG_ARMV7A_HAVE_GICv2 is not set
+# CONFIG_ARMV7A_HAVE_GTM is not set
+# CONFIG_ARMV7A_HAVE_PTM is not set
 CONFIG_ARMV7A_HAVE_L2CC=y
 CONFIG_ARMV7A_HAVE_L2CC_PL310=y
 
@@ -186,7 +195,6 @@ CONFIG_SAMA5_HAVE_SPI2=y
 # CONFIG_SAMA5_HAVE_TC is not set
 CONFIG_SAMA5_HAVE_TC1=y
 CONFIG_SAMA5_HAVE_TC2=y
-CONFIG_ARCH_HAVE_TRUSTZONE=y
 CONFIG_SAMA5_HAVE_TWI3=y
 CONFIG_SAMA5_HAVE_VDEC=y
 # CONFIG_SAMA5_FLEXCOM is not set
@@ -521,6 +529,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -535,7 +545,12 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -543,6 +558,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 CONFIG_MTD=y
@@ -567,12 +583,15 @@ CONFIG_MTD_AT25=y
 CONFIG_AT25_SPIMODE=0
 CONFIG_AT25_SPIFREQUENCY=20000000
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
+# CONFIG_MTD_N25QXXX is not set
 # CONFIG_MTD_SMART is not set
 # CONFIG_MTD_RAMTRON is not set
 # CONFIG_MTD_SST25 is not set
 # CONFIG_MTD_SST25XX is not set
+# CONFIG_MTD_SST26 is not set
 # CONFIG_MTD_SST39FV is not set
 # CONFIG_MTD_W25 is not set
 # CONFIG_EEPROM is not set
@@ -583,6 +602,8 @@ CONFIG_AT25_SPIFREQUENCY=20000000
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -606,10 +627,6 @@ CONFIG_USART3_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -636,15 +653,18 @@ CONFIG_USART3_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -689,11 +709,6 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -759,12 +774,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 # CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -808,10 +826,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -820,18 +838,18 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -845,14 +863,14 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
+# CONFIG_FSUTILS_FLASH_ERASEALL is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_FSUTILS_PASSWD is not set
 
@@ -872,8 +890,8 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -884,6 +902,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -905,13 +924,13 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 CONFIG_SYSTEM_HEX2BIN=y
 # CONFIG_SYSTEM_HEX2BIN_DEBUG is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 CONFIG_SYSTEM_READLINE=y
@@ -919,6 +938,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sama5d4-ek/bridge/defconfig b/configs/sama5d4-ek/bridge/defconfig
index c7f5e3cca9..76a5894a9d 100644
--- a/configs/sama5d4-ek/bridge/defconfig
+++ b/configs/sama5d4-ek/bridge/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -80,6 +81,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -98,6 +100,7 @@ CONFIG_ARCH_CHIP_SAMA5=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -119,9 +122,13 @@ CONFIG_ARCH_CORTEXA5=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-a"
 CONFIG_ARCH_CHIP="sama5"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARCH_HAVE_DPFPU is not set
 CONFIG_ARCH_FPU=y
+CONFIG_ARCH_HAVE_TRUSTZONE=y
+CONFIG_ARCH_TRUSTZONE_SECURE=y
 # CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 CONFIG_ARCH_LOWVECTORS=y
@@ -131,6 +138,8 @@ CONFIG_ARCH_LOWVECTORS=y
 # ARMv7-A Configuration Options
 #
 # CONFIG_ARMV7A_HAVE_GICv2 is not set
+# CONFIG_ARMV7A_HAVE_GTM is not set
+# CONFIG_ARMV7A_HAVE_PTM is not set
 CONFIG_ARMV7A_HAVE_L2CC=y
 CONFIG_ARMV7A_HAVE_L2CC_PL310=y
 
@@ -186,7 +195,6 @@ CONFIG_SAMA5_HAVE_SPI2=y
 # CONFIG_SAMA5_HAVE_TC is not set
 CONFIG_SAMA5_HAVE_TC1=y
 CONFIG_SAMA5_HAVE_TC2=y
-CONFIG_ARCH_HAVE_TRUSTZONE=y
 CONFIG_SAMA5_HAVE_TWI3=y
 CONFIG_SAMA5_HAVE_VDEC=y
 # CONFIG_SAMA5_FLEXCOM is not set
@@ -555,7 +563,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -563,6 +576,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -623,6 +637,8 @@ CONFIG_ETH1_PHY_KSZ8081=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -646,10 +662,6 @@ CONFIG_USART3_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 CONFIG_SERIAL_NPOLLWAITERS=2
@@ -677,15 +689,18 @@ CONFIG_USART3_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -828,11 +843,6 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -901,6 +911,8 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 # CONFIG_NETDB_HOSTFILE is not set
 # CONFIG_NETDB_DNSCLIENT is not set
@@ -908,6 +920,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -980,16 +993,17 @@ CONFIG_EXAMPLES_BRIDGE_NET2_PRIORITY=100
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_CXXTEST is not set
 # CONFIG_EXAMPLES_DHCPD is not set
+# CONFIG_EXAMPLES_DISCOVER is not set
 # CONFIG_EXAMPLES_ELF is not set
 # CONFIG_EXAMPLES_FSTEST is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -998,18 +1012,18 @@ CONFIG_EXAMPLES_BRIDGE_NET2_PRIORITY=100
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1025,11 +1039,9 @@ CONFIG_EXAMPLES_BRIDGE_NET2_PRIORITY=100
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UDPBLASTER is not set
-# CONFIG_EXAMPLES_DISCOVER is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1053,8 +1065,8 @@ CONFIG_EXAMPLES_BRIDGE_NET2_PRIORITY=100
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1068,14 +1080,15 @@ CONFIG_EXAMPLES_BRIDGE_NET2_PRIORITY=100
 # CONFIG_NETUTILS_CODECS is not set
 # CONFIG_NETUTILS_DHCPC is not set
 # CONFIG_NETUTILS_DHCPD is not set
+# CONFIG_NETUTILS_DISCOVER is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_TFTPC is not set
 CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_NTPCLIENT is not set
-# CONFIG_NETUTILS_DISCOVER is not set
 # CONFIG_NETUTILS_PPPD is not set
+# CONFIG_NETUTILS_SMTP is not set
+# CONFIG_NETUTILS_TFTPC is not set
 
 #
 # NSH Library
@@ -1094,12 +1107,12 @@ CONFIG_NETUTILS_NETLIB=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 CONFIG_SYSTEM_RAMTEST=y
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 CONFIG_SYSTEM_READLINE=y
@@ -1107,6 +1120,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sama5d4-ek/dramboot/defconfig b/configs/sama5d4-ek/dramboot/defconfig
index 064b7a2521..2069204439 100644
--- a/configs/sama5d4-ek/dramboot/defconfig
+++ b/configs/sama5d4-ek/dramboot/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -80,6 +81,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -98,6 +100,7 @@ CONFIG_ARCH_CHIP_SAMA5=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -119,9 +122,13 @@ CONFIG_ARCH_CORTEXA5=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-a"
 CONFIG_ARCH_CHIP="sama5"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARCH_HAVE_DPFPU is not set
 CONFIG_ARCH_FPU=y
+CONFIG_ARCH_HAVE_TRUSTZONE=y
+CONFIG_ARCH_TRUSTZONE_SECURE=y
 # CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 CONFIG_ARCH_LOWVECTORS=y
@@ -131,6 +138,8 @@ CONFIG_ARCH_LOWVECTORS=y
 # ARMv7-A Configuration Options
 #
 # CONFIG_ARMV7A_HAVE_GICv2 is not set
+# CONFIG_ARMV7A_HAVE_GTM is not set
+# CONFIG_ARMV7A_HAVE_PTM is not set
 CONFIG_ARMV7A_HAVE_L2CC=y
 CONFIG_ARMV7A_HAVE_L2CC_PL310=y
 
@@ -186,7 +195,6 @@ CONFIG_SAMA5_HAVE_SPI2=y
 # CONFIG_SAMA5_HAVE_TC is not set
 CONFIG_SAMA5_HAVE_TC1=y
 CONFIG_SAMA5_HAVE_TC2=y
-CONFIG_ARCH_HAVE_TRUSTZONE=y
 CONFIG_SAMA5_HAVE_TWI3=y
 CONFIG_SAMA5_HAVE_VDEC=y
 # CONFIG_SAMA5_FLEXCOM is not set
@@ -521,7 +529,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -529,6 +542,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -540,6 +554,8 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -563,10 +579,6 @@ CONFIG_USART3_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -593,15 +605,18 @@ CONFIG_USART3_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -646,11 +661,6 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -716,12 +726,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 # CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -765,10 +778,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -777,18 +790,18 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -802,10 +815,9 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -829,8 +841,8 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -841,6 +853,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -862,13 +875,13 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 CONFIG_SYSTEM_HEX2BIN=y
 # CONFIG_SYSTEM_HEX2BIN_DEBUG is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 CONFIG_SYSTEM_READLINE=y
@@ -876,6 +889,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sama5d4-ek/elf/defconfig b/configs/sama5d4-ek/elf/defconfig
index c42a5fb412..7b2b355e2d 100644
--- a/configs/sama5d4-ek/elf/defconfig
+++ b/configs/sama5d4-ek/elf/defconfig
@@ -47,10 +47,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -100,6 +101,7 @@ CONFIG_ARCH_CHIP_SAMA5=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -121,9 +123,15 @@ CONFIG_ARCH_CORTEXA5=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-a"
 CONFIG_ARCH_CHIP="sama5"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARCH_HAVE_DPFPU is not set
 CONFIG_ARCH_FPU=y
+CONFIG_ARCH_HAVE_TRUSTZONE=y
+CONFIG_ARCH_TRUSTZONE_SECURE=y
+# CONFIG_ARCH_TRUSTZONE_NONSECURE is not set
+# CONFIG_ARCH_TRUSTZONE_BOTH is not set
 # CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 CONFIG_ARCH_LOWVECTORS=y
@@ -133,6 +141,8 @@ CONFIG_ARCH_LOWVECTORS=y
 # ARMv7-A Configuration Options
 #
 # CONFIG_ARMV7A_HAVE_GICv2 is not set
+# CONFIG_ARMV7A_HAVE_GTM is not set
+# CONFIG_ARMV7A_HAVE_PTM is not set
 CONFIG_ARMV7A_HAVE_L2CC=y
 CONFIG_ARMV7A_HAVE_L2CC_PL310=y
 
@@ -189,7 +199,6 @@ CONFIG_SAMA5_HAVE_SPI2=y
 # CONFIG_SAMA5_HAVE_TC is not set
 CONFIG_SAMA5_HAVE_TC1=y
 CONFIG_SAMA5_HAVE_TC2=y
-CONFIG_ARCH_HAVE_TRUSTZONE=y
 CONFIG_SAMA5_HAVE_TWI3=y
 CONFIG_SAMA5_HAVE_VDEC=y
 # CONFIG_SAMA5_FLEXCOM is not set
@@ -547,7 +556,12 @@ CONFIG_AUDIO_DEVICES=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -555,6 +569,7 @@ CONFIG_AUDIO_DEVICES=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -566,6 +581,8 @@ CONFIG_AUDIO_DEVICES=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -589,10 +606,6 @@ CONFIG_USART4_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 CONFIG_SERIAL_NPOLLWAITERS=2
@@ -634,15 +647,18 @@ CONFIG_USART4_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -680,11 +696,6 @@ CONFIG_FS_ROMFS=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -758,12 +769,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 # CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -812,10 +826,10 @@ CONFIG_EXAMPLES_ELF_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -824,18 +838,18 @@ CONFIG_EXAMPLES_ELF_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RANDOM is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
@@ -852,11 +866,10 @@ CONFIG_EXAMPLES_ELF_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_UNIONFS is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -880,8 +893,8 @@ CONFIG_EXAMPLES_ELF_CXXINITIALIZE=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -893,6 +906,7 @@ CONFIG_EXAMPLES_ELF_CXXINITIALIZE=y
 #
 # CONFIG_NETUTILS_CHAT is not set
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -914,13 +928,13 @@ CONFIG_EXAMPLES_ELF_CXXINITIALIZE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_SYSTEM_I2CTOOL is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_I2CTOOL is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 CONFIG_SYSTEM_READLINE=y
@@ -928,6 +942,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sama5d4-ek/ipv6/defconfig b/configs/sama5d4-ek/ipv6/defconfig
index c316af858a..a5400f4e90 100644
--- a/configs/sama5d4-ek/ipv6/defconfig
+++ b/configs/sama5d4-ek/ipv6/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -717,6 +718,7 @@ CONFIG_MXT_NPOLLWAITERS=4
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -779,6 +781,8 @@ CONFIG_ETH0_PHY_KSZ8081=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -861,20 +865,24 @@ CONFIG_HIDKBD_NPOLLWAITERS=2
 # CONFIG_USBHOST_TRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 CONFIG_RAMLOG=y
-CONFIG_RAMLOG_SYSLOG=y
 # CONFIG_RAMLOG_CONSOLE is not set
 CONFIG_RAMLOG_BUFSIZE=16384
 # CONFIG_RAMLOG_CRLF is not set
 CONFIG_RAMLOG_NONBLOCKING=y
 CONFIG_RAMLOG_NPOLLWAITERS=4
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_RAMLOG_SYSLOG=y
+# CONFIG_SYSLOG_CONSOLE is not set
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 # CONFIG_CONSOLE_SYSLOG is not set
 
 #
@@ -1039,12 +1047,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_NET is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-# CONFIG_SYSLOG_CHAR is not set
-
 #
 # Graphics Support
 #
@@ -1241,6 +1243,7 @@ CONFIG_LIBC_NETDB=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/sama5d4-ek/knsh/defconfig b/configs/sama5d4-ek/knsh/defconfig
index 8d9f0691a3..d08f54cfd0 100644
--- a/configs/sama5d4-ek/knsh/defconfig
+++ b/configs/sama5d4-ek/knsh/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -99,6 +100,7 @@ CONFIG_ARCH_CHIP_SAMA5=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -120,9 +122,15 @@ CONFIG_ARCH_CORTEXA5=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-a"
 CONFIG_ARCH_CHIP="sama5"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARCH_HAVE_DPFPU is not set
 CONFIG_ARCH_FPU=y
+CONFIG_ARCH_HAVE_TRUSTZONE=y
+CONFIG_ARCH_TRUSTZONE_SECURE=y
+# CONFIG_ARCH_TRUSTZONE_NONSECURE is not set
+# CONFIG_ARCH_TRUSTZONE_BOTH is not set
 # CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 CONFIG_ARCH_LOWVECTORS=y
@@ -132,6 +140,8 @@ CONFIG_ARCH_LOWVECTORS=y
 # ARMv7-A Configuration Options
 #
 # CONFIG_ARMV7A_HAVE_GICv2 is not set
+# CONFIG_ARMV7A_HAVE_GTM is not set
+# CONFIG_ARMV7A_HAVE_PTM is not set
 CONFIG_ARMV7A_HAVE_L2CC=y
 CONFIG_ARMV7A_HAVE_L2CC_PL310=y
 
@@ -190,7 +200,6 @@ CONFIG_SAMA5_HAVE_SPI2=y
 # CONFIG_SAMA5_HAVE_TC is not set
 CONFIG_SAMA5_HAVE_TC1=y
 CONFIG_SAMA5_HAVE_TC2=y
-CONFIG_ARCH_HAVE_TRUSTZONE=y
 CONFIG_SAMA5_HAVE_TWI3=y
 CONFIG_SAMA5_HAVE_VDEC=y
 # CONFIG_SAMA5_FLEXCOM is not set
@@ -565,7 +574,12 @@ CONFIG_RTC_DATETIME=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -573,6 +587,7 @@ CONFIG_RTC_DATETIME=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -595,6 +610,8 @@ CONFIG_SDIO_BLOCKSETUP=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -618,10 +635,6 @@ CONFIG_USART4_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 CONFIG_SERIAL_NPOLLWAITERS=2
@@ -663,15 +676,18 @@ CONFIG_USART4_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -725,11 +741,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_MOUNTS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -809,12 +820,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 # CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_USRWORK is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
@@ -862,9 +876,9 @@ CONFIG_EXAMPLES_HELLO_PROGNAME="hello"
 CONFIG_EXAMPLES_HELLO_PRIORITY=100
 CONFIG_EXAMPLES_HELLO_STACKSIZE=2048
 # CONFIG_EXAMPLES_HELLOXX is not set
+# CONFIG_EXAMPLES_IGMP is not set
 # CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_KEYPADTEST is not set
-# CONFIG_EXAMPLES_IGMP is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -875,18 +889,18 @@ CONFIG_EXAMPLES_NSH_PROGNAME="init"
 # CONFIG_EXAMPLES_NSH_CXXINITIALIZE is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RANDOM is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
@@ -901,10 +915,9 @@ CONFIG_EXAMPLES_NSH_PROGNAME="init"
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -928,8 +941,8 @@ CONFIG_EXAMPLES_NSH_PROGNAME="init"
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -941,6 +954,7 @@ CONFIG_EXAMPLES_NSH_PROGNAME="init"
 #
 # CONFIG_NETUTILS_CHAT is not set
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -1057,12 +1071,12 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1070,6 +1084,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sama5d4-ek/nsh/defconfig b/configs/sama5d4-ek/nsh/defconfig
index 60cfb5bc74..bf72a2a86b 100644
--- a/configs/sama5d4-ek/nsh/defconfig
+++ b/configs/sama5d4-ek/nsh/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -717,6 +718,7 @@ CONFIG_MXT_NPOLLWAITERS=4
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -781,6 +783,8 @@ CONFIG_ETH0_PHY_KSZ8081=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -863,20 +867,24 @@ CONFIG_HIDKBD_NPOLLWAITERS=2
 # CONFIG_USBHOST_TRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 CONFIG_RAMLOG=y
-CONFIG_RAMLOG_SYSLOG=y
 # CONFIG_RAMLOG_CONSOLE is not set
 CONFIG_RAMLOG_BUFSIZE=16384
 # CONFIG_RAMLOG_CRLF is not set
 CONFIG_RAMLOG_NONBLOCKING=y
 CONFIG_RAMLOG_NPOLLWAITERS=4
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_RAMLOG_SYSLOG=y
+# CONFIG_SYSLOG_CONSOLE is not set
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 # CONFIG_CONSOLE_SYSLOG is not set
 
 #
@@ -1043,12 +1051,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_NET is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-# CONFIG_SYSLOG_CHAR is not set
-
 #
 # Graphics Support
 #
@@ -1252,6 +1254,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/sama5d4-ek/nxwm/defconfig b/configs/sama5d4-ek/nxwm/defconfig
index f1ba6ebe4b..add09daf5f 100644
--- a/configs/sama5d4-ek/nxwm/defconfig
+++ b/configs/sama5d4-ek/nxwm/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -686,6 +687,7 @@ CONFIG_MXT_NPOLLWAITERS=4
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -750,6 +752,8 @@ CONFIG_ETH0_PHY_KSZ8081=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -832,20 +836,24 @@ CONFIG_HIDKBD_NPOLLWAITERS=2
 # CONFIG_USBHOST_TRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 CONFIG_RAMLOG=y
-CONFIG_RAMLOG_SYSLOG=y
 # CONFIG_RAMLOG_CONSOLE is not set
 CONFIG_RAMLOG_BUFSIZE=16384
 # CONFIG_RAMLOG_CRLF is not set
 CONFIG_RAMLOG_NONBLOCKING=y
 CONFIG_RAMLOG_NPOLLWAITERS=4
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_RAMLOG_SYSLOG=y
+# CONFIG_SYSLOG_CONSOLE is not set
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 # CONFIG_CONSOLE_SYSLOG is not set
 
 #
@@ -1010,12 +1018,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_NET is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-# CONFIG_SYSLOG_CHAR is not set
-
 #
 # Graphics Support
 #
@@ -1240,6 +1242,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/sama5d4-ek/ramtest/defconfig b/configs/sama5d4-ek/ramtest/defconfig
index 2ab5988a75..00c135747e 100644
--- a/configs/sama5d4-ek/ramtest/defconfig
+++ b/configs/sama5d4-ek/ramtest/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -80,6 +81,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -98,6 +100,7 @@ CONFIG_ARCH_CHIP_SAMA5=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -119,9 +122,13 @@ CONFIG_ARCH_CORTEXA5=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-a"
 CONFIG_ARCH_CHIP="sama5"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARCH_HAVE_DPFPU is not set
 CONFIG_ARCH_FPU=y
+CONFIG_ARCH_HAVE_TRUSTZONE=y
+CONFIG_ARCH_TRUSTZONE_SECURE=y
 # CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 CONFIG_ARCH_LOWVECTORS=y
@@ -131,6 +138,8 @@ CONFIG_ARCH_LOWVECTORS=y
 # ARMv7-A Configuration Options
 #
 # CONFIG_ARMV7A_HAVE_GICv2 is not set
+# CONFIG_ARMV7A_HAVE_GTM is not set
+# CONFIG_ARMV7A_HAVE_PTM is not set
 CONFIG_ARMV7A_HAVE_L2CC=y
 CONFIG_ARMV7A_HAVE_L2CC_PL310=y
 
@@ -186,7 +195,6 @@ CONFIG_SAMA5_HAVE_SPI2=y
 # CONFIG_SAMA5_HAVE_TC is not set
 CONFIG_SAMA5_HAVE_TC1=y
 CONFIG_SAMA5_HAVE_TC2=y
-CONFIG_ARCH_HAVE_TRUSTZONE=y
 CONFIG_SAMA5_HAVE_TWI3=y
 CONFIG_SAMA5_HAVE_VDEC=y
 # CONFIG_SAMA5_FLEXCOM is not set
@@ -521,7 +529,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -529,6 +542,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -540,6 +554,8 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -563,10 +579,6 @@ CONFIG_USART3_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -593,15 +605,18 @@ CONFIG_USART3_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -654,11 +669,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_MOUNTS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -724,12 +734,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 # CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -773,10 +786,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -786,17 +799,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -804,17 +817,16 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -838,8 +850,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -850,6 +862,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -960,12 +973,12 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 CONFIG_SYSTEM_RAMTEST=y
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -973,6 +986,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/samd20-xplained/nsh/defconfig b/configs/samd20-xplained/nsh/defconfig
index c5e67c41c8..5b77260e57 100644
--- a/configs/samd20-xplained/nsh/defconfig
+++ b/configs/samd20-xplained/nsh/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -80,6 +81,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -98,6 +100,7 @@ CONFIG_ARCH_CHIP_SAMD=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -119,11 +122,14 @@ CONFIG_ARCH_CORTEXM0=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv6-m"
 CONFIG_ARCH_CHIP="samdl"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 
 #
@@ -450,7 +456,12 @@ CONFIG_DEV_NULL=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -458,6 +469,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -469,6 +481,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -492,10 +506,6 @@ CONFIG_USART4_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -536,15 +546,18 @@ CONFIG_USART4_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -582,11 +595,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -649,11 +657,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -697,10 +708,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -710,17 +721,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -728,17 +739,16 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -760,8 +770,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -772,6 +782,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -883,12 +894,12 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -896,6 +907,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/samd21-xplained/nsh/defconfig b/configs/samd21-xplained/nsh/defconfig
index a4c76dda60..4b5a9b44ce 100644
--- a/configs/samd21-xplained/nsh/defconfig
+++ b/configs/samd21-xplained/nsh/defconfig
@@ -46,10 +46,11 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -80,6 +81,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -98,6 +100,7 @@ CONFIG_ARCH_CHIP_SAMD=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -119,11 +122,14 @@ CONFIG_ARCH_CORTEXM0=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv6-m"
 CONFIG_ARCH_CHIP="samdl"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 
 #
@@ -448,7 +454,12 @@ CONFIG_DEV_NULL=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -456,6 +467,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -467,6 +479,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -490,10 +504,6 @@ CONFIG_USART4_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -534,15 +544,18 @@ CONFIG_USART4_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -580,11 +593,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -647,11 +655,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -695,10 +706,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -708,17 +719,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -726,17 +737,16 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -758,8 +768,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -770,6 +780,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -881,12 +892,12 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -894,6 +905,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/same70-xplained/netnsh/defconfig b/configs/same70-xplained/netnsh/defconfig
index c4421983e7..0f03d530c1 100644
--- a/configs/same70-xplained/netnsh/defconfig
+++ b/configs/same70-xplained/netnsh/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -541,6 +542,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -569,6 +572,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -613,6 +617,7 @@ CONFIG_MTD_AT25=y
 CONFIG_AT25_SPIMODE=0
 CONFIG_AT25_SPIFREQUENCY=20000000
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
 # CONFIG_MTD_N25QXXX is not set
@@ -674,6 +679,8 @@ CONFIG_ETH0_PHY_KSZ8081=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -723,15 +730,18 @@ CONFIG_USART1_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -898,11 +908,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_MTD is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -986,6 +991,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/same70-xplained/nsh/defconfig b/configs/same70-xplained/nsh/defconfig
index e1c9fb23db..cb89c826f1 100644
--- a/configs/same70-xplained/nsh/defconfig
+++ b/configs/same70-xplained/nsh/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -80,6 +81,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -98,6 +100,7 @@ CONFIG_ARCH="arm"
 CONFIG_ARCH_CHIP_SAMV7=y
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -119,6 +122,8 @@ CONFIG_ARCH_CORTEXM7=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="samv7"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 CONFIG_ARMV7M_CMNVECTOR=y
@@ -127,6 +132,7 @@ CONFIG_ARCH_HAVE_FPU=y
 CONFIG_ARCH_HAVE_DPFPU=y
 CONFIG_ARCH_FPU=y
 CONFIG_ARCH_DPFPU=y
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
@@ -142,6 +148,7 @@ CONFIG_ARMV7M_HAVE_ITCM=y
 CONFIG_ARMV7M_HAVE_DTCM=y
 # CONFIG_ARMV7M_ITCM is not set
 # CONFIG_ARMV7M_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARW is not set
 # CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
 # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDW is not set
@@ -257,6 +264,13 @@ CONFIG_SAMV7_USART1=y
 # CONFIG_SAMV7_USART2 is not set
 # CONFIG_SAMV7_WDT is not set
 # CONFIG_SAMV7_RSWDT is not set
+# CONFIG_SAMV7_JTAG_DISABLE is not set
+CONFIG_SAMV7_JTAG_FULL_ENABLE=y
+# CONFIG_SAMV7_JTAG_FULL_SW_ENABLE is not set
+# CONFIG_SAMV7_JTAG_SW_ENABLE is not set
+# CONFIG_SAMV7_ERASE_DISABLE is not set
+CONFIG_SAMV7_ERASE_ENABLE=y
+# CONFIG_SAMV7_SYSTEMRESET is not set
 CONFIG_SAMV7_GPIO_IRQ=y
 CONFIG_SAMV7_GPIOA_IRQ=y
 # CONFIG_SAMV7_GPIOB_IRQ is not set
@@ -513,6 +527,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -528,7 +544,12 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -536,6 +557,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -580,12 +602,15 @@ CONFIG_MTD_AT25=y
 CONFIG_AT25_SPIMODE=0
 CONFIG_AT25_SPIFREQUENCY=20000000
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
+# CONFIG_MTD_N25QXXX is not set
 # CONFIG_MTD_SMART is not set
 # CONFIG_MTD_RAMTRON is not set
 # CONFIG_MTD_SST25 is not set
 # CONFIG_MTD_SST25XX is not set
+# CONFIG_MTD_SST26 is not set
 # CONFIG_MTD_SST39FV is not set
 # CONFIG_MTD_W25 is not set
 # CONFIG_EEPROM is not set
@@ -596,6 +621,8 @@ CONFIG_AT25_SPIFREQUENCY=20000000
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -619,10 +646,6 @@ CONFIG_USART1_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -649,15 +672,18 @@ CONFIG_USART1_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -711,11 +737,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_MTD is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -783,12 +804,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 # CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -836,10 +860,10 @@ CONFIG_EXAMPLES_BUTTONS_NAME7="Button 7"
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -848,17 +872,17 @@ CONFIG_EXAMPLES_BUTTONS_NAME7="Button 7"
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -866,21 +890,22 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
+# CONFIG_FSUTILS_FLASH_ERASEALL is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_FSUTILS_PASSWD is not set
 
@@ -900,8 +925,8 @@ CONFIG_EXAMPLES_NSH=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -912,6 +937,7 @@ CONFIG_EXAMPLES_NSH=y
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -1026,11 +1052,12 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FLASH_ERASEALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=0
 CONFIG_I2CTOOL_MAXBUS=0
@@ -1038,7 +1065,7 @@ CONFIG_I2CTOOL_MINADDR=0x03
 CONFIG_I2CTOOL_MAXADDR=0x77
 CONFIG_I2CTOOL_MAXREGADDR=0xff
 CONFIG_I2CTOOL_DEFFREQ=400000
-# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 CONFIG_SYSTEM_RAMTEST=y
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1046,6 +1073,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/saml21-xplained/nsh/defconfig b/configs/saml21-xplained/nsh/defconfig
index 17e0f2f588..7d37c41d4e 100644
--- a/configs/saml21-xplained/nsh/defconfig
+++ b/configs/saml21-xplained/nsh/defconfig
@@ -46,10 +46,11 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -80,6 +81,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -98,6 +100,7 @@ CONFIG_ARCH_CHIP_SAML=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -119,11 +122,14 @@ CONFIG_ARCH_CORTEXM0=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv6-m"
 CONFIG_ARCH_CHIP="samdl"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 
 #
@@ -436,7 +442,12 @@ CONFIG_DEV_NULL=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -444,6 +455,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -455,6 +467,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -478,10 +492,6 @@ CONFIG_USART4_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -522,15 +532,18 @@ CONFIG_USART4_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -568,11 +581,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -635,11 +643,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -683,10 +694,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -696,17 +707,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -714,17 +725,16 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -746,8 +756,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -758,6 +768,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -869,12 +880,12 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -882,6 +893,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/samv71-xult/knsh/defconfig b/configs/samv71-xult/knsh/defconfig
index 9e6c099608..64d931ab93 100644
--- a/configs/samv71-xult/knsh/defconfig
+++ b/configs/samv71-xult/knsh/defconfig
@@ -51,10 +51,11 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -270,6 +271,13 @@ CONFIG_SAMV7_UART3=y
 # CONFIG_SAMV7_USART2 is not set
 # CONFIG_SAMV7_WDT is not set
 # CONFIG_SAMV7_RSWDT is not set
+# CONFIG_SAMV7_JTAG_DISABLE is not set
+CONFIG_SAMV7_JTAG_FULL_ENABLE=y
+# CONFIG_SAMV7_JTAG_FULL_SW_ENABLE is not set
+# CONFIG_SAMV7_JTAG_SW_ENABLE is not set
+# CONFIG_SAMV7_ERASE_DISABLE is not set
+CONFIG_SAMV7_ERASE_ENABLE=y
+# CONFIG_SAMV7_SYSTEMRESET is not set
 CONFIG_SAMV7_GPIO_IRQ=y
 CONFIG_SAMV7_GPIOA_IRQ=y
 CONFIG_SAMV7_GPIOB_IRQ=y
@@ -528,6 +536,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -543,7 +553,12 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -551,6 +566,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -595,12 +611,15 @@ CONFIG_MTD_AT25=y
 CONFIG_AT25_SPIMODE=0
 CONFIG_AT25_SPIFREQUENCY=20000000
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
+# CONFIG_MTD_N25QXXX is not set
 # CONFIG_MTD_SMART is not set
 # CONFIG_MTD_RAMTRON is not set
 # CONFIG_MTD_SST25 is not set
 # CONFIG_MTD_SST25XX is not set
+# CONFIG_MTD_SST26 is not set
 # CONFIG_MTD_SST39FV is not set
 # CONFIG_MTD_W25 is not set
 # CONFIG_EEPROM is not set
@@ -611,6 +630,8 @@ CONFIG_AT25_SPIFREQUENCY=20000000
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -634,10 +655,6 @@ CONFIG_UART3_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -664,15 +681,18 @@ CONFIG_UART3_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -726,11 +746,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_MTD is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -807,6 +822,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_USRWORK is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
@@ -837,9 +853,9 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
+# CONFIG_EXAMPLES_IGMP is not set
 # CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_KEYPADTEST is not set
-# CONFIG_EXAMPLES_IGMP is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -848,18 +864,18 @@ CONFIG_ARCH_HAVE_TLS=y
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -873,14 +889,15 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
+# CONFIG_FSUTILS_FLASH_ERASEALL is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_FSUTILS_PASSWD is not set
 
@@ -900,8 +917,8 @@ CONFIG_EXAMPLES_NSH=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -912,6 +929,7 @@ CONFIG_EXAMPLES_NSH=y
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -1025,11 +1043,11 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=0
 CONFIG_I2CTOOL_MAXBUS=0
@@ -1037,7 +1055,7 @@ CONFIG_I2CTOOL_MINADDR=0x03
 CONFIG_I2CTOOL_MAXADDR=0x77
 CONFIG_I2CTOOL_MAXREGADDR=0xff
 CONFIG_I2CTOOL_DEFFREQ=400000
-# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 CONFIG_SYSTEM_RAMTEST=y
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1045,6 +1063,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/samv71-xult/module/defconfig b/configs/samv71-xult/module/defconfig
index fc642b19b5..dcd165c2ae 100644
--- a/configs/samv71-xult/module/defconfig
+++ b/configs/samv71-xult/module/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -262,6 +263,13 @@ CONFIG_SAMV7_UART3=y
 # CONFIG_SAMV7_USART2 is not set
 # CONFIG_SAMV7_WDT is not set
 # CONFIG_SAMV7_RSWDT is not set
+# CONFIG_SAMV7_JTAG_DISABLE is not set
+CONFIG_SAMV7_JTAG_FULL_ENABLE=y
+# CONFIG_SAMV7_JTAG_FULL_SW_ENABLE is not set
+# CONFIG_SAMV7_JTAG_SW_ENABLE is not set
+# CONFIG_SAMV7_ERASE_DISABLE is not set
+CONFIG_SAMV7_ERASE_ENABLE=y
+# CONFIG_SAMV7_SYSTEMRESET is not set
 CONFIG_SAMV7_GPIO_IRQ=y
 CONFIG_SAMV7_GPIOA_IRQ=y
 CONFIG_SAMV7_GPIOB_IRQ=y
@@ -508,7 +516,12 @@ CONFIG_DEV_NULL=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -516,6 +529,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -527,6 +541,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -550,10 +566,6 @@ CONFIG_UART3_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -580,15 +592,18 @@ CONFIG_UART3_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -642,11 +657,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_MOUNTS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -723,6 +733,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -758,10 +769,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -775,17 +786,17 @@ CONFIG_EXAMPLES_MODULE_DEVPATH="/dev/ram0"
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_ROMFS is not set
@@ -794,19 +805,19 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_UNIONFS is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -830,8 +841,8 @@ CONFIG_EXAMPLES_NSH=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -842,6 +853,7 @@ CONFIG_EXAMPLES_NSH=y
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -958,12 +970,12 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -971,6 +983,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/samv71-xult/mxtxplnd/defconfig b/configs/samv71-xult/mxtxplnd/defconfig
index 0c62c6a03a..24970c51a2 100644
--- a/configs/samv71-xult/mxtxplnd/defconfig
+++ b/configs/samv71-xult/mxtxplnd/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -80,6 +81,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -98,6 +100,7 @@ CONFIG_ARCH="arm"
 CONFIG_ARCH_CHIP_SAMV7=y
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -119,6 +122,8 @@ CONFIG_ARCH_CORTEXM7=y
 # CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="samv7"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 CONFIG_ARMV7M_CMNVECTOR=y
@@ -127,6 +132,7 @@ CONFIG_ARCH_HAVE_FPU=y
 CONFIG_ARCH_HAVE_DPFPU=y
 CONFIG_ARCH_FPU=y
 CONFIG_ARCH_DPFPU=y
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
@@ -142,6 +148,7 @@ CONFIG_ARMV7M_HAVE_ITCM=y
 CONFIG_ARMV7M_HAVE_DTCM=y
 # CONFIG_ARMV7M_ITCM is not set
 # CONFIG_ARMV7M_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARW is not set
 # CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
 # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDW is not set
@@ -258,6 +265,13 @@ CONFIG_SAMV7_USART0=y
 # CONFIG_SAMV7_USART2 is not set
 # CONFIG_SAMV7_WDT is not set
 # CONFIG_SAMV7_RSWDT is not set
+# CONFIG_SAMV7_JTAG_DISABLE is not set
+CONFIG_SAMV7_JTAG_FULL_ENABLE=y
+# CONFIG_SAMV7_JTAG_FULL_SW_ENABLE is not set
+# CONFIG_SAMV7_JTAG_SW_ENABLE is not set
+# CONFIG_SAMV7_ERASE_DISABLE is not set
+CONFIG_SAMV7_ERASE_ENABLE=y
+# CONFIG_SAMV7_SYSTEMRESET is not set
 CONFIG_SAMV7_GPIO_IRQ=y
 CONFIG_SAMV7_GPIOA_IRQ=y
 CONFIG_SAMV7_GPIOB_IRQ=y
@@ -514,6 +528,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -540,10 +556,14 @@ CONFIG_MXT_THRESHY=8
 # CONFIG_DJOYSTICK is not set
 # CONFIG_AJOYSTICK is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 CONFIG_LCD=y
 
 #
-# Common LCD Settings
+# Common Graphic LCD Settings
 #
 # CONFIG_LCD_CONSOLE is not set
 # CONFIG_LCD_NOGETRUN is not set
@@ -572,11 +592,7 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_LCD_RLANDSCAPE is not set
 # CONFIG_LCD_ILI9341 is not set
 # CONFIG_LCD_RA8875 is not set
-
-#
-# Alphanumeric/Segment LCD Devices
-#
-# CONFIG_LCD_LCD1602 is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -584,6 +600,7 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -628,12 +645,15 @@ CONFIG_MTD_AT25=y
 CONFIG_AT25_SPIMODE=0
 CONFIG_AT25_SPIFREQUENCY=20000000
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
+# CONFIG_MTD_N25QXXX is not set
 # CONFIG_MTD_SMART is not set
 # CONFIG_MTD_RAMTRON is not set
 # CONFIG_MTD_SST25 is not set
 # CONFIG_MTD_SST25XX is not set
+# CONFIG_MTD_SST26 is not set
 # CONFIG_MTD_SST39FV is not set
 # CONFIG_MTD_W25 is not set
 # CONFIG_EEPROM is not set
@@ -644,6 +664,8 @@ CONFIG_AT25_SPIFREQUENCY=20000000
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -667,10 +689,6 @@ CONFIG_USART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -697,15 +715,18 @@ CONFIG_USART0_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -759,11 +780,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_MTD is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -772,6 +788,7 @@ CONFIG_NX_LCDDRIVER=y
 CONFIG_NX_NPLANES=1
 CONFIG_NX_BGCOLOR=0x0
 # CONFIG_NX_WRITEONLY is not set
+# CONFIG_NX_UPDATE is not set
 
 #
 # Supported Pixel Depths
@@ -916,12 +933,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 # CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -969,10 +989,10 @@ CONFIG_EXAMPLES_BUTTONS_NAME7="Button 7"
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_LCDRW is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
@@ -982,7 +1002,6 @@ CONFIG_EXAMPLES_BUTTONS_NAME7="Button 7"
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
@@ -994,12 +1013,13 @@ CONFIG_EXAMPLES_NXLINES_LINEWIDTH=16
 CONFIG_EXAMPLES_NXLINES_BORDERWIDTH=16
 CONFIG_EXAMPLES_NXLINES_BPP=16
 # CONFIG_EXAMPLES_NXLINES_EXTERNINIT is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1007,8 +1027,8 @@ CONFIG_EXAMPLES_NXLINES_BPP=16
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
@@ -1018,14 +1038,15 @@ CONFIG_EXAMPLES_TOUCHSCREEN_MINOR=0
 CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0"
 # CONFIG_EXAMPLES_TOUCHSCREEN_MOUSE is not set
 CONFIG_EXAMPLES_TOUCHSCREEN_ARCHINIT=y
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
+# CONFIG_FSUTILS_FLASH_ERASEALL is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_FSUTILS_PASSWD is not set
 
@@ -1045,8 +1066,8 @@ CONFIG_EXAMPLES_TOUCHSCREEN_ARCHINIT=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1057,6 +1078,7 @@ CONFIG_EXAMPLES_TOUCHSCREEN_ARCHINIT=y
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -1171,11 +1193,12 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FLASH_ERASEALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=0
 CONFIG_I2CTOOL_MAXBUS=0
@@ -1183,7 +1206,7 @@ CONFIG_I2CTOOL_MINADDR=0x03
 CONFIG_I2CTOOL_MAXADDR=0x77
 CONFIG_I2CTOOL_MAXREGADDR=0xff
 CONFIG_I2CTOOL_DEFFREQ=400000
-# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1191,6 +1214,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/samv71-xult/netnsh/defconfig b/configs/samv71-xult/netnsh/defconfig
index 0fdfc08e77..90595673e0 100644
--- a/configs/samv71-xult/netnsh/defconfig
+++ b/configs/samv71-xult/netnsh/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -544,6 +545,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -572,6 +575,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -616,6 +620,7 @@ CONFIG_MTD_AT25=y
 CONFIG_AT25_SPIMODE=0
 CONFIG_AT25_SPIFREQUENCY=20000000
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
 # CONFIG_MTD_N25QXXX is not set
@@ -677,6 +682,8 @@ CONFIG_ETH0_PHY_KSZ8061=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -726,15 +733,18 @@ CONFIG_UART3_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -901,11 +911,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_MTD is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -990,6 +995,7 @@ CONFIG_NETDB_DNSSERVER_IPv4ADDR=0x0a000001
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/samv71-xult/nsh/defconfig b/configs/samv71-xult/nsh/defconfig
index 123b0db98e..03913ee6a1 100644
--- a/configs/samv71-xult/nsh/defconfig
+++ b/configs/samv71-xult/nsh/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -264,6 +265,13 @@ CONFIG_SAMV7_UART3=y
 # CONFIG_SAMV7_USART2 is not set
 # CONFIG_SAMV7_WDT is not set
 # CONFIG_SAMV7_RSWDT is not set
+# CONFIG_SAMV7_JTAG_DISABLE is not set
+CONFIG_SAMV7_JTAG_FULL_ENABLE=y
+# CONFIG_SAMV7_JTAG_FULL_SW_ENABLE is not set
+# CONFIG_SAMV7_JTAG_SW_ENABLE is not set
+# CONFIG_SAMV7_ERASE_DISABLE is not set
+CONFIG_SAMV7_ERASE_ENABLE=y
+# CONFIG_SAMV7_SYSTEMRESET is not set
 CONFIG_SAMV7_GPIO_IRQ=y
 CONFIG_SAMV7_GPIOA_IRQ=y
 CONFIG_SAMV7_GPIOB_IRQ=y
@@ -521,6 +529,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -536,7 +546,12 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -544,6 +559,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -588,12 +604,15 @@ CONFIG_MTD_AT25=y
 CONFIG_AT25_SPIMODE=0
 CONFIG_AT25_SPIFREQUENCY=20000000
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
+# CONFIG_MTD_N25QXXX is not set
 # CONFIG_MTD_SMART is not set
 # CONFIG_MTD_RAMTRON is not set
 # CONFIG_MTD_SST25 is not set
 # CONFIG_MTD_SST25XX is not set
+# CONFIG_MTD_SST26 is not set
 # CONFIG_MTD_SST39FV is not set
 # CONFIG_MTD_W25 is not set
 # CONFIG_EEPROM is not set
@@ -604,6 +623,8 @@ CONFIG_AT25_SPIFREQUENCY=20000000
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -627,10 +648,6 @@ CONFIG_UART3_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -657,15 +674,18 @@ CONFIG_UART3_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -719,11 +739,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_MTD is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -799,6 +814,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -846,10 +862,10 @@ CONFIG_EXAMPLES_BUTTONS_NAME7="Button 7"
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -858,17 +874,17 @@ CONFIG_EXAMPLES_BUTTONS_NAME7="Button 7"
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -876,21 +892,22 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
+# CONFIG_FSUTILS_FLASH_ERASEALL is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_FSUTILS_PASSWD is not set
 
@@ -910,8 +927,8 @@ CONFIG_EXAMPLES_NSH=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -922,6 +939,7 @@ CONFIG_EXAMPLES_NSH=y
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -1036,11 +1054,12 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FLASH_ERASEALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=0
 CONFIG_I2CTOOL_MAXBUS=0
@@ -1048,7 +1067,7 @@ CONFIG_I2CTOOL_MINADDR=0x03
 CONFIG_I2CTOOL_MAXADDR=0x77
 CONFIG_I2CTOOL_MAXREGADDR=0xff
 CONFIG_I2CTOOL_DEFFREQ=400000
-# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 CONFIG_SYSTEM_RAMTEST=y
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1056,6 +1075,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/samv71-xult/nxwm/defconfig b/configs/samv71-xult/nxwm/defconfig
index ba5ff815e6..c6e14be293 100644
--- a/configs/samv71-xult/nxwm/defconfig
+++ b/configs/samv71-xult/nxwm/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -530,6 +531,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -600,6 +603,7 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -644,6 +648,7 @@ CONFIG_MTD_AT25=y
 CONFIG_AT25_SPIMODE=0
 CONFIG_AT25_SPIFREQUENCY=20000000
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
 # CONFIG_MTD_N25QXXX is not set
@@ -662,6 +667,8 @@ CONFIG_AT25_SPIFREQUENCY=20000000
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -711,15 +718,18 @@ CONFIG_USART0_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -764,11 +774,6 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -951,6 +956,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -995,10 +1001,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_LCDRW is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
@@ -1008,17 +1014,17 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1026,17 +1032,17 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1061,8 +1067,8 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1367,12 +1373,12 @@ CONFIG_NXWM_HEXCALCULATOR_FONTID=5
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=0
 CONFIG_I2CTOOL_MAXBUS=0
@@ -1380,7 +1386,7 @@ CONFIG_I2CTOOL_MINADDR=0x03
 CONFIG_I2CTOOL_MAXADDR=0x77
 CONFIG_I2CTOOL_MAXREGADDR=0xff
 CONFIG_I2CTOOL_DEFFREQ=400000
-# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1388,6 +1394,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/samv71-xult/vnc/defconfig b/configs/samv71-xult/vnc/defconfig
index bf5f14f78d..df447f54cf 100644
--- a/configs/samv71-xult/vnc/defconfig
+++ b/configs/samv71-xult/vnc/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -544,6 +545,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -572,6 +575,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -616,6 +620,7 @@ CONFIG_MTD_AT25=y
 CONFIG_AT25_SPIMODE=0
 CONFIG_AT25_SPIFREQUENCY=20000000
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
 # CONFIG_MTD_N25QXXX is not set
@@ -678,6 +683,8 @@ CONFIG_ETH0_PHY_KSZ8061=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -727,15 +734,18 @@ CONFIG_UART3_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -898,11 +908,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_MTD is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1082,6 +1087,7 @@ CONFIG_LIBC_NETDB=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/samv71-xult/vnxwm/defconfig b/configs/samv71-xult/vnxwm/defconfig
index 9a8d768422..f4327906b8 100644
--- a/configs/samv71-xult/vnxwm/defconfig
+++ b/configs/samv71-xult/vnxwm/defconfig
@@ -46,10 +46,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -547,6 +548,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -575,6 +578,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -619,6 +623,7 @@ CONFIG_MTD_AT25=y
 CONFIG_AT25_SPIMODE=0
 CONFIG_AT25_SPIFREQUENCY=20000000
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
 # CONFIG_MTD_N25QXXX is not set
@@ -681,6 +686,8 @@ CONFIG_ETH0_PHY_KSZ8061=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -730,15 +737,18 @@ CONFIG_UART3_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -901,11 +911,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_MTD is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1106,6 +1111,7 @@ CONFIG_LIBC_NETDB=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/shenzhou/nsh/defconfig b/configs/shenzhou/nsh/defconfig
index 67d1dfa078..af9e915439 100644
--- a/configs/shenzhou/nsh/defconfig
+++ b/configs/shenzhou/nsh/defconfig
@@ -42,10 +42,12 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -706,6 +708,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -738,6 +742,7 @@ CONFIG_RTC=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -801,6 +806,8 @@ CONFIG_ETH0_PHY_DM9161=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -850,15 +857,18 @@ CONFIG_USART2_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -1012,11 +1022,6 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1100,6 +1105,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/shenzhou/nxwm/defconfig b/configs/shenzhou/nxwm/defconfig
index ca29ac7cd2..dd76d669aa 100644
--- a/configs/shenzhou/nxwm/defconfig
+++ b/configs/shenzhou/nxwm/defconfig
@@ -46,10 +46,12 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -734,6 +736,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -812,6 +816,7 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -865,6 +870,8 @@ CONFIG_ETH0_PHY_DM9161=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -914,15 +921,18 @@ CONFIG_USART2_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -1068,11 +1078,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1262,6 +1267,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/shenzhou/thttpd/defconfig b/configs/shenzhou/thttpd/defconfig
index dc34d9d581..a1150884ef 100644
--- a/configs/shenzhou/thttpd/defconfig
+++ b/configs/shenzhou/thttpd/defconfig
@@ -42,9 +42,14 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 CONFIG_DEBUG_FEATURES=y
-CONFIG_ARCH_HAVE_HEAPCHECK=y
-# CONFIG_DEBUG_INFO is not set
+
+#
+# Debug SYSLOG Output Controls
+#
+# CONFIG_DEBUG_ERROR is not set
+# CONFIG_DEBUG_ASSERTIONS is not set
 
 #
 # Subsystem Debug Options
@@ -60,19 +65,19 @@ CONFIG_ARCH_HAVE_HEAPCHECK=y
 #
 # OS Function Debug Options
 #
-# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_IRQ is not set
 
 #
 # Driver Debug Options
 #
 # CONFIG_DEBUG_LEDS is not set
-# CONFIG_DEBUG_ANALOG is not set
 # CONFIG_DEBUG_GPIO is not set
 # CONFIG_DEBUG_RTC is not set
 # CONFIG_DEBUG_SPI is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -499,7 +504,6 @@ CONFIG_STM32_PHYSR_100FD=0x8000
 CONFIG_STM32_RMII=y
 CONFIG_STM32_RMII_MCO=y
 # CONFIG_STM32_RMII_EXTCLK is not set
-# CONFIG_STM32_ETHMAC_REGDEBUG is not set
 
 #
 # USB FS Host Configuration
@@ -734,6 +738,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -766,6 +772,7 @@ CONFIG_RTC=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 CONFIG_MTD=y
@@ -788,6 +795,7 @@ CONFIG_MTD=y
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT25 is not set
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
 # CONFIG_MTD_N25QXXX is not set
@@ -855,6 +863,8 @@ CONFIG_ETH0_PHY_DM9161=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -906,15 +916,18 @@ CONFIG_USART2_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -1013,7 +1026,6 @@ CONFIG_NET_ARPTAB_SIZE=16
 CONFIG_NET_ARP_MAXAGE=120
 # CONFIG_NET_ARP_IPIN is not set
 # CONFIG_NET_ARP_SEND is not set
-# CONFIG_NET_ARP_DUMP is not set
 
 #
 # Network I/O Buffer Support
@@ -1069,11 +1081,6 @@ CONFIG_FS_ROMFS=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1157,6 +1164,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/spark/composite/defconfig b/configs/spark/composite/defconfig
index 310439b762..1ef402810f 100644
--- a/configs/spark/composite/defconfig
+++ b/configs/spark/composite/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -199,6 +201,7 @@ CONFIG_ARCH_CHIP_STM32F103CB=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -407,6 +410,10 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_DMACAPABLE is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -418,10 +425,18 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
 # CONFIG_USART2_RXDMA is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -672,6 +687,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -688,7 +705,12 @@ CONFIG_ANALOG=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -696,6 +718,7 @@ CONFIG_ANALOG=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 CONFIG_MTD=y
@@ -718,6 +741,7 @@ CONFIG_MTD_BYTE_WRITE=y
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT25 is not set
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
 # CONFIG_MTD_N25QXXX is not set
@@ -743,6 +767,7 @@ CONFIG_SST25_SECTOR512=y
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
 CONFIG_SERIAL_REMOVABLE=y
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -877,15 +902,18 @@ CONFIG_CC3000_UNSOLICED_STACKSIZE=264
 # CONFIG_WL_NRF24L01 is not set
 # CONFIG_WL_PN532 is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -935,11 +963,6 @@ CONFIG_FS_FATTIME=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1015,6 +1038,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -1053,10 +1077,10 @@ CONFIG_EXAMPLES_CC3000BASIC=y
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -1066,17 +1090,17 @@ CONFIG_EXAMPLES_CC3000BASIC=y
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1084,21 +1108,22 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
+# CONFIG_FSUTILS_FLASH_ERASEALL is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_FSUTILS_PASSWD is not set
 
@@ -1118,8 +1143,8 @@ CONFIG_EXAMPLES_NSH=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1247,21 +1272,8 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_CLE is not set
-# CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_SYSTEM_HEXED is not set
-# CONFIG_SYSTEM_RAMTEST is not set
-CONFIG_READLINE_HAVE_EXTMATCH=y
-CONFIG_SYSTEM_READLINE=y
-CONFIG_READLINE_ECHO=y
-# CONFIG_READLINE_TABCOMPLETION is not set
-# CONFIG_READLINE_CMD_HISTORY is not set
-# CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_CDCACM is not set
+# CONFIG_SYSTEM_CLE is not set
 CONFIG_SYSTEM_COMPOSITE=y
 CONFIG_SYSTEM_COMPOSITE_NLUNS=1
 CONFIG_SYSTEM_COMPOSITE_DEVMINOR1=0
@@ -1279,7 +1291,21 @@ CONFIG_SYSTEM_COMPOSITE_BUFSIZE=256
 # CONFIG_SYSTEM_COMPOSITE_TRACECONTROLLER is not set
 # CONFIG_SYSTEM_COMPOSITE_TRACEINTERRUPTS is not set
 # CONFIG_SYSTEM_COMPOSITE_DEBUGMM is not set
+# CONFIG_SYSTEM_CUTERM is not set
+# CONFIG_SYSTEM_FLASH_ERASEALL is not set
+# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_RAMTEST is not set
+CONFIG_READLINE_HAVE_EXTMATCH=y
+CONFIG_SYSTEM_READLINE=y
+CONFIG_READLINE_ECHO=y
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
+# CONFIG_SYSTEM_SUDOKU is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
-# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_SYSTEM_USBMONITOR is not set
+# CONFIG_SYSTEM_USBMSC is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/spark/nsh/defconfig b/configs/spark/nsh/defconfig
index 037990ab7c..749fdc5e65 100644
--- a/configs/spark/nsh/defconfig
+++ b/configs/spark/nsh/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -199,6 +201,7 @@ CONFIG_ARCH_CHIP_STM32F103CB=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -407,6 +410,10 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_DMACAPABLE is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -418,10 +425,18 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
 # CONFIG_USART2_RXDMA is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -672,6 +687,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -688,7 +705,12 @@ CONFIG_ANALOG=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -696,6 +718,7 @@ CONFIG_ANALOG=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 CONFIG_MTD=y
@@ -718,6 +741,7 @@ CONFIG_MTD_BYTE_WRITE=y
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT25 is not set
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
 # CONFIG_MTD_N25QXXX is not set
@@ -743,6 +767,7 @@ CONFIG_SST25_SECTOR512=y
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
 CONFIG_SERIAL_REMOVABLE=y
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -877,15 +902,18 @@ CONFIG_CC3000_UNSOLICED_STACKSIZE=264
 # CONFIG_WL_NRF24L01 is not set
 # CONFIG_WL_PN532 is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -935,11 +963,6 @@ CONFIG_FS_FATTIME=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1015,6 +1038,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -1053,10 +1077,10 @@ CONFIG_EXAMPLES_CC3000BASIC=y
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -1066,17 +1090,17 @@ CONFIG_EXAMPLES_CC3000BASIC=y
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1084,21 +1108,22 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
+# CONFIG_FSUTILS_FLASH_ERASEALL is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_FSUTILS_PASSWD is not set
 
@@ -1118,8 +1143,8 @@ CONFIG_EXAMPLES_NSH=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1249,12 +1274,15 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_CDCACM is not set
 # CONFIG_SYSTEM_CLE is not set
+# CONFIG_SYSTEM_COMPOSITE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FLASH_ERASEALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1262,10 +1290,8 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
-# CONFIG_SYSTEM_CDCACM is not set
-# CONFIG_SYSTEM_COMPOSITE is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
-# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_SYSTEM_USBMONITOR is not set
+# CONFIG_SYSTEM_USBMSC is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/spark/usbmsc/defconfig b/configs/spark/usbmsc/defconfig
index 121e10b5b9..9e05a1f1b4 100644
--- a/configs/spark/usbmsc/defconfig
+++ b/configs/spark/usbmsc/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -199,6 +201,7 @@ CONFIG_ARCH_CHIP_STM32F103CB=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -407,6 +410,10 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_DMACAPABLE is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -418,10 +425,18 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
 # CONFIG_USART2_RXDMA is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -672,6 +687,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -688,7 +705,12 @@ CONFIG_ANALOG=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -696,6 +718,7 @@ CONFIG_ANALOG=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 CONFIG_MTD=y
@@ -718,6 +741,7 @@ CONFIG_MTD_BYTE_WRITE=y
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT25 is not set
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
 # CONFIG_MTD_N25QXXX is not set
@@ -742,6 +766,8 @@ CONFIG_SST25_SECTOR512=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -841,15 +867,18 @@ CONFIG_CC3000_UNSOLICED_STACKSIZE=264
 # CONFIG_WL_NRF24L01 is not set
 # CONFIG_WL_PN532 is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -899,11 +928,6 @@ CONFIG_FS_FATTIME=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -979,6 +1003,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -1017,10 +1042,10 @@ CONFIG_EXAMPLES_CC3000BASIC=y
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -1030,17 +1055,17 @@ CONFIG_EXAMPLES_CC3000BASIC=y
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1048,21 +1073,22 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
+# CONFIG_FSUTILS_FLASH_ERASEALL is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_FSUTILS_PASSWD is not set
 
@@ -1082,8 +1108,8 @@ CONFIG_EXAMPLES_NSH=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1212,12 +1238,13 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FLASH_ERASEALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1225,8 +1252,8 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_USBMONITOR is not set
 CONFIG_SYSTEM_USBMSC=y
 CONFIG_SYSTEM_USBMSC_NLUNS=1
 CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
@@ -1238,5 +1265,5 @@ CONFIG_SYSTEM_USBMSC_DEVPATH3="/dev/mmcsd2"
 # CONFIG_SYSTEM_USBMSC_DEBUGMM is not set
 CONFIG_SYSTEM_USBMSC_CMD_STACKSIZE=768
 CONFIG_SYSTEM_USBMSC_CMD_PRIORITY=100
-# CONFIG_SYSTEM_USBMONITOR is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/spark/usbnsh/defconfig b/configs/spark/usbnsh/defconfig
index 2d4a963b66..1316e8034d 100644
--- a/configs/spark/usbnsh/defconfig
+++ b/configs/spark/usbnsh/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -199,6 +201,7 @@ CONFIG_ARCH_CHIP_STM32F103CB=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -407,6 +410,10 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_DMACAPABLE is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -418,10 +425,18 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
 # CONFIG_USART2_RXDMA is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -675,6 +690,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -689,7 +706,12 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -697,6 +719,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 CONFIG_MTD=y
@@ -719,6 +742,7 @@ CONFIG_MTD_BYTE_WRITE=y
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT25 is not set
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
 # CONFIG_MTD_N25QXXX is not set
@@ -743,6 +767,7 @@ CONFIG_SST25_SPIFREQUENCY=20000000
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_SERIAL_REMOVABLE=y
+# CONFIG_SERIAL_CONSOLE is not set
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -834,14 +859,17 @@ CONFIG_CDCACM_PRODUCTSTR="CDC/ACM Serial"
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_NONE=y
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -885,11 +913,6 @@ CONFIG_FS_FAT=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -965,6 +988,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -999,10 +1023,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -1011,17 +1035,17 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1029,21 +1053,22 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
+# CONFIG_FSUTILS_FLASH_ERASEALL is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_FSUTILS_PASSWD is not set
 
@@ -1063,8 +1088,8 @@ CONFIG_EXAMPLES_NSH=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1195,12 +1220,14 @@ CONFIG_USBDEV_MINOR=0
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_CDCACM is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FLASH_ERASEALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1208,8 +1235,7 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
-# CONFIG_SYSTEM_CDCACM is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_USBMONITOR is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/spark/usbserial/defconfig b/configs/spark/usbserial/defconfig
index 35279b3dbc..76625f70fa 100644
--- a/configs/spark/usbserial/defconfig
+++ b/configs/spark/usbserial/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -199,6 +201,7 @@ CONFIG_ARCH_CHIP_STM32F103CB=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -407,6 +410,10 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_DMACAPABLE is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -418,10 +425,18 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
 # CONFIG_USART2_RXDMA is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -676,6 +691,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -692,7 +709,12 @@ CONFIG_ANALOG=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -700,6 +722,7 @@ CONFIG_ANALOG=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 CONFIG_MTD=y
@@ -722,6 +745,7 @@ CONFIG_MTD_BYTE_WRITE=y
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT25 is not set
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
 # CONFIG_MTD_N25QXXX is not set
@@ -747,6 +771,7 @@ CONFIG_SST25_SECTOR512=y
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
 CONFIG_SERIAL_REMOVABLE=y
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -851,15 +876,18 @@ CONFIG_CC3000_PROBES=y
 # CONFIG_WL_NRF24L01 is not set
 # CONFIG_WL_PN532 is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -909,11 +937,6 @@ CONFIG_FS_FATTIME=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -989,6 +1012,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -1027,10 +1051,10 @@ CONFIG_EXAMPLES_CC3000BASIC=y
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -1040,18 +1064,18 @@ CONFIG_EXAMPLES_CC3000BASIC=y
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1065,7 +1089,6 @@ CONFIG_EXAMPLES_CC3000BASIC=y
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 CONFIG_EXAMPLES_USBSERIAL=y
 CONFIG_EXAMPLES_USBSERIAL_BUFSIZE=512
 CONFIG_EXAMPLES_USBSERIAL_TRACEINIT=y
@@ -1075,10 +1098,12 @@ CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=y
 CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=y
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
+# CONFIG_FSUTILS_FLASH_ERASEALL is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_FSUTILS_PASSWD is not set
 
@@ -1098,8 +1123,8 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1132,18 +1157,18 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_CDCACM is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
-# CONFIG_SYSTEM_CDCACM is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_USBMONITOR is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm3210e-eval/buttons/defconfig b/configs/stm3210e-eval/buttons/defconfig
index afc30ec09b..6253cf2193 100644
--- a/configs/stm3210e-eval/buttons/defconfig
+++ b/configs/stm3210e-eval/buttons/defconfig
@@ -46,10 +46,12 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -207,6 +209,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 CONFIG_ARCH_CHIP_STM32F103ZE=y
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -418,6 +421,10 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_FSMC_SRAM is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -429,12 +436,20 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
 CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -667,7 +682,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -675,6 +695,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -686,6 +707,8 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -748,15 +771,18 @@ CONFIG_USART2_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -786,11 +812,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -860,6 +881,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -901,10 +923,10 @@ CONFIG_EXAMPLES_BUTTONS_NAME7="UP"
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -913,18 +935,18 @@ CONFIG_EXAMPLES_BUTTONS_NAME7="UP"
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -938,9 +960,9 @@ CONFIG_EXAMPLES_BUTTONS_NAME7="UP"
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -962,8 +984,8 @@ CONFIG_EXAMPLES_BUTTONS_NAME7="UP"
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -996,16 +1018,16 @@ CONFIG_EXAMPLES_BUTTONS_NAME7="UP"
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm3210e-eval/composite/defconfig b/configs/stm3210e-eval/composite/defconfig
index 4062ccbfff..fa4db610c0 100644
--- a/configs/stm3210e-eval/composite/defconfig
+++ b/configs/stm3210e-eval/composite/defconfig
@@ -46,10 +46,12 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -209,6 +211,7 @@ CONFIG_SDIO_DMA=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 CONFIG_ARCH_CHIP_STM32F103ZE=y
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -421,6 +424,10 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_DMACAPABLE is not set
 # CONFIG_STM32_FSMC_SRAM is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -432,12 +439,20 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
 CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -700,7 +715,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -708,6 +728,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -742,6 +763,7 @@ CONFIG_MTD=y
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT25 is not set
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
 # CONFIG_MTD_N25QXXX is not set
@@ -761,6 +783,7 @@ CONFIG_MTD=y
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
 CONFIG_SERIAL_REMOVABLE=y
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -894,15 +917,18 @@ CONFIG_USBMSC_SCSI_STACKSIZE=2048
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -939,11 +965,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1019,6 +1040,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -1048,10 +1070,10 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -1060,18 +1082,18 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1085,14 +1107,15 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
+# CONFIG_FSUTILS_FLASH_ERASEALL is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_FSUTILS_PASSWD is not set
 
@@ -1112,8 +1135,8 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1146,18 +1169,8 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_CLE is not set
-# CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_SYSTEM_HEXED is not set
-# CONFIG_SYSTEM_RAMTEST is not set
-# CONFIG_READLINE_HAVE_EXTMATCH is not set
-# CONFIG_SYSTEM_READLINE is not set
-# CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_CDCACM is not set
+# CONFIG_SYSTEM_CLE is not set
 CONFIG_SYSTEM_COMPOSITE=y
 CONFIG_SYSTEM_COMPOSITE_NLUNS=1
 CONFIG_SYSTEM_COMPOSITE_DEVMINOR1=0
@@ -1170,6 +1183,16 @@ CONFIG_SYSTEM_COMPOSITE_TTYUSB=0
 CONFIG_SYSTEM_COMPOSITE_SERDEV="/dev/ttyACM0"
 CONFIG_SYSTEM_COMPOSITE_BUFSIZE=256
 # CONFIG_SYSTEM_COMPOSITE_DEBUGMM is not set
+# CONFIG_SYSTEM_CUTERM is not set
+# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_RAMTEST is not set
+# CONFIG_READLINE_HAVE_EXTMATCH is not set
+# CONFIG_SYSTEM_READLINE is not set
+# CONFIG_SYSTEM_SUDOKU is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_USBMSC is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm3210e-eval/nsh/defconfig b/configs/stm3210e-eval/nsh/defconfig
index c3526b15ff..fc951bb2b6 100644
--- a/configs/stm3210e-eval/nsh/defconfig
+++ b/configs/stm3210e-eval/nsh/defconfig
@@ -46,10 +46,12 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -210,6 +212,7 @@ CONFIG_SDIO_DMA=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 CONFIG_ARCH_CHIP_STM32F103ZE=y
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -422,6 +425,10 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_DMACAPABLE is not set
 # CONFIG_STM32_FSMC_SRAM is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -433,12 +440,20 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
 CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -703,7 +718,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -711,6 +731,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -745,6 +766,7 @@ CONFIG_MTD=y
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT25 is not set
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
 # CONFIG_MTD_N25QXXX is not set
@@ -763,6 +785,8 @@ CONFIG_MTD=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -846,15 +870,18 @@ CONFIG_USBDEV_MAXPOWER=100
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -897,11 +924,6 @@ CONFIG_FAT_LCNAMES=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -977,6 +999,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -1006,10 +1029,10 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -1018,18 +1041,18 @@ CONFIG_ARCH_HAVE_TLS=y
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1043,14 +1066,15 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
+# CONFIG_FSUTILS_FLASH_ERASEALL is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_FSUTILS_PASSWD is not set
 
@@ -1070,8 +1094,8 @@ CONFIG_EXAMPLES_NSH=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1195,12 +1219,12 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1208,6 +1232,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm3210e-eval/nsh2/defconfig b/configs/stm3210e-eval/nsh2/defconfig
index 94d06efad5..e5f10041dd 100644
--- a/configs/stm3210e-eval/nsh2/defconfig
+++ b/configs/stm3210e-eval/nsh2/defconfig
@@ -46,10 +46,12 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -209,6 +211,7 @@ CONFIG_SDIO_DMA=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 CONFIG_ARCH_CHIP_STM32F103ZE=y
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -423,6 +426,10 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_DMACAPABLE is not set
 # CONFIG_STM32_FSMC_SRAM is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -434,12 +441,20 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
 CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -725,10 +740,14 @@ CONFIG_I2C_DRIVER=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 CONFIG_LCD=y
 
 #
-# Common LCD Settings
+# Common Graphic LCD Settings
 #
 # CONFIG_LCD_CONSOLE is not set
 CONFIG_LCD_NOGETRUN=y
@@ -756,12 +775,7 @@ CONFIG_LCD_RPORTRAIT=y
 # CONFIG_LCD_RLANDSCAPE is not set
 # CONFIG_LCD_ILI9341 is not set
 # CONFIG_LCD_RA8875 is not set
-
-#
-# Alphanumeric/Segment LCD Devices
-#
-# CONFIG_LCD_LCD1602 is not set
-# CONFIG_LCD_BACKPACK is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -769,6 +783,7 @@ CONFIG_LCD_RPORTRAIT=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -803,6 +818,7 @@ CONFIG_MTD=y
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT25 is not set
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
 # CONFIG_MTD_N25QXXX is not set
@@ -821,6 +837,8 @@ CONFIG_MTD=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -919,15 +937,18 @@ CONFIG_USBMSC_SCSI_STACKSIZE=2048
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -972,11 +993,6 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1141,6 +1157,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -1175,10 +1192,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_LCDRW is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
@@ -1202,7 +1219,6 @@ CONFIG_EXAMPLES_NX_BPP=16
 # CONFIG_EXAMPLES_NX_RAWWINDOWS is not set
 CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 # CONFIG_EXAMPLES_NX_EXTERNINIT is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 CONFIG_EXAMPLES_NXHELLO=y
 CONFIG_EXAMPLES_NXHELLO_VPLANE=0
@@ -1224,12 +1240,13 @@ CONFIG_EXAMPLES_NXHELLO_FONTID=6
 # CONFIG_EXAMPLES_NXHELLO_EXTERNINIT is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1237,21 +1254,22 @@ CONFIG_EXAMPLES_NXHELLO_FONTID=6
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
+# CONFIG_FSUTILS_FLASH_ERASEALL is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_FSUTILS_PASSWD is not set
 
@@ -1271,8 +1289,8 @@ CONFIG_EXAMPLES_NXHELLO_FONTID=6
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1397,11 +1415,12 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FLASH_ERASEALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=1
 CONFIG_I2CTOOL_MAXBUS=2
@@ -1409,7 +1428,7 @@ CONFIG_I2CTOOL_MINADDR=0x03
 CONFIG_I2CTOOL_MAXADDR=0x77
 CONFIG_I2CTOOL_MAXREGADDR=0xff
 CONFIG_I2CTOOL_DEFFREQ=100000
-# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1417,7 +1436,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
 CONFIG_SYSTEM_USBMSC=y
 CONFIG_SYSTEM_USBMSC_NLUNS=1
@@ -1430,4 +1448,5 @@ CONFIG_SYSTEM_USBMSC_DEVPATH3="/dev/mmcsd2"
 # CONFIG_SYSTEM_USBMSC_DEBUGMM is not set
 CONFIG_SYSTEM_USBMSC_CMD_STACKSIZE=768
 CONFIG_SYSTEM_USBMSC_CMD_PRIORITY=100
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm3210e-eval/nx/defconfig b/configs/stm3210e-eval/nx/defconfig
index d4283c715a..451e9024a9 100644
--- a/configs/stm3210e-eval/nx/defconfig
+++ b/configs/stm3210e-eval/nx/defconfig
@@ -46,10 +46,12 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -207,6 +209,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 CONFIG_ARCH_CHIP_STM32F103ZE=y
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -421,6 +424,10 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_DMACAPABLE is not set
 # CONFIG_STM32_FSMC_SRAM is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -432,12 +439,20 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
 CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -702,10 +717,14 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 CONFIG_LCD=y
 
 #
-# Common LCD Settings
+# Common Graphic LCD Settings
 #
 # CONFIG_LCD_CONSOLE is not set
 CONFIG_LCD_NOGETRUN=y
@@ -733,11 +752,7 @@ CONFIG_LCD_RPORTRAIT=y
 # CONFIG_LCD_RLANDSCAPE is not set
 # CONFIG_LCD_ILI9341 is not set
 # CONFIG_LCD_RA8875 is not set
-
-#
-# Alphanumeric/Segment LCD Devices
-#
-# CONFIG_LCD_LCD1602 is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -745,6 +760,7 @@ CONFIG_LCD_RPORTRAIT=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -756,6 +772,8 @@ CONFIG_LCD_RPORTRAIT=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -838,15 +856,18 @@ CONFIG_USBDEV_MAXPOWER=100
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -877,11 +898,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1040,6 +1056,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -1068,10 +1085,10 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_LCDRW is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
@@ -1094,18 +1111,18 @@ CONFIG_EXAMPLES_NX_FONTID=0
 CONFIG_EXAMPLES_NX_BPP=16
 # CONFIG_EXAMPLES_NX_RAWWINDOWS is not set
 CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1119,9 +1136,9 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1143,8 +1160,8 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1177,16 +1194,16 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm3210e-eval/nxterm/defconfig b/configs/stm3210e-eval/nxterm/defconfig
index 9c371098f4..02bf3d366a 100644
--- a/configs/stm3210e-eval/nxterm/defconfig
+++ b/configs/stm3210e-eval/nxterm/defconfig
@@ -46,10 +46,12 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -207,6 +209,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 CONFIG_ARCH_CHIP_STM32F103ZE=y
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -419,6 +422,10 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_DMACAPABLE is not set
 # CONFIG_STM32_FSMC_SRAM is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -430,12 +437,20 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
 CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -698,10 +713,14 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 CONFIG_LCD=y
 
 #
-# Common LCD Settings
+# Common Graphic LCD Settings
 #
 # CONFIG_LCD_CONSOLE is not set
 CONFIG_LCD_NOGETRUN=y
@@ -729,11 +748,7 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_LCD_RLANDSCAPE is not set
 # CONFIG_LCD_ILI9341 is not set
 # CONFIG_LCD_RA8875 is not set
-
-#
-# Alphanumeric/Segment LCD Devices
-#
-# CONFIG_LCD_LCD1602 is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -741,6 +756,7 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -752,6 +768,8 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -815,15 +833,18 @@ CONFIG_USART2_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -861,11 +882,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1048,6 +1064,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -1081,10 +1098,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_LCDRW is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
@@ -1094,17 +1111,17 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-CONFIG_EXAMPLES_NXTERM=y
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+CONFIG_EXAMPLES_NXTERM=y
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1112,17 +1129,17 @@ CONFIG_EXAMPLES_NXTERM=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1144,8 +1161,8 @@ CONFIG_EXAMPLES_NXTERM=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1269,12 +1286,12 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1282,6 +1299,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm3210e-eval/pm/defconfig b/configs/stm3210e-eval/pm/defconfig
index c09cc4ccff..b23c795374 100644
--- a/configs/stm3210e-eval/pm/defconfig
+++ b/configs/stm3210e-eval/pm/defconfig
@@ -46,10 +46,12 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -207,6 +209,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 CONFIG_ARCH_CHIP_STM32F103ZE=y
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -421,6 +424,10 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_FSMC_SRAM is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_PWM is not set
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
@@ -433,12 +440,20 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
 CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -722,10 +737,14 @@ CONFIG_RTC_NALARMS=1
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 CONFIG_LCD=y
 
 #
-# Common LCD Settings
+# Common Graphic LCD Settings
 #
 # CONFIG_LCD_CONSOLE is not set
 CONFIG_LCD_NOGETRUN=y
@@ -753,11 +772,7 @@ CONFIG_LCD_RPORTRAIT=y
 # CONFIG_LCD_RLANDSCAPE is not set
 # CONFIG_LCD_ILI9341 is not set
 # CONFIG_LCD_RA8875 is not set
-
-#
-# Alphanumeric/Segment LCD Devices
-#
-# CONFIG_LCD_LCD1602 is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -765,6 +780,7 @@ CONFIG_LCD_RPORTRAIT=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -794,6 +810,8 @@ CONFIG_PM_SLEEPENTER_COUNT=70
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -857,15 +875,18 @@ CONFIG_USART2_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -903,11 +924,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1069,6 +1085,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -1103,10 +1120,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_LCDRW is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
@@ -1130,7 +1147,6 @@ CONFIG_EXAMPLES_NX_BPP=16
 # CONFIG_EXAMPLES_NX_RAWWINDOWS is not set
 CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 # CONFIG_EXAMPLES_NX_EXTERNINIT is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 CONFIG_EXAMPLES_NXHELLO=y
 CONFIG_EXAMPLES_NXHELLO_VPLANE=0
@@ -1152,12 +1168,13 @@ CONFIG_EXAMPLES_NXHELLO_FONTID=6
 # CONFIG_EXAMPLES_NXHELLO_EXTERNINIT is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1165,17 +1182,17 @@ CONFIG_EXAMPLES_NXHELLO_FONTID=6
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1197,8 +1214,8 @@ CONFIG_EXAMPLES_NXHELLO_FONTID=6
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1322,12 +1339,12 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1335,6 +1352,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm3210e-eval/usbmsc/defconfig b/configs/stm3210e-eval/usbmsc/defconfig
index 9896e04519..4914b222ed 100644
--- a/configs/stm3210e-eval/usbmsc/defconfig
+++ b/configs/stm3210e-eval/usbmsc/defconfig
@@ -42,10 +42,12 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -202,6 +204,7 @@ CONFIG_SDIO_DMA=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 CONFIG_ARCH_CHIP_STM32F103ZE=y
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -414,6 +417,10 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_DMACAPABLE is not set
 # CONFIG_STM32_FSMC_SRAM is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -425,12 +432,20 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
 CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -693,7 +708,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -701,6 +721,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -724,6 +745,8 @@ CONFIG_SDIO_PREFLIGHT=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -822,15 +845,18 @@ CONFIG_USBMSC_SCSI_STACKSIZE=2048
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -867,11 +893,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -947,6 +968,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -976,10 +998,10 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -988,18 +1010,18 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1013,10 +1035,10 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1040,8 +1062,8 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1074,17 +1096,16 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
 CONFIG_SYSTEM_USBMSC=y
 CONFIG_SYSTEM_USBMSC_NLUNS=1
@@ -1095,4 +1116,5 @@ CONFIG_SYSTEM_USBMSC_DEVPATH2="/dev/mmcsd1"
 CONFIG_SYSTEM_USBMSC_DEVMINOR3=2
 CONFIG_SYSTEM_USBMSC_DEVPATH3="/dev/mmcsd2"
 # CONFIG_SYSTEM_USBMSC_DEBUGMM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm3210e-eval/usbserial/defconfig b/configs/stm3210e-eval/usbserial/defconfig
index 6e81763397..f8223e3a14 100644
--- a/configs/stm3210e-eval/usbserial/defconfig
+++ b/configs/stm3210e-eval/usbserial/defconfig
@@ -42,10 +42,12 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -200,6 +202,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 CONFIG_ARCH_CHIP_STM32F103ZE=y
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -411,6 +414,10 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_FSMC_SRAM is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -422,12 +429,20 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
 CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -680,7 +695,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -688,6 +708,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -700,6 +721,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
 CONFIG_SERIAL_REMOVABLE=y
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -797,15 +819,18 @@ CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -836,11 +861,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -913,6 +933,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -941,10 +962,10 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -953,18 +974,18 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -978,11 +999,11 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 CONFIG_EXAMPLES_USBSERIAL=y
 CONFIG_EXAMPLES_USBSERIAL_BUFSIZE=512
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1004,8 +1025,8 @@ CONFIG_EXAMPLES_USBSERIAL_BUFSIZE=512
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1038,16 +1059,16 @@ CONFIG_EXAMPLES_USBSERIAL_BUFSIZE=512
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm3220g-eval/dhcpd/defconfig b/configs/stm3220g-eval/dhcpd/defconfig
index 805beb4172..0d999829ee 100644
--- a/configs/stm3220g-eval/dhcpd/defconfig
+++ b/configs/stm3220g-eval/dhcpd/defconfig
@@ -46,10 +46,12 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -207,6 +209,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 CONFIG_ARCH_CHIP_STM32F207IG=y
@@ -432,6 +435,10 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 # CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG is not set
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -449,9 +456,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART3_SERIALDRIVER=y
 # CONFIG_STM32_USART3_1WIREDRIVER is not set
 # CONFIG_USART3_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -696,7 +711,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -704,6 +724,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -754,6 +775,8 @@ CONFIG_ETH0_PHY_DP83848C=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -803,15 +826,18 @@ CONFIG_USART3_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -939,11 +965,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1014,6 +1035,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -1050,15 +1072,16 @@ CONFIG_EXAMPLES_DHCPD_NOMAC=y
 CONFIG_EXAMPLES_DHCPD_IPADDR=0x0a000001
 CONFIG_EXAMPLES_DHCPD_DRIPADDR=0x0a000001
 CONFIG_EXAMPLES_DHCPD_NETMASK=0xffffff00
+# CONFIG_EXAMPLES_DISCOVER is not set
 # CONFIG_EXAMPLES_ELF is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -1067,18 +1090,18 @@ CONFIG_EXAMPLES_DHCPD_NETMASK=0xffffff00
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1094,10 +1117,9 @@ CONFIG_EXAMPLES_DHCPD_NETMASK=0xffffff00
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UDPBLASTER is not set
-# CONFIG_EXAMPLES_DISCOVER is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1119,8 +1141,8 @@ CONFIG_EXAMPLES_DHCPD_NETMASK=0xffffff00
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1145,15 +1167,15 @@ CONFIG_NETUTILS_DHCPD_NETMASK=0xffffff00
 CONFIG_NETUTILS_DHCPD_DNSIP=0x08080808
 CONFIG_NETUTILS_DHCPD_OFFERTIME=3600
 CONFIG_NETUTILS_DHCPD_DECLINETIME=3600
+# CONFIG_NETUTILS_DISCOVER is not set
 # CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_TFTPC is not set
 CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_NTPCLIENT is not set
-# CONFIG_NETUTILS_DISCOVER is not set
 # CONFIG_NETUTILS_PPPD is not set
+# CONFIG_NETUTILS_SMTP is not set
+# CONFIG_NETUTILS_TFTPC is not set
 
 #
 # NSH Library
@@ -1172,16 +1194,16 @@ CONFIG_NETUTILS_NETLIB=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm3220g-eval/nettest/defconfig b/configs/stm3220g-eval/nettest/defconfig
index 17436141d6..061c77ea53 100644
--- a/configs/stm3220g-eval/nettest/defconfig
+++ b/configs/stm3220g-eval/nettest/defconfig
@@ -46,10 +46,12 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -207,6 +209,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 CONFIG_ARCH_CHIP_STM32F207IG=y
@@ -432,6 +435,10 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 # CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG is not set
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -449,9 +456,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART3_SERIALDRIVER=y
 # CONFIG_STM32_USART3_1WIREDRIVER is not set
 # CONFIG_USART3_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -696,7 +711,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -704,6 +724,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -755,6 +776,8 @@ CONFIG_ETH0_PHY_DP83848C=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -803,15 +826,18 @@ CONFIG_USART3_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -944,11 +970,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1018,6 +1039,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -1055,10 +1077,10 @@ CONFIG_HAVE_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -1081,18 +1103,18 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1106,9 +1128,9 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_WGET is not set
 
 #
@@ -1131,8 +1153,8 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1146,9 +1168,9 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TELNETD is not set
-CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
@@ -1170,16 +1192,16 @@ CONFIG_NETUTILS_NETLIB=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm3220g-eval/nsh/defconfig b/configs/stm3220g-eval/nsh/defconfig
index 001e8d6d00..fd7610f652 100644
--- a/configs/stm3220g-eval/nsh/defconfig
+++ b/configs/stm3220g-eval/nsh/defconfig
@@ -42,10 +42,12 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -752,6 +754,7 @@ CONFIG_RTC_DATETIME=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -781,6 +784,7 @@ CONFIG_MTD=y
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT25 is not set
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
 # CONFIG_MTD_N25QXXX is not set
@@ -839,6 +843,8 @@ CONFIG_ETH0_PHY_DP83848C=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -888,15 +894,18 @@ CONFIG_USART3_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -1050,11 +1059,6 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1139,6 +1143,7 @@ CONFIG_NETDB_DNSSERVER_IPv4ADDR=0x0a000001
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/stm3220g-eval/nsh2/defconfig b/configs/stm3220g-eval/nsh2/defconfig
index 997630da9e..263355865c 100644
--- a/configs/stm3220g-eval/nsh2/defconfig
+++ b/configs/stm3220g-eval/nsh2/defconfig
@@ -46,10 +46,12 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -758,6 +760,7 @@ CONFIG_RTC_DATETIME=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -792,6 +795,7 @@ CONFIG_MTD=y
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT25 is not set
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
 # CONFIG_MTD_N25QXXX is not set
@@ -851,6 +855,8 @@ CONFIG_ETH0_PHY_DP83848C=y
 # CONFIG_SENSORS is not set
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
+# CONFIG_SERIAL_REMOVABLE is not set
+# CONFIG_SERIAL_CONSOLE is not set
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -884,19 +890,22 @@ CONFIG_SERIAL=y
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 CONFIG_RAMLOG=y
-CONFIG_RAMLOG_SYSLOG=y
 CONFIG_RAMLOG_BUFSIZE=1024
 # CONFIG_RAMLOG_CRLF is not set
 CONFIG_RAMLOG_NONBLOCKING=y
 CONFIG_RAMLOG_NPOLLWAITERS=4
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_RAMLOG_SYSLOG=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -1050,12 +1059,6 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-# CONFIG_SYSLOG_CHAR is not set
-
 #
 # Graphics Support
 #
@@ -1139,6 +1142,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/stm3220g-eval/nxwm/defconfig b/configs/stm3220g-eval/nxwm/defconfig
index 7e3f42c3ba..1ab3afe832 100644
--- a/configs/stm3220g-eval/nxwm/defconfig
+++ b/configs/stm3220g-eval/nxwm/defconfig
@@ -46,10 +46,12 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -829,6 +831,7 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -889,6 +892,8 @@ CONFIG_ETH0_PHY_DP83848C=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -938,15 +943,18 @@ CONFIG_USART3_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -1099,11 +1107,6 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1290,6 +1293,7 @@ CONFIG_LIBC_NETDB=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/stm3220g-eval/telnetd/defconfig b/configs/stm3220g-eval/telnetd/defconfig
index 47f800f319..9e57584d8e 100644
--- a/configs/stm3220g-eval/telnetd/defconfig
+++ b/configs/stm3220g-eval/telnetd/defconfig
@@ -46,10 +46,12 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -207,6 +209,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 CONFIG_ARCH_CHIP_STM32F207IG=y
@@ -432,6 +435,10 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 # CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG is not set
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -449,9 +456,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART3_SERIALDRIVER=y
 # CONFIG_STM32_USART3_1WIREDRIVER is not set
 # CONFIG_USART3_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -696,7 +711,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -704,6 +724,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -757,6 +778,8 @@ CONFIG_ETH0_PHY_DP83848C=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -805,15 +828,18 @@ CONFIG_USART3_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -946,11 +972,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1020,6 +1041,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -1057,10 +1079,10 @@ CONFIG_HAVE_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -1070,18 +1092,18 @@ CONFIG_HAVE_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1103,9 +1125,9 @@ CONFIG_EXAMPLES_TELNETD_CLIENTPRIO=128
 CONFIG_EXAMPLES_TELNETD_CLIENTSTACKSIZE=2048
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_WGET is not set
 
 #
@@ -1128,8 +1150,8 @@ CONFIG_EXAMPLES_TELNETD_CLIENTSTACKSIZE=2048
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1143,9 +1165,9 @@ CONFIG_EXAMPLES_TELNETD_CLIENTSTACKSIZE=2048
 # CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_SMTP is not set
 CONFIG_NETUTILS_TELNETD=y
-CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
@@ -1167,16 +1189,16 @@ CONFIG_NETUTILS_NETLIB=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm3240g-eval/dhcpd/defconfig b/configs/stm3240g-eval/dhcpd/defconfig
index 34dae8ea1d..368ea6cf04 100644
--- a/configs/stm3240g-eval/dhcpd/defconfig
+++ b/configs/stm3240g-eval/dhcpd/defconfig
@@ -46,10 +46,12 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -208,6 +210,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -435,6 +438,10 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_CCMEXCLUDE is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM2_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
@@ -453,9 +460,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART3_SERIALDRIVER=y
 # CONFIG_STM32_USART3_1WIREDRIVER is not set
 # CONFIG_USART3_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -700,7 +715,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -708,6 +728,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -758,6 +779,8 @@ CONFIG_ETH0_PHY_DP83848C=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -807,15 +830,18 @@ CONFIG_USART3_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -943,11 +969,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1018,6 +1039,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -1054,15 +1076,16 @@ CONFIG_EXAMPLES_DHCPD_NOMAC=y
 CONFIG_EXAMPLES_DHCPD_IPADDR=0x0a000001
 CONFIG_EXAMPLES_DHCPD_DRIPADDR=0x0a000001
 CONFIG_EXAMPLES_DHCPD_NETMASK=0xffffff00
+# CONFIG_EXAMPLES_DISCOVER is not set
 # CONFIG_EXAMPLES_ELF is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -1071,18 +1094,18 @@ CONFIG_EXAMPLES_DHCPD_NETMASK=0xffffff00
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1098,10 +1121,9 @@ CONFIG_EXAMPLES_DHCPD_NETMASK=0xffffff00
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UDPBLASTER is not set
-# CONFIG_EXAMPLES_DISCOVER is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1123,8 +1145,8 @@ CONFIG_EXAMPLES_DHCPD_NETMASK=0xffffff00
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1149,15 +1171,15 @@ CONFIG_NETUTILS_DHCPD_NETMASK=0xffffff00
 CONFIG_NETUTILS_DHCPD_DNSIP=0x08080808
 CONFIG_NETUTILS_DHCPD_OFFERTIME=3600
 CONFIG_NETUTILS_DHCPD_DECLINETIME=3600
+# CONFIG_NETUTILS_DISCOVER is not set
 # CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_TFTPC is not set
 CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_NTPCLIENT is not set
-# CONFIG_NETUTILS_DISCOVER is not set
 # CONFIG_NETUTILS_PPPD is not set
+# CONFIG_NETUTILS_SMTP is not set
+# CONFIG_NETUTILS_TFTPC is not set
 
 #
 # NSH Library
@@ -1176,16 +1198,16 @@ CONFIG_NETUTILS_NETLIB=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm3240g-eval/discover/defconfig b/configs/stm3240g-eval/discover/defconfig
index bb3e492924..a6948166b7 100644
--- a/configs/stm3240g-eval/discover/defconfig
+++ b/configs/stm3240g-eval/discover/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -200,6 +202,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -428,6 +431,10 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_CCMEXCLUDE is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM2_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
@@ -446,9 +453,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART3_SERIALDRIVER=y
 # CONFIG_STM32_USART3_1WIREDRIVER is not set
 # CONFIG_USART3_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -722,7 +737,12 @@ CONFIG_I2C_POLLED=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -730,6 +750,7 @@ CONFIG_I2C_POLLED=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -781,6 +802,8 @@ CONFIG_ETH0_PHY_DP83848C=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -830,15 +853,18 @@ CONFIG_USART3_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -991,11 +1017,6 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1080,6 +1101,7 @@ CONFIG_NETDB_DNSSERVER_IPv4ADDR=0x0a000001
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -1112,16 +1134,21 @@ CONFIG_HAVE_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_CXXTEST is not set
 # CONFIG_EXAMPLES_DHCPD is not set
+CONFIG_EXAMPLES_DISCOVER=y
+CONFIG_EXAMPLES_DISCOVER_DHCPC=y
+CONFIG_EXAMPLES_DISCOVER_NOMAC=y
+CONFIG_EXAMPLES_DISCOVER_DRIPADDR=0xc0a80201
+CONFIG_EXAMPLES_DISCOVER_NETMASK=0xffffff00
 # CONFIG_EXAMPLES_ELF is not set
 # CONFIG_EXAMPLES_FSTEST is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -1131,18 +1158,18 @@ CONFIG_HAVE_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1158,14 +1185,9 @@ CONFIG_HAVE_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UDPBLASTER is not set
-CONFIG_EXAMPLES_DISCOVER=y
-CONFIG_EXAMPLES_DISCOVER_DHCPC=y
-CONFIG_EXAMPLES_DISCOVER_NOMAC=y
-CONFIG_EXAMPLES_DISCOVER_DRIPADDR=0xc0a80201
-CONFIG_EXAMPLES_DISCOVER_NETMASK=0xffffff00
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_WGET is not set
 
 #
@@ -1190,8 +1212,8 @@ CONFIG_EXAMPLES_DISCOVER_NETMASK=0xffffff00
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1204,25 +1226,25 @@ CONFIG_EXAMPLES_DISCOVER_NETMASK=0xffffff00
 # CONFIG_NETUTILS_CODECS is not set
 CONFIG_NETUTILS_DHCPC=y
 # CONFIG_NETUTILS_DHCPD is not set
+CONFIG_NETUTILS_DISCOVER=y
+CONFIG_DISCOVER_STACK_SIZE=1024
+CONFIG_DISCOVER_PRIORITY=50
+CONFIG_DISCOVER_PORT=96
+CONFIG_DISCOVER_INTERFACE="eth0"
+CONFIG_DISCOVER_DEVICE_CLASS=0xff
+CONFIG_DISCOVER_DESCR="STM3240G-EVAL"
 # CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
+CONFIG_NETUTILS_NETLIB=y
+# CONFIG_NETUTILS_NTPCLIENT is not set
+# CONFIG_NETUTILS_PPPD is not set
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
-CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
-# CONFIG_NETUTILS_NTPCLIENT is not set
-CONFIG_NETUTILS_DISCOVER=y
-CONFIG_DISCOVER_STACK_SIZE=1024
-CONFIG_DISCOVER_PRIORITY=50
-CONFIG_DISCOVER_PORT=96
-CONFIG_DISCOVER_INTERFACE="eth0"
-CONFIG_DISCOVER_DEVICE_CLASS=0xff
-CONFIG_DISCOVER_DESCR="STM3240G-EVAL"
 # CONFIG_NETUTILS_XMLRPC is not set
-# CONFIG_NETUTILS_PPPD is not set
 
 #
 # NSH Library
@@ -1241,18 +1263,18 @@ CONFIG_DISCOVER_DESCR="STM3240G-EVAL"
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_SYSTEM_I2CTOOL is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_I2CTOOL is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm3240g-eval/knxwm/defconfig b/configs/stm3240g-eval/knxwm/defconfig
index 1a350e3b67..0c9c596c53 100644
--- a/configs/stm3240g-eval/knxwm/defconfig
+++ b/configs/stm3240g-eval/knxwm/defconfig
@@ -51,10 +51,12 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -215,6 +217,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -823,6 +826,7 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -834,6 +838,8 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -883,15 +889,18 @@ CONFIG_USART3_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -935,11 +944,6 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1113,6 +1117,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 CONFIG_LIB_USRWORK=y
 CONFIG_LIB_USRWORKPRIORITY=100
 CONFIG_LIB_USRWORKPERIOD=100000
@@ -1155,9 +1160,9 @@ CONFIG_CXX_NEWLONG=y
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
+# CONFIG_EXAMPLES_IGMP is not set
 # CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_KEYPADTEST is not set
-# CONFIG_EXAMPLES_IGMP is not set
 # CONFIG_EXAMPLES_LCDRW is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
@@ -1167,18 +1172,18 @@ CONFIG_CXX_NEWLONG=y
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1192,10 +1197,10 @@ CONFIG_CXX_NEWLONG=y
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1219,8 +1224,8 @@ CONFIG_CXX_NEWLONG=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1422,19 +1427,19 @@ CONFIG_NXWM_HEXCALCULATOR_FONTID=5
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_SYSTEM_I2CTOOL is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_I2CTOOL is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm3240g-eval/nettest/defconfig b/configs/stm3240g-eval/nettest/defconfig
index 3c2dd7b6b0..42672a45da 100644
--- a/configs/stm3240g-eval/nettest/defconfig
+++ b/configs/stm3240g-eval/nettest/defconfig
@@ -46,10 +46,12 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -208,6 +210,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -435,6 +438,10 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_CCMEXCLUDE is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM2_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
@@ -453,9 +460,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART3_SERIALDRIVER=y
 # CONFIG_STM32_USART3_1WIREDRIVER is not set
 # CONFIG_USART3_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -700,7 +715,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -708,6 +728,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -759,6 +780,8 @@ CONFIG_ETH0_PHY_DP83848C=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -807,15 +830,18 @@ CONFIG_USART3_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -948,11 +974,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1022,6 +1043,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -1059,10 +1081,10 @@ CONFIG_HAVE_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -1085,18 +1107,18 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1110,9 +1132,9 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_WGET is not set
 
 #
@@ -1135,8 +1157,8 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1150,9 +1172,9 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TELNETD is not set
-CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
@@ -1174,16 +1196,16 @@ CONFIG_NETUTILS_NETLIB=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm3240g-eval/nsh/defconfig b/configs/stm3240g-eval/nsh/defconfig
index b46e539a5a..82ba6591df 100644
--- a/configs/stm3240g-eval/nsh/defconfig
+++ b/configs/stm3240g-eval/nsh/defconfig
@@ -46,10 +46,12 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -765,6 +767,7 @@ CONFIG_RTC_DATETIME=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -818,6 +821,8 @@ CONFIG_ETH0_PHY_DP83848C=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -867,15 +872,18 @@ CONFIG_USART3_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -1029,11 +1037,6 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1117,6 +1120,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/stm3240g-eval/nsh2/defconfig b/configs/stm3240g-eval/nsh2/defconfig
index 6903c6cbd4..2d7a66a331 100644
--- a/configs/stm3240g-eval/nsh2/defconfig
+++ b/configs/stm3240g-eval/nsh2/defconfig
@@ -46,10 +46,12 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -762,6 +764,7 @@ CONFIG_RTC_DATETIME=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -796,6 +799,7 @@ CONFIG_MTD=y
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT25 is not set
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
 # CONFIG_MTD_N25QXXX is not set
@@ -855,6 +859,8 @@ CONFIG_ETH0_PHY_DP83848C=y
 # CONFIG_SENSORS is not set
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
+# CONFIG_SERIAL_REMOVABLE is not set
+# CONFIG_SERIAL_CONSOLE is not set
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -888,19 +894,22 @@ CONFIG_SERIAL=y
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 CONFIG_RAMLOG=y
-CONFIG_RAMLOG_SYSLOG=y
 CONFIG_RAMLOG_BUFSIZE=1024
 # CONFIG_RAMLOG_CRLF is not set
 CONFIG_RAMLOG_NONBLOCKING=y
 CONFIG_RAMLOG_NPOLLWAITERS=4
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_RAMLOG_SYSLOG=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -1054,12 +1063,6 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-# CONFIG_SYSLOG_CHAR is not set
-
 #
 # Graphics Support
 #
@@ -1143,6 +1146,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/stm3240g-eval/nxterm/defconfig b/configs/stm3240g-eval/nxterm/defconfig
index 291340b2a3..9c793c79c6 100644
--- a/configs/stm3240g-eval/nxterm/defconfig
+++ b/configs/stm3240g-eval/nxterm/defconfig
@@ -46,10 +46,12 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -798,6 +800,7 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -851,6 +854,8 @@ CONFIG_ETH0_PHY_DP83848C=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -900,15 +905,18 @@ CONFIG_USART3_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -1055,11 +1063,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1251,6 +1254,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/stm3240g-eval/nxwm/defconfig b/configs/stm3240g-eval/nxwm/defconfig
index c2729b1ea0..d12bd75e53 100644
--- a/configs/stm3240g-eval/nxwm/defconfig
+++ b/configs/stm3240g-eval/nxwm/defconfig
@@ -46,10 +46,12 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -832,6 +834,7 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -885,6 +888,8 @@ CONFIG_ETH0_PHY_NONE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -934,15 +939,18 @@ CONFIG_USART3_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -1095,11 +1103,6 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1293,6 +1296,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/stm3240g-eval/telnetd/defconfig b/configs/stm3240g-eval/telnetd/defconfig
index f2895a91e3..7a6aa7a884 100644
--- a/configs/stm3240g-eval/telnetd/defconfig
+++ b/configs/stm3240g-eval/telnetd/defconfig
@@ -46,10 +46,12 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -208,6 +210,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -435,6 +438,10 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_CCMEXCLUDE is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM2_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
@@ -453,9 +460,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART3_SERIALDRIVER=y
 # CONFIG_STM32_USART3_1WIREDRIVER is not set
 # CONFIG_USART3_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -700,7 +715,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -708,6 +728,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -761,6 +782,8 @@ CONFIG_ETH0_PHY_DP83848C=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -809,15 +832,18 @@ CONFIG_USART3_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -950,11 +976,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1024,6 +1045,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -1061,10 +1083,10 @@ CONFIG_HAVE_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -1074,18 +1096,18 @@ CONFIG_HAVE_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1107,9 +1129,9 @@ CONFIG_EXAMPLES_TELNETD_CLIENTPRIO=128
 CONFIG_EXAMPLES_TELNETD_CLIENTSTACKSIZE=2048
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_WGET is not set
 
 #
@@ -1132,8 +1154,8 @@ CONFIG_EXAMPLES_TELNETD_CLIENTSTACKSIZE=2048
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1147,9 +1169,9 @@ CONFIG_EXAMPLES_TELNETD_CLIENTSTACKSIZE=2048
 # CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_SMTP is not set
 CONFIG_NETUTILS_TELNETD=y
-CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
@@ -1171,16 +1193,16 @@ CONFIG_NETUTILS_NETLIB=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm3240g-eval/webserver/defconfig b/configs/stm3240g-eval/webserver/defconfig
index b16ae73145..916ec6c8d0 100644
--- a/configs/stm3240g-eval/webserver/defconfig
+++ b/configs/stm3240g-eval/webserver/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -755,6 +757,7 @@ CONFIG_RTC_DATETIME=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 CONFIG_MTD=y
@@ -777,6 +780,7 @@ CONFIG_MTD=y
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT25 is not set
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
 # CONFIG_MTD_N25QXXX is not set
@@ -837,6 +841,8 @@ CONFIG_ETH0_PHY_NONE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -886,15 +892,18 @@ CONFIG_USART3_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -1047,11 +1056,6 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1128,6 +1132,7 @@ CONFIG_LIBC_NETDB=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/stm3240g-eval/xmlrpc/defconfig b/configs/stm3240g-eval/xmlrpc/defconfig
index e802595fe0..24cc0a0c4d 100644
--- a/configs/stm3240g-eval/xmlrpc/defconfig
+++ b/configs/stm3240g-eval/xmlrpc/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -200,6 +202,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -428,6 +431,10 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_CCMEXCLUDE is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM2_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
@@ -446,9 +453,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART3_SERIALDRIVER=y
 # CONFIG_STM32_USART3_1WIREDRIVER is not set
 # CONFIG_USART3_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -717,7 +732,12 @@ CONFIG_I2C_POLLED=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -725,6 +745,7 @@ CONFIG_I2C_POLLED=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -776,6 +797,8 @@ CONFIG_ETH0_PHY_DP83848C=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -826,15 +849,18 @@ CONFIG_USART3_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -987,11 +1013,6 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1076,6 +1097,7 @@ CONFIG_NETDB_DNSSERVER_IPv4ADDR=0x0a000001
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -1108,16 +1130,17 @@ CONFIG_HAVE_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_CXXTEST is not set
 # CONFIG_EXAMPLES_DHCPD is not set
+# CONFIG_EXAMPLES_DISCOVER is not set
 # CONFIG_EXAMPLES_ELF is not set
 # CONFIG_EXAMPLES_FSTEST is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -1127,18 +1150,18 @@ CONFIG_HAVE_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1154,10 +1177,9 @@ CONFIG_HAVE_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UDPBLASTER is not set
-# CONFIG_EXAMPLES_DISCOVER is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_WGET is not set
 CONFIG_EXAMPLES_XMLRPC=y
 CONFIG_EXAMPLES_XMLRPC_BUFFERSIZE=1024
@@ -1188,8 +1210,8 @@ CONFIG_EXAMPLES_XMLRPC_NETMASK=0xffffff00
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1203,21 +1225,21 @@ CONFIG_EXAMPLES_XMLRPC_NETMASK=0xffffff00
 # CONFIG_NETUTILS_CODECS is not set
 CONFIG_NETUTILS_DHCPC=y
 # CONFIG_NETUTILS_DHCPD is not set
+# CONFIG_NETUTILS_DISCOVER is not set
 # CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
+CONFIG_NETUTILS_NETLIB=y
+# CONFIG_NETUTILS_NTPCLIENT is not set
+# CONFIG_NETUTILS_PPPD is not set
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_TFTPC is not set
-CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
-# CONFIG_NETUTILS_NTPCLIENT is not set
-# CONFIG_NETUTILS_DISCOVER is not set
 CONFIG_NETUTILS_XMLRPC=y
 CONFIG_XMLRPC_STRINGSIZE=64
-# CONFIG_NETUTILS_PPPD is not set
 
 #
 # NSH Library
@@ -1236,18 +1258,18 @@ CONFIG_XMLRPC_STRINGSIZE=64
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_SYSTEM_I2CTOOL is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_I2CTOOL is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm32_tiny/nsh/defconfig b/configs/stm32_tiny/nsh/defconfig
index 7ba4ffc1ec..efa50a903f 100644
--- a/configs/stm32_tiny/nsh/defconfig
+++ b/configs/stm32_tiny/nsh/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -200,6 +202,7 @@ CONFIG_ARCH_CHIP_STM32F103C8=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -407,6 +410,10 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -418,9 +425,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -665,6 +680,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -679,7 +696,12 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -687,6 +709,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -698,6 +721,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -756,15 +781,18 @@ CONFIG_WL_NRF24L01_RXSUPPORT=y
 CONFIG_WL_NRF24L01_RXFIFO_LEN=128
 # CONFIG_WL_PN532 is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -802,11 +830,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -879,6 +902,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -912,10 +936,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -924,17 +948,17 @@ CONFIG_EXAMPLES_NRF24L01TERM=y
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -942,17 +966,17 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -974,8 +998,8 @@ CONFIG_EXAMPLES_NSH=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1099,12 +1123,12 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1112,6 +1136,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm32_tiny/usbnsh/defconfig b/configs/stm32_tiny/usbnsh/defconfig
index e42722af42..847b090897 100644
--- a/configs/stm32_tiny/usbnsh/defconfig
+++ b/configs/stm32_tiny/usbnsh/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -199,6 +201,7 @@ CONFIG_ARCH_CHIP_STM32F103C8=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -405,6 +408,10 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 # CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG is not set
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -416,9 +423,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -661,7 +676,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -669,6 +689,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -680,6 +701,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_SERIAL_REMOVABLE=y
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -771,14 +793,17 @@ CONFIG_CDCACM_PRODUCTSTR="CDC/ACM Serial"
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_NONE=y
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -816,11 +841,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -893,6 +913,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -926,10 +947,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -938,17 +959,17 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -956,17 +977,17 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -988,8 +1009,8 @@ CONFIG_EXAMPLES_NSH=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1118,12 +1139,13 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_CDCACM is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1131,8 +1153,7 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
-# CONFIG_SYSTEM_CDCACM is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_USBMONITOR is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm32f103-minimum/minnsh/defconfig b/configs/stm32f103-minimum/minnsh/defconfig
index ce656ae2c6..da3a0941ce 100644
--- a/configs/stm32f103-minimum/minnsh/defconfig
+++ b/configs/stm32f103-minimum/minnsh/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+# CONFIG_DEBUG_ALERT 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
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -199,6 +201,7 @@ CONFIG_ARCH_CHIP_STM32F103C8=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -405,6 +408,10 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -655,6 +662,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -665,6 +673,8 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_SENSORS is not set
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -714,14 +724,17 @@ CONFIG_USART1_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_NONE=y
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -751,11 +764,6 @@ CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -825,6 +833,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -853,10 +862,10 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -865,18 +874,18 @@ CONFIG_ARCH_HAVE_TLS=y
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -890,9 +899,9 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -914,8 +923,8 @@ CONFIG_EXAMPLES_NSH=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -926,6 +935,7 @@ CONFIG_EXAMPLES_NSH=y
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -1033,12 +1043,12 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1046,6 +1056,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm32f103-minimum/nsh/defconfig b/configs/stm32f103-minimum/nsh/defconfig
index 9837d73ae1..ee5bcaeee3 100644
--- a/configs/stm32f103-minimum/nsh/defconfig
+++ b/configs/stm32f103-minimum/nsh/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -199,6 +201,7 @@ CONFIG_ARCH_CHIP_STM32F103C8=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -405,6 +408,10 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -416,9 +423,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -664,7 +679,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -672,6 +692,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -683,6 +704,8 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -733,15 +756,18 @@ CONFIG_USART1_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -779,11 +805,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -856,6 +877,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -889,10 +911,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -901,17 +923,17 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -919,17 +941,17 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -951,8 +973,8 @@ CONFIG_EXAMPLES_NSH=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1076,12 +1098,12 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1089,6 +1111,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm32f103-minimum/usbnsh/defconfig b/configs/stm32f103-minimum/usbnsh/defconfig
index cbdc654d59..9a0e984177 100644
--- a/configs/stm32f103-minimum/usbnsh/defconfig
+++ b/configs/stm32f103-minimum/usbnsh/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -199,6 +201,7 @@ CONFIG_ARCH_CHIP_STM32F103C8=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -405,6 +408,10 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 # CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG is not set
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -416,9 +423,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -661,7 +676,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -669,6 +689,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -680,6 +701,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_SERIAL_REMOVABLE=y
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -771,14 +793,17 @@ CONFIG_CDCACM_PRODUCTSTR="CDC/ACM Serial"
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_NONE=y
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -816,11 +841,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -893,6 +913,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -926,10 +947,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -938,17 +959,17 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -956,17 +977,17 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -988,8 +1009,8 @@ CONFIG_EXAMPLES_NSH=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1118,12 +1139,13 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_CDCACM is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1131,8 +1153,7 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
-# CONFIG_SYSTEM_CDCACM is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_USBMONITOR is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm32f3discovery/nsh/defconfig b/configs/stm32f3discovery/nsh/defconfig
index 269761d132..4cb1dfd5e2 100644
--- a/configs/stm32f3discovery/nsh/defconfig
+++ b/configs/stm32f3discovery/nsh/defconfig
@@ -46,10 +46,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -208,6 +210,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -419,6 +422,10 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_CCMEXCLUDE is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -429,9 +436,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -682,7 +697,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -690,6 +710,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -702,6 +723,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
 CONFIG_SERIAL_REMOVABLE=y
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -791,15 +813,18 @@ CONFIG_CDCACM_PRODUCTSTR="CDC/ACM Serial"
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -837,11 +862,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -914,6 +934,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -957,10 +978,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -970,17 +991,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -988,17 +1009,17 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1020,8 +1041,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1146,12 +1167,14 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
+CONFIG_SYSTEM_CDCACM=y
+CONFIG_SYSTEM_CDCACM_DEVMINOR=0
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1159,8 +1182,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
-CONFIG_SYSTEM_CDCACM=y
-CONFIG_SYSTEM_CDCACM_DEVMINOR=0
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm32f3discovery/usbnsh/defconfig b/configs/stm32f3discovery/usbnsh/defconfig
index 50e9dd3435..3d771a5f99 100644
--- a/configs/stm32f3discovery/usbnsh/defconfig
+++ b/configs/stm32f3discovery/usbnsh/defconfig
@@ -46,10 +46,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -208,6 +210,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -420,6 +423,10 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_CCMEXCLUDE is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -430,9 +437,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -682,6 +697,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -696,7 +713,12 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -704,6 +726,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -715,6 +738,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_SERIAL_REMOVABLE=y
+# CONFIG_SERIAL_CONSOLE is not set
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -804,14 +828,19 @@ CONFIG_CDCACM_PRODUCTSTR="CDC/ACM Serial"
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+CONFIG_SYSLOG_CHAR=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+CONFIG_SYSLOG_CHAR_CRLF=y
+CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
 
 #
 # Networking Support
@@ -849,13 +878,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-CONFIG_SYSLOG_CHAR=y
-CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
-
 #
 # Graphics Support
 #
@@ -928,6 +950,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -971,10 +994,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -984,17 +1007,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1002,17 +1025,17 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1034,8 +1057,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1160,12 +1183,13 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_CDCACM is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1173,7 +1197,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
-# CONFIG_SYSTEM_CDCACM is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm32f411e-disco/nsh/defconfig b/configs/stm32f411e-disco/nsh/defconfig
index 282476a13d..1845e9d48a 100644
--- a/configs/stm32f411e-disco/nsh/defconfig
+++ b/configs/stm32f411e-disco/nsh/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -200,6 +202,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -410,6 +413,10 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 # CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG is not set
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -423,9 +430,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -661,7 +676,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -669,6 +689,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -680,6 +701,8 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -729,15 +752,18 @@ CONFIG_USART2_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -775,11 +801,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -852,6 +873,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -894,10 +916,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_LEDS is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
@@ -907,17 +929,17 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -925,16 +947,16 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -956,8 +978,8 @@ CONFIG_EXAMPLES_NSH=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1081,12 +1103,12 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1094,6 +1116,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm32f429i-disco/extflash/defconfig b/configs/stm32f429i-disco/extflash/defconfig
index 06dd83e1ea..f4e687e9af 100644
--- a/configs/stm32f429i-disco/extflash/defconfig
+++ b/configs/stm32f429i-disco/extflash/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 CONFIG_DEBUG_NOOPT=y
@@ -200,6 +202,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -435,6 +438,10 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_CCMEXCLUDE is not set
 CONFIG_STM32_FSMC_SRAM=y
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -722,6 +729,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -749,6 +758,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 CONFIG_MTD=y
@@ -778,6 +788,7 @@ CONFIG_RAMMTD_ERASESTATE=0xff
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT25 is not set
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
 # CONFIG_MTD_N25QXXX is not set
@@ -808,6 +819,8 @@ CONFIG_SST25XX_MEMORY_TYPE=0x25
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -857,15 +870,18 @@ CONFIG_USART1_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -918,11 +934,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_SMARTFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1000,6 +1011,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -1039,15 +1051,16 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_CXXTEST is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FLASH_TEST is not set
 # CONFIG_EXAMPLES_FSTEST is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -1058,17 +1071,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RANDOM is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
@@ -1077,18 +1090,17 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_FLASH_TEST is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1114,8 +1126,8 @@ CONFIG_FSUTILS_MKSMARTFS=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1241,13 +1253,13 @@ CONFIG_PLATFORM_CONFIGDATA=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 CONFIG_SYSTEM_FLASH_ERASEALL=y
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1255,6 +1267,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm32f429i-disco/lcd/defconfig b/configs/stm32f429i-disco/lcd/defconfig
index 32d0d306d7..cca650004b 100644
--- a/configs/stm32f429i-disco/lcd/defconfig
+++ b/configs/stm32f429i-disco/lcd/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -201,6 +203,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -435,6 +438,10 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_CCMEXCLUDE is not set
 CONFIG_STM32_FSMC_SRAM=y
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -451,9 +458,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -704,10 +719,14 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 CONFIG_LCD=y
 
 #
-# Common LCD Settings
+# Common Graphic LCD Settings
 #
 # CONFIG_LCD_CONSOLE is not set
 # CONFIG_LCD_NOGETRUN is not set
@@ -742,11 +761,7 @@ CONFIG_LCD_ILI9341_IFACE0_LANDSCAPE=y
 # CONFIG_LCD_ILI9341_IFACE0_RPORTRAIT is not set
 CONFIG_LCD_ILI9341_IFACE0_RGB565=y
 # CONFIG_LCD_RA8875 is not set
-
-#
-# Alphanumeric/Segment LCD Devices
-#
-# CONFIG_LCD_LCD1602 is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -754,6 +769,7 @@ CONFIG_LCD_ILI9341_IFACE0_RGB565=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -765,6 +781,8 @@ CONFIG_LCD_ILI9341_IFACE0_RGB565=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -814,15 +832,18 @@ CONFIG_USART1_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -860,11 +881,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1029,6 +1045,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -1072,10 +1089,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 CONFIG_EXAMPLES_LCDRW=y
 CONFIG_EXAMPLES_LDCRW_DEVNO=0
 CONFIG_EXAMPLES_LDCRW_XRES=320
@@ -1105,17 +1122,17 @@ CONFIG_EXAMPLES_NX_CLIENTPRIO=100
 CONFIG_EXAMPLES_NX_SERVERPRIO=120
 CONFIG_EXAMPLES_NX_LISTENERPRIO=80
 CONFIG_EXAMPLES_NX_NOTIFYSIGNO=4
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1123,16 +1140,16 @@ CONFIG_EXAMPLES_NX_NOTIFYSIGNO=4
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1154,8 +1171,8 @@ CONFIG_EXAMPLES_NX_NOTIFYSIGNO=4
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1280,12 +1297,12 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1293,6 +1310,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm32f429i-disco/ltdc/defconfig b/configs/stm32f429i-disco/ltdc/defconfig
index 6504e4e3ee..138dacd2e6 100644
--- a/configs/stm32f429i-disco/ltdc/defconfig
+++ b/configs/stm32f429i-disco/ltdc/defconfig
@@ -42,9 +42,14 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 CONFIG_DEBUG_FEATURES=y
-CONFIG_ARCH_HAVE_HEAPCHECK=y
-# CONFIG_DEBUG_INFO is not set
+
+#
+# Debug SYSLOG Output Controls
+#
+# CONFIG_DEBUG_ERROR is not set
+# CONFIG_DEBUG_ASSERTIONS is not set
 
 #
 # Subsystem Debug Options
@@ -59,18 +64,18 @@ CONFIG_ARCH_HAVE_HEAPCHECK=y
 #
 # OS Function Debug Options
 #
-# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_IRQ is not set
 
 #
 # Driver Debug Options
 #
 # CONFIG_DEBUG_LEDS is not set
-# CONFIG_DEBUG_ANALOG is not set
 # CONFIG_DEBUG_GPIO is not set
 # CONFIG_DEBUG_SPI is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -227,6 +232,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -463,6 +469,10 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y
 CONFIG_STM32_CCMEXCLUDE=y
 CONFIG_STM32_CCM_PROCFS=y
 CONFIG_STM32_FSMC_SRAM=y
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -479,9 +489,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -774,6 +792,8 @@ CONFIG_SPI_CMDDATA=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -788,7 +808,12 @@ CONFIG_SPI_CMDDATA=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -796,6 +821,7 @@ CONFIG_SPI_CMDDATA=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -807,6 +833,8 @@ CONFIG_SPI_CMDDATA=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -857,15 +885,18 @@ CONFIG_USART1_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -911,11 +942,6 @@ CONFIG_FS_PROCFS_REGISTER=y
 # CONFIG_FS_PROCFS_EXCLUDE_MOUNTS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1077,6 +1103,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -1120,10 +1147,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 CONFIG_EXAMPLES_LTDC=y
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
@@ -1141,17 +1168,17 @@ CONFIG_EXAMPLES_NX_DEFAULT_FONT=y
 CONFIG_EXAMPLES_NX_BPP=16
 # CONFIG_EXAMPLES_NX_RAWWINDOWS is not set
 CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1159,16 +1186,16 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1192,8 +1219,8 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1319,12 +1346,12 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1332,6 +1359,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm32f429i-disco/nsh/defconfig b/configs/stm32f429i-disco/nsh/defconfig
index df6fe33ebd..1489366940 100644
--- a/configs/stm32f429i-disco/nsh/defconfig
+++ b/configs/stm32f429i-disco/nsh/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 CONFIG_DEBUG_NOOPT=y
@@ -200,6 +202,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -434,6 +437,10 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_CCMEXCLUDE is not set
 CONFIG_STM32_FSMC_SRAM=y
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -450,9 +457,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -690,6 +705,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -704,7 +721,12 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -712,6 +734,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -723,6 +746,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -772,15 +797,18 @@ CONFIG_USART1_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -818,11 +846,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -897,6 +920,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -940,10 +964,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -953,17 +977,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -971,16 +995,16 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1002,8 +1026,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1127,12 +1151,12 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1140,6 +1164,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm32f429i-disco/usbmsc/defconfig b/configs/stm32f429i-disco/usbmsc/defconfig
index a010d81bdb..c041a1a207 100644
--- a/configs/stm32f429i-disco/usbmsc/defconfig
+++ b/configs/stm32f429i-disco/usbmsc/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 CONFIG_DEBUG_NOOPT=y
@@ -203,6 +205,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -437,6 +440,10 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_CCMEXCLUDE is not set
 CONFIG_STM32_FSMC_SRAM=y
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -453,9 +460,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -479,8 +494,6 @@ CONFIG_STM32_OTGHS_DESCSIZE=128
 #
 # USB Host Debug Configuration
 #
-# CONFIG_STM32_USBHOST_REGDEBUG is not set
-# CONFIG_STM32_USBHOST_PKTDUMP is not set
 
 #
 # USB Device Configuration
@@ -714,6 +727,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -728,7 +743,12 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -736,6 +756,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -747,6 +768,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -805,15 +828,18 @@ CONFIG_USBHOST_MSC=y
 # CONFIG_USBHOST_TRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -857,11 +883,6 @@ CONFIG_FS_FAT=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -939,6 +960,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -983,10 +1005,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -996,17 +1018,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1014,17 +1036,17 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1048,8 +1070,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1174,12 +1196,12 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1187,6 +1209,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm32f429i-disco/usbnsh/defconfig b/configs/stm32f429i-disco/usbnsh/defconfig
index e5a5394c15..9b72f2bf72 100644
--- a/configs/stm32f429i-disco/usbnsh/defconfig
+++ b/configs/stm32f429i-disco/usbnsh/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 CONFIG_DEBUG_NOOPT=y
@@ -200,6 +202,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -434,6 +437,10 @@ CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_CCMEXCLUDE is not set
 CONFIG_STM32_FSMC_SRAM=y
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -450,9 +457,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -698,6 +713,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -712,7 +729,12 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -720,6 +742,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -731,6 +754,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_SERIAL_REMOVABLE=y
+# CONFIG_SERIAL_CONSOLE is not set
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -820,14 +844,17 @@ CONFIG_CDCACM_PRODUCTSTR="CDC/ACM Serial"
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_NONE=y
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -871,11 +898,6 @@ CONFIG_FS_FAT=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -954,6 +976,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -998,10 +1021,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -1011,17 +1034,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1029,17 +1052,17 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1063,8 +1086,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1191,12 +1214,13 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_CDCACM is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 CONFIG_SYSTEM_RAMTEST=y
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1204,7 +1228,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
-# CONFIG_SYSTEM_CDCACM is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm32f4discovery/cxxtest/defconfig b/configs/stm32f4discovery/cxxtest/defconfig
index 00e1029dc5..ccb07593a8 100644
--- a/configs/stm32f4discovery/cxxtest/defconfig
+++ b/configs/stm32f4discovery/cxxtest/defconfig
@@ -46,10 +46,12 @@ CONFIG_ARCH_FLOAT_H=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -208,6 +210,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -435,6 +438,10 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_CCMEXCLUDE is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM2_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
@@ -453,9 +460,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -698,7 +713,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -706,6 +726,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -717,6 +738,8 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -766,15 +789,18 @@ CONFIG_USART2_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -805,11 +831,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -879,6 +900,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -920,10 +942,10 @@ CONFIG_EXAMPLES_CXXTEST_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -932,18 +954,18 @@ CONFIG_EXAMPLES_CXXTEST_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -957,9 +979,9 @@ CONFIG_EXAMPLES_CXXTEST_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -981,8 +1003,8 @@ CONFIG_EXAMPLES_CXXTEST_CXXINITIALIZE=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1015,16 +1037,16 @@ CONFIG_EXAMPLES_CXXTEST_CXXINITIALIZE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm32f4discovery/elf/defconfig b/configs/stm32f4discovery/elf/defconfig
index 1cff39814b..fcf650368e 100644
--- a/configs/stm32f4discovery/elf/defconfig
+++ b/configs/stm32f4discovery/elf/defconfig
@@ -46,10 +46,12 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -209,6 +211,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -436,6 +439,10 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 CONFIG_STM32_CCMEXCLUDE=y
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM2_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
@@ -454,9 +461,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -698,7 +713,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -706,6 +726,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -717,6 +738,8 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -765,15 +788,18 @@ CONFIG_USART2_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -810,11 +836,6 @@ CONFIG_FS_ROMFS=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -894,6 +915,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -934,10 +956,10 @@ CONFIG_EXAMPLES_ELF_DEVPATH="/dev/ram0"
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -946,18 +968,18 @@ CONFIG_EXAMPLES_ELF_DEVPATH="/dev/ram0"
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_ROMFS is not set
@@ -973,10 +995,10 @@ CONFIG_EXAMPLES_ELF_DEVPATH="/dev/ram0"
 # CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_UNIONFS is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1000,8 +1022,8 @@ CONFIG_EXAMPLES_ELF_DEVPATH="/dev/ram0"
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1035,16 +1057,16 @@ CONFIG_EXAMPLES_ELF_DEVPATH="/dev/ram0"
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm32f4discovery/ipv6/defconfig b/configs/stm32f4discovery/ipv6/defconfig
index c74e1fe5f0..8e11faeb12 100644
--- a/configs/stm32f4discovery/ipv6/defconfig
+++ b/configs/stm32f4discovery/ipv6/defconfig
@@ -46,10 +46,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -754,6 +756,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -781,6 +785,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -845,6 +850,8 @@ CONFIG_ETH0_PHY_LAN8720=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -894,15 +901,18 @@ CONFIG_USART6_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -1066,11 +1076,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_NET is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1147,6 +1152,7 @@ CONFIG_LIBC_NETDB=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/stm32f4discovery/kostest/defconfig b/configs/stm32f4discovery/kostest/defconfig
index 57c52c3260..1d1f1c310c 100644
--- a/configs/stm32f4discovery/kostest/defconfig
+++ b/configs/stm32f4discovery/kostest/defconfig
@@ -51,10 +51,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -214,6 +216,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -441,6 +444,10 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_CCMEXCLUDE is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM2_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
@@ -459,9 +466,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -706,7 +721,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -714,6 +734,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -725,6 +746,8 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -773,15 +796,18 @@ CONFIG_USART2_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -812,11 +838,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -887,6 +908,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_USRWORK is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
@@ -916,9 +938,9 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
+# CONFIG_EXAMPLES_IGMP is not set
 # CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_KEYPADTEST is not set
-# CONFIG_EXAMPLES_IGMP is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -927,11 +949,11 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 CONFIG_EXAMPLES_OSTEST=y
 CONFIG_EXAMPLES_OSTEST_LOOPS=1
@@ -943,8 +965,8 @@ CONFIG_EXAMPLES_OSTEST_WAITRESULT=y
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -958,9 +980,9 @@ CONFIG_EXAMPLES_OSTEST_WAITRESULT=y
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -982,8 +1004,8 @@ CONFIG_EXAMPLES_OSTEST_WAITRESULT=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1016,16 +1038,16 @@ CONFIG_EXAMPLES_OSTEST_WAITRESULT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm32f4discovery/netnsh/defconfig b/configs/stm32f4discovery/netnsh/defconfig
index 262ed58a5b..0ba6e71679 100644
--- a/configs/stm32f4discovery/netnsh/defconfig
+++ b/configs/stm32f4discovery/netnsh/defconfig
@@ -46,10 +46,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -754,6 +756,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -781,6 +785,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -847,6 +852,8 @@ CONFIG_ETH0_PHY_LAN8720=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -896,15 +903,18 @@ CONFIG_USART6_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -1070,11 +1080,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_NET is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1158,6 +1163,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/stm32f4discovery/nsh/defconfig b/configs/stm32f4discovery/nsh/defconfig
index b49e862c0b..9db07e2797 100644
--- a/configs/stm32f4discovery/nsh/defconfig
+++ b/configs/stm32f4discovery/nsh/defconfig
@@ -46,10 +46,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -208,6 +210,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -436,6 +439,10 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_CCMEXCLUDE is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM2_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
@@ -454,9 +461,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -699,6 +714,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -713,7 +730,12 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -721,6 +743,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -732,6 +755,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -781,15 +806,18 @@ CONFIG_USART2_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -835,11 +863,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_MOUNTS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -913,6 +936,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -956,10 +980,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -969,17 +993,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -987,16 +1011,16 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1020,8 +1044,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1146,12 +1170,12 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1159,6 +1183,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm32f4discovery/nxlines/defconfig b/configs/stm32f4discovery/nxlines/defconfig
index 05dda537a9..5c1a2c8438 100644
--- a/configs/stm32f4discovery/nxlines/defconfig
+++ b/configs/stm32f4discovery/nxlines/defconfig
@@ -46,10 +46,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -208,6 +210,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -437,6 +440,10 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_CCMEXCLUDE is not set
 # CONFIG_STM32_FSMC_SRAM is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM2_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
@@ -455,9 +462,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -700,6 +715,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -714,10 +731,14 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 CONFIG_LCD=y
 
 #
-# Common LCD Settings
+# Common Graphic LCD Settings
 #
 # CONFIG_LCD_CONSOLE is not set
 # CONFIG_LCD_NOGETRUN is not set
@@ -749,11 +770,7 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_LCD_RLANDSCAPE is not set
 # CONFIG_LCD_ILI9341 is not set
 # CONFIG_LCD_RA8875 is not set
-
-#
-# Alphanumeric/Segment LCD Devices
-#
-# CONFIG_LCD_LCD1602 is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -761,6 +778,7 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -772,6 +790,8 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -821,15 +841,18 @@ CONFIG_USART2_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -874,11 +897,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_MOUNTS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1041,6 +1059,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -1079,10 +1098,10 @@ CONFIG_HAVE_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_LCDRW is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
@@ -1092,7 +1111,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
@@ -1107,13 +1125,14 @@ CONFIG_EXAMPLES_NXLINES_BORDERWIDTH=4
 CONFIG_EXAMPLES_NXLINES_BORDERCOLOR=0xffe0
 CONFIG_EXAMPLES_NXLINES_CIRCLECOLOR=0xf7bb
 CONFIG_EXAMPLES_NXLINES_BPP=16
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1127,9 +1146,9 @@ CONFIG_EXAMPLES_NXLINES_BPP=16
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1153,8 +1172,8 @@ CONFIG_EXAMPLES_NXLINES_BPP=16
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1279,12 +1298,12 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1292,6 +1311,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm32f4discovery/pm/defconfig b/configs/stm32f4discovery/pm/defconfig
index fd0fc976b8..80912483b2 100644
--- a/configs/stm32f4discovery/pm/defconfig
+++ b/configs/stm32f4discovery/pm/defconfig
@@ -46,10 +46,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -208,6 +210,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -435,6 +438,10 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_CCMEXCLUDE is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_PWM is not set
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM2_CAP is not set
@@ -454,9 +461,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -720,7 +735,12 @@ CONFIG_RTC_NALARMS=1
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -728,6 +748,7 @@ CONFIG_RTC_NALARMS=1
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -757,6 +778,8 @@ CONFIG_PM_SLEEPENTER_COUNT=70
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -806,15 +829,18 @@ CONFIG_USART2_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -860,11 +886,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_MOUNTS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -938,6 +959,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -981,10 +1003,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_LEDS is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
@@ -995,17 +1017,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1013,16 +1035,16 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1046,8 +1068,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1172,12 +1194,12 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1185,6 +1207,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm32f4discovery/posix_spawn/defconfig b/configs/stm32f4discovery/posix_spawn/defconfig
index 9646703965..54d5abeea9 100644
--- a/configs/stm32f4discovery/posix_spawn/defconfig
+++ b/configs/stm32f4discovery/posix_spawn/defconfig
@@ -46,10 +46,12 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -209,6 +211,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -436,6 +439,10 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 CONFIG_STM32_CCMEXCLUDE=y
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM2_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
@@ -454,9 +461,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -698,7 +713,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -706,6 +726,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -717,6 +738,8 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -765,15 +788,18 @@ CONFIG_USART2_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -810,11 +836,6 @@ CONFIG_FS_ROMFS=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -897,6 +918,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -934,10 +956,10 @@ CONFIG_HAVE_CXX=y
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -946,20 +968,20 @@ CONFIG_HAVE_CXX=y
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 CONFIG_EXAMPLES_POSIXSPAWN=y
 CONFIG_EXAMPLES_POSIXSPAWN_DEVMINOR=0
 CONFIG_EXAMPLES_POSIXSPAWN_DEVPATH="/dev/ram0"
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_ROMFS is not set
@@ -975,10 +997,10 @@ CONFIG_EXAMPLES_POSIXSPAWN_DEVPATH="/dev/ram0"
 # CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_UNIONFS is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1002,8 +1024,8 @@ CONFIG_EXAMPLES_POSIXSPAWN_DEVPATH="/dev/ram0"
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1037,16 +1059,16 @@ CONFIG_EXAMPLES_POSIXSPAWN_DEVPATH="/dev/ram0"
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm32f4discovery/rgbled/defconfig b/configs/stm32f4discovery/rgbled/defconfig
index bc51c7fb53..d7f39c44ce 100644
--- a/configs/stm32f4discovery/rgbled/defconfig
+++ b/configs/stm32f4discovery/rgbled/defconfig
@@ -42,9 +42,14 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 CONFIG_DEBUG_FEATURES=y
-CONFIG_ARCH_HAVE_HEAPCHECK=y
-# CONFIG_DEBUG_INFO is not set
+
+#
+# Debug SYSLOG Output Controls
+#
+# CONFIG_DEBUG_ERROR is not set
+# CONFIG_DEBUG_ASSERTIONS is not set
 
 #
 # Subsystem Debug Options
@@ -59,19 +64,19 @@ CONFIG_ARCH_HAVE_HEAPCHECK=y
 #
 # OS Function Debug Options
 #
-# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_IRQ is not set
 
 #
 # Driver Debug Options
 #
 # CONFIG_DEBUG_LEDS is not set
-# CONFIG_DEBUG_ANALOG is not set
 # CONFIG_DEBUG_GPIO is not set
 # CONFIG_DEBUG_PWM is not set
 # CONFIG_DEBUG_SPI is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -227,6 +232,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -455,6 +461,10 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_CCMEXCLUDE is not set
+
+#
+# Timer Configuration
+#
 CONFIG_STM32_TIM1_PWM=y
 CONFIG_STM32_TIM1_MODE=0
 CONFIG_STM32_TIM1_CHANNEL=1
@@ -486,9 +496,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -733,6 +751,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -747,7 +767,12 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -755,6 +780,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_USERLED is not set
 CONFIG_RGBLED=y
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -766,6 +792,8 @@ CONFIG_RGBLED=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -816,15 +844,18 @@ CONFIG_USART2_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -870,11 +901,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_MOUNTS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -948,6 +974,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -991,10 +1018,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -1004,17 +1031,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 CONFIG_EXAMPLES_RGBLED=y
 CONFIG_EXAMPLES_RGBLED_DEVNAME="/dev/rgbled0"
 CONFIG_EXAMPLES_RGBLED_PRIORITY=100
@@ -1025,16 +1052,16 @@ CONFIG_EXAMPLES_RGBLED_STACKSIZE=2048
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1058,8 +1085,8 @@ CONFIG_EXAMPLES_RGBLED_STACKSIZE=2048
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1184,12 +1211,12 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1197,6 +1224,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm32f4discovery/uavcan/defconfig b/configs/stm32f4discovery/uavcan/defconfig
index 7718d6329f..fcdac447bc 100644
--- a/configs/stm32f4discovery/uavcan/defconfig
+++ b/configs/stm32f4discovery/uavcan/defconfig
@@ -42,10 +42,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -199,6 +201,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -426,6 +429,10 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_CCMEXCLUDE is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM2_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
@@ -676,7 +683,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -684,6 +696,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -698,19 +711,22 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 CONFIG_RAMLOG=y
-CONFIG_RAMLOG_SYSLOG=y
 CONFIG_RAMLOG_BUFSIZE=1024
 # CONFIG_RAMLOG_CRLF is not set
 CONFIG_RAMLOG_NONBLOCKING=y
 CONFIG_RAMLOG_NPOLLWAITERS=4
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_RAMLOG_SYSLOG=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -747,12 +763,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-# CONFIG_SYSLOG_CHAR is not set
-
 #
 # Graphics Support
 #
@@ -825,6 +835,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -894,10 +905,10 @@ CONFIG_LIBUAVCAN_INIT_RETRIES=0
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -906,18 +917,18 @@ CONFIG_LIBUAVCAN_INIT_RETRIES=0
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -935,9 +946,9 @@ CONFIG_EXAMPLES_UAVCAN=y
 CONFIG_EXAMPLES_UAVCAN_NODE_MEM_POOL_SIZE=4096
 CONFIG_EXAMPLES_UAVCAN_NODE_ID=1
 CONFIG_EXAMPLES_UAVCAN_NODE_NAME="org.nuttx.apps.examples.uavcan"
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -959,8 +970,8 @@ CONFIG_EXAMPLES_UAVCAN_NODE_NAME="org.nuttx.apps.examples.uavcan"
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -994,16 +1005,16 @@ CONFIG_EXAMPLES_UAVCAN_NODE_NAME="org.nuttx.apps.examples.uavcan"
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm32f4discovery/usbnsh/defconfig b/configs/stm32f4discovery/usbnsh/defconfig
index 86d93e7213..b85e4d4869 100644
--- a/configs/stm32f4discovery/usbnsh/defconfig
+++ b/configs/stm32f4discovery/usbnsh/defconfig
@@ -46,10 +46,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -208,6 +210,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -436,6 +439,10 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 # CONFIG_STM32_CCMEXCLUDE is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM2_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
@@ -454,9 +461,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_USART2_1WIREDRIVER is not set
 # CONFIG_USART2_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -707,6 +722,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -721,7 +738,12 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -729,6 +751,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -740,6 +763,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_SERIAL_REMOVABLE=y
+# CONFIG_SERIAL_CONSOLE is not set
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -829,14 +853,19 @@ CONFIG_CDCACM_PRODUCTSTR="CDC/ACM Serial"
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+CONFIG_SYSLOG_CHAR=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+CONFIG_SYSLOG_CHAR_CRLF=y
+CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
 
 #
 # Networking Support
@@ -882,13 +911,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_MOUNTS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-CONFIG_SYSLOG_CHAR=y
-CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
-
 #
 # Graphics Support
 #
@@ -962,6 +984,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -1005,10 +1028,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -1018,17 +1041,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -1036,17 +1059,17 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -1070,8 +1093,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1197,12 +1220,13 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_CDCACM is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1210,7 +1234,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
-# CONFIG_SYSTEM_CDCACM is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm32f746-ws/nsh/defconfig b/configs/stm32f746-ws/nsh/defconfig
index a45d8a824a..88c143a392 100644
--- a/configs/stm32f746-ws/nsh/defconfig
+++ b/configs/stm32f746-ws/nsh/defconfig
@@ -42,6 +42,7 @@ CONFIG_ARCH_STDARG_H=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 CONFIG_STACK_COLORATION=y
@@ -256,6 +257,9 @@ CONFIG_STM32F7_HAVE_RNG=y
 CONFIG_STM32F7_HAVE_SPI5=y
 CONFIG_STM32F7_HAVE_SPI6=y
 # CONFIG_STM32F7_HAVE_SDMMC2 is not set
+# CONFIG_STM32F7_HAVE_ADC1_DMA is not set
+# CONFIG_STM32F7_HAVE_ADC2_DMA is not set
+# CONFIG_STM32F7_HAVE_ADC3_DMA is not set
 # CONFIG_STM32F7_HAVE_CAN3 is not set
 CONFIG_STM32F7_HAVE_DCMI=y
 # CONFIG_STM32F7_HAVE_DSIHOST is not set
@@ -292,6 +296,7 @@ CONFIG_STM32F7_ADC1=y
 CONFIG_STM32F7_I2C1=y
 # CONFIG_STM32F7_I2C2 is not set
 # CONFIG_STM32F7_I2C3 is not set
+# CONFIG_STM32F7_I2C4 is not set
 # CONFIG_STM32F7_LPTIM1 is not set
 # CONFIG_STM32F7_LTDC is not set
 # CONFIG_STM32F7_OTGFS is not set
@@ -322,7 +327,6 @@ CONFIG_STM32F7_SPI1=y
 # CONFIG_STM32F7_TIM12 is not set
 # CONFIG_STM32F7_TIM13 is not set
 # CONFIG_STM32F7_TIM14 is not set
-# CONFIG_STM32F7_TIM15 is not set
 # CONFIG_STM32F7_USART1 is not set
 # CONFIG_STM32F7_USART2 is not set
 # CONFIG_STM32F7_USART3 is not set
@@ -345,8 +349,25 @@ CONFIG_STM32F7_USART6=y
 #
 # CONFIG_STM32F7_SPI_INTERRUPTS is not set
 # CONFIG_STM32F7_SPI_DMA is not set
+
+#
+# I2C Configuration
+#
+# CONFIG_STM32F7_I2C_DYNTIMEO is not set
+CONFIG_STM32F7_I2CTIMEOSEC=0
+CONFIG_STM32F7_I2CTIMEOMS=500
+CONFIG_STM32F7_I2CTIMEOTICKS=500
+# CONFIG_STM32F7_I2C_DUTY16_9 is not set
 # CONFIG_STM32F7_CUSTOM_CLOCKCONFIG is not set
 
+#
+# Timer Configuration
+#
+
+#
+# ADC Configuration
+#
+
 #
 # Architecture Options
 #
@@ -623,6 +644,8 @@ CONFIG_PIPES=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -673,16 +696,19 @@ CONFIG_USART6_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
 # CONFIG_DRIVER_NOTE is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -721,11 +747,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
diff --git a/configs/stm32f746g-disco/README.txt b/configs/stm32f746g-disco/README.txt
index 4ae7ac06ac..48ba63ec41 100644
--- a/configs/stm32f746g-disco/README.txt
+++ b/configs/stm32f746g-disco/README.txt
@@ -49,14 +49,6 @@ STATUS
   2015-07-20:  STM32 F7 Ethernet appears to be functional, but has had
     only light testing.
 
-  2015-07-21:  Added a protected build version of the NSH configuration
-    (called knsh).  That configuration is close:  It boots, but I get
-    a hard fault each time I do the NSH "help" command.  Everything else
-    works fine.  I am thinking this is a corrupted binary; I am thinking
-    that there is a bad pointer in the command table.  But this is hard
-    to prove but possible because the steps to produce and load the
-    binary are awkward.
-
 Development Environment
 =======================
 
diff --git a/configs/stm32f746g-disco/netnsh/defconfig b/configs/stm32f746g-disco/netnsh/defconfig
index f39e13dee5..7774a4b116 100644
--- a/configs/stm32f746g-disco/netnsh/defconfig
+++ b/configs/stm32f746g-disco/netnsh/defconfig
@@ -46,10 +46,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 CONFIG_DEBUG_NOOPT=y
@@ -263,6 +265,9 @@ CONFIG_STM32F7_HAVE_RNG=y
 # CONFIG_STM32F7_HAVE_SPI5 is not set
 # CONFIG_STM32F7_HAVE_SPI6 is not set
 # CONFIG_STM32F7_HAVE_SDMMC2 is not set
+# CONFIG_STM32F7_HAVE_ADC1_DMA is not set
+# CONFIG_STM32F7_HAVE_ADC2_DMA is not set
+# CONFIG_STM32F7_HAVE_ADC3_DMA is not set
 # CONFIG_STM32F7_HAVE_CAN3 is not set
 CONFIG_STM32F7_HAVE_DCMI=y
 # CONFIG_STM32F7_HAVE_DSIHOST is not set
@@ -278,6 +283,7 @@ CONFIG_STM32F7_HAVE_DMA2D=y
 # CONFIG_STM32F7_I2C is not set
 # CONFIG_STM32F7_SAI is not set
 # CONFIG_STM32F7_SPI is not set
+# CONFIG_STM32F7_TIM is not set
 CONFIG_STM32F7_USART=y
 # CONFIG_STM32F7_ADC1 is not set
 # CONFIG_STM32F7_ADC2 is not set
@@ -298,6 +304,7 @@ CONFIG_STM32F7_ETHMAC=y
 # CONFIG_STM32F7_I2C1 is not set
 # CONFIG_STM32F7_I2C2 is not set
 # CONFIG_STM32F7_I2C3 is not set
+# CONFIG_STM32F7_I2C4 is not set
 # CONFIG_STM32F7_LPTIM1 is not set
 # CONFIG_STM32F7_OTGFS is not set
 # CONFIG_STM32F7_OTGHS is not set
@@ -325,7 +332,6 @@ CONFIG_STM32F7_ETHMAC=y
 # CONFIG_STM32F7_TIM12 is not set
 # CONFIG_STM32F7_TIM13 is not set
 # CONFIG_STM32F7_TIM14 is not set
-# CONFIG_STM32F7_TIM15 is not set
 # CONFIG_STM32F7_USART1 is not set
 # CONFIG_STM32F7_USART2 is not set
 # CONFIG_STM32F7_USART3 is not set
@@ -344,6 +350,10 @@ CONFIG_STM32F7_USART6=y
 # CONFIG_STM32F7_USART_BREAKS is not set
 # CONFIG_STM32F7_CUSTOM_CLOCKCONFIG is not set
 
+#
+# Timer Configuration
+#
+
 #
 # Ethernet MAC configuration
 #
@@ -583,6 +593,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -609,6 +621,7 @@ CONFIG_SPI_EXCHANGE=y
 #
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -662,6 +675,8 @@ CONFIG_ETH0_PHY_LAN8742A=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -711,15 +726,18 @@ CONFIG_USART6_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -880,11 +898,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -958,6 +971,7 @@ CONFIG_LIBC_NETDB=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/stm32f746g-disco/nsh/defconfig b/configs/stm32f746g-disco/nsh/defconfig
index 03cd1f7505..73f36d894f 100644
--- a/configs/stm32f746g-disco/nsh/defconfig
+++ b/configs/stm32f746g-disco/nsh/defconfig
@@ -46,10 +46,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 CONFIG_DEBUG_NOOPT=y
@@ -284,6 +286,7 @@ CONFIG_STM32F7_HAVE_DMA2D=y
 # CONFIG_STM32F7_TIM is not set
 CONFIG_STM32F7_USART=y
 # CONFIG_STM32F7_ADC1 is not set
+# CONFIG_STM32F7_ADC2 is not set
 # CONFIG_STM32F7_ADC3 is not set
 # CONFIG_STM32F7_BKPSRAM is not set
 # CONFIG_STM32F7_CAN1 is not set
@@ -606,6 +609,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -655,15 +660,18 @@ CONFIG_USART6_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -701,11 +709,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -834,10 +837,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
+# CONFIG_EXAMPLES_NX is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
-# CONFIG_EXAMPLES_NX is not set
 # CONFIG_EXAMPLES_NXLINES is not set
 # CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
diff --git a/configs/stm32l476vg-disco/nsh/defconfig b/configs/stm32l476vg-disco/nsh/defconfig
index b8202466cd..7bb5a7b16c 100644
--- a/configs/stm32l476vg-disco/nsh/defconfig
+++ b/configs/stm32l476vg-disco/nsh/defconfig
@@ -42,9 +42,14 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 CONFIG_DEBUG_FEATURES=y
-CONFIG_ARCH_HAVE_HEAPCHECK=y
-# CONFIG_DEBUG_INFO is not set
+
+#
+# Debug SYSLOG Output Controls
+#
+# CONFIG_DEBUG_ERROR is not set
+# CONFIG_DEBUG_ASSERTIONS is not set
 
 #
 # Subsystem Debug Options
@@ -60,19 +65,19 @@ CONFIG_ARCH_HAVE_HEAPCHECK=y
 # OS Function Debug Options
 #
 # CONFIG_DEBUG_DMA is not set
-# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_IRQ is not set
 
 #
 # Driver Debug Options
 #
 # CONFIG_DEBUG_LEDS is not set
-# CONFIG_DEBUG_ANALOG is not set
 # CONFIG_DEBUG_GPIO is not set
 # CONFIG_DEBUG_RTC is not set
 # CONFIG_DEBUG_SPI is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 CONFIG_DEBUG_NOOPT=y
@@ -248,7 +253,6 @@ CONFIG_STM32L4_QSPI_DMA_CHAN_1_5=y
 CONFIG_STM32L4_QSPI_DMAPRIORITY_MEDIUM=y
 # CONFIG_STM32L4_QSPI_DMAPRIORITY_LOW is not set
 CONFIG_STM32L4_QSPI_DMATHRESHOLD=4
-# CONFIG_STM32L4_QSPI_REGDEBUG is not set
 
 #
 # APB1 Peripherals
@@ -535,6 +539,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -555,7 +561,12 @@ CONFIG_RTC_IOCTL=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -563,6 +574,7 @@ CONFIG_RTC_IOCTL=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 CONFIG_MTD=y
@@ -586,6 +598,7 @@ CONFIG_MTD_PARTITION=y
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT25 is not set
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
 CONFIG_MTD_N25QXXX=y
@@ -596,6 +609,7 @@ CONFIG_N25QXXX_SECTOR512=y
 # CONFIG_MTD_RAMTRON is not set
 # CONFIG_MTD_SST25 is not set
 # CONFIG_MTD_SST25XX is not set
+# CONFIG_MTD_SST26 is not set
 # CONFIG_MTD_SST39FV is not set
 # CONFIG_MTD_W25 is not set
 # CONFIG_EEPROM is not set
@@ -606,6 +620,8 @@ CONFIG_N25QXXX_SECTOR512=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -629,10 +645,6 @@ CONFIG_USART2_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -660,15 +672,18 @@ CONFIG_USART2_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -721,11 +736,6 @@ CONFIG_FS_PROCFS_REGISTER=y
 # CONFIG_FS_PROCFS_EXCLUDE_PARTITIONS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -801,6 +811,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -862,10 +873,10 @@ CONFIG_EXAMPLES_BUTTONS_NAME7="Button 7"
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 CONFIG_EXAMPLES_MEDIA=y
 CONFIG_EXAMPLES_MEDIA_DEVPATH="/dev/mtd0"
 CONFIG_EXAMPLES_MEDIA_BLOCKSIZE=512
@@ -878,17 +889,17 @@ CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RANDOM is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
@@ -898,23 +909,24 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_UNIONFS is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
+# CONFIG_FSUTILS_FLASH_ERASEALL is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_FSUTILS_PASSWD is not set
 
@@ -934,8 +946,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -946,6 +958,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -1068,12 +1081,13 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FLASH_ERASEALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1081,7 +1095,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
-CONFIG_SYSTEM_DISCOTEST=y
diff --git a/configs/stm32ldiscovery/nsh/defconfig b/configs/stm32ldiscovery/nsh/defconfig
index b7593a5be0..17293ae1cb 100644
--- a/configs/stm32ldiscovery/nsh/defconfig
+++ b/configs/stm32ldiscovery/nsh/defconfig
@@ -46,10 +46,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -207,6 +209,7 @@ CONFIG_ARCH_CHIP_STM32L152RB=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -412,6 +415,10 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 # CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG is not set
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
 # CONFIG_STM32_TIM9_CAP is not set
@@ -423,9 +430,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -659,7 +674,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -667,6 +687,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -678,6 +699,8 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -727,15 +750,18 @@ CONFIG_USART1_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -765,11 +791,6 @@ CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -835,6 +856,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -863,10 +885,10 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -875,18 +897,18 @@ CONFIG_ARCH_HAVE_TLS=y
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -900,9 +922,9 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -924,8 +946,8 @@ CONFIG_EXAMPLES_NSH=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1044,12 +1066,12 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1057,6 +1079,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm32vldiscovery/nsh/defconfig b/configs/stm32vldiscovery/nsh/defconfig
index 818ad684ae..c40099da62 100644
--- a/configs/stm32vldiscovery/nsh/defconfig
+++ b/configs/stm32vldiscovery/nsh/defconfig
@@ -46,10 +46,12 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -207,6 +209,7 @@ CONFIG_ARCH_CHIP_STM32F100RB=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -346,7 +349,7 @@ CONFIG_STM32_HAVE_TIM14=y
 CONFIG_STM32_HAVE_TIM15=y
 CONFIG_STM32_HAVE_TIM16=y
 CONFIG_STM32_HAVE_TIM17=y
-CONFIG_STM32_HAVE_ADC2=y
+# CONFIG_STM32_HAVE_ADC2 is not set
 # CONFIG_STM32_HAVE_ADC3 is not set
 # CONFIG_STM32_HAVE_ADC4 is not set
 # CONFIG_STM32_HAVE_ADC1_DMA is not set
@@ -369,7 +372,6 @@ CONFIG_STM32_HAVE_I2C2=y
 # CONFIG_STM32_HAVE_SAIPLL is not set
 # CONFIG_STM32_HAVE_I2SPLL is not set
 # CONFIG_STM32_ADC1 is not set
-# CONFIG_STM32_ADC2 is not set
 CONFIG_STM32_BKP=y
 # CONFIG_STM32_CEC is not set
 # CONFIG_STM32_CRC is not set
@@ -413,6 +415,10 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 # CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG is not set
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -426,9 +432,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -678,7 +692,12 @@ CONFIG_RTC=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -686,6 +705,7 @@ CONFIG_RTC=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -697,6 +717,8 @@ CONFIG_RTC=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -746,15 +768,18 @@ CONFIG_USART1_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -799,11 +824,6 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -879,6 +899,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -913,10 +934,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -925,17 +946,17 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -943,16 +964,16 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -976,8 +997,8 @@ CONFIG_EXAMPLES_NSH=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1100,12 +1121,12 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1113,6 +1134,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/teensy-3.x/nsh/defconfig b/configs/teensy-3.x/nsh/defconfig
index d1d1c6acf0..cc089e31f5 100644
--- a/configs/teensy-3.x/nsh/defconfig
+++ b/configs/teensy-3.x/nsh/defconfig
@@ -41,14 +41,16 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -79,6 +81,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 CONFIG_ARCH_CHIP_KINETIS=y
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -96,7 +99,11 @@ CONFIG_ARCH_CHIP_KINETIS=y
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -106,12 +113,23 @@ CONFIG_ARCH_CORTEXM4=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="kinetis"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARCH_HAVE_DPFPU is not set
 # CONFIG_ARCH_FPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
 #
@@ -121,6 +139,7 @@ CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARW is not set
 # CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
 # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDW is not set
@@ -152,6 +171,7 @@ CONFIG_ARCH_CHIP_MK20DX256VLH7=y
 # CONFIG_ARCH_CHIP_MK40X256VMD100 is not set
 # CONFIG_ARCH_CHIP_MK60N256VLQ100 is not set
 # CONFIG_ARCH_CHIP_MK60N256VMD100 is not set
+# CONFIG_ARCH_CHIP_MK60N512VLL100 is not set
 # CONFIG_ARCH_CHIP_MK60N512VLQ100 is not set
 # CONFIG_ARCH_CHIP_MK60N512VMD100 is not set
 # CONFIG_ARCH_CHIP_MK60X256VLQ100 is not set
@@ -224,11 +244,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
 # CONFIG_ARCH_USE_MPU is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
@@ -322,6 +345,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -372,9 +396,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -405,14 +430,20 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 CONFIG_SPI=y
+# CONFIG_SPI_SLAVE is not set
 CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_CMDDATA is not set
 # CONFIG_SPI_CALLBACK is not set
 # CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_HWFEATURES is not set
+# CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -426,8 +457,23 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -437,6 +483,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -460,14 +508,11 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -484,19 +529,23 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -528,16 +577,12 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_FAT is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_BINFS is not set
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -556,6 +601,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -599,10 +648,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -621,11 +674,14 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 
+#
+# CAN Utilities
+#
+
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -633,11 +689,11 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -645,33 +701,44 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -683,30 +750,28 @@ CONFIG_EXAMPLES_NSH=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -726,6 +791,7 @@ CONFIG_NSH_BUILTIN_APPS=y
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
@@ -734,6 +800,7 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_DD is not set
 # CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -742,8 +809,10 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 # CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -761,8 +830,10 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
@@ -789,6 +860,8 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -802,16 +875,19 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
-# CONFIG_SYSTEM_POWEROFF is not set
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/teensy-3.x/usbnsh/defconfig b/configs/teensy-3.x/usbnsh/defconfig
index c1038bed80..41fb535e7a 100644
--- a/configs/teensy-3.x/usbnsh/defconfig
+++ b/configs/teensy-3.x/usbnsh/defconfig
@@ -42,10 +42,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -443,6 +444,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -470,6 +473,7 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -482,6 +486,7 @@ CONFIG_SPI_EXCHANGE=y
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
 CONFIG_SERIAL_REMOVABLE=y
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -574,15 +579,18 @@ CONFIG_CDCACM_PRODUCTSTR="CDC/ACM Serial"
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -620,11 +628,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -698,6 +701,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/teensy-lc/nsh/defconfig b/configs/teensy-lc/nsh/defconfig
index a397ec0768..73ad8e5634 100644
--- a/configs/teensy-lc/nsh/defconfig
+++ b/configs/teensy-lc/nsh/defconfig
@@ -16,7 +16,7 @@ CONFIG_HOST_LINUX=y
 #
 # Build Configuration
 #
-CONFIG_APPS_DIR="../apps"
+# CONFIG_APPS_DIR="../apps"
 CONFIG_BUILD_FLAT=y
 # CONFIG_BUILD_2PASS is not set
 
@@ -37,18 +37,23 @@ CONFIG_INTELHEX_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 CONFIG_DEBUG_FEATURES=y
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-CONFIG_DEBUG_INFO=y
+
+#
+# Debug SYSLOG Output Controls
+#
+# CONFIG_DEBUG_ERROR is not set
+# CONFIG_DEBUG_ASSERTIONS is not set
 
 #
 # Subsystem Debug Options
 #
-# CONFIG_DEBUG_AUDIO is not set
 # CONFIG_DEBUG_BINFMT is not set
 # CONFIG_DEBUG_FS is not set
 # CONFIG_DEBUG_GRAPHICS is not set
@@ -65,12 +70,12 @@ CONFIG_DEBUG_INFO=y
 # Driver Debug Options
 #
 # CONFIG_DEBUG_LEDS is not set
-# CONFIG_DEBUG_ANALOG is not set
 # CONFIG_DEBUG_GPIO is not set
 # CONFIG_DEBUG_PWM is not set
 # CONFIG_DEBUG_SPI is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 CONFIG_STACK_COLORATION=y
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -102,10 +107,12 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 CONFIG_ARCH_CHIP_KL=y
 # CONFIG_ARCH_CHIP_LM is not set
 # CONFIG_ARCH_CHIP_TIVA is not set
+# CONFIG_ARCH_CHIP_LPC11XX is not set
 # CONFIG_ARCH_CHIP_LPC17XX is not set
 # CONFIG_ARCH_CHIP_LPC214X is not set
 # CONFIG_ARCH_CHIP_LPC2378 is not set
@@ -114,10 +121,15 @@ CONFIG_ARCH_CHIP_KL=y
 # CONFIG_ARCH_CHIP_NUC1XX is not set
 # CONFIG_ARCH_CHIP_SAMA5 is not set
 # CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -127,13 +139,24 @@ CONFIG_ARCH_CORTEXM0=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv6-m"
 CONFIG_ARCH_CHIP="kl"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 
 #
 # ARMV6M Configuration Options
@@ -214,11 +237,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
@@ -273,8 +299,11 @@ CONFIG_NSH_MMCSDMINOR=0
 # Board-Specific Options
 #
 CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_RESET is not set
+# CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
 # CONFIG_BOARDCTL_ADCTEST is not set
+# CONFIG_BOARDCTL_PWMTEST is not set
 # CONFIG_BOARDCTL_GRAPHICS is not set
 # CONFIG_BOARDCTL_IOCTL is not set
 
@@ -311,6 +340,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=8
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -355,9 +385,10 @@ CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
 CONFIG_SIG_SIGCONDTIMEDOUT=16
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -388,14 +419,20 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 CONFIG_PWM=y
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 CONFIG_SPI=y
+# CONFIG_SPI_SLAVE is not set
 CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_CMDDATA is not set
 # CONFIG_SPI_CALLBACK is not set
 # CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_HWFEATURES is not set
+# CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -409,8 +446,23 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -420,6 +472,8 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -443,14 +497,11 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_SERIAL_TIOCSERGSTRUCT is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
@@ -468,19 +519,23 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -509,11 +564,7 @@ CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y
 # CONFIG_FS_RAMMAP is not set
 # CONFIG_FS_BINFS is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -533,6 +584,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -573,10 +628,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -602,11 +661,14 @@ CONFIG_HAVE_CXXINITIALIZE=y
 #
 CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 
+#
+# CAN Utilities
+#
+
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_CXXTEST is not set
@@ -616,10 +678,11 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -628,36 +691,46 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NSH_CXXINITIALIZE is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PWM is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_PWM is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
-# CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -669,32 +742,28 @@ CONFIG_EXAMPLES_NSH=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_PPPD is not set
-
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
 
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -713,6 +782,7 @@ CONFIG_NSH_BUILTIN_APPS=y
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+CONFIG_NSH_DISABLE_BASENAME=y
 # CONFIG_NSH_DISABLE_CAT is not set
 CONFIG_NSH_DISABLE_CD=y
 CONFIG_NSH_DISABLE_CP=y
@@ -721,6 +791,7 @@ CONFIG_NSH_DISABLE_DATE=y
 CONFIG_NSH_DISABLE_DD=y
 CONFIG_NSH_DISABLE_DF=y
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+CONFIG_NSH_DISABLE_DIRNAME=y
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -729,8 +800,10 @@ CONFIG_NSH_DISABLE_GET=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 CONFIG_NSH_DISABLE_IFCONFIG=y
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 CONFIG_NSH_DISABLE_LOSETUP=y
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 CONFIG_NSH_DISABLE_MKDIR=y
@@ -748,8 +821,10 @@ CONFIG_NSH_DISABLE_RMDIR=y
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+CONFIG_NSH_DISABLE_TIME=y
 # CONFIG_NSH_DISABLE_TEST is not set
 CONFIG_NSH_DISABLE_UMOUNT=y
+CONFIG_NSH_DISABLE_UNAME=y
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 CONFIG_NSH_DISABLE_WGET=y
@@ -773,6 +848,8 @@ CONFIG_NSH_DISABLESCRIPT=y
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -786,20 +863,23 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
-# CONFIG_SYSTEM_POWEROFF is not set
-# CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 CONFIG_SYSTEM_STACKMONITOR=y
 CONFIG_SYSTEM_STACKMONITOR_STACKSIZE=2048
 CONFIG_SYSTEM_STACKMONITOR_PRIORITY=50
 CONFIG_SYSTEM_STACKMONITOR_INTERVAL=2
+# CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/tm4c123g-launchpad/nsh/defconfig b/configs/tm4c123g-launchpad/nsh/defconfig
index 2e6208a3e3..0a6233316e 100644
--- a/configs/tm4c123g-launchpad/nsh/defconfig
+++ b/configs/tm4c123g-launchpad/nsh/defconfig
@@ -37,14 +37,16 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,10 +77,12 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
 CONFIG_ARCH_CHIP_TIVA=y
+# CONFIG_ARCH_CHIP_LPC11XX is not set
 # CONFIG_ARCH_CHIP_LPC17XX is not set
 # CONFIG_ARCH_CHIP_LPC214X is not set
 # CONFIG_ARCH_CHIP_LPC2378 is not set
@@ -87,10 +91,15 @@ CONFIG_ARCH_CHIP_TIVA=y
 # CONFIG_ARCH_CHIP_NUC1XX is not set
 # CONFIG_ARCH_CHIP_SAMA5 is not set
 # CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -100,8 +109,17 @@ CONFIG_ARCH_CORTEXM4=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="tiva"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
@@ -109,6 +127,8 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
 CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARCH_HAVE_DPFPU is not set
 # CONFIG_ARCH_FPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
 #
@@ -118,11 +138,13 @@ CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
 CONFIG_ARMV7M_OABI_TOOLCHAIN=y
+# CONFIG_ARMV7M_HAVE_STACKCHECK is not set
 # CONFIG_ARMV7M_ITMSYSLOG is not set
 
 #
@@ -197,7 +219,6 @@ CONFIG_TIVA_SSI0=y
 # CONFIG_TIVA_TIMER3 is not set
 # CONFIG_TIVA_TIMER4 is not set
 # CONFIG_TIVA_TIMER5 is not set
-# CONFIG_TIVA_ETHERNET is not set
 # CONFIG_TIVA_FLASH is not set
 
 #
@@ -247,11 +268,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
 # CONFIG_ARCH_USE_MPU is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
@@ -311,6 +335,14 @@ CONFIG_NSH_MMCSDMINOR=0
 #
 # Board-Specific Options
 #
+CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_RESET is not set
+# CONFIG_BOARDCTL_UNIQUEID is not set
+# CONFIG_BOARDCTL_TSCTEST is not set
+# CONFIG_BOARDCTL_ADCTEST is not set
+# CONFIG_BOARDCTL_PWMTEST is not set
+# CONFIG_BOARDCTL_GRAPHICS is not set
+# CONFIG_BOARDCTL_IOCTL is not set
 
 #
 # RTOS Features
@@ -345,6 +377,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -395,9 +428,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -428,11 +462,16 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 # CONFIG_SPI is not set
 # CONFIG_I2S is not set
+
+#
+# Timer Driver Support
+#
 # CONFIG_TIMER is not set
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
@@ -441,8 +480,23 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -452,6 +506,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -475,14 +531,11 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -499,19 +552,23 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -543,14 +600,11 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_FAT is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_BINFS is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -570,6 +624,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -609,13 +667,18 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
 # CONFIG_LIBC_PERROR_STDOUT is not set
 CONFIG_ARCH_LOWPUTC=y
 # CONFIG_LIBC_LOCALTIME is not set
+# CONFIG_TIME_EXTENDED is not set
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -634,11 +697,14 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 
+#
+# CAN Utilities
+#
+
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -646,11 +712,11 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -658,35 +724,45 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
-# CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -698,35 +774,28 @@ CONFIG_EXAMPLES_NSH=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_TFTPC is not set
-# CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_NETLIB is not set
-# CONFIG_NETUTILS_WEBCLIENT is not set
-# CONFIG_NETUTILS_PPPD is not set
-
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
 
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -746,13 +815,16 @@ CONFIG_NSH_BUILTIN_APPS=y
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
 # CONFIG_NSH_DISABLE_CMP is not set
+CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_DD is not set
 # CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -761,8 +833,10 @@ CONFIG_NSH_BUILTIN_APPS=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 # CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -780,8 +854,10 @@ CONFIG_NSH_BUILTIN_APPS=y
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
@@ -808,7 +884,8 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
-CONFIG_LIB_BOARDCTL=y
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -822,120 +899,19 @@ CONFIG_LIB_BOARDCTL=y
 #
 # System Libraries and NSH Add-Ons
 #
-
-#
-# Custom Free Memory Command
-#
-# CONFIG_SYSTEM_FREE is not set
-
-#
-# EMACS-like Command Line Editor
-#
 # CONFIG_SYSTEM_CLE is not set
-
-#
-# CU Minimal Terminal
-#
 # CONFIG_SYSTEM_CUTERM is not set
-
-#
-# FLASH Program Installation
-#
-# CONFIG_SYSTEM_INSTALL is not set
-
-#
-# FLASH Erase-all Command
-#
-
-#
-# Intel HEX to binary conversion
-#
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-
-#
-# I2C tool
-#
-
-#
-# INI File Parser
-#
-# CONFIG_FSUTILS_INIFILE is not set
-
-#
-# NxPlayer media player library / command Line
-#
-
-#
-# RAM test
-#
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
-
-#
-# readline()
-#
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
-
-#
-# P-Code Support
-#
-
-#
-# PHY Tool
-#
-
-#
-# Power Off
-#
-# CONFIG_SYSTEM_POWEROFF is not set
-
-#
-# RAMTRON
-#
-
-#
-# SD Card
-#
-
-#
-# Sudoku
-#
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-
-#
-# Sysinfo
-#
-
-#
-# Temperature
-#
-
-#
-# VI Work-Alike Editor
-#
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
-
-#
-# Stack Monitor
-#
-
-#
-# USB CDC/ACM Device Commands
-#
-
-#
-# USB Composite Device Commands
-#
-
-#
-# USB Mass Storage Device Commands
-#
-
-#
-# USB Monitor
-#
-
-#
-# Zmodem Commands
-#
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/tm4c1294-launchpad/ipv6/defconfig b/configs/tm4c1294-launchpad/ipv6/defconfig
index a51d473b00..47b86bf68c 100644
--- a/configs/tm4c1294-launchpad/ipv6/defconfig
+++ b/configs/tm4c1294-launchpad/ipv6/defconfig
@@ -42,10 +42,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -518,6 +519,7 @@ CONFIG_I2C_DRIVER=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -551,6 +553,8 @@ CONFIG_ARCH_PHY_INTERRUPT=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -600,15 +604,18 @@ CONFIG_UART0_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -754,11 +761,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -832,6 +834,7 @@ CONFIG_LIBC_NETDB=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/tm4c1294-launchpad/nsh/defconfig b/configs/tm4c1294-launchpad/nsh/defconfig
index ef2b756981..15a4e83331 100644
--- a/configs/tm4c1294-launchpad/nsh/defconfig
+++ b/configs/tm4c1294-launchpad/nsh/defconfig
@@ -42,10 +42,11 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -518,6 +519,7 @@ CONFIG_I2C_DRIVER=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -553,6 +555,8 @@ CONFIG_ARCH_PHY_INTERRUPT=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -602,15 +606,18 @@ CONFIG_UART0_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -760,11 +767,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -844,6 +846,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/twr-k60n512/nsh/defconfig b/configs/twr-k60n512/nsh/defconfig
index 120f1f778b..65e1a1a01c 100644
--- a/configs/twr-k60n512/nsh/defconfig
+++ b/configs/twr-k60n512/nsh/defconfig
@@ -37,14 +37,16 @@ CONFIG_INTELHEX_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,6 +77,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 CONFIG_ARCH_CHIP_KINETIS=y
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -92,7 +95,11 @@ CONFIG_ARCH_CHIP_KINETIS=y
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -102,12 +109,23 @@ CONFIG_ARCH_CORTEXM4=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="kinetis"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARCH_HAVE_DPFPU is not set
 # CONFIG_ARCH_FPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
 #
@@ -117,6 +135,7 @@ CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
@@ -128,6 +147,14 @@ CONFIG_ARMV7M_OABI_TOOLCHAIN=y
 #
 # Kinetis Configuration Options
 #
+# CONFIG_ARCH_CHIP_MK20DN32VLH5 is not set
+# CONFIG_ARCH_CHIP_MK20DX32VLH5 is not set
+# CONFIG_ARCH_CHIP_MK20DN64VLH5 is not set
+# CONFIG_ARCH_CHIP_MK20DX64VLH5 is not set
+# CONFIG_ARCH_CHIP_MK20DN128VLH5 is not set
+# CONFIG_ARCH_CHIP_MK20DX128VLH5 is not set
+# CONFIG_ARCH_CHIP_MK20DX64VLH7 is not set
+# CONFIG_ARCH_CHIP_MK20DX128VLH7 is not set
 # CONFIG_ARCH_CHIP_MK20DX256VLH7 is not set
 # CONFIG_ARCH_CHIP_MK40N512VLQ100 is not set
 # CONFIG_ARCH_CHIP_MK40N512VMD100 is not set
@@ -137,6 +164,7 @@ CONFIG_ARMV7M_OABI_TOOLCHAIN=y
 # CONFIG_ARCH_CHIP_MK40X256VMD100 is not set
 # CONFIG_ARCH_CHIP_MK60N256VLQ100 is not set
 # CONFIG_ARCH_CHIP_MK60N256VMD100 is not set
+# CONFIG_ARCH_CHIP_MK60N512VLL100 is not set
 # CONFIG_ARCH_CHIP_MK60N512VLQ100 is not set
 CONFIG_ARCH_CHIP_MK60N512VMD100=y
 # CONFIG_ARCH_CHIP_MK60X256VLQ100 is not set
@@ -210,11 +238,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
 # CONFIG_ARCH_USE_MPU is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
@@ -310,6 +341,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -360,9 +392,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -393,6 +426,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -410,8 +444,23 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -421,6 +470,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -444,14 +495,11 @@ CONFIG_UART3_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART3_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -468,19 +516,23 @@ CONFIG_UART3_PARITY=0
 CONFIG_UART3_2STOP=0
 # CONFIG_UART3_IFLOWCONTROL is not set
 # CONFIG_UART3_OFLOWCONTROL is not set
+# CONFIG_UART3_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -513,18 +565,16 @@ CONFIG_FS_FAT=y
 # CONFIG_FAT_LCNAMES is not set
 # CONFIG_FAT_LFN is not set
 # CONFIG_FS_FATTIME is not set
+# CONFIG_FAT_FORCE_INDIRECT is not set
 # CONFIG_FAT_DMAMEMORY is not set
+# CONFIG_FAT_DIRECT_RETRY is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -543,6 +593,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -588,10 +642,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -606,26 +665,26 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FSTEST is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -633,18 +692,19 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -652,14 +712,25 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -672,30 +743,28 @@ CONFIG_EXAMPLES_NSH=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -714,6 +783,7 @@ CONFIG_NSH_NESTDEPTH=3
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
@@ -722,6 +792,7 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_DD is not set
 # CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -730,8 +801,10 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 # CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -750,8 +823,10 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
@@ -778,6 +853,8 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -791,16 +868,19 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
-# CONFIG_SYSTEM_POWEROFF is not set
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/u-blox-c027/nsh/defconfig b/configs/u-blox-c027/nsh/defconfig
index 07bca63b71..eff1c86df1 100644
--- a/configs/u-blox-c027/nsh/defconfig
+++ b/configs/u-blox-c027/nsh/defconfig
@@ -42,9 +42,14 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 CONFIG_DEBUG_FEATURES=y
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-# CONFIG_DEBUG_INFO is not set
+
+#
+# Debug SYSLOG Output Controls
+#
+# CONFIG_DEBUG_ERROR is not set
+# CONFIG_DEBUG_ASSERTIONS is not set
 
 #
 # Subsystem Debug Options
@@ -66,10 +71,10 @@ CONFIG_DEBUG_FEATURES=y
 # Driver Debug Options
 #
 # CONFIG_DEBUG_LEDS is not set
-# CONFIG_DEBUG_ANALOG is not set
 CONFIG_DEBUG_GPIO=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -259,7 +264,6 @@ CONFIG_NET_EMACRAM_SIZE=7296
 CONFIG_NET_NTXDESC=6
 CONFIG_NET_NRXDESC=6
 # CONFIG_NET_WOL is not set
-# CONFIG_NET_REGDEBUG is not set
 # CONFIG_NET_HASH is not set
 # CONFIG_LPC17_MULTICAST is not set
 
@@ -506,6 +510,7 @@ CONFIG_DEV_ZERO=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 CONFIG_MODEM=y
 CONFIG_MODEM_U_BLOX=y
@@ -574,6 +579,8 @@ CONFIG_ETH1_PHY_NONE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -668,15 +675,18 @@ CONFIG_UART3_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -781,7 +791,6 @@ CONFIG_NET_ARP_MAXAGE=120
 CONFIG_NET_ARP_SEND=y
 CONFIG_ARP_SEND_MAXTRIES=5
 CONFIG_ARP_SEND_DELAYMSEC=20
-# CONFIG_NET_ARP_DUMP is not set
 
 #
 # Network I/O Buffer Support
@@ -848,11 +857,6 @@ CONFIG_FS_PROCFS=y
 # CONFIG_FS_PROCFS_EXCLUDE_NET is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -934,6 +938,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/viewtool-stm32f107/highpri/defconfig b/configs/viewtool-stm32f107/highpri/defconfig
index c7b9fdb040..578e69700c 100644
--- a/configs/viewtool-stm32f107/highpri/defconfig
+++ b/configs/viewtool-stm32f107/highpri/defconfig
@@ -46,10 +46,12 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -207,6 +209,7 @@ CONFIG_ARCH_CHIP_STM32F103VC=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -416,6 +419,10 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 # CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG is not set
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -427,9 +434,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -677,7 +692,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -685,6 +705,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -696,6 +717,8 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -746,15 +769,18 @@ CONFIG_USART1_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -791,11 +817,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -868,6 +889,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -897,10 +919,10 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -909,18 +931,18 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -934,9 +956,9 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -958,8 +980,8 @@ CONFIG_ARCH_HAVE_TLS=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -993,16 +1015,16 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/viewtool-stm32f107/netnsh/defconfig b/configs/viewtool-stm32f107/netnsh/defconfig
index a7ef0e16ba..93163ab9c2 100644
--- a/configs/viewtool-stm32f107/netnsh/defconfig
+++ b/configs/viewtool-stm32f107/netnsh/defconfig
@@ -46,10 +46,12 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -720,6 +722,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -773,6 +776,8 @@ CONFIG_ETH0_PHY_DP83848C=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -823,15 +828,18 @@ CONFIG_USART1_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -981,11 +989,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -1065,6 +1068,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/viewtool-stm32f107/nsh/defconfig b/configs/viewtool-stm32f107/nsh/defconfig
index 57540eba2d..8a9aec6580 100644
--- a/configs/viewtool-stm32f107/nsh/defconfig
+++ b/configs/viewtool-stm32f107/nsh/defconfig
@@ -46,10 +46,12 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -207,6 +209,7 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARCH_CHIP_STM32F103VE is not set
 # CONFIG_ARCH_CHIP_STM32F103ZE is not set
 # CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
 CONFIG_ARCH_CHIP_STM32F107VC=y
 # CONFIG_ARCH_CHIP_STM32F205RG is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
@@ -414,6 +417,10 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 # CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG is not set
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
+
+#
+# Timer Configuration
+#
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -425,9 +432,17 @@ CONFIG_STM32_SERIALDRIVER=y
 #
 # U[S]ART Configuration
 #
+
+#
+# U[S]ART Device Configuration
+#
 CONFIG_STM32_USART1_SERIALDRIVER=y
 # CONFIG_STM32_USART1_1WIREDRIVER is not set
 # CONFIG_USART1_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
@@ -675,7 +690,12 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
@@ -683,6 +703,7 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -694,6 +715,8 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -744,15 +767,18 @@ CONFIG_USART1_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -790,11 +816,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -867,6 +888,7 @@ CONFIG_ARCH_HAVE_TLS=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -901,10 +923,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -913,17 +935,17 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -931,16 +953,16 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
@@ -962,8 +984,8 @@ CONFIG_EXAMPLES_NSH=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -1088,12 +1110,12 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
@@ -1101,6 +1123,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_TABCOMPLETION is not set
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/zkit-arm-1769/hello/defconfig b/configs/zkit-arm-1769/hello/defconfig
index 3b3c51a7e5..183e232cfb 100644
--- a/configs/zkit-arm-1769/hello/defconfig
+++ b/configs/zkit-arm-1769/hello/defconfig
@@ -37,14 +37,16 @@ CONFIG_INTELHEX_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,6 +77,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -92,7 +95,11 @@ CONFIG_ARCH_CHIP_LPC17XX=y
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -102,14 +109,25 @@ CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="lpc17xx"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
 #
@@ -119,6 +137,7 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
@@ -224,11 +243,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
 # CONFIG_ARCH_USE_MPU is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
@@ -273,6 +295,7 @@ CONFIG_RAM_SIZE=32768
 #
 # CONFIG_ARCH_BOARD_LPCXPRESSO is not set
 # CONFIG_ARCH_BOARD_MBED is not set
+# CONFIG_ARCH_BOARD_U_BLOX_C027 is not set
 CONFIG_ARCH_BOARD_ZKITARM=y
 # CONFIG_ARCH_BOARD_CUSTOM is not set
 CONFIG_ARCH_BOARD="zkit-arm-1769"
@@ -321,6 +344,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="hello_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -351,6 +375,7 @@ CONFIG_NAME_MAX=32
 # CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
+# CONFIG_SIG_EVTHREAD is not set
 
 #
 # Signal Numbers
@@ -359,9 +384,10 @@ CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
 CONFIG_SIG_SIGWORK=17
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 CONFIG_SCHED_WORKQUEUE=y
 CONFIG_SCHED_HPWORK=y
@@ -395,6 +421,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -412,8 +439,23 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 CONFIG_NETDEVICES=y
@@ -421,7 +463,11 @@ CONFIG_NETDEVICES=y
 #
 # General Ethernet MAC Driver Options
 #
+# CONFIG_NETDEV_LOOPBACK is not set
+# CONFIG_NETDEV_TELNET is not set
 # CONFIG_NETDEV_MULTINIC is not set
+CONFIG_ARCH_HAVE_NETDEV_STATISTICS=y
+# CONFIG_NETDEV_LATEINIT is not set
 
 #
 # External Ethernet MAC Device Support
@@ -431,6 +477,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_ENCX24J600 is not set
 # CONFIG_NET_E1000 is not set
 # CONFIG_NET_SLIP is not set
+# CONFIG_NET_FTMAC100 is not set
 # CONFIG_NET_VNET is not set
 
 #
@@ -449,6 +496,7 @@ CONFIG_ETH0_PHY_DP83848C=y
 # CONFIG_ETH0_PHY_LAN8720 is not set
 # CONFIG_ETH0_PHY_LAN8740 is not set
 # CONFIG_ETH0_PHY_LAN8740A is not set
+# CONFIG_ETH0_PHY_LAN8742A is not set
 # CONFIG_ETH0_PHY_DM9161 is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
@@ -457,6 +505,8 @@ CONFIG_ETH0_PHY_DP83848C=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -480,13 +530,10 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -503,19 +550,23 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -539,6 +590,7 @@ CONFIG_NET_GUARDSIZE=2
 #
 # CONFIG_NET_MULTILINK is not set
 CONFIG_NET_ETHERNET=y
+# CONFIG_NET_LOOPBACK is not set
 # CONFIG_NET_TUN is not set
 
 #
@@ -624,6 +676,7 @@ CONFIG_IOB_NCHAINS=8
 # Routing Table Configuration
 #
 # CONFIG_NET_ROUTE is not set
+CONFIG_NET_HOSTNAME=""
 
 #
 # Crypto API
@@ -647,15 +700,11 @@ CONFIG_FS_READABLE=y
 # CONFIG_FS_FAT is not set
 # CONFIG_FS_NXFFS is not set
 CONFIG_FS_ROMFS=y
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -674,6 +723,10 @@ CONFIG_MM_REGIONS=2
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -717,10 +770,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -735,14 +793,13 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -750,11 +807,13 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 CONFIG_EXAMPLES_HELLO=y
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
+CONFIG_EXAMPLES_HELLO_PRIORITY=100
+CONFIG_EXAMPLES_HELLO_STACKSIZE=2048
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -763,19 +822,20 @@ CONFIG_EXAMPLES_HELLO=y
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -784,19 +844,30 @@ CONFIG_EXAMPLES_HELLO=y
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_UNIONFS is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_WGET is not set
 # CONFIG_EXAMPLES_XMLRPC is not set
 
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
 #
 # Graphics Support
 #
@@ -808,33 +879,31 @@ CONFIG_EXAMPLES_HELLO=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
+# CONFIG_NETUTILS_CHAT is not set
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
+# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TELNETD is not set
 # CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_NETLIB is not set
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
@@ -852,15 +921,16 @@ CONFIG_EXAMPLES_HELLO=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+# CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
-# CONFIG_SYSTEM_POWEROFF is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/zkit-arm-1769/nsh/defconfig b/configs/zkit-arm-1769/nsh/defconfig
index 723ad67184..10d3e98357 100644
--- a/configs/zkit-arm-1769/nsh/defconfig
+++ b/configs/zkit-arm-1769/nsh/defconfig
@@ -42,10 +42,11 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -455,6 +456,8 @@ CONFIG_SPI=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -482,6 +485,7 @@ CONFIG_SPI=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -545,6 +549,8 @@ CONFIG_ETH0_PHY_DP83848C=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -594,15 +600,18 @@ CONFIG_UART0_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -756,11 +765,6 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -844,6 +848,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/zkit-arm-1769/nxhello/defconfig b/configs/zkit-arm-1769/nxhello/defconfig
index c2248afe13..6412e6686f 100644
--- a/configs/zkit-arm-1769/nxhello/defconfig
+++ b/configs/zkit-arm-1769/nxhello/defconfig
@@ -42,10 +42,11 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -455,6 +456,8 @@ CONFIG_SPI_CMDDATA=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -519,6 +522,7 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -582,6 +586,8 @@ CONFIG_ETH0_PHY_DP83848C=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -631,15 +637,18 @@ CONFIG_UART0_2STOP=0
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -786,11 +795,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -959,6 +963,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/zkit-arm-1769/thttpd/defconfig b/configs/zkit-arm-1769/thttpd/defconfig
index 6029f85b55..124e511bfc 100644
--- a/configs/zkit-arm-1769/thttpd/defconfig
+++ b/configs/zkit-arm-1769/thttpd/defconfig
@@ -37,14 +37,16 @@ CONFIG_INTELHEX_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,6 +77,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -92,7 +95,11 @@ CONFIG_ARCH_CHIP_LPC17XX=y
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 # CONFIG_ARCH_ARM7TDMI is not set
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -102,14 +109,25 @@ CONFIG_ARCH_CORTEXM3=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="lpc17xx"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
 # CONFIG_ARMV7M_USEBASEPRI is not set
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARMV7M_LAZYFPU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
 
 #
@@ -119,6 +137,7 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
@@ -224,11 +243,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
 # CONFIG_ARCH_USE_MPU is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
@@ -273,6 +295,7 @@ CONFIG_RAM_SIZE=32768
 #
 # CONFIG_ARCH_BOARD_LPCXPRESSO is not set
 # CONFIG_ARCH_BOARD_MBED is not set
+# CONFIG_ARCH_BOARD_U_BLOX_C027 is not set
 CONFIG_ARCH_BOARD_ZKITARM=y
 # CONFIG_ARCH_BOARD_CUSTOM is not set
 CONFIG_ARCH_BOARD="zkit-arm-1769"
@@ -321,6 +344,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="thttp_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -351,6 +375,7 @@ CONFIG_NAME_MAX=32
 # CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
+# CONFIG_SIG_EVTHREAD is not set
 
 #
 # Signal Numbers
@@ -359,9 +384,10 @@ CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
 CONFIG_SIG_SIGWORK=17
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 CONFIG_SCHED_WORKQUEUE=y
 CONFIG_SCHED_HPWORK=y
@@ -395,6 +421,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -412,8 +439,23 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 CONFIG_NETDEVICES=y
@@ -421,7 +463,11 @@ CONFIG_NETDEVICES=y
 #
 # General Ethernet MAC Driver Options
 #
+# CONFIG_NETDEV_LOOPBACK is not set
+# CONFIG_NETDEV_TELNET is not set
 # CONFIG_NETDEV_MULTINIC is not set
+CONFIG_ARCH_HAVE_NETDEV_STATISTICS=y
+# CONFIG_NETDEV_LATEINIT is not set
 
 #
 # External Ethernet MAC Device Support
@@ -431,6 +477,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_ENCX24J600 is not set
 # CONFIG_NET_E1000 is not set
 # CONFIG_NET_SLIP is not set
+# CONFIG_NET_FTMAC100 is not set
 # CONFIG_NET_VNET is not set
 
 #
@@ -440,6 +487,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_ETH0_PHY_NONE is not set
 # CONFIG_ETH0_PHY_AM79C874 is not set
 # CONFIG_ETH0_PHY_KS8721 is not set
+# CONFIG_ETH0_PHY_KSZ8041 is not set
 # CONFIG_ETH0_PHY_KSZ8051 is not set
 # CONFIG_ETH0_PHY_KSZ8061 is not set
 # CONFIG_ETH0_PHY_KSZ8081 is not set
@@ -448,6 +496,7 @@ CONFIG_ETH0_PHY_DP83848C=y
 # CONFIG_ETH0_PHY_LAN8720 is not set
 # CONFIG_ETH0_PHY_LAN8740 is not set
 # CONFIG_ETH0_PHY_LAN8740A is not set
+# CONFIG_ETH0_PHY_LAN8742A is not set
 # CONFIG_ETH0_PHY_DM9161 is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
@@ -456,6 +505,8 @@ CONFIG_ETH0_PHY_DP83848C=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -479,13 +530,10 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -502,19 +550,23 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -538,6 +590,7 @@ CONFIG_NET_GUARDSIZE=2
 #
 # CONFIG_NET_MULTILINK is not set
 CONFIG_NET_ETHERNET=y
+# CONFIG_NET_LOOPBACK is not set
 # CONFIG_NET_TUN is not set
 
 #
@@ -623,6 +676,7 @@ CONFIG_IOB_NCHAINS=8
 # Routing Table Configuration
 #
 # CONFIG_NET_ROUTE is not set
+CONFIG_NET_HOSTNAME=""
 
 #
 # Crypto API
@@ -646,13 +700,10 @@ CONFIG_FS_READABLE=y
 # CONFIG_FS_FAT is not set
 # CONFIG_FS_NXFFS is not set
 CONFIG_FS_ROMFS=y
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -672,6 +723,10 @@ CONFIG_MM_REGIONS=2
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -715,10 +770,15 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -733,14 +793,13 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -748,11 +807,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -761,19 +820,20 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -782,6 +842,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 CONFIG_EXAMPLES_THTTPD=y
@@ -790,13 +851,24 @@ CONFIG_EXAMPLES_THTTPD_DRIPADDR=0xac100002
 CONFIG_EXAMPLES_THTTPD_NETMASK=0xffffff00
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
+# CONFIG_EXAMPLES_UNIONFS is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_WGET is not set
 # CONFIG_EXAMPLES_XMLRPC is not set
 
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
 #
 # Graphics Support
 #
@@ -808,20 +880,24 @@ CONFIG_EXAMPLES_THTTPD_NETMASK=0xffffff00
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
+# CONFIG_NETUTILS_CHAT is not set
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TELNETD is not set
 CONFIG_NETUTILS_THTTPD=y
@@ -856,16 +932,10 @@ CONFIG_THTTPD_IDLE_SEND_LIMIT_SEC=300
 CONFIG_THTTPD_TILDE_MAP_NONE=y
 # CONFIG_THTTPD_GENERATE_INDICES is not set
 # CONFIG_THTTPD_USE_URLPATTERN is not set
-CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
@@ -883,15 +953,16 @@ CONFIG_NETUTILS_NETLIB=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+# CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
-# CONFIG_SYSTEM_POWEROFF is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/zp214xpa/nsh/defconfig b/configs/zp214xpa/nsh/defconfig
index 8535cf24f2..4f9e75d13b 100644
--- a/configs/zp214xpa/nsh/defconfig
+++ b/configs/zp214xpa/nsh/defconfig
@@ -37,14 +37,16 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,6 +77,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
@@ -92,7 +95,11 @@ CONFIG_ARCH_CHIP_LPC214X=y
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 CONFIG_ARCH_ARM7TDMI=y
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -102,10 +109,21 @@ CONFIG_ARCH_ARM7TDMI=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="arm"
 CONFIG_ARCH_CHIP="lpc214x"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 # CONFIG_ARCH_LOWVECTORS is not set
 
@@ -158,6 +176,7 @@ CONFIG_LPC214X_UART1=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
@@ -251,6 +270,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=0
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -301,9 +321,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -334,6 +355,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -352,8 +374,21 @@ CONFIG_DEV_NULL=y
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -363,6 +398,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -386,14 +423,11 @@ CONFIG_UART1_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_UART1_SERIAL_CONSOLE is not set
@@ -411,6 +445,7 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 
 #
 # UART1 Configuration
@@ -423,19 +458,23 @@ CONFIG_UART1_PARITY=0
 CONFIG_UART1_2STOP=0
 # CONFIG_UART1_IFLOWCONTROL is not set
 # CONFIG_UART1_OFLOWCONTROL is not set
+# CONFIG_UART1_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -467,15 +506,11 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_FAT is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -494,6 +529,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -537,11 +576,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -556,14 +598,13 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -571,11 +612,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -583,18 +624,19 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -602,14 +644,24 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -621,30 +673,28 @@ CONFIG_EXAMPLES_NSH=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -663,6 +713,7 @@ CONFIG_NSH_NESTDEPTH=3
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
@@ -671,6 +722,7 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_DD is not set
 # CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -679,8 +731,10 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 # CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -698,6 +752,7 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
 # CONFIG_NSH_DISABLE_UNAME is not set
@@ -727,6 +782,8 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -740,15 +797,19 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/zp214xpa/nxlines/defconfig b/configs/zp214xpa/nxlines/defconfig
index ca43f21181..95d24c8369 100644
--- a/configs/zp214xpa/nxlines/defconfig
+++ b/configs/zp214xpa/nxlines/defconfig
@@ -37,14 +37,16 @@ CONFIG_RAW_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -75,10 +77,12 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
 # CONFIG_ARCH_CHIP_TIVA is not set
+# CONFIG_ARCH_CHIP_LPC11XX is not set
 # CONFIG_ARCH_CHIP_LPC17XX is not set
 CONFIG_ARCH_CHIP_LPC214X=y
 # CONFIG_ARCH_CHIP_LPC2378 is not set
@@ -87,10 +91,15 @@ CONFIG_ARCH_CHIP_LPC214X=y
 # CONFIG_ARCH_CHIP_NUC1XX is not set
 # CONFIG_ARCH_CHIP_SAMA5 is not set
 # CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
 # CONFIG_ARCH_CHIP_SAM34 is not set
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
 CONFIG_ARCH_ARM7TDMI=y
 # CONFIG_ARCH_ARM926EJS is not set
 # CONFIG_ARCH_ARM920T is not set
@@ -100,10 +109,21 @@ CONFIG_ARCH_ARM7TDMI=y
 # CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
 CONFIG_ARCH_FAMILY="arm"
 CONFIG_ARCH_CHIP="lpc214x"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+# CONFIG_ARM_TOOLCHAIN_GNU is not set
 # CONFIG_ARCH_HAVE_FPU is not set
 # CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+# CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 # CONFIG_ARCH_LOWVECTORS is not set
 
@@ -156,11 +176,14 @@ CONFIG_LPC214X_UART1=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+# CONFIG_ARCH_HAVE_RESET is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
 # CONFIG_ARCH_IDLE_CUSTOM is not set
@@ -212,8 +235,10 @@ CONFIG_ARCH_BOARD="zp214xpa"
 # Board-Specific Options
 #
 CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
 # CONFIG_BOARDCTL_ADCTEST is not set
+# CONFIG_BOARDCTL_PWMTEST is not set
 CONFIG_BOARDCTL_GRAPHICS=y
 # CONFIG_BOARDCTL_IOCTL is not set
 
@@ -250,6 +275,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nxlines_main"
 CONFIG_RR_INTERVAL=0
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -300,9 +326,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -333,14 +360,20 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 CONFIG_SPI=y
+# CONFIG_SPI_SLAVE is not set
 # CONFIG_SPI_EXCHANGE is not set
 CONFIG_SPI_CMDDATA=y
 # CONFIG_SPI_CALLBACK is not set
 # CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_HWFEATURES is not set
+# CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -354,10 +387,15 @@ CONFIG_SPI_CMDDATA=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 CONFIG_LCD=y
 
 #
-# Common LCD Settings
+# Common Graphic LCD Settings
 #
 # CONFIG_LCD_CONSOLE is not set
 # CONFIG_LCD_NOGETRUN is not set
@@ -374,6 +412,7 @@ CONFIG_LCD_MAXPOWER=1
 # CONFIG_LCD_UG9664HSWAG01 is not set
 # CONFIG_LCD_UG2864HSWEG01 is not set
 # CONFIG_LCD_UG2832HSWEG04 is not set
+# CONFIG_LCD_SSD1351 is not set
 # CONFIG_LCD_ST7565 is not set
 # CONFIG_LCD_ST7567 is not set
 CONFIG_LCD_UG2864AMBAG01=y
@@ -387,12 +426,17 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_LCD_RPORTRAIT is not set
 # CONFIG_LCD_RLANDSCAPE is not set
 # CONFIG_LCD_ILI9341 is not set
+# CONFIG_LCD_RA8875 is not set
+# CONFIG_SLCD is not set
 
 #
-# Alphanumeric/Segment LCD Devices
+# LED Support
 #
-# CONFIG_LCD_LCD1602 is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -402,6 +446,8 @@ CONFIG_LCD_LANDSCAPE=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -425,13 +471,10 @@ CONFIG_UART1_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_UART1_SERIAL_CONSOLE is not set
@@ -449,6 +492,7 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 
 #
 # UART1 Configuration
@@ -461,19 +505,23 @@ CONFIG_UART1_PARITY=0
 CONFIG_UART1_2STOP=0
 # CONFIG_UART1_IFLOWCONTROL is not set
 # CONFIG_UART1_OFLOWCONTROL is not set
+# CONFIG_UART1_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -505,13 +553,10 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_FAT is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -521,6 +566,7 @@ CONFIG_NX_LCDDRIVER=y
 CONFIG_NX_NPLANES=1
 CONFIG_NX_BGCOLOR=0x0
 CONFIG_NX_WRITEONLY=y
+# CONFIG_NX_UPDATE is not set
 
 #
 # Supported Pixel Depths
@@ -619,6 +665,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -662,10 +712,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -680,14 +734,13 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -695,12 +748,12 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_LCDRW is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -708,9 +761,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 CONFIG_EXAMPLES_NXLINES=y
@@ -725,29 +776,41 @@ CONFIG_EXAMPLES_NXLINES_BORDERCOLOR=0x01
 CONFIG_EXAMPLES_NXLINES_CIRCLECOLOR=0x00
 CONFIG_EXAMPLES_NXLINES_BPP=1
 CONFIG_EXAMPLES_NXLINES_EXTERNINIT=y
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
-# CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -759,27 +822,22 @@ CONFIG_EXAMPLES_NXLINES_EXTERNINIT=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_PPPD is not set
-
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
 
 #
 # NSH Library
@@ -798,15 +856,16 @@ CONFIG_EXAMPLES_NXLINES_EXTERNINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+# CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
-# CONFIG_SYSTEM_POWEROFF is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
-- 
GitLab


From fd1d874a8a058a3e62d41ba788b468b974fe2c66 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Thu, 23 Jun 2016 16:01:45 -0600
Subject: [PATCH 026/229] Refresh all PIC32 configurations

---
 configs/mirtoo/nsh/defconfig              | 123 +++++++++++++------
 configs/mirtoo/nxffs/defconfig            | 139 +++++++++++++++------
 configs/pcblogic-pic32mx/nsh/defconfig    | 127 +++++++++++++------
 configs/pic32mx-starterkit/nsh/defconfig  | 141 ++++++++++++++++------
 configs/pic32mx-starterkit/nsh2/defconfig |  28 +++--
 configs/pic32mx7mmb/nsh/defconfig         |  28 +++--
 configs/pic32mz-starterkit/nsh/defconfig  | 141 ++++++++++++++++------
 configs/sure-pic32mx/nsh/defconfig        | 128 ++++++++++++++------
 configs/sure-pic32mx/usbnsh/defconfig     | 133 ++++++++++++++------
 configs/ubw32/nsh/defconfig               | 133 ++++++++++++++------
 10 files changed, 797 insertions(+), 324 deletions(-)

diff --git a/configs/mirtoo/nsh/defconfig b/configs/mirtoo/nsh/defconfig
index 53c083284a..924327ea7b 100644
--- a/configs/mirtoo/nsh/defconfig
+++ b/configs/mirtoo/nsh/defconfig
@@ -41,13 +41,15 @@ CONFIG_INTELHEX_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -267,12 +269,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
 # CONFIG_ARCH_HAVE_POWEROFF is not set
+# CONFIG_ARCH_HAVE_RESET is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
@@ -363,6 +367,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=0
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -413,9 +418,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -446,6 +452,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -463,8 +470,23 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -474,6 +496,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -497,14 +521,11 @@ CONFIG_UART1_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_UART1_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -521,19 +542,23 @@ CONFIG_UART1_PARITY=0
 CONFIG_UART1_2STOP=0
 # CONFIG_UART1_IFLOWCONTROL is not set
 # CONFIG_UART1_OFLOWCONTROL is not set
+# CONFIG_UART1_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -564,11 +589,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -587,6 +607,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -627,10 +651,13 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+# CONFIG_ARCH_HAVE_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -645,14 +672,13 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -660,11 +686,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -672,18 +698,19 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -691,14 +718,24 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -710,30 +747,28 @@ CONFIG_EXAMPLES_NSH=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -751,6 +786,7 @@ CONFIG_NSH_NESTDEPTH=3
 # Disable Individual commands
 #
 CONFIG_NSH_DISABLE_ADDROUTE=y
+CONFIG_NSH_DISABLE_BASENAME=y
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
@@ -759,6 +795,7 @@ CONFIG_NSH_DISABLE_DATE=y
 CONFIG_NSH_DISABLE_DD=y
 CONFIG_NSH_DISABLE_DF=y
 CONFIG_NSH_DISABLE_DELROUTE=y
+CONFIG_NSH_DISABLE_DIRNAME=y
 # CONFIG_NSH_DISABLE_ECHO is not set
 CONFIG_NSH_DISABLE_EXEC=y
 CONFIG_NSH_DISABLE_EXIT=y
@@ -767,8 +804,10 @@ CONFIG_NSH_DISABLE_GET=y
 # CONFIG_NSH_DISABLE_HELP is not set
 CONFIG_NSH_DISABLE_HEXDUMP=y
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 CONFIG_NSH_DISABLE_LOSETUP=y
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -786,8 +825,10 @@ CONFIG_NSH_DISABLE_PUT=y
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+CONFIG_NSH_DISABLE_TIME=y
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
+CONFIG_NSH_DISABLE_UNAME=y
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 CONFIG_NSH_DISABLE_WGET=y
@@ -812,6 +853,8 @@ CONFIG_NSH_DISABLE_LOOPS=y
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -825,15 +868,19 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/mirtoo/nxffs/defconfig b/configs/mirtoo/nxffs/defconfig
index 0c240a2754..2f82da56da 100644
--- a/configs/mirtoo/nxffs/defconfig
+++ b/configs/mirtoo/nxffs/defconfig
@@ -41,13 +41,15 @@ CONFIG_INTELHEX_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -272,12 +274,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
 # CONFIG_ARCH_HAVE_POWEROFF is not set
+# CONFIG_ARCH_HAVE_RESET is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
@@ -334,6 +338,7 @@ CONFIG_NSH_MMCSDMINOR=0
 #
 CONFIG_MIRTOO_RELEASE=2
 CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
 # CONFIG_BOARDCTL_ADCTEST is not set
 # CONFIG_BOARDCTL_PWMTEST is not set
@@ -373,6 +378,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=0
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -410,9 +416,10 @@ CONFIG_NAME_MAX=32
 CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -443,14 +450,20 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 CONFIG_SPI=y
+# CONFIG_SPI_SLAVE is not set
 # CONFIG_SPI_EXCHANGE is not set
 # CONFIG_SPI_CMDDATA is not set
 # CONFIG_SPI_CALLBACK is not set
 # CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_HWFEATURES is not set
+# CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -464,8 +477,23 @@ CONFIG_SPI=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 CONFIG_MTD=y
 
 #
@@ -474,6 +502,7 @@ CONFIG_MTD=y
 # CONFIG_MTD_PARTITION is not set
 # CONFIG_MTD_SECT512 is not set
 # CONFIG_MTD_BYTE_WRITE is not set
+# CONFIG_MTD_PROGMEM is not set
 # CONFIG_MTD_CONFIG is not set
 
 #
@@ -481,10 +510,14 @@ CONFIG_MTD=y
 #
 # CONFIG_MTD_NAND is not set
 # CONFIG_RAMMTD is not set
+# CONFIG_FILEMTD is not set
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT25 is not set
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
+# CONFIG_MTD_S25FL1 is not set
+# CONFIG_MTD_N25QXXX is not set
 # CONFIG_MTD_SMART is not set
 # CONFIG_MTD_RAMTRON is not set
 CONFIG_MTD_SST25=y
@@ -495,6 +528,7 @@ CONFIG_SST25_SPIFREQUENCY=20000000
 # CONFIG_SST25_SLOWWRITE is not set
 # CONFIG_SST25_SLOWREAD is not set
 # CONFIG_MTD_SST25XX is not set
+# CONFIG_MTD_SST26 is not set
 # CONFIG_MTD_SST39FV is not set
 # CONFIG_MTD_W25 is not set
 # CONFIG_EEPROM is not set
@@ -505,6 +539,8 @@ CONFIG_SST25_SPIFREQUENCY=20000000
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -528,14 +564,11 @@ CONFIG_UART1_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_UART1_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -552,19 +585,23 @@ CONFIG_UART1_PARITY=0
 CONFIG_UART1_2STOP=0
 # CONFIG_UART1_IFLOWCONTROL is not set
 # CONFIG_UART1_OFLOWCONTROL is not set
+# CONFIG_UART1_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -601,15 +638,11 @@ CONFIG_NXFFS_PACKTHRESHOLD=32
 CONFIG_NXFFS_MAXNAMLEN=255
 CONFIG_NXFFS_TAILTHRESHOLD=8192
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -628,6 +661,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -673,10 +710,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+# CONFIG_ARCH_HAVE_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -691,26 +732,26 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FSTEST is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -718,18 +759,19 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -737,14 +779,27 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_FLASH_ERASEALL is not set
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -757,30 +812,28 @@ CONFIG_EXAMPLES_NSH=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -799,6 +852,7 @@ CONFIG_NSH_DISABLEBG=y
 # Disable Individual commands
 #
 CONFIG_NSH_DISABLE_ADDROUTE=y
+CONFIG_NSH_DISABLE_BASENAME=y
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
@@ -807,6 +861,7 @@ CONFIG_NSH_DISABLE_DATE=y
 CONFIG_NSH_DISABLE_DD=y
 CONFIG_NSH_DISABLE_DF=y
 CONFIG_NSH_DISABLE_DELROUTE=y
+CONFIG_NSH_DISABLE_DIRNAME=y
 # CONFIG_NSH_DISABLE_ECHO is not set
 CONFIG_NSH_DISABLE_EXEC=y
 CONFIG_NSH_DISABLE_EXIT=y
@@ -815,8 +870,10 @@ CONFIG_NSH_DISABLE_GET=y
 # CONFIG_NSH_DISABLE_HELP is not set
 CONFIG_NSH_DISABLE_HEXDUMP=y
 CONFIG_NSH_DISABLE_IFCONFIG=y
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 CONFIG_NSH_DISABLE_KILL=y
 # CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -834,8 +891,10 @@ CONFIG_NSH_DISABLE_PUT=y
 # CONFIG_NSH_DISABLE_SET is not set
 CONFIG_NSH_DISABLE_SH=y
 # CONFIG_NSH_DISABLE_SLEEP is not set
+CONFIG_NSH_DISABLE_TIME=y
 CONFIG_NSH_DISABLE_TEST=y
 # CONFIG_NSH_DISABLE_UMOUNT is not set
+CONFIG_NSH_DISABLE_UNAME=y
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 CONFIG_NSH_DISABLE_WGET=y
@@ -858,6 +917,8 @@ CONFIG_NSH_DISABLESCRIPT=y
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -871,15 +932,19 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/pcblogic-pic32mx/nsh/defconfig b/configs/pcblogic-pic32mx/nsh/defconfig
index 78547b0112..0d6bffa7a9 100644
--- a/configs/pcblogic-pic32mx/nsh/defconfig
+++ b/configs/pcblogic-pic32mx/nsh/defconfig
@@ -41,13 +41,15 @@ CONFIG_INTELHEX_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -266,12 +268,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
 # CONFIG_ARCH_HAVE_POWEROFF is not set
+# CONFIG_ARCH_HAVE_RESET is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
@@ -360,6 +364,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=0
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -410,9 +415,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -443,6 +449,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -460,8 +467,22 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -471,6 +492,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -494,14 +517,11 @@ CONFIG_UART1_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_UART1_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -518,19 +538,23 @@ CONFIG_UART1_PARITY=0
 CONFIG_UART1_2STOP=0
 # CONFIG_UART1_IFLOWCONTROL is not set
 # CONFIG_UART1_OFLOWCONTROL is not set
+# CONFIG_UART1_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -562,16 +586,12 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_FAT is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_BINFS is not set
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -590,6 +610,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -633,10 +657,13 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+# CONFIG_ARCH_HAVE_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -655,11 +682,14 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 
+#
+# CAN Utilities
+#
+
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -667,11 +697,11 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -679,33 +709,44 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -717,30 +758,28 @@ CONFIG_EXAMPLES_NSH=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -760,6 +799,7 @@ CONFIG_NSH_BUILTIN_APPS=y
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
@@ -768,6 +808,7 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_DD is not set
 # CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -776,8 +817,10 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 # CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -795,8 +838,10 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
@@ -823,6 +868,8 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -836,15 +883,19 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/pic32mx-starterkit/nsh/defconfig b/configs/pic32mx-starterkit/nsh/defconfig
index c31f98bf9b..1586dd3bd3 100644
--- a/configs/pic32mx-starterkit/nsh/defconfig
+++ b/configs/pic32mx-starterkit/nsh/defconfig
@@ -41,13 +41,15 @@ CONFIG_INTELHEX_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -266,12 +268,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
 # CONFIG_ARCH_HAVE_POWEROFF is not set
+# CONFIG_ARCH_HAVE_RESET is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
@@ -329,6 +333,7 @@ CONFIG_NSH_MMCSDSLOTNO=0
 # Board-Specific Options
 #
 CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
 # CONFIG_BOARDCTL_ADCTEST is not set
 # CONFIG_BOARDCTL_PWMTEST is not set
@@ -368,6 +373,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -418,9 +424,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -451,6 +458,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -468,7 +476,21 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -477,6 +499,7 @@ CONFIG_MMCSD_MMCSUPPORT=y
 CONFIG_MMCSD_HAVECARDDETECT=y
 # CONFIG_ARCH_HAVE_SDIO is not set
 # CONFIG_ARCH_HAVE_SDIOWAIT_WRCOMPLETE is not set
+# CONFIG_MODEM is not set
 CONFIG_MTD=y
 
 #
@@ -485,6 +508,7 @@ CONFIG_MTD=y
 # CONFIG_MTD_PARTITION is not set
 # CONFIG_MTD_SECT512 is not set
 # CONFIG_MTD_BYTE_WRITE is not set
+# CONFIG_MTD_PROGMEM is not set
 # CONFIG_MTD_CONFIG is not set
 
 #
@@ -492,14 +516,19 @@ CONFIG_MTD=y
 #
 # CONFIG_MTD_NAND is not set
 # CONFIG_RAMMTD is not set
+# CONFIG_FILEMTD is not set
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT25 is not set
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
+# CONFIG_MTD_S25FL1 is not set
+# CONFIG_MTD_N25QXXX is not set
 # CONFIG_MTD_SMART is not set
 # CONFIG_MTD_RAMTRON is not set
 # CONFIG_MTD_SST25 is not set
 # CONFIG_MTD_SST25XX is not set
+# CONFIG_MTD_SST26 is not set
 # CONFIG_MTD_SST39FV is not set
 # CONFIG_MTD_W25 is not set
 # CONFIG_EEPROM is not set
@@ -510,6 +539,8 @@ CONFIG_MTD=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -533,14 +564,11 @@ CONFIG_UART1_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_UART1_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -557,19 +585,23 @@ CONFIG_UART1_PARITY=0
 CONFIG_UART1_2STOP=0
 # CONFIG_UART1_IFLOWCONTROL is not set
 # CONFIG_UART1_OFLOWCONTROL is not set
+# CONFIG_UART1_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -603,19 +635,17 @@ CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
 CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_FATTIME is not set
+# CONFIG_FAT_FORCE_INDIRECT is not set
 # CONFIG_FAT_DMAMEMORY is not set
+# CONFIG_FAT_DIRECT_RETRY is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_BINFS is not set
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -634,6 +664,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -679,10 +713,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+# CONFIG_ARCH_HAVE_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -701,23 +739,27 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 
+#
+# CAN Utilities
+#
+
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FSTEST is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -725,33 +767,47 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_FLASH_ERASEALL is not set
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -764,30 +820,28 @@ CONFIG_EXAMPLES_NSH=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -807,6 +861,7 @@ CONFIG_NSH_BUILTIN_APPS=y
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
@@ -815,6 +870,7 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_DD is not set
 # CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -823,8 +879,10 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 # CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -843,8 +901,10 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
@@ -871,6 +931,8 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -884,15 +946,20 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FLASH_ERASEALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/pic32mx-starterkit/nsh2/defconfig b/configs/pic32mx-starterkit/nsh2/defconfig
index e0d59d64c8..d10280cc5c 100644
--- a/configs/pic32mx-starterkit/nsh2/defconfig
+++ b/configs/pic32mx-starterkit/nsh2/defconfig
@@ -46,9 +46,10 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -499,6 +500,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -528,6 +530,7 @@ CONFIG_MTD=y
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT25 is not set
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
 # CONFIG_MTD_N25QXXX is not set
@@ -588,6 +591,8 @@ CONFIG_ETH0_PHY_DP83848C=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+# CONFIG_SERIAL_CONSOLE is not set
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -621,20 +626,24 @@ CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 CONFIG_RAMLOG=y
-CONFIG_RAMLOG_SYSLOG=y
 # CONFIG_RAMLOG_CONSOLE is not set
 CONFIG_RAMLOG_BUFSIZE=16384
 # CONFIG_RAMLOG_CRLF is not set
 CONFIG_RAMLOG_NONBLOCKING=y
 CONFIG_RAMLOG_NPOLLWAITERS=4
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_RAMLOG_SYSLOG=y
+# CONFIG_SYSLOG_CONSOLE is not set
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 # CONFIG_CONSOLE_SYSLOG is not set
 
 #
@@ -789,12 +798,6 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-# CONFIG_SYSLOG_CHAR is not set
-
 #
 # Graphics Support
 #
@@ -877,6 +880,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/pic32mx7mmb/nsh/defconfig b/configs/pic32mx7mmb/nsh/defconfig
index 0e50acd4de..6812086dea 100644
--- a/configs/pic32mx7mmb/nsh/defconfig
+++ b/configs/pic32mx7mmb/nsh/defconfig
@@ -46,9 +46,10 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -489,6 +490,8 @@ CONFIG_SPI=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_HWFEATURES is not set
 # CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -516,6 +519,7 @@ CONFIG_SPI=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -548,6 +552,7 @@ CONFIG_MTD=y
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT25 is not set
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
 # CONFIG_MTD_N25QXXX is not set
@@ -608,6 +613,8 @@ CONFIG_ETH0_PHY_LAN8720=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -692,15 +699,18 @@ CONFIG_USBMSC_SCSI_STACKSIZE=2048
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -854,11 +864,6 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -941,6 +946,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
diff --git a/configs/pic32mz-starterkit/nsh/defconfig b/configs/pic32mz-starterkit/nsh/defconfig
index 957e7a04fd..4c31a821ae 100644
--- a/configs/pic32mz-starterkit/nsh/defconfig
+++ b/configs/pic32mz-starterkit/nsh/defconfig
@@ -41,13 +41,15 @@ CONFIG_INTELHEX_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -192,12 +194,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
 # CONFIG_ARCH_HAVE_POWEROFF is not set
+# CONFIG_ARCH_HAVE_RESET is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
@@ -256,6 +260,7 @@ CONFIG_NSH_MMCSDSLOTNO=0
 # Board-Specific Options
 #
 CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
 # CONFIG_BOARDCTL_ADCTEST is not set
 # CONFIG_BOARDCTL_PWMTEST is not set
@@ -295,6 +300,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -345,9 +351,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -378,6 +385,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -395,7 +403,21 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -404,6 +426,7 @@ CONFIG_MMCSD_MMCSUPPORT=y
 CONFIG_MMCSD_HAVECARDDETECT=y
 # CONFIG_ARCH_HAVE_SDIO is not set
 # CONFIG_ARCH_HAVE_SDIOWAIT_WRCOMPLETE is not set
+# CONFIG_MODEM is not set
 CONFIG_MTD=y
 
 #
@@ -412,6 +435,7 @@ CONFIG_MTD=y
 # CONFIG_MTD_PARTITION is not set
 # CONFIG_MTD_SECT512 is not set
 # CONFIG_MTD_BYTE_WRITE is not set
+# CONFIG_MTD_PROGMEM is not set
 # CONFIG_MTD_CONFIG is not set
 
 #
@@ -419,14 +443,19 @@ CONFIG_MTD=y
 #
 # CONFIG_MTD_NAND is not set
 # CONFIG_RAMMTD is not set
+# CONFIG_FILEMTD is not set
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT25 is not set
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
+# CONFIG_MTD_S25FL1 is not set
+# CONFIG_MTD_N25QXXX is not set
 # CONFIG_MTD_SMART is not set
 # CONFIG_MTD_RAMTRON is not set
 # CONFIG_MTD_SST25 is not set
 # CONFIG_MTD_SST25XX is not set
+# CONFIG_MTD_SST26 is not set
 # CONFIG_MTD_SST39FV is not set
 # CONFIG_MTD_W25 is not set
 # CONFIG_EEPROM is not set
@@ -437,6 +466,8 @@ CONFIG_MTD=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -460,14 +491,11 @@ CONFIG_UART1_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_UART1_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -484,19 +512,23 @@ CONFIG_UART1_PARITY=0
 CONFIG_UART1_2STOP=0
 # CONFIG_UART1_IFLOWCONTROL is not set
 # CONFIG_UART1_OFLOWCONTROL is not set
+# CONFIG_UART1_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -530,19 +562,17 @@ CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
 CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_FATTIME is not set
+# CONFIG_FAT_FORCE_INDIRECT is not set
 # CONFIG_FAT_DMAMEMORY is not set
+# CONFIG_FAT_DIRECT_RETRY is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_BINFS is not set
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -561,6 +591,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -606,10 +640,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+# CONFIG_ARCH_HAVE_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -628,23 +666,27 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 
+#
+# CAN Utilities
+#
+
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FSTEST is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -652,33 +694,47 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_FLASH_ERASEALL is not set
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -691,30 +747,28 @@ CONFIG_EXAMPLES_NSH=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -734,6 +788,7 @@ CONFIG_NSH_BUILTIN_APPS=y
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
@@ -742,6 +797,7 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_DD is not set
 # CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -750,8 +806,10 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 # CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -770,8 +828,10 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
@@ -798,6 +858,8 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -811,15 +873,20 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FLASH_ERASEALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sure-pic32mx/nsh/defconfig b/configs/sure-pic32mx/nsh/defconfig
index ac04ca6b59..8219ec829f 100644
--- a/configs/sure-pic32mx/nsh/defconfig
+++ b/configs/sure-pic32mx/nsh/defconfig
@@ -41,13 +41,15 @@ CONFIG_INTELHEX_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -266,12 +268,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
 # CONFIG_ARCH_HAVE_POWEROFF is not set
+# CONFIG_ARCH_HAVE_RESET is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
@@ -332,6 +336,7 @@ CONFIG_NSH_MMCSDMINOR=0
 CONFIG_ARCH_DBDP11215=y
 # CONFIG_ARCH_DBDP11212 is not set
 CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
 # CONFIG_BOARDCTL_ADCTEST is not set
 # CONFIG_BOARDCTL_PWMTEST is not set
@@ -371,6 +376,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=0
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -421,9 +427,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -454,6 +461,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -471,8 +479,23 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -482,6 +505,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -505,14 +530,11 @@ CONFIG_UART2_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_UART2_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -529,19 +551,23 @@ CONFIG_UART2_PARITY=0
 CONFIG_UART2_2STOP=0
 # CONFIG_UART2_IFLOWCONTROL is not set
 # CONFIG_UART2_OFLOWCONTROL is not set
+# CONFIG_UART2_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -573,16 +599,12 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_FAT is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_BINFS is not set
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -601,6 +623,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -644,10 +670,13 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+# CONFIG_ARCH_HAVE_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -666,11 +695,14 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 
+#
+# CAN Utilities
+#
+
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -678,11 +710,11 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -690,33 +722,45 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -728,30 +772,28 @@ CONFIG_EXAMPLES_NSH=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -771,6 +813,7 @@ CONFIG_NSH_BUILTIN_APPS=y
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
@@ -779,6 +822,7 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_DD is not set
 # CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -787,8 +831,10 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 # CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -806,8 +852,10 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
@@ -834,6 +882,8 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -847,15 +897,19 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sure-pic32mx/usbnsh/defconfig b/configs/sure-pic32mx/usbnsh/defconfig
index 4f11af19f0..3bf95a7750 100644
--- a/configs/sure-pic32mx/usbnsh/defconfig
+++ b/configs/sure-pic32mx/usbnsh/defconfig
@@ -41,13 +41,15 @@ CONFIG_INTELHEX_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -267,12 +269,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
 # CONFIG_ARCH_HAVE_POWEROFF is not set
+# CONFIG_ARCH_HAVE_RESET is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
@@ -333,6 +337,7 @@ CONFIG_NSH_MMCSDMINOR=0
 CONFIG_ARCH_DBDP11215=y
 # CONFIG_ARCH_DBDP11212 is not set
 CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_UNIQUEID is not set
 CONFIG_BOARDCTL_USBDEVCTRL=y
 # CONFIG_BOARDCTL_TSCTEST is not set
 # CONFIG_BOARDCTL_ADCTEST is not set
@@ -373,6 +378,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=0
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -423,9 +429,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -456,6 +463,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -473,8 +481,23 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -484,6 +507,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_SERIAL_REMOVABLE=y
+# CONFIG_SERIAL_CONSOLE is not set
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -507,14 +531,11 @@ CONFIG_UART2_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 # CONFIG_UART2_SERIAL_CONSOLE is not set
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -531,6 +552,7 @@ CONFIG_UART2_PARITY=0
 CONFIG_UART2_2STOP=0
 # CONFIG_UART2_IFLOWCONTROL is not set
 # CONFIG_UART2_OFLOWCONTROL is not set
+# CONFIG_UART2_DMA is not set
 CONFIG_USBDEV=y
 
 #
@@ -562,8 +584,8 @@ CONFIG_CDCACM_EPBULKOUT_HSSIZE=512
 CONFIG_CDCACM_EPBULKIN=2
 CONFIG_CDCACM_EPBULKIN_FSSIZE=64
 CONFIG_CDCACM_EPBULKIN_HSSIZE=512
-CONFIG_CDCACM_NWRREQS=4
 CONFIG_CDCACM_NRDREQS=4
+CONFIG_CDCACM_NWRREQS=4
 CONFIG_CDCACM_BULKIN_REQLEN=96
 CONFIG_CDCACM_RXBUFSIZE=256
 CONFIG_CDCACM_TXBUFSIZE=256
@@ -575,14 +597,19 @@ CONFIG_CDCACM_PRODUCTSTR="CDC/ACM Serial"
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+CONFIG_SYSLOG_CHAR=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+CONFIG_SYSLOG_CHAR_CRLF=y
+CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
 
 #
 # Networking Support
@@ -614,18 +641,12 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_FAT is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_BINFS is not set
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-CONFIG_SYSLOG_CHAR=y
-CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
-
 #
 # Graphics Support
 #
@@ -644,6 +665,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -687,10 +712,13 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+# CONFIG_ARCH_HAVE_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -709,11 +737,14 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 
+#
+# CAN Utilities
+#
+
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -721,11 +752,11 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -733,33 +764,45 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -771,30 +814,28 @@ CONFIG_EXAMPLES_NSH=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -814,6 +855,7 @@ CONFIG_NSH_BUILTIN_APPS=y
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
@@ -822,6 +864,7 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_DD is not set
 # CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -830,8 +873,10 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 # CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -849,8 +894,10 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
@@ -878,6 +925,8 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_USBCONSOLE is not set
 # CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -891,16 +940,20 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_CDCACM is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
-# CONFIG_SYSTEM_CDCACM is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/ubw32/nsh/defconfig b/configs/ubw32/nsh/defconfig
index 6592e260a2..f30d05b118 100644
--- a/configs/ubw32/nsh/defconfig
+++ b/configs/ubw32/nsh/defconfig
@@ -41,13 +41,15 @@ CONFIG_INTELHEX_BINARY=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
+CONFIG_DEBUG_ALERT=y
 # CONFIG_DEBUG_FEATURES is not set
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -266,12 +268,14 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
 # CONFIG_ARCH_HAVE_POWEROFF is not set
+# CONFIG_ARCH_HAVE_RESET is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
@@ -332,6 +336,7 @@ CONFIG_NSH_MMCSDSLOTNO=0
 # Board-Specific Options
 #
 CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
 # CONFIG_BOARDCTL_ADCTEST is not set
 # CONFIG_BOARDCTL_PWMTEST is not set
@@ -371,6 +376,7 @@ CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=0
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -421,9 +427,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -454,6 +461,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
@@ -471,7 +479,21 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -480,6 +502,7 @@ CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_HAVECARDDETECT is not set
 # CONFIG_ARCH_HAVE_SDIO is not set
 # CONFIG_ARCH_HAVE_SDIOWAIT_WRCOMPLETE is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -489,6 +512,8 @@ CONFIG_MMCSD_NSLOTS=1
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -512,14 +537,11 @@ CONFIG_UART1_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_UART1_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -536,19 +558,23 @@ CONFIG_UART1_PARITY=0
 CONFIG_UART1_2STOP=0
 # CONFIG_UART1_IFLOWCONTROL is not set
 # CONFIG_UART1_OFLOWCONTROL is not set
+# CONFIG_UART1_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
 
 #
 # Networking Support
@@ -582,19 +608,17 @@ CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
 CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_FATTIME is not set
+# CONFIG_FAT_FORCE_INDIRECT is not set
 # CONFIG_FAT_DMAMEMORY is not set
+# CONFIG_FAT_DIRECT_RETRY is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_BINFS is not set
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -613,6 +637,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -658,10 +686,14 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+# CONFIG_ARCH_HAVE_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -680,23 +712,27 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 
+#
+# CAN Utilities
+#
+
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FSTEST is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -704,33 +740,46 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -743,30 +792,28 @@ CONFIG_EXAMPLES_NSH=y
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
 
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
 # Command Line Configuration
@@ -786,6 +833,7 @@ CONFIG_NSH_BUILTIN_APPS=y
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
@@ -794,6 +842,7 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_DD is not set
 # CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -802,8 +851,10 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 # CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -822,8 +873,10 @@ CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
@@ -850,6 +903,8 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -863,15 +918,19 @@ CONFIG_NSH_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
-- 
GitLab


From d27ebee0702de93d1a029990538ebce1670f1919 Mon Sep 17 00:00:00 2001
From: Wolfgang Reissnegger 
Date: Thu, 23 Jun 2016 11:04:36 -0700
Subject: [PATCH 027/229] [sam34][timer] Fix ops check in TCIOC_STOP.

---
 drivers/timers/timer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/timers/timer.c b/drivers/timers/timer.c
index 6bcbc3b634..0186e9977f 100644
--- a/drivers/timers/timer.c
+++ b/drivers/timers/timer.c
@@ -258,7 +258,7 @@ static int timer_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
       {
         /* Stop the timer */
 
-        if (lower->ops->start)
+        if (lower->ops->stop)
           {
             ret = lower->ops->stop(lower);
           }
-- 
GitLab


From f4adb82fe71f0333fc49491ed4a5b48ae9498661 Mon Sep 17 00:00:00 2001
From: Wolfgang Reissnegger 
Date: Wed, 15 Jun 2016 17:45:58 -0700
Subject: [PATCH 028/229] [sam34][dacc] Bugfix: DACC_WPMR_WPKEY_MASK ->
 DACC_WPMR_WPKEY

---
 arch/arm/src/sam34/chip/sam_dacc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/src/sam34/chip/sam_dacc.h b/arch/arm/src/sam34/chip/sam_dacc.h
index 4581289eda..80a61d874a 100644
--- a/arch/arm/src/sam34/chip/sam_dacc.h
+++ b/arch/arm/src/sam34/chip/sam_dacc.h
@@ -209,7 +209,7 @@
 #define DACC_WPMR_WPEN             (1 << 0)  /* Bit 0:  Write Protect Enable */
 #define DACC_WPMR_WPKEY_SHIFT      (8)       /* Bits 8-31: Write Protect KEY */
 #define DACC_WPMR_WPKEY_MASK       (0x00ffffff << DACC_WPMR_WPKEY_SHIFT)
-#  define DACC_WPMR_WPKEY_MASK     (0x00444143 << DACC_WPMR_WPKEY_SHIFT)
+#  define DACC_WPMR_WPKEY          (0x00444143 << DACC_WPMR_WPKEY_SHIFT)
 
 /* Write Protect Status register */
 
-- 
GitLab


From 85056eaffdb4591429469c24a0e97276a2c35512 Mon Sep 17 00:00:00 2001
From: David Sidrane 
Date: Thu, 23 Jun 2016 14:28:25 -1000
Subject: [PATCH 029/229] Fix Spelling

---
 tools/README.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/README.txt b/tools/README.txt
index 44b0427427..408bccad7b 100644
--- a/tools/README.txt
+++ b/tools/README.txt
@@ -580,7 +580,7 @@ refresh.sh
 
   This is a bash script that automatics refreshing of board default
   configuration (defconfig) files.  It does not do anything special
-  thet you cannot do manually, but is useful for me when I have to
+  that you cannot do manually, but is useful for me when I have to
   update dozens of confuration files.
 
   Configuration files have to be updated because over time, the
-- 
GitLab


From 0bf68df3c7f88457936eb73acff072efa4d091d5 Mon Sep 17 00:00:00 2001
From: David Sidrane 
Date: Thu, 23 Jun 2016 14:36:23 -1000
Subject: [PATCH 030/229] Missing memset def

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

diff --git a/arch/arm/src/stm32f7/stm32_allocateheap.c b/arch/arm/src/stm32f7/stm32_allocateheap.c
index 541e0654b1..8b21ad68b7 100644
--- a/arch/arm/src/stm32f7/stm32_allocateheap.c
+++ b/arch/arm/src/stm32f7/stm32_allocateheap.c
@@ -41,6 +41,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 
-- 
GitLab


From 6de8dba383c45b13e6bed0ed2d06081ce4314a31 Mon Sep 17 00:00:00 2001
From: Sebastien Lorquet 
Date: Fri, 24 Jun 2016 11:29:31 +0200
Subject: [PATCH 031/229] Preliminary rename of stm32 can driver functions

---
 arch/arm/src/stm32/stm32_can.c | 336 ++++++++++++++++-----------------
 1 file changed, 168 insertions(+), 168 deletions(-)

diff --git a/arch/arm/src/stm32/stm32_can.c b/arch/arm/src/stm32/stm32_can.c
index cd902bf7e2..4380e51a30 100644
--- a/arch/arm/src/stm32/stm32_can.c
+++ b/arch/arm/src/stm32/stm32_can.c
@@ -106,50 +106,50 @@ struct stm32_can_s
 
 /* CAN Register access */
 
-static uint32_t can_getreg(FAR struct stm32_can_s *priv, int offset);
-static uint32_t can_getfreg(FAR struct stm32_can_s *priv, int offset);
-static void can_putreg(FAR struct stm32_can_s *priv, int offset,
+static uint32_t stm32can_getreg(FAR struct stm32_can_s *priv, int offset);
+static uint32_t stm32can_getfreg(FAR struct stm32_can_s *priv, int offset);
+static void stm32can_putreg(FAR struct stm32_can_s *priv, int offset,
                        uint32_t value);
-static void can_putfreg(FAR struct stm32_can_s *priv, int offset,
+static void stm32can_putfreg(FAR struct stm32_can_s *priv, int offset,
                         uint32_t value);
 #ifdef CONFIG_STM32_CAN_REGDEBUG
-static void can_dumpctrlregs(FAR struct stm32_can_s *priv,
+static void stm32can_dumpctrlregs(FAR struct stm32_can_s *priv,
                              FAR const char *msg);
-static void can_dumpmbregs(FAR struct stm32_can_s *priv,
+static void stm32can_dumpmbregs(FAR struct stm32_can_s *priv,
                            FAR const char *msg);
-static void can_dumpfiltregs(FAR struct stm32_can_s *priv,
+static void stm32can_dumpfiltregs(FAR struct stm32_can_s *priv,
                              FAR const char *msg);
 #else
-#  define can_dumpctrlregs(priv,msg)
-#  define can_dumpmbregs(priv,msg)
-#  define can_dumpfiltregs(priv,msg)
+#  define stm32can_dumpctrlregs(priv,msg)
+#  define stm32can_dumpmbregs(priv,msg)
+#  define stm32can_dumpfiltregs(priv,msg)
 #endif
 
 /* CAN driver methods */
 
-static void can_reset(FAR struct can_dev_s *dev);
-static int  can_setup(FAR struct can_dev_s *dev);
-static void can_shutdown(FAR struct can_dev_s *dev);
-static void can_rxint(FAR struct can_dev_s *dev, bool enable);
-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);
-static int  can_remoterequest(FAR struct can_dev_s *dev, uint16_t id);
-static int  can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg);
-static bool can_txready(FAR struct can_dev_s *dev);
-static bool can_txempty(FAR struct can_dev_s *dev);
+static void stm32can_reset(FAR struct can_dev_s *dev);
+static int  stm32can_setup(FAR struct can_dev_s *dev);
+static void stm32can_shutdown(FAR struct can_dev_s *dev);
+static void stm32can_rxint(FAR struct can_dev_s *dev, bool enable);
+static void stm32can_txint(FAR struct can_dev_s *dev, bool enable);
+static int  stm32can_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg);
+static int  stm32can_remoterequest(FAR struct can_dev_s *dev, uint16_t id);
+static int  stm32can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg);
+static bool stm32can_txready(FAR struct can_dev_s *dev);
+static bool stm32can_txempty(FAR struct can_dev_s *dev);
 
 /* CAN interrupt handling */
 
-static int  can_rxinterrupt(int irq, FAR void *context, int rxmb);
-static int  can_rx0interrupt(int irq, FAR void *context);
-static int  can_rx1interrupt(int irq, FAR void *context);
-static int  can_txinterrupt(int irq, FAR void *context);
+static int  stm32can_rxinterrupt(int irq, FAR void *context, int rxmb);
+static int  stm32can_rx0interrupt(int irq, FAR void *context);
+static int  stm32can_rx1interrupt(int irq, FAR void *context);
+static int  stm32can_txinterrupt(int irq, FAR void *context);
 
 /* Initialization */
 
-static int  can_bittiming(FAR struct stm32_can_s *priv);
-static int  can_cellinit(FAR struct stm32_can_s *priv);
-static int  can_filterinit(FAR struct stm32_can_s *priv);
+static int  stm32can_bittiming(FAR struct stm32_can_s *priv);
+static int  stm32can_cellinit(FAR struct stm32_can_s *priv);
+static int  stm32can_filterinit(FAR struct stm32_can_s *priv);
 
 /****************************************************************************
  * Private Data
@@ -157,16 +157,16 @@ static int  can_filterinit(FAR struct stm32_can_s *priv);
 
 static const struct can_ops_s g_canops =
 {
-  .co_reset         = can_reset,
-  .co_setup         = can_setup,
-  .co_shutdown      = can_shutdown,
-  .co_rxint         = can_rxint,
-  .co_txint         = can_txint,
-  .co_ioctl         = can_ioctl,
-  .co_remoterequest = can_remoterequest,
-  .co_send          = can_send,
-  .co_txready       = can_txready,
-  .co_txempty       = can_txempty,
+  .co_reset         = stm32can_reset,
+  .co_setup         = stm32can_setup,
+  .co_shutdown      = stm32can_shutdown,
+  .co_rxint         = stm32can_rxint,
+  .co_txint         = stm32can_txint,
+  .co_ioctl         = stm32can_ioctl,
+  .co_remoterequest = stm32can_remoterequest,
+  .co_send          = stm32can_send,
+  .co_txready       = stm32can_txready,
+  .co_txempty       = stm32can_txempty,
 };
 
 #ifdef CONFIG_STM32_CAN1
@@ -220,8 +220,8 @@ static struct can_dev_s g_can2dev =
  ****************************************************************************/
 
 /****************************************************************************
- * Name: can_getreg
- * Name: can_getfreg
+ * Name: stm32can_getreg
+ * Name: stm32can_getfreg
  *
  * Description:
  *   Read the value of a CAN register or filter block register.
@@ -235,7 +235,7 @@ static struct can_dev_s g_can2dev =
  ****************************************************************************/
 
 #ifdef CONFIG_STM32_CAN_REGDEBUG
-static uint32_t can_vgetreg(uint32_t addr)
+static uint32_t stm32can_vgetreg(uint32_t addr)
 {
   static uint32_t prevaddr = 0;
   static uint32_t preval   = 0;
@@ -288,23 +288,23 @@ static uint32_t can_vgetreg(uint32_t addr)
   return val;
 }
 
-static uint32_t can_getreg(FAR struct stm32_can_s *priv, int offset)
+static uint32_t stm32can_getreg(FAR struct stm32_can_s *priv, int offset)
 {
-  return can_vgetreg(priv->base + offset);
+  return stm32can_vgetreg(priv->base + offset);
 }
 
-static uint32_t can_getfreg(FAR struct stm32_can_s *priv, int offset)
+static uint32_t stm32can_getfreg(FAR struct stm32_can_s *priv, int offset)
 {
-  return can_vgetreg(priv->fbase + offset);
+  return stm32can_vgetreg(priv->fbase + offset);
 }
 
 #else
-static uint32_t can_getreg(FAR struct stm32_can_s *priv, int offset)
+static uint32_t stm32can_getreg(FAR struct stm32_can_s *priv, int offset)
 {
   return getreg32(priv->base + offset);
 }
 
-static uint32_t can_getfreg(FAR struct stm32_can_s *priv, int offset)
+static uint32_t stm32can_getfreg(FAR struct stm32_can_s *priv, int offset)
 {
   return getreg32(priv->fbase + offset);
 }
@@ -312,8 +312,8 @@ static uint32_t can_getfreg(FAR struct stm32_can_s *priv, int offset)
 #endif
 
 /****************************************************************************
- * Name: can_putreg
- * Name: can_putfreg
+ * Name: stm32can_putreg
+ * Name: stm32can_putfreg
  *
  * Description:
  *   Set the value of a CAN register or filter block register.
@@ -329,7 +329,7 @@ static uint32_t can_getfreg(FAR struct stm32_can_s *priv, int offset)
  ****************************************************************************/
 
 #ifdef CONFIG_STM32_CAN_REGDEBUG
-static void can_vputreg(uint32_t addr, uint32_t value)
+static void stm32can_vputreg(uint32_t addr, uint32_t value)
 {
 
   /* Show the register value being written */
@@ -341,26 +341,26 @@ static void can_vputreg(uint32_t addr, uint32_t value)
   putreg32(value, addr);
 }
 
-static void can_putreg(FAR struct stm32_can_s *priv, int offset,
+static void stm32can_putreg(FAR struct stm32_can_s *priv, int offset,
                        uint32_t value)
 {
-  can_vputreg(priv->base + offset, value);
+  stm32can_vputreg(priv->base + offset, value);
 }
 
-static void can_putfreg(FAR struct stm32_can_s *priv, int offset,
+static void stm32can_putfreg(FAR struct stm32_can_s *priv, int offset,
                         uint32_t value)
 {
-  can_vputreg(priv->fbase + offset, value);
+  stm32can_vputreg(priv->fbase + offset, value);
 }
 
 #else
-static void can_putreg(FAR struct stm32_can_s *priv, int offset,
+static void stm32can_putreg(FAR struct stm32_can_s *priv, int offset,
                        uint32_t value)
 {
   putreg32(value, priv->base + offset);
 }
 
-static void can_putfreg(FAR struct stm32_can_s *priv, int offset,
+static void stm32can_putfreg(FAR struct stm32_can_s *priv, int offset,
                         uint32_t value)
 {
   putreg32(value, priv->fbase + offset);
@@ -368,7 +368,7 @@ static void can_putfreg(FAR struct stm32_can_s *priv, int offset,
 #endif
 
 /****************************************************************************
- * Name: can_dumpctrlregs
+ * Name: stm32can_dumpctrlregs
  *
  * Description:
  *   Dump the contents of all CAN control registers
@@ -382,7 +382,7 @@ static void can_putfreg(FAR struct stm32_can_s *priv, int offset,
  ****************************************************************************/
 
 #ifdef CONFIG_STM32_CAN_REGDEBUG
-static void can_dumpctrlregs(FAR struct stm32_can_s *priv,
+static void stm32can_dumpctrlregs(FAR struct stm32_can_s *priv,
                              FAR const char *msg)
 {
   if (msg)
@@ -413,7 +413,7 @@ static void can_dumpctrlregs(FAR struct stm32_can_s *priv,
 #endif
 
 /****************************************************************************
- * Name: can_dumpmbregs
+ * Name: stm32can_dumpmbregs
  *
  * Description:
  *   Dump the contents of all CAN mailbox registers
@@ -427,7 +427,7 @@ static void can_dumpctrlregs(FAR struct stm32_can_s *priv,
  ****************************************************************************/
 
 #ifdef CONFIG_STM32_CAN_REGDEBUG
-static void can_dumpmbregs(FAR struct stm32_can_s *priv,
+static void stm32can_dumpmbregs(FAR struct stm32_can_s *priv,
                            FAR const char *msg)
 {
   if (msg)
@@ -474,7 +474,7 @@ static void can_dumpmbregs(FAR struct stm32_can_s *priv,
 #endif
 
 /****************************************************************************
- * Name: can_dumpfiltregs
+ * Name: stm32can_dumpfiltregs
  *
  * Description:
  *   Dump the contents of all CAN filter registers
@@ -488,7 +488,7 @@ static void can_dumpmbregs(FAR struct stm32_can_s *priv,
  ****************************************************************************/
 
 #ifdef CONFIG_STM32_CAN_REGDEBUG
-static void can_dumpfiltregs(FAR struct stm32_can_s *priv,
+static void stm32can_dumpfiltregs(FAR struct stm32_can_s *priv,
                              FAR const char *msg)
 {
   int i;
@@ -519,11 +519,11 @@ static void can_dumpfiltregs(FAR struct stm32_can_s *priv,
 #endif
 
 /****************************************************************************
- * Name: can_reset
+ * Name: stm32can_reset
  *
  * Description:
  *   Reset the CAN device.  Called early to initialize the hardware. This
- *   function is called, before can_setup() and on error conditions.
+ *   function is called, before stm32can_setup() and on error conditions.
  *
  * Input Parameters:
  *   dev - An instance of the "upper half" can driver state structure.
@@ -533,7 +533,7 @@ static void can_dumpfiltregs(FAR struct stm32_can_s *priv,
  *
  ****************************************************************************/
 
-static void can_reset(FAR struct can_dev_s *dev)
+static void stm32can_reset(FAR struct can_dev_s *dev)
 {
   FAR struct stm32_can_s *priv = dev->cd_priv;
   uint32_t regval;
@@ -581,7 +581,7 @@ static void can_reset(FAR struct can_dev_s *dev)
 }
 
 /****************************************************************************
- * Name: can_setup
+ * Name: stm32can_setup
  *
  * Description:
  *   Configure the CAN. This method is called the first time that the CAN
@@ -597,7 +597,7 @@ static void can_reset(FAR struct can_dev_s *dev)
  *
  ****************************************************************************/
 
-static int can_setup(FAR struct can_dev_s *dev)
+static int stm32can_setup(FAR struct can_dev_s *dev)
 {
   FAR struct stm32_can_s *priv = dev->cd_priv;
   int ret;
@@ -607,31 +607,31 @@ static int can_setup(FAR struct can_dev_s *dev)
 
   /* CAN cell initialization */
 
-  ret = can_cellinit(priv);
+  ret = stm32can_cellinit(priv);
   if (ret < 0)
     {
       canerr("ERROR: CAN%d cell initialization failed: %d\n", priv->port, ret);
       return ret;
     }
 
-  can_dumpctrlregs(priv, "After cell initialization");
-  can_dumpmbregs(priv, NULL);
+  stm32can_dumpctrlregs(priv, "After cell initialization");
+  stm32can_dumpmbregs(priv, NULL);
 
   /* CAN filter initialization */
 
-  ret = can_filterinit(priv);
+  ret = stm32can_filterinit(priv);
   if (ret < 0)
     {
       canerr("ERROR: CAN%d filter initialization failed: %d\n", priv->port, ret);
       return ret;
     }
-  can_dumpfiltregs(priv, "After filter initialization");
+  stm32can_dumpfiltregs(priv, "After filter initialization");
 
   /* Attach the CAN RX FIFO 0/1 interrupts and TX interrupts.
    * The others are not used.
    */
 
-  ret = irq_attach(priv->canrx[0], can_rx0interrupt);
+  ret = irq_attach(priv->canrx[0], stm32can_rx0interrupt);
   if (ret < 0)
     {
       canerr(ERROR: "Failed to attach CAN%d RX0 IRQ (%d)",
@@ -639,7 +639,7 @@ static int can_setup(FAR struct can_dev_s *dev)
       return ret;
     }
 
-  ret = irq_attach(priv->canrx[1], can_rx1interrupt);
+  ret = irq_attach(priv->canrx[1], stm32can_rx1interrupt);
   if (ret < 0)
     {
       canerr("ERROR: Failed to attach CAN%d RX1 IRQ (%d)",
@@ -647,7 +647,7 @@ static int can_setup(FAR struct can_dev_s *dev)
       return ret;
     }
 
-  ret = irq_attach(priv->cantx, can_txinterrupt);
+  ret = irq_attach(priv->cantx, stm32can_txinterrupt);
   if (ret < 0)
     {
       canerr("ERROR: Failed to attach CAN%d TX IRQ (%d)",
@@ -667,7 +667,7 @@ static int can_setup(FAR struct can_dev_s *dev)
 }
 
 /****************************************************************************
- * Name: can_shutdown
+ * Name: stm32can_shutdown
  *
  * Description:
  *   Disable the CAN.  This method is called when the CAN device is closed.
@@ -681,7 +681,7 @@ static int can_setup(FAR struct can_dev_s *dev)
  *
  ****************************************************************************/
 
-static void can_shutdown(FAR struct can_dev_s *dev)
+static void stm32can_shutdown(FAR struct can_dev_s *dev)
 {
   FAR struct stm32_can_s *priv = dev->cd_priv;
 
@@ -701,11 +701,11 @@ static void can_shutdown(FAR struct can_dev_s *dev)
 
   /* And reset the hardware */
 
-  can_reset(dev);
+  stm32can_reset(dev);
 }
 
 /****************************************************************************
- * Name: can_rxint
+ * Name: stm32can_rxint
  *
  * Description:
  *   Call to enable or disable RX interrupts.
@@ -718,7 +718,7 @@ static void can_shutdown(FAR struct can_dev_s *dev)
  *
  ****************************************************************************/
 
-static void can_rxint(FAR struct can_dev_s *dev, bool enable)
+static void stm32can_rxint(FAR struct can_dev_s *dev, bool enable)
 {
   FAR struct stm32_can_s *priv = dev->cd_priv;
   uint32_t regval;
@@ -727,7 +727,7 @@ static void can_rxint(FAR struct can_dev_s *dev, bool enable)
 
   /* Enable/disable the FIFO 0/1 message pending interrupt */
 
-  regval = can_getreg(priv, STM32_CAN_IER_OFFSET);
+  regval = stm32can_getreg(priv, STM32_CAN_IER_OFFSET);
   if (enable)
     {
       regval |= CAN_IER_FMPIE0 | CAN_IER_FMPIE1;
@@ -736,11 +736,11 @@ static void can_rxint(FAR struct can_dev_s *dev, bool enable)
     {
       regval &= ~(CAN_IER_FMPIE0 | CAN_IER_FMPIE1);
     }
-  can_putreg(priv, STM32_CAN_IER_OFFSET, regval);
+  stm32can_putreg(priv, STM32_CAN_IER_OFFSET, regval);
 }
 
 /****************************************************************************
- * Name: can_txint
+ * Name: stm32can_txint
  *
  * Description:
  *   Call to enable or disable TX interrupts.
@@ -753,7 +753,7 @@ static void can_rxint(FAR struct can_dev_s *dev, bool enable)
  *
  ****************************************************************************/
 
-static void can_txint(FAR struct can_dev_s *dev, bool enable)
+static void stm32can_txint(FAR struct can_dev_s *dev, bool enable)
 {
   FAR struct stm32_can_s *priv = dev->cd_priv;
   uint32_t regval;
@@ -764,14 +764,14 @@ static void can_txint(FAR struct can_dev_s *dev, bool enable)
 
   if (!enable)
     {
-      regval  = can_getreg(priv, STM32_CAN_IER_OFFSET);
+      regval  = stm32can_getreg(priv, STM32_CAN_IER_OFFSET);
       regval &= ~CAN_IER_TMEIE;
-      can_putreg(priv, STM32_CAN_IER_OFFSET, regval);
+      stm32can_putreg(priv, STM32_CAN_IER_OFFSET, regval);
     }
 }
 
 /****************************************************************************
- * Name: can_ioctl
+ * Name: stm32can_ioctl
  *
  * Description:
  *   All ioctl calls will be routed through this method
@@ -784,7 +784,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)
+static int stm32can_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg)
 {
   /* No CAN ioctls are supported */
 
@@ -792,7 +792,7 @@ static int can_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg)
 }
 
 /****************************************************************************
- * Name: can_remoterequest
+ * Name: stm32can_remoterequest
  *
  * Description:
  *   Send a remote request
@@ -805,14 +805,14 @@ 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)
+static int stm32can_remoterequest(FAR struct can_dev_s *dev, uint16_t id)
 {
 #warning "Remote request not implemented"
   return -ENOSYS;
 }
 
 /****************************************************************************
- * Name: can_send
+ * Name: stm32can_send
  *
  * Description:
  *    Send one can message.
@@ -834,7 +834,7 @@ static int can_remoterequest(FAR struct can_dev_s *dev, uint16_t id)
  *
  ****************************************************************************/
 
-static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg)
+static int stm32can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg)
 {
   FAR struct stm32_can_s *priv = dev->cd_priv;
   FAR uint8_t *ptr;
@@ -848,7 +848,7 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg)
 
   /* Select one empty transmit mailbox */
 
-  regval = can_getreg(priv, STM32_CAN_TSR_OFFSET);
+  regval = stm32can_getreg(priv, STM32_CAN_TSR_OFFSET);
   if ((regval & CAN_TSR_TME0) != 0 && (regval & CAN_TSR_RQCP0) == 0)
     {
       txmb = 0;
@@ -869,10 +869,10 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg)
 
   /* Clear TXRQ, RTR, IDE, EXID, and STID fields */
 
-  regval  = can_getreg(priv, STM32_CAN_TIR_OFFSET(txmb));
+  regval  = stm32can_getreg(priv, STM32_CAN_TIR_OFFSET(txmb));
   regval &= ~(CAN_TIR_TXRQ | CAN_TIR_RTR | CAN_TIR_IDE |
               CAN_TIR_EXID_MASK | CAN_TIR_STID_MASK);
-  can_putreg(priv, STM32_CAN_TIR_OFFSET(txmb), regval);
+  stm32can_putreg(priv, STM32_CAN_TIR_OFFSET(txmb), regval);
 
   /* Set up the ID, standard 11-bit or extended 29-bit. */
 
@@ -892,15 +892,15 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg)
   regval &= ~CAN_TIR_STID_MASK;
   regval |= (uint32_t)msg->cm_hdr.ch_id << CAN_TIR_STID_SHIFT;
 #endif
-  can_putreg(priv, STM32_CAN_TIR_OFFSET(txmb), regval);
+  stm32can_putreg(priv, STM32_CAN_TIR_OFFSET(txmb), regval);
 
   /* Set up the DLC */
 
   dlc     = msg->cm_hdr.ch_dlc;
-  regval  = can_getreg(priv, STM32_CAN_TDTR_OFFSET(txmb));
+  regval  = stm32can_getreg(priv, STM32_CAN_TDTR_OFFSET(txmb));
   regval &= ~(CAN_TDTR_DLC_MASK | CAN_TDTR_TGT);
   regval |= (uint32_t)dlc << CAN_TDTR_DLC_SHIFT;
-  can_putreg(priv, STM32_CAN_TDTR_OFFSET(txmb), regval);
+  stm32can_putreg(priv, STM32_CAN_TDTR_OFFSET(txmb), regval);
 
   /* Set up the data fields */
 
@@ -930,7 +930,7 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg)
             }
         }
     }
-  can_putreg(priv, STM32_CAN_TDLR_OFFSET(txmb), regval);
+  stm32can_putreg(priv, STM32_CAN_TDLR_OFFSET(txmb), regval);
 
   regval = 0;
   if (dlc > 4)
@@ -956,26 +956,26 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg)
             }
         }
     }
-  can_putreg(priv, STM32_CAN_TDHR_OFFSET(txmb), regval);
+  stm32can_putreg(priv, STM32_CAN_TDHR_OFFSET(txmb), regval);
 
   /* Enable the transmit mailbox empty interrupt (may already be enabled) */
 
-  regval  = can_getreg(priv, STM32_CAN_IER_OFFSET);
+  regval  = stm32can_getreg(priv, STM32_CAN_IER_OFFSET);
   regval |= CAN_IER_TMEIE;
-  can_putreg(priv, STM32_CAN_IER_OFFSET, regval);
+  stm32can_putreg(priv, STM32_CAN_IER_OFFSET, regval);
 
   /* Request transmission */
 
-  regval  = can_getreg(priv, STM32_CAN_TIR_OFFSET(txmb));
+  regval  = stm32can_getreg(priv, STM32_CAN_TIR_OFFSET(txmb));
   regval |= CAN_TIR_TXRQ;  /* Transmit Mailbox Request */
-  can_putreg(priv, STM32_CAN_TIR_OFFSET(txmb), regval);
+  stm32can_putreg(priv, STM32_CAN_TIR_OFFSET(txmb), regval);
 
-  can_dumpmbregs(priv, "After send");
+  stm32can_dumpmbregs(priv, "After send");
   return OK;
 }
 
 /****************************************************************************
- * Name: can_txready
+ * Name: stm32can_txready
  *
  * Description:
  *   Return true if the CAN hardware can accept another TX message.
@@ -988,21 +988,21 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg)
  *
  ****************************************************************************/
 
-static bool can_txready(FAR struct can_dev_s *dev)
+static bool stm32can_txready(FAR struct can_dev_s *dev)
 {
   FAR struct stm32_can_s *priv = dev->cd_priv;
   uint32_t regval;
 
   /* Return true if any mailbox is available */
 
-  regval = can_getreg(priv, STM32_CAN_TSR_OFFSET);
+  regval = stm32can_getreg(priv, STM32_CAN_TSR_OFFSET);
   caninfo("CAN%d TSR: %08x\n", priv->port, regval);
 
   return (regval & CAN_ALL_MAILBOXES) != 0;
 }
 
 /****************************************************************************
- * Name: can_txempty
+ * Name: stm32can_txempty
  *
  * Description:
  *   Return true if all message have been sent.  If for example, the CAN
@@ -1019,21 +1019,21 @@ static bool can_txready(FAR struct can_dev_s *dev)
  *
  ****************************************************************************/
 
-static bool can_txempty(FAR struct can_dev_s *dev)
+static bool stm32can_txempty(FAR struct can_dev_s *dev)
 {
   FAR struct stm32_can_s *priv = dev->cd_priv;
   uint32_t regval;
 
   /* Return true if all mailboxes are available */
 
-  regval = can_getreg(priv, STM32_CAN_TSR_OFFSET);
+  regval = stm32can_getreg(priv, STM32_CAN_TSR_OFFSET);
   caninfo("CAN%d TSR: %08x\n", priv->port, regval);
 
   return (regval & CAN_ALL_MAILBOXES) == CAN_ALL_MAILBOXES;
 }
 
 /****************************************************************************
- * Name: can_rxinterrupt
+ * Name: stm32can_rxinterrupt
  *
  * Description:
  *   CAN RX FIFO 0/1 interrupt handler
@@ -1048,7 +1048,7 @@ static bool can_txempty(FAR struct can_dev_s *dev)
  *
  ****************************************************************************/
 
-static int can_rxinterrupt(int irq, FAR void *context, int rxmb)
+static int stm32can_rxinterrupt(int irq, FAR void *context, int rxmb)
 {
   FAR struct can_dev_s *dev = NULL;
   FAR struct stm32_can_s *priv;
@@ -1080,7 +1080,7 @@ static int can_rxinterrupt(int irq, FAR void *context, int rxmb)
 
   /* Verify that a message is pending in the FIFO */
 
-  regval   = can_getreg(priv, STM32_CAN_RFR_OFFSET(rxmb));
+  regval   = stm32can_getreg(priv, STM32_CAN_RFR_OFFSET(rxmb));
   npending = (regval & CAN_RFR_FMP_MASK) >> CAN_RFR_FMP_SHIFT;
   if (npending < 1)
     {
@@ -1090,16 +1090,16 @@ static int can_rxinterrupt(int irq, FAR void *context, int rxmb)
 
   if (rxmb == 0)
     {
-      can_dumpmbregs(priv, "RX0 interrupt");
+      stm32can_dumpmbregs(priv, "RX0 interrupt");
     }
   else
     {
-      can_dumpmbregs(priv, "RX1 interrupt");
+      stm32can_dumpmbregs(priv, "RX1 interrupt");
     }
 
   /* Get the CAN identifier. */
 
-  regval = can_getreg(priv, STM32_CAN_RIR_OFFSET(rxmb));
+  regval = stm32can_getreg(priv, STM32_CAN_RIR_OFFSET(rxmb));
 
 #ifdef CONFIG_CAN_EXTID
   if ((regval & CAN_RIR_IDE) != 0)
@@ -1136,18 +1136,18 @@ static int can_rxinterrupt(int irq, FAR void *context, int rxmb)
 
   /* Get the DLC */
 
-  regval     = can_getreg(priv, STM32_CAN_RDTR_OFFSET(rxmb));
+  regval     = stm32can_getreg(priv, STM32_CAN_RDTR_OFFSET(rxmb));
   hdr.ch_dlc = (regval & CAN_RDTR_DLC_MASK) >> CAN_RDTR_DLC_SHIFT;
 
   /* Save the message data */
 
-  regval  = can_getreg(priv, STM32_CAN_RDLR_OFFSET(rxmb));
+  regval  = stm32can_getreg(priv, STM32_CAN_RDLR_OFFSET(rxmb));
   data[0] = (regval & CAN_RDLR_DATA0_MASK) >> CAN_RDLR_DATA0_SHIFT;
   data[1] = (regval & CAN_RDLR_DATA1_MASK) >> CAN_RDLR_DATA1_SHIFT;
   data[2] = (regval & CAN_RDLR_DATA2_MASK) >> CAN_RDLR_DATA2_SHIFT;
   data[3] = (regval & CAN_RDLR_DATA3_MASK) >> CAN_RDLR_DATA3_SHIFT;
 
-  regval  = can_getreg(priv, STM32_CAN_RDHR_OFFSET(rxmb));
+  regval  = stm32can_getreg(priv, STM32_CAN_RDHR_OFFSET(rxmb));
   data[4] = (regval & CAN_RDHR_DATA4_MASK) >> CAN_RDHR_DATA4_SHIFT;
   data[5] = (regval & CAN_RDHR_DATA5_MASK) >> CAN_RDHR_DATA5_SHIFT;
   data[6] = (regval & CAN_RDHR_DATA6_MASK) >> CAN_RDHR_DATA6_SHIFT;
@@ -1162,14 +1162,14 @@ static int can_rxinterrupt(int irq, FAR void *context, int rxmb)
 #ifndef CONFIG_CAN_EXTID
 errout:
 #endif
-  regval  = can_getreg(priv, STM32_CAN_RFR_OFFSET(rxmb));
+  regval  = stm32can_getreg(priv, STM32_CAN_RFR_OFFSET(rxmb));
   regval |= CAN_RFR_RFOM;
-  can_putreg(priv, STM32_CAN_RFR_OFFSET(rxmb), regval);
+  stm32can_putreg(priv, STM32_CAN_RFR_OFFSET(rxmb), regval);
   return ret;
 }
 
 /****************************************************************************
- * Name: can_rx0interrupt
+ * Name: stm32can_rx0interrupt
  *
  * Description:
  *   CAN RX FIFO 0 interrupt handler
@@ -1183,13 +1183,13 @@ errout:
  *
  ****************************************************************************/
 
-static int can_rx0interrupt(int irq, FAR void *context)
+static int stm32can_rx0interrupt(int irq, FAR void *context)
 {
-  return can_rxinterrupt(irq, context, 0);
+  return stm32can_rxinterrupt(irq, context, 0);
 }
 
 /****************************************************************************
- * Name: can_rx1interrupt
+ * Name: stm32can_rx1interrupt
  *
  * Description:
  *   CAN RX FIFO 1 interrupt handler
@@ -1203,13 +1203,13 @@ static int can_rx0interrupt(int irq, FAR void *context)
  *
  ****************************************************************************/
 
-static int can_rx1interrupt(int irq, FAR void *context)
+static int stm32can_rx1interrupt(int irq, FAR void *context)
 {
-  return can_rxinterrupt(irq, context, 1);
+  return stm32can_rxinterrupt(irq, context, 1);
 }
 
 /****************************************************************************
- * Name: can_txinterrupt
+ * Name: stm32can_txinterrupt
  *
  * Description:
  *   CAN TX mailbox complete interrupt handler
@@ -1223,7 +1223,7 @@ static int can_rx1interrupt(int irq, FAR void *context)
  *
  ****************************************************************************/
 
-static int can_txinterrupt(int irq, FAR void *context)
+static int stm32can_txinterrupt(int irq, FAR void *context)
 {
   FAR struct can_dev_s *dev = NULL;
   FAR struct stm32_can_s *priv;
@@ -1251,7 +1251,7 @@ static int can_txinterrupt(int irq, FAR void *context)
 
   /* Get the transmit status */
 
-  regval = can_getreg(priv, STM32_CAN_TSR_OFFSET);
+  regval = stm32can_getreg(priv, STM32_CAN_TSR_OFFSET);
 
   /* Check for RQCP0: Request completed mailbox 0 */
 
@@ -1261,7 +1261,7 @@ static int can_txinterrupt(int irq, FAR void *context)
        * ALST0 and TERR0) for Mailbox 0.
        */
 
-      can_putreg(priv, STM32_CAN_TSR_OFFSET, CAN_TSR_RQCP0);
+      stm32can_putreg(priv, STM32_CAN_TSR_OFFSET, CAN_TSR_RQCP0);
 
       /* Check for errors */
 
@@ -1281,7 +1281,7 @@ static int can_txinterrupt(int irq, FAR void *context)
        * ALST1 and TERR1) for Mailbox 1.
        */
 
-      can_putreg(priv, STM32_CAN_TSR_OFFSET, CAN_TSR_RQCP1);
+      stm32can_putreg(priv, STM32_CAN_TSR_OFFSET, CAN_TSR_RQCP1);
 
       /* Check for errors */
 
@@ -1301,7 +1301,7 @@ static int can_txinterrupt(int irq, FAR void *context)
        * ALST2 and TERR2) for Mailbox 2.
        */
 
-      can_putreg(priv, STM32_CAN_TSR_OFFSET, CAN_TSR_RQCP2);
+      stm32can_putreg(priv, STM32_CAN_TSR_OFFSET, CAN_TSR_RQCP2);
 
       /* Check for errors */
 
@@ -1317,7 +1317,7 @@ static int can_txinterrupt(int irq, FAR void *context)
 }
 
 /****************************************************************************
- * Name: can_bittiming
+ * Name: stm32can_bittiming
  *
  * Description:
  *   Set the CAN bit timing register (BTR) based on the configured BAUD.
@@ -1372,7 +1372,7 @@ static int can_txinterrupt(int irq, FAR void *context)
  *
  ****************************************************************************/
 
-static int can_bittiming(FAR struct stm32_can_s *priv)
+static int stm32can_bittiming(FAR struct stm32_can_s *priv)
 {
   uint32_t tmp;
   uint32_t brp;
@@ -1451,12 +1451,12 @@ static int can_bittiming(FAR struct stm32_can_s *priv)
   tmp |= CAN_BTR_LBKM;
 #endif
 
-  can_putreg(priv, STM32_CAN_BTR_OFFSET, tmp);
+  stm32can_putreg(priv, STM32_CAN_BTR_OFFSET, tmp);
   return OK;
 }
 
 /****************************************************************************
- * Name: can_cellinit
+ * Name: stm32can_cellinit
  *
  * Description:
  *   CAN cell initialization
@@ -1469,7 +1469,7 @@ static int can_bittiming(FAR struct stm32_can_s *priv)
  *
  ****************************************************************************/
 
-static int can_cellinit(FAR struct stm32_can_s *priv)
+static int stm32can_cellinit(FAR struct stm32_can_s *priv)
 {
   volatile uint32_t timeout;
   uint32_t regval;
@@ -1479,20 +1479,20 @@ static int can_cellinit(FAR struct stm32_can_s *priv)
 
   /* Exit from sleep mode */
 
-  regval  = can_getreg(priv, STM32_CAN_MCR_OFFSET);
+  regval  = stm32can_getreg(priv, STM32_CAN_MCR_OFFSET);
   regval &= ~CAN_MCR_SLEEP;
-  can_putreg(priv, STM32_CAN_MCR_OFFSET, regval);
+  stm32can_putreg(priv, STM32_CAN_MCR_OFFSET, regval);
 
   /* Enter initialization mode */
 
   regval |= CAN_MCR_INRQ;
-  can_putreg(priv, STM32_CAN_MCR_OFFSET, regval);
+  stm32can_putreg(priv, STM32_CAN_MCR_OFFSET, regval);
 
   /* Wait until initialization mode is acknowledged */
 
   for (timeout = INAK_TIMEOUT; timeout > 0; timeout--)
     {
-      regval = can_getreg(priv, STM32_CAN_MSR_OFFSET);
+      regval = stm32can_getreg(priv, STM32_CAN_MSR_OFFSET);
       if ((regval & CAN_MSR_INAK) != 0)
         {
           /* We are in initialization mode */
@@ -1519,14 +1519,14 @@ static int can_cellinit(FAR struct stm32_can_s *priv)
    *  - Transmit FIFO priority
    */
 
-  regval   = can_getreg(priv, STM32_CAN_MCR_OFFSET);
+  regval   = stm32can_getreg(priv, STM32_CAN_MCR_OFFSET);
   regval &= ~(CAN_MCR_TXFP | CAN_MCR_RFLM | CAN_MCR_NART |
               CAN_MCR_AWUM | CAN_MCR_ABOM | CAN_MCR_TTCM);
-  can_putreg(priv, STM32_CAN_MCR_OFFSET, regval);
+  stm32can_putreg(priv, STM32_CAN_MCR_OFFSET, regval);
 
   /* Configure bit timing. */
 
-  ret = can_bittiming(priv);
+  ret = stm32can_bittiming(priv);
   if (ret < 0)
     {
       canerr("ERROR: Failed to set bit timing: %d\n", ret);
@@ -1535,15 +1535,15 @@ static int can_cellinit(FAR struct stm32_can_s *priv)
 
   /* Exit initialization mode */
 
-  regval  = can_getreg(priv, STM32_CAN_MCR_OFFSET);
+  regval  = stm32can_getreg(priv, STM32_CAN_MCR_OFFSET);
   regval &= ~CAN_MCR_INRQ;
-  can_putreg(priv, STM32_CAN_MCR_OFFSET, regval);
+  stm32can_putreg(priv, STM32_CAN_MCR_OFFSET, regval);
 
   /* Wait until the initialization mode exit is acknowledged */
 
   for (timeout = INAK_TIMEOUT; timeout > 0; timeout--)
     {
-      regval = can_getreg(priv, STM32_CAN_MSR_OFFSET);
+      regval = stm32can_getreg(priv, STM32_CAN_MSR_OFFSET);
       if ((regval & CAN_MSR_INAK) == 0)
         {
           /* We are out of initialization mode */
@@ -1564,7 +1564,7 @@ static int can_cellinit(FAR struct stm32_can_s *priv)
 }
 
 /****************************************************************************
- * Name: can_filterinit
+ * Name: stm32can_filterinit
  *
  * Description:
  *   CAN filter initialization.  CAN filters are not currently used by this
@@ -1596,7 +1596,7 @@ static int can_cellinit(FAR struct stm32_can_s *priv)
  *
  ****************************************************************************/
 
-static int can_filterinit(FAR struct stm32_can_s *priv)
+static int stm32can_filterinit(FAR struct stm32_can_s *priv)
 {
   uint32_t regval;
   uint32_t bitmask;
@@ -1609,63 +1609,63 @@ static int can_filterinit(FAR struct stm32_can_s *priv)
 
   /* Enter filter initialization mode */
 
-  regval  = can_getfreg(priv, STM32_CAN_FMR_OFFSET);
+  regval  = stm32can_getfreg(priv, STM32_CAN_FMR_OFFSET);
   regval |= CAN_FMR_FINIT;
-  can_putfreg(priv, STM32_CAN_FMR_OFFSET, regval);
+  stm32can_putfreg(priv, STM32_CAN_FMR_OFFSET, regval);
 
   /* Assign half the filters to CAN1, half to CAN2 */
 
 #if defined(CONFIG_STM32_CONNECTIVITYLINE) || \
     defined(CONFIG_STM32_STM32F20XX) || \
     defined(CONFIG_STM32_STM32F40XX)
-  regval  = can_getfreg(priv, STM32_CAN_FMR_OFFSET);
+  regval  = stm32can_getfreg(priv, STM32_CAN_FMR_OFFSET);
   regval &= CAN_FMR_CAN2SB_MASK;
   regval |= (CAN_NFILTERS / 2) << CAN_FMR_CAN2SB_SHIFT;
-  can_putfreg(priv, STM32_CAN_FMR_OFFSET, regval);
+  stm32can_putfreg(priv, STM32_CAN_FMR_OFFSET, regval);
 #endif
 
   /* Disable the filter */
 
-  regval  = can_getfreg(priv, STM32_CAN_FA1R_OFFSET);
+  regval  = stm32can_getfreg(priv, STM32_CAN_FA1R_OFFSET);
   regval &= ~bitmask;
-  can_putfreg(priv, STM32_CAN_FA1R_OFFSET, regval);
+  stm32can_putfreg(priv, STM32_CAN_FA1R_OFFSET, regval);
 
   /* Select the 32-bit scale for the filter */
 
-  regval  = can_getfreg(priv, STM32_CAN_FS1R_OFFSET);
+  regval  = stm32can_getfreg(priv, STM32_CAN_FS1R_OFFSET);
   regval |= bitmask;
-  can_putfreg(priv, STM32_CAN_FS1R_OFFSET, regval);
+  stm32can_putfreg(priv, STM32_CAN_FS1R_OFFSET, regval);
 
   /* There are 14 or 28 filter banks (depending) on the device.
    * Each filter bank is composed of two 32-bit registers, CAN_FiR:
    */
 
-  can_putfreg(priv, STM32_CAN_FIR_OFFSET(priv->filter, 1), 0);
-  can_putfreg(priv, STM32_CAN_FIR_OFFSET(priv->filter, 2), 0);
+  stm32can_putfreg(priv, STM32_CAN_FIR_OFFSET(priv->filter, 1), 0);
+  stm32can_putfreg(priv, STM32_CAN_FIR_OFFSET(priv->filter, 2), 0);
 
   /* Set Id/Mask mode for the filter */
 
-  regval  = can_getfreg(priv, STM32_CAN_FM1R_OFFSET);
+  regval  = stm32can_getfreg(priv, STM32_CAN_FM1R_OFFSET);
   regval &= ~bitmask;
-  can_putfreg(priv, STM32_CAN_FM1R_OFFSET, regval);
+  stm32can_putfreg(priv, STM32_CAN_FM1R_OFFSET, regval);
 
   /* Assign FIFO 0 for the filter */
 
-  regval  = can_getfreg(priv, STM32_CAN_FFA1R_OFFSET);
+  regval  = stm32can_getfreg(priv, STM32_CAN_FFA1R_OFFSET);
   regval &= ~bitmask;
-  can_putfreg(priv, STM32_CAN_FFA1R_OFFSET, regval);
+  stm32can_putfreg(priv, STM32_CAN_FFA1R_OFFSET, regval);
 
   /* Enable the filter */
 
-  regval  = can_getfreg(priv, STM32_CAN_FA1R_OFFSET);
+  regval  = stm32can_getfreg(priv, STM32_CAN_FA1R_OFFSET);
   regval |= bitmask;
-  can_putfreg(priv, STM32_CAN_FA1R_OFFSET, regval);
+  stm32can_putfreg(priv, STM32_CAN_FA1R_OFFSET, regval);
 
   /* Exit filter initialization mode */
 
-  regval  = can_getfreg(priv, STM32_CAN_FMR_OFFSET);
+  regval  = stm32can_getfreg(priv, STM32_CAN_FMR_OFFSET);
   regval &= ~CAN_FMR_FINIT;
-  can_putfreg(priv, STM32_CAN_FMR_OFFSET, regval);
+  stm32can_putfreg(priv, STM32_CAN_FMR_OFFSET, regval);
   return OK;
 }
 
-- 
GitLab


From 017670ac9da0381f5cb35048da8491a75243fdf7 Mon Sep 17 00:00:00 2001
From: Sebastien Lorquet 
Date: Fri, 24 Jun 2016 11:40:59 +0200
Subject: [PATCH 032/229] Re-rename the stm32l4 can driver functions

---
 arch/arm/src/stm32l4/stm32l4_can.c | 418 ++++++++++++++---------------
 arch/arm/src/stm32l4/stm32l4_can.h |   2 +-
 2 files changed, 210 insertions(+), 210 deletions(-)

diff --git a/arch/arm/src/stm32l4/stm32l4_can.c b/arch/arm/src/stm32l4/stm32l4_can.c
index 3821055760..6052791de1 100644
--- a/arch/arm/src/stm32l4/stm32l4_can.c
+++ b/arch/arm/src/stm32l4/stm32l4_can.c
@@ -90,7 +90,7 @@
  * Private Types
  ****************************************************************************/
 
-struct stm32l4_can_s
+struct stm32l4can__s
 {
   uint8_t  port;   /* CAN port number (1 or 2) */
   uint8_t  canrx0; /* CAN RX FIFO 0 IRQ number */
@@ -107,65 +107,65 @@ struct stm32l4_can_s
 
 /* CAN Register access */
 
-static uint32_t stm32l4_cangetreg(FAR struct stm32l4_can_s *priv,
+static uint32_t stm32l4can_getreg(FAR struct stm32l4can__s *priv,
               int offset);
-static uint32_t stm32l4_cangetfreg(FAR struct stm32l4_can_s *priv,
+static uint32_t stm32l4can_getfreg(FAR struct stm32l4can__s *priv,
               int offset);
-static void stm32l4_canputreg(FAR struct stm32l4_can_s *priv, int offset,
+static void stm32l4can_putreg(FAR struct stm32l4can__s *priv, int offset,
               uint32_t value);
-static void stm32l4_canputfreg(FAR struct stm32l4_can_s *priv, int offset,
+static void stm32l4can_putfreg(FAR struct stm32l4can__s *priv, int offset,
               uint32_t value);
 #ifdef CONFIG_STM32L4_CAN_REGDEBUG
-static void stm32l4_candumpctrlregs(FAR struct stm32l4_can_s *priv,
+static void stm32l4can_dumpctrlregs(FAR struct stm32l4can__s *priv,
               FAR const char *msg);
-static void stm32l4_candumpmbregs(FAR struct stm32l4_can_s *priv,
+static void stm32l4can_dumpmbregs(FAR struct stm32l4can__s *priv,
               FAR const char *msg);
-static void stm32l4_candumpfiltregs(FAR struct stm32l4_can_s *priv,
+static void stm32l4can_dumpfiltregs(FAR struct stm32l4can__s *priv,
               FAR const char *msg);
 #else
-#  define stm32l4_candumpctrlregs(priv,msg)
-#  define stm32l4_candumpmbregs(priv,msg)
-#  define stm32l4_candumpfiltregs(priv,msg)
+#  define stm32l4can_dumpctrlregs(priv,msg)
+#  define stm32l4can_dumpmbregs(priv,msg)
+#  define stm32l4can_dumpfiltregs(priv,msg)
 #endif
 
 /* CAN driver methods */
 
-static void stm32l4_canreset(FAR struct can_dev_s *dev);
-static int  stm32l4_cansetup(FAR struct can_dev_s *dev);
-static void stm32l4_canshutdown(FAR struct can_dev_s *dev);
-static void stm32l4_canrxint(FAR struct can_dev_s *dev, bool enable);
-static void stm32l4_cantxint(FAR struct can_dev_s *dev, bool enable);
-static int  stm32l4_canioctl(FAR struct can_dev_s *dev, int cmd,
+static void stm32l4can_reset(FAR struct can_dev_s *dev);
+static int  stm32l4can_setup(FAR struct can_dev_s *dev);
+static void stm32l4can_shutdown(FAR struct can_dev_s *dev);
+static void stm32l4can_rxint(FAR struct can_dev_s *dev, bool enable);
+static void stm32l4can_txint(FAR struct can_dev_s *dev, bool enable);
+static int  stm32l4can_ioctl(FAR struct can_dev_s *dev, int cmd,
               unsigned long arg);
-static int  stm32l4_canremoterequest(FAR struct can_dev_s *dev,
+static int  stm32l4can_remoterequest(FAR struct can_dev_s *dev,
               uint16_t id);
-static int  stm32l4_cansend(FAR struct can_dev_s *dev,
+static int  stm32l4can_send(FAR struct can_dev_s *dev,
               FAR struct can_msg_s *msg);
-static bool stm32l4_cantxready(FAR struct can_dev_s *dev);
-static bool stm32l4_cantxempty(FAR struct can_dev_s *dev);
+static bool stm32l4can_txready(FAR struct can_dev_s *dev);
+static bool stm32l4can_txempty(FAR struct can_dev_s *dev);
 
 /* CAN interrupt handling */
 
-static int  stm32l4_canrx0interrupt(int irq, FAR void *context);
-static int  stm32l4_cantxinterrupt(int irq, FAR void *context);
+static int  stm32l4can_rx0interrupt(int irq, FAR void *context);
+static int  stm32l4can_txinterrupt(int irq, FAR void *context);
 
 /* Initialization */
 
-static int  stm32l4_canenterinitmode(FAR struct stm32l4_can_s *priv);
-static int  stm32l4_canexitinitmode(FAR struct stm32l4_can_s *priv);
-static int  stm32l4_canbittiming(FAR struct stm32l4_can_s *priv);
-static int  stm32l4_cancellinit(FAR struct stm32l4_can_s *priv);
-static int  stm32l4_canfilterinit(FAR struct stm32l4_can_s *priv);
+static int  stm32l4can_enterinitmode(FAR struct stm32l4can__s *priv);
+static int  stm32l4can_exitinitmode(FAR struct stm32l4can__s *priv);
+static int  stm32l4can_bittiming(FAR struct stm32l4can__s *priv);
+static int  stm32l4can_cellinit(FAR struct stm32l4can__s *priv);
+static int  stm32l4can_filterinit(FAR struct stm32l4can__s *priv);
 
 /* Filtering (todo) */
 
-static int  stm32l4_canaddextfilter(FAR struct stm32l4_can_s *priv,
+static int  stm32l4can_addextfilter(FAR struct stm32l4can__s *priv,
               FAR struct canioc_extfilter_s *arg);
-static int  stm32l4_candelextfilter(FAR struct stm32l4_can_s *priv,
+static int  stm32l4can_delextfilter(FAR struct stm32l4can__s *priv,
               int arg);
-static int  stm32l4_canaddstdfilter(FAR struct stm32l4_can_s *priv,
+static int  stm32l4can_addstdfilter(FAR struct stm32l4can__s *priv,
               FAR struct canioc_stdfilter_s *arg);
-static int  stm32l4_candelstdfilter(FAR struct stm32l4_can_s *priv,
+static int  stm32l4can_delstdfilter(FAR struct stm32l4can__s *priv,
               int arg);
 
 /****************************************************************************
@@ -174,20 +174,20 @@ static int  stm32l4_candelstdfilter(FAR struct stm32l4_can_s *priv,
 
 static const struct can_ops_s g_canops =
 {
-  .co_reset         = stm32l4_canreset,
-  .co_setup         = stm32l4_cansetup,
-  .co_shutdown      = stm32l4_canshutdown,
-  .co_rxint         = stm32l4_canrxint,
-  .co_txint         = stm32l4_cantxint,
-  .co_ioctl         = stm32l4_canioctl,
-  .co_remoterequest = stm32l4_canremoterequest,
-  .co_send          = stm32l4_cansend,
-  .co_txready       = stm32l4_cantxready,
-  .co_txempty       = stm32l4_cantxempty,
+  .co_reset         = stm32l4can_reset,
+  .co_setup         = stm32l4can_setup,
+  .co_shutdown      = stm32l4can_shutdown,
+  .co_rxint         = stm32l4can_rxint,
+  .co_txint         = stm32l4can_txint,
+  .co_ioctl         = stm32l4can_ioctl,
+  .co_remoterequest = stm32l4can_remoterequest,
+  .co_send          = stm32l4can_send,
+  .co_txready       = stm32l4can_txready,
+  .co_txempty       = stm32l4can_txempty,
 };
 
 #ifdef CONFIG_STM32L4_CAN1
-static struct stm32l4_can_s g_can1priv =
+static struct stm32l4can__s g_can1priv =
 {
   .port             = 1,
   .canrx0           = STM32L4_IRQ_CAN1RX0,
@@ -210,8 +210,8 @@ static struct can_dev_s g_can1dev =
  ****************************************************************************/
 
 /****************************************************************************
- * Name: stm32l4_cangetreg
- * Name: stm32l4_cangetfreg
+ * Name: stm32l4can_getreg
+ * Name: stm32l4can_getfreg
  *
  * Description:
  *   Read the value of a CAN register or filter block register.
@@ -225,7 +225,7 @@ static struct can_dev_s g_can1dev =
  ****************************************************************************/
 
 #ifdef CONFIG_STM32L4_CAN_REGDEBUG
-static uint32_t stm32l4_canvgetreg(uint32_t addr)
+static uint32_t stm32l4can_vgetreg(uint32_t addr)
 {
   static uint32_t prevaddr = 0;
   static uint32_t preval   = 0;
@@ -278,23 +278,23 @@ static uint32_t stm32l4_canvgetreg(uint32_t addr)
   return val;
 }
 
-static uint32_t stm32l4_cangetreg(FAR struct stm32l4_can_s *priv, int offset)
+static uint32_t stm32l4can_getreg(FAR struct stm32l4can__s *priv, int offset)
 {
-  return stm32l4_canvgetreg(priv->base + offset);
+  return stm32l4can_vgetreg(priv->base + offset);
 }
 
-static uint32_t stm32l4_cangetfreg(FAR struct stm32l4_can_s *priv, int offset)
+static uint32_t stm32l4can_getfreg(FAR struct stm32l4can__s *priv, int offset)
 {
-  return stm32l4_canvgetreg(priv->fbase + offset);
+  return stm32l4can_vgetreg(priv->fbase + offset);
 }
 
 #else
-static uint32_t stm32l4_cangetreg(FAR struct stm32l4_can_s *priv, int offset)
+static uint32_t stm32l4can_getreg(FAR struct stm32l4can__s *priv, int offset)
 {
   return getreg32(priv->base + offset);
 }
 
-static uint32_t stm32l4_cangetfreg(FAR struct stm32l4_can_s *priv, int offset)
+static uint32_t stm32l4can_getfreg(FAR struct stm32l4can__s *priv, int offset)
 {
   return getreg32(priv->fbase + offset);
 }
@@ -302,8 +302,8 @@ static uint32_t stm32l4_cangetfreg(FAR struct stm32l4_can_s *priv, int offset)
 #endif
 
 /****************************************************************************
- * Name: stm32l4_canputreg
- * Name: stm32l4_canputfreg
+ * Name: stm32l4can_putreg
+ * Name: stm32l4can_putfreg
  *
  * Description:
  *   Set the value of a CAN register or filter block register.
@@ -319,7 +319,7 @@ static uint32_t stm32l4_cangetfreg(FAR struct stm32l4_can_s *priv, int offset)
  ****************************************************************************/
 
 #ifdef CONFIG_STM32L4_CAN_REGDEBUG
-static void stm32l4_canvputreg(uint32_t addr, uint32_t value)
+static void stm32l4can_vputreg(uint32_t addr, uint32_t value)
 {
   /* Show the register value being written */
 
@@ -330,26 +330,26 @@ static void stm32l4_canvputreg(uint32_t addr, uint32_t value)
   putreg32(value, addr);
 }
 
-static void stm32l4_canputreg(FAR struct stm32l4_can_s *priv, int offset,
+static void stm32l4can_putreg(FAR struct stm32l4can__s *priv, int offset,
                               uint32_t value)
 {
-  stm32l4_canvputreg(priv->base + offset, value);
+  stm32l4can_vputreg(priv->base + offset, value);
 }
 
-static void stm32l4_canputfreg(FAR struct stm32l4_can_s *priv, int offset,
+static void stm32l4can_putfreg(FAR struct stm32l4can__s *priv, int offset,
                                uint32_t value)
 {
-  stm32l4_canvputreg(priv->fbase + offset, value);
+  stm32l4can_vputreg(priv->fbase + offset, value);
 }
 
 #else
-static void stm32l4_canputreg(FAR struct stm32l4_can_s *priv, int offset,
+static void stm32l4can_putreg(FAR struct stm32l4can__s *priv, int offset,
                               uint32_t value)
 {
   putreg32(value, priv->base + offset);
 }
 
-static void stm32l4_canputfreg(FAR struct stm32l4_can_s *priv, int offset,
+static void stm32l4can_putfreg(FAR struct stm32l4can__s *priv, int offset,
                                uint32_t value)
 {
   putreg32(value, priv->fbase + offset);
@@ -357,7 +357,7 @@ static void stm32l4_canputfreg(FAR struct stm32l4_can_s *priv, int offset,
 #endif
 
 /****************************************************************************
- * Name: stm32l4_candumpctrlregs
+ * Name: stm32l4can_dumpctrlregs
  *
  * Description:
  *   Dump the contents of all CAN control registers
@@ -371,7 +371,7 @@ static void stm32l4_canputfreg(FAR struct stm32l4_can_s *priv, int offset,
  ****************************************************************************/
 
 #ifdef CONFIG_STM32L4_CAN_REGDEBUG
-static void stm32l4_candumpctrlregs(FAR struct stm32l4_can_s *priv,
+static void stm32l4can_dumpctrlregs(FAR struct stm32l4can__s *priv,
                                     FAR const char *msg)
 {
   if (msg)
@@ -402,7 +402,7 @@ static void stm32l4_candumpctrlregs(FAR struct stm32l4_can_s *priv,
 #endif
 
 /****************************************************************************
- * Name: stm32l4_candumpmbregs
+ * Name: stm32l4can_dumpmbregs
  *
  * Description:
  *   Dump the contents of all CAN mailbox registers
@@ -416,7 +416,7 @@ static void stm32l4_candumpctrlregs(FAR struct stm32l4_can_s *priv,
  ****************************************************************************/
 
 #ifdef CONFIG_STM32L4_CAN_REGDEBUG
-static void stm32l4_candumpmbregs(FAR struct stm32l4_can_s *priv,
+static void stm32l4can_dumpmbregs(FAR struct stm32l4can__s *priv,
                                   FAR const char *msg)
 {
   if (msg)
@@ -463,7 +463,7 @@ static void stm32l4_candumpmbregs(FAR struct stm32l4_can_s *priv,
 #endif
 
 /****************************************************************************
- * Name: stm32l4_candumpfiltregs
+ * Name: stm32l4can_dumpfiltregs
  *
  * Description:
  *   Dump the contents of all CAN filter registers
@@ -477,7 +477,7 @@ static void stm32l4_candumpmbregs(FAR struct stm32l4_can_s *priv,
  ****************************************************************************/
 
 #ifdef CONFIG_STM32L4_CAN_REGDEBUG
-static void stm32l4_candumpfiltregs(FAR struct stm32l4_can_s *priv,
+static void stm32l4can_dumpfiltregs(FAR struct stm32l4can__s *priv,
                                     FAR const char *msg)
 {
   int i;
@@ -508,11 +508,11 @@ static void stm32l4_candumpfiltregs(FAR struct stm32l4_can_s *priv,
 #endif
 
 /****************************************************************************
- * Name: stm32l4_canreset
+ * Name: stm32l4can_reset
  *
  * Description:
  *   Reset the CAN device.  Called early to initialize the hardware. This
- *   function is called, before stm32l4_cansetup() and on error conditions.
+ *   function is called, before stm32l4can_setup() and on error conditions.
  *
  * Input Parameters:
  *   dev - An instance of the "upper half" can driver state structure.
@@ -522,9 +522,9 @@ static void stm32l4_candumpfiltregs(FAR struct stm32l4_can_s *priv,
  *
  ****************************************************************************/
 
-static void stm32l4_canreset(FAR struct can_dev_s *dev)
+static void stm32l4can_reset(FAR struct can_dev_s *dev)
 {
-  FAR struct stm32l4_can_s *priv = dev->cd_priv;
+  FAR struct stm32l4can__s *priv = dev->cd_priv;
   uint32_t regval;
   uint32_t regbit = 0;
   irqstate_t flags;
@@ -563,7 +563,7 @@ static void stm32l4_canreset(FAR struct can_dev_s *dev)
 }
 
 /****************************************************************************
- * Name: stm32l4_cansetup
+ * Name: stm32l4can_setup
  *
  * Description:
  *   Configure the CAN. This method is called the first time that the CAN
@@ -579,9 +579,9 @@ static void stm32l4_canreset(FAR struct can_dev_s *dev)
  *
  ****************************************************************************/
 
-static int stm32l4_cansetup(FAR struct can_dev_s *dev)
+static int stm32l4can_setup(FAR struct can_dev_s *dev)
 {
-  FAR struct stm32l4_can_s *priv = dev->cd_priv;
+  FAR struct stm32l4can__s *priv = dev->cd_priv;
   int ret;
 
   caninfo("CAN%d RX0 irq: %d TX irq: %d\n",
@@ -589,7 +589,7 @@ static int stm32l4_cansetup(FAR struct can_dev_s *dev)
 
   /* CAN cell initialization */
 
-  ret = stm32l4_cancellinit(priv);
+  ret = stm32l4can_cellinit(priv);
   if (ret < 0)
     {
       canerr("ERROR: CAN%d cell initialization failed: %d\n",
@@ -597,12 +597,12 @@ static int stm32l4_cansetup(FAR struct can_dev_s *dev)
       return ret;
     }
 
-  stm32l4_candumpctrlregs(priv, "After cell initialization");
-  stm32l4_candumpmbregs(priv, NULL);
+  stm32l4can_dumpctrlregs(priv, "After cell initialization");
+  stm32l4can_dumpmbregs(priv, NULL);
 
   /* CAN filter initialization */
 
-  ret = stm32l4_canfilterinit(priv);
+  ret = stm32l4can_filterinit(priv);
   if (ret < 0)
     {
       canerr("ERROR: CAN%d filter initialization failed: %d\n",
@@ -610,13 +610,13 @@ static int stm32l4_cansetup(FAR struct can_dev_s *dev)
       return ret;
     }
 
-  stm32l4_candumpfiltregs(priv, "After filter initialization");
+  stm32l4can_dumpfiltregs(priv, "After filter initialization");
 
   /* Attach the CAN RX FIFO 0 interrupt and TX interrupts.  The others are
    * not used.
    */
 
-  ret = irq_attach(priv->canrx0, stm32l4_canrx0interrupt);
+  ret = irq_attach(priv->canrx0, stm32l4can_rx0interrupt);
   if (ret < 0)
     {
       canerr("ERROR: Failed to attach CAN%d RX0 IRQ (%d)",
@@ -624,7 +624,7 @@ static int stm32l4_cansetup(FAR struct can_dev_s *dev)
       return ret;
     }
 
-  ret = irq_attach(priv->cantx, stm32l4_cantxinterrupt);
+  ret = irq_attach(priv->cantx, stm32l4can_txinterrupt);
   if (ret < 0)
     {
       canerr("ERROR: Failed to attach CAN%d TX IRQ (%d)",
@@ -643,7 +643,7 @@ static int stm32l4_cansetup(FAR struct can_dev_s *dev)
 }
 
 /****************************************************************************
- * Name: stm32l4_canshutdown
+ * Name: stm32l4can_shutdown
  *
  * Description:
  *   Disable the CAN.  This method is called when the CAN device is closed.
@@ -657,9 +657,9 @@ static int stm32l4_cansetup(FAR struct can_dev_s *dev)
  *
  ****************************************************************************/
 
-static void stm32l4_canshutdown(FAR struct can_dev_s *dev)
+static void stm32l4can_shutdown(FAR struct can_dev_s *dev)
 {
-  FAR struct stm32l4_can_s *priv = dev->cd_priv;
+  FAR struct stm32l4can__s *priv = dev->cd_priv;
 
   caninfo("CAN%d\n", priv->port);
 
@@ -675,11 +675,11 @@ static void stm32l4_canshutdown(FAR struct can_dev_s *dev)
 
   /* And reset the hardware */
 
-  stm32l4_canreset(dev);
+  stm32l4can_reset(dev);
 }
 
 /****************************************************************************
- * Name: stm32l4_canrxint
+ * Name: stm32l4can_rxint
  *
  * Description:
  *   Call to enable or disable RX interrupts.
@@ -692,16 +692,16 @@ static void stm32l4_canshutdown(FAR struct can_dev_s *dev)
  *
  ****************************************************************************/
 
-static void stm32l4_canrxint(FAR struct can_dev_s *dev, bool enable)
+static void stm32l4can_rxint(FAR struct can_dev_s *dev, bool enable)
 {
-  FAR struct stm32l4_can_s *priv = dev->cd_priv;
+  FAR struct stm32l4can__s *priv = dev->cd_priv;
   uint32_t regval;
 
   caninfo("CAN%d enable: %d\n", priv->port, enable);
 
   /* Enable/disable the FIFO 0 message pending interrupt */
 
-  regval = stm32l4_cangetreg(priv, STM32L4_CAN_IER_OFFSET);
+  regval = stm32l4can_getreg(priv, STM32L4_CAN_IER_OFFSET);
   if (enable)
     {
       regval |= CAN_IER_FMPIE0;
@@ -711,11 +711,11 @@ static void stm32l4_canrxint(FAR struct can_dev_s *dev, bool enable)
       regval &= ~CAN_IER_FMPIE0;
     }
 
-  stm32l4_canputreg(priv, STM32L4_CAN_IER_OFFSET, regval);
+  stm32l4can_putreg(priv, STM32L4_CAN_IER_OFFSET, regval);
 }
 
 /****************************************************************************
- * Name: stm32l4_cantxint
+ * Name: stm32l4can_txint
  *
  * Description:
  *   Call to enable or disable TX interrupts.
@@ -728,9 +728,9 @@ static void stm32l4_canrxint(FAR struct can_dev_s *dev, bool enable)
  *
  ****************************************************************************/
 
-static void stm32l4_cantxint(FAR struct can_dev_s *dev, bool enable)
+static void stm32l4can_txint(FAR struct can_dev_s *dev, bool enable)
 {
-  FAR struct stm32l4_can_s *priv = dev->cd_priv;
+  FAR struct stm32l4can__s *priv = dev->cd_priv;
   uint32_t regval;
 
   caninfo("CAN%d enable: %d\n", priv->port, enable);
@@ -739,14 +739,14 @@ static void stm32l4_cantxint(FAR struct can_dev_s *dev, bool enable)
 
   if (!enable)
     {
-      regval  = stm32l4_cangetreg(priv, STM32L4_CAN_IER_OFFSET);
+      regval  = stm32l4can_getreg(priv, STM32L4_CAN_IER_OFFSET);
       regval &= ~CAN_IER_TMEIE;
-      stm32l4_canputreg(priv, STM32L4_CAN_IER_OFFSET, regval);
+      stm32l4can_putreg(priv, STM32L4_CAN_IER_OFFSET, regval);
     }
 }
 
 /****************************************************************************
- * Name: stm32l4_canioctl
+ * Name: stm32l4can_ioctl
  *
  * Description:
  *   All ioctl calls will be routed through this method
@@ -759,10 +759,10 @@ static void stm32l4_cantxint(FAR struct can_dev_s *dev, bool enable)
  *
  ****************************************************************************/
 
-static int stm32l4_canioctl(FAR struct can_dev_s *dev, int cmd,
+static int stm32l4can_ioctl(FAR struct can_dev_s *dev, int cmd,
                             unsigned long arg)
 {
-  FAR struct stm32l4_can_s *priv;
+  FAR struct stm32l4can__s *priv;
   int ret = -ENOTTY;
 
   caninfo("cmd=%04x arg=%lu\n", cmd, arg);
@@ -793,7 +793,7 @@ static int stm32l4_canioctl(FAR struct can_dev_s *dev, int cmd,
           uint32_t brp;
 
           DEBUGASSERT(bt != NULL);
-          regval       = stm32l4_cangetreg(priv, STM32L4_CAN_BTR_OFFSET);
+          regval       = stm32l4can_getreg(priv, STM32L4_CAN_BTR_OFFSET);
           bt->bt_sjw   = ((regval & CAN_BTR_SJW_MASK) >> CAN_BTR_SJW_SHIFT) + 1;
           bt->bt_tseg1 = ((regval & CAN_BTR_TS1_MASK) >> CAN_BTR_TS1_SHIFT) + 1;
           bt->bt_tseg2 = ((regval & CAN_BTR_TS2_MASK) >> CAN_BTR_TS2_SHIFT) + 1;
@@ -837,7 +837,7 @@ static int stm32l4_canioctl(FAR struct can_dev_s *dev, int cmd,
           DEBUGASSERT(bt->bt_tseg1 > 0 && bt->bt_tseg1 <= 16);
           DEBUGASSERT(bt->bt_tseg2 > 0 && bt->bt_tseg2 <=  8);
 
-          regval = stm32l4_cangetreg(priv, STM32L4_CAN_BTR_OFFSET);
+          regval = stm32l4can_getreg(priv, STM32L4_CAN_BTR_OFFSET);
 
           /* Extract bit timing data */
           /* tmp is in clocks per bit time */
@@ -855,9 +855,9 @@ static int stm32l4_canioctl(FAR struct can_dev_s *dev, int cmd,
               ret = -EINVAL;
             }
 
-          /* Otherwise, nquanta is stm32l4_canbit_quanta, ts1 and ts2 are
+          /* Otherwise, nquanta is stm32l4can_bit_quanta, ts1 and ts2 are
            * provided by the user and we calculate brp to achieve
-           * stm32l4_canbit_quanta quanta in the bit times
+           * stm32l4can_bit_quanta quanta in the bit times
            */
 
           else
@@ -878,15 +878,15 @@ static int stm32l4_canioctl(FAR struct can_dev_s *dev, int cmd,
   
           /* Bit timing can only be configured in init mode. */
 
-          ret = stm32l4_canenterinitmode(priv);
+          ret = stm32l4can_enterinitmode(priv);
           if (ret != 0)
             {
               break;
             }
 
-          stm32l4_canputreg(priv, STM32L4_CAN_BTR_OFFSET, regval);
+          stm32l4can_putreg(priv, STM32L4_CAN_BTR_OFFSET, regval);
 
-          ret = stm32l4_canexitinitmode(priv);
+          ret = stm32l4can_exitinitmode(priv);
 
           if (ret == 0)
             {
@@ -914,7 +914,7 @@ static int stm32l4_canioctl(FAR struct can_dev_s *dev, int cmd,
 
           DEBUGASSERT(bm != NULL);
 
-          regval          = stm32l4_cangetreg(priv, STM32L4_CAN_BTR_OFFSET);
+          regval          = stm32l4can_getreg(priv, STM32L4_CAN_BTR_OFFSET);
 
           bm->bm_loopback = ((regval & CAN_BTR_LBKM) == CAN_BTR_LBKM);
           bm->bm_silent   = ((regval & CAN_BTR_SILM) == CAN_BTR_SILM);
@@ -941,7 +941,7 @@ static int stm32l4_canioctl(FAR struct can_dev_s *dev, int cmd,
 
           DEBUGASSERT(bm != NULL);
 
-          regval = stm32l4_cangetreg(priv, STM32L4_CAN_BTR_OFFSET);
+          regval = stm32l4can_getreg(priv, STM32L4_CAN_BTR_OFFSET);
 
           if (bm->bm_loopback)
             {
@@ -963,15 +963,15 @@ static int stm32l4_canioctl(FAR struct can_dev_s *dev, int cmd,
 
           /* This register can only be configured in init mode. */
 
-          ret = stm32l4_canenterinitmode(priv);
+          ret = stm32l4can_enterinitmode(priv);
           if (ret != 0)
             {
               break;
             }
 
-          stm32l4_canputreg(priv, STM32L4_CAN_BTR_OFFSET, regval);
+          stm32l4can_putreg(priv, STM32L4_CAN_BTR_OFFSET, regval);
 
-          ret = stm32l4_canexitinitmode(priv);
+          ret = stm32l4can_exitinitmode(priv);
         }
         break;
 
@@ -988,7 +988,7 @@ static int stm32l4_canioctl(FAR struct can_dev_s *dev, int cmd,
       case CANIOC_ADD_EXTFILTER:
         {
           DEBUGASSERT(arg != 0);
-          ret = stm32l4_canaddextfilter(priv, (FAR struct canioc_extfilter_s *)arg);
+          ret = stm32l4can_addextfilter(priv, (FAR struct canioc_extfilter_s *)arg);
         }
         break;
 
@@ -1005,7 +1005,7 @@ static int stm32l4_canioctl(FAR struct can_dev_s *dev, int cmd,
       case CANIOC_DEL_EXTFILTER:
         {
           DEBUGASSERT(arg <= priv->config->nextfilters);
-          ret = stm32l4_candelextfilter(priv, (int)arg);
+          ret = stm32l4can_delextfilter(priv, (int)arg);
         }
         break;
 #endif
@@ -1022,7 +1022,7 @@ static int stm32l4_canioctl(FAR struct can_dev_s *dev, int cmd,
       case CANIOC_ADD_STDFILTER:
         {
           DEBUGASSERT(arg != 0);
-          ret = stm32l4_canaddstdfilter(priv, (FAR struct canioc_stdfilter_s *)arg);
+          ret = stm32l4can_addstdfilter(priv, (FAR struct canioc_stdfilter_s *)arg);
         }
         break;
 
@@ -1039,7 +1039,7 @@ static int stm32l4_canioctl(FAR struct can_dev_s *dev, int cmd,
       case CANIOC_DEL_STDFILTER:
         {
           DEBUGASSERT(arg <= priv->config->nstdfilters);
-          ret = stm32l4_candelstdfilter(priv, (int)arg);
+          ret = stm32l4can_delstdfilter(priv, (int)arg);
         }
         break;
 
@@ -1054,7 +1054,7 @@ static int stm32l4_canioctl(FAR struct can_dev_s *dev, int cmd,
 }
 
 /****************************************************************************
- * Name: stm32l4_canremoterequest
+ * Name: stm32l4can_remoterequest
  *
  * Description:
  *   Send a remote request
@@ -1067,14 +1067,14 @@ static int stm32l4_canioctl(FAR struct can_dev_s *dev, int cmd,
  *
  ****************************************************************************/
 
-static int stm32l4_canremoterequest(FAR struct can_dev_s *dev, uint16_t id)
+static int stm32l4can_remoterequest(FAR struct can_dev_s *dev, uint16_t id)
 {
 #warning "Remote request not implemented"
   return -ENOSYS;
 }
 
 /****************************************************************************
- * Name: stm32l4_cansend
+ * Name: stm32l4can_send
  *
  * Description:
  *    Send one can message.
@@ -1096,10 +1096,10 @@ static int stm32l4_canremoterequest(FAR struct can_dev_s *dev, uint16_t id)
  *
  ****************************************************************************/
 
-static int stm32l4_cansend(FAR struct can_dev_s *dev,
+static int stm32l4can_send(FAR struct can_dev_s *dev,
                            FAR struct can_msg_s *msg)
 {
-  FAR struct stm32l4_can_s *priv = dev->cd_priv;
+  FAR struct stm32l4can__s *priv = dev->cd_priv;
   FAR uint8_t *ptr;
   uint32_t regval;
   uint32_t tmp;
@@ -1111,7 +1111,7 @@ static int stm32l4_cansend(FAR struct can_dev_s *dev,
 
   /* Select one empty transmit mailbox */
 
-  regval = stm32l4_cangetreg(priv, STM32L4_CAN_TSR_OFFSET);
+  regval = stm32l4can_getreg(priv, STM32L4_CAN_TSR_OFFSET);
   if ((regval & CAN_TSR_TME0) != 0 && (regval & CAN_TSR_RQCP0) == 0)
     {
       txmb = 0;
@@ -1132,10 +1132,10 @@ static int stm32l4_cansend(FAR struct can_dev_s *dev,
 
   /* Clear TXRQ, RTR, IDE, EXID, and STID fields */
 
-  regval  = stm32l4_cangetreg(priv, STM32L4_CAN_TIR_OFFSET(txmb));
+  regval  = stm32l4can_getreg(priv, STM32L4_CAN_TIR_OFFSET(txmb));
   regval &= ~(CAN_TIR_TXRQ | CAN_TIR_RTR | CAN_TIR_IDE | CAN_TIR_EXID_MASK |
               CAN_TIR_STID_MASK);
-  stm32l4_canputreg(priv, STM32L4_CAN_TIR_OFFSET(txmb), regval);
+  stm32l4can_putreg(priv, STM32L4_CAN_TIR_OFFSET(txmb), regval);
 
   /* Set up the ID, standard 11-bit or extended 29-bit. */
 
@@ -1155,15 +1155,15 @@ static int stm32l4_cansend(FAR struct can_dev_s *dev,
   regval &= ~CAN_TIR_STID_MASK;
   regval |= (uint32_t)msg->cm_hdr.ch_id << CAN_TIR_STID_SHIFT;
 #endif
-  stm32l4_canputreg(priv, STM32L4_CAN_TIR_OFFSET(txmb), regval);
+  stm32l4can_putreg(priv, STM32L4_CAN_TIR_OFFSET(txmb), regval);
 
   /* Set up the DLC */
 
   dlc     = msg->cm_hdr.ch_dlc;
-  regval  = stm32l4_cangetreg(priv, STM32L4_CAN_TDTR_OFFSET(txmb));
+  regval  = stm32l4can_getreg(priv, STM32L4_CAN_TDTR_OFFSET(txmb));
   regval &= ~(CAN_TDTR_DLC_MASK | CAN_TDTR_TGT);
   regval |= (uint32_t)dlc << CAN_TDTR_DLC_SHIFT;
-  stm32l4_canputreg(priv, STM32L4_CAN_TDTR_OFFSET(txmb), regval);
+  stm32l4can_putreg(priv, STM32L4_CAN_TDTR_OFFSET(txmb), regval);
 
   /* Set up the data fields */
 
@@ -1194,7 +1194,7 @@ static int stm32l4_cansend(FAR struct can_dev_s *dev,
         }
     }
 
-  stm32l4_canputreg(priv, STM32L4_CAN_TDLR_OFFSET(txmb), regval);
+  stm32l4can_putreg(priv, STM32L4_CAN_TDLR_OFFSET(txmb), regval);
 
   regval = 0;
   if (dlc > 4)
@@ -1221,26 +1221,26 @@ static int stm32l4_cansend(FAR struct can_dev_s *dev,
         }
     }
 
-  stm32l4_canputreg(priv, STM32L4_CAN_TDHR_OFFSET(txmb), regval);
+  stm32l4can_putreg(priv, STM32L4_CAN_TDHR_OFFSET(txmb), regval);
 
   /* Enable the transmit mailbox empty interrupt (may already be enabled) */
 
-  regval  = stm32l4_cangetreg(priv, STM32L4_CAN_IER_OFFSET);
+  regval  = stm32l4can_getreg(priv, STM32L4_CAN_IER_OFFSET);
   regval |= CAN_IER_TMEIE;
-  stm32l4_canputreg(priv, STM32L4_CAN_IER_OFFSET, regval);
+  stm32l4can_putreg(priv, STM32L4_CAN_IER_OFFSET, regval);
 
   /* Request transmission */
 
-  regval  = stm32l4_cangetreg(priv, STM32L4_CAN_TIR_OFFSET(txmb));
+  regval  = stm32l4can_getreg(priv, STM32L4_CAN_TIR_OFFSET(txmb));
   regval |= CAN_TIR_TXRQ;  /* Transmit Mailbox Request */
-  stm32l4_canputreg(priv, STM32L4_CAN_TIR_OFFSET(txmb), regval);
+  stm32l4can_putreg(priv, STM32L4_CAN_TIR_OFFSET(txmb), regval);
 
-  stm32l4_candumpmbregs(priv, "After send");
+  stm32l4can_dumpmbregs(priv, "After send");
   return OK;
 }
 
 /****************************************************************************
- * Name: stm32l4_cantxready
+ * Name: stm32l4can_txready
  *
  * Description:
  *   Return true if the CAN hardware can accept another TX message.
@@ -1253,14 +1253,14 @@ static int stm32l4_cansend(FAR struct can_dev_s *dev,
  *
  ****************************************************************************/
 
-static bool stm32l4_cantxready(FAR struct can_dev_s *dev)
+static bool stm32l4can_txready(FAR struct can_dev_s *dev)
 {
-  FAR struct stm32l4_can_s *priv = dev->cd_priv;
+  FAR struct stm32l4can__s *priv = dev->cd_priv;
   uint32_t regval;
 
   /* Return true if any mailbox is available */
 
-  regval = stm32l4_cangetreg(priv, STM32L4_CAN_TSR_OFFSET);
+  regval = stm32l4can_getreg(priv, STM32L4_CAN_TSR_OFFSET);
   caninfo("CAN%d TSR: %08x\n", priv->port, regval);
 
   if ((regval & CAN_ALL_MAILBOXES) != 0)
@@ -1272,7 +1272,7 @@ static bool stm32l4_cantxready(FAR struct can_dev_s *dev)
 }
 
 /****************************************************************************
- * Name: stm32l4_cantxempty
+ * Name: stm32l4can_txempty
  *
  * Description:
  *   Return true if all message have been sent.  If for example, the CAN
@@ -1289,14 +1289,14 @@ static bool stm32l4_cantxready(FAR struct can_dev_s *dev)
  *
  ****************************************************************************/
 
-static bool stm32l4_cantxempty(FAR struct can_dev_s *dev)
+static bool stm32l4can_txempty(FAR struct can_dev_s *dev)
 {
-  FAR struct stm32l4_can_s *priv = dev->cd_priv;
+  FAR struct stm32l4can__s *priv = dev->cd_priv;
   uint32_t regval;
 
   /* Return true if all mailboxes are available */
 
-  regval = stm32l4_cangetreg(priv, STM32L4_CAN_TSR_OFFSET);
+  regval = stm32l4can_getreg(priv, STM32L4_CAN_TSR_OFFSET);
   caninfo("CAN%d TSR: %08x\n", priv->port, regval);
 
   if ((regval & CAN_ALL_MAILBOXES) == CAN_ALL_MAILBOXES)
@@ -1308,7 +1308,7 @@ static bool stm32l4_cantxempty(FAR struct can_dev_s *dev)
 }
 
 /****************************************************************************
- * Name: stm32l4_canrx0interrupt
+ * Name: stm32l4can_rx0interrupt
  *
  * Description:
  *   CAN RX FIFO 0 interrupt handler
@@ -1322,10 +1322,10 @@ static bool stm32l4_cantxempty(FAR struct can_dev_s *dev)
  *
  ****************************************************************************/
 
-static int stm32l4_canrx0interrupt(int irq, FAR void *context)
+static int stm32l4can_rx0interrupt(int irq, FAR void *context)
 {
   FAR struct can_dev_s *dev = NULL;
-  FAR struct stm32l4_can_s *priv;
+  FAR struct stm32l4can__s *priv;
   struct can_hdr_s hdr;
   uint8_t data[CAN_MAXDATALEN];
   uint32_t regval;
@@ -1337,7 +1337,7 @@ static int stm32l4_canrx0interrupt(int irq, FAR void *context)
 
   /* Verify that a message is pending in FIFO 0 */
 
-  regval   = stm32l4_cangetreg(priv, STM32L4_CAN_RF0R_OFFSET);
+  regval   = stm32l4can_getreg(priv, STM32L4_CAN_RF0R_OFFSET);
   npending = (regval & CAN_RFR_FMP_MASK) >> CAN_RFR_FMP_SHIFT;
   if (npending < 1)
     {
@@ -1345,11 +1345,11 @@ static int stm32l4_canrx0interrupt(int irq, FAR void *context)
       return OK;
     }
 
-  stm32l4_candumpmbregs(priv, "RX0 interrupt");
+  stm32l4can_dumpmbregs(priv, "RX0 interrupt");
 
   /* Get the CAN identifier. */
 
-  regval = stm32l4_cangetreg(priv, STM32L4_CAN_RI0R_OFFSET);
+  regval = stm32l4can_getreg(priv, STM32L4_CAN_RI0R_OFFSET);
 
 #ifdef CONFIG_CAN_EXTID
   if ((regval & CAN_RIR_IDE) != 0)
@@ -1386,18 +1386,18 @@ static int stm32l4_canrx0interrupt(int irq, FAR void *context)
 
   /* Get the DLC */
 
-  regval     = stm32l4_cangetreg(priv, STM32L4_CAN_RDT0R_OFFSET);
+  regval     = stm32l4can_getreg(priv, STM32L4_CAN_RDT0R_OFFSET);
   hdr.ch_dlc = (regval & CAN_RDTR_DLC_MASK) >> CAN_RDTR_DLC_SHIFT;
 
   /* Save the message data */
 
-  regval  = stm32l4_cangetreg(priv, STM32L4_CAN_RDL0R_OFFSET);
+  regval  = stm32l4can_getreg(priv, STM32L4_CAN_RDL0R_OFFSET);
   data[0] = (regval & CAN_RDLR_DATA0_MASK) >> CAN_RDLR_DATA0_SHIFT;
   data[1] = (regval & CAN_RDLR_DATA1_MASK) >> CAN_RDLR_DATA1_SHIFT;
   data[2] = (regval & CAN_RDLR_DATA2_MASK) >> CAN_RDLR_DATA2_SHIFT;
   data[3] = (regval & CAN_RDLR_DATA3_MASK) >> CAN_RDLR_DATA3_SHIFT;
 
-  regval  = stm32l4_cangetreg(priv, STM32L4_CAN_RDH0R_OFFSET);
+  regval  = stm32l4can_getreg(priv, STM32L4_CAN_RDH0R_OFFSET);
   data[4] = (regval & CAN_RDHR_DATA4_MASK) >> CAN_RDHR_DATA4_SHIFT;
   data[5] = (regval & CAN_RDHR_DATA5_MASK) >> CAN_RDHR_DATA5_SHIFT;
   data[6] = (regval & CAN_RDHR_DATA6_MASK) >> CAN_RDHR_DATA6_SHIFT;
@@ -1412,14 +1412,14 @@ static int stm32l4_canrx0interrupt(int irq, FAR void *context)
 #ifndef CONFIG_CAN_EXTID
 errout:
 #endif
-  regval  = stm32l4_cangetreg(priv, STM32L4_CAN_RF0R_OFFSET);
+  regval  = stm32l4can_getreg(priv, STM32L4_CAN_RF0R_OFFSET);
   regval |= CAN_RFR_RFOM;
-  stm32l4_canputreg(priv, STM32L4_CAN_RF0R_OFFSET, regval);
+  stm32l4can_putreg(priv, STM32L4_CAN_RF0R_OFFSET, regval);
   return ret;
 }
 
 /****************************************************************************
- * Name: stm32l4_cantxinterrupt
+ * Name: stm32l4can_txinterrupt
  *
  * Description:
  *   CAN TX mailbox complete interrupt handler
@@ -1433,10 +1433,10 @@ errout:
  *
  ****************************************************************************/
 
-static int stm32l4_cantxinterrupt(int irq, FAR void *context)
+static int stm32l4can_txinterrupt(int irq, FAR void *context)
 {
   FAR struct can_dev_s *dev = NULL;
-  FAR struct stm32l4_can_s *priv;
+  FAR struct stm32l4can__s *priv;
   uint32_t regval;
 
   dev = &g_can1dev;
@@ -1444,7 +1444,7 @@ static int stm32l4_cantxinterrupt(int irq, FAR void *context)
 
   /* Get the transmit status */
 
-  regval = stm32l4_cangetreg(priv, STM32L4_CAN_TSR_OFFSET);
+  regval = stm32l4can_getreg(priv, STM32L4_CAN_TSR_OFFSET);
 
   /* Check for RQCP0: Request completed mailbox 0 */
 
@@ -1454,7 +1454,7 @@ static int stm32l4_cantxinterrupt(int irq, FAR void *context)
        * ALST0 and TERR0) for Mailbox 0.
        */
 
-      stm32l4_canputreg(priv, STM32L4_CAN_TSR_OFFSET, CAN_TSR_RQCP0);
+      stm32l4can_putreg(priv, STM32L4_CAN_TSR_OFFSET, CAN_TSR_RQCP0);
 
       /* Check for errors */
 
@@ -1474,7 +1474,7 @@ static int stm32l4_cantxinterrupt(int irq, FAR void *context)
        * ALST1 and TERR1) for Mailbox 1.
        */
 
-      stm32l4_canputreg(priv, STM32L4_CAN_TSR_OFFSET, CAN_TSR_RQCP1);
+      stm32l4can_putreg(priv, STM32L4_CAN_TSR_OFFSET, CAN_TSR_RQCP1);
 
       /* Check for errors */
 
@@ -1494,7 +1494,7 @@ static int stm32l4_cantxinterrupt(int irq, FAR void *context)
        * ALST2 and TERR2) for Mailbox 2.
        */
 
-      stm32l4_canputreg(priv, STM32L4_CAN_TSR_OFFSET, CAN_TSR_RQCP2);
+      stm32l4can_putreg(priv, STM32L4_CAN_TSR_OFFSET, CAN_TSR_RQCP2);
 
       /* Check for errors */
 
@@ -1510,7 +1510,7 @@ static int stm32l4_cantxinterrupt(int irq, FAR void *context)
 }
 
 /****************************************************************************
- * Name: stm32l4_canbittiming
+ * Name: stm32l4can_bittiming
  *
  * Description:
  *   Set the CAN bit timing register (BTR) based on the configured BAUD.
@@ -1566,7 +1566,7 @@ static int stm32l4_cantxinterrupt(int irq, FAR void *context)
  *
  ****************************************************************************/
 
-static int stm32l4_canbittiming(FAR struct stm32l4_can_s *priv)
+static int stm32l4can_bittiming(FAR struct stm32l4can__s *priv)
 {
   uint32_t tmp;
   uint32_t brp;
@@ -1646,12 +1646,12 @@ static int stm32l4_canbittiming(FAR struct stm32l4_can_s *priv)
   tmp |= CAN_BTR_LBKM;
 #endif
 
-  stm32l4_canputreg(priv, STM32L4_CAN_BTR_OFFSET, tmp);
+  stm32l4can_putreg(priv, STM32L4_CAN_BTR_OFFSET, tmp);
   return OK;
 }
 
 /****************************************************************************
- * Name: stm32l4_canenterinitmode
+ * Name: stm32l4can_enterinitmode
  *
  * Description:
  *   Put the CAN cell in Initialization mode. This only disconnects the CAN
@@ -1666,7 +1666,7 @@ static int stm32l4_canbittiming(FAR struct stm32l4_can_s *priv)
  *
  ****************************************************************************/
 
-static int stm32l4_canenterinitmode(FAR struct stm32l4_can_s *priv)
+static int stm32l4can_enterinitmode(FAR struct stm32l4can__s *priv)
 {
   uint32_t regval;
   volatile uint32_t timeout;
@@ -1675,15 +1675,15 @@ static int stm32l4_canenterinitmode(FAR struct stm32l4_can_s *priv)
 
   /* Enter initialization mode */
 
-  regval  = stm32l4_cangetreg(priv, STM32L4_CAN_MCR_OFFSET);
+  regval  = stm32l4can_getreg(priv, STM32L4_CAN_MCR_OFFSET);
   regval |= CAN_MCR_INRQ;
-  stm32l4_canputreg(priv, STM32L4_CAN_MCR_OFFSET, regval);
+  stm32l4can_putreg(priv, STM32L4_CAN_MCR_OFFSET, regval);
 
   /* Wait until initialization mode is acknowledged */
 
   for (timeout = INAK_TIMEOUT; timeout > 0; timeout--)
     {
-      regval = stm32l4_cangetreg(priv, STM32L4_CAN_MSR_OFFSET);
+      regval = stm32l4can_getreg(priv, STM32L4_CAN_MSR_OFFSET);
       if ((regval & CAN_MSR_INAK) != 0)
         {
           /* We are in initialization mode */
@@ -1704,7 +1704,7 @@ static int stm32l4_canenterinitmode(FAR struct stm32l4_can_s *priv)
 }
 
 /****************************************************************************
- * Name: stm32l4_canexitinitmode
+ * Name: stm32l4can_exitinitmode
  *
  * Description:
  *   Put the CAN cell out of the Initialization mode (to Normal mode)
@@ -1717,22 +1717,22 @@ static int stm32l4_canenterinitmode(FAR struct stm32l4_can_s *priv)
  *
  ****************************************************************************/
 
-static int stm32l4_canexitinitmode(FAR struct stm32l4_can_s *priv)
+static int stm32l4can_exitinitmode(FAR struct stm32l4can__s *priv)
 {
   uint32_t regval;
   volatile uint32_t timeout;
 
   /* Exit Initialization mode, enter Normal mode */
 
-  regval  = stm32l4_cangetreg(priv, STM32L4_CAN_MCR_OFFSET);
+  regval  = stm32l4can_getreg(priv, STM32L4_CAN_MCR_OFFSET);
   regval &= ~CAN_MCR_INRQ;
-  stm32l4_canputreg(priv, STM32L4_CAN_MCR_OFFSET, regval);
+  stm32l4can_putreg(priv, STM32L4_CAN_MCR_OFFSET, regval);
 
   /* Wait until the initialization mode exit is acknowledged */
 
   for (timeout = INAK_TIMEOUT; timeout > 0; timeout--)
     {
-      regval = stm32l4_cangetreg(priv, STM32L4_CAN_MSR_OFFSET);
+      regval = stm32l4can_getreg(priv, STM32L4_CAN_MSR_OFFSET);
       if ((regval & CAN_MSR_INAK) == 0)
         {
           /* We are out of initialization mode */
@@ -1753,7 +1753,7 @@ static int stm32l4_canexitinitmode(FAR struct stm32l4_can_s *priv)
 }
 
 /****************************************************************************
- * Name: stm32l4_cancellinit
+ * Name: stm32l4can_cellinit
  *
  * Description:
  *   CAN cell initialization
@@ -1766,7 +1766,7 @@ static int stm32l4_canexitinitmode(FAR struct stm32l4_can_s *priv)
  *
  ****************************************************************************/
 
-static int stm32l4_cancellinit(FAR struct stm32l4_can_s *priv)
+static int stm32l4can_cellinit(FAR struct stm32l4can__s *priv)
 {
   uint32_t regval;
   int ret;
@@ -1775,16 +1775,16 @@ static int stm32l4_cancellinit(FAR struct stm32l4_can_s *priv)
 
   /* Exit from sleep mode */
 
-  regval  = stm32l4_cangetreg(priv, STM32L4_CAN_MCR_OFFSET);
+  regval  = stm32l4can_getreg(priv, STM32L4_CAN_MCR_OFFSET);
   regval &= ~CAN_MCR_SLEEP;
-  stm32l4_canputreg(priv, STM32L4_CAN_MCR_OFFSET, regval);
+  stm32l4can_putreg(priv, STM32L4_CAN_MCR_OFFSET, regval);
 
   /* Configure CAN behavior.  Priority driven request order, not message ID. */
 
   regval |= CAN_MCR_TXFP;
-  stm32l4_canputreg(priv, STM32L4_CAN_MCR_OFFSET, regval);
+  stm32l4can_putreg(priv, STM32L4_CAN_MCR_OFFSET, regval);
 
-  ret = stm32l4_canenterinitmode(priv);
+  ret = stm32l4can_enterinitmode(priv);
   if(ret != 0)
     {
       return ret;
@@ -1800,25 +1800,25 @@ static int stm32l4_cancellinit(FAR struct stm32l4_can_s *priv)
    *  - Transmit FIFO priority
    */
 
-  regval   = stm32l4_cangetreg(priv, STM32L4_CAN_MCR_OFFSET);
+  regval   = stm32l4can_getreg(priv, STM32L4_CAN_MCR_OFFSET);
   regval &= ~(CAN_MCR_TXFP | CAN_MCR_RFLM | CAN_MCR_NART | CAN_MCR_AWUM |
               CAN_MCR_ABOM | CAN_MCR_TTCM);
-  stm32l4_canputreg(priv, STM32L4_CAN_MCR_OFFSET, regval);
+  stm32l4can_putreg(priv, STM32L4_CAN_MCR_OFFSET, regval);
 
   /* Configure bit timing. */
 
-  ret = stm32l4_canbittiming(priv);
+  ret = stm32l4can_bittiming(priv);
   if (ret < 0)
     {
       canerr("ERROR: Failed to set bit timing: %d\n", ret);
       return ret;
     }
 
-  return stm32l4_canexitinitmode(priv);
+  return stm32l4can_exitinitmode(priv);
 }
 
 /****************************************************************************
- * Name: stm32l4_canfilterinit
+ * Name: stm32l4can_filterinit
  *
  * Description:
  *   CAN filter initialization.  CAN filters are not currently used by this
@@ -1849,7 +1849,7 @@ static int stm32l4_cancellinit(FAR struct stm32l4_can_s *priv)
  *
  ****************************************************************************/
 
-static int stm32l4_canfilterinit(FAR struct stm32l4_can_s *priv)
+static int stm32l4can_filterinit(FAR struct stm32l4can__s *priv)
 {
   uint32_t regval;
   uint32_t bitmask;
@@ -1862,57 +1862,57 @@ static int stm32l4_canfilterinit(FAR struct stm32l4_can_s *priv)
 
   /* Enter filter initialization mode */
 
-  regval  = stm32l4_cangetfreg(priv, STM32L4_CAN_FMR_OFFSET);
+  regval  = stm32l4can_getfreg(priv, STM32L4_CAN_FMR_OFFSET);
   regval |= CAN_FMR_FINIT;
-  stm32l4_canputfreg(priv, STM32L4_CAN_FMR_OFFSET, regval);
+  stm32l4can_putfreg(priv, STM32L4_CAN_FMR_OFFSET, regval);
 
   /* Disable the filter */
 
-  regval  = stm32l4_cangetfreg(priv, STM32L4_CAN_FA1R_OFFSET);
+  regval  = stm32l4can_getfreg(priv, STM32L4_CAN_FA1R_OFFSET);
   regval &= ~bitmask;
-  stm32l4_canputfreg(priv, STM32L4_CAN_FA1R_OFFSET, regval);
+  stm32l4can_putfreg(priv, STM32L4_CAN_FA1R_OFFSET, regval);
 
   /* Select the 32-bit scale for the filter */
 
-  regval  = stm32l4_cangetfreg(priv, STM32L4_CAN_FS1R_OFFSET);
+  regval  = stm32l4can_getfreg(priv, STM32L4_CAN_FS1R_OFFSET);
   regval |= bitmask;
-  stm32l4_canputfreg(priv, STM32L4_CAN_FS1R_OFFSET, regval);
+  stm32l4can_putfreg(priv, STM32L4_CAN_FS1R_OFFSET, regval);
 
   /* There are 14 or 28 filter banks (depending) on the device.  Each filter bank is
    * composed of two 32-bit registers, CAN_FiR:
    */
 
-  stm32l4_canputfreg(priv,  STM32L4_CAN_FIR_OFFSET(priv->filter, 1), 0);
-  stm32l4_canputfreg(priv,  STM32L4_CAN_FIR_OFFSET(priv->filter, 2), 0);
+  stm32l4can_putfreg(priv,  STM32L4_CAN_FIR_OFFSET(priv->filter, 1), 0);
+  stm32l4can_putfreg(priv,  STM32L4_CAN_FIR_OFFSET(priv->filter, 2), 0);
 
   /* Set Id/Mask mode for the filter */
 
-  regval  = stm32l4_cangetfreg(priv, STM32L4_CAN_FM1R_OFFSET);
+  regval  = stm32l4can_getfreg(priv, STM32L4_CAN_FM1R_OFFSET);
   regval &= ~bitmask;
-  stm32l4_canputfreg(priv, STM32L4_CAN_FM1R_OFFSET, regval);
+  stm32l4can_putfreg(priv, STM32L4_CAN_FM1R_OFFSET, regval);
 
   /* Assign FIFO 0 for the filter */
 
-  regval  = stm32l4_cangetfreg(priv, STM32L4_CAN_FFA1R_OFFSET);
+  regval  = stm32l4can_getfreg(priv, STM32L4_CAN_FFA1R_OFFSET);
   regval &= ~bitmask;
-  stm32l4_canputfreg(priv, STM32L4_CAN_FFA1R_OFFSET, regval);
+  stm32l4can_putfreg(priv, STM32L4_CAN_FFA1R_OFFSET, regval);
 
   /* Enable the filter */
 
-  regval  = stm32l4_cangetfreg(priv, STM32L4_CAN_FA1R_OFFSET);
+  regval  = stm32l4can_getfreg(priv, STM32L4_CAN_FA1R_OFFSET);
   regval |= bitmask;
-  stm32l4_canputfreg(priv, STM32L4_CAN_FA1R_OFFSET, regval);
+  stm32l4can_putfreg(priv, STM32L4_CAN_FA1R_OFFSET, regval);
 
   /* Exit filter initialization mode */
 
-  regval  = stm32l4_cangetfreg(priv, STM32L4_CAN_FMR_OFFSET);
+  regval  = stm32l4can_getfreg(priv, STM32L4_CAN_FMR_OFFSET);
   regval &= ~CAN_FMR_FINIT;
-  stm32l4_canputfreg(priv, STM32L4_CAN_FMR_OFFSET, regval);
+  stm32l4can_putfreg(priv, STM32L4_CAN_FMR_OFFSET, regval);
   return OK;
 }
 
 /****************************************************************************
- * Name: stm32l4_canaddextfilter
+ * Name: stm32l4can_addextfilter
  *
  * Description:
  *   Add a filter for extended CAN IDs
@@ -1928,14 +1928,14 @@ static int stm32l4_canfilterinit(FAR struct stm32l4_can_s *priv)
  *
  ****************************************************************************/
 
-static int  stm32l4_canaddextfilter(FAR struct stm32l4_can_s *priv,
+static int  stm32l4can_addextfilter(FAR struct stm32l4can__s *priv,
                                     FAR struct canioc_extfilter_s *arg)
 {
   return -ENOTTY;
 }
 
 /****************************************************************************
- * Name: stm32l4_candelextfilter
+ * Name: stm32l4can_delextfilter
  *
  * Description:
  *   Remove a filter for extended CAN IDs
@@ -1952,13 +1952,13 @@ static int  stm32l4_canaddextfilter(FAR struct stm32l4_can_s *priv,
  *
  ****************************************************************************/
 
-static int  stm32l4_candelextfilter(FAR struct stm32l4_can_s *priv, int arg)
+static int  stm32l4can_delextfilter(FAR struct stm32l4can__s *priv, int arg)
 {
   return -ENOTTY;
 }
 
 /****************************************************************************
- * Name: stm32l4_canaddextfilter
+ * Name: stm32l4can_addextfilter
  *
  * Description:
  *   Add a filter for standard CAN IDs
@@ -1974,14 +1974,14 @@ static int  stm32l4_candelextfilter(FAR struct stm32l4_can_s *priv, int arg)
  *
  ****************************************************************************/
 
-static int  stm32l4_canaddstdfilter(FAR struct stm32l4_can_s *priv,
+static int  stm32l4can_addstdfilter(FAR struct stm32l4can__s *priv,
                                     FAR struct canioc_stdfilter_s *arg)
 {
   return -ENOTTY;
 }
 
 /****************************************************************************
- * Name: stm32l4_candelstdfilter
+ * Name: stm32l4can_delstdfilter
  *
  * Description:
  *   Remove a filter for standard CAN IDs
@@ -1998,7 +1998,7 @@ static int  stm32l4_canaddstdfilter(FAR struct stm32l4_can_s *priv,
  *
  ****************************************************************************/
 
-static int  stm32l4_candelstdfilter(FAR struct stm32l4_can_s *priv, int arg)
+static int  stm32l4can_delstdfilter(FAR struct stm32l4can__s *priv, int arg)
 {
   return -ENOTTY;
 }
@@ -2008,7 +2008,7 @@ static int  stm32l4_candelstdfilter(FAR struct stm32l4_can_s *priv, int arg)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: stm32l4_caninitialize
+ * Name: stm32l4can_initialize
  *
  * Description:
  *   Initialize the selected CAN port
@@ -2021,7 +2021,7 @@ static int  stm32l4_candelstdfilter(FAR struct stm32l4_can_s *priv, int arg)
  *
  ****************************************************************************/
 
-FAR struct can_dev_s *stm32l4_caninitialize(int port)
+FAR struct can_dev_s *stm32l4can_initialize(int port)
 {
   FAR struct can_dev_s *dev = NULL;
 
diff --git a/arch/arm/src/stm32l4/stm32l4_can.h b/arch/arm/src/stm32l4/stm32l4_can.h
index f9dad5d89f..91b96c7c9b 100644
--- a/arch/arm/src/stm32l4/stm32l4_can.h
+++ b/arch/arm/src/stm32l4/stm32l4_can.h
@@ -131,7 +131,7 @@ extern "C"
  ****************************************************************************/
 
 struct can_dev_s;
-FAR struct can_dev_s *stm32l4_caninitialize(int port);
+FAR struct can_dev_s *stm32l4can_initialize(int port);
 
 #undef EXTERN
 #if defined(__cplusplus)
-- 
GitLab


From 613e3b0b2cf185051b5339a5608ad130bac88044 Mon Sep 17 00:00:00 2001
From: Sebastien Lorquet 
Date: Fri, 24 Jun 2016 11:44:40 +0200
Subject: [PATCH 033/229] Fix a search/replace typo

---
 arch/arm/src/stm32l4/stm32l4_can.c | 98 +++++++++++++++---------------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/arch/arm/src/stm32l4/stm32l4_can.c b/arch/arm/src/stm32l4/stm32l4_can.c
index 6052791de1..ae465a2fa4 100644
--- a/arch/arm/src/stm32l4/stm32l4_can.c
+++ b/arch/arm/src/stm32l4/stm32l4_can.c
@@ -90,7 +90,7 @@
  * Private Types
  ****************************************************************************/
 
-struct stm32l4can__s
+struct stm32l4_can_s
 {
   uint8_t  port;   /* CAN port number (1 or 2) */
   uint8_t  canrx0; /* CAN RX FIFO 0 IRQ number */
@@ -107,20 +107,20 @@ struct stm32l4can__s
 
 /* CAN Register access */
 
-static uint32_t stm32l4can_getreg(FAR struct stm32l4can__s *priv,
+static uint32_t stm32l4can_getreg(FAR struct stm32l4_can_s *priv,
               int offset);
-static uint32_t stm32l4can_getfreg(FAR struct stm32l4can__s *priv,
+static uint32_t stm32l4can_getfreg(FAR struct stm32l4_can_s *priv,
               int offset);
-static void stm32l4can_putreg(FAR struct stm32l4can__s *priv, int offset,
+static void stm32l4can_putreg(FAR struct stm32l4_can_s *priv, int offset,
               uint32_t value);
-static void stm32l4can_putfreg(FAR struct stm32l4can__s *priv, int offset,
+static void stm32l4can_putfreg(FAR struct stm32l4_can_s *priv, int offset,
               uint32_t value);
 #ifdef CONFIG_STM32L4_CAN_REGDEBUG
-static void stm32l4can_dumpctrlregs(FAR struct stm32l4can__s *priv,
+static void stm32l4can_dumpctrlregs(FAR struct stm32l4_can_s *priv,
               FAR const char *msg);
-static void stm32l4can_dumpmbregs(FAR struct stm32l4can__s *priv,
+static void stm32l4can_dumpmbregs(FAR struct stm32l4_can_s *priv,
               FAR const char *msg);
-static void stm32l4can_dumpfiltregs(FAR struct stm32l4can__s *priv,
+static void stm32l4can_dumpfiltregs(FAR struct stm32l4_can_s *priv,
               FAR const char *msg);
 #else
 #  define stm32l4can_dumpctrlregs(priv,msg)
@@ -151,21 +151,21 @@ static int  stm32l4can_txinterrupt(int irq, FAR void *context);
 
 /* Initialization */
 
-static int  stm32l4can_enterinitmode(FAR struct stm32l4can__s *priv);
-static int  stm32l4can_exitinitmode(FAR struct stm32l4can__s *priv);
-static int  stm32l4can_bittiming(FAR struct stm32l4can__s *priv);
-static int  stm32l4can_cellinit(FAR struct stm32l4can__s *priv);
-static int  stm32l4can_filterinit(FAR struct stm32l4can__s *priv);
+static int  stm32l4can_enterinitmode(FAR struct stm32l4_can_s *priv);
+static int  stm32l4can_exitinitmode(FAR struct stm32l4_can_s *priv);
+static int  stm32l4can_bittiming(FAR struct stm32l4_can_s *priv);
+static int  stm32l4can_cellinit(FAR struct stm32l4_can_s *priv);
+static int  stm32l4can_filterinit(FAR struct stm32l4_can_s *priv);
 
 /* Filtering (todo) */
 
-static int  stm32l4can_addextfilter(FAR struct stm32l4can__s *priv,
+static int  stm32l4can_addextfilter(FAR struct stm32l4_can_s *priv,
               FAR struct canioc_extfilter_s *arg);
-static int  stm32l4can_delextfilter(FAR struct stm32l4can__s *priv,
+static int  stm32l4can_delextfilter(FAR struct stm32l4_can_s *priv,
               int arg);
-static int  stm32l4can_addstdfilter(FAR struct stm32l4can__s *priv,
+static int  stm32l4can_addstdfilter(FAR struct stm32l4_can_s *priv,
               FAR struct canioc_stdfilter_s *arg);
-static int  stm32l4can_delstdfilter(FAR struct stm32l4can__s *priv,
+static int  stm32l4can_delstdfilter(FAR struct stm32l4_can_s *priv,
               int arg);
 
 /****************************************************************************
@@ -187,7 +187,7 @@ static const struct can_ops_s g_canops =
 };
 
 #ifdef CONFIG_STM32L4_CAN1
-static struct stm32l4can__s g_can1priv =
+static struct stm32l4_can_s g_can1priv =
 {
   .port             = 1,
   .canrx0           = STM32L4_IRQ_CAN1RX0,
@@ -278,23 +278,23 @@ static uint32_t stm32l4can_vgetreg(uint32_t addr)
   return val;
 }
 
-static uint32_t stm32l4can_getreg(FAR struct stm32l4can__s *priv, int offset)
+static uint32_t stm32l4can_getreg(FAR struct stm32l4_can_s *priv, int offset)
 {
   return stm32l4can_vgetreg(priv->base + offset);
 }
 
-static uint32_t stm32l4can_getfreg(FAR struct stm32l4can__s *priv, int offset)
+static uint32_t stm32l4can_getfreg(FAR struct stm32l4_can_s *priv, int offset)
 {
   return stm32l4can_vgetreg(priv->fbase + offset);
 }
 
 #else
-static uint32_t stm32l4can_getreg(FAR struct stm32l4can__s *priv, int offset)
+static uint32_t stm32l4can_getreg(FAR struct stm32l4_can_s *priv, int offset)
 {
   return getreg32(priv->base + offset);
 }
 
-static uint32_t stm32l4can_getfreg(FAR struct stm32l4can__s *priv, int offset)
+static uint32_t stm32l4can_getfreg(FAR struct stm32l4_can_s *priv, int offset)
 {
   return getreg32(priv->fbase + offset);
 }
@@ -330,26 +330,26 @@ static void stm32l4can_vputreg(uint32_t addr, uint32_t value)
   putreg32(value, addr);
 }
 
-static void stm32l4can_putreg(FAR struct stm32l4can__s *priv, int offset,
+static void stm32l4can_putreg(FAR struct stm32l4_can_s *priv, int offset,
                               uint32_t value)
 {
   stm32l4can_vputreg(priv->base + offset, value);
 }
 
-static void stm32l4can_putfreg(FAR struct stm32l4can__s *priv, int offset,
+static void stm32l4can_putfreg(FAR struct stm32l4_can_s *priv, int offset,
                                uint32_t value)
 {
   stm32l4can_vputreg(priv->fbase + offset, value);
 }
 
 #else
-static void stm32l4can_putreg(FAR struct stm32l4can__s *priv, int offset,
+static void stm32l4can_putreg(FAR struct stm32l4_can_s *priv, int offset,
                               uint32_t value)
 {
   putreg32(value, priv->base + offset);
 }
 
-static void stm32l4can_putfreg(FAR struct stm32l4can__s *priv, int offset,
+static void stm32l4can_putfreg(FAR struct stm32l4_can_s *priv, int offset,
                                uint32_t value)
 {
   putreg32(value, priv->fbase + offset);
@@ -371,7 +371,7 @@ static void stm32l4can_putfreg(FAR struct stm32l4can__s *priv, int offset,
  ****************************************************************************/
 
 #ifdef CONFIG_STM32L4_CAN_REGDEBUG
-static void stm32l4can_dumpctrlregs(FAR struct stm32l4can__s *priv,
+static void stm32l4can_dumpctrlregs(FAR struct stm32l4_can_s *priv,
                                     FAR const char *msg)
 {
   if (msg)
@@ -416,7 +416,7 @@ static void stm32l4can_dumpctrlregs(FAR struct stm32l4can__s *priv,
  ****************************************************************************/
 
 #ifdef CONFIG_STM32L4_CAN_REGDEBUG
-static void stm32l4can_dumpmbregs(FAR struct stm32l4can__s *priv,
+static void stm32l4can_dumpmbregs(FAR struct stm32l4_can_s *priv,
                                   FAR const char *msg)
 {
   if (msg)
@@ -477,7 +477,7 @@ static void stm32l4can_dumpmbregs(FAR struct stm32l4can__s *priv,
  ****************************************************************************/
 
 #ifdef CONFIG_STM32L4_CAN_REGDEBUG
-static void stm32l4can_dumpfiltregs(FAR struct stm32l4can__s *priv,
+static void stm32l4can_dumpfiltregs(FAR struct stm32l4_can_s *priv,
                                     FAR const char *msg)
 {
   int i;
@@ -524,7 +524,7 @@ static void stm32l4can_dumpfiltregs(FAR struct stm32l4can__s *priv,
 
 static void stm32l4can_reset(FAR struct can_dev_s *dev)
 {
-  FAR struct stm32l4can__s *priv = dev->cd_priv;
+  FAR struct stm32l4_can_s *priv = dev->cd_priv;
   uint32_t regval;
   uint32_t regbit = 0;
   irqstate_t flags;
@@ -581,7 +581,7 @@ static void stm32l4can_reset(FAR struct can_dev_s *dev)
 
 static int stm32l4can_setup(FAR struct can_dev_s *dev)
 {
-  FAR struct stm32l4can__s *priv = dev->cd_priv;
+  FAR struct stm32l4_can_s *priv = dev->cd_priv;
   int ret;
 
   caninfo("CAN%d RX0 irq: %d TX irq: %d\n",
@@ -659,7 +659,7 @@ static int stm32l4can_setup(FAR struct can_dev_s *dev)
 
 static void stm32l4can_shutdown(FAR struct can_dev_s *dev)
 {
-  FAR struct stm32l4can__s *priv = dev->cd_priv;
+  FAR struct stm32l4_can_s *priv = dev->cd_priv;
 
   caninfo("CAN%d\n", priv->port);
 
@@ -694,7 +694,7 @@ static void stm32l4can_shutdown(FAR struct can_dev_s *dev)
 
 static void stm32l4can_rxint(FAR struct can_dev_s *dev, bool enable)
 {
-  FAR struct stm32l4can__s *priv = dev->cd_priv;
+  FAR struct stm32l4_can_s *priv = dev->cd_priv;
   uint32_t regval;
 
   caninfo("CAN%d enable: %d\n", priv->port, enable);
@@ -730,7 +730,7 @@ static void stm32l4can_rxint(FAR struct can_dev_s *dev, bool enable)
 
 static void stm32l4can_txint(FAR struct can_dev_s *dev, bool enable)
 {
-  FAR struct stm32l4can__s *priv = dev->cd_priv;
+  FAR struct stm32l4_can_s *priv = dev->cd_priv;
   uint32_t regval;
 
   caninfo("CAN%d enable: %d\n", priv->port, enable);
@@ -762,7 +762,7 @@ static void stm32l4can_txint(FAR struct can_dev_s *dev, bool enable)
 static int stm32l4can_ioctl(FAR struct can_dev_s *dev, int cmd,
                             unsigned long arg)
 {
-  FAR struct stm32l4can__s *priv;
+  FAR struct stm32l4_can_s *priv;
   int ret = -ENOTTY;
 
   caninfo("cmd=%04x arg=%lu\n", cmd, arg);
@@ -1099,7 +1099,7 @@ static int stm32l4can_remoterequest(FAR struct can_dev_s *dev, uint16_t id)
 static int stm32l4can_send(FAR struct can_dev_s *dev,
                            FAR struct can_msg_s *msg)
 {
-  FAR struct stm32l4can__s *priv = dev->cd_priv;
+  FAR struct stm32l4_can_s *priv = dev->cd_priv;
   FAR uint8_t *ptr;
   uint32_t regval;
   uint32_t tmp;
@@ -1255,7 +1255,7 @@ static int stm32l4can_send(FAR struct can_dev_s *dev,
 
 static bool stm32l4can_txready(FAR struct can_dev_s *dev)
 {
-  FAR struct stm32l4can__s *priv = dev->cd_priv;
+  FAR struct stm32l4_can_s *priv = dev->cd_priv;
   uint32_t regval;
 
   /* Return true if any mailbox is available */
@@ -1291,7 +1291,7 @@ static bool stm32l4can_txready(FAR struct can_dev_s *dev)
 
 static bool stm32l4can_txempty(FAR struct can_dev_s *dev)
 {
-  FAR struct stm32l4can__s *priv = dev->cd_priv;
+  FAR struct stm32l4_can_s *priv = dev->cd_priv;
   uint32_t regval;
 
   /* Return true if all mailboxes are available */
@@ -1325,7 +1325,7 @@ static bool stm32l4can_txempty(FAR struct can_dev_s *dev)
 static int stm32l4can_rx0interrupt(int irq, FAR void *context)
 {
   FAR struct can_dev_s *dev = NULL;
-  FAR struct stm32l4can__s *priv;
+  FAR struct stm32l4_can_s *priv;
   struct can_hdr_s hdr;
   uint8_t data[CAN_MAXDATALEN];
   uint32_t regval;
@@ -1436,7 +1436,7 @@ errout:
 static int stm32l4can_txinterrupt(int irq, FAR void *context)
 {
   FAR struct can_dev_s *dev = NULL;
-  FAR struct stm32l4can__s *priv;
+  FAR struct stm32l4_can_s *priv;
   uint32_t regval;
 
   dev = &g_can1dev;
@@ -1566,7 +1566,7 @@ static int stm32l4can_txinterrupt(int irq, FAR void *context)
  *
  ****************************************************************************/
 
-static int stm32l4can_bittiming(FAR struct stm32l4can__s *priv)
+static int stm32l4can_bittiming(FAR struct stm32l4_can_s *priv)
 {
   uint32_t tmp;
   uint32_t brp;
@@ -1666,7 +1666,7 @@ static int stm32l4can_bittiming(FAR struct stm32l4can__s *priv)
  *
  ****************************************************************************/
 
-static int stm32l4can_enterinitmode(FAR struct stm32l4can__s *priv)
+static int stm32l4can_enterinitmode(FAR struct stm32l4_can_s *priv)
 {
   uint32_t regval;
   volatile uint32_t timeout;
@@ -1717,7 +1717,7 @@ static int stm32l4can_enterinitmode(FAR struct stm32l4can__s *priv)
  *
  ****************************************************************************/
 
-static int stm32l4can_exitinitmode(FAR struct stm32l4can__s *priv)
+static int stm32l4can_exitinitmode(FAR struct stm32l4_can_s *priv)
 {
   uint32_t regval;
   volatile uint32_t timeout;
@@ -1766,7 +1766,7 @@ static int stm32l4can_exitinitmode(FAR struct stm32l4can__s *priv)
  *
  ****************************************************************************/
 
-static int stm32l4can_cellinit(FAR struct stm32l4can__s *priv)
+static int stm32l4can_cellinit(FAR struct stm32l4_can_s *priv)
 {
   uint32_t regval;
   int ret;
@@ -1849,7 +1849,7 @@ static int stm32l4can_cellinit(FAR struct stm32l4can__s *priv)
  *
  ****************************************************************************/
 
-static int stm32l4can_filterinit(FAR struct stm32l4can__s *priv)
+static int stm32l4can_filterinit(FAR struct stm32l4_can_s *priv)
 {
   uint32_t regval;
   uint32_t bitmask;
@@ -1928,7 +1928,7 @@ static int stm32l4can_filterinit(FAR struct stm32l4can__s *priv)
  *
  ****************************************************************************/
 
-static int  stm32l4can_addextfilter(FAR struct stm32l4can__s *priv,
+static int  stm32l4can_addextfilter(FAR struct stm32l4_can_s *priv,
                                     FAR struct canioc_extfilter_s *arg)
 {
   return -ENOTTY;
@@ -1952,7 +1952,7 @@ static int  stm32l4can_addextfilter(FAR struct stm32l4can__s *priv,
  *
  ****************************************************************************/
 
-static int  stm32l4can_delextfilter(FAR struct stm32l4can__s *priv, int arg)
+static int  stm32l4can_delextfilter(FAR struct stm32l4_can_s *priv, int arg)
 {
   return -ENOTTY;
 }
@@ -1974,7 +1974,7 @@ static int  stm32l4can_delextfilter(FAR struct stm32l4can__s *priv, int arg)
  *
  ****************************************************************************/
 
-static int  stm32l4can_addstdfilter(FAR struct stm32l4can__s *priv,
+static int  stm32l4can_addstdfilter(FAR struct stm32l4_can_s *priv,
                                     FAR struct canioc_stdfilter_s *arg)
 {
   return -ENOTTY;
@@ -1998,7 +1998,7 @@ static int  stm32l4can_addstdfilter(FAR struct stm32l4can__s *priv,
  *
  ****************************************************************************/
 
-static int  stm32l4can_delstdfilter(FAR struct stm32l4can__s *priv, int arg)
+static int  stm32l4can_delstdfilter(FAR struct stm32l4_can_s *priv, int arg)
 {
   return -ENOTTY;
 }
-- 
GitLab


From d3441668ee80fc99af6bce9cd63d5071729157dd Mon Sep 17 00:00:00 2001
From: Sebastien Lorquet 
Date: Fri, 24 Jun 2016 11:53:17 +0200
Subject: [PATCH 034/229] Port STM32L4 CAN IOCTLs to STM32

---
 arch/arm/src/stm32/stm32_can.c     | 393 ++++++++++++++++++++++++++++-
 arch/arm/src/stm32l4/stm32l4_can.c |  26 +-
 2 files changed, 404 insertions(+), 15 deletions(-)

diff --git a/arch/arm/src/stm32/stm32_can.c b/arch/arm/src/stm32/stm32_can.c
index 4380e51a30..a7d8f366c4 100644
--- a/arch/arm/src/stm32/stm32_can.c
+++ b/arch/arm/src/stm32/stm32_can.c
@@ -125,6 +125,17 @@ static void stm32can_dumpfiltregs(FAR struct stm32_can_s *priv,
 #  define stm32can_dumpfiltregs(priv,msg)
 #endif
 
+/* Filtering (todo) */
+
+static int  stm32l4can_addextfilter(FAR struct stm32l4_can_s *priv,
+              FAR struct canioc_extfilter_s *arg);
+static int  stm32l4can_delextfilter(FAR struct stm32l4_can_s *priv,
+              int arg);
+static int  stm32l4can_addstdfilter(FAR struct stm32l4_can_s *priv,
+              FAR struct canioc_stdfilter_s *arg);
+static int  stm32l4can_delstdfilter(FAR struct stm32l4_can_s *priv,
+              int arg);
+
 /* CAN driver methods */
 
 static void stm32can_reset(FAR struct can_dev_s *dev);
@@ -786,9 +797,295 @@ static void stm32can_txint(FAR struct can_dev_s *dev, bool enable)
 
 static int stm32can_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg)
 {
-  /* No CAN ioctls are supported */
+  FAR struct stm32_can_s *priv;
+  int ret = -ENOTTY;
 
-  return -ENOTTY;
+  caninfo("cmd=%04x arg=%lu\n", cmd, arg);
+
+  DEBUGASSERT(dev && dev->cd_priv);
+  priv = dev->cd_priv;
+
+  /* Handle the command */
+
+  switch (cmd)
+    {
+      /* CANIOC_GET_BITTIMING:
+       *   Description:    Return the current bit timing settings
+       *   Argument:       A pointer to a write-able instance of struct
+       *                   canioc_bittiming_s in which current bit timing
+       *                   values will be returned.
+       *   Returned Value: Zero (OK) is returned on success.  Otherwise -1
+       *                   (ERROR) is returned with the errno variable set
+       *                   to indicate the nature of the error.
+       *   Dependencies:   None
+       */
+
+      case CANIOC_GET_BITTIMING:
+        {
+          FAR struct canioc_bittiming_s *bt =
+            (FAR struct canioc_bittiming_s *)arg;
+          uint32_t regval;
+          uint32_t brp;
+
+          DEBUGASSERT(bt != NULL);
+          regval       = stm32can_getreg(priv, STM32_CAN_BTR_OFFSET);
+          bt->bt_sjw   = ((regval & CAN_BTR_SJW_MASK) >> CAN_BTR_SJW_SHIFT) + 1;
+          bt->bt_tseg1 = ((regval & CAN_BTR_TS1_MASK) >> CAN_BTR_TS1_SHIFT) + 1;
+          bt->bt_tseg2 = ((regval & CAN_BTR_TS2_MASK) >> CAN_BTR_TS2_SHIFT) + 1;
+
+          brp          = ((regval & CAN_BTR_BRP_MASK) >> CAN_BTR_BRP_SHIFT) + 1;
+          bt->bt_baud  = STM32_PCLK1_FREQUENCY /
+                         (brp * (bt->bt_tseg1 + bt->bt_tseg2 + 1));
+          ret = OK;
+        }
+        break;
+
+      /* CANIOC_SET_BITTIMING:
+       *   Description:    Set new current bit timing values
+       *   Argument:       A pointer to a read-able instance of struct
+       *                   canioc_bittiming_s in which the new bit timing
+       *                   values are provided.
+       *   Returned Value: Zero (OK) is returned on success.  Otherwise -1
+       *                   (ERROR)is returned with the errno variable set
+       *                    to indicate thenature of the error.
+       *   Dependencies:   None
+       *
+       * REVISIT: There is probably a limitation here:  If there are multiple
+       * threads trying to send CAN packets, when one of these threads
+       * reconfigures the bitrate, the MCAN hardware will be reset and the
+       * context of operation will be lost.  Hence, this IOCTL can only safely
+       * be executed in quiescent time periods.
+       */
+
+      case CANIOC_SET_BITTIMING:
+        {
+          FAR const struct canioc_bittiming_s *bt =
+            (FAR const struct canioc_bittiming_s *)arg;
+          uint32_t brp;
+          uint32_t can_bit_quanta;
+          uint32_t tmp;
+          uint32_t regval;
+
+          DEBUGASSERT(bt != NULL);
+          DEBUGASSERT(bt->bt_baud < STM32_PCLK1_FREQUENCY);
+          DEBUGASSERT(bt->bt_sjw > 0 && bt->bt_sjw <= 4);
+          DEBUGASSERT(bt->bt_tseg1 > 0 && bt->bt_tseg1 <= 16);
+          DEBUGASSERT(bt->bt_tseg2 > 0 && bt->bt_tseg2 <=  8);
+
+          regval = stm32can_getreg(priv, STM32_CAN_BTR_OFFSET);
+
+          /* Extract bit timing data */
+          /* tmp is in clocks per bit time */
+
+          tmp = STM32_PCLK1_FREQUENCY / bt->bt_baud;
+
+          /* This value is dynamic as requested by user */
+
+          can_bit_quanta = bt->bt_tseg1 + bt->bt_tseg2 + 1;
+
+          if (tmp < can_bit_quanta)
+            {
+              /* This timing is not possible */
+
+              ret = -EINVAL;
+            }
+
+          /* Otherwise, nquanta is can_bit_quanta, ts1 and ts2 are
+           * provided by the user and we calculate brp to achieve
+           * can_bit_quanta quanta in the bit times
+           */
+
+          else
+            {
+              brp = (tmp + (can_bit_quanta/2)) / can_bit_quanta;
+              DEBUGASSERT(brp >= 1 && brp <= CAN_BTR_BRP_MAX);
+            }
+
+          caninfo("TS1: %d TS2: %d BRP: %d\n", bt->bt_tseg1, bt->bt_tseg2, brp);
+
+          /* Configure bit timing. */
+
+          regval &= ~(CAN_BTR_BRP_MASK | CAN_BTR_TS1_MASK | CAN_BTR_TS2_MASK | CAN_BTR_SJW_MASK);
+          regval |= ((brp          - 1) << CAN_BTR_BRP_SHIFT) |
+                    ((bt->bt_tseg1 - 1) << CAN_BTR_TS1_SHIFT) |
+                    ((bt->bt_tseg2 - 1) << CAN_BTR_TS2_SHIFT) |
+                    ((bt->bt_sjw   - 1) << CAN_BTR_SJW_SHIFT);
+
+          /* Bit timing can only be configured in init mode. */
+
+          ret = stm32can_enterinitmode(priv);
+          if (ret != 0)
+            {
+              break;
+            }
+
+          stm32can_putreg(priv, STM32_CAN_BTR_OFFSET, regval);
+
+          ret = stm32can_exitinitmode(priv);
+
+          if (ret == 0)
+            {
+              priv->baud  = STM32_PCLK1_FREQUENCY / (brp * (bt->bt_tseg1 + bt->bt_tseg2 + 1));
+            }
+        }
+        break;
+
+      /* CANIOC_GET_CONNMODES:
+       *   Description:    Get the current bus connection modes
+       *   Argument:       A pointer to a write-able instance of struct
+       *                   canioc_connmodes_s in which the new bus modes will
+       *                   be returned.
+       *   Returned Value: Zero (OK) is returned on success.  Otherwise -1
+       *                   (ERROR)is returned with the errno variable set
+       *                   to indicate the nature of the error.
+       *   Dependencies:   None
+       */
+
+      case CANIOC_GET_CONNMODES:
+        {
+          FAR struct canioc_connmodes_s *bm =
+            (FAR struct canioc_connmodes_s *)arg;
+          uint32_t regval;
+
+          DEBUGASSERT(bm != NULL);
+
+          regval          = stm32can_getreg(priv, STM32_CAN_BTR_OFFSET);
+
+          bm->bm_loopback = ((regval & CAN_BTR_LBKM) == CAN_BTR_LBKM);
+          bm->bm_silent   = ((regval & CAN_BTR_SILM) == CAN_BTR_SILM);
+          ret = OK;
+          break;
+        }
+
+      /* CANIOC_SET_CONNMODES:
+       *   Description:    Set new bus connection modes values
+       *   Argument:       A pointer to a read-able instance of struct
+       *                   canioc_connmodes_s in which the new bus modes
+       *                   are provided.
+       *   Returned Value: Zero (OK) is returned on success.  Otherwise -1
+       *                   (ERROR) is returned with the errno variable set
+       *                   to indicate the nature of the error.
+       *   Dependencies:   None
+      */
+
+      case CANIOC_SET_CONNMODES:
+        {
+          FAR struct canioc_connmodes_s *bm =
+            (FAR struct canioc_connmodes_s *)arg;
+          uint32_t regval;
+
+          DEBUGASSERT(bm != NULL);
+
+          regval = stm32can_getreg(priv, STM32_CAN_BTR_OFFSET);
+
+          if (bm->bm_loopback)
+            {
+            regval |= CAN_BTR_LBKM;
+            }
+          else
+            {
+            regval &= ~CAN_BTR_LBKM;
+            }
+
+          if (bm->bm_silent)
+            {
+            regval |= CAN_BTR_SILM;
+            }
+          else
+            {
+            regval &= ~CAN_BTR_SILM;
+            }
+
+          /* This register can only be configured in init mode. */
+
+          ret = stm32can_enterinitmode(priv);
+          if (ret != 0)
+            {
+              break;
+            }
+
+          stm32can_putreg(priv, STM32_CAN_BTR_OFFSET, regval);
+
+          ret = stm32can_exitinitmode(priv);
+        }
+        break;
+
+#ifdef CONFIG_CAN_EXTID
+      /* CANIOC_ADD_EXTFILTER:
+       *   Description:    Add an address filter for a extended 29 bit
+       *                   address.
+       *   Argument:       A reference to struct canioc_extfilter_s
+       *   Returned Value: A non-negative filter ID is returned on success.
+       *                   Otherwise -1 (ERROR) is returned with the errno
+       *                   variable set to indicate the nature of the error.
+       */
+
+      case CANIOC_ADD_EXTFILTER:
+        {
+          DEBUGASSERT(arg != 0);
+          ret = stm32can_addextfilter(priv, (FAR struct canioc_extfilter_s *)arg);
+        }
+        break;
+
+      /* CANIOC_DEL_EXTFILTER:
+       *   Description:    Remove an address filter for a standard 29 bit
+       *                   address.
+       *   Argument:       The filter index previously returned by the
+       *                   CANIOC_ADD_EXTFILTER command
+       *   Returned Value: Zero (OK) is returned on success.  Otherwise -1
+       *                   (ERROR)is returned with the errno variable set
+       *                   to indicate the nature of the error.
+       */
+
+      case CANIOC_DEL_EXTFILTER:
+        {
+          DEBUGASSERT(arg <= priv->config->nextfilters);
+          ret = stm32can_delextfilter(priv, (int)arg);
+        }
+        break;
+#endif
+
+      /* CANIOC_ADD_STDFILTER:
+       *   Description:    Add an address filter for a standard 11 bit
+       *                   address.
+       *   Argument:       A reference to struct canioc_stdfilter_s
+       *   Returned Value: A non-negative filter ID is returned on success.
+       *                   Otherwise -1 (ERROR) is returned with the errno
+       *                   variable set to indicate the nature of the error.
+       */
+
+      case CANIOC_ADD_STDFILTER:
+        {
+          DEBUGASSERT(arg != 0);
+          ret = stm32can_addstdfilter(priv, (FAR struct canioc_stdfilter_s *)arg);
+        }
+        break;
+
+      /* CANIOC_DEL_STDFILTER:
+       *   Description:    Remove an address filter for a standard 11 bit
+       *                   address.
+       *   Argument:       The filter index previously returned by the
+       *                   CANIOC_ADD_STDFILTER command
+       *   Returned Value: Zero (OK) is returned on success.  Otherwise -1
+       *                   (ERROR) is returned with the errno variable set
+       *                   to indicate the nature of the error.
+       */
+
+      case CANIOC_DEL_STDFILTER:
+        {
+          DEBUGASSERT(arg <= priv->config->nstdfilters);
+          ret = stm32can_delstdfilter(priv, (int)arg);
+        }
+        break;
+
+      /* Unsupported/unrecognized command */
+
+      default:
+        canerr("ERROR: Unrecognized command: %04x\n", cmd);
+        break;
+    }
+
+  return ret;
 }
 
 /****************************************************************************
@@ -1669,6 +1966,98 @@ static int stm32can_filterinit(FAR struct stm32_can_s *priv)
   return OK;
 }
 
+/****************************************************************************
+ * Name: stm32can_addextfilter
+ *
+ * Description:
+ *   Add a filter for extended CAN IDs
+ *
+ * Input Parameter:
+ *   priv - A pointer to the private data structure for this CAN block
+ *   arg  - A pointer to a structure describing the filter
+ *
+ * Returned Value:
+ *   A non-negative filter ID is returned on success.
+ *   Otherwise -1 (ERROR) is returned with the errno
+ *   set to indicate the nature of the error.
+ *
+ ****************************************************************************/
+
+static int  stm32can_addextfilter(FAR struct stm32_can_s *priv,
+                                    FAR struct canioc_extfilter_s *arg)
+{
+  return -ENOTTY;
+}
+
+/****************************************************************************
+ * Name: stm32can_delextfilter
+ *
+ * Description:
+ *   Remove a filter for extended CAN IDs
+ *
+ * Input Parameter:
+ *   priv - A pointer to the private data structure for this CAN block
+ *   arg  - The filter index previously returned by the
+ *            CANIOC_ADD_EXTFILTER command
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success.  Otherwise -1 (ERROR)
+ *   returned with the errno variable set to indicate the
+ *   of the error.
+ *
+ ****************************************************************************/
+
+static int  stm32can_delextfilter(FAR struct stm32_can_s *priv, int arg)
+{
+  return -ENOTTY;
+}
+
+/****************************************************************************
+ * Name: stm32can_addextfilter
+ *
+ * Description:
+ *   Add a filter for standard CAN IDs
+ *
+ * Input Parameter:
+ *   priv - A pointer to the private data structure for this CAN block
+ *   arg  - A pointer to a structure describing the filter
+ *
+ * Returned Value:
+ *   A non-negative filter ID is returned on success.
+ *   Otherwise -1 (ERROR) is returned with the errno
+ *   set to indicate the nature of the error.
+ *
+ ****************************************************************************/
+
+static int  stm32can_addstdfilter(FAR struct stm32_can_s *priv,
+                                    FAR struct canioc_stdfilter_s *arg)
+{
+  return -ENOTTY;
+}
+
+/****************************************************************************
+ * Name: stm32can_delstdfilter
+ *
+ * Description:
+ *   Remove a filter for standard CAN IDs
+ *
+ * Input Parameter:
+ *   priv - A pointer to the private data structure for this CAN block
+ *   arg  - The filter index previously returned by the
+ *            CANIOC_ADD_STDFILTER command
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success.  Otherwise -1 (ERROR)
+ *   returned with the errno variable set to indicate the
+ *   of the error.
+ *
+ ****************************************************************************/
+
+static int  stm32can_delstdfilter(FAR struct stm32_can_s *priv, int arg)
+{
+  return -ENOTTY;
+}
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
diff --git a/arch/arm/src/stm32l4/stm32l4_can.c b/arch/arm/src/stm32l4/stm32l4_can.c
index ae465a2fa4..8b4e3a06de 100644
--- a/arch/arm/src/stm32l4/stm32l4_can.c
+++ b/arch/arm/src/stm32l4/stm32l4_can.c
@@ -128,6 +128,17 @@ static void stm32l4can_dumpfiltregs(FAR struct stm32l4_can_s *priv,
 #  define stm32l4can_dumpfiltregs(priv,msg)
 #endif
 
+/* Filtering (todo) */
+
+static int  stm32l4can_addextfilter(FAR struct stm32l4_can_s *priv,
+              FAR struct canioc_extfilter_s *arg);
+static int  stm32l4can_delextfilter(FAR struct stm32l4_can_s *priv,
+              int arg);
+static int  stm32l4can_addstdfilter(FAR struct stm32l4_can_s *priv,
+              FAR struct canioc_stdfilter_s *arg);
+static int  stm32l4can_delstdfilter(FAR struct stm32l4_can_s *priv,
+              int arg);
+
 /* CAN driver methods */
 
 static void stm32l4can_reset(FAR struct can_dev_s *dev);
@@ -157,17 +168,6 @@ static int  stm32l4can_bittiming(FAR struct stm32l4_can_s *priv);
 static int  stm32l4can_cellinit(FAR struct stm32l4_can_s *priv);
 static int  stm32l4can_filterinit(FAR struct stm32l4_can_s *priv);
 
-/* Filtering (todo) */
-
-static int  stm32l4can_addextfilter(FAR struct stm32l4_can_s *priv,
-              FAR struct canioc_extfilter_s *arg);
-static int  stm32l4can_delextfilter(FAR struct stm32l4_can_s *priv,
-              int arg);
-static int  stm32l4can_addstdfilter(FAR struct stm32l4_can_s *priv,
-              FAR struct canioc_stdfilter_s *arg);
-static int  stm32l4can_delstdfilter(FAR struct stm32l4_can_s *priv,
-              int arg);
-
 /****************************************************************************
  * Private Data
  ****************************************************************************/
@@ -855,9 +855,9 @@ static int stm32l4can_ioctl(FAR struct can_dev_s *dev, int cmd,
               ret = -EINVAL;
             }
 
-          /* Otherwise, nquanta is stm32l4can_bit_quanta, ts1 and ts2 are
+          /* Otherwise, nquanta is can_bit_quanta, ts1 and ts2 are
            * provided by the user and we calculate brp to achieve
-           * stm32l4can_bit_quanta quanta in the bit times
+           * can_bit_quanta quanta in the bit times
            */
 
           else
-- 
GitLab


From ea8760eb19b3b44a37e270033a57bc4e0b5d4fe5 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Fri, 24 Jun 2016 07:20:04 -0600
Subject: [PATCH 035/229] Cosmetic changes from review of last PR

---
 arch/arm/src/stm32/stm32_can.c     | 34 +++++++++++++++++-------------
 arch/arm/src/stm32l4/stm32l4_can.c |  4 ++--
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/arch/arm/src/stm32/stm32_can.c b/arch/arm/src/stm32/stm32_can.c
index a7d8f366c4..c8193f65f4 100644
--- a/arch/arm/src/stm32/stm32_can.c
+++ b/arch/arm/src/stm32/stm32_can.c
@@ -1,4 +1,4 @@
-/************************************************************************************
+/****************************************************************************
  * arch/arm/src/stm32/stm32_can.c
  *
  *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
@@ -34,7 +34,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 /****************************************************************************
  * Included Files
@@ -109,16 +109,16 @@ struct stm32_can_s
 static uint32_t stm32can_getreg(FAR struct stm32_can_s *priv, int offset);
 static uint32_t stm32can_getfreg(FAR struct stm32_can_s *priv, int offset);
 static void stm32can_putreg(FAR struct stm32_can_s *priv, int offset,
-                       uint32_t value);
+              uint32_t value);
 static void stm32can_putfreg(FAR struct stm32_can_s *priv, int offset,
-                        uint32_t value);
+              uint32_t value);
 #ifdef CONFIG_STM32_CAN_REGDEBUG
 static void stm32can_dumpctrlregs(FAR struct stm32_can_s *priv,
-                             FAR const char *msg);
+              FAR const char *msg);
 static void stm32can_dumpmbregs(FAR struct stm32_can_s *priv,
-                           FAR const char *msg);
+              FAR const char *msg);
 static void stm32can_dumpfiltregs(FAR struct stm32_can_s *priv,
-                             FAR const char *msg);
+              FAR const char *msg);
 #else
 #  define stm32can_dumpctrlregs(priv,msg)
 #  define stm32can_dumpmbregs(priv,msg)
@@ -143,9 +143,11 @@ static int  stm32can_setup(FAR struct can_dev_s *dev);
 static void stm32can_shutdown(FAR struct can_dev_s *dev);
 static void stm32can_rxint(FAR struct can_dev_s *dev, bool enable);
 static void stm32can_txint(FAR struct can_dev_s *dev, bool enable);
-static int  stm32can_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg);
+static int  stm32can_ioctl(FAR struct can_dev_s *dev, int cmd,
+              unsigned long arg);
 static int  stm32can_remoterequest(FAR struct can_dev_s *dev, uint16_t id);
-static int  stm32can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg);
+static int  stm32can_send(FAR struct can_dev_s *dev,
+              FAR struct can_msg_s *msg);
 static bool stm32can_txready(FAR struct can_dev_s *dev);
 static bool stm32can_txempty(FAR struct can_dev_s *dev);
 
@@ -353,26 +355,26 @@ static void stm32can_vputreg(uint32_t addr, uint32_t value)
 }
 
 static void stm32can_putreg(FAR struct stm32_can_s *priv, int offset,
-                       uint32_t value)
+                            uint32_t value)
 {
   stm32can_vputreg(priv->base + offset, value);
 }
 
 static void stm32can_putfreg(FAR struct stm32_can_s *priv, int offset,
-                        uint32_t value)
+                             uint32_t value)
 {
   stm32can_vputreg(priv->fbase + offset, value);
 }
 
 #else
 static void stm32can_putreg(FAR struct stm32_can_s *priv, int offset,
-                       uint32_t value)
+                            uint32_t value)
 {
   putreg32(value, priv->base + offset);
 }
 
 static void stm32can_putfreg(FAR struct stm32_can_s *priv, int offset,
-                        uint32_t value)
+                             uint32_t value)
 {
   putreg32(value, priv->fbase + offset);
 }
@@ -636,6 +638,7 @@ static int stm32can_setup(FAR struct can_dev_s *dev)
       canerr("ERROR: CAN%d filter initialization failed: %d\n", priv->port, ret);
       return ret;
     }
+
   stm32can_dumpfiltregs(priv, "After filter initialization");
 
   /* Attach the CAN RX FIFO 0/1 interrupts and TX interrupts.
@@ -795,7 +798,8 @@ static void stm32can_txint(FAR struct can_dev_s *dev, bool enable)
  *
  ****************************************************************************/
 
-static int stm32can_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg)
+static int stm32can_ioctl(FAR struct can_dev_s *dev, int cmd,
+                          unsigned long arg)
 {
   FAR struct stm32_can_s *priv;
   int ret = -ENOTTY;
@@ -966,7 +970,7 @@ static int stm32can_ioctl(FAR struct can_dev_s *dev, int cmd, unsigned long arg)
        *                   (ERROR) is returned with the errno variable set
        *                   to indicate the nature of the error.
        *   Dependencies:   None
-      */
+       */
 
       case CANIOC_SET_CONNMODES:
         {
diff --git a/arch/arm/src/stm32l4/stm32l4_can.c b/arch/arm/src/stm32l4/stm32l4_can.c
index 8b4e3a06de..2d65032c33 100644
--- a/arch/arm/src/stm32l4/stm32l4_can.c
+++ b/arch/arm/src/stm32l4/stm32l4_can.c
@@ -1,4 +1,4 @@
-/************************************************************************************
+/****************************************************************************
  * arch/arm/src/stm32l4/stm32l4_can.c
  *
  *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
@@ -35,7 +35,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 /****************************************************************************
  * Included Files
-- 
GitLab


From 170574d331ec09b2fc72636f86be628ea2f69381 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Fri, 24 Jun 2016 07:45:59 -0600
Subject: [PATCH 036/229] Add configuration logic to include a Kconfig file in
 each custom configuration.  Includes adding a dummy custom board
 configuration directory.  A consequence of this that each custom board
 directory will now need to contain a Kconfig file.  NOTE also that the new
 board directory does not take effect in the configuration menues until the
 NEXT time you run 'make menuconfig'

---
 Makefile.unix         |  12 ++---
 Makefile.win          |  10 ++--
 configs/Kconfig       | 110 +++++++++++++++++-------------------------
 configs/dummy/Kconfig |   4 ++
 4 files changed, 60 insertions(+), 76 deletions(-)
 create mode 100644 configs/dummy/Kconfig

diff --git a/Makefile.unix b/Makefile.unix
index 022c796216..a6913ad672 100644
--- a/Makefile.unix
+++ b/Makefile.unix
@@ -480,22 +480,22 @@ pass2dep: context tools/mkdeps$(HOSTEXEEXT) tools/cnvwindeps$(HOSTEXEEXT)
 # location: http://ymorin.is-a-geek.org/projects/kconfig-frontends.  See
 # README.txt file in the NuttX tools GIT repository for additional information.
 
-config: apps_preconfig
+config: context apps_preconfig
 	$(Q) APPSDIR=${CONFIG_APPS_DIR} kconfig-conf Kconfig
 
-oldconfig: apps_preconfig
+oldconfig: context apps_preconfig
 	$(Q) APPSDIR=${CONFIG_APPS_DIR} kconfig-conf --oldconfig Kconfig
 
-olddefconfig: apps_preconfig
+olddefconfig: context apps_preconfig
 	$(Q) APPSDIR=${CONFIG_APPS_DIR} kconfig-conf --olddefconfig Kconfig
 
-menuconfig: apps_preconfig
+menuconfig: context apps_preconfig
 	$(Q) APPSDIR=${CONFIG_APPS_DIR} kconfig-mconf Kconfig
 
-qconfig: apps_preconfig
+qconfig: context apps_preconfig
 	$(Q) APPSDIR=${CONFIG_APPS_DIR} kconfig-qconf Kconfig
 
-gconfig: apps_preconfig
+gconfig: context apps_preconfig
 	$(Q) APPSDIR=${CONFIG_APPS_DIR} kconfig-gconf Kconfig
 
 # export
diff --git a/Makefile.win b/Makefile.win
index 5a71a42122..5556efb79f 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -480,16 +480,16 @@ pass2dep: context tools\mkdeps$(HOSTEXEEXT)
 # location: http://ymorin.is-a-geek.org/projects/kconfig-frontends.  See
 # misc\tools\README.txt for additional information.
 
-config: apps_preconfig
+config: context apps_preconfig
 	$(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-conf Kconfig
 
-oldconfig: apps_preconfig
-	$(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-conf --oldconfig Kconfig
+oldconfig: context apps_preconfig
+	$(Q) context set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-conf --oldconfig Kconfig
 
-olddefconfig: apps_preconfig
+olddefconfig: context apps_preconfig
 	$(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-conf --olddefconfig Kconfig
 
-menuconfig: configenv apps_preconfig
+menuconfig: context configenv apps_preconfig
 	$(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-mconf Kconfig
 
 # export
diff --git a/configs/Kconfig b/configs/Kconfig
index 75014db5fd..b6e90d411b 100644
--- a/configs/Kconfig
+++ b/configs/Kconfig
@@ -444,6 +444,12 @@ config ARCH_BOARD_MIRTOO
 		This is the port to the DTX1-4000L "Mirtoo" module.  This module uses MicroChip
 		PIC32MX250F128D.  See http://www.dimitech.com/ for further information.
 
+config ARCH_BOARD_MOXA
+	bool "Moxa board"
+	depends on ARCH_CHIP_MOXART
+	---help---
+		Moxa
+
 config ARCH_BOARD_NUTINY_NUC120
 	bool "Nuvoton NuTiny NUC120"
 	depends on ARCH_CHIP_NUC120LE3AN
@@ -1257,26 +1263,13 @@ config ARCH_BOARD_CUSTOM
 		Don't see the board you want?  You must first select the exact MCU part
 		number, then the boards supporting that part will be available for selection.
 
-config ARCH_BOARD_MOXA
-	bool "Moxa board"
-	depends on ARCH_CHIP_MOXART
-	---help---
-		Moxa
-
 endchoice
 
-if ARCH_BOARD_CUSTOM
 menu "Custom Board Configuration"
 
-config ARCH_BOARD_CUSTOM_NAME
-	string "Custom board name"
-	default ""
-	---help---
-		This is a name for the board.  It is not used except to return the
-		information via the NSH uname command.
-
 config ARCH_BOARD_CUSTOM_DIR
 	string "Custom board directory"
+	default "configs/dummy"
 	---help---
 		If the custom board configuration is selected, then it is necessary
 		to also tell the build system where it can find the board directory
@@ -1289,33 +1282,17 @@ config ARCH_BOARD_CUSTOM_DIR
 
 config ARCH_BOARD_CUSTOM_DIR_RELPATH
 	bool "Relative custom board directory"
+	default y
 	---help---
 		Specifies that the board directory is relative to the NuttX directory.
 
-config BOARD_CRASHDUMP
-	bool "Enable Board level logging of crash dumps"
-	default n
-	---help---
-		If selected up_asseert will call out to board_crashdump, in the case
-		of an assertion failure, prior to calling exit. Or in the
-		case of a hardfault prior to looping indefinitely. board_crashdump
-		then has a chance to save the state of the machine.
-
-		The purpose of board_crashdump is to save as much information as it can
-		about the cause of the fault and then most likely reset the system.
-
-		 N.B. There is limited system resources that can be used, who knows
-		 what memory is trashed? So all we can expect to do is save the
-		"machine state" in a place where on the next reset can write it
-		to more sophisticated storage in a sane operating environment.
+if ARCH_BOARD_CUSTOM
 
-config BOARD_RESET_ON_CRASH
-	bool "Eanble Board Reset after the crashdump is saved"
-	default n
-	depends on BOARD_CRASHDUMP
+config ARCH_BOARD_CUSTOM_NAME
+	string "Custom board name"
 	---help---
-		If selected the board_crashdump should reset the machine after
-		saveing the state of the machine
+		This is a name for the board.  It is not used except to return the
+		information via the NSH uname command.
 
 config BOARD_CUSTOM_LEDS
 	bool "Custom board LEDs"
@@ -1341,8 +1318,8 @@ config BOARD_CUSTOM_INTERRUPT
 	depends on NETDEVICES
 	select ARCH_PHY_INTERRUPT if NETDEVICES
 
-endmenu # Custom Board Configuration
 endif #ARCH_BOARD_CUSTOM
+endmenu # Custom Board Configuration
 
 config ARCH_BOARD
 	string
@@ -1503,34 +1480,9 @@ config ARCH_IRQBUTTONS
 	---help---
 		"Support interrupts on button presses and releases."
 
-config NSH_MMCSDMINOR
-	int "MMC/SD minor number"
-	default 0
-	depends on NSH_LIBRARY && MMCSD
-	---help---
-		If board-specific NSH start-up logic needs to mount an MMC/SD device, then the
-		setting should be provided to identify the MMC/SD minor device number (i.e., the N ini
-		/dev/mmcsdN).  Default 0
-
-config NSH_MMCSDSLOTNO
-	int "MMC/SD slot number"
-	default 0
-	depends on NSH_LIBRARY && MMCSD
-	---help---
-		If board-specific NSH start-up supports more than one MMC/SD slot, then this setting
-		should be provided to indicate which slot should be used.  Default: 0.
-
-config NSH_MMCSDSPIPORTNO
-	int "MMC/SD SPI device number"
-	default 0
-	depends on NSH_LIBRARY && MMCSD && MMCSD_SPI
-	---help---
-		If board-specif NSH start-up logic will mount an SPI-based MMC/SD volume, then this
-		setting may be needed to tell the board logic which SPI bus to use.  Default: 0
-		(meaning is board-specific).
-
 comment "Board-Specific Options"
 
+
 if ARCH_BOARD_AMBER
 source "configs/amber/Kconfig"
 endif
@@ -1657,6 +1609,9 @@ endif
 if ARCH_BOARD_MOTEINO_MEGA
 source "configs/moteino-mega/Kconfig"
 endif
+if ARCH_BOARD_MOXA
+source "configs/moxa/Kconfig"
+endif
 if ARCH_BOARD_MX1ADS
 source "configs/mx1ads/Kconfig"
 endif
@@ -1891,10 +1846,35 @@ endif
 if ARCH_BOARD_SIM
 source "configs/sim/Kconfig"
 endif
-if ARCH_BOARD_MOXA
-source "configs/moxa/Kconfig"
+if ARCH_BOARD_CUSTOM
+source "$ARCH_BOARD_CUSTOM_DIR/Kconfig"
 endif
 
+config BOARD_CRASHDUMP
+	bool "Enable Board level logging of crash dumps"
+	default n
+	---help---
+		If selected up_assert will call out to board_crashdump, in the case
+		of an assertion failure, prior to calling exit. Or in the
+		case of a hardfault prior to looping indefinitely. board_crashdump
+		then has a chance to save the state of the machine.
+
+		The purpose of board_crashdump is to save as much information as it can
+		about the cause of the fault and then most likely reset the system.
+
+		 N.B. There is limited system resources that can be used, who knows
+		 what memory is trashed? So all we can expect to do is save the
+		"machine state" in a place where on the next reset can write it
+		to more sophisticated storage in a sane operating environment.
+
+config BOARD_RESET_ON_CRASH
+	bool "Enable Board Reset after the crashdump is saved"
+	default n
+	depends on BOARD_CRASHDUMP
+	---help---
+		If selected the board_crashdump should reset the machine after
+		saveing the state of the machine
+
 config LIB_BOARDCTL
 	bool "Enable boardctl() interface"
 	default n
diff --git a/configs/dummy/Kconfig b/configs/dummy/Kconfig
new file mode 100644
index 0000000000..f72f3c094c
--- /dev/null
+++ b/configs/dummy/Kconfig
@@ -0,0 +1,4 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
-- 
GitLab


From 8afe721612653bd2379080e91b6c1e8b5f2d41a2 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Fri, 24 Jun 2016 07:54:41 -0600
Subject: [PATCH 037/229] Make custom board options invisible until custom
 board is selected

---
 configs/Kconfig | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/configs/Kconfig b/configs/Kconfig
index b6e90d411b..c2efce0812 100644
--- a/configs/Kconfig
+++ b/configs/Kconfig
@@ -1265,6 +1265,20 @@ config ARCH_BOARD_CUSTOM
 
 endchoice
 
+if !ARCH_BOARD_CUSTOM
+
+config ARCH_BOARD_CUSTOM_DIR
+	string
+	default "configs/dummy"
+
+config ARCH_BOARD_CUSTOM_DIR_RELPATH
+	bool
+	default y
+
+endif # !ARCH_BOARD_CUSTOM
+
+if ARCH_BOARD_CUSTOM
+
 menu "Custom Board Configuration"
 
 config ARCH_BOARD_CUSTOM_DIR
@@ -1286,8 +1300,6 @@ config ARCH_BOARD_CUSTOM_DIR_RELPATH
 	---help---
 		Specifies that the board directory is relative to the NuttX directory.
 
-if ARCH_BOARD_CUSTOM
-
 config ARCH_BOARD_CUSTOM_NAME
 	string "Custom board name"
 	---help---
@@ -1318,8 +1330,8 @@ config BOARD_CUSTOM_INTERRUPT
 	depends on NETDEVICES
 	select ARCH_PHY_INTERRUPT if NETDEVICES
 
-endif #ARCH_BOARD_CUSTOM
 endmenu # Custom Board Configuration
+endif #ARCH_BOARD_CUSTOM
 
 config ARCH_BOARD
 	string
-- 
GitLab


From ae19ca45e0f0566a5733f77fe132a6cc8b64206f Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Fri, 24 Jun 2016 09:43:49 -0600
Subject: [PATCH 038/229] drivrs/ioexpander:  Add support for a very simple
 GPIO drivers.  It supports only pre-conrigured input and output pins and only
 basic input and output operations.

---
 drivers/Kconfig                    |  10 --
 drivers/ioexpander/Kconfig         |  22 +++
 drivers/ioexpander/Make.defs       |  20 +++
 drivers/ioexpander/gpio.c          | 269 +++++++++++++++++++++++++++++
 include/nuttx/fs/ioctl.h           |   6 +
 include/nuttx/ioexpander/gpio.h    | 132 ++++++++++++++
 include/nuttx/ioexpander/pca9555.h |  40 +++--
 7 files changed, 475 insertions(+), 24 deletions(-)
 create mode 100644 drivers/ioexpander/gpio.c
 create mode 100644 include/nuttx/ioexpander/gpio.h

diff --git a/drivers/Kconfig b/drivers/Kconfig
index fbb5f5942f..011850d6c9 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -370,17 +370,7 @@ if INPUT
 source drivers/input/Kconfig
 endif # INPUT
 
-menuconfig IOEXPANDER
-	bool "IO Expander Support"
-	default n
-	---help---
-		This directory holds implementations of IO expander drivers.
-		See include/nuttx/ioexpander/ioexpander.h for registration information.
-
-if IOEXPANDER
 source drivers/ioexpander/Kconfig
-endif # IOEXPANDER
-
 source drivers/lcd/Kconfig
 source drivers/leds/Kconfig
 
diff --git a/drivers/ioexpander/Kconfig b/drivers/ioexpander/Kconfig
index 438beeed5a..fd6abd7715 100644
--- a/drivers/ioexpander/Kconfig
+++ b/drivers/ioexpander/Kconfig
@@ -3,6 +3,17 @@
 # see the file kconfig-language.txt in the NuttX tools repository.
 #
 
+menu "IO Expander/GPIO Support"
+
+config IOEXPANDER
+	bool "Enable IO Expander Support"
+	default n
+	---help---
+		This directory holds implementations of IO expander drivers.
+		See include/nuttx/ioexpander/ioexpander.h for registration information.
+
+if IOEXPANDER
+
 config IOEXPANDER_PCA9555
 	bool "PCA9555 I2C IO expander"
 	default n
@@ -40,3 +51,14 @@ config IOEXPANDER_MULTIPIN
 	---help---
 		This settings enable the definition of routines for
 		optimized simultaneous access to multiple pins.
+
+endif # IOEXPANDER
+
+config DEV_GPIO
+	bool "GPIO driver"
+	default n
+	---help---
+		Enables a simple GPIO input/output driver to support application-
+		space testing of hardware.
+
+endmenu # IO Expander/GPIO Support
diff --git a/drivers/ioexpander/Make.defs b/drivers/ioexpander/Make.defs
index aea59aea51..37e669fe94 100644
--- a/drivers/ioexpander/Make.defs
+++ b/drivers/ioexpander/Make.defs
@@ -43,6 +43,26 @@ ifeq ($(CONFIG_IOEXPANDER_PCA9555),y)
   CSRCS += pca9555.c
 endif
 
+endif # CONFIG_IOEXPANDER
+
+# GPIO test device driver (independent of IOEXPANDERS)
+
+ifeq ($(CONFIG_DEV_GPIO),y)
+  CSRCS += gpio.c
+endif
+
+# The folling implements an awkward OR
+
+ifeq ($(CONFIG_IOEXPANDER),y)
+
+# Include ioexpander I/O device driver build support
+
+DEPPATH += --dep-path ioexpander
+VPATH += :ioexpander
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)ioexpander}
+
+else ifeq ($(CONFIG_DEV_GPIO),y)
+
 # Include ioexpander I/O device driver build support
 
 DEPPATH += --dep-path ioexpander
diff --git a/drivers/ioexpander/gpio.c b/drivers/ioexpander/gpio.c
new file mode 100644
index 0000000000..2d5ffa9b35
--- /dev/null
+++ b/drivers/ioexpander/gpio.c
@@ -0,0 +1,269 @@
+/****************************************************************************
+ * drivers/ioexpander/gpio.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 
+#include 
+#include 
+
+#include 
+#include 
+
+#ifdef CONFIG_DEV_GPIO
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static int     gpio_open(FAR struct file *filep);
+static int     gpio_close(FAR struct file *filep);
+static ssize_t gpio_read(FAR struct file *filep, FAR char *buffer,
+                 size_t buflen);
+static ssize_t gpio_write(FAR struct file *filep, FAR const char *buffer,
+                 size_t buflen);
+static int     gpio_ioctl(FAR struct file *filep, int cmd,
+                 unsigned long arg);
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static const struct file_operations g_gpio_input_ops =
+{
+  gpio_open,  /* open */
+  gpio_close, /* close */
+  gpio_read,  /* read */
+  NULL,       /* write */
+  NULL,       /* seek */
+  gpio_ioctl  /* ioctl */
+#ifndef CONFIG_DISABLE_POLL
+  , NULL      /* poll */
+#endif
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL      /* unlink */
+#endif
+};
+
+static const struct file_operations g_gpio_output_ops =
+{
+  gpio_open,  /* open */
+  gpio_close, /* close */
+  NULL,       /* read */
+  gpio_write, /* write */
+  NULL,       /* seek */
+  gpio_ioctl  /* ioctl */
+#ifndef CONFIG_DISABLE_POLL
+  , NULL      /* poll */
+#endif
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL      /* unlink */
+#endif
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: gpio_open
+ *
+ * Description:
+ *   Standard character driver open method.
+ *
+ ****************************************************************************/
+
+static int gpio_open(FAR struct file *filep)
+{
+  return OK;
+}
+
+/****************************************************************************
+ * Name: gpio_close
+ *
+ * Description:
+ *   Standard character driver close method.
+ *
+ ****************************************************************************/
+
+static int gpio_close(FAR struct file *filep)
+{
+  return OK;
+}
+
+/****************************************************************************
+ * Name: gpio_read
+ *
+ * Description:
+ *   Standard character driver read method.
+ *
+ ****************************************************************************/
+
+static ssize_t gpio_read(FAR struct file *filep, FAR char *buffer,
+                         size_t buflen)
+{
+  return 0;
+}
+
+/****************************************************************************
+ * Name: gpio_write
+ *
+ * Description:
+ *   Standard character driver write method.
+ *
+ ****************************************************************************/
+
+static ssize_t gpio_write(FAR struct file *filep, FAR const char *buffer,
+                          size_t buflen)
+{
+  return (ssize_t)buflen;
+}
+
+/****************************************************************************
+ * Name: gpio_ioctl
+ *
+ * Description:
+ *   Standard character driver ioctl method.
+ *
+ ****************************************************************************/
+
+static int gpio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
+{
+  FAR struct inode *inode;
+  FAR struct gpio_common_dev_s *dev;
+  int ret = OK;
+
+  DEBUGASSERT(filep != NULL && filep->f_inode != NULL);
+  inode = filep->f_inode;
+  DEBUGASSERT(inode->i_private != NULL);
+  dev = inode->i_private;
+
+  switch (cmd)
+  {
+  /* Command:     GPIO_WRITE
+   * Description: Set the value of an output GPIO
+   * Argument:    0=output a low value; 1=outut a high value
+   */
+
+  case GPIO_WRITE:
+    if (dev->output)
+      {
+        FAR struct gpio_output_dev_s *outdev =
+          (FAR struct gpio_output_dev_s *)dev;
+
+        DEBUGASSERT(outdev->gpout_write != NULL);
+        ret = outdev->gpout_write(outdev, (int)arg);
+      }
+    else
+      {
+        ret = -EACCES;
+      }
+    break;
+
+  /* Command:     GPIO_READ
+   * Description: Read the value of an input or output GPIO
+   * Argument:    A pointer to an integer value to receive the result:
+   *              0=low value; 1=high value.
+   */
+
+  case GPIO_READ:
+    if (dev->output)
+      {
+        FAR struct gpio_output_dev_s *outdev =
+          (FAR struct gpio_output_dev_s *)dev;
+
+        DEBUGASSERT(outdev->gpout_read != NULL);
+        ret = outdev->gpout_read(outdev);
+      }
+    else
+      {
+        FAR struct gpio_input_dev_s *indev =
+          (FAR struct gpio_input_dev_s *)dev;
+
+        DEBUGASSERT(indev->gpin_read != NULL);
+        ret = indev->gpin_read(indev);
+      }
+    break;
+  }
+
+  return ret;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: gpio_input_register
+ *
+ * Description:
+ *   Register GPIO input pin device driver.
+ *
+ ****************************************************************************/
+
+int gpio_input_register(FAR struct gpio_input_dev_s *dev, int minor)
+{
+  char devname[16];
+
+  DEBUGASSERT((unsigned int)minor < 100);
+  snprintf(devname, 16, "/dev/gpin%u", (unsigned int)minor);
+
+  return register_driver(devname, &g_gpio_input_ops, 0444, dev);
+}
+
+/****************************************************************************
+ * Name: gpio_output_register
+ *
+ * Description:
+ *   Register GPIO output pin device driver.
+ *
+ ****************************************************************************/
+
+int gpio_output_register(FAR struct gpio_output_dev_s *dev, int minor)
+{
+  char devname[16];
+
+  DEBUGASSERT((unsigned int)minor < 100);
+  snprintf(devname, 16, "/dev/gpout%u", (unsigned int)minor);
+
+  return register_driver(devname, &g_gpio_output_ops, 0222, dev);
+}
+
+#endif /* CONFIG_DEV_GPIO */
diff --git a/include/nuttx/fs/ioctl.h b/include/nuttx/fs/ioctl.h
index e404057d7e..b79c783923 100644
--- a/include/nuttx/fs/ioctl.h
+++ b/include/nuttx/fs/ioctl.h
@@ -83,6 +83,7 @@
 #define _LOOPBASE       (0x1e00) /* Loop device commands */
 #define _MODEMBASE      (0x1f00) /* Modem ioctl commands */
 #define _I2CBASE        (0x2000) /* I2C driver commands */
+#define _GPIOBASE       (0x2100) /* GPIO driver commands */
 
 /* boardctl commands share the same number space */
 
@@ -381,6 +382,11 @@
 #define _I2CIOCVALID(c)    (_IOC_TYPE(c)==_I2CBASE)
 #define _I2CIOC(nr)        _IOC(_I2CBASE,nr)
 
+/* GPIO driver command definitions ******************************************/
+
+#define _GPIOCVALID(c)     (_IOC_TYPE(c)==_GPIOBASE)
+#define _GPIOC(nr)         _IOC(_GPIOBASE,nr)
+
 /* boardctl() command definitions *******************************************/
 
 #define _BOARDIOCVALID(c) (_IOC_TYPE(c)==_BOARDBASE)
diff --git a/include/nuttx/ioexpander/gpio.h b/include/nuttx/ioexpander/gpio.h
new file mode 100644
index 0000000000..5d6e791746
--- /dev/null
+++ b/include/nuttx/ioexpander/gpio.h
@@ -0,0 +1,132 @@
+/********************************************************************************************
+ * include/nuttx/ioexpander/gpio.h
+ *
+ *   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.
+ *
+ ********************************************************************************************/
+
+#ifndef __INCLUDE_NUTTX_IOEXPANDER_GPIO_H
+#define __INCLUDE_NUTTX_IOEXPANDER_GPIO_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include 
+#include 
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Command:     GPIO_WRITE
+ * Description: Set the value of an output GPIO
+ * Argument:    0=output a low value; 1=outut a high value
+ *
+ * Command:     GPIO_READ
+ * Description: Read the value of an input or output GPIO
+ * Argument:    A pointer to an integer value to receive the result:
+ *              0=low value; 1=high value.
+ */
+
+#define GPIO_WRITE _GPIOC(1)
+#define GPIO_READ  _GPIOC(2)
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/* Common interface definition.  Must be cast-compatible with struct
+ * gpio_input_dev_s and struct gpio_output_dev_s
+ */
+
+struct gpio_common_dev_s
+{
+  bool output;
+  uint8_t unused[3];
+};
+
+/* The interface to a GPIO input pin */
+
+struct gpio_input_dev_s
+{
+  bool output;
+  uint8_t unused[3];
+  CODE int (*gpin_read)(FAR struct gpio_input_dev_s *dev);
+};
+
+/* The interface to a GPIO input pin */
+
+struct gpio_output_dev_s
+{
+  bool output;
+  uint8_t unused[3];
+  CODE int (*gpout_read)(FAR struct gpio_output_dev_s *dev);
+  CODE int (*gpout_write)(FAR struct gpio_output_dev_s *dev, int value);
+};
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+#ifdef __cplusplus
+#define EXTERN extern "C"
+extern "C"
+{
+#else
+#define EXTERN extern
+#endif
+
+/****************************************************************************
+ * Name: gpio_input_register
+ *
+ * Description:
+ *   Register GPIO input pin device driver.
+ *
+ ****************************************************************************/
+
+int gpio_input_register(FAR struct gpio_input_dev_s *dev, int minor);
+
+/****************************************************************************
+ * Name: gpio_output_register
+ *
+ * Description:
+ *   Register GPIO output pin device driver.
+ *
+ ****************************************************************************/
+
+int gpio_output_register(FAR struct gpio_output_dev_s *dev, int minor);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __INCLUDE_NUTTX_IOEXPANDER_GPIO_H */
diff --git a/include/nuttx/ioexpander/pca9555.h b/include/nuttx/ioexpander/pca9555.h
index aa0b3c2863..3a99a7def3 100644
--- a/include/nuttx/ioexpander/pca9555.h
+++ b/include/nuttx/ioexpander/pca9555.h
@@ -1,4 +1,4 @@
-/********************************************************************************************
+/****************************************************************************
  * include/nuttx/ioexpander/pca9555.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
@@ -35,20 +35,31 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- ********************************************************************************************/
+ ****************************************************************************/
 
 #ifndef __INCLUDE_NUTTX_IOEXPANDER_PCA9555_H
 #define __INCLUDE_NUTTX_IOEXPANDER_PCA9555_H
 
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include 
 #include 
 
-/* A reference to a structure of this type must be passed to the PCA9555 driver when the
- * driver is instantiated. This structure provides information about the configuration of
- * the PCA9555 and provides some board-specific hooks.
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/* A reference to a structure of this type must be passed to the PCA9555
+ * driver when the driver is instantiated. This structure provides
+ * information about the configuration of the PCA9555 and provides some
+ * board-specific hooks.
  *
- * Memory for this structure is provided by the caller.  It is not copied by the driver
- * and is presumed to persist while the driver is active. The memory must be writeable
- * because, under certain circumstances, the driver may modify the frequency.
+ * Memory for this structure is provided by the caller.  It is not copied by
+ * the driver and is presumed to persist while the driver is active. The
+ * memory must be writeable because, under certain circumstances, the driver
+ * may modify the frequency.
  */
 
 struct pca9555_config_s
@@ -81,9 +92,9 @@ struct pca9555_config_s
 #endif
 };
 
-/********************************************************************************************
+/****************************************************************************
  * Public Function Prototypes
- ********************************************************************************************/
+ ****************************************************************************/
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
@@ -93,11 +104,12 @@ extern "C"
 #define EXTERN extern
 #endif
 
-/********************************************************************************************
+/****************************************************************************
  * Name: pca9555_initialize
  *
  * Description:
- *   Instantiate and configure the PCA9555 device driver to use the provided I2C device 
+ *   Instantiate and configure the PCA9555 device driver to use the provided
+ *   I2C device
  *   instance.
  *
  * Input Parameters:
@@ -108,9 +120,9 @@ extern "C"
  * Returned Value:
  *   an ioexpander_dev_s instance on success, NULL on failure.
  *
- ********************************************************************************************/
+ ****************************************************************************/
 
-FAR struct ioexpander_dev_s* pca9555_initialize(FAR struct i2c_master_s *dev,
+FAR struct ioexpander_dev_s *pca9555_initialize(FAR struct i2c_master_s *dev,
                                                 FAR struct pca9555_config_s *config);
 
 #ifdef __cplusplus
-- 
GitLab


From 315e22e4df093c25c850ba8aa22cb5da3c812dbf Mon Sep 17 00:00:00 2001
From: Alexander Vasiljev 
Date: Fri, 24 Jun 2016 10:09:36 -0600
Subject: [PATCH 039/229] Correct auto-negotiation mode in the LPC43xx
 ethernet.

---
 arch/arm/src/lpc43xx/lpc43_ethernet.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/arm/src/lpc43xx/lpc43_ethernet.c b/arch/arm/src/lpc43xx/lpc43_ethernet.c
index db05295ec0..086dd0b8f3 100644
--- a/arch/arm/src/lpc43xx/lpc43_ethernet.c
+++ b/arch/arm/src/lpc43xx/lpc43_ethernet.c
@@ -3392,6 +3392,9 @@ static int lpc43_phyinit(FAR struct lpc43_ethmac_s *priv)
       priv->mbps100 = 1;
     }
 #endif
+#endif
+
+#else /* Auto-negotion not selected */
 
 #ifdef CONFIG_LPC43_ETHFD
   priv->mbps100 = 1;
@@ -3399,12 +3402,10 @@ static int lpc43_phyinit(FAR struct lpc43_ethmac_s *priv)
 
 #ifdef CONFIG_LPC43_ETH100MBPS
   priv->fduplex = 1;
-#endif
 #endif
 
-  /* However we got here, commit to the hardware */
-
   phyval = 0;
+
   if (priv->mbps100)
     {
       phyval |= MII_MCR_FULLDPLX;
-- 
GitLab


From 26f7b8c9e540e57243483b2b4ed2a9a972972b94 Mon Sep 17 00:00:00 2001
From: Michael Spahlinger 
Date: Fri, 24 Jun 2016 10:33:51 -0600
Subject: [PATCH 040/229] TWIHS Driver improved and GPIO-Driver fixed for
 Open-Drain Pins
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 - sam_gpioread: Now the actual line level from the pin is read back.  This is extremely important for Open-Drain Pins, which can be used bidirectionally
 - Re-Implemented twi_reset-function and enhanced it so it can be called from inside the driver (see next point)
 - Glitch-Filter: Added a configuration option to enable the twi-built-in glitch filter
 - Added a "Single Master Mode": In EMC Testing the TWI-Bus got stuck because the TWI-Master detected a Multi-Master access (but there is no second master). With the option "Single Master" we detect these events and automatically trigger a twi_reset. We also do an automatic recovery if a slave got stuck (SDA stays low).

With the above changes I²C-Bus reliability in harsh environments (eg. EMC) is greatly improved.

The small change in the GPIO-Driver was necessary because otherwise you cannot read back the correct line status of Open-Drain Outputs and this is needed by the twi_reset function.
---
 arch/arm/Kconfig               |   1 +
 arch/arm/src/samv7/Kconfig     |  69 ++++++++++
 arch/arm/src/samv7/sam_gpio.c  |  12 +-
 arch/arm/src/samv7/sam_twihs.c | 230 +++++++++++++++++++++++++--------
 4 files changed, 247 insertions(+), 65 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f31f812778..fcc1c9ce98 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -213,6 +213,7 @@ config ARCH_CHIP_SAMV7
 	select ARCH_HAVE_RAMFUNCS
 	select ARCH_HAVE_TICKLESS
 	select ARMV7M_HAVE_STACKCHECK
+	select ARCH_HAVE_I2CRESET
 	---help---
 		Atmel SAMV7 (ARM Cortex-M7) architectures
 
diff --git a/arch/arm/src/samv7/Kconfig b/arch/arm/src/samv7/Kconfig
index 55eb92d485..9507e0c59c 100644
--- a/arch/arm/src/samv7/Kconfig
+++ b/arch/arm/src/samv7/Kconfig
@@ -957,16 +957,85 @@ config SAMV7_TWIHS0_FREQUENCY
 	default 100000
 	depends on SAMV7_TWIHS0
 
+config SAMV7_TWIHS0_GLITCH_FILTER
+	int "TWIHS0 Glitch Filter Time"
+	default 1
+	range 0 7
+	depends on SAMV7_TWIHS0
+	---help---
+		Apply filtering on TWIHS Inputs. Given number is the maximum pulse width
+		(defined in peripheral CLKs) of spikes to be suppressed by the input filter.
+		Setting this value to zero will disable glitch filtering.
+
+config SAMV7_TWIHS0_SINGLE_MASTER
+	bool "TWIHS0 Single Master Mode"
+	default y
+	depends on SAMV7_TWIHS0
+	depends on I2C_RESET
+	---help---
+		Enables a mode, where errors on the I2C-Bus (e.g. by EMC or
+		stuck slaves) are automatically handled by the driver.
+		In an error-case the I2C-Bus is reset so further communication
+		on the bus can take place.
+		This option is default on because the TWI-Driver can't handle
+		Multi-Master I2C anyways.
+
 config SAMV7_TWIHS1_FREQUENCY
 	int "TWIHS1 Frequency"
 	default 100000
 	depends on SAMV7_TWIHS1
 
+config SAMV7_TWIHS1_GLITCH_FILTER
+	int "TWIHS1 Glitch Filter Time"
+	default 1
+	range 0 7
+	depends on SAMV7_TWIHS1
+	---help---
+		Apply filtering on TWIHS Inputs. Given number is the maximum pulse width
+		(defined in peripheral CLKs) of spikes to be suppressed by the input filter.
+		Setting this value to zero will disable glitch filtering.
+
+config SAMV7_TWIHS1_SINGLE_MASTER
+	bool "TWIHS1 Single Master Mode"
+	default y
+	depends on SAMV7_TWIHS1
+	depends on I2C_RESET
+	---help---
+		Enables a mode, where errors on the I2C-Bus (e.g. by EMC or
+		stuck slaves) are automatically handled by the driver.
+		In an error-case the I2C-Bus is reset so further communication
+		on the bus can take place.
+		This option is default on because the TWI-Driver can't handle
+		Multi-Master I2C anyways.
+
 config SAMV7_TWIHS2_FREQUENCY
 	int "TWIHS2 Frequency"
 	default 100000
 	depends on SAMV7_TWIHS2
 
+config SAMV7_TWIHS2_GLITCH_FILTER
+	int "TWIHS2 Glitch Filter Time"
+	default 1
+	range 0 7
+	depends on SAMV7_TWIHS2
+	---help---
+		Apply filtering on TWIHS Inputs. Given number is the maximum pulse width
+		(defined in peripheral CLKs) of spikes to be suppressed by the input filter.
+		Setting this value to zero will disable glitch filtering.
+
+config SAMV7_TWIHS2_SINGLE_MASTER
+	bool "TWIHS2 Single Master Mode"
+	default y
+	depends on SAMV7_TWIHS2
+	depends on I2C_RESET
+	---help---
+		Enables a mode, where errors on the I2C-Bus (e.g. by EMC or
+		stuck slaves) are automatically handled by the driver.
+		In an error-case the I2C-Bus is reset so further communication
+		on the bus can take place.
+		This option is default on because the TWI-Driver can't handle
+		Multi-Master I2C anyways.
+
 config SAMV7_TWIHS_REGDEBUG
 	bool "TWIHS register level debug"
 	depends on DEBUG_I2C_INFO
diff --git a/arch/arm/src/samv7/sam_gpio.c b/arch/arm/src/samv7/sam_gpio.c
index 9b322f8381..cf681e7662 100644
--- a/arch/arm/src/samv7/sam_gpio.c
+++ b/arch/arm/src/samv7/sam_gpio.c
@@ -543,15 +543,11 @@ bool sam_gpioread(gpio_pinset_t pinset)
   uint32_t  pin  = sam_gpio_pinmask(pinset);
   uint32_t  regval;
 
-  if ((pinset & GPIO_MODE_MASK) == GPIO_OUTPUT)
-    {
-      regval = getreg32(base + SAM_PIO_ODSR_OFFSET);
-    }
-  else
-    {
-      regval = getreg32(base + SAM_PIO_PDSR_OFFSET);
-    }
+  /* Always read the Pin Data Status Register.  Otherwise an Open-Drain
+   * Output pin will not be read back correctly.
+   */
 
+  regval = getreg32(base + SAM_PIO_PDSR_OFFSET);
   return (regval & pin) != 0;
 }
 
diff --git a/arch/arm/src/samv7/sam_twihs.c b/arch/arm/src/samv7/sam_twihs.c
index 6a0de18ef4..032d2eaa4a 100644
--- a/arch/arm/src/samv7/sam_twihs.c
+++ b/arch/arm/src/samv7/sam_twihs.c
@@ -116,13 +116,13 @@
 
 #define TWIHS_MAX_FREQUENCY 66000000   /* Maximum TWIHS frequency */
 
-/* Macros to convert a I2C pin to a PIO open-drain output */
+/* Macros to convert a I2C pin to a GPIO open-drain output */
 
-#define I2C_INPUT       (PIO_INPUT | PIO_CFG_PULLUP)
-#define I2C_OUTPUT      (PIO_OUTPUT | PIO_CFG_OPENDRAIN | PIO_OUTPUT_SET)
+#define I2C_INPUT       (GPIO_INPUT | GPIO_CFG_PULLUP)
+#define I2C_OUTPUT      (GPIO_OUTPUT | GPIO_CFG_OPENDRAIN | GPIO_OUTPUT_SET)
 
-#define MKI2C_INPUT(p)  (((p) & (PIO_PORT_MASK | PIO_PIN_MASK)) | I2C_INPUT)
-#define MKI2C_OUTPUT(p) (((p) & (PIO_PORT_MASK | PIO_PIN_MASK)) | I2C_OUTPUT)
+#define MKI2C_INPUT(p)  (((p) & (GPIO_PORT_MASK | GPIO_PIN_MASK)) | I2C_INPUT)
+#define MKI2C_OUTPUT(p) (((p) & (GPIO_PORT_MASK | GPIO_PIN_MASK)) | I2C_OUTPUT)
 
 /****************************************************************************
  * Private Types
@@ -134,6 +134,8 @@ struct twi_attr_s
   uint8_t             twi;        /* TWIHS device number (for debug output) */
   uint8_t             pid;        /* TWIHS peripheral ID */
   uint16_t            irq;        /* IRQ number for this TWIHS bus */
+  uint8_t             glitchfltr; /* Pulse width of a glich to be suppressed by the filter */
+  uint8_t             s_master;   /* Single-Master Mode active */
   gpio_pinset_t       sclcfg;     /* TWIHS CK pin configuration (SCL in I2C-ese) */
   gpio_pinset_t       sdacfg;     /* TWIHS D pin configuration (SDA in I2C-ese) */
   uintptr_t           base;       /* Base address of TWIHS registers */
@@ -219,6 +221,7 @@ static void twi_startmessage(struct twi_dev_s *priv, struct i2c_msg_s *msg);
 static int twi_transfer(FAR struct i2c_master_s *dev,
           FAR struct i2c_msg_s *msgs, int count);
 #ifdef CONFIG_I2C_RESET
+static int  twi_reset_internal(FAR struct i2c_master_s *dev);
 static int  twi_reset(FAR struct i2c_master_s * dev);
 #endif
 
@@ -237,6 +240,12 @@ static const struct twi_attr_s g_twi0attr =
   .twi     = 0,
   .pid     = SAM_PID_TWIHS0,
   .irq     = SAM_IRQ_TWIHS0,
+  .glitchfltr = CONFIG_SAMV7_TWIHS0_GLITCH_FILTER,
+#ifdef CONFIG_SAMV7_TWIHS0_SINGLE_MASTER
+  .s_master = 1,
+#else
+  .s_master = 0,
+#endif
   .sclcfg  = GPIO_TWIHS0_CK,
   .sdacfg  = GPIO_TWIHS0_D,
   .base    = SAM_TWIHS0_BASE,
@@ -252,6 +261,12 @@ static const struct twi_attr_s g_twi1attr =
   .twi     = 1,
   .pid     = SAM_PID_TWIHS1,
   .irq     = SAM_IRQ_TWIHS1,
+  .glitchfltr = CONFIG_SAMV7_TWIHS1_GLITCH_FILTER,
+#ifdef CONFIG_SAMV7_TWIHS1_SINGLE_MASTER
+  .s_master = 1,
+#else
+  .s_master = 0,
+#endif
   .sclcfg  = GPIO_TWIHS1_CK,
   .sdacfg  = GPIO_TWIHS1_D,
   .base    = SAM_TWIHS1_BASE,
@@ -267,6 +282,12 @@ static const struct twi_attr_s g_twi2attr =
   .twi     = 2,
   .pid     = SAM_PID_TWIHS2,
   .irq     = SAM_IRQ_TWIHS2,
+  .glitchfltr = CONFIG_SAMV7_TWIHS2_GLITCH_FILTER,
+#ifdef CONFIG_SAMV7_TWIHS0_SINGLE_MASTER
+  .s_master = 1,
+#else
+  .s_master = 0,
+#endif
   .sclcfg  = GPIO_TWIHS2_CK,
   .sdacfg  = GPIO_TWIHS2_D,
   .base    = SAM_TWIHS2_BASE,
@@ -312,7 +333,7 @@ static void twi_takesem(sem_t *sem)
        * awakened by a signal.
        */
 
-      ASSERT(errno == EINTR);
+      DEBUGASSERT(errno == EINTR);
     }
 }
 
@@ -494,6 +515,24 @@ static int twi_wait(struct twi_dev_s *priv, unsigned int size)
    * all further interrupts for the TWIHS have been disabled.
    */
 
+  /* Check if an Arbitration Lost has occured */
+
+  if (priv->result == -EUSERS)
+    {
+      /* Something bad happened on the bus so force a reset */
+
+      priv->result = twi_reset_internal(&priv->dev);
+
+      /* Although the reset was successful tell the higher driver that it's
+       * transfer has failed and should be repeated.
+       */
+
+     if (priv->result == OK)
+       {
+          priv->result = -EIO;
+       }
+    }
+
   return priv->result;
 }
 
@@ -607,6 +646,20 @@ static int twi_interrupt(struct twi_dev_s *priv)
         }
     }
 
+  /* If Single-Master Mode is enabled and we lost arbitration (someone else or
+   * an EMC-Pulse did something on the bus) something went very wrong. So we end
+   * the current transfer with an EUSERS. The wait function will then reset
+   * the bus so further communication can take place.
+   */
+
+  else if ((priv->attr->s_master) && ((pending & TWIHS_INT_ARBLST) != 0))
+    {
+      /* Wake up the thread with an Arbitration Lost error indication */
+
+      i2cllerr("ERROR: TWIHS%d Arbitration Lost\n");
+      twi_wakeup(priv, -EUSERS);
+    }
+
   /* Check for errors.  We must check for errors *before* checking TXRDY or
    * TXCMP because the error can be signaled in combination with TXRDY or
    * TXCOMP.
@@ -856,6 +909,7 @@ static int twi_transfer(FAR struct i2c_master_s *dev,
   struct twi_dev_s *priv = (struct twi_dev_s *)dev;
   irqstate_t flags;
   unsigned int size;
+  uint32_t sr;
   int i;
   int ret;
 
@@ -891,6 +945,22 @@ static int twi_transfer(FAR struct i2c_master_s *dev,
 
   twi_setfrequency(priv, msgs->frequency);
 
+  /* When we are in Single Master Mode check if the bus is ready (no stuck
+   * DATA or CLK line).
+   * Otherwise initiate a bus reset.
+   */
+
+  if (priv->attr->s_master)
+    {
+      sr = twi_getrel(priv, SAM_TWIHS_SR_OFFSET);
+      if (((sr & TWIHS_INT_SDA) == 0) || ((sr & TWIHS_INT_SCL) == 0))
+        {
+          ret = twi_reset_internal(&priv->dev);
+          if (ret != OK)
+            goto errout;
+        }
+    }
+
   /* Initiate the transfer.  The rest will be handled from interrupt
    * logic.  Interrupts must be disabled to prevent re-entrance from the
    * interrupt level.
@@ -904,46 +974,46 @@ static int twi_transfer(FAR struct i2c_master_s *dev,
    */
 
   ret = twi_wait(priv, size);
+  leave_critical_section(flags);
+
+errout:
   if (ret < 0)
     {
       i2cerr("ERROR: Transfer failed: %d\n", ret);
     }
 
-  leave_critical_section(flags);
   twi_givesem(&priv->exclsem);
   return ret;
 }
 
 /************************************************************************************
- * Name: twi_reset
- *
- * Description:
- *   Perform an I2C bus reset in an attempt to break loose stuck I2C devices.
- *
- * Input Parameters:
- *   dev   - Device-specific state data
- *
- * Returned Value:
- *   Zero (OK) on success; a negated errno value on failure.
- *
- ************************************************************************************/
+* Name: twi_reset_internal
+*
+* Description:
+*   Perform an I2C bus reset in an attempt to break loose stuck I2C devices.
+*   This function can be called from inside the driver while the TWIHS device is
+*   already locked, so we must not handle any semapores inside.
+*   To initiate a bus reset from outside the driver use twi_reset(dev).
+*
+* Input Parameters:
+*   dev   - Device-specific state data
+*
+* Returned Value:
+*   Zero (OK) on success; a negated errno value on failure.
+*
+************************************************************************************/
 
 #ifdef CONFIG_I2C_RESET
-static int twi_reset(FAR struct i2c_master_s *dev)
+static int twi_reset_internal(FAR struct i2c_master_s *dev)
 {
   struct twi_dev_s *priv = (struct twi_dev_s *)dev;
   unsigned int clockcnt;
   unsigned int stretchcnt;
   uint32_t sclpin;
   uint32_t sdapin;
+  uint8_t wait_us;
   int ret;
 
-  ASSERT(priv);
-
-  /* Get exclusive access to the TWIHS device */
-
-  twi_takesem(&priv->exclsem);
-
   /* Disable TWIHS interrupts */
 
   up_disable_irq(priv->attr->irq);
@@ -960,28 +1030,31 @@ static int twi_reset(FAR struct i2c_master_s *dev)
   sam_configgpio(sclpin);
   sam_configgpio(sdapin);
 
-  /* Peripheral clocking must be enabled in order to read valid data from
-   * the output pin (clocking is enabled automatically for pins configured
-   * as inputs).
-   */
-
-  sam_pio_forceclk(sclpin, true);
-  sam_pio_forceclk(sdapin, true);
-
   /* Clock the bus until any slaves currently driving it low let it float.
    * Reading from the output will return the actual sensed level on the
    * SDA pin (not the level that we wrote).
    */
 
+  /* Set the wait-time according to the TWI-Bus-Frequency */
+
+  if (priv->frequency >= 330000)
+    {
+      wait_us = 3;
+    }
+  else
+    {
+      wait_us = 10;
+    }
+
   clockcnt = 0;
-  while (sam_pioread(sdapin) == false)
+  while (sam_gpioread(sdapin) == false)
     {
       /* Give up if we have tried too hard */
 
       if (clockcnt++ > 10)
         {
           ret = -ETIMEDOUT;
-          goto errout_with_lock;
+          goto errout;
         }
 
       /* Sniff to make sure that clock stretching has finished.  SCL should
@@ -991,55 +1064,85 @@ static int twi_reset(FAR struct i2c_master_s *dev)
        */
 
       stretchcnt = 0;
-      while (sam_pioread(sclpin) == false)
+      while (sam_gpioread(sclpin) == false)
         {
           /* Give up if we have tried too hard */
 
           if (stretchcnt++ > 10)
             {
               ret = -EAGAIN;
-              goto errout_with_lock;
+              goto errout;
             }
 
-          up_udelay(10);
+          up_udelay(wait_us);
         }
 
       /* Drive SCL low */
 
-      sam_piowrite(sclpin, false);
-      up_udelay(10);
+      sam_gpiowrite(sclpin, false);
+      up_udelay(wait_us);
 
       /* Drive SCL high (floating) again */
 
-      sam_piowrite(sclpin, true);
-      up_udelay(10);
+      sam_gpiowrite(sclpin, true);
+      up_udelay(wait_us);
     }
 
   /* Generate a start followed by a stop to reset slave
    * state machines.
    */
 
-  sam_piowrite(sdapin, false);
-  up_udelay(10);
-  sam_piowrite(sclpin, false);
-  up_udelay(10);
-
-  sam_piowrite(sclpin, true);
-  up_udelay(10);
-  sam_piowrite(sdapin, true);
-  up_udelay(10);
+  sam_gpiowrite(sdapin, false);
+  up_udelay(wait_us);
+  sam_gpiowrite(sclpin, false);
+  up_udelay(wait_us);
 
-  /* Clocking is no longer forced */
-
-  sam_pio_forceclk(sclpin, false);
-  sam_pio_forceclk(sdapin, false);
+  sam_gpiowrite(sclpin, true);
+  up_udelay(wait_us);
+  sam_gpiowrite(sdapin, true);
+  up_udelay(wait_us);
 
   /* Re-initialize the port hardware */
 
   twi_hw_initialize(priv, priv->frequency);
   ret = OK;
 
-errout_with_lock:
+errout:
+  return ret;
+}
+#endif /* CONFIG_I2C_RESET */
+
+/************************************************************************************
+ * Name: twi_reset
+ *
+ * Description:
+ *   Perform an I2C bus reset in an attempt to break loose stuck I2C devices.
+ *   This function can be called from outside the driver, so lock the TWIHS Device
+ *   and then let the internal reset function do the work.
+ *
+ * Input Parameters:
+ *   dev   - Device-specific state data
+ *
+ * Returned Value:
+ *   Zero (OK) on success; a negated errno value on failure.
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_I2C_RESET
+static int twi_reset(FAR struct i2c_master_s *dev)
+{
+  struct twi_dev_s *priv = (struct twi_dev_s *)dev;
+  int ret;
+
+  DEBUGASSERT(priv != NULL);
+
+  /* Get exclusive access to the TWIHS device */
+
+  twi_takesem(&priv->exclsem);
+
+  /* Do the reset-procedure */
+
+  ret = twi_reset_internal(dev);
 
   /* Release our lock on the bus */
 
@@ -1217,6 +1320,19 @@ static void twi_hw_initialize(struct twi_dev_s *priv, uint32_t frequency)
   regval |= PMC_PCR_PID(priv->attr->pid) | PMC_PCR_CMD | PMC_PCR_EN;
   twi_putabs(priv, SAM_PMC_PCR, regval);
 
+  /* Set the TWIHS Input Filters */
+
+  if (priv->attr->glitchfltr)
+    {
+      regval = TWIHS_FILTR_FILT | TWIHS_FILTR_THRES(priv->attr->glitchfltr);
+    }
+  else
+    {
+      regval = 0;
+    }
+
+  twi_putrel(priv, SAM_TWIHS_FILTR_OFFSET, regval);
+
   /* Set the initial TWIHS data transfer frequency */
 
   priv->frequency  = 0;
-- 
GitLab


From fc8dfbd45ad1dfd16751476d83b0f1c79762d17b Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Fri, 24 Jun 2016 11:00:27 -0600
Subject: [PATCH 041/229] Update ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index 10c9ed34b6..226425ca8f 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -12117,3 +12117,57 @@
 	  (2016-06-21).
 	* drivers/syslog: Extend SYSLOG logic so that we can send SYSLOG output
 	  to a file.  Not verified on initial commit  (2016-06-21).
+	* arch/arm/src/stm32l4: Add some CAN mode IOCTL calls.  These will be
+	  useful for device autotest when the application boots.  They are
+	  redundant with the CONFIG_CAN_LOOPBACK option, which can now just be
+	  interpreted as a default setting.  From Sebastien Lorquet (2016-06-22).
+	* drivers/syslog: syslog_dev_flush() needs to check if the inode is a
+	  mountpoint before calling the flush() method.  Noted by David Sidrane
+	  (2016-06-22).
+	* arch/arm/src/stm32f7: Adds SDMMC1 for stm32F7 74-75.  From Lok Tep
+	  (2016-06-22).
+	* drivers/syslog: SYSLOG character device channel will now expand LF to
+	  CR-LF.  Controllable with a configuration option (2016-06-22).
+	* arch/arm/src/stm32l4: Implementation of loopback IOCTLs.  From
+	  Sebastien Lorquet (2016-06-22).
+	* Documentation: Add SYSLOG documentation to the porting guide
+	  (2016-06-22).
+	* configs/stm32f746g-disco:  Removed knsh configuration it failed to
+	  refresh (via tools/refresh.sh).  I assume that it is a hand-edited
+	  configuration and, hence, must be removed from the repository
+	  (2016-06-23).
+	* arch/arm/arc/sam34: DAC bugfix: DACC_WPMR_WPKEY_MASK -> DACC_WPMR_WPKEY. 
+	  Timer bugfix:  Fix ops check in TCIOC_STOP.  From Wolfgang Reissnegge
+	  (2016-06-23).
+	* arch/arm/src/stm32: Port STM32L4 CAN IOCTLs to STM32.  From Sebastien
+	  Lorquet (2016-06-24).
+	* configs/Konfig:Add configuration logic to include a Kconfig file in
+	  each custom configuration.  Includes adding a dummy custom board
+	  configuration directory.  A consequence of this that each custom board
+	  directory will now need to contain a Kconfig file.  NOTE also that
+	  the new board directory does not take effect in the configuration
+	  menus until the NEXT time you run 'make menuconfig' (2016-06-24).
+	* drivers/ioexpander:  Add support for a very simple GPIO driver.  It
+	  supports only pre-conrigured input and output pins and only basic
+	  input and output operations (2016-06-24).
+	* arch/arm/src/lpc43xx:  Correct auto-negotiation mode in the LPC43xx
+	  Ethernet.  From Alexander Vasiljev (2016-06-24)
+	* arch/arm/src/samv7: TWIHS Driver improved and GPIO-Driver fixed for
+	  Open-Drain Pins
+	  - sam_gpioread: Now the actual line level from the pin is read back.
+	    This is extremely important for Open-Drain Pins, which can be used
+	    bidirectionally
+	  - Re-Implemented twi_reset-function and enhanced it so it can be
+	    called from inside the driver (see next point)
+	  - Glitch-Filter: Added a configuration option to enable the twi-built-
+	    in glitch filter
+	  - Added a "Single Master Mode": In EMC Testing the TWI-Bus got stuck
+	    because the TWI-Master detected a Multi-Master access (but there is
+	    no second master). With the option "Single Master" we detect these
+	    events and automatically trigger a twi_reset. We also do an
+	    automatic recovery if a slave got stuck (SDA stays low).
+	  With the above changes I²C-Bus reliability in harsh environments (eg.
+	  EMC) is greatly improved. The small change in the GPIO-Driver was
+	  necessary because otherwise you cannot read back the correct line
+	  status of Open-Drain Outputs and this is needed by the twi_reset
+	  function.  From Michael Spahlinger (2016-06-24)
-- 
GitLab


From 20708c7c5e8b1bad06cf26da5e41e1246aea2467 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Fri, 24 Jun 2016 11:32:24 -0600
Subject: [PATCH 042/229] GPIO driver: Fix inconsistency in naming; beef up a
 debug assertion.

---
 drivers/ioexpander/gpio.c       |  8 ++++----
 include/nuttx/ioexpander/gpio.h | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/ioexpander/gpio.c b/drivers/ioexpander/gpio.c
index 2d5ffa9b35..d7f1e966fa 100644
--- a/drivers/ioexpander/gpio.c
+++ b/drivers/ioexpander/gpio.c
@@ -183,7 +183,7 @@ static int gpio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
    */
 
   case GPIO_WRITE:
-    if (dev->output)
+    if (dev->gp_output)
       {
         FAR struct gpio_output_dev_s *outdev =
           (FAR struct gpio_output_dev_s *)dev;
@@ -204,7 +204,7 @@ static int gpio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
    */
 
   case GPIO_READ:
-    if (dev->output)
+    if (dev->gp_output)
       {
         FAR struct gpio_output_dev_s *outdev =
           (FAR struct gpio_output_dev_s *)dev;
@@ -242,7 +242,7 @@ int gpio_input_register(FAR struct gpio_input_dev_s *dev, int minor)
 {
   char devname[16];
 
-  DEBUGASSERT((unsigned int)minor < 100);
+  DEBUGASSERT(dev != NULL && !dev->output && (unsigned int)minor < 100);
   snprintf(devname, 16, "/dev/gpin%u", (unsigned int)minor);
 
   return register_driver(devname, &g_gpio_input_ops, 0444, dev);
@@ -260,7 +260,7 @@ int gpio_output_register(FAR struct gpio_output_dev_s *dev, int minor)
 {
   char devname[16];
 
-  DEBUGASSERT((unsigned int)minor < 100);
+  DEBUGASSERT(dev != NULL && dev->output && (unsigned int)minor < 100);
   snprintf(devname, 16, "/dev/gpout%u", (unsigned int)minor);
 
   return register_driver(devname, &g_gpio_output_ops, 0222, dev);
diff --git a/include/nuttx/ioexpander/gpio.h b/include/nuttx/ioexpander/gpio.h
index 5d6e791746..1e5ae50cc7 100644
--- a/include/nuttx/ioexpander/gpio.h
+++ b/include/nuttx/ioexpander/gpio.h
@@ -70,16 +70,16 @@
 
 struct gpio_common_dev_s
 {
-  bool output;
-  uint8_t unused[3];
+  bool gp_output;
+  uint8_t gp_unused[3];
 };
 
 /* The interface to a GPIO input pin */
 
 struct gpio_input_dev_s
 {
-  bool output;
-  uint8_t unused[3];
+  bool gpin_output;
+  uint8_t gpin_unused[3];
   CODE int (*gpin_read)(FAR struct gpio_input_dev_s *dev);
 };
 
@@ -87,8 +87,8 @@ struct gpio_input_dev_s
 
 struct gpio_output_dev_s
 {
-  bool output;
-  uint8_t unused[3];
+  bool gpout_output;
+  uint8_t gpout_unused[3];
   CODE int (*gpout_read)(FAR struct gpio_output_dev_s *dev);
   CODE int (*gpout_write)(FAR struct gpio_output_dev_s *dev, int value);
 };
-- 
GitLab


From db50f13511b254c116b248b1826e03ba77ad0c7b Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Fri, 24 Jun 2016 14:34:21 -0600
Subject: [PATCH 043/229] Correct some typos in DEBUGASSERT statements

---
 drivers/ioexpander/gpio.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/ioexpander/gpio.c b/drivers/ioexpander/gpio.c
index d7f1e966fa..882c2b4644 100644
--- a/drivers/ioexpander/gpio.c
+++ b/drivers/ioexpander/gpio.c
@@ -188,7 +188,8 @@ static int gpio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
         FAR struct gpio_output_dev_s *outdev =
           (FAR struct gpio_output_dev_s *)dev;
 
-        DEBUGASSERT(outdev->gpout_write != NULL);
+        DEBUGASSERT(outdev->gpout_write != NULL &&
+                    ((arg == 0UL) || (arg == 1UL)));
         ret = outdev->gpout_write(outdev, (int)arg);
       }
     else
@@ -242,9 +243,10 @@ int gpio_input_register(FAR struct gpio_input_dev_s *dev, int minor)
 {
   char devname[16];
 
-  DEBUGASSERT(dev != NULL && !dev->output && (unsigned int)minor < 100);
-  snprintf(devname, 16, "/dev/gpin%u", (unsigned int)minor);
+  DEBUGASSERT(dev != NULL && !dev->gpin_output && dev->gpin_read != NULL &&
+              (unsigned int)minor < 100);
 
+  snprintf(devname, 16, "/dev/gpin%u", (unsigned int)minor);
   return register_driver(devname, &g_gpio_input_ops, 0444, dev);
 }
 
@@ -260,9 +262,10 @@ int gpio_output_register(FAR struct gpio_output_dev_s *dev, int minor)
 {
   char devname[16];
 
-  DEBUGASSERT(dev != NULL && dev->output && (unsigned int)minor < 100);
-  snprintf(devname, 16, "/dev/gpout%u", (unsigned int)minor);
+  DEBUGASSERT(dev != NULL && dev->gpout_output && dev->gpout_read != NULL &&
+              dev->gpout_write != NULL &&(unsigned int)minor < 100);
 
+  snprintf(devname, 16, "/dev/gpout%u", (unsigned int)minor);
   return register_driver(devname, &g_gpio_output_ops, 0222, dev);
 }
 
-- 
GitLab


From 201977fa051e8f67429b8174c1766c13daf53fd0 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Fri, 24 Jun 2016 16:27:11 -0600
Subject: [PATCH 044/229] Refresh all PIC32 configurations

---
 configs/mirtoo/nsh/defconfig              | 10 +++++++++-
 configs/mirtoo/nxffs/defconfig            | 10 +++++++++-
 configs/pcblogic-pic32mx/nsh/defconfig    | 10 +++++++++-
 configs/pic32mx-starterkit/nsh/defconfig  | 12 ++++++++++--
 configs/pic32mx-starterkit/nsh2/defconfig | 12 ++++++++++--
 configs/pic32mx7mmb/nsh/defconfig         | 14 +++++++++++---
 configs/pic32mz-starterkit/nsh/defconfig  | 12 ++++++++++--
 configs/sure-pic32mx/nsh/defconfig        | 10 +++++++++-
 configs/sure-pic32mx/usbnsh/defconfig     | 10 +++++++++-
 configs/ubw32/nsh/defconfig               | 12 ++++++++++--
 10 files changed, 96 insertions(+), 16 deletions(-)

diff --git a/configs/mirtoo/nsh/defconfig b/configs/mirtoo/nsh/defconfig
index 924327ea7b..578532c82c 100644
--- a/configs/mirtoo/nsh/defconfig
+++ b/configs/mirtoo/nsh/defconfig
@@ -319,6 +319,8 @@ CONFIG_RAM_SIZE=32768
 #
 CONFIG_ARCH_BOARD_MIRTOO=y
 # CONFIG_ARCH_BOARD_CUSTOM is not set
+CONFIG_ARCH_BOARD_CUSTOM_DIR="configs/dummy"
+CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD="mirtoo"
 
 #
@@ -326,12 +328,12 @@ CONFIG_ARCH_BOARD="mirtoo"
 #
 CONFIG_ARCH_HAVE_LEDS=y
 CONFIG_ARCH_LEDS=y
-CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Board-Specific Options
 #
 CONFIG_MIRTOO_RELEASE=2
+# CONFIG_BOARD_CRASHDUMP is not set
 # CONFIG_LIB_BOARDCTL is not set
 
 #
@@ -470,7 +472,12 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
 
 #
 # LCD Driver Support
@@ -833,6 +840,7 @@ CONFIG_NSH_DISABLE_UNAME=y
 # CONFIG_NSH_DISABLE_USLEEP is not set
 CONFIG_NSH_DISABLE_WGET=y
 CONFIG_NSH_DISABLE_XD=y
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Configure Command Options
diff --git a/configs/mirtoo/nxffs/defconfig b/configs/mirtoo/nxffs/defconfig
index 2f82da56da..0531feb699 100644
--- a/configs/mirtoo/nxffs/defconfig
+++ b/configs/mirtoo/nxffs/defconfig
@@ -324,6 +324,8 @@ CONFIG_RAM_SIZE=32768
 #
 CONFIG_ARCH_BOARD_MIRTOO=y
 # CONFIG_ARCH_BOARD_CUSTOM is not set
+CONFIG_ARCH_BOARD_CUSTOM_DIR="configs/dummy"
+CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD="mirtoo"
 
 #
@@ -331,12 +333,12 @@ CONFIG_ARCH_BOARD="mirtoo"
 #
 CONFIG_ARCH_HAVE_LEDS=y
 CONFIG_ARCH_LEDS=y
-CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Board-Specific Options
 #
 CONFIG_MIRTOO_RELEASE=2
+# CONFIG_BOARD_CRASHDUMP is not set
 CONFIG_LIB_BOARDCTL=y
 # CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
@@ -477,7 +479,12 @@ CONFIG_SPI=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
 
 #
 # LCD Driver Support
@@ -899,6 +906,7 @@ CONFIG_NSH_DISABLE_UNAME=y
 # CONFIG_NSH_DISABLE_USLEEP is not set
 CONFIG_NSH_DISABLE_WGET=y
 # CONFIG_NSH_DISABLE_XD is not set
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Configure Command Options
diff --git a/configs/pcblogic-pic32mx/nsh/defconfig b/configs/pcblogic-pic32mx/nsh/defconfig
index 0d6bffa7a9..4f23559c87 100644
--- a/configs/pcblogic-pic32mx/nsh/defconfig
+++ b/configs/pcblogic-pic32mx/nsh/defconfig
@@ -319,16 +319,18 @@ CONFIG_RAM_SIZE=32768
 CONFIG_ARCH_BOARD_PCBLOGICPIC32MX=y
 # CONFIG_ARCH_BOARD_UBW32 is not set
 # CONFIG_ARCH_BOARD_CUSTOM is not set
+CONFIG_ARCH_BOARD_CUSTOM_DIR="configs/dummy"
+CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD="pcblogic-pic32mx"
 
 #
 # Common Board Options
 #
-CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Board-Specific Options
 #
+# CONFIG_BOARD_CRASHDUMP is not set
 # CONFIG_LIB_BOARDCTL is not set
 
 #
@@ -467,7 +469,12 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
 
 #
 # LCD Driver Support
@@ -846,6 +853,7 @@ CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Configure Command Options
diff --git a/configs/pic32mx-starterkit/nsh/defconfig b/configs/pic32mx-starterkit/nsh/defconfig
index 1586dd3bd3..2c2994b8f6 100644
--- a/configs/pic32mx-starterkit/nsh/defconfig
+++ b/configs/pic32mx-starterkit/nsh/defconfig
@@ -319,6 +319,8 @@ CONFIG_RAM_SIZE=131072
 CONFIG_ARCH_BOARD_PIC32MX_STARTERKIT=y
 # CONFIG_ARCH_BOARD_PIC32MX7MMB is not set
 # CONFIG_ARCH_BOARD_CUSTOM is not set
+CONFIG_ARCH_BOARD_CUSTOM_DIR="configs/dummy"
+CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD="pic32mx-starterkit"
 
 #
@@ -326,12 +328,11 @@ CONFIG_ARCH_BOARD="pic32mx-starterkit"
 #
 CONFIG_ARCH_HAVE_LEDS=y
 CONFIG_ARCH_LEDS=y
-CONFIG_NSH_MMCSDMINOR=0
-CONFIG_NSH_MMCSDSLOTNO=0
 
 #
 # Board-Specific Options
 #
+# CONFIG_BOARD_CRASHDUMP is not set
 CONFIG_LIB_BOARDCTL=y
 # CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
@@ -476,7 +477,12 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
 
 #
 # LCD Driver Support
@@ -909,6 +915,8 @@ CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
+CONFIG_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSLOTNO=0
 
 #
 # Configure Command Options
diff --git a/configs/pic32mx-starterkit/nsh2/defconfig b/configs/pic32mx-starterkit/nsh2/defconfig
index d10280cc5c..fb7a8299c9 100644
--- a/configs/pic32mx-starterkit/nsh2/defconfig
+++ b/configs/pic32mx-starterkit/nsh2/defconfig
@@ -329,6 +329,8 @@ CONFIG_RAM_SIZE=131072
 CONFIG_ARCH_BOARD_PIC32MX_STARTERKIT=y
 # CONFIG_ARCH_BOARD_PIC32MX7MMB is not set
 # CONFIG_ARCH_BOARD_CUSTOM is not set
+CONFIG_ARCH_BOARD_CUSTOM_DIR="configs/dummy"
+CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD="pic32mx-starterkit"
 
 #
@@ -336,12 +338,11 @@ CONFIG_ARCH_BOARD="pic32mx-starterkit"
 #
 CONFIG_ARCH_HAVE_LEDS=y
 CONFIG_ARCH_LEDS=y
-CONFIG_NSH_MMCSDMINOR=0
-CONFIG_NSH_MMCSDSLOTNO=0
 
 #
 # Board-Specific Options
 #
+# CONFIG_BOARD_CRASHDUMP is not set
 CONFIG_LIB_BOARDCTL=y
 # CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
@@ -486,7 +487,12 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
 
 #
 # LCD Driver Support
@@ -1092,6 +1098,8 @@ CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
+CONFIG_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSLOTNO=0
 
 #
 # Configure Command Options
diff --git a/configs/pic32mx7mmb/nsh/defconfig b/configs/pic32mx7mmb/nsh/defconfig
index 6812086dea..cf40beab3b 100644
--- a/configs/pic32mx7mmb/nsh/defconfig
+++ b/configs/pic32mx7mmb/nsh/defconfig
@@ -337,6 +337,8 @@ CONFIG_RAM_SIZE=131072
 # CONFIG_ARCH_BOARD_PIC32MX_STARTERKIT is not set
 CONFIG_ARCH_BOARD_PIC32MX7MMB=y
 # CONFIG_ARCH_BOARD_CUSTOM is not set
+CONFIG_ARCH_BOARD_CUSTOM_DIR="configs/dummy"
+CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD="pic32mx7mmb"
 
 #
@@ -344,13 +346,11 @@ CONFIG_ARCH_BOARD="pic32mx7mmb"
 #
 CONFIG_ARCH_HAVE_LEDS=y
 CONFIG_ARCH_LEDS=y
-CONFIG_NSH_MMCSDMINOR=0
-CONFIG_NSH_MMCSDSLOTNO=0
-CONFIG_NSH_MMCSDSPIPORTNO=1
 
 #
 # Board-Specific Options
 #
+# CONFIG_BOARD_CRASHDUMP is not set
 CONFIG_LIB_BOARDCTL=y
 # CONFIG_BOARDCTL_UNIQUEID is not set
 CONFIG_BOARDCTL_USBDEVCTRL=y
@@ -505,7 +505,12 @@ CONFIG_SPI=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
 
 #
 # LCD Driver Support
@@ -1155,6 +1160,9 @@ CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
+CONFIG_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
 
 #
 # Configure Command Options
diff --git a/configs/pic32mz-starterkit/nsh/defconfig b/configs/pic32mz-starterkit/nsh/defconfig
index 4c31a821ae..706ddbd17d 100644
--- a/configs/pic32mz-starterkit/nsh/defconfig
+++ b/configs/pic32mz-starterkit/nsh/defconfig
@@ -244,6 +244,8 @@ CONFIG_RAM_SIZE=131072
 #
 CONFIG_ARCH_BOARD_PIC32MZ_STARTERKIT=y
 # CONFIG_ARCH_BOARD_CUSTOM is not set
+CONFIG_ARCH_BOARD_CUSTOM_DIR="configs/dummy"
+CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD="pic32mz-starterkit"
 
 #
@@ -253,12 +255,11 @@ CONFIG_ARCH_HAVE_LEDS=y
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_HAVE_BUTTONS=y
 # CONFIG_ARCH_BUTTONS is not set
-CONFIG_NSH_MMCSDMINOR=0
-CONFIG_NSH_MMCSDSLOTNO=0
 
 #
 # Board-Specific Options
 #
+# CONFIG_BOARD_CRASHDUMP is not set
 CONFIG_LIB_BOARDCTL=y
 # CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
@@ -403,7 +404,12 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
 
 #
 # LCD Driver Support
@@ -836,6 +842,8 @@ CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
+CONFIG_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSLOTNO=0
 
 #
 # Configure Command Options
diff --git a/configs/sure-pic32mx/nsh/defconfig b/configs/sure-pic32mx/nsh/defconfig
index 8219ec829f..48a49bdb44 100644
--- a/configs/sure-pic32mx/nsh/defconfig
+++ b/configs/sure-pic32mx/nsh/defconfig
@@ -318,6 +318,8 @@ CONFIG_RAM_SIZE=32768
 #
 CONFIG_ARCH_BOARD_SUREPIC32MX=y
 # CONFIG_ARCH_BOARD_CUSTOM is not set
+CONFIG_ARCH_BOARD_CUSTOM_DIR="configs/dummy"
+CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD="sure-pic32mx"
 
 #
@@ -328,13 +330,13 @@ CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_HAVE_BUTTONS=y
 # CONFIG_ARCH_BUTTONS is not set
 CONFIG_ARCH_HAVE_IRQBUTTONS=y
-CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Board-Specific Options
 #
 CONFIG_ARCH_DBDP11215=y
 # CONFIG_ARCH_DBDP11212 is not set
+# CONFIG_BOARD_CRASHDUMP is not set
 CONFIG_LIB_BOARDCTL=y
 # CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
@@ -479,7 +481,12 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
 
 #
 # LCD Driver Support
@@ -860,6 +867,7 @@ CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Configure Command Options
diff --git a/configs/sure-pic32mx/usbnsh/defconfig b/configs/sure-pic32mx/usbnsh/defconfig
index 3bf95a7750..e37fa61f70 100644
--- a/configs/sure-pic32mx/usbnsh/defconfig
+++ b/configs/sure-pic32mx/usbnsh/defconfig
@@ -319,6 +319,8 @@ CONFIG_RAM_SIZE=32768
 #
 CONFIG_ARCH_BOARD_SUREPIC32MX=y
 # CONFIG_ARCH_BOARD_CUSTOM is not set
+CONFIG_ARCH_BOARD_CUSTOM_DIR="configs/dummy"
+CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD="sure-pic32mx"
 
 #
@@ -329,13 +331,13 @@ CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_HAVE_BUTTONS=y
 # CONFIG_ARCH_BUTTONS is not set
 CONFIG_ARCH_HAVE_IRQBUTTONS=y
-CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Board-Specific Options
 #
 CONFIG_ARCH_DBDP11215=y
 # CONFIG_ARCH_DBDP11212 is not set
+# CONFIG_BOARD_CRASHDUMP is not set
 CONFIG_LIB_BOARDCTL=y
 # CONFIG_BOARDCTL_UNIQUEID is not set
 CONFIG_BOARDCTL_USBDEVCTRL=y
@@ -481,7 +483,12 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
 
 #
 # LCD Driver Support
@@ -902,6 +909,7 @@ CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Configure Command Options
diff --git a/configs/ubw32/nsh/defconfig b/configs/ubw32/nsh/defconfig
index f30d05b118..3a39c3883f 100644
--- a/configs/ubw32/nsh/defconfig
+++ b/configs/ubw32/nsh/defconfig
@@ -319,6 +319,8 @@ CONFIG_RAM_SIZE=32768
 # CONFIG_ARCH_BOARD_PCBLOGICPIC32MX is not set
 CONFIG_ARCH_BOARD_UBW32=y
 # CONFIG_ARCH_BOARD_CUSTOM is not set
+CONFIG_ARCH_BOARD_CUSTOM_DIR="configs/dummy"
+CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y
 CONFIG_ARCH_BOARD="ubw32"
 
 #
@@ -329,12 +331,11 @@ CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_HAVE_BUTTONS=y
 # CONFIG_ARCH_BUTTONS is not set
 CONFIG_ARCH_HAVE_IRQBUTTONS=y
-CONFIG_NSH_MMCSDMINOR=0
-CONFIG_NSH_MMCSDSLOTNO=0
 
 #
 # Board-Specific Options
 #
+# CONFIG_BOARD_CRASHDUMP is not set
 CONFIG_LIB_BOARDCTL=y
 # CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
@@ -479,7 +480,12 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
 
 #
 # LCD Driver Support
@@ -881,6 +887,8 @@ CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
+CONFIG_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSLOTNO=0
 
 #
 # Configure Command Options
-- 
GitLab


From 39e7d5431f43872b1e35ec0584a00721c86c515d Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Fri, 24 Jun 2016 16:29:15 -0600
Subject: [PATCH 045/229] update gitignore

---
 arch/sim/include/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/sim/include/.gitignore b/arch/sim/include/.gitignore
index 12c22f4f28..e6460c4a67 100644
--- a/arch/sim/include/.gitignore
+++ b/arch/sim/include/.gitignore
@@ -1,2 +1,3 @@
 /board
+/chip
 
-- 
GitLab


From 6c762faa0f9fcb9b03247bd2f72a91acb2ebc7a2 Mon Sep 17 00:00:00 2001
From: ziggurat29 
Date: Fri, 24 Jun 2016 17:48:08 -0500
Subject: [PATCH 046/229] updated to reflect changes in debug output
 macros/fxns

---
 arch/arm/src/stm32l4/stm32l4_otgfsdev.c   | 24 +++++++++++------------
 configs/stm32l476vg-disco/src/stm32_usb.c |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/arch/arm/src/stm32l4/stm32l4_otgfsdev.c b/arch/arm/src/stm32l4/stm32l4_otgfsdev.c
index 155a6c209a..3ad74b74a1 100644
--- a/arch/arm/src/stm32l4/stm32l4_otgfsdev.c
+++ b/arch/arm/src/stm32l4/stm32l4_otgfsdev.c
@@ -1242,7 +1242,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",
+  uinfo("EP%d req=%p: len=%d xfrd=%d zlp=%d\n",
           privep->epphy, privreq, privreq->req.len,
           privreq->req.xfrd, privep->zlp);
 
@@ -1508,7 +1508,7 @@ static void stm32_epout_complete(FAR struct stm32_usbdev_s *priv,
       return;
     }
 
-  ullvdbg("EP%d: len=%d xfrd=%d\n",
+  uinfo("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
@@ -1543,7 +1543,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);
+  uinfo("EP0: bcnt=%d\n", bcnt);
   usbtrace(TRACE_READ(EP0), bcnt);
 
   /* Verify that an OUT SETUP request as received before this data was
@@ -1636,7 +1636,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);
+  uinfo("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 */
@@ -1720,7 +1720,7 @@ static void stm32_epout_request(FAR struct stm32_usbdev_s *priv,
               return;
             }
 
-          ullvdbg("EP%d: len=%d\n", privep->epphy, privreq->req.len);
+          uinfo("EP%d: len=%d\n", privep->epphy, privreq->req.len);
 
           /* Ignore any attempt to receive a zero length packet (this really
            * should not happen.
@@ -2514,7 +2514,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",
+  uinfo("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 */
@@ -2649,7 +2649,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);
+              uinfo("DOEPINT(%d) = %08x\n", epno, regval);
               stm32_putreg(0xFF, STM32_OTGFS_DOEPINT(epno));
             }
 
@@ -2879,7 +2879,7 @@ static inline void stm32_epin_interrupt(FAR struct stm32_usbdev_s *priv)
         {
           if ((daint & 1) != 0)
             {
-              ulldbg("DIEPINT(%d) = %08x\n",
+              uinfo("DIEPINT(%d) = %08x\n",
                      epno, stm32_getreg(STM32_OTGFS_DIEPINT(epno)));
               stm32_putreg(0xFF, STM32_OTGFS_DIEPINT(epno));
             }
@@ -3825,7 +3825,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;
         }
     }
@@ -3920,7 +3920,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;
         }
     }
@@ -4358,7 +4358,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);
+      uinfo("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
       return -EINVAL;
     }
 #endif
@@ -5470,7 +5470,7 @@ void up_usbinitialize(void)
   ret = irq_attach(STM32L4_IRQ_OTGFS, stm32_usbinterrupt);
   if (ret < 0)
     {
-      udbg("irq_attach failed\n", ret);
+      uerr("irq_attach failed\n", ret);
       goto errout;
     }
 
diff --git a/configs/stm32l476vg-disco/src/stm32_usb.c b/configs/stm32l476vg-disco/src/stm32_usb.c
index f1a2aa5f22..de9f08c4ee 100644
--- a/configs/stm32l476vg-disco/src/stm32_usb.c
+++ b/configs/stm32l476vg-disco/src/stm32_usb.c
@@ -329,7 +329,7 @@ xcpt_t stm32l4_setup_overcurrent(xcpt_t handler)
 #ifdef CONFIG_USBDEV
 void stm32l4_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ulldbg("resume: %d\n", resume);
+  uinfo("resume: %d\n", resume);
 }
 #endif
 
-- 
GitLab


From adf0e8d357acd305de962d13f7db830fce90ae64 Mon Sep 17 00:00:00 2001
From: David Sidrane 
Date: Thu, 23 Jun 2016 14:27:43 -1000
Subject: [PATCH 047/229] Clean up F7 SDMMC

---
 arch/arm/src/stm32f7/Kconfig                  |   84 ++
 arch/arm/src/stm32f7/chip/stm32_sdmmc.h       |    8 +-
 .../src/stm32f7/chip/stm32f74xx75xx_sdmmc.h   |  268 ----
 .../src/stm32f7/chip/stm32f74xx77xx_sdmmc.h   |  224 ++++
 arch/arm/src/stm32f7/stm32_sdmmc.c            | 1117 +++++++++++------
 arch/arm/src/stm32f7/stm32_sdmmc.h            |    4 +-
 6 files changed, 1043 insertions(+), 662 deletions(-)
 delete mode 100644 arch/arm/src/stm32f7/chip/stm32f74xx75xx_sdmmc.h
 create mode 100644 arch/arm/src/stm32f7/chip/stm32f74xx77xx_sdmmc.h

diff --git a/arch/arm/src/stm32f7/Kconfig b/arch/arm/src/stm32f7/Kconfig
index 0f2f65f84a..a93aaa598b 100644
--- a/arch/arm/src/stm32f7/Kconfig
+++ b/arch/arm/src/stm32f7/Kconfig
@@ -1215,12 +1215,16 @@ config STM32F7_SDMMC1
 	bool "SDMMC1"
 	default n
 	select ARCH_HAVE_SDIO
+	select ARCH_HAVE_SDIOWAIT_WRCOMPLETE
+	select SDIO_PREFLIGHT
 
 config STM32F7_SDMMC2
 	bool "SDMMC2"
 	default n
 	depends on STM32F7_HAVE_SDMMC2
 	select ARCH_HAVE_SDIO
+	select ARCH_HAVE_SDIOWAIT_WRCOMPLETE
+	select SDIO_PREFLIGHT
 
 config STM32F7_SPDIFRX
 	bool "SPDIFRX"
@@ -1710,6 +1714,86 @@ config STM32F7_I2C_DUTY16_9
 
 endmenu # "I2C Configuration"
 
+config STM32F7_SDMMC_XFRDEBUG
+	bool "SDMMC transfer debug"
+	depends on DEBUG_FS_INFO && (STM32F7_SDMMC1 || STM32F7_SDMMC2)
+	default n
+	---help---
+		Enable special debug instrumentation analyze SDMMC data transfers.
+		This logic is as non-invasive as possible:  It samples SDMMC
+		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 CONFIG_DEBUG_INFO.
+
+menu "SDMMC1 Configuration"
+	depends on STM32F7_SDMMC1
+
+config SDMMC1_DMA
+	bool "Support DMA data transfers on SDMMC1"
+	default y if STM32F7_DMA2
+	depends on STM32F7_DMA2
+	---help---
+		Support DMA data transfers on SDMMC1.  Requires STM32F7_SDMMC1 and config STM32F7_DMA2.
+
+config SDMMC1_PRI
+	hex "SDMMC1 interrupt priority"
+	default 128
+	depends on ARCH_IRQPRIO && EXPERIMENTAL
+	---help---
+		Select SDMMC1 interrupt priority.  Default: 128.
+
+config SDMMC1_DMAPRIO
+	hex "SDMMC1 DMA priority"
+	default 0x00010000
+	---help---
+		Select SDMMC1 DMA prority.
+
+		Options are: 0x00000000 low, 0x00010000 medium,
+		0x00020000 high, 0x00030000 very high.  Default: medium.
+
+config SDMMC1_WIDTH_D1_ONLY
+	bool "Use D1 only on SDMMC1"
+	default n
+	---help---
+		Select 1-bit transfer mode.  Default: 4-bit transfer mode.
+
+endmenu # "SDMMC1 Configuration"
+
+menu "SDMMC2 Configuration"
+	depends on STM32F7_SDMMC2
+
+config SDMMC2_DMA
+	bool "Support DMA data transfers on SDMMC2"
+	default y if STM32F7_DMA2
+	depends on STM32F7_DMA2
+	---help---
+		Support DMA data transfers on SDMMC2.  Requires STM32F7_SDMMC2 and config STM32F7_DMA2.
+
+config SDMMC2_PRI
+	hex "SDMMC2 interrupt priority"
+	default 128
+	depends on ARCH_IRQPRIO && EXPERIMENTAL
+	---help---
+		Select SDMMC2 interrupt priority.  Default: 128.
+
+config SDMMC2_DMAPRIO
+	hex "SDMMC2 DMA priority"
+	default 0x00010000
+	---help---
+		Select SDMMC1 DMA prority.
+
+		Options are: 0x00000000 low, 0x00010000 medium,
+		0x00020000 high, 0x00030000 very high.  Default: medium.
+
+config SDMMC2_WIDTH_D1_ONLY
+	bool "Use D1 only on SDMMC2"
+	default n
+	---help---
+		Select 1-bit transfer mode.  Default: 4-bit transfer mode.
+
+endmenu # "SDMMC2 Configuration"
+
 config STM32F7_CUSTOM_CLOCKCONFIG
 		bool "Custom clock configuration"
 	default n
diff --git a/arch/arm/src/stm32f7/chip/stm32_sdmmc.h b/arch/arm/src/stm32f7/chip/stm32_sdmmc.h
index 10ed29f238..016ddb18fb 100644
--- a/arch/arm/src/stm32f7/chip/stm32_sdmmc.h
+++ b/arch/arm/src/stm32f7/chip/stm32_sdmmc.h
@@ -2,7 +2,8 @@
  * arch/arm/src/stm32f7/chip/stm32_sdmmc.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
@@ -43,8 +44,9 @@
 #include 
 #include "chip.h"
 
-#if defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX)
-#  include "stm32f74xx75xx_sdmmc.h"
+#if defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX) || \
+    defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
+#  include "stm32f74xx77xx_sdmmc.h"
 #else
 #  error "Unsupported STM32 F7 part"
 #endif
diff --git a/arch/arm/src/stm32f7/chip/stm32f74xx75xx_sdmmc.h b/arch/arm/src/stm32f7/chip/stm32f74xx75xx_sdmmc.h
deleted file mode 100644
index 117c4da2fa..0000000000
--- a/arch/arm/src/stm32f7/chip/stm32f74xx75xx_sdmmc.h
+++ /dev/null
@@ -1,268 +0,0 @@
-/************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_sdmmc.h
- *
- *   Copyright (C) 2009, 2011-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.
- *
- ************************************************************************************/
-
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XX_SDMMC_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XX_SDMMC_H
-
-/************************************************************************************
- * Pre-processor Definitions
- ************************************************************************************/
-
-/* Register Offsets *****************************************************************/
-
-#define STM32_SDMMC1_POWER_OFFSET   0x0000 /* SDIO power control register */
-#define STM32_SDMMC1_CLKCR_OFFSET   0x0004 /* SDI clock control register */
-#define STM32_SDMMC1_ARG_OFFSET     0x0008 /* SDIO argument register */
-#define STM32_SDMMC1_CMD_OFFSET     0x000c /* SDIO command register */
-#define STM32_SDMMC1_RESPCMD_OFFSET 0x0010 /* SDIO command response register */
-#define STM32_SDMMC1_RESP_OFFSET(n) (0x0010+4*(n))
-#define STM32_SDMMC1_RESP1_OFFSET   0x0014 /* SDIO response 1 register */
-#define STM32_SDMMC1_RESP2_OFFSET   0x0018 /* SDIO response 2 register */
-#define STM32_SDMMC1_RESP3_OFFSET   0x001c /* SDIO response 3 register */
-#define STM32_SDMMC1_RESP4_OFFSET   0x0020 /* SDIO response 4 register */
-#define STM32_SDMMC1_DTIMER_OFFSET  0x0024 /* SDIO data timer register */
-#define STM32_SDMMC1_DLEN_OFFSET    0x0028 /* SDIO data length register */
-#define STM32_SDMMC1_DCTRL_OFFSET   0x002c /* SDIO data control register */
-#define STM32_SDMMC1_DCOUNT_OFFSET  0x0030 /* SDIO data counter register */
-#define STM32_SDMMC1_STA_OFFSET     0x0034 /* SDIO status register */
-#define STM32_SDMMC1_ICR_OFFSET     0x0038 /* SDIO interrupt clear register */
-#define STM32_SDMMC1_MASK_OFFSET    0x003c /* SDIO mask register */
-#define STM32_SDMMC1_FIFOCNT_OFFSET 0x0048 /* SDIO FIFO counter register */
-#define STM32_SDMMC1_FIFO_OFFSET    0x0080 /* SDIO data FIFO register */
-
-/* Register Addresses ***************************************************************/
-
-#define STM32_SDMMC1_POWER          (STM32_SDMMC1_BASE+STM32_SDMMC1_POWER_OFFSET)
-#define STM32_SDMMC1_CLKCR          (STM32_SDMMC1_BASE+STM32_SDMMC1_CLKCR_OFFSET)
-#define STM32_SDMMC1_ARG            (STM32_SDMMC1_BASE+STM32_SDMMC1_ARG_OFFSET)
-#define STM32_SDMMC1_CMD            (STM32_SDMMC1_BASE+STM32_SDMMC1_CMD_OFFSET)
-#define STM32_SDMMC1_RESPCMD        (STM32_SDMMC1_BASE+STM32_SDMMC1_RESPCMD_OFFSET)
-#define STM32_SDMMC1_RESP(n)        (STM32_SDMMC1_BASE+STM32_SDMMC1_RESP_OFFSET(n))
-#define STM32_SDMMC1_RESP1          (STM32_SDMMC1_BASE+STM32_SDMMC1_RESP1_OFFSET)
-#define STM32_SDMMC1_RESP2          (STM32_SDMMC1_BASE+STM32_SDMMC1_RESP2_OFFSET)
-#define STM32_SDMMC1_RESP3          (STM32_SDMMC1_BASE+STM32_SDMMC1_RESP3_OFFSET)
-#define STM32_SDMMC1_RESP4          (STM32_SDMMC1_BASE+STM32_SDMMC1_RESP4_OFFSET)
-#define STM32_SDMMC1_DTIMER         (STM32_SDMMC1_BASE+STM32_SDMMC1_DTIMER_OFFSET)
-#define STM32_SDMMC1_DLEN           (STM32_SDMMC1_BASE+STM32_SDMMC1_DLEN_OFFSET)
-#define STM32_SDMMC1_DCTRL          (STM32_SDMMC1_BASE+STM32_SDMMC1_DCTRL_OFFSET)
-#define STM32_SDMMC1_DCOUNT         (STM32_SDMMC1_BASE+STM32_SDMMC1_DCOUNT_OFFSET)
-#define STM32_SDMMC1_STA            (STM32_SDMMC1_BASE+STM32_SDMMC1_STA_OFFSET)
-#define STM32_SDMMC1_ICR            (STM32_SDMMC1_BASE+STM32_SDMMC1_ICR_OFFSET)
-#define STM32_SDMMC1_MASK           (STM32_SDMMC1_BASE+STM32_SDMMC1_MASK_OFFSET)
-#define STM32_SDMMC1_FIFOCNT        (STM32_SDMMC1_BASE+STM32_SDMMC1_FIFOCNT_OFFSET)
-#define STM32_SDMMC1_FIFO           (STM32_SDMMC1_BASE+STM32_SDMMC1_FIFO_OFFSET)
-
-
-/* Register Bitfield Definitions ****************************************************/
-
-#define SDIO_POWER_PWRCTRL_SHIFT       (0)       /* Bits 0-1: Power supply control bits */
-#define SDIO_POWER_PWRCTRL_MASK        (3 << SDIO_POWER_PWRCTRL_SHIFT)
-#  define SDIO_POWER_PWRCTRL_OFF       (0 << SDIO_POWER_PWRCTRL_SHIFT) /* 00: Power-off: card clock stopped */
-#  define SDIO_POWER_PWRCTRL_PWRUP     (2 << SDIO_POWER_PWRCTRL_SHIFT) /* 10: Reserved power-up */
-#  define SDIO_POWER_PWRCTRL_ON        (3 << SDIO_POWER_PWRCTRL_SHIFT) /* 11: Power-on: card is clocked */
-
-#define SDIO_POWER_RESET               (0)       /* Reset value */
-
-#define SDIO_CLKCR_CLKDIV_SHIFT        (0)       /* Bits 7-0: Clock divide factor */
-#define SDIO_CLKCR_CLKDIV_MASK         (0xff << SDIO_CLKCR_CLKDIV_SHIFT)
-#define SDIO_CLKCR_CLKEN               (1 << 8)  /* Bit 8: Clock enable bit */
-#define SDIO_CLKCR_PWRSAV              (1 << 9)  /* Bit 9: Power saving configuration bit */
-#define SDIO_CLKCR_BYPASS              (1 << 10) /* Bit 10: Clock divider bypass enable bit */
-#define SDIO_CLKCR_WIDBUS_SHIFT        (11)      /* Bits 12-11: Wide bus mode enable bits */
-#define SDIO_CLKCR_WIDBUS_MASK         (3 << SDIO_CLKCR_WIDBUS_SHIFT)
-#  define SDIO_CLKCR_WIDBUS_D1         (0 << SDIO_CLKCR_WIDBUS_SHIFT) /* 00: Default (SDIO_D0) */
-#  define SDIO_CLKCR_WIDBUS_D4         (1 << SDIO_CLKCR_WIDBUS_SHIFT) /* 01: 4-wide (SDIO_D[3:0]) */
-#  define SDIO_CLKCR_WIDBUS_D8         (2 << SDIO_CLKCR_WIDBUS_SHIFT) /* 10: 8-wide (SDIO_D[7:0]) */
-#define SDIO_CLKCR_NEGEDGE             (1 << 13) /* Bit 13: SDIO_CK dephasing selection bit */
-#define SDIO_CLKCR_HWFC_EN             (1 << 14) /* Bit 14: HW Flow Control enable */
-
-#define SDIO_CLKCR_RESET               (0)       /* Reset value */
-#define SDIO_ARG_RESET                 (0)       /* Reset value */
-
-#define SDIO_CLKCR_CLKEN_BB            (STM32_SDMMC1_CLKCR_BB + (8 * 4))
-#define SDIO_CLKCR_PWRSAV_BB           (STM32_SDMMC1_CLKCR_BB + (9 * 4))
-#define SDIO_CLKCR_BYPASS_BB           (STM32_SDMMC1_CLKCR_BB + (10 * 4))
-#define SDIO_CLKCR_NEGEDGE_BB          (STM32_SDMMC1_CLKCR_BB + (13 * 4))
-#define SDIO_CLKCR_HWFC_EN_BB          (STM32_SDMMC1_CLKCR_BB + (14 * 4))
-
-#define SDIO_CMD_CMDINDEX_SHIFT        (0)
-#define SDIO_CMD_CMDINDEX_MASK         (0x3f << SDIO_CMD_CMDINDEX_SHIFT)
-#define SDIO_CMD_WAITRESP_SHIFT        (6)       /* Bits 7-6: Wait for response bits */
-#define SDIO_CMD_WAITRESP_MASK         (3 << SDIO_CMD_WAITRESP_SHIFT)
-#  define SDIO_CMD_NORESPONSE          (0 << SDIO_CMD_WAITRESP_SHIFT) /* 00/10: No response */
-#  define SDIO_CMD_SHORTRESPONSE       (1 << SDIO_CMD_WAITRESP_SHIFT) /* 01: Short response */
-#  define SDIO_CMD_LONGRESPONSE        (3 << SDIO_CMD_WAITRESP_SHIFT) /* 11: Long response */
-#define SDIO_CMD_WAITINT               (1 << 8)  /* Bit 8: CPSM waits for interrupt request */
-#define SDIO_CMD_WAITPEND              (1 << 9)  /* Bit 9: CPSM Waits for ends of data transfer */
-#define SDIO_CMD_CPSMEN                (1 << 10) /* Bit 10: Command path state machine enable */
-#define SDIO_CMD_SUSPEND               (1 << 11) /* Bit 11: SD I/O suspend command */
-#define SDIO_CMD_ENDCMD                (1 << 12) /* Bit 12: Enable CMD completion */
-#define SDIO_CMD_NIEN                  (1 << 13) /* Bit 13: not Interrupt Enable */
-#define SDIO_CMD_ATACMD                (1 << 14) /* Bit 14: CE-ATA command */
-
-#define SDIO_CMD_RESET                 (0)       /* Reset value */
-
-#define SDIO_CMD_WAITINT_BB            (STM32_SDMMC1_CMD_BB + (8 * 4))
-#define SDIO_CMD_WAITPEND_BB           (STM32_SDMMC1_CMD_BB + (9 * 4))
-#define SDIO_CMD_CPSMEN_BB             (STM32_SDMMC1_CMD_BB + (10 * 4))
-#define SDIO_CMD_SUSPEND_BB            (STM32_SDMMC1_CMD_BB + (11 * 4))
-#define SDIO_CMD_ENCMD_BB              (STM32_SDMMC1_CMD_BB + (12 * 4))
-#define SDIO_CMD_NIEN_BB               (STM32_SDMMC1_CMD_BB + (13 * 4))
-#define SDIO_CMD_ATACMD_BB             (STM32_SDMMC1_CMD_BB + (14 * 4))
-
-#define SDIO_RESPCMD_SHIFT             (0)
-#define SDIO_RESPCMD_MASK              (0x3f << SDIO_RESPCMD_SHIFT)
-
-#define SDIO_DTIMER_RESET              (0)       /* Reset value */
-
-#define SDIO_DLEN_SHIFT                (0)
-#define SDIO_DLEN_MASK                 (0x01ffffff << SDIO_DLEN_SHIFT)
-
-#define SDIO_DLEN_RESET                (0)       /* Reset value */
-
-#define SDIO_DCTRL_DTEN                (1 << 0)  /* Bit 0: Data transfer enabled bit */
-#define SDIO_DCTRL_DTDIR               (1 << 1)  /* Bit 1: Data transfer direction */
-#define SDIO_DCTRL_DTMODE              (1 << 2)  /* Bit 2: Data transfer mode */
-#define SDIO_DCTRL_DMAEN               (1 << 3)  /* Bit 3: DMA enable bit */
-#define SDIO_DCTRL_DBLOCKSIZE_SHIFT    (4)       /* Bits 7-4: Data block size */
-#define SDIO_DCTRL_DBLOCKSIZE_MASK     (15 << SDIO_DCTRL_DBLOCKSIZE_SHIFT)
-#  define SDIO_DCTRL_1BYTE             (0 << SDIO_DCTRL_DBLOCKSIZE_SHIFT)
-#  define SDIO_DCTRL_2BYTES            (1 << SDIO_DCTRL_DBLOCKSIZE_SHIFT)
-#  define SDIO_DCTRL_4BYTES            (2 << SDIO_DCTRL_DBLOCKSIZE_SHIFT)
-#  define SDIO_DCTRL_8BYTES            (3 << SDIO_DCTRL_DBLOCKSIZE_SHIFT)
-#  define SDIO_DCTRL_16BYTES           (4 << SDIO_DCTRL_DBLOCKSIZE_SHIFT)
-#  define SDIO_DCTRL_32BYTES           (5 << SDIO_DCTRL_DBLOCKSIZE_SHIFT)
-#  define SDIO_DCTRL_64BYTES           (6 << SDIO_DCTRL_DBLOCKSIZE_SHIFT)
-#  define SDIO_DCTRL_128BYTES          (7 << SDIO_DCTRL_DBLOCKSIZE_SHIFT)
-#  define SDIO_DCTRL_256BYTES          (8 << SDIO_DCTRL_DBLOCKSIZE_SHIFT)
-#  define SDIO_DCTRL_512BYTES          (9 << SDIO_DCTRL_DBLOCKSIZE_SHIFT)
-#  define SDIO_DCTRL_1KBYTE            (10 << SDIO_DCTRL_DBLOCKSIZE_SHIFT)
-#  define SDIO_DCTRL_2KBYTES           (11 << SDIO_DCTRL_DBLOCKSIZE_SHIFT)
-#  define SDIO_DCTRL_4KBYTES           (12 << SDIO_DCTRL_DBLOCKSIZE_SHIFT)
-#  define SDIO_DCTRL_8KBYTES           (13 << SDIO_DCTRL_DBLOCKSIZE_SHIFT)
-#  define SDIO_DCTRL_16KBYTES          (14 << SDIO_DCTRL_DBLOCKSIZE_SHIFT)
-#define SDIO_DCTRL_RWSTART             (1 << 8)  /* Bit 8: Read wait start */
-#define SDIO_DCTRL_RWSTOP              (1 << 9)  /* Bit 9: Read wait stop */
-#define SDIO_DCTRL_RWMOD               (1 << 10) /* Bit 10: Read wait mode */
-#define SDIO_DCTRL_SDIOEN              (1 << 11) /* Bit 11: SD I/O enable functions */
-
-#define SDIO_DCTRL_RESET               (0)       /* Reset value */
-
-#define SDIO_DCTRL_DTEN_BB             (STM32_SDMMC1_DCTRL_BB + (0 * 4))
-#define SDIO_DCTRL_DTDIR_BB            (STM32_SDMMC1_DCTRL_BB + (1 * 4))
-#define SDIO_DCTRL_DTMODE_BB           (STM32_SDMMC1_DCTRL_BB + (2 * 4))
-#define SDIO_DCTRL_DMAEN_BB            (STM32_SDMMC1_DCTRL_BB + (3 * 4))
-#define SDIO_DCTRL_RWSTART_BB          (STM32_SDMMC1_DCTRL_BB + (8 * 4))
-#define SDIO_DCTRL_RWSTOP_BB           (STM32_SDMMC1_DCTRL_BB + (9 * 4))
-#define SDIO_DCTRL_RWMOD_BB            (STM32_SDMMC1_DCTRL_BB + (10 * 4))
-#define SDIO_DCTRL_SDIOEN_BB           (STM32_SDMMC1_DCTRL_BB + (11 * 4))
-
-#define SDIO_DATACOUNT_SHIFT           (0)
-#define SDIO_DATACOUNT_MASK            (0x01ffffff << SDIO_DATACOUNT_SHIFT)
-
-#define SDIO_STA_CCRCFAIL              (1 << 0)  /* Bit 0: Command response CRC fail */
-#define SDIO_STA_DCRCFAIL              (1 << 1)  /* Bit 1: Data block CRC fail */
-#define SDIO_STA_CTIMEOUT              (1 << 2)  /* Bit 2: Command response timeout */
-#define SDIO_STA_DTIMEOUT              (1 << 3)  /* Bit 3: Data timeout */
-#define SDIO_STA_TXUNDERR              (1 << 4)  /* Bit 4: Transmit FIFO underrun error */
-#define SDIO_STA_RXOVERR               (1 << 5)  /* Bit 5: Received FIFO overrun error */
-#define SDIO_STA_CMDREND               (1 << 6)  /* Bit 6: Command response received  */
-#define SDIO_STA_CMDSENT               (1 << 7)  /* Bit 7: Command sent  */
-#define SDIO_STA_DATAEND               (1 << 8)  /* Bit 8: Data end */
-#define SDIO_STA_STBITERR              (1 << 9)  /* Bit 9: Start bit not detected  */
-#define SDIO_STA_DBCKEND               (1 << 10) /* Bit 10: Data block sent/received  */
-#define SDIO_STA_CMDACT                (1 << 11) /* Bit 11: Command transfer in progress */
-#define SDIO_STA_TXACT                 (1 << 12) /* Bit 12: Data transmit in progress */
-#define SDIO_STA_RXACT                 (1 << 13) /* Bit 13: Data receive in progress */
-#define SDIO_STA_TXFIFOHE              (1 << 14) /* Bit 14: Transmit FIFO half empty */
-#define SDIO_STA_RXFIFOHF              (1 << 15) /* Bit 15: Receive FIFO half full */
-#define SDIO_STA_TXFIFOF               (1 << 16) /* Bit 16: Transmit FIFO full */
-#define SDIO_STA_RXFIFOF               (1 << 17) /* Bit 17: Receive FIFO full */
-#define SDIO_STA_TXFIFOE               (1 << 18) /* Bit 18: Transmit FIFO empty */
-#define SDIO_STA_RXFIFOE               (1 << 19) /* Bit 19: Receive FIFO empty */
-#define SDIO_STA_TXDAVL                (1 << 20) /* Bit 20: Data available in transmit FIFO */
-#define SDIO_STA_RXDAVL                (1 << 21) /* Bit 21: Data available in receive FIFO */
-#define SDIO_STA_SDIOIT                (1 << 22) /* Bit 22: SDIO interrupt received */
-#define SDIO_STA_CEATAEND              (1 << 23) /* Bit 23: CMD6 CE-ATA command completion */
-
-#define SDIO_ICR_CCRCFAILC             (1 << 0)  /* Bit 0: CCRCFAIL flag clear bit */
-#define SDIO_ICR_DCRCFAILC             (1 << 1)  /* Bit 1: DCRCFAIL flag clear bit */
-#define SDIO_ICR_CTIMEOUTC             (1 << 2)  /* Bit 2: CTIMEOUT flag clear bit */
-#define SDIO_ICR_DTIMEOUTC             (1 << 3)  /* Bit 3: DTIMEOUT flag clear bit */
-#define SDIO_ICR_TXUNDERRC             (1 << 4)  /* Bit 4: TXUNDERR flag clear bit */
-#define SDIO_ICR_RXOVERRC              (1 << 5)  /* Bit 5: RXOVERR flag clear bit */
-#define SDIO_ICR_CMDRENDC              (1 << 6)  /* Bit 6: CMDREND flag clear bit */
-#define SDIO_ICR_CMDSENTC              (1 << 7)  /* Bit 7: CMDSENT flag clear bit */
-#define SDIO_ICR_DATAENDC              (1 << 8)  /* Bit 8: DATAEND flag clear bit */
-#define SDIO_ICR_STBITERRC             (1 << 9)  /* Bit 9: STBITERR flag clear bit */
-#define SDIO_ICR_DBCKENDC              (1 << 10) /* Bit 10: DBCKEND flag clear bit */
-#define SDIO_ICR_SDIOITC               (1 << 22) /* Bit 22: SDIOIT flag clear bit */
-#define SDIO_ICR_CEATAENDC             (1 << 23) /* Bit 23: CEATAEND flag clear bit */
-
-#define SDIO_ICR_RESET                 0x00c007ff
-#define SDIO_ICR_STATICFLAGS           0x000005ff
-
-#define SDIO_MASK_CCRCFAILIE           (1 << 0)  /* Bit 0: Command CRC fail interrupt enable */
-#define SDIO_MASK_DCRCFAILIE           (1 << 1)  /* Bit 1: Data CRC fail interrupt enable */
-#define SDIO_MASK_CTIMEOUTIE           (1 << 2)  /* Bit 2: Command timeout interrupt enable */
-#define SDIO_MASK_DTIMEOUTIE           (1 << 3)  /* Bit 3: Data timeout interrupt enable */
-#define SDIO_MASK_TXUNDERRIE           (1 << 4)  /* Bit 4: Tx FIFO underrun error interrupt enable */
-#define SDIO_MASK_RXOVERRIE            (1 << 5)  /* Bit 5: Rx FIFO overrun error interrupt enable */
-#define SDIO_MASK_CMDRENDIE            (1 << 6)  /* Bit 6: Command response received interrupt enable */
-#define SDIO_MASK_CMDSENTIE            (1 << 7)  /* Bit 7: Command sent interrupt enable */
-#define SDIO_MASK_DATAENDIE            (1 << 8)  /* Bit 8: Data end interrupt enable */
-#define SDIO_MASK_STBITERRIE           (1 << 9)  /* Bit 9: Start bit error interrupt enable */
-#define SDIO_MASK_DBCKENDIE            (1 << 10) /* Bit 10: Data block end interrupt enable */
-#define SDIO_MASK_CMDACTIE             (1 << 11) /* Bit 11: Command acting interrupt enable */
-#define SDIO_MASK_TXACTIE              (1 << 12) /* Bit 12: Data transmit acting interrupt enable */
-#define SDIO_MASK_RXACTIE              (1 << 13) /* Bit 13: Data receive acting interrupt enable */
-#define SDIO_MASK_TXFIFOHEIE           (1 << 14) /* Bit 14: Tx FIFO half empty interrupt enable */
-#define SDIO_MASK_RXFIFOHFIE           (1 << 15) /* Bit 15: Rx FIFO half full interrupt enable */
-#define SDIO_MASK_TXFIFOFIE            (1 << 16) /* Bit 16: Tx FIFO full interrupt enable */
-#define SDIO_MASK_RXFIFOFIE            (1 << 17) /* Bit 17: Rx FIFO full interrupt enable */
-#define SDIO_MASK_TXFIFOEIE            (1 << 18) /* Bit 18: Tx FIFO empty interrupt enable */
-#define SDIO_MASK_RXFIFOEIE            (1 << 19) /* Bit 19: Rx FIFO empty interrupt enable */
-#define SDIO_MASK_TXDAVLIE             (1 << 20) /* Bit 20: Data available in Tx FIFO interrupt enable */
-#define SDIO_MASK_RXDAVLIE             (1 << 21) /* Bit 21: Data available in Rx FIFO interrupt enable */
-#define SDIO_MASK_SDIOITIE             (1 << 22) /* Bit 22: SDIO mode interrupt received interrupt enable */
-#define SDIO_MASK_CEATAENDIE           (1 << 23) /* Bit 23: CE-ATA command completion interrupt enable */
-
-#define SDIO_MASK_RESET                (0)
-
-#define SDIO_FIFOCNT_SHIFT             (0)
-#define SDIO_FIFOCNT_MASK              (0x01ffffff << SDIO_FIFOCNT_SHIFT)
-
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XX_SDMMC_H */
-
diff --git a/arch/arm/src/stm32f7/chip/stm32f74xx77xx_sdmmc.h b/arch/arm/src/stm32f7/chip/stm32f74xx77xx_sdmmc.h
new file mode 100644
index 0000000000..e0d52edc4e
--- /dev/null
+++ b/arch/arm/src/stm32f7/chip/stm32f74xx77xx_sdmmc.h
@@ -0,0 +1,224 @@
+ /* arch/arm/src/stm32f7/chip/stm32f74xx77xx_sdmmc.h
+ *
+ *   Copyright (C) 2009, 2011-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_SRC_STM32F7_CHIP_STM32F74XX77XX_SDMMC_H
+#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX77XX_SDMMC_H
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+/* Register Offsets *****************************************************************/
+
+#define STM32_SDMMC_POWER_OFFSET              0x0000 /* SDMMC power control register */
+#define STM32_SDMMC_CLKCR_OFFSET              0x0004 /* SDMMC clock control register */
+#define STM32_SDMMC_ARG_OFFSET                0x0008 /* SDMMC argument register */
+#define STM32_SDMMC_CMD_OFFSET                0x000c /* SDMMC command register */
+#define STM32_SDMMC_RESPCMD_OFFSET            0x0010 /* SDMMC command response register */
+#define STM32_SDMMC_RESP_OFFSET(n)            (0x0010+4*(n))
+#define STM32_SDMMC_RESP1_OFFSET              0x0014 /* SDMMC response 1 register */
+#define STM32_SDMMC_RESP2_OFFSET              0x0018 /* SDMMC response 2 register */
+#define STM32_SDMMC_RESP3_OFFSET              0x001c /* SDMMC response 3 register */
+#define STM32_SDMMC_RESP4_OFFSET              0x0020 /* SDMMC response 4 register */
+#define STM32_SDMMC_DTIMER_OFFSET             0x0024 /* SDMMC data timer register */
+#define STM32_SDMMC_DLEN_OFFSET               0x0028 /* SDMMC data length register */
+#define STM32_SDMMC_DCTRL_OFFSET              0x002c /* SDMMC data control register */
+#define STM32_SDMMC_DCOUNT_OFFSET             0x0030 /* SDMMC data counter register */
+#define STM32_SDMMC_STA_OFFSET                0x0034 /* SDMMC status register */
+#define STM32_SDMMC_ICR_OFFSET                0x0038 /* SDMMC interrupt clear register */
+#define STM32_SDMMC_MASK_OFFSET               0x003c /* SDMMC mask register */
+#define STM32_SDMMC_FIFOCNT_OFFSET            0x0048 /* SDMMC FIFO counter register */
+#define STM32_SDMMC_FIFO_OFFSET               0x0080 /* SDMMC data FIFO register */
+
+
+/* Register Bitfield Definitions ****************************************************/
+
+#define STM32_SDMMC_POWER_PWRCTRL_SHIFT       (0)       /* Bits 0-1: Power supply control bits */
+#define STM32_SDMMC_POWER_PWRCTRL_MASK        (3 << STM32_SDMMC_POWER_PWRCTRL_SHIFT)
+#  define STM32_SDMMC_POWER_PWRCTRL_OFF       (0 << STM32_SDMMC_POWER_PWRCTRL_SHIFT) /* 00: Power-off: card clock stopped */
+#  define STM32_SDMMC_POWER_PWRCTRL_PWRUP     (2 << STM32_SDMMC_POWER_PWRCTRL_SHIFT) /* 10: Reserved power-up */
+#  define STM32_SDMMC_POWER_PWRCTRL_ON        (3 << STM32_SDMMC_POWER_PWRCTRL_SHIFT) /* 11: Power-on: card is clocked */
+
+#define STM32_SDMMC_POWER_RESET               (0)       /* Reset value */
+
+#define STM32_SDMMC_CLKCR_CLKDIV_SHIFT        (0)       /* Bits 7-0: Clock divide factor */
+#define STM32_SDMMC_CLKCR_CLKDIV_MASK         (0xff << STM32_SDMMC_CLKCR_CLKDIV_SHIFT)
+#define STM32_SDMMC_CLKCR_CLKEN               (1 << 8)  /* Bit 8: Clock enable bit */
+#define STM32_SDMMC_CLKCR_PWRSAV              (1 << 9)  /* Bit 9: Power saving configuration bit */
+#define STM32_SDMMC_CLKCR_BYPASS              (1 << 10) /* Bit 10: Clock divider bypass enable bit */
+#define STM32_SDMMC_CLKCR_WIDBUS_SHIFT        (11)      /* Bits 12-11: Wide bus mode enable bits */
+#define STM32_SDMMC_CLKCR_WIDBUS_MASK         (3 << STM32_SDMMC_CLKCR_WIDBUS_SHIFT)
+#  define STM32_SDMMC_CLKCR_WIDBUS_D1         (0 << STM32_SDMMC_CLKCR_WIDBUS_SHIFT) /* 00: Default (STM32_SDMMC_D0) */
+#  define STM32_SDMMC_CLKCR_WIDBUS_D4         (1 << STM32_SDMMC_CLKCR_WIDBUS_SHIFT) /* 01: 4-wide (STM32_SDMMC_D[3:0]) */
+#  define STM32_SDMMC_CLKCR_WIDBUS_D8         (2 << STM32_SDMMC_CLKCR_WIDBUS_SHIFT) /* 10: 8-wide (STM32_SDMMC_D[7:0]) */
+#define STM32_SDMMC_CLKCR_NEGEDGE             (1 << 13) /* Bit 13: STM32_SDMMC_CK dephasing selection bit */
+#define STM32_SDMMC_CLKCR_HWFC_EN             (1 << 14) /* Bit 14: HW Flow Control enable */
+
+#define STM32_SDMMC_CLKCR_RESET               (0)       /* Reset value */
+
+#define STM32_SDMMC_ARG_RESET                 (0)       /* Reset value */
+
+#define STM32_SDMMC_CMD_CMDINDEX_SHIFT        (0)
+#define STM32_SDMMC_CMD_CMDINDEX_MASK         (0x3f << STM32_SDMMC_CMD_CMDINDEX_SHIFT)
+#define STM32_SDMMC_CMD_WAITRESP_SHIFT        (6)       /* Bits 7-6: Wait for response bits */
+#define STM32_SDMMC_CMD_WAITRESP_MASK         (3 << STM32_SDMMC_CMD_WAITRESP_SHIFT)
+#  define STM32_SDMMC_CMD_NORESPONSE          (0 << STM32_SDMMC_CMD_WAITRESP_SHIFT) /* 00/10: No response */
+#  define STM32_SDMMC_CMD_SHORTRESPONSE       (1 << STM32_SDMMC_CMD_WAITRESP_SHIFT) /* 01: Short response */
+#  define STM32_SDMMC_CMD_LONGRESPONSE        (3 << STM32_SDMMC_CMD_WAITRESP_SHIFT) /* 11: Long response */
+#define STM32_SDMMC_CMD_WAITINT               (1 << 8)  /* Bit 8: CPSM waits for interrupt request */
+#define STM32_SDMMC_CMD_WAITPEND              (1 << 9)  /* Bit 9: CPSM Waits for ends of data transfer */
+#define STM32_SDMMC_CMD_CPSMEN                (1 << 10) /* Bit 10: Command path state machine enable */
+#define STM32_SDMMC_CMD_SUSPEND               (1 << 11) /* Bit 11: SD I/O suspend command */
+#define STM32_SDMMC_CMD_ENDCMD                (1 << 12) /* Bit 12: Enable CMD completion */
+#define STM32_SDMMC_CMD_NIEN                  (1 << 13) /* Bit 13: not Interrupt Enable */
+#define STM32_SDMMC_CMD_ATACMD                (1 << 14) /* Bit 14: CE-ATA command */
+
+#define STM32_SDMMC_CMD_RESET                 (0)       /* Reset value */
+
+#define STM32_SDMMC_RESPCMD_SHIFT             (0)
+#define STM32_SDMMC_RESPCMD_MASK              (0x3f << STM32_SDMMC_RESPCMD_SHIFT)
+
+#define STM32_SDMMC_DTIMER_RESET              (0)       /* Reset value */
+
+#define STM32_SDMMC_DLEN_SHIFT                (0)
+#define STM32_SDMMC_DLEN_MASK                 (0x01ffffff << STM32_SDMMC_DLEN_SHIFT)
+
+#define STM32_SDMMC_DLEN_RESET                (0)       /* Reset value */
+
+#define STM32_SDMMC_DCTRL_DTEN                (1 << 0)  /* Bit 0: Data transfer enabled bit */
+#define STM32_SDMMC_DCTRL_DTDIR               (1 << 1)  /* Bit 1: Data transfer direction */
+#define STM32_SDMMC_DCTRL_DTMODE              (1 << 2)  /* Bit 2: Data transfer mode */
+#define STM32_SDMMC_DCTRL_DMAEN               (1 << 3)  /* Bit 3: DMA enable bit */
+#define STM32_SDMMC_DCTRL_DBLOCKSIZE_SHIFT    (4)       /* Bits 7-4: Data block size */
+#define STM32_SDMMC_DCTRL_DBLOCKSIZE_MASK     (15 << STM32_SDMMC_DCTRL_DBLOCKSIZE_SHIFT)
+#  define STM32_SDMMC_DCTRL_1BYTE             (0 << STM32_SDMMC_DCTRL_DBLOCKSIZE_SHIFT)
+#  define STM32_SDMMC_DCTRL_2BYTES            (1 << STM32_SDMMC_DCTRL_DBLOCKSIZE_SHIFT)
+#  define STM32_SDMMC_DCTRL_4BYTES            (2 << STM32_SDMMC_DCTRL_DBLOCKSIZE_SHIFT)
+#  define STM32_SDMMC_DCTRL_8BYTES            (3 << STM32_SDMMC_DCTRL_DBLOCKSIZE_SHIFT)
+#  define STM32_SDMMC_DCTRL_16BYTES           (4 << STM32_SDMMC_DCTRL_DBLOCKSIZE_SHIFT)
+#  define STM32_SDMMC_DCTRL_32BYTES           (5 << STM32_SDMMC_DCTRL_DBLOCKSIZE_SHIFT)
+#  define STM32_SDMMC_DCTRL_64BYTES           (6 << STM32_SDMMC_DCTRL_DBLOCKSIZE_SHIFT)
+#  define STM32_SDMMC_DCTRL_128BYTES          (7 << STM32_SDMMC_DCTRL_DBLOCKSIZE_SHIFT)
+#  define STM32_SDMMC_DCTRL_256BYTES          (8 << STM32_SDMMC_DCTRL_DBLOCKSIZE_SHIFT)
+#  define STM32_SDMMC_DCTRL_512BYTES          (9 << STM32_SDMMC_DCTRL_DBLOCKSIZE_SHIFT)
+#  define STM32_SDMMC_DCTRL_1KBYTE            (10 << STM32_SDMMC_DCTRL_DBLOCKSIZE_SHIFT)
+#  define STM32_SDMMC_DCTRL_2KBYTES           (11 << STM32_SDMMC_DCTRL_DBLOCKSIZE_SHIFT)
+#  define STM32_SDMMC_DCTRL_4KBYTES           (12 << STM32_SDMMC_DCTRL_DBLOCKSIZE_SHIFT)
+#  define STM32_SDMMC_DCTRL_8KBYTES           (13 << STM32_SDMMC_DCTRL_DBLOCKSIZE_SHIFT)
+#  define STM32_SDMMC_DCTRL_16KBYTES          (14 << STM32_SDMMC_DCTRL_DBLOCKSIZE_SHIFT)
+#define STM32_SDMMC_DCTRL_RWSTART             (1 << 8)  /* Bit 8: Read wait start */
+#define STM32_SDMMC_DCTRL_RWSTOP              (1 << 9)  /* Bit 9: Read wait stop */
+#define STM32_SDMMC_DCTRL_RWMOD               (1 << 10) /* Bit 10: Read wait mode */
+#define STM32_SDMMC_DCTRL_SDIOEN              (1 << 11) /* Bit 11: SD I/O enable functions */
+
+#define STM32_SDMMC_DCTRL_RESET               (0)       /* Reset value */
+
+#define STM32_SDMMC_DCOUNT_SHIFT              (0)
+#define STM32_SDMMC_DCOUNT_MASK               (0x01ffffff << STM32_SDMMC_DCOUNT_SHIFT)
+
+#define STM32_SDMMC_STA_CCRCFAIL              (1 << 0)  /* Bit 0: Command response CRC fail */
+#define STM32_SDMMC_STA_DCRCFAIL              (1 << 1)  /* Bit 1: Data block CRC fail */
+#define STM32_SDMMC_STA_CTIMEOUT              (1 << 2)  /* Bit 2: Command response timeout */
+#define STM32_SDMMC_STA_DTIMEOUT              (1 << 3)  /* Bit 3: Data timeout */
+#define STM32_SDMMC_STA_TXUNDERR              (1 << 4)  /* Bit 4: Transmit FIFO underrun error */
+#define STM32_SDMMC_STA_RXOVERR               (1 << 5)  /* Bit 5: Received FIFO overrun error */
+#define STM32_SDMMC_STA_CMDREND               (1 << 6)  /* Bit 6: Command response received  */
+#define STM32_SDMMC_STA_CMDSENT               (1 << 7)  /* Bit 7: Command sent  */
+#define STM32_SDMMC_STA_DATAEND               (1 << 8)  /* Bit 8: Data end */
+#define STM32_SDMMC_STA_STBITERR              (1 << 9)  /* Bit 9: Start bit not detected  */
+#define STM32_SDMMC_STA_DBCKEND               (1 << 10) /* Bit 10: Data block sent/received  */
+#define STM32_SDMMC_STA_CMDACT                (1 << 11) /* Bit 11: Command transfer in progress */
+#define STM32_SDMMC_STA_TXACT                 (1 << 12) /* Bit 12: Data transmit in progress */
+#define STM32_SDMMC_STA_RXACT                 (1 << 13) /* Bit 13: Data receive in progress */
+#define STM32_SDMMC_STA_TXFIFOHE              (1 << 14) /* Bit 14: Transmit FIFO half empty */
+#define STM32_SDMMC_STA_RXFIFOHF              (1 << 15) /* Bit 15: Receive FIFO half full */
+#define STM32_SDMMC_STA_TXFIFOF               (1 << 16) /* Bit 16: Transmit FIFO full */
+#define STM32_SDMMC_STA_RXFIFOF               (1 << 17) /* Bit 17: Receive FIFO full */
+#define STM32_SDMMC_STA_TXFIFOE               (1 << 18) /* Bit 18: Transmit FIFO empty */
+#define STM32_SDMMC_STA_RXFIFOE               (1 << 19) /* Bit 19: Receive FIFO empty */
+#define STM32_SDMMC_STA_TXDAVL                (1 << 20) /* Bit 20: Data available in transmit FIFO */
+#define STM32_SDMMC_STA_RXDAVL                (1 << 21) /* Bit 21: Data available in receive FIFO */
+#define STM32_SDMMC_STA_SDIOIT                (1 << 22) /* Bit 22: SDIO interrupt received */
+#define STM32_SDMMC_STA_CEATAEND              (1 << 23) /* Bit 23: CMD6 CE-ATA command completion */
+
+#define STM32_SDMMC_ICR_CCRCFAILC             (1 << 0)  /* Bit 0: CCRCFAIL flag clear bit */
+#define STM32_SDMMC_ICR_DCRCFAILC             (1 << 1)  /* Bit 1: DCRCFAIL flag clear bit */
+#define STM32_SDMMC_ICR_CTIMEOUTC             (1 << 2)  /* Bit 2: CTIMEOUT flag clear bit */
+#define STM32_SDMMC_ICR_DTIMEOUTC             (1 << 3)  /* Bit 3: DTIMEOUT flag clear bit */
+#define STM32_SDMMC_ICR_TXUNDERRC             (1 << 4)  /* Bit 4: TXUNDERR flag clear bit */
+#define STM32_SDMMC_ICR_RXOVERRC              (1 << 5)  /* Bit 5: RXOVERR flag clear bit */
+#define STM32_SDMMC_ICR_CMDRENDC              (1 << 6)  /* Bit 6: CMDREND flag clear bit */
+#define STM32_SDMMC_ICR_CMDSENTC              (1 << 7)  /* Bit 7: CMDSENT flag clear bit */
+#define STM32_SDMMC_ICR_DATAENDC              (1 << 8)  /* Bit 8: DATAEND flag clear bit */
+#define STM32_SDMMC_ICR_STBITERRC             (1 << 9)  /* Bit 9: STBITERR flag clear bit */
+#define STM32_SDMMC_ICR_DBCKENDC              (1 << 10) /* Bit 10: DBCKEND flag clear bit */
+#define STM32_SDMMC_ICR_SDIOITC               (1 << 22) /* Bit 22: SDIOIT flag clear bit */
+#define STM32_SDMMC_ICR_CEATAENDC             (1 << 23) /* Bit 23: CEATAEND flag clear bit */
+
+#define STM32_SDMMC_ICR_RESET                 0x00c007ff
+#define STM32_SDMMC_ICR_STATICFLAGS           0x000005ff
+
+#define STM32_SDMMC_MASK_CCRCFAILIE           (1 << 0)  /* Bit 0: Command CRC fail interrupt enable */
+#define STM32_SDMMC_MASK_DCRCFAILIE           (1 << 1)  /* Bit 1: Data CRC fail interrupt enable */
+#define STM32_SDMMC_MASK_CTIMEOUTIE           (1 << 2)  /* Bit 2: Command timeout interrupt enable */
+#define STM32_SDMMC_MASK_DTIMEOUTIE           (1 << 3)  /* Bit 3: Data timeout interrupt enable */
+#define STM32_SDMMC_MASK_TXUNDERRIE           (1 << 4)  /* Bit 4: Tx FIFO underrun error interrupt enable */
+#define STM32_SDMMC_MASK_RXOVERRIE            (1 << 5)  /* Bit 5: Rx FIFO overrun error interrupt enable */
+#define STM32_SDMMC_MASK_CMDRENDIE            (1 << 6)  /* Bit 6: Command response received interrupt enable */
+#define STM32_SDMMC_MASK_CMDSENTIE            (1 << 7)  /* Bit 7: Command sent interrupt enable */
+#define STM32_SDMMC_MASK_DATAENDIE            (1 << 8)  /* Bit 8: Data end interrupt enable */
+#define STM32_SDMMC_MASK_STBITERRIE           (1 << 9)  /* Bit 9: Start bit error interrupt enable */
+#define STM32_SDMMC_MASK_DBCKENDIE            (1 << 10) /* Bit 10: Data block end interrupt enable */
+#define STM32_SDMMC_MASK_CMDACTIE             (1 << 11) /* Bit 11: Command acting interrupt enable */
+#define STM32_SDMMC_MASK_TXACTIE              (1 << 12) /* Bit 12: Data transmit acting interrupt enable */
+#define STM32_SDMMC_MASK_RXACTIE              (1 << 13) /* Bit 13: Data receive acting interrupt enable */
+#define STM32_SDMMC_MASK_TXFIFOHEIE           (1 << 14) /* Bit 14: Tx FIFO half empty interrupt enable */
+#define STM32_SDMMC_MASK_RXFIFOHFIE           (1 << 15) /* Bit 15: Rx FIFO half full interrupt enable */
+#define STM32_SDMMC_MASK_TXFIFOFIE            (1 << 16) /* Bit 16: Tx FIFO full interrupt enable */
+#define STM32_SDMMC_MASK_RXFIFOFIE            (1 << 17) /* Bit 17: Rx FIFO full interrupt enable */
+#define STM32_SDMMC_MASK_TXFIFOEIE            (1 << 18) /* Bit 18: Tx FIFO empty interrupt enable */
+#define STM32_SDMMC_MASK_RXFIFOEIE            (1 << 19) /* Bit 19: Rx FIFO empty interrupt enable */
+#define STM32_SDMMC_MASK_TXDAVLIE             (1 << 20) /* Bit 20: Data available in Tx FIFO interrupt enable */
+#define STM32_SDMMC_MASK_RXDAVLIE             (1 << 21) /* Bit 21: Data available in Rx FIFO interrupt enable */
+#define STM32_SDMMC_MASK_SDIOITIE             (1 << 22) /* Bit 22: SDIO mode interrupt received interrupt enable */
+#define STM32_SDMMC_MASK_CEATAENDIE           (1 << 23) /* Bit 23: CE-ATA command completion interrupt enable */
+
+#define STM32_SDMMC_MASK_RESET                (0)
+
+#define STM32_SDMMC_FIFOCNT_SHIFT             (0)
+#define STM32_SDMMC_FIFOCNT_MASK              (0x0ffffff << STM32_SDMMC_FIFOCNT_SHIFT)
+
+#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX77XX_SDMMC_H */
+
diff --git a/arch/arm/src/stm32f7/stm32_sdmmc.c b/arch/arm/src/stm32f7/stm32_sdmmc.c
index 16473094b5..d7d78f3006 100644
--- a/arch/arm/src/stm32f7/stm32_sdmmc.c
+++ b/arch/arm/src/stm32f7/stm32_sdmmc.c
@@ -37,8 +37,6 @@
  * Included Files
  ****************************************************************************/
 
-#include "stm32_sdmmc.h"
-
 #include 
 
 #include 
@@ -65,12 +63,9 @@
 
 #include "stm32_dma.h"
 #include "stm32_gpio.h"
+#include "stm32_sdmmc.h"
 
-
-/* TODO STM32F7_SDMMC2
- */
-
-#ifdef CONFIG_STM32F7_SDMMC1
+#if defined(CONFIG_STM32F7_SDMMC1) || defined(CONFIG_STM32F7_SDMMC2)
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -80,27 +75,27 @@
 /* Required system configuration options:
  *
  *   CONFIG_ARCH_DMA - Enable architecture-specific DMA subsystem
- *     initialization.  Required if CONFIG_SDIO_DMA is enabled.
+ *     initialization.  Required if CONFIG_SDMMC[1|2]_DMA is enabled.
  *   CONFIG_STM32F7_DMA2 - Enable STM32 DMA2 support.  Required if
- *     CONFIG_SDIO_DMA is enabled
+ *     CONFIG_SDMMC[1|2]_DMA  is enabled
  *   CONFIG_SCHED_WORKQUEUE -- Callback support requires work queue support.
  *
  * Driver-specific configuration options:
  *
  *   CONFIG_SDIO_MUXBUS - Setting this configuration enables some locking
- *     APIs to manage concurrent accesses on the SDIO bus.  This is not
+ *     APIs to manage concurrent accesses on the SDMMC bus.  This is not
  *     needed for the simple case of a single SD card, for example.
- *   CONFIG_SDIO_DMA - Enable SDIO.  This is a marginally optional.  For
- *     most usages, SDIO will cause data overruns if used without DMA.
+ *   CONFIG_SDIO_DMA - Enable SDMMC.  This is a marginally optional.  For
+ *     most usages, SDMMC will cause data overruns if used without DMA.
  *     NOTE the above system DMA configuration options.
- *   CONFIG_SDIO_WIDTH_D1_ONLY - This may be selected to force the driver
+ *   CONFIG_SDMMC_WIDTH_D1_ONLY - This may be selected to force the driver
  *     operate with only a single data line (the default is to use all
  *     4 SD data lines).
- *   CONFIG_SDIO_PRI - SDIO interrupt priority.  This setting is not very
+ *   CONFIG_SDMMC_PRI - SDMMC interrupt priority.  This setting is not very
  *     important since interrupt nesting is not currently supported.
- *   CONFIG_SDM_DMAPRIO - SDIO DMA priority.  This can be selecte if
+ *   CONFIG_SDMMMC_DMAPRIO - SDMMC DMA priority.  This can be selecte if
  *     CONFIG_SDIO_DMA is enabled.
- *   CONFIG_SDIO_XFRDEBUG - Enables some very low-level debug output
+ *   CONFIG_CONFIG_STM32F7_SDMMC_XFRDEBUG - Enables some very low-level debug output
  *     This also requires CONFIG_DEBUG_FS and CONFIG_DEBUG_INFO
  */
 
@@ -116,52 +111,75 @@
 #  error "Callback support requires CONFIG_SCHED_WORKQUEUE"
 #endif
 
-#ifndef CONFIG_SDIO_PRI
-#  define CONFIG_SDIO_PRI        NVIC_SYSH_PRIORITY_DEFAULT
+#ifdef CONFIG_STM32F7_SDMMC1
+#  ifndef CONFIG_SDMMC1_PRI
+#    define CONFIG_SDMMC1_PRI        NVIC_SYSH_PRIORITY_DEFAULT
+#  endif
+
+#  ifdef CONFIG_SDIO_DMA
+#    ifndef CONFIG_SDMMC1_DMAPRIO
+#        define CONFIG_SDMMC1_DMAPRIO DMA_SCR_PRIVERYHI
+#    endif
+#    if (CONFIG_SDMMC1_DMAPRIO & ~DMA_SCR_PL_MASK) != 0
+#      error "Illegal value for CONFIG_SDMMC1_DMAPRIO"
+#    endif
+#  else
+#    undef CONFIG_SDMMC1_DMAPRIO
+#  endif
 #endif
 
-#ifdef CONFIG_SDIO_DMA
-#  ifndef CONFIG_SDIO_DMAPRIO
-#      define CONFIG_SDIO_DMAPRIO  DMA_SCR_PRIVERYHI
+#ifdef CONFIG_STM32F7_SDMMC2
+#  ifndef CONFIG_SDMMC2_PRI
+#    define CONFIG_SDMMC2_PRI        NVIC_SYSH_PRIORITY_DEFAULT
 #  endif
-#  if (CONFIG_SDIO_DMAPRIO & ~DMA_SCR_PL_MASK) != 0
-#    error "Illegal value for CONFIG_SDIO_DMAPRIO"
+
+#  ifdef CONFIG_SDIO_DMA
+#    ifndef CONFIG_SDMMC2_DMAPRIO
+#        define CONFIG_SDMMC2_DMAPRIO DMA_SCR_PRIVERYHI
+#    endif
+#    if (CONFIG_SDMMC2_DMAPRIO & ~DMA_SCR_PL_MASK) != 0
+#      error "Illegal value for CONFIG_SDMMC2_DMAPRIO"
+#    endif
+#  else
+#    undef CONFIG_SDMMC2_DMAPRIO
 #  endif
-#else
-#  undef CONFIG_SDIO_DMAPRIO
 #endif
 
 #if !defined(CONFIG_DEBUG_FS) || !defined(CONFIG_DEBUG_FEATURES)
-#  undef CONFIG_SDIO_XFRDEBUG
+#  undef CONFIG_CONFIG_STM32F7_SDMMC_XFRDEBUG
 #endif
 
 /* Friendly CLKCR bit re-definitions ****************************************/
 
-#define SDIO_CLKCR_RISINGEDGE    (0)
-#define SDIO_CLKCR_FALLINGEDGE   SDIO_CLKCR_NEGEDGE
+#define STM32_CLKCR_RISINGEDGE    (0)
+#define STM32_CLKCR_FALLINGEDGE   STM32_CLKCR_NEGEDGE
 
-/* Mode dependent settings.  These depend on clock devisor settings that must
- * be defined in the board-specific board.h header file: SDIO_INIT_CLKDIV,
- * SDIO_MMCXFR_CLKDIV, and SDIO_SDXFR_CLKDIV.
+/* Mode dependent settings.  These depend on clock divisor settings that must
+ * be defined in the board-specific board.h header file: STM32_SDMMC_INIT_CLKDIV,
+ * STM32_SDMMC_MMCXFR_CLKDIV, and STM32_SDMMC_SDXFR_CLKDIV.
  */
 
-#define STM32_CLCKCR_INIT        (SDMMC1_INIT_CLKDIV | SDIO_CLKCR_RISINGEDGE | \
-                                  SDIO_CLKCR_WIDBUS_D1)
-#define SDIO_CLKCR_MMCXFR        (SDMMC1_MMCXFR_CLKDIV | SDIO_CLKCR_RISINGEDGE | \
-                                  SDIO_CLKCR_WIDBUS_D1)
-#define SDIO_CLCKR_SDXFR         (SDMMC1_SDXFR_CLKDIV | SDIO_CLKCR_RISINGEDGE | \
-                                  SDIO_CLKCR_WIDBUS_D1)
-#define SDIO_CLCKR_SDWIDEXFR     (SDMMC1_SDXFR_CLKDIV | SDIO_CLKCR_RISINGEDGE | \
-                                  SDIO_CLKCR_WIDBUS_D4)
+#define STM32_CLCKCR_INIT           (STM32_SDMMC_INIT_CLKDIV      | \
+                                     STM32_CLKCR_RISINGEDGE | \
+                                     STM32_SDMMC_CLKCR_WIDBUS_D1)
+#define STM32_SDMMC_CLKCR_MMCXFR    (STM32_SDMMC_MMCXFR_CLKDIV    | \
+                                     STM32_CLKCR_RISINGEDGE | \
+                                     STM32_SDMMC_CLKCR_WIDBUS_D1)
+#define STM32_SDMMC_CLCKR_SDXFR     (STM32_SDMMC_SDXFR_CLKDIV     | \
+                                     STM32_CLKCR_RISINGEDGE | \
+                                     STM32_SDMMC_CLKCR_WIDBUS_D1)
+#define STM32_SDMMC_CLCKR_SDWIDEXFR (STM32_SDMMC_SDXFR_CLKDIV     | \
+                                     STM32_CLKCR_RISINGEDGE | \
+                                     STM32_SDMMC_CLKCR_WIDBUS_D4)
 
 /* Timing */
 
-#define SDIO_CMDTIMEOUT          (100000)
-#define SDIO_LONGTIMEOUT         (0x7fffffff)
+#define SDMMC_CMDTIMEOUT         (100000)
+#define SDMMC_LONGTIMEOUT        (0x7fffffff)
 
 /* Big DTIMER setting */
 
-#define SDIO_DTIMER_DATATIMEOUT  (0x000fffff)
+#define SDMMC_DTIMER_DATATIMEOUT (0x000fffff)
 
 /* DMA channel/stream configuration register settings.  The following
  * must be selected.  The DMA driver will select the remaining fields.
@@ -173,76 +191,120 @@
  */
 
 
-/* STM32 stream configuration register (SCR) settings. */
+/* STM32 stream configuration register (SCR) settings base settings sans
+ * priority.
+ */
 
-#define SDIO_RXDMA32_CONFIG    (DMA_SCR_PFCTRL | DMA_SCR_DIR_P2M|DMA_SCR_MINC | \
+#  define SDMMC_RXDMA32_CONFIG   (DMA_SCR_PFCTRL | DMA_SCR_DIR_P2M|DMA_SCR_MINC | \
                                   DMA_SCR_PSIZE_32BITS | DMA_SCR_MSIZE_32BITS | \
-                                  CONFIG_SDIO_DMAPRIO | DMA_SCR_PBURST_INCR4 | \
-                                  DMA_SCR_MBURST_INCR4)
-#define SDIO_TXDMA32_CONFIG    (DMA_SCR_PFCTRL | DMA_SCR_DIR_M2P | DMA_SCR_MINC | \
+                                  DMA_SCR_PBURST_INCR4 | DMA_SCR_MBURST_INCR4)
+#  define SDMMC_TXDMA32_CONFIG   (DMA_SCR_PFCTRL | DMA_SCR_DIR_M2P | DMA_SCR_MINC | \
                                   DMA_SCR_PSIZE_32BITS | DMA_SCR_MSIZE_32BITS | \
-                                  CONFIG_SDIO_DMAPRIO | DMA_SCR_PBURST_INCR4 | \
-                                  DMA_SCR_MBURST_INCR4)
+                                  DMA_SCR_PBURST_INCR4 | DMA_SCR_MBURST_INCR4)
+
+#ifdef DMAMAP_SDMMC1
 
-/* SDIO DMA Channel/Stream selection.  There
+/* SDMMC DMA Channel/Stream selection.  There
  * are multiple DMA stream options that must be dis-ambiguated in the board.h
  * file.
  */
 
-#define SDIO_DMACHAN           DMAMAP_SDMMC1
+#  define SDMMC1_DMACHAN          DMAMAP_SDMMC1
+#endif
+
+
+#ifdef DMAMAP_SDMMC2
+
+/* SDMMC DMA Channel/Stream selection.  There
+ * are multiple DMA stream options that must be dis-ambiguated in the board.h
+ * file.
+ */
+
+#  define SDMMC2_DMACHAN           DMAMAP_SDMMC2
+#endif
 
 /* FIFO sizes */
 
-#define SDIO_HALFFIFO_WORDS      (8)
-#define SDIO_HALFFIFO_BYTES      (8*4)
+#define SDMMC_HALFFIFO_WORDS      (8)
+#define SDMMC_HALFFIFO_BYTES      (8*4)
 
 /* Data transfer interrupt mask bits */
 
-#define SDIO_RECV_MASK     (SDIO_MASK_DCRCFAILIE | SDIO_MASK_DTIMEOUTIE | \
-                            SDIO_MASK_DATAENDIE | SDIO_MASK_RXOVERRIE | \
-                            SDIO_MASK_RXFIFOHFIE | SDIO_MASK_STBITERRIE)
-#define SDIO_SEND_MASK     (SDIO_MASK_DCRCFAILIE | SDIO_MASK_DTIMEOUTIE | \
-                            SDIO_MASK_DATAENDIE | SDIO_MASK_TXUNDERRIE | \
-                            SDIO_MASK_TXFIFOHEIE | SDIO_MASK_STBITERRIE)
-#define SDIO_DMARECV_MASK  (SDIO_MASK_DCRCFAILIE | SDIO_MASK_DTIMEOUTIE | \
-                            SDIO_MASK_DATAENDIE | SDIO_MASK_RXOVERRIE | \
-                            SDIO_MASK_STBITERRIE)
-#define SDIO_DMASEND_MASK  (SDIO_MASK_DCRCFAILIE | SDIO_MASK_DTIMEOUTIE | \
-                            SDIO_MASK_DATAENDIE | SDIO_MASK_TXUNDERRIE | \
-                            SDIO_MASK_STBITERRIE)
+#define STM32_SDMMC_RECV_MASK     (STM32_SDMMC_MASK_DCRCFAILIE | \
+                                   STM32_SDMMC_MASK_DTIMEOUTIE | \
+                                   STM32_SDMMC_MASK_DATAENDIE  | \
+                                   STM32_SDMMC_MASK_RXOVERRIE  | \
+                                   STM32_SDMMC_MASK_RXFIFOHFIE | \
+                                   STM32_SDMMC_MASK_STBITERRIE)
+
+#define STM32_SDMMC_SEND_MASK     (STM32_SDMMC_MASK_DCRCFAILIE | \
+                                   STM32_SDMMC_MASK_DTIMEOUTIE | \
+                                   STM32_SDMMC_MASK_DATAENDIE  | \
+                                   STM32_SDMMC_MASK_TXUNDERRIE | \
+                                   STM32_SDMMC_MASK_TXFIFOHEIE | \
+                                   STM32_SDMMC_MASK_STBITERRIE)
+
+#define STM32_SDMMC_DMARECV_MASK  (STM32_SDMMC_MASK_DCRCFAILIE | \
+                                   STM32_SDMMC_MASK_DTIMEOUTIE | \
+                                   STM32_SDMMC_MASK_DATAENDIE  | \
+                                   STM32_SDMMC_MASK_RXOVERRIE | \
+                                   STM32_SDMMC_MASK_STBITERRIE)
+
+#define STM32_SDMMC_DMASEND_MASK  (STM32_SDMMC_MASK_DCRCFAILIE | \
+                                   STM32_SDMMC_MASK_DTIMEOUTIE | \
+                                   STM32_SDMMC_MASK_DATAENDIE  | \
+                                   STM32_SDMMC_MASK_TXUNDERRIE | \
+                                   STM32_SDMMC_MASK_STBITERRIE)
 
 /* Event waiting interrupt mask bits */
 
-#define SDIO_CMDDONE_STA   (SDIO_STA_CMDSENT)
-#define SDIO_RESPDONE_STA  (SDIO_STA_CTIMEOUT | SDIO_STA_CCRCFAIL | \
-                            SDIO_STA_CMDREND)
-#define SDIO_XFRDONE_STA   (0)
+#define STM32_SDMMC_CMDDONE_STA   (STM32_SDMMC_STA_CMDSENT)
+
+#define STM32_SDMMC_RESPDONE_STA  (STM32_SDMMC_STA_CTIMEOUT | \
+                                   STM32_SDMMC_STA_CCRCFAIL | \
+                                   STM32_SDMMC_STA_CMDREND)
+
+#define STM32_SDMMC_XFRDONE_STA   (0)
+
+#define STM32_SDMMC_CMDDONE_MASK  (STM32_SDMMC_MASK_CMDSENTIE)
+
+#define STM32_SDMMC_RESPDONE_MASK (STM32_SDMMC_MASK_CCRCFAILIE | \
+                                   STM32_SDMMC_MASK_CTIMEOUTIE | \
+                                   STM32_SDMMC_MASK_CMDRENDIE)
+
+#define STM32_SDMMC_XFRDONE_MASK  (0)
+
+#define STM32_SDMMC_CMDDONE_ICR   (STM32_SDMMC_ICR_CMDSENTC | \
+                                   STM32_SDMMC_ICR_DBCKENDC)
 
-#define SDIO_CMDDONE_MASK  (SDIO_MASK_CMDSENTIE)
-#define SDIO_RESPDONE_MASK (SDIO_MASK_CCRCFAILIE | SDIO_MASK_CTIMEOUTIE | \
-                            SDIO_MASK_CMDRENDIE)
-#define SDIO_XFRDONE_MASK  (0)
+#define STM32_SDMMC_RESPDONE_ICR  (STM32_SDMMC_ICR_CTIMEOUTC | \
+                                   STM32_SDMMC_ICR_CCRCFAILC | \
+                                   STM32_SDMMC_ICR_CMDRENDC  | \
+                                   STM32_SDMMC_ICR_DBCKENDC)
 
-#define SDIO_CMDDONE_ICR   (SDIO_ICR_CMDSENTC | SDIO_ICR_DBCKENDC)
-#define SDIO_RESPDONE_ICR  (SDIO_ICR_CTIMEOUTC | SDIO_ICR_CCRCFAILC | \
-                            SDIO_ICR_CMDRENDC | SDIO_ICR_DBCKENDC)
-#define SDIO_XFRDONE_ICR   (SDIO_ICR_DATAENDC | SDIO_ICR_DCRCFAILC | \
-                            SDIO_ICR_DTIMEOUTC | SDIO_ICR_RXOVERRC | \
-                            SDIO_ICR_TXUNDERRC | SDIO_ICR_STBITERRC | \
-                            SDIO_ICR_DBCKENDC)
+#define STM32_SDMMC_XFRDONE_ICR   (STM32_SDMMC_ICR_DATAENDC  | \
+                                   STM32_SDMMC_ICR_DCRCFAILC | \
+                                   STM32_SDMMC_ICR_DTIMEOUTC | \
+                                   STM32_SDMMC_ICR_RXOVERRC  | \
+                                   STM32_SDMMC_ICR_TXUNDERRC | \
+                                   STM32_SDMMC_ICR_STBITERRC | \
+                                   STM32_SDMMC_ICR_DBCKENDC)
 
-#define SDIO_WAITALL_ICR   (SDIO_CMDDONE_ICR | SDIO_RESPDONE_ICR | \
-                            SDIO_XFRDONE_ICR | SDIO_ICR_DBCKENDC)
+#define STM32_SDMMC_WAITALL_ICR   (STM32_SDMMC_CMDDONE_ICR   | \
+                                   STM32_SDMMC_RESPDONE_ICR  | \
+                                   STM32_SDMMC_XFRDONE_ICR   | \
+                                   STM32_SDMMC_ICR_DBCKENDC)
 
 /* Let's wait until we have both SDIO transfer complete and DMA complete. */
 
-#define SDIO_XFRDONE_FLAG  (1)
-#define SDIO_DMADONE_FLAG  (2)
-#define SDIO_ALLDONE       (3)
+
+#define SDMMC_XFRDONE_FLAG  (1)
+#define SDMMC_DMADONE_FLAG  (2)
+#define SDMMC_ALLDONE       (3)
 
 /* Register logging support */
 
-#ifdef CONFIG_SDIO_XFRDEBUG
+#ifdef CONFIG_STM32F7_SDMMC_XFRDEBUG
 #  ifdef CONFIG_SDIO_DMA
 #    define SAMPLENDX_BEFORE_SETUP  0
 #    define SAMPLENDX_BEFORE_ENABLE 1
@@ -262,13 +324,27 @@
  * Private Types
  ****************************************************************************/
 
-/* This structure defines the state of the STM32 SDIO interface */
+/* This structure defines the state of the STM32 SDMMC interface */
 
 struct stm32_dev_s
 {
   struct sdio_dev_s  dev;        /* Standard, base SDIO interface */
 
   /* STM32-specific extensions */
+  uint32_t          base;
+  int               nirq;
+  xcpt_t            handler;
+#ifdef CONFIG_ARCH_IRQPRIO
+  int               irqprio;
+#endif
+#ifdef CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE
+  uint32_t          d0_gpio;
+  xcpt_t            wrchandler;
+#endif
+#ifdef CONFIG_SDIO_DMA
+  uint32_t          dmapri;
+#endif
+
   /* Event support */
 
   sem_t              waitsem;    /* Implements event waiting */
@@ -295,7 +371,7 @@ struct stm32_dev_s
 
   bool               widebus;    /* Required for DMA support */
 #ifdef CONFIG_SDIO_DMA
-  volatile uint8_t   xfrflags;   /* Used to synchronize SDIO and DMA completion events */
+  volatile uint8_t   xfrflags;   /* Used to synchronize SDMMC and DMA completion events */
   bool               dmamode;    /* true: DMA mode transfer */
   DMA_HANDLE         dma;        /* Handle for DMA channel */
 #endif
@@ -303,7 +379,7 @@ struct stm32_dev_s
 
 /* Register logging support */
 
-#ifdef CONFIG_SDIO_XFRDEBUG
+#ifdef CONFIG_STM32F7_SDMMC_XFRDEBUG
 struct stm32_sdioregs_s
 {
   uint8_t  power;
@@ -332,20 +408,24 @@ struct stm32_sampleregs_s
 
 /* Low-level helpers ********************************************************/
 
+static inline void sdmmc_putreg32(struct stm32_dev_s *priv, uint32_t value,\
+                                  int offset);
+static inline uint32_t sdmmc_getreg32(struct stm32_dev_s *priv, int offset);
 static void stm32_takesem(struct stm32_dev_s *priv);
 #define     stm32_givesem(priv) (sem_post(&priv->waitsem))
-static inline void stm32_setclkcr(uint32_t clkcr);
+static inline void stm32_setclkcr(struct stm32_dev_s *priv, uint32_t clkcr);
 static void stm32_configwaitints(struct stm32_dev_s *priv, uint32_t waitmask,
               sdio_eventset_t waitevents, sdio_eventset_t wkupevents);
 static void stm32_configxfrints(struct stm32_dev_s *priv, uint32_t xfrmask);
-static void stm32_setpwrctrl(uint32_t pwrctrl);
-static inline uint32_t stm32_getpwrctrl(void);
+static void stm32_setpwrctrl(struct stm32_dev_s *priv, uint32_t pwrctrl);
+static inline uint32_t stm32_getpwrctrl(struct stm32_dev_s *priv);
 
 /* DMA Helpers **************************************************************/
 
-#ifdef CONFIG_SDIO_XFRDEBUG
+#ifdef CONFIG_STM32F7_SDMMC_XFRDEBUG
 static void stm32_sampleinit(void);
-static void stm32_sdiosample(struct stm32_sdioregs_s *regs);
+static void stm32_sdiosample(struct stm32_dev_s *priv,
+                             struct stm32_sdioregs_s *regs);
 static void stm32_sample(struct stm32_dev_s *priv, int index);
 static void stm32_sdiodump(struct stm32_sdioregs_s *regs, const char *msg);
 static void stm32_dumpsample(struct stm32_dev_s *priv,
@@ -364,8 +444,9 @@ static void stm32_dmacallback(DMA_HANDLE handle, uint8_t status, void *arg);
 /* Data Transfer Helpers ****************************************************/
 
 static uint8_t stm32_log2(uint16_t value);
-static void stm32_dataconfig(uint32_t timeout, uint32_t dlen, uint32_t dctrl);
-static void stm32_datadisable(void);
+static void stm32_dataconfig(struct stm32_dev_s *priv, uint32_t timeout,
+                             uint32_t dlen, uint32_t dctrl);
+static void stm32_datadisable(struct stm32_dev_s *priv);
 static void stm32_sendfifo(struct stm32_dev_s *priv);
 static void stm32_recvfifo(struct stm32_dev_s *priv);
 static void stm32_eventtimeout(int argc, uint32_t arg);
@@ -374,9 +455,22 @@ static void stm32_endtransfer(struct stm32_dev_s *priv, sdio_eventset_t wkupeven
 
 /* Interrupt Handling *******************************************************/
 
-static int  stm32_interrupt(int irq, void *context);
+static int  stm32_sdmmc_interrupt(struct stm32_dev_s *sdmmc_dev);
+
+#ifdef CONFIG_STM32F7_SDMMC1
+static int stm32_sdmmc1_interrupt(int irq, void *context);
+#endif
+#ifdef CONFIG_STM32F7_SDMMC2
+static int stm32_sdmmc2_interrupt(int irq, void *context);
+#endif
+
 #ifdef CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE
-static int  stm32_rdyinterrupt(int irq, void *context);
+#ifdef CONFIG_STM32F7_SDMMC1
+static int  stm32_sdmmc1_rdyinterrupt(int irq, void *context);
+#endif
+#ifdef CONFIG_STM32F7_SDMMC2
+static int  stm32_sdmmc2_rdyinterrupt(int irq, void *context);
+#endif
 #endif
 
 /* SDIO interface methods ***************************************************/
@@ -444,13 +538,69 @@ static int  stm32_dmasendsetup(FAR struct sdio_dev_s *dev,
 /* Initialization/uninitialization/reset ************************************/
 
 static void stm32_callback(void *arg);
-static void stm32_default(void);
+static void stm32_default(struct stm32_dev_s *priv);
 
 /****************************************************************************
  * Private Data
  ****************************************************************************/
-
-struct stm32_dev_s g_sdiodev =
+#ifdef CONFIG_STM32F7_SDMMC1
+struct stm32_dev_s g_sdmmcdev1 =
+{
+  .dev =
+  {
+#ifdef CONFIG_SDIO_MUXBUS
+    .lock             = stm32_lock,
+#endif
+    .reset            = stm32_reset,
+    .status           = stm32_status,
+    .widebus          = stm32_widebus,
+    .clock            = stm32_clock,
+    .attach           = stm32_attach,
+    .sendcmd          = stm32_sendcmd,
+#ifdef CONFIG_SDIO_BLOCKSETUP
+    .blocksetup       = stm32_blocksetup, /* Not implemented yet */
+#endif
+    .recvsetup        = stm32_recvsetup,
+    .sendsetup        = stm32_sendsetup,
+    .cancel           = stm32_cancel,
+    .waitresponse     = stm32_waitresponse,
+    .recvR1           = stm32_recvshortcrc,
+    .recvR2           = stm32_recvlong,
+    .recvR3           = stm32_recvshort,
+    .recvR4           = stm32_recvnotimpl,
+    .recvR5           = stm32_recvnotimpl,
+    .recvR6           = stm32_recvshortcrc,
+    .recvR7           = stm32_recvshort,
+    .waitenable       = stm32_waitenable,
+    .eventwait        = stm32_eventwait,
+    .callbackenable   = stm32_callbackenable,
+    .registercallback = stm32_registercallback,
+#ifdef CONFIG_SDIO_DMA
+    .dmasupported     = stm32_dmasupported,
+#ifdef CONFIG_SDIO_PREFLIGHT
+    .dmapreflight     = stm32_dmapreflight,
+#endif
+    .dmarecvsetup     = stm32_dmarecvsetup,
+    .dmasendsetup     = stm32_dmasendsetup,
+#endif
+  },
+  .base              = STM32_SDMMC1_BASE,
+  .nirq              = STM32_IRQ_SDMMC1,
+  .handler           = stm32_sdmmc1_interrupt,
+#ifdef CONFIG_SDMMC1_PRI
+  .irqprio           = CONFIG_SDMMC1_PRI,
+#endif
+#ifdef CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE
+  .d0_gpio           = GPIO_SDMMC1_D0,
+  .wrchandler        = stm32_sdmmc1_rdyinterrupt,
+#endif
+#ifdef CONFIG_SDMMC1_DMAPRIO
+  .dmapri            = CONFIG_SDMMC1_DMAPRIO,
+#endif
+};
+#endif
+#ifdef CONFIG_STM32F7_SDMMC2
+struct stm32_dev_s g_sdmmcdev2 =
 {
   .dev =
   {
@@ -490,11 +640,24 @@ struct stm32_dev_s g_sdiodev =
     .dmasendsetup     = stm32_dmasendsetup,
 #endif
   },
+  .base              = STM32_SDMMC2_BASE,
+  .nirq              = STM32_IRQ_SDMMC2,
+  .handler           = stm32_sdmmc2_interrupt,
+#ifdef CONFIG_SDMMC2_PRI
+  .irqprio           = CONFIG_SDMMC2_PRI,
+#endif
+#ifdef CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE
+  .d0_gpio           = GPIO_SDMMC2_D0,
+  .wrchandler        = stm32_sdmmc2_rdyinterrupt,
+#endif
+#ifdef CONFIG_SDMMC2_DMAPRIO
+  .dmapri            = CONFIG_SDMMC2_DMAPRIO,
+#endif
 };
-
+#endif
 /* Register logging support */
 
-#ifdef CONFIG_SDIO_XFRDEBUG
+#ifdef CONFIG_STM32F7_SDMMC_XFRDEBUG
 static struct stm32_sampleregs_s g_sampleregs[DEBUG_NSAMPLES];
 #endif
 
@@ -505,6 +668,44 @@ static struct stm32_sampleregs_s g_sampleregs[DEBUG_NSAMPLES];
 /****************************************************************************
  * Low-level Helpers
  ****************************************************************************/
+
+/****************************************************************************
+ * Name: sdmmc_putreg32
+ ****************************************************************************/
+
+static inline void sdmmc_putreg32(struct stm32_dev_s *priv, uint32_t value,\
+                                  int offset)
+{
+  putreg32(value, priv->base + offset);
+}
+
+/****************************************************************************
+ * Name: sdmmc_gettreg32
+ ****************************************************************************/
+
+static inline uint32_t sdmmc_getreg32(struct stm32_dev_s *priv, int offset)
+{
+  return getreg32(priv->base + offset);
+}
+
+/****************************************************************************
+ * Name: sdmmc_modifyreg32
+ ****************************************************************************/
+
+static inline void sdmmc_modifyreg32(struct stm32_dev_s *priv, int offset,
+                                      uint32_t clearbits, uint32_t setbits)
+{
+  irqstate_t flags;
+  int32_t   regval;
+
+  flags   = enter_critical_section();
+  regval  = getreg32(priv->base + offset);
+  regval &= ~clearbits;
+  regval |= setbits;
+  putreg32(regval, priv->base + offset);
+  leave_critical_section(flags);
+}
+
 /****************************************************************************
  * Name: stm32_takesem
  *
@@ -513,7 +714,7 @@ static struct stm32_sampleregs_s g_sampleregs[DEBUG_NSAMPLES];
  *   of signals).
  *
  * Input Parameters:
- *   dev - Instance of the SDIO device driver state structure.
+ *   priv  - Instance of the SDMMC private state structure.
  *
  * Returned Value:
  *   None
@@ -544,6 +745,7 @@ static void stm32_takesem(struct stm32_dev_s *priv)
  *   CLKDIV, PWRSAV, BYPASS, WIDBUS, NEGEDGE, and HWFC_EN
  *
  * Input Parameters:
+ *   priv       - Instance of the SDMMC private state structure.
  *   clkcr - A new CLKCR setting for the above mentions bits (other bits
  *           are ignored.
  *
@@ -552,27 +754,30 @@ static void stm32_takesem(struct stm32_dev_s *priv)
  *
  ****************************************************************************/
 
-static inline void stm32_setclkcr(uint32_t clkcr)
+static inline void stm32_setclkcr(struct stm32_dev_s *priv, uint32_t clkcr)
 {
-  uint32_t regval = getreg32(STM32_SDMMC1_CLKCR);
+  uint32_t regval = sdmmc_getreg32(priv, STM32_SDMMC_CLKCR_OFFSET);
 
   /* Clear CLKDIV, PWRSAV, BYPASS, WIDBUS, NEGEDGE, HWFC_EN bits */
 
-  regval &= ~(SDIO_CLKCR_CLKDIV_MASK | SDIO_CLKCR_PWRSAV | SDIO_CLKCR_BYPASS |
-              SDIO_CLKCR_WIDBUS_MASK | SDIO_CLKCR_NEGEDGE | SDIO_CLKCR_HWFC_EN |
-              SDIO_CLKCR_CLKEN);
+  regval &= ~(STM32_SDMMC_CLKCR_CLKDIV_MASK | STM32_SDMMC_CLKCR_PWRSAV      |
+              STM32_SDMMC_CLKCR_BYPASS      | STM32_SDMMC_CLKCR_WIDBUS_MASK |
+              STM32_SDMMC_CLKCR_NEGEDGE     | STM32_SDMMC_CLKCR_HWFC_EN     |
+              STM32_SDMMC_CLKCR_CLKEN);
 
   /* Replace with user provided settings */
 
-  clkcr  &=  (SDIO_CLKCR_CLKDIV_MASK | SDIO_CLKCR_PWRSAV | SDIO_CLKCR_BYPASS |
-              SDIO_CLKCR_WIDBUS_MASK | SDIO_CLKCR_NEGEDGE | SDIO_CLKCR_HWFC_EN |
-              SDIO_CLKCR_CLKEN);
+  clkcr  &=  (STM32_SDMMC_CLKCR_CLKDIV_MASK | STM32_SDMMC_CLKCR_PWRSAV      |
+              STM32_SDMMC_CLKCR_BYPASS      | STM32_SDMMC_CLKCR_WIDBUS_MASK |
+              STM32_SDMMC_CLKCR_NEGEDGE     | STM32_SDMMC_CLKCR_HWFC_EN     |
+              STM32_SDMMC_CLKCR_CLKEN);
 
   regval |=  clkcr;
-  putreg32(regval, STM32_SDMMC1_CLKCR);
+  sdmmc_putreg32(priv, regval, STM32_SDMMC_CLKCR_OFFSET);
 
-  finfo("CLKCR: %08x PWR: %08x\n",
-        getreg32(STM32_SDMMC1_CLKCR), getreg32(STM32_SDMMC1_POWER));
+  mcinfo("CLKCR: %08x PWR: %08x\n",
+        sdmmc_getreg32(priv, STM32_SDMMC_CLKCR_OFFSET),
+        sdmmc_getreg32(priv, STM32_SDMMC_POWER_OFFSET));
 }
 
 /****************************************************************************
@@ -582,7 +787,7 @@ static inline void stm32_setclkcr(uint32_t clkcr)
  *   Enable/disable SDIO interrupts needed to suport the wait function
  *
  * Input Parameters:
- *   priv       - A reference to the SDIO device state structure
+ *   priv       - Instance of the SDMMC private state structure.
  *   waitmask   - The set of bits in the SDIO MASK register to set
  *   waitevents - Waited for events
  *   wkupevent  - Wake-up events
@@ -609,24 +814,24 @@ static void stm32_configwaitints(struct stm32_dev_s *priv, uint32_t waitmask,
 #ifdef CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE
   if ((waitmask & SDIOWAIT_WRCOMPLETE) != 0)
     {
-      /* Do not use this in STM32_SDMMC1_MASK register */
+      /* Do not use this in STM32_SDMMC_MASK register */
 
       waitmask &= !SDIOWAIT_WRCOMPLETE;
 
-      pinset = GPIO_SDMMC1_D0 & (GPIO_PORT_MASK | GPIO_PIN_MASK);
+      pinset = priv->d0_gpio & (GPIO_PORT_MASK | GPIO_PIN_MASK);
       pinset |= (GPIO_INPUT | GPIO_FLOAT | GPIO_EXTI);
 
-      /* Arm the SDIO_D Ready and install Isr */
+      /* Arm the SDMMC_D Ready and install Isr */
 
-      stm32_gpiosetevent(pinset, true, false, false, stm32_rdyinterrupt);
+      stm32_gpiosetevent(pinset, true, false, false, priv->wrchandler);
     }
 
-  /* Disarm SDIO_D ready */
+  /* Disarm SDMMC_D ready */
 
   if ((wkupevent & SDIOWAIT_WRCOMPLETE) != 0)
     {
-      stm32_gpiosetevent(GPIO_SDMMC1_D0, false, false, false , NULL);
-      stm32_configgpio(GPIO_SDMMC1_D0);
+      stm32_gpiosetevent(priv->d0_gpio, false, false, false , NULL);
+      stm32_configgpio(priv->d0_gpio);
     }
 #endif
 
@@ -636,7 +841,7 @@ static void stm32_configwaitints(struct stm32_dev_s *priv, uint32_t waitmask,
 #ifdef CONFIG_SDIO_DMA
   priv->xfrflags   = 0;
 #endif
-  putreg32(priv->xfrmask | priv->waitmask, STM32_SDMMC1_MASK);
+  sdmmc_putreg32(priv, priv->xfrmask | priv->waitmask, STM32_SDMMC_MASK_OFFSET);
   leave_critical_section(flags);
 }
 
@@ -647,7 +852,7 @@ static void stm32_configwaitints(struct stm32_dev_s *priv, uint32_t waitmask,
  *   Enable SDIO interrupts needed to support the data transfer event
  *
  * Input Parameters:
- *   priv    - A reference to the SDIO device state structure
+ *   priv    - Instance of the SDMMC private state structure.
  *   xfrmask - The set of bits in the SDIO MASK register to set
  *
  * Returned Value:
@@ -660,7 +865,7 @@ static void stm32_configxfrints(struct stm32_dev_s *priv, uint32_t xfrmask)
   irqstate_t flags;
   flags = enter_critical_section();
   priv->xfrmask = xfrmask;
-  putreg32(priv->xfrmask | priv->waitmask, STM32_SDMMC1_MASK);
+  sdmmc_putreg32(priv, priv->xfrmask | priv->waitmask, STM32_SDMMC_MASK_OFFSET);
   leave_critical_section(flags);
 }
 
@@ -672,6 +877,7 @@ static void stm32_configxfrints(struct stm32_dev_s *priv, uint32_t xfrmask)
  *   ON or OFF
  *
  * Input Parameters:
+ *   priv  - Instance of the SDMMC private state structure.
  *   clkcr - A new PWRCTRL setting
  *
  * Returned Value:
@@ -679,14 +885,14 @@ static void stm32_configxfrints(struct stm32_dev_s *priv, uint32_t xfrmask)
  *
  ****************************************************************************/
 
-static void stm32_setpwrctrl(uint32_t pwrctrl)
+static void stm32_setpwrctrl(struct stm32_dev_s *priv, uint32_t pwrctrl)
 {
   uint32_t regval;
 
-  regval  = getreg32(STM32_SDMMC1_POWER);
-  regval &= ~SDIO_POWER_PWRCTRL_MASK;
+  regval  = sdmmc_getreg32(priv, STM32_SDMMC_POWER_OFFSET);
+  regval &= ~STM32_SDMMC_POWER_PWRCTRL_MASK;
   regval |= pwrctrl;
-  putreg32(regval, STM32_SDMMC1_POWER);
+  sdmmc_putreg32(priv, regval, STM32_SDMMC_POWER_OFFSET);
 }
 
 /****************************************************************************
@@ -698,16 +904,17 @@ static void stm32_setpwrctrl(uint32_t pwrctrl)
  *   or OFF
  *
  * Input Parameters:
- *   None
+ *   priv  - Instance of the SDMMC private state structure.
  *
  * Returned Value:
  *   The current value of the  the PWRCTRL field of the SDIO POWER register.
  *
  ****************************************************************************/
 
-static inline uint32_t stm32_getpwrctrl(void)
+static inline uint32_t stm32_getpwrctrl(struct stm32_dev_s *priv)
 {
-  return getreg32(STM32_SDMMC1_POWER) & SDIO_POWER_PWRCTRL_MASK;
+  return sdmmc_getreg32(priv, STM32_SDMMC_POWER_OFFSET) &
+                        STM32_SDMMC_POWER_PWRCTRL_MASK;
 }
 
 /****************************************************************************
@@ -722,7 +929,7 @@ static inline uint32_t stm32_getpwrctrl(void)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_SDIO_XFRDEBUG
+#ifdef CONFIG_STM32F7_SDMMC_XFRDEBUG
 static void stm32_sampleinit(void)
 {
   memset(g_sampleregs, 0xff, DEBUG_NSAMPLES * sizeof(struct stm32_sampleregs_s));
@@ -737,18 +944,19 @@ static void stm32_sampleinit(void)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_SDIO_XFRDEBUG
-static void stm32_sdiosample(struct stm32_sdioregs_s *regs)
+#ifdef CONFIG_STM32F7_SDMMC_XFRDEBUG
+static void stm32_sdiosample(struct stm32_dev_s *priv,
+                             struct stm32_sdioregs_s *regs)
 {
-  regs->power   = (uint8_t)getreg32(STM32_SDMMC1_POWER);
-  regs->clkcr   = (uint16_t)getreg32(STM32_SDMMC1_CLKCR);
-  regs->dctrl   = (uint16_t)getreg32(STM32_SDMMC1_DCTRL);
-  regs->dtimer  = getreg32(STM32_SDMMC1_DTIMER);
-  regs->dlen    = getreg32(STM32_SDMMC1_DLEN);
-  regs->dcount  = getreg32(STM32_SDMMC1_DCOUNT);
-  regs->sta     = getreg32(STM32_SDMMC1_STA);
-  regs->mask    = getreg32(STM32_SDMMC1_MASK);
-  regs->fifocnt = getreg32(STM32_SDMMC1_FIFOCNT);
+  regs->power   = (uint8_t)sdmmc_getreg32(priv, STM32_SDMMC_POWER_OFFSET);
+  regs->clkcr   = (uint16_t)sdmmc_getreg32(priv, STM32_SDMMC_CLKCR_OFFSET);
+  regs->dctrl   = (uint16_t)sdmmc_getreg32(priv, STM32_SDMMC_DCTRL_OFFSET);
+  regs->dtimer  = sdmmc_getreg32(priv, STM32_SDMMC_DTIMER_OFFSET);
+  regs->dlen    = sdmmc_getreg32(priv, STM32_SDMMC_DLEN_OFFSET);
+  regs->dcount  = sdmmc_getreg32(priv, STM32_SDMMC_DCOUNT_OFFSET);
+  regs->sta     = sdmmc_getreg32(priv, STM32_SDMMC_STA_OFFSET);
+  regs->mask    = sdmmc_getreg32(priv, STM32_SDMMC_MASK_OFFSET);
+  regs->fifocnt = sdmmc_getreg32(priv, STM32_SDMMC_FIFOCNT_OFFSET);
 }
 #endif
 
@@ -760,7 +968,7 @@ static void stm32_sdiosample(struct stm32_sdioregs_s *regs)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_SDIO_XFRDEBUG
+#ifdef CONFIG_STM32F7_SDMMC_XFRDEBUG
 static void stm32_sample(struct stm32_dev_s *priv, int index)
 {
   struct stm32_sampleregs_s *regs = &g_sampleregs[index];
@@ -772,7 +980,7 @@ static void stm32_sample(struct stm32_dev_s *priv, int index)
     }
 #endif
 
-  stm32_sdiosample(®s->sdio);
+  stm32_sdiosample(priv, ®s->sdio);
 }
 #endif
 
@@ -784,19 +992,19 @@ static void stm32_sample(struct stm32_dev_s *priv, int index)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_SDIO_XFRDEBUG
+#ifdef CONFIG_STM32F7_SDMMC_XFRDEBUG
 static void stm32_sdiodump(struct stm32_sdioregs_s *regs, const char *msg)
 {
-  ferr("SDIO Registers: %s\n", msg);
-  ferr("  POWER[%08x]: %08x\n", STM32_SDMMC1_POWER,   regs->power);
-  ferr("  CLKCR[%08x]: %08x\n", STM32_SDMMC1_CLKCR,   regs->clkcr);
-  ferr("  DCTRL[%08x]: %08x\n", STM32_SDMMC1_DCTRL,   regs->dctrl);
-  ferr(" DTIMER[%08x]: %08x\n", STM32_SDMMC1_DTIMER,  regs->dtimer);
-  ferr("   DLEN[%08x]: %08x\n", STM32_SDMMC1_DLEN,    regs->dlen);
-  ferr(" DCOUNT[%08x]: %08x\n", STM32_SDMMC1_DCOUNT,  regs->dcount);
-  ferr("    STA[%08x]: %08x\n", STM32_SDMMC1_STA,     regs->sta);
-  ferr("   MASK[%08x]: %08x\n", STM32_SDMMC1_MASK,    regs->mask);
-  ferr("FIFOCNT[%08x]: %08x\n", STM32_SDMMC1_FIFOCNT, regs->fifocnt);
+  mcinfo("SDIO Registers: %s\n", msg);
+  mcinfo("  POWER[%08x]: %08x\n", STM32_SDMMC_POWER_OFFSET,   regs->power);
+  mcinfo("  CLKCR[%08x]: %08x\n", STM32_SDMMC_CLKCR_OFFSET,   regs->clkcr);
+  mcinfo("  DCTRL[%08x]: %08x\n", STM32_SDMMC_DCTRL_OFFSET,   regs->dctrl);
+  mcinfo(" DTIMER[%08x]: %08x\n", STM32_SDMMC_DTIMER_OFFSET,  regs->dtimer);
+  mcinfo("   DLEN[%08x]: %08x\n", STM32_SDMMC_DLEN_OFFSET,    regs->dlen);
+  mcinfo(" DCOUNT[%08x]: %08x\n", STM32_SDMMC_DCOUNT_OFFSET,  regs->dcount);
+  mcinfo("    STA[%08x]: %08x\n", STM32_SDMMC_STA_OFFSET,     regs->sta);
+  mcinfo("   MASK[%08x]: %08x\n", STM32_SDMMC_MASK_OFFSET,    regs->mask);
+  mcinfo("FIFOCNT[%08x]: %08x\n", STM32_SDMMC_FIFOCNT_OFFSET, regs->fifocnt);
 }
 #endif
 
@@ -808,7 +1016,7 @@ static void stm32_sdiodump(struct stm32_sdioregs_s *regs, const char *msg)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_SDIO_XFRDEBUG
+#ifdef CONFIG_STM32F7_SDMMC_XFRDEBUG
 static void stm32_dumpsample(struct stm32_dev_s *priv,
                              struct stm32_sampleregs_s *regs, const char *msg)
 {
@@ -831,7 +1039,7 @@ static void stm32_dumpsample(struct stm32_dev_s *priv,
  *
  ****************************************************************************/
 
-#ifdef CONFIG_SDIO_XFRDEBUG
+#ifdef CONFIG_STM32F7_SDMMC_XFRDEBUG
 static void stm32_dumpsamples(struct stm32_dev_s *priv)
 {
   stm32_dumpsample(priv, &g_sampleregs[SAMPLENDX_BEFORE_SETUP], "Before setup");
@@ -882,7 +1090,7 @@ static void stm32_dmacallback(DMA_HANDLE handle, uint8_t status, void *arg)
 
   if ((status & DMA_STATUS_ERROR) != 0)
     {
-      fllerr("DMA error %02x, remaining: %d\n", status, priv->remaining);
+      mcerr("DMA error %02x, remaining: %d\n", status, priv->remaining);
       result = SDIOWAIT_ERROR;
     }
   else
@@ -896,8 +1104,8 @@ static void stm32_dmacallback(DMA_HANDLE handle, uint8_t status, void *arg)
    * will appropriately time out.
    */
 
-  priv->xfrflags |= SDIO_DMADONE_FLAG;
-  if (priv->xfrflags == SDIO_ALLDONE || result == SDIOWAIT_ERROR)
+  priv->xfrflags |= SDMMC_DMADONE_FLAG;
+  if (priv->xfrflags == SDMMC_ALLDONE || result == SDIOWAIT_ERROR)
     {
       stm32_endtransfer(priv, result);
     }
@@ -947,29 +1155,27 @@ static uint8_t stm32_log2(uint16_t value)
  *
  ****************************************************************************/
 
-static void stm32_dataconfig(uint32_t timeout, uint32_t dlen, uint32_t dctrl)
+static void stm32_dataconfig(struct stm32_dev_s *priv, uint32_t timeout,
+                             uint32_t dlen, uint32_t dctrl)
 {
   uint32_t regval = 0;
 
   /* Enable data path */
 
-  putreg32(timeout, STM32_SDMMC1_DTIMER); /* Set DTIMER */
-  putreg32(dlen,    STM32_SDMMC1_DLEN);   /* Set DLEN */
+  sdmmc_putreg32(priv, timeout, STM32_SDMMC_DTIMER_OFFSET); /* Set DTIMER */
+  sdmmc_putreg32(priv, dlen,    STM32_SDMMC_DLEN_OFFSET);   /* Set DLEN */
 
   /* Configure DCTRL DTDIR, DTMODE, and DBLOCKSIZE fields and set the DTEN
    * field
    */
 
-  regval  =  getreg32(STM32_SDMMC1_DCTRL);
-  regval &= ~(SDIO_DCTRL_DTDIR | SDIO_DCTRL_DTMODE | SDIO_DCTRL_DBLOCKSIZE_MASK);
-  dctrl  &=  (SDIO_DCTRL_DTDIR | SDIO_DCTRL_DTMODE | SDIO_DCTRL_DBLOCKSIZE_MASK);
-  regval |=  (dctrl | SDIO_DCTRL_DTEN);
-
-#ifdef CONFIG_SDIO_DMA
-  regval |= SDIO_DCTRL_DMAEN;
-#endif
-
-  putreg32(regval, STM32_SDMMC1_DCTRL);
+  regval  =  sdmmc_getreg32(priv, STM32_SDMMC_DCTRL_OFFSET);
+  regval &= ~(STM32_SDMMC_DCTRL_DTDIR | STM32_SDMMC_DCTRL_DTMODE |
+              STM32_SDMMC_DCTRL_DBLOCKSIZE_MASK);
+  dctrl  &=  (STM32_SDMMC_DCTRL_DTDIR | STM32_SDMMC_DCTRL_DTMODE |
+              STM32_SDMMC_DCTRL_DBLOCKSIZE_MASK);
+  regval |=  (dctrl | STM32_SDMMC_DCTRL_DTEN);
+  sdmmc_putreg32(priv, regval, STM32_SDMMC_DCTRL_OFFSET);
 }
 
 /****************************************************************************
@@ -981,21 +1187,23 @@ static void stm32_dataconfig(uint32_t timeout, uint32_t dlen, uint32_t dctrl)
  *
  ****************************************************************************/
 
-static void stm32_datadisable(void)
+static void stm32_datadisable(struct stm32_dev_s *priv)
 {
   uint32_t regval;
 
   /* Disable the data path */
 
-  putreg32(SDIO_DTIMER_DATATIMEOUT, STM32_SDMMC1_DTIMER); /* Reset DTIMER */
-  putreg32(0,                       STM32_SDMMC1_DLEN);   /* Reset DLEN */
+  /* Reset DTIMER */
+  sdmmc_putreg32(priv, SDMMC_DTIMER_DATATIMEOUT, STM32_SDMMC_DTIMER_OFFSET);
+  sdmmc_putreg32(priv, 0, STM32_SDMMC_DLEN_OFFSET);   /* Reset DLEN */
 
   /* Reset DCTRL DTEN, DTDIR, DTMODE, DMAEN, and DBLOCKSIZE fields */
 
-  regval  = getreg32(STM32_SDMMC1_DCTRL);
-  regval &= ~(SDIO_DCTRL_DTEN | SDIO_DCTRL_DTDIR | SDIO_DCTRL_DTMODE |
-              SDIO_DCTRL_DMAEN | SDIO_DCTRL_DBLOCKSIZE_MASK);
-  putreg32(regval, STM32_SDMMC1_DCTRL);
+  regval  = sdmmc_getreg32(priv, STM32_SDMMC_DCTRL_OFFSET);
+  regval &= ~(STM32_SDMMC_DCTRL_DTEN   | STM32_SDMMC_DCTRL_DTDIR |
+              STM32_SDMMC_DCTRL_DTMODE | STM32_SDMMC_DCTRL_DMAEN |
+              STM32_SDMMC_DCTRL_DBLOCKSIZE_MASK);
+  sdmmc_putreg32(priv, regval, STM32_SDMMC_DCTRL_OFFSET);
 }
 
 /****************************************************************************
@@ -1005,7 +1213,7 @@ static void stm32_datadisable(void)
  *   Send SDIO data in interrupt mode
  *
  * Input Parameters:
- *   priv - An instance of the SDIO device interface
+ *   priv  - Instance of the SDMMC private state structure.
  *
  * Returned Value:
  *   None
@@ -1023,7 +1231,7 @@ static void stm32_sendfifo(struct stm32_dev_s *priv)
   /* Loop while there is more data to be sent and the RX FIFO is not full */
 
   while (priv->remaining > 0 &&
-         (getreg32(STM32_SDMMC1_STA) & SDIO_STA_TXFIFOF) == 0)
+         (sdmmc_getreg32(priv, STM32_SDMMC_STA_OFFSET) & STM32_SDMMC_STA_TXFIFOF) == 0)
     {
       /* Is there a full word remaining in the user buffer? */
 
@@ -1056,7 +1264,7 @@ static void stm32_sendfifo(struct stm32_dev_s *priv)
 
       /* Put the word in the FIFO */
 
-      putreg32(data.w, STM32_SDMMC1_FIFO);
+     sdmmc_putreg32(priv, data.w, STM32_SDMMC_FIFO_OFFSET);
     }
 }
 
@@ -1067,7 +1275,7 @@ static void stm32_sendfifo(struct stm32_dev_s *priv)
  *   Receive SDIO data in interrupt mode
  *
  * Input Parameters:
- *   priv - An instance of the SDIO device interface
+ *   priv  - Instance of the SDMMC private state structure.
  *
  * Returned Value:
  *   None
@@ -1087,11 +1295,11 @@ static void stm32_recvfifo(struct stm32_dev_s *priv)
    */
 
   while (priv->remaining > 0 &&
-         (getreg32(STM32_SDMMC1_STA) & SDIO_STA_RXDAVL) != 0)
+         (sdmmc_getreg32(priv, STM32_SDMMC_STA_OFFSET) & STM32_SDMMC_STA_RXDAVL) != 0)
     {
       /* Read the next word from the RX FIFO */
 
-      data.w = getreg32(STM32_SDMMC1_FIFO);
+      data.w = sdmmc_getreg32(priv, STM32_SDMMC_FIFO_OFFSET);
       if (priv->remaining >= sizeof(uint32_t))
         {
           /* Transfer the whole word to the user buffer */
@@ -1127,7 +1335,8 @@ static void stm32_recvfifo(struct stm32_dev_s *priv)
  *
  * Input Parameters:
  *   argc   - The number of arguments (should be 1)
- *   arg    - The argument (state structure reference cast to uint32_t)
+ *   arg    - The argument (the SDMMC private state structure reference cast
+ *            to uint32_t)
  *
  * Returned Value:
  *   None
@@ -1143,7 +1352,8 @@ static void stm32_eventtimeout(int argc, uint32_t arg)
 
   /* There is always race conditions with timer expirations. */
 
-  DEBUGASSERT((priv->waitevents & SDIOWAIT_TIMEOUT) != 0 || priv->wkupevent != 0);
+  DEBUGASSERT((priv->waitevents & SDIOWAIT_TIMEOUT) != 0 ||
+              priv->wkupevent != 0);
 
   /* Is a data transfer complete event expected? */
 
@@ -1152,7 +1362,7 @@ static void stm32_eventtimeout(int argc, uint32_t arg)
       /* Yes.. wake up any waiting threads */
 
       stm32_endwait(priv, SDIOWAIT_TIMEOUT);
-      fllerr("Timeout: remaining: %d\n", priv->remaining);
+      mcerr("Timeout: remaining: %d\n", priv->remaining);
     }
 }
 
@@ -1163,7 +1373,7 @@ static void stm32_eventtimeout(int argc, uint32_t arg)
  *   Wake up a waiting thread if the waited-for event has occurred.
  *
  * Input Parameters:
- *   priv      - An instance of the SDIO device interface
+ *   priv  - Instance of the SDMMC private state structure.
  *   wkupevent - The event that caused the wait to end
  *
  * Returned Value:
@@ -1198,7 +1408,7 @@ static void stm32_endwait(struct stm32_dev_s *priv, sdio_eventset_t wkupevent)
  *   are detected.
  *
  * Input Parameters:
- *   priv   - An instance of the SDIO device interface
+ *   priv  - Instance of the SDMMC private state structure.
  *   wkupevent - The event that caused the transfer to end
  *
  * Returned Value:
@@ -1209,7 +1419,8 @@ static void stm32_endwait(struct stm32_dev_s *priv, sdio_eventset_t wkupevent)
  *
  ****************************************************************************/
 
-static void stm32_endtransfer(struct stm32_dev_s *priv, sdio_eventset_t wkupevent)
+static void stm32_endtransfer(struct stm32_dev_s *priv,
+                              sdio_eventset_t wkupevent)
 {
   /* Disable all transfer related interrupts */
 
@@ -1217,7 +1428,7 @@ static void stm32_endtransfer(struct stm32_dev_s *priv, sdio_eventset_t wkupeven
 
   /* Clearing pending interrupt status on all transfer related interrupts */
 
-  putreg32(SDIO_XFRDONE_ICR, STM32_SDMMC1_ICR);
+  sdmmc_putreg32(priv, STM32_SDMMC_XFRDONE_ICR, STM32_SDMMC_ICR_OFFSET);
 
   /* If this was a DMA transfer, make sure that DMA is stopped */
 
@@ -1256,13 +1467,14 @@ static void stm32_endtransfer(struct stm32_dev_s *priv, sdio_eventset_t wkupeven
  ****************************************************************************/
 
 /****************************************************************************
- * Name: stm32_rdyinterrupt
+ * Name: stm32_sdmmc[1|2]_rdyinterrupt
  *
  * Description:
- *   SDIO ready interrupt handler
+ *   SDMMC ready interrupt handler
  *
  * Input Parameters:
- *   dev - An instance of the SDIO device interface
+ *   irq     - not used
+ *   context - not used
  *
  * Returned Value:
  *   None
@@ -1270,31 +1482,41 @@ static void stm32_endtransfer(struct stm32_dev_s *priv, sdio_eventset_t wkupeven
  ****************************************************************************/
 
 #ifdef CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE
-static int stm32_rdyinterrupt(int irq, void *context)
+#  if defined(CONFIG_STM32F7_SDMMC1)
+static int stm32_sdmmc1_rdyinterrupt(int irq, void *context)
+{
+  struct stm32_dev_s *priv = &g_sdmmcdev1;
+  stm32_endwait(priv, SDIOWAIT_WRCOMPLETE);
+  return OK;
+}
+#  endif
+
+#  if defined(CONFIG_STM32F7_SDMMC2)
+static int stm32_sdmmc2_rdyinterrupt(int irq, void *context)
 {
-  struct stm32_dev_s *priv = &g_sdiodev;
+  struct stm32_dev_s *priv = &g_sdmmcdev2;
   stm32_endwait(priv, SDIOWAIT_WRCOMPLETE);
   return OK;
 }
+#  endif
 #endif
 
 /****************************************************************************
- * Name: stm32_interrupt
+ * Name: stm32_sdmmc_interrupt
  *
  * Description:
- *   SDIO interrupt handler
+ *   SDMMC common interrupt handler
  *
  * Input Parameters:
- *   dev - An instance of the SDIO device interface
+ *   priv  - Instance of the SDMMC private state structure.
  *
  * Returned Value:
  *   None
  *
  ****************************************************************************/
 
-static int stm32_interrupt(int irq, void *context)
+static int stm32_sdmmc_interrupt(struct stm32_dev_s  *priv)
 {
-  struct stm32_dev_s *priv = &g_sdiodev;
   uint32_t enabled;
   uint32_t pending;
 
@@ -1305,7 +1527,8 @@ static int stm32_interrupt(int irq, void *context)
    * bits remaining, then we have work to do here.
    */
 
-  while ((enabled = getreg32(STM32_SDMMC1_STA) & getreg32(STM32_SDMMC1_MASK)) != 0)
+  while ((enabled = sdmmc_getreg32(priv, STM32_SDMMC_STA_OFFSET) &
+          sdmmc_getreg32(priv, STM32_SDMMC_MASK_OFFSET)) != 0)
     {
       /* Handle in progress, interrupt driven data transfers ****************/
 
@@ -1320,7 +1543,7 @@ static int stm32_interrupt(int irq, void *context)
                * processing a receive transaction.
                */
 
-              if ((pending & SDIO_STA_RXFIFOHF) != 0)
+              if ((pending & STM32_SDMMC_STA_RXFIFOHF) != 0)
                 {
                   /* Receive data from the RX FIFO */
 
@@ -1332,7 +1555,7 @@ static int stm32_interrupt(int irq, void *context)
                * both!
                */
 
-              else if ((pending & SDIO_STA_TXFIFOHE) != 0)
+              else if ((pending & STM32_SDMMC_STA_TXFIFOHE) != 0)
                 {
                   /* Send data via the TX FIFO */
 
@@ -1342,7 +1565,7 @@ static int stm32_interrupt(int irq, void *context)
 
           /* Handle data end events */
 
-          if ((pending & SDIO_STA_DATAEND) != 0)
+          if ((pending & STM32_SDMMC_STA_DATAEND) != 0)
             {
               /* Handle any data remaining the RX FIFO.  If the RX FIFO is
                * less than half full at the end of the transfer, then no
@@ -1358,8 +1581,8 @@ static int stm32_interrupt(int irq, void *context)
                    * finished.
                    */
 
-                  priv->xfrflags |= SDIO_XFRDONE_FLAG;
-                  if (priv->xfrflags == SDIO_ALLDONE)
+                  priv->xfrflags |= SDMMC_XFRDONE_FLAG;
+                  if (priv->xfrflags == SDMMC_ALLDONE)
                     {
                       stm32_endtransfer(priv, SDIOWAIT_TRANSFERDONE);
                     }
@@ -1388,51 +1611,52 @@ static int stm32_interrupt(int irq, void *context)
 
           /* Handle data block send/receive CRC failure */
 
-          else if ((pending & SDIO_STA_DCRCFAIL) != 0)
+          else if ((pending & STM32_SDMMC_STA_DCRCFAIL) != 0)
             {
               /* Terminate the transfer with an error */
 
-              fllerr("ERROR: Data block CRC failure, remaining: %d\n", priv->remaining);
+              mcerr("ERROR: Data block CRC failure, remaining: %d\n",
+                    priv->remaining);
               stm32_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR);
             }
 
           /* Handle data timeout error */
 
-          else if ((pending & SDIO_STA_DTIMEOUT) != 0)
+          else if ((pending & STM32_SDMMC_STA_DTIMEOUT) != 0)
             {
               /* Terminate the transfer with an error */
 
-              fllerr("ERROR: Data timeout, remaining: %d\n", priv->remaining);
+              mcerr("ERROR: Data timeout, remaining: %d\n", priv->remaining);
               stm32_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_TIMEOUT);
             }
 
           /* Handle RX FIFO overrun error */
 
-          else if ((pending & SDIO_STA_RXOVERR) != 0)
+          else if ((pending & STM32_SDMMC_STA_RXOVERR) != 0)
             {
               /* Terminate the transfer with an error */
 
-              fllerr("ERROR: RX FIFO overrun, remaining: %d\n", priv->remaining);
+              mcerr("ERROR: RX FIFO overrun, remaining: %d\n", priv->remaining);
               stm32_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR);
             }
 
           /* Handle TX FIFO underrun error */
 
-          else if ((pending & SDIO_STA_TXUNDERR) != 0)
+          else if ((pending & STM32_SDMMC_STA_TXUNDERR) != 0)
             {
               /* Terminate the transfer with an error */
 
-              fllerr("ERROR: TX FIFO underrun, remaining: %d\n", priv->remaining);
+              mcerr("ERROR: TX FIFO underrun, remaining: %d\n", priv->remaining);
               stm32_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR);
             }
 
           /* Handle start bit error */
 
-          else if ((pending & SDIO_STA_STBITERR) != 0)
+          else if ((pending & STM32_SDMMC_STA_STBITERR) != 0)
             {
               /* Terminate the transfer with an error */
 
-              fllerr("ERROR: Start bit, remaining: %d\n", priv->remaining);
+              mcerr("ERROR: Start bit, remaining: %d\n", priv->remaining);
               stm32_endtransfer(priv, SDIOWAIT_TRANSFERDONE | SDIOWAIT_ERROR);
             }
         }
@@ -1444,7 +1668,7 @@ static int stm32_interrupt(int irq, void *context)
         {
           /* Is this a response completion event? */
 
-          if ((pending & SDIO_RESPDONE_STA) != 0)
+          if ((pending & STM32_SDMMC_RESPDONE_STA) != 0)
             {
               /* Yes.. Is their a thread waiting for response done? */
 
@@ -1452,14 +1676,15 @@ static int stm32_interrupt(int irq, void *context)
                 {
                   /* Yes.. wake the thread up */
 
-                  putreg32(SDIO_RESPDONE_ICR | SDIO_CMDDONE_ICR, STM32_SDMMC1_ICR);
+                 sdmmc_putreg32(priv, STM32_SDMMC_RESPDONE_ICR |
+                                STM32_SDMMC_CMDDONE_ICR, STM32_SDMMC_ICR_OFFSET);
                   stm32_endwait(priv, SDIOWAIT_RESPONSEDONE);
                 }
             }
 
           /* Is this a command completion event? */
 
-          if ((pending & SDIO_CMDDONE_STA) != 0)
+          if ((pending & STM32_SDMMC_CMDDONE_STA) != 0)
             {
               /* Yes.. Is their a thread waiting for command done? */
 
@@ -1467,7 +1692,8 @@ static int stm32_interrupt(int irq, void *context)
                 {
                   /* Yes.. wake the thread up */
 
-                  putreg32(SDIO_CMDDONE_ICR, STM32_SDMMC1_ICR);
+                 sdmmc_putreg32(priv, STM32_SDMMC_CMDDONE_ICR,
+                                STM32_SDMMC_ICR_OFFSET);
                   stm32_endwait(priv, SDIOWAIT_CMDDONE);
                 }
             }
@@ -1477,6 +1703,49 @@ static int stm32_interrupt(int irq, void *context)
   return OK;
 }
 
+/****************************************************************************
+ * Name: stm32_sdmmc1_interrupt
+ *
+ * Description:
+ *   SDMMC 1 interrupt handler wrapper
+ *
+ * Input Parameters:
+ *   irq     - not used
+ *   context - not used
+ *
+ * Returned Value:
+ *   None
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_STM32F7_SDMMC1
+static int stm32_sdmmc1_interrupt(int irq, void *context)
+{
+  return stm32_sdmmc_interrupt(&g_sdmmcdev1);
+}
+#endif
+
+/****************************************************************************
+ * Name: stm32_sdmmc2_interrupt
+ *
+ * Description:
+ *   SDMMC 2 interrupt handler wrapper
+ *
+ * Input Parameters:
+ *   irq     - not used
+ *   context - not used
+ *
+ *
+ * Returned Value:
+ *   None
+ *
+ ****************************************************************************/
+#ifdef CONFIG_STM32F7_SDMMC2
+static int stm32_sdmmc2_interrupt(int irq, void *context)
+{
+  return stm32_sdmmc_interrupt(&g_sdmmcdev2);
+}
+#endif
 /****************************************************************************
  * SDIO Interface Methods
  ****************************************************************************/
@@ -1500,11 +1769,9 @@ static int stm32_interrupt(int irq, void *context)
 #ifdef CONFIG_SDIO_MUXBUS
 static int stm32_lock(FAR struct sdio_dev_s *dev, bool lock)
 {
-  /* Single SDIO instance so there is only one possibility.  The multiplex
-   * bus is part of board support package.
+  /* The multiplex bus is part of board support package.
    */
-
-  stm32_muxbus_sdio_lock(lock);
+  stm32_muxbus_sdio_lock(dev, lock);
   return OK;
 }
 #endif
@@ -1531,11 +1798,12 @@ static void stm32_reset(FAR struct sdio_dev_s *dev)
   /* Disable clocking */
 
   flags = enter_critical_section();
-  stm32_setpwrctrl(SDIO_POWER_PWRCTRL_OFF);
+  sdmmc_modifyreg32(priv, STM32_SDMMC_CLKCR_OFFSET, STM32_SDMMC_CLKCR_CLKEN, 0);
+  stm32_setpwrctrl(priv, STM32_SDMMC_POWER_PWRCTRL_OFF);
 
   /* Put SDIO registers in their default, reset state */
 
-  stm32_default();
+  stm32_default(priv);
 
   /* Reset data */
 
@@ -1543,7 +1811,8 @@ static void stm32_reset(FAR struct sdio_dev_s *dev)
   priv->waitmask   = 0;      /* Interrupt enables for event waiting */
   priv->wkupevent  = 0;      /* The event that caused the wakeup */
 #ifdef CONFIG_SDIO_DMA
-  priv->xfrflags   = 0;      /* Used to synchronize SDIO and DMA completion events */
+  priv->xfrflags   = 0;      /* Used to synchronize SDIO and DMA
+                              * completion events */
 #endif
 
   wd_cancel(priv->waitwdog); /* Cancel any timeouts */
@@ -1563,12 +1832,13 @@ static void stm32_reset(FAR struct sdio_dev_s *dev)
 
   /* Configure the SDIO peripheral */
 
-  stm32_setclkcr(STM32_CLCKCR_INIT | SDIO_CLKCR_CLKEN);
-  stm32_setpwrctrl(SDIO_POWER_PWRCTRL_ON);
+  stm32_setclkcr(priv, STM32_CLCKCR_INIT | STM32_SDMMC_CLKCR_CLKEN);
+  stm32_setpwrctrl(priv, STM32_SDMMC_POWER_PWRCTRL_ON);
   leave_critical_section(flags);
 
-  finfo("CLCKR: %08x POWER: %08x\n",
-        getreg32(STM32_SDMMC1_CLKCR), getreg32(STM32_SDMMC1_POWER));
+  mcinfo("CLCKR: %08x POWER: %08x\n",
+        sdmmc_getreg32(priv, STM32_SDMMC_CLKCR_OFFSET),
+        sdmmc_getreg32(priv, STM32_SDMMC_POWER_OFFSET));
 }
 
 /****************************************************************************
@@ -1631,6 +1901,7 @@ static void stm32_widebus(FAR struct sdio_dev_s *dev, bool wide)
 
 static void stm32_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate)
 {
+  struct stm32_dev_s *priv = (struct stm32_dev_s *)dev;
   uint32_t clckr;
 
   switch (rate)
@@ -1645,33 +1916,33 @@ static void stm32_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate)
       /* Enable in initial ID mode clocking (<400KHz) */
 
       case CLOCK_IDMODE:
-        clckr = (STM32_CLCKCR_INIT | SDIO_CLKCR_CLKEN);
+        clckr = (STM32_CLCKCR_INIT | STM32_SDMMC_CLKCR_CLKEN);
         break;
 
       /* Enable in MMC normal operation clocking */
 
       case CLOCK_MMC_TRANSFER:
-        clckr = (SDIO_CLKCR_MMCXFR | SDIO_CLKCR_CLKEN);
+        clckr = (STM32_SDMMC_CLKCR_MMCXFR | STM32_SDMMC_CLKCR_CLKEN);
         break;
 
       /* SD normal operation clocking (wide 4-bit mode) */
 
       case CLOCK_SD_TRANSFER_4BIT:
-#ifndef CONFIG_SDIO_WIDTH_D1_ONLY
-        clckr = (SDIO_CLCKR_SDWIDEXFR | SDIO_CLKCR_CLKEN);
+#ifndef CONFIG_SDMMC_WIDTH_D1_ONLY
+        clckr = (STM32_SDMMC_CLCKR_SDWIDEXFR | STM32_SDMMC_CLKCR_CLKEN);
         break;
 #endif
 
       /* SD normal operation clocking (narrow 1-bit mode) */
 
       case CLOCK_SD_TRANSFER_1BIT:
-        clckr = (SDIO_CLCKR_SDXFR | SDIO_CLKCR_CLKEN);
+        clckr = (STM32_SDMMC_CLCKR_SDXFR | STM32_SDMMC_CLKCR_CLKEN);
         break;
     }
 
   /* Set the new clock frequency along with the clock enable/disable bit */
 
-  stm32_setclkcr(clckr);
+  stm32_setclkcr(priv, clckr);
 }
 
 /****************************************************************************
@@ -1690,11 +1961,13 @@ static void stm32_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate)
 
 static int stm32_attach(FAR struct sdio_dev_s *dev)
 {
+  struct stm32_dev_s *priv = (struct stm32_dev_s *)dev;
   int ret;
 
   /* Attach the SDIO interrupt handler */
 
-  ret = irq_attach(STM32_IRQ_SDMMC1, stm32_interrupt);
+  ret = irq_attach(priv->nirq, priv->handler);
+
   if (ret == OK)
     {
 
@@ -1702,19 +1975,20 @@ static int stm32_attach(FAR struct sdio_dev_s *dev)
        * interrupt flags
        */
 
-      putreg32(SDIO_MASK_RESET,      STM32_SDMMC1_MASK);
-      putreg32(SDIO_ICR_STATICFLAGS, STM32_SDMMC1_ICR);
+     sdmmc_putreg32(priv, STM32_SDMMC_MASK_RESET, STM32_SDMMC_MASK_OFFSET);
+     sdmmc_putreg32(priv, STM32_SDMMC_ICR_STATICFLAGS, STM32_SDMMC_ICR_OFFSET);
 
       /* Enable SDIO interrupts at the NVIC.  They can now be enabled at
        * the SDIO controller as needed.
        */
 
-      up_enable_irq(STM32_IRQ_SDMMC1);
+      up_enable_irq(priv->nirq);
 
-#ifdef CONFIG_ARCH_IRQPRIO
+#if defined(CONFIG_ARCH_IRQPRIO) && (defined(CONFIG_SDMMC1_DMAPRIO) || \
+                                     defined(CONFIG_SDMMC2_DMAPRIO))
       /* Set the interrupt priority */
 
-      up_prioritize_irq(STM32_IRQ_SDIO, CONFIG_SDIO_PRI);
+      up_prioritize_irq(priv->nirq, priv->irqprio);
 #endif
     }
 
@@ -1739,25 +2013,27 @@ static int stm32_attach(FAR struct sdio_dev_s *dev)
 
 static int stm32_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t arg)
 {
+  struct stm32_dev_s *priv = (struct stm32_dev_s *)dev;
   uint32_t regval;
   uint32_t cmdidx;
 
   /* Set the SDIO Argument value */
 
-  putreg32(arg, STM32_SDMMC1_ARG);
+  sdmmc_putreg32(priv, arg, STM32_SDMMC_ARG_OFFSET);
 
   /* Clear CMDINDEX, WAITRESP, WAITINT, WAITPEND, and CPSMEN bits */
 
-  regval = getreg32(STM32_SDMMC1_CMD);
-  regval &= ~(SDIO_CMD_CMDINDEX_MASK | SDIO_CMD_WAITRESP_MASK |
-              SDIO_CMD_WAITINT | SDIO_CMD_WAITPEND | SDIO_CMD_CPSMEN);
+  regval = sdmmc_getreg32(priv, STM32_SDMMC_CMD_OFFSET);
+  regval &= ~(STM32_SDMMC_CMD_CMDINDEX_MASK | STM32_SDMMC_CMD_WAITRESP_MASK |
+              STM32_SDMMC_CMD_WAITINT       | STM32_SDMMC_CMD_WAITPEND      |
+              STM32_SDMMC_CMD_CPSMEN);
 
   /* Set WAITRESP bits */
 
   switch (cmd & MMCSD_RESPONSE_MASK)
     {
     case MMCSD_NO_RESPONSE:
-      regval |= SDIO_CMD_NORESPONSE;
+      regval |= STM32_SDMMC_CMD_NORESPONSE;
       break;
 
     case MMCSD_R1_RESPONSE:
@@ -1767,25 +2043,26 @@ static int stm32_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t arg)
     case MMCSD_R5_RESPONSE:
     case MMCSD_R6_RESPONSE:
     case MMCSD_R7_RESPONSE:
-      regval |= SDIO_CMD_SHORTRESPONSE;
+      regval |= STM32_SDMMC_CMD_SHORTRESPONSE;
       break;
 
     case MMCSD_R2_RESPONSE:
-      regval |= SDIO_CMD_LONGRESPONSE;
+      regval |= STM32_SDMMC_CMD_LONGRESPONSE;
       break;
     }
 
   /* Set CPSMEN and the command index */
 
   cmdidx  = (cmd & MMCSD_CMDIDX_MASK) >> MMCSD_CMDIDX_SHIFT;
-  regval |= cmdidx | SDIO_CMD_CPSMEN;
+  regval |= cmdidx | STM32_SDMMC_CMD_CPSMEN;
 
-  finfo("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, regval);
+  mcinfo("cmd: %08x arg: %08x regval: %08x\n", cmd, arg, regval);
 
   /* Write the SDIO CMD */
 
-  putreg32(SDIO_RESPDONE_ICR | SDIO_CMDDONE_ICR, STM32_SDMMC1_ICR);
-  putreg32(regval, STM32_SDMMC1_CMD);
+  sdmmc_putreg32(priv, STM32_SDMMC_RESPDONE_ICR | STM32_SDMMC_CMDDONE_ICR,
+                 STM32_SDMMC_ICR_OFFSET);
+  sdmmc_putreg32(priv, regval, STM32_SDMMC_CMD_OFFSET);
   return OK;
 }
 
@@ -1797,7 +2074,7 @@ static int stm32_sendcmd(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t arg)
  *   (interrupt driven mode).  This method will do whatever controller setup
  *   is necessary.  This would be called for SD memory just BEFORE sending
  *   CMD13 (SEND_STATUS), CMD17 (READ_SINGLE_BLOCK), CMD18
- *   (READ_MULTIPLE_BLOCKS), ACMD51 (SEND_SCR), etc.  Normally, SDIO_WAITEVENT
+ *   (READ_MULTIPLE_BLOCKS), ACMD51 (SEND_SCR), etc.  Normally, SDMMC_WAITEVENT
  *   will be called to receive the indication that the transfer is complete.
  *
  * Input Parameters:
@@ -1821,7 +2098,7 @@ static int stm32_recvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer,
 
   /* Reset the DPSM configuration */
 
-  stm32_datadisable();
+  stm32_datadisable(priv);
   stm32_sampleinit();
   stm32_sample(priv, SAMPLENDX_BEFORE_SETUP);
 
@@ -1835,12 +2112,13 @@ static int stm32_recvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer,
 
   /* Then set up the SDIO data path */
 
-  dblocksize = stm32_log2(nbytes) << SDIO_DCTRL_DBLOCKSIZE_SHIFT;
-  stm32_dataconfig(SDIO_DTIMER_DATATIMEOUT, nbytes, dblocksize | SDIO_DCTRL_DTDIR);
+  dblocksize = stm32_log2(nbytes) << STM32_SDMMC_DCTRL_DBLOCKSIZE_SHIFT;
+  stm32_dataconfig(priv, SDMMC_DTIMER_DATATIMEOUT, nbytes, dblocksize |
+                   STM32_SDMMC_DCTRL_DTDIR);
 
   /* And enable interrupts */
 
-  stm32_configxfrints(priv, SDIO_RECV_MASK);
+  stm32_configxfrints(priv, STM32_SDMMC_RECV_MASK);
   stm32_sample(priv, SAMPLENDX_AFTER_SETUP);
   return OK;
 }
@@ -1852,7 +2130,7 @@ static int stm32_recvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer,
  *   Setup hardware in preparation for data transfer from the card.  This method
  *   will do whatever controller setup is necessary.  This would be called
  *   for SD memory just AFTER sending CMD24 (WRITE_BLOCK), CMD25
- *   (WRITE_MULTIPLE_BLOCK), ... and before SDIO_SENDDATA is called.
+ *   (WRITE_MULTIPLE_BLOCK), ... and before SDMMC_SENDDATA is called.
  *
  * Input Parameters:
  *   dev    - An instance of the SDIO device interface
@@ -1864,8 +2142,8 @@ static int stm32_recvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer,
  *
  ****************************************************************************/
 
-static int stm32_sendsetup(FAR struct sdio_dev_s *dev, FAR const uint8_t *buffer,
-                           size_t nbytes)
+static int stm32_sendsetup(FAR struct sdio_dev_s *dev, FAR const
+                           uint8_t *buffer, size_t nbytes)
 {
   struct stm32_dev_s *priv = (struct stm32_dev_s *)dev;
   uint32_t dblocksize;
@@ -1875,7 +2153,7 @@ static int stm32_sendsetup(FAR struct sdio_dev_s *dev, FAR const uint8_t *buffer
 
   /* Reset the DPSM configuration */
 
-  stm32_datadisable();
+  stm32_datadisable(priv);
   stm32_sampleinit();
   stm32_sample(priv, SAMPLENDX_BEFORE_SETUP);
 
@@ -1889,12 +2167,12 @@ static int stm32_sendsetup(FAR struct sdio_dev_s *dev, FAR const uint8_t *buffer
 
   /* Then set up the SDIO data path */
 
-  dblocksize = stm32_log2(nbytes) << SDIO_DCTRL_DBLOCKSIZE_SHIFT;
-  stm32_dataconfig(SDIO_DTIMER_DATATIMEOUT, nbytes, dblocksize);
+  dblocksize = stm32_log2(nbytes) << STM32_SDMMC_DCTRL_DBLOCKSIZE_SHIFT;
+  stm32_dataconfig(priv, SDMMC_DTIMER_DATATIMEOUT, nbytes, dblocksize);
 
   /* Enable TX interrupts */
 
-  stm32_configxfrints(priv, SDIO_SEND_MASK);
+  stm32_configxfrints(priv, STM32_SDMMC_SEND_MASK);
   stm32_sample(priv, SAMPLENDX_AFTER_SETUP);
   return OK;
 }
@@ -1903,8 +2181,8 @@ static int stm32_sendsetup(FAR struct sdio_dev_s *dev, FAR const uint8_t *buffer
  * Name: stm32_cancel
  *
  * Description:
- *   Cancel the data transfer setup of SDIO_RECVSETUP, SDIO_SENDSETUP,
- *   SDIO_DMARECVSETUP or SDIO_DMASENDSETUP.  This must be called to cancel
+ *   Cancel the data transfer setup of SDMMC_RECVSETUP, SDMMC_SENDSETUP,
+ *   SDMMC_DMARECVSETUP or SDMMC_DMASENDSETUP.  This must be called to cancel
  *   the data transfer setup if, for some reason, you cannot perform the
  *   transfer.
  *
@@ -1929,7 +2207,7 @@ static int stm32_cancel(FAR struct sdio_dev_s *dev)
    * interrupts
    */
 
-  putreg32(SDIO_WAITALL_ICR, STM32_SDMMC1_ICR);
+  sdmmc_putreg32(priv, STM32_SDMMC_WAITALL_ICR, STM32_SDMMC_ICR_OFFSET);
 
   /* Cancel any watchdog timeout */
 
@@ -1972,22 +2250,23 @@ static int stm32_cancel(FAR struct sdio_dev_s *dev)
 
 static int stm32_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
 {
+  struct stm32_dev_s *priv = (struct stm32_dev_s *)dev;
   int32_t timeout;
   uint32_t events;
 
   switch (cmd & MMCSD_RESPONSE_MASK)
     {
     case MMCSD_NO_RESPONSE:
-      events  = SDIO_CMDDONE_STA;
-      timeout = SDIO_CMDTIMEOUT;
+      events  = STM32_SDMMC_CMDDONE_STA;
+      timeout = SDMMC_CMDTIMEOUT;
       break;
 
     case MMCSD_R1_RESPONSE:
     case MMCSD_R1B_RESPONSE:
     case MMCSD_R2_RESPONSE:
     case MMCSD_R6_RESPONSE:
-      events  = SDIO_RESPDONE_STA;
-      timeout = SDIO_LONGTIMEOUT;
+      events  = STM32_SDMMC_RESPDONE_STA;
+      timeout = SDMMC_LONGTIMEOUT;
       break;
 
     case MMCSD_R4_RESPONSE:
@@ -1996,8 +2275,8 @@ static int stm32_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
 
     case MMCSD_R3_RESPONSE:
     case MMCSD_R7_RESPONSE:
-      events  = SDIO_RESPDONE_STA;
-      timeout = SDIO_CMDTIMEOUT;
+      events  = STM32_SDMMC_RESPDONE_STA;
+      timeout = SDMMC_CMDTIMEOUT;
       break;
 
     default:
@@ -2006,18 +2285,18 @@ static int stm32_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
 
   /* Then wait for the response (or timeout) */
 
-  while ((getreg32(STM32_SDMMC1_STA) & events) == 0)
+  while ((sdmmc_getreg32(priv, STM32_SDMMC_STA_OFFSET) & events) == 0)
     {
       if (--timeout <= 0)
         {
-          ferr("ERROR: Timeout cmd: %08x events: %08x STA: %08x\n",
-               cmd, events, getreg32(STM32_SDMMC1_STA));
+           mcerr("ERROR: Timeout cmd: %08x events: %08x STA: %08x\n",
+               cmd, events, sdmmc_getreg32(priv, STM32_SDMMC_STA_OFFSET));
 
           return -ETIMEDOUT;
         }
     }
 
-  putreg32(SDIO_CMDDONE_ICR, STM32_SDMMC1_ICR);
+  sdmmc_putreg32(priv, STM32_SDMMC_CMDDONE_ICR, STM32_SDMMC_ICR_OFFSET);
   return OK;
 }
 
@@ -2036,15 +2315,17 @@ static int stm32_waitresponse(FAR struct sdio_dev_s *dev, uint32_t cmd)
  *
  * Returned Value:
  *   Number of bytes sent on success; a negated errno on failure.  Here a
- *   failure means only a faiure to obtain the requested reponse (due to
+ *   failure means only a faiure to obtain the requested response (due to
  *   transport problem -- timeout, CRC, etc.).  The implementation only
- *   assures that the response is returned intacta and does not check errors
+ *   assures that the response is returned intact and does not check errors
  *   within the response itself.
  *
  ****************************************************************************/
 
-static int stm32_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort)
+static int stm32_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd,
+                              uint32_t *rshort)
 {
+  struct stm32_dev_s *priv = (struct stm32_dev_s *)dev;
 #ifdef CONFIG_DEBUG_FEATURES
   uint32_t respcmd;
 #endif
@@ -2077,7 +2358,7 @@ static int stm32_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t
 #ifdef CONFIG_DEBUG_FEATURES
   if (!rshort)
     {
-      ferr("ERROR: rshort=NULL\n");
+      mcerr("ERROR: rshort=NULL\n");
       ret = -EINVAL;
     }
 
@@ -2087,7 +2368,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)
     {
-      ferr("ERROR: Wrong response CMD=%08x\n", cmd);
+      mcerr("ERROR: Wrong response CMD=%08x\n", cmd);
       ret = -EINVAL;
     }
   else
@@ -2095,15 +2376,15 @@ static int stm32_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t
     {
       /* Check if a timeout or CRC error occurred */
 
-      regval = getreg32(STM32_SDMMC1_STA);
-      if ((regval & SDIO_STA_CTIMEOUT) != 0)
+      regval = sdmmc_getreg32(priv, STM32_SDMMC_STA_OFFSET);
+      if ((regval & STM32_SDMMC_STA_CTIMEOUT) != 0)
         {
-          ferr("ERROR: Command timeout: %08x\n", regval);
+          mcerr("ERROR: Command timeout: %08x\n", regval);
           ret = -ETIMEDOUT;
         }
-      else if ((regval & SDIO_STA_CCRCFAIL) != 0)
+      else if ((regval & STM32_SDMMC_STA_CCRCFAIL) != 0)
         {
-          ferr("ERROR: CRC failure: %08x\n", regval);
+          mcerr("ERROR: CRC failure: %08x\n", regval);
           ret = -EIO;
         }
 #ifdef CONFIG_DEBUG_FEATURES
@@ -2111,10 +2392,11 @@ static int stm32_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t
         {
           /* Check response received is of desired command */
 
-          respcmd = getreg32(STM32_SDMMC1_RESPCMD);
-          if ((uint8_t)(respcmd & SDIO_RESPCMD_MASK) != (cmd & MMCSD_CMDIDX_MASK))
+          respcmd = sdmmc_getreg32(priv, STM32_SDMMC_RESPCMD_OFFSET);
+          if ((uint8_t)(respcmd & STM32_SDMMC_RESPCMD_MASK) !=
+              (cmd & MMCSD_CMDIDX_MASK))
             {
-              ferr("ERROR: RESCMD=%02x CMD=%08x\n", respcmd, cmd);
+              mcerr("ERROR: RESCMD=%02x CMD=%08x\n", respcmd, cmd);
               ret = -EINVAL;
             }
         }
@@ -2123,13 +2405,16 @@ static int stm32_recvshortcrc(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t
 
   /* Clear all pending message completion events and return the R1/R6 response */
 
-  putreg32(SDIO_RESPDONE_ICR | SDIO_CMDDONE_ICR, STM32_SDMMC1_ICR);
-  *rshort = getreg32(STM32_SDMMC1_RESP1);
+  sdmmc_putreg32(priv, STM32_SDMMC_RESPDONE_ICR | STM32_SDMMC_CMDDONE_ICR,
+                 STM32_SDMMC_ICR_OFFSET);
+  *rshort = sdmmc_getreg32(priv, STM32_SDMMC_RESP1_OFFSET);
   return ret;
 }
 
-static int stm32_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlong[4])
+static int stm32_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd,
+                          uint32_t rlong[4])
 {
+  struct stm32_dev_s *priv = (struct stm32_dev_s *)dev;
   uint32_t regval;
   int ret = OK;
 
@@ -2147,7 +2432,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)
     {
-      ferr("ERROR: Wrong response CMD=%08x\n", cmd);
+      mcerr("ERROR: Wrong response CMD=%08x\n", cmd);
       ret = -EINVAL;
     }
   else
@@ -2155,34 +2440,36 @@ static int stm32_recvlong(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t rlo
     {
       /* Check if a timeout or CRC error occurred */
 
-      regval = getreg32(STM32_SDMMC1_STA);
-      if (regval & SDIO_STA_CTIMEOUT)
+      regval = sdmmc_getreg32(priv, STM32_SDMMC_STA_OFFSET);
+      if (regval & STM32_SDMMC_STA_CTIMEOUT)
         {
-          ferr("ERROR: Timeout STA: %08x\n", regval);
+          mcerr("ERROR: Timeout STA: %08x\n", regval);
           ret = -ETIMEDOUT;
         }
-      else if (regval & SDIO_STA_CCRCFAIL)
+      else if (regval & STM32_SDMMC_STA_CCRCFAIL)
         {
-          ferr("ERROR: CRC fail STA: %08x\n", regval);
+          mcerr("ERROR: CRC fail STA: %08x\n", regval);
           ret = -EIO;
         }
     }
 
   /* Return the long response */
 
-  putreg32(SDIO_RESPDONE_ICR | SDIO_CMDDONE_ICR, STM32_SDMMC1_ICR);
+  sdmmc_putreg32(priv, STM32_SDMMC_RESPDONE_ICR | STM32_SDMMC_CMDDONE_ICR,
+                 STM32_SDMMC_ICR_OFFSET);
   if (rlong)
     {
-      rlong[0] = getreg32(STM32_SDMMC1_RESP1);
-      rlong[1] = getreg32(STM32_SDMMC1_RESP2);
-      rlong[2] = getreg32(STM32_SDMMC1_RESP3);
-      rlong[3] = getreg32(STM32_SDMMC1_RESP4);
+      rlong[0] = sdmmc_getreg32(priv, STM32_SDMMC_RESP1_OFFSET);
+      rlong[1] = sdmmc_getreg32(priv, STM32_SDMMC_RESP2_OFFSET);
+      rlong[2] = sdmmc_getreg32(priv, STM32_SDMMC_RESP3_OFFSET);
+      rlong[3] = sdmmc_getreg32(priv, STM32_SDMMC_RESP4_OFFSET);
     }
   return ret;
 }
 
 static int stm32_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rshort)
 {
+  struct stm32_dev_s *priv = (struct stm32_dev_s *)dev;
   uint32_t regval;
   int ret = OK;
 
@@ -2201,7 +2488,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)
     {
-      ferr("ERROR: Wrong response CMD=%08x\n", cmd);
+      mcerr("ERROR: Wrong response CMD=%08x\n", cmd);
       ret = -EINVAL;
     }
   else
@@ -2211,27 +2498,31 @@ static int stm32_recvshort(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *r
        * a good response)
        */
 
-      regval = getreg32(STM32_SDMMC1_STA);
-      if (regval & SDIO_STA_CTIMEOUT)
+      regval = sdmmc_getreg32(priv, STM32_SDMMC_STA_OFFSET);
+      if (regval & STM32_SDMMC_STA_CTIMEOUT)
         {
-          ferr("ERROR: Timeout STA: %08x\n", regval);
+          mcerr("ERROR: Timeout STA: %08x\n", regval);
           ret = -ETIMEDOUT;
         }
     }
 
-  putreg32(SDIO_RESPDONE_ICR | SDIO_CMDDONE_ICR, STM32_SDMMC1_ICR);
+  sdmmc_putreg32(priv, STM32_SDMMC_RESPDONE_ICR | STM32_SDMMC_CMDDONE_ICR,
+                 STM32_SDMMC_ICR_OFFSET);
   if (rshort)
     {
-      *rshort = getreg32(STM32_SDMMC1_RESP1);
+      *rshort = sdmmc_getreg32(priv, STM32_SDMMC_RESP1_OFFSET);
     }
   return ret;
 }
 
 /* MMC responses not supported */
 
-static int stm32_recvnotimpl(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t *rnotimpl)
+static int stm32_recvnotimpl(FAR struct sdio_dev_s *dev, uint32_t cmd,
+                             uint32_t *rnotimpl)
 {
-  putreg32(SDIO_RESPDONE_ICR | SDIO_CMDDONE_ICR, STM32_SDMMC1_ICR);
+  struct stm32_dev_s *priv = (struct stm32_dev_s *)dev;
+  sdmmc_putreg32(priv, STM32_SDMMC_RESPDONE_ICR | STM32_SDMMC_CMDDONE_ICR,
+                 STM32_SDMMC_ICR_OFFSET);
   return -ENOSYS;
 }
 
@@ -2240,13 +2531,13 @@ static int stm32_recvnotimpl(FAR struct sdio_dev_s *dev, uint32_t cmd, uint32_t
  *
  * Description:
  *   Enable/disable of a set of SDIO wait events.  This is part of the
- *   the SDIO_WAITEVENT sequence.  The set of to-be-waited-for events is
+ *   the SDMMC_WAITEVENT sequence.  The set of to-be-waited-for events is
  *   configured before calling stm32_eventwait.  This is done in this way
  *   to help the driver to eliminate race conditions between the command
  *   setup and the subsequent events.
  *
- *   The enabled events persist until either (1) SDIO_WAITENABLE is called
- *   again specifying a different set of wait events, or (2) SDIO_EVENTWAIT
+ *   The enabled events persist until either (1) SDMMC_WAITENABLE is called
+ *   again specifying a different set of wait events, or (2) SDMMC_EVENTWAIT
  *   returns.
  *
  * Input Parameters:
@@ -2286,22 +2577,22 @@ static void stm32_waitenable(FAR struct sdio_dev_s *dev,
       waitmask = 0;
       if ((eventset & SDIOWAIT_CMDDONE) != 0)
         {
-          waitmask |= SDIO_CMDDONE_MASK;
+          waitmask |= STM32_SDMMC_CMDDONE_MASK;
         }
 
       if ((eventset & SDIOWAIT_RESPONSEDONE) != 0)
         {
-          waitmask |= SDIO_RESPDONE_MASK;
+          waitmask |= STM32_SDMMC_RESPDONE_MASK;
         }
 
       if ((eventset & SDIOWAIT_TRANSFERDONE) != 0)
         {
-          waitmask |= SDIO_XFRDONE_MASK;
+          waitmask |= STM32_SDMMC_XFRDONE_MASK;
         }
 
       /* Enable event-related interrupts */
 
-      putreg32(SDIO_WAITALL_ICR, STM32_SDMMC1_ICR);
+     sdmmc_putreg32(priv, STM32_SDMMC_WAITALL_ICR, STM32_SDMMC_ICR_OFFSET);
     }
 
   stm32_configwaitints(priv, waitmask, eventset, 0);
@@ -2312,8 +2603,8 @@ static void stm32_waitenable(FAR struct sdio_dev_s *dev,
  *
  * Description:
  *   Wait for one of the enabled events to occur (or a timeout).  Note that
- *   all events enabled by SDIO_WAITEVENTS are disabled when stm32_eventwait
- *   returns.  SDIO_WAITEVENTS must be called again before stm32_eventwait
+ *   all events enabled by SDMMC_WAITEVENTS are disabled when stm32_eventwait
+ *   returns.  SDMMC_WAITEVENTS must be called again before stm32_eventwait
  *   can be used again.
  *
  * Input Parameters:
@@ -2369,7 +2660,7 @@ static sdio_eventset_t stm32_eventwait(FAR struct sdio_dev_s *dev,
                        1, (uint32_t)priv);
       if (ret != OK)
         {
-          ferr("ERROR: wd_start failed: %d\n", ret);
+          mcerr("ERROR: wd_start failed: %d\n", ret);
         }
     }
 
@@ -2380,7 +2671,7 @@ static sdio_eventset_t stm32_eventwait(FAR struct sdio_dev_s *dev,
        * If Pin is ready and if ISR did NOT fire end the wait here
        */
 
-      if (stm32_gpioread(GPIO_SDMMC1_D0) &&
+      if (stm32_gpioread(priv->d0_gpio) &&
          (priv->wkupevent & SDIOWAIT_WRCOMPLETE) == 0)
         {
           stm32_endwait(priv, SDIOWAIT_WRCOMPLETE);
@@ -2456,7 +2747,7 @@ static void stm32_callbackenable(FAR struct sdio_dev_s *dev,
 {
   struct stm32_dev_s *priv = (struct stm32_dev_s *)dev;
 
-  finfo("eventset: %02x\n", eventset);
+  mcinfo("eventset: %02x\n", eventset);
   DEBUGASSERT(priv != NULL);
 
   priv->cbevents = eventset;
@@ -2473,7 +2764,7 @@ static void stm32_callbackenable(FAR struct sdio_dev_s *dev,
  *   thread.
  *
  *   When this method is called, all callbacks should be disabled until they
- *   are enabled via a call to SDIO_CALLBACKENABLE
+ *   are enabled via a call to SDMMC_CALLBACKENABLE
  *
  * Input Parameters:
  *   dev -      Device-specific state data
@@ -2492,7 +2783,7 @@ static int stm32_registercallback(FAR struct sdio_dev_s *dev,
 
   /* Disable callbacks and register this callback and is argument */
 
-  finfo("Register %p(%p)\n", callback, arg);
+  mcinfo("Register %p(%p)\n", callback, arg);
   DEBUGASSERT(priv != NULL);
 
   priv->cbevents = 0;
@@ -2555,7 +2846,8 @@ static int stm32_dmapreflight(FAR struct sdio_dev_s *dev,
 
   /* DMA must be possible to the buffer */
 
-  if (!stm32_dmacapable((uintptr_t)buffer, (buflen + 3) >> 2, SDIO_RXDMA32_CONFIG))
+  if (!stm32_dmacapable((uintptr_t)buffer, (buflen + 3) >> 2,
+                        STM32_SDMMC_RXDMA32_CONFIG | priv->dmapri))
     {
       return -EFAULT;
     }
@@ -2598,7 +2890,8 @@ static int stm32_dmarecvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer,
 #ifdef CONFIG_ARMV7M_DCACHE
   /* buffer alignment is required for DMA transfers with dcache */
 
-  if (((uintptr_t)buffer & (ARMV7M_DCACHE_LINESIZE-1)) != 0 || (buflen & (ARMV7M_DCACHE_LINESIZE-1)) != 0)
+  if (((uintptr_t)buffer & (ARMV7M_DCACHE_LINESIZE-1)) != 0 ||
+      (buflen & (ARMV7M_DCACHE_LINESIZE-1)) != 0)
     {
       return -EFAULT;
     }
@@ -2606,7 +2899,7 @@ static int stm32_dmarecvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer,
 
   /* Reset the DPSM configuration */
 
-  stm32_datadisable();
+  stm32_datadisable(priv);
 
   /* Initialize register sampling */
 
@@ -2621,15 +2914,18 @@ static int stm32_dmarecvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer,
 
   /* Then set up the SDIO data path */
 
-  dblocksize = stm32_log2(buflen) << SDIO_DCTRL_DBLOCKSIZE_SHIFT;
-  stm32_dataconfig(SDIO_DTIMER_DATATIMEOUT, buflen, dblocksize | SDIO_DCTRL_DTDIR);
+  dblocksize = stm32_log2(buflen) << STM32_SDMMC_DCTRL_DBLOCKSIZE_SHIFT;
+  stm32_dataconfig(priv, SDMMC_DTIMER_DATATIMEOUT, buflen, dblocksize |
+                   STM32_SDMMC_DCTRL_DTDIR);
 
   /* Configure the RX DMA */
 
-  stm32_configxfrints(priv, SDIO_DMARECV_MASK);
-
-  stm32_dmasetup(priv->dma, STM32_SDMMC1_FIFO, (uint32_t)buffer,
-                 (buflen + 3) >> 2, SDIO_RXDMA32_CONFIG);
+  stm32_configxfrints(priv, STM32_SDMMC_DMARECV_MASK);
+  
+  sdmmc_modifyreg32(priv, STM32_SDMMC_DCTRL_OFFSET, 0, STM32_SDMMC_DCTRL_DMAEN);
+  stm32_dmasetup(priv->dma, priv->base + STM32_SDMMC_FIFO_OFFSET,
+                 (uint32_t)buffer, (buflen + 3) >> 2,
+                 SDMMC_RXDMA32_CONFIG | priv->dmapri);
 
   /* Force RAM reread */
 
@@ -2679,7 +2975,8 @@ static int stm32_dmasendsetup(FAR struct sdio_dev_s *dev,
 #ifdef CONFIG_ARMV7M_DCACHE
   /* buffer alignment is required for DMA transfers with dcache */
 
-  if (((uintptr_t)buffer & (ARMV7M_DCACHE_LINESIZE-1)) != 0 || (buflen & (ARMV7M_DCACHE_LINESIZE-1)) != 0)
+  if (((uintptr_t)buffer & (ARMV7M_DCACHE_LINESIZE-1)) != 0 ||
+      (buflen & (ARMV7M_DCACHE_LINESIZE-1)) != 0)
     {
       return -EFAULT;
     }
@@ -2687,7 +2984,7 @@ static int stm32_dmasendsetup(FAR struct sdio_dev_s *dev,
 
   /* Reset the DPSM configuration */
 
-  stm32_datadisable();
+  stm32_datadisable(priv);
 
   /* Initialize register sampling */
 
@@ -2706,13 +3003,13 @@ static int stm32_dmasendsetup(FAR struct sdio_dev_s *dev,
 
   /* Then set up the SDIO data path */
 
-  dblocksize = stm32_log2(buflen) << SDIO_DCTRL_DBLOCKSIZE_SHIFT;
-  stm32_dataconfig(SDIO_DTIMER_DATATIMEOUT, buflen, dblocksize);
+  dblocksize = stm32_log2(buflen) << STM32_SDMMC_DCTRL_DBLOCKSIZE_SHIFT;
+  stm32_dataconfig(priv, SDMMC_DTIMER_DATATIMEOUT, buflen, dblocksize);
 
   /* Configure the TX DMA */
 
-  stm32_dmasetup(priv->dma, STM32_SDMMC1_FIFO, (uint32_t)buffer,
-                 (buflen + 3) >> 2, SDIO_TXDMA32_CONFIG);
+  stm32_dmasetup(priv->dma, priv->base + STM32_SDMMC_FIFO_OFFSET, (uint32_t)buffer,
+                 (buflen + 3) >> 2, SDMMC_TXDMA32_CONFIG | priv->dmapri);
 
   stm32_sample(priv, SAMPLENDX_BEFORE_ENABLE);
 
@@ -2723,7 +3020,7 @@ static int stm32_dmasendsetup(FAR struct sdio_dev_s *dev,
 
   /* Enable TX interrupts */
 
-  stm32_configxfrints(priv, SDIO_DMASEND_MASK);
+  stm32_configxfrints(priv, STM32_SDMMC_DMASEND_MASK);
 
   return OK;
 }
@@ -2752,7 +3049,7 @@ static void stm32_callback(void *arg)
   /* Is a callback registered? */
 
   DEBUGASSERT(priv != NULL);
-  finfo("Callback %p(%p) cbevents: %02x cdstatus: %02x\n",
+  mcinfo("Callback %p(%p) cbevents: %02x cdstatus: %02x\n",
         priv->callback, priv->cbarg, priv->cbevents, priv->cdstatus);
 
   if (priv->callback)
@@ -2797,14 +3094,14 @@ static void stm32_callback(void *arg)
         {
           /* Yes.. queue it */
 
-           finfo("Queuing callback to %p(%p)\n", priv->callback, priv->cbarg);
+           mcinfo("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 */
 
-          finfo("Callback to %p(%p)\n", priv->callback, priv->cbarg);
+          mcinfo("Callback to %p(%p)\n", priv->callback, priv->cbarg);
           priv->callback(priv->cbarg);
         }
     }
@@ -2818,17 +3115,17 @@ static void stm32_callback(void *arg)
  *
  ****************************************************************************/
 
-static void stm32_default(void)
+static void stm32_default(struct stm32_dev_s *priv)
 {
-  putreg32(SDIO_POWER_RESET,  STM32_SDMMC1_POWER);
-  putreg32(SDIO_CLKCR_RESET,  STM32_SDMMC1_CLKCR);
-  putreg32(SDIO_ARG_RESET,    STM32_SDMMC1_ARG);
-  putreg32(SDIO_CMD_RESET,    STM32_SDMMC1_CMD);
-  putreg32(SDIO_DTIMER_RESET, STM32_SDMMC1_DTIMER);
-  putreg32(SDIO_DLEN_RESET,   STM32_SDMMC1_DLEN);
-  putreg32(SDIO_DCTRL_RESET,  STM32_SDMMC1_DCTRL);
-  putreg32(SDIO_ICR_RESET,    STM32_SDMMC1_ICR);
-  putreg32(SDIO_MASK_RESET,   STM32_SDMMC1_MASK);
+  sdmmc_putreg32(priv, STM32_SDMMC_POWER_RESET,  STM32_SDMMC_POWER_OFFSET);
+  sdmmc_putreg32(priv, STM32_SDMMC_CLKCR_RESET,  STM32_SDMMC_CLKCR_OFFSET);
+  sdmmc_putreg32(priv, STM32_SDMMC_ARG_RESET,    STM32_SDMMC_ARG_OFFSET);
+  sdmmc_putreg32(priv, STM32_SDMMC_CMD_RESET,    STM32_SDMMC_CMD_OFFSET);
+  sdmmc_putreg32(priv, STM32_SDMMC_DTIMER_RESET, STM32_SDMMC_DTIMER_OFFSET);
+  sdmmc_putreg32(priv, STM32_SDMMC_DLEN_RESET,   STM32_SDMMC_DLEN_OFFSET);
+  sdmmc_putreg32(priv, STM32_SDMMC_DCTRL_RESET,  STM32_SDMMC_DCTRL_OFFSET);
+  sdmmc_putreg32(priv, STM32_SDMMC_ICR_RESET,    STM32_SDMMC_ICR_OFFSET);
+  sdmmc_putreg32(priv, STM32_SDMMC_MASK_RESET,   STM32_SDMMC_MASK_OFFSET);
 }
 
 /****************************************************************************
@@ -2851,9 +3148,68 @@ static void stm32_default(void)
 
 FAR struct sdio_dev_s *sdio_initialize(int slotno)
 {
-  /* There is only one slot */
+  struct stm32_dev_s *priv = NULL;
+#ifdef CONFIG_SDIO_DMA
+  unsigned int      dmachan;
+#endif
+
+#ifdef CONFIG_STM32F7_SDMMC1
+  if (slotno == 0)
+    {
+      /* Select SDMMC 1 */
+
+      priv = &g_sdmmcdev1;
+#ifdef CONFIG_SDIO_DMA
+      dmachan = SDMMC1_DMACHAN;
+#endif
+
+      /* Configure GPIOs for 4-bit, wide-bus operation (the chip is capable of
+       * 8-bit wide bus operation but D4-D7 are not configured).
+       *
+       * If bus is multiplexed then there is a custom bus configuration utility
+       * in the scope of the board support package.
+       */
+#ifndef CONFIG_SDIO_MUXBUS
+        stm32_configgpio(GPIO_SDMMC1_D0);
+#ifndef CONFIG_SDMMC_WIDTH_D1_ONLY
+        stm32_configgpio(GPIO_SDMMC1_D1);
+        stm32_configgpio(GPIO_SDMMC1_D2);
+        stm32_configgpio(GPIO_SDMMC1_D3);
+#endif
+        stm32_configgpio(GPIO_SDMMC1_CK);
+        stm32_configgpio(GPIO_SDMMC1_CMD);
+#endif
+
+    }
+  else
+#endif
+#ifdef CONFIG_STM32F7_SDMMC2
+  if (slotno == 1)
+    {
+      /* Select SDMMC 2 */
 
-  struct stm32_dev_s *priv = &g_sdiodev;
+      priv = &g_sdmmcdev2;
+#ifdef CONFIG_SDIO_DMA
+      dmachan = SDMMC2_DMACHAN;
+#endif
+
+#ifndef CONFIG_SDIO_MUXBUS
+        stm32_configgpio(GPIO_SDMMC2_D0);
+#ifndef CONFIG_SDMMC_WIDTH_D1_ONLY
+        stm32_configgpio(GPIO_SDMMC2_D1);
+        stm32_configgpio(GPIO_SDMMC2_D2);
+        stm32_configgpio(GPIO_SDMMC2_D3);
+#endif
+        stm32_configgpio(GPIO_SDMMC2_CK);
+        stm32_configgpio(GPIO_SDMMC2_CMD);
+#endif
+}
+  else
+#endif
+    {
+      mcerr("ERROR: Unsupported SDMMC slot: %d\n", slotno);
+      return NULL;
+    }
 
   /* Initialize the SDIO slot structure */
 
@@ -2864,41 +3220,23 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno)
   /* Allocate a DMA channel */
 
 #ifdef CONFIG_SDIO_DMA
-  priv->dma = stm32_dmachannel(SDIO_DMACHAN);
+  priv->dma = stm32_dmachannel(dmachan);
   DEBUGASSERT(priv->dma);
 #endif
 
-  /* Configure GPIOs for 4-bit, wide-bus operation (the chip is capable of
-   * 8-bit wide bus operation but D4-D7 are not configured).
-   *
-   * If bus is multiplexed then there is a custom bus configuration utility
-   * in the scope of the board support package.
-   */
-
-#ifndef CONFIG_SDIO_MUXBUS
-  stm32_configgpio(GPIO_SDMMC1_D0);
-#ifndef CONFIG_SDIO_WIDTH_D1_ONLY
-  stm32_configgpio(GPIO_SDMMC1_D1);
-  stm32_configgpio(GPIO_SDMMC1_D2);
-  stm32_configgpio(GPIO_SDMMC1_D3);
-#endif
-  stm32_configgpio(GPIO_SDMMC1_CK);
-  stm32_configgpio(GPIO_SDMMC1_CMD);
-#endif
-
   /* Reset the card and assure that it is in the initial, unconfigured
    * state.
    */
 
   stm32_reset(&priv->dev);
-  return &g_sdiodev.dev;
+  return &priv->dev;
 }
 
 /****************************************************************************
  * Name: sdio_mediachange
  *
  * Description:
- *   Called by board-specific logic -- posssible from an interrupt handler --
+ *   Called by board-specific logic -- possible from an interrupt handler --
  *   in order to signal to the driver that a card has been inserted or
  *   removed from the slot
  *
@@ -2934,7 +3272,7 @@ void sdio_mediachange(FAR struct sdio_dev_s *dev, bool cardinslot)
 
   leave_critical_section(flags);
 
-  finfo("cdstatus OLD: %02x NEW: %02x\n", cdstatus, priv->cdstatus);
+  mcinfo("cdstatus OLD: %02x NEW: %02x\n", cdstatus, priv->cdstatus);
 
   /* Perform any requested callback if the status has changed */
 
@@ -2976,7 +3314,8 @@ void sdio_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect)
     {
       priv->cdstatus &= ~SDIO_STATUS_WRPROTECTED;
     }
-  finfo("cdstatus: %02x\n", priv->cdstatus);
+    
+  mcinfo("cdstatus: %02x\n", priv->cdstatus);
   leave_critical_section(flags);
 }
-#endif /* CONFIG_STM32F7_SDMMC1 */
+#endif /* CONFIG_STM32F7_SDMMC1 || CONFIG_STM32F7_SDMMC2 */
diff --git a/arch/arm/src/stm32f7/stm32_sdmmc.h b/arch/arm/src/stm32f7/stm32_sdmmc.h
index 12b6348559..8e722497c5 100644
--- a/arch/arm/src/stm32f7/stm32_sdmmc.h
+++ b/arch/arm/src/stm32f7/stm32_sdmmc.h
@@ -40,13 +40,13 @@
  * Included Files
  ************************************************************************************/
 
-#include "chip/stm32_sdmmc.h"
-
 #include 
 #include 
 #include 
 
 #include "chip.h"
+#include "chip/stm32_sdmmc.h"
+
 
 /************************************************************************************
  * Public Functions
-- 
GitLab


From a31c35bd7b19e1d24b63dd3bb4624187a91b926c Mon Sep 17 00:00:00 2001
From: David Sidrane 
Date: Thu, 23 Jun 2016 14:35:27 -1000
Subject: [PATCH 048/229] Fixed Missing number in stm32f76xx77xx PINMAP

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

diff --git a/arch/arm/src/stm32f7/chip/stm32f76xx77xx_pinmap.h b/arch/arm/src/stm32f7/chip/stm32f76xx77xx_pinmap.h
index 4c60603c95..b2ded840df 100644
--- a/arch/arm/src/stm32f7/chip/stm32f76xx77xx_pinmap.h
+++ b/arch/arm/src/stm32f7/chip/stm32f76xx77xx_pinmap.h
@@ -943,7 +943,7 @@
 #define GPIO_SDMMC2_CMD       (GPIO_ALT|GPIO_AF11|GPIO_PULLUP|GPIO_SPEED_50MHz|GPIO_PUSHPULL|GPIO_PORTD|GPIO_PIN7)
 #define GPIO_SDMMC2_D0_1      (GPIO_ALT|GPIO_AF10|GPIO_PULLUP|GPIO_SPEED_50MHz|GPIO_PUSHPULL|GPIO_PORTB|GPIO_PIN14)
 #define GPIO_SDMMC2_D1_1      (GPIO_ALT|GPIO_AF10|GPIO_PULLUP|GPIO_SPEED_50MHz|GPIO_PUSHPULL|GPIO_PORTB|GPIO_PIN15)
-#define GPIO_SDMMC2_D2_1      (GPIO_ALT|GPIO_AF10|GPIO_PULLUP|GPIO_SPEED_50MHz|GPIO_PUSHPULL|GPIO_PORTB|GPIO_PIN)
+#define GPIO_SDMMC2_D2_1      (GPIO_ALT|GPIO_AF10|GPIO_PULLUP|GPIO_SPEED_50MHz|GPIO_PUSHPULL|GPIO_PORTB|GPIO_PIN3)
 #define GPIO_SDMMC2_D3_1      (GPIO_ALT|GPIO_AF10|GPIO_PULLUP|GPIO_SPEED_50MHz|GPIO_PUSHPULL|GPIO_PORTB|GPIO_PIN4)
 #define GPIO_SDMMC2_D0_2      (GPIO_ALT|GPIO_AF11|GPIO_PULLUP|GPIO_SPEED_50MHz|GPIO_PUSHPULL|GPIO_PORTG|GPIO_PIN9)
 #define GPIO_SDMMC2_D1_2      (GPIO_ALT|GPIO_AF11|GPIO_PULLUP|GPIO_SPEED_50MHz|GPIO_PUSHPULL|GPIO_PORTG|GPIO_PIN10)
-- 
GitLab


From 3e2a620f8c112490d357e06609e356cd8de318a7 Mon Sep 17 00:00:00 2001
From: David Sidrane 
Date: Thu, 23 Jun 2016 14:37:24 -1000
Subject: [PATCH 049/229] Fixed Undefined STM32_IRQ_NIRQS

---
 arch/arm/src/stm32f7/stm32_irq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/src/stm32f7/stm32_irq.c b/arch/arm/src/stm32f7/stm32_irq.c
index eb7a8e1b86..758f32b147 100644
--- a/arch/arm/src/stm32f7/stm32_irq.c
+++ b/arch/arm/src/stm32f7/stm32_irq.c
@@ -656,7 +656,7 @@ int up_prioritize_irq(int irq, int priority)
   uint32_t regval;
   int shift;
 
-  DEBUGASSERT(irq >= STM32_IRQ_MEMFAULT && irq < STM32_IRQ_NIRQS &&
+  DEBUGASSERT(irq >= STM32_IRQ_MEMFAULT && irq < NR_IRQS &&
               (unsigned)priority <= NVIC_SYSH_PRIORITY_MIN);
 
   if (irq < STM32_IRQ_FIRST)
-- 
GitLab


From b31e5e3c9d4436276e5cd43694a3ec7b0bba20a9 Mon Sep 17 00:00:00 2001
From: David Sidrane 
Date: Thu, 23 Jun 2016 14:41:51 -1000
Subject: [PATCH 050/229] Added SDMMC to Nucleo-144

---
 configs/nucleo-144/include/board.h           | 61 +++++++++++++++++++-
 configs/nucleo-144/src/Makefile              |  2 +-
 configs/nucleo-144/src/nucleo-144.h          | 53 ++++++++++++++++-
 configs/nucleo-144/src/stm32_appinitialize.c |  1 +
 configs/nucleo-144/src/stm32_sdio.c          | 19 +++---
 5 files changed, 122 insertions(+), 14 deletions(-)

diff --git a/configs/nucleo-144/include/board.h b/configs/nucleo-144/include/board.h
index 1561ad8cc6..18d2727502 100644
--- a/configs/nucleo-144/include/board.h
+++ b/configs/nucleo-144/include/board.h
@@ -127,8 +127,8 @@
 
 #define CONFIG_STM32F7_PLLSAI 1
 #define STM32_RCC_PLLSAICFGR_PLLSAIN    RCC_PLLSAICFGR_PLLSAIN(192)
-#define STM32_RCC_PLLSAICFGR_PLLSAIP    RCC_PLLSAICFGR_PLLSAIP(2)
-#define STM32_RCC_PLLSAICFGR_PLLSAIQ    RCC_PLLSAICFGR_PLLSAIQ(2)
+#define STM32_RCC_PLLSAICFGR_PLLSAIP    RCC_PLLSAICFGR_PLLSAIP(8)
+#define STM32_RCC_PLLSAICFGR_PLLSAIQ    RCC_PLLSAICFGR_PLLSAIQ(4)
 #define STM32_RCC_PLLSAICFGR_PLLSAIR    RCC_PLLSAICFGR_PLLSAIR(2)
 
 /* Configure Dedicated Clock Configuration Register */
@@ -167,7 +167,7 @@
 #define STM32_RCC_DCKCFGR2_I2C4SRC    RCC_DCKCFGR2_I2C4SEL_HSI
 #define STM32_RCC_DCKCFGR2_LPTIM1SRC  RCC_DCKCFGR2_LPTIM1SEL_APB
 #define STM32_RCC_DCKCFGR2_CECSRC     RCC_DCKCFGR2_CECSEL_HSI
-#define STM32_RCC_DCKCFGR2_CK48MSRC   RCC_DCKCFGR2_CK48MSEL_PLLSAI
+#define STM32_RCC_DCKCFGR2_CK48MSRC   RCC_DCKCFGR2_CK48MSEL_PLL
 #define STM32_RCC_DCKCFGR2_SDMMCSRC   RCC_DCKCFGR2_SDMMCSEL_48MHZ
 #define STM32_RCC_DCKCFGR2_SDMMC2SRC  RCC_DCKCFGR2_SDMMC2SEL_48MHZ
 #define STM32_RCC_DCKCFGR2_DSISRC     RCC_DCKCFGR2_DSISEL_48MHZ
@@ -216,6 +216,61 @@
 #define STM32_APB2_TIM10_CLKIN  (2*STM32_PCLK2_FREQUENCY)
 #define STM32_APB2_TIM11_CLKIN  (2*STM32_PCLK2_FREQUENCY)
 
+/* SDMMC dividers.  Note that slower clocking is required when DMA is disabled
+ * in order to avoid RX overrun/TX underrun errors due to delayed responses
+ * to service FIFOs in interrupt driven mode.  These values have not been
+ * tuned!!!
+ *
+ * SDMMCCLK=48MHz, SDMMC_CK=SDMMCCLK/(118+2)=400 KHz
+ */
+
+#define STM32_SDMMC_INIT_CLKDIV         (118 << STM32_SDMMC_CLKCR_CLKDIV_SHIFT)
+
+/* DMA ON:  SDMMCCLK=48MHz, SDMMC_CK=SDMMCCLK/(1+2)=16 MHz
+ * DMA OFF: SDMMCCLK=48MHz, SDMMC_CK=SDMMCCLK/(2+2)=12 MHz
+ */
+
+#ifdef CONFIG_SDIO_DMA
+#  define STM32_SDMMC_MMCXFR_CLKDIV     (1 << STM32_SDMMC_CLKCR_CLKDIV_SHIFT)
+#else
+#  define STM32_SDMMC_MMCXFR_CLKDIV     (2 << STM32_SDMMC_CLKCR_CLKDIV_SHIFT)
+#endif
+
+/* DMA ON:  SDMMCCLK=48MHz, SDMMC_CK=SDMMCCLK/(1+2)=16 MHz
+ * DMA OFF: SDMMCCLK=48MHz, SDMMC_CK=SDMMCCLK/(2+2)=12 MHz
+ */
+
+#ifdef CONFIG_SDIO_DMA
+#  define STM32_SDMMC_SDXFR_CLKDIV      (1 << STM32_SDMMC_CLKCR_CLKDIV_SHIFT)
+#else
+#  define STM32_SDMMC_SDXFR_CLKDIV      (2 << STM32_SDMMC_CLKCR_CLKDIV_SHIFT)
+#endif
+
+#if defined(CONFIG_STM32F7_SDMMC2)
+#  define GPIO_SDMMC2_D0 GPIO_SDMMC2_D0_1
+#  define GPIO_SDMMC2_D1 GPIO_SDMMC2_D1_1
+#  define GPIO_SDMMC2_D2 GPIO_SDMMC2_D2_1
+#  define GPIO_SDMMC2_D3 GPIO_SDMMC2_D3_1
+#endif
+/* DMA Channl/Stream Selections *****************************************************/
+/* Stream selections are arbitrary for now but might become important in the future
+ * if we set aside more DMA channels/streams.
+ *
+ * SDMMC DMA is on DMA2
+ *
+ * SDMMC1 DMA
+ *   DMAMAP_SDMMC1_1 = Channel 4, Stream 3
+ *   DMAMAP_SDMMC1_2 = Channel 4, Stream 6
+ *
+ * SDMMC2 DMA
+ *   DMAMAP_SDMMC2_1 = Channel 11, Stream 0
+ *   DMAMAP_SDMMC3_2 = Channel 11, Stream 5
+ */
+
+#define DMAMAP_SDMMC1  DMAMAP_SDMMC1_1
+#define DMAMAP_SDMMC2  DMAMAP_SDMMC2_1
+
+
 /* FLASH wait states
  *
  *  --------- ---------- -----------
diff --git a/configs/nucleo-144/src/Makefile b/configs/nucleo-144/src/Makefile
index e4e02750bd..ca3ede019c 100644
--- a/configs/nucleo-144/src/Makefile
+++ b/configs/nucleo-144/src/Makefile
@@ -60,7 +60,7 @@ ifeq ($(CONFIG_ADC),y)
 CSRCS += stm32_adc.c
 endif
 
-ifeq ($(HAVE_SDIO),y)
+ifeq ($(CONFIG_MMCSD),y)
 CSRCS += stm32_sdio.c
 endif
 
diff --git a/configs/nucleo-144/src/nucleo-144.h b/configs/nucleo-144/src/nucleo-144.h
index 48a6f9f11a..2d070539d2 100644
--- a/configs/nucleo-144/src/nucleo-144.h
+++ b/configs/nucleo-144/src/nucleo-144.h
@@ -128,8 +128,45 @@
 #define NUCLEO_SPI_BUS3_CS2  10
 #define NUCLEO_SPI_BUS3_CS3  11
 
-#if defined(CONFIG_STM32_SDIO)
-#define GPIO_SDIO_NCD (GPIO_INPUT|GPIO_FLOAT|GPIO_EXTI | GPIO_PORTB | GPIO_PIN15)
+#if defined(CONFIG_STM32F7_SDMMC1) || defined(CONFIG_STM32F7_SDMMC2)
+# define HAVE_SDIO
+#endif
+
+#if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_MMCSD_SDIO)
+#  undef HAVE_SDIO
+#endif
+
+#define SDIO_SLOTNO 0  /* Only one slot */
+
+#ifdef HAVE_SDIO
+
+#  if defined(CONFIG_STM32F7_SDMMC1)
+#    define GPIO_SDMMC1_NCD (GPIO_INPUT|GPIO_FLOAT|GPIO_EXTI | GPIO_PORTC | GPIO_PIN11)
+#  endif
+
+#  if defined(CONFIG_NSH_MMCSDSLOTNO) && (CONFIG_NSH_MMCSDSLOTNO != 0)
+#    warning "Only one MMC/SD slot, slot 0"
+#    define CONFIG_NSH_MMCSDSLOTNO SDIO_SLOTNO
+#  endif
+
+#  if defined(CONFIG_NSH_MMCSDMINOR)
+#    define SDIO_MINOR CONFIG_NSH_MMCSDMINOR
+#  else
+#    define SDIO_MINOR 0
+#  endif
+
+  /* SD card bringup does not work if performed on the IDLE thread because it
+   * will cause waiting.  Use either:
+   *
+   *  CONFIG_LIB_BOARDCTL=y, OR
+   *  CONFIG_BOARD_INITIALIZE=y && CONFIG_BOARD_INITTHREAD=y
+   */
+
+#  if defined(CONFIG_BOARD_INITIALIZE) && !defined(CONFIG_LIB_BOARDCTL) && \
+     !defined(CONFIG_BOARD_INITTHREAD)
+#    warning SDIO initialization cannot be perfomed on the IDLE thread
+#    undef HAVE_SDIO
+#  endif
 #endif
 
 /************************************************************************************
@@ -196,5 +233,17 @@ int stm32_dma_alloc_init(void);
 int board_adc_initialize(void);
 #endif
 
+/****************************************************************************
+ * Name: stm32_sdio_initialize
+ *
+ * Description:
+ *   Called at application startup time to initialize the SCMMC functionality.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_MMCSD
+int stm32_sdio_initialize(void);
+#endif
+
 #endif /* __ASSEMBLY__ */
 #endif /* __CONFIGS_NUCLEO_144_SRC_NUCLEO_144_H */
diff --git a/configs/nucleo-144/src/stm32_appinitialize.c b/configs/nucleo-144/src/stm32_appinitialize.c
index 9daf02a3ff..17b26a1b05 100644
--- a/configs/nucleo-144/src/stm32_appinitialize.c
+++ b/configs/nucleo-144/src/stm32_appinitialize.c
@@ -42,6 +42,7 @@
 #include 
 
 #include 
+#include 
 #include 
 
 #include "nucleo-144.h"
diff --git a/configs/nucleo-144/src/stm32_sdio.c b/configs/nucleo-144/src/stm32_sdio.c
index 87b316be2e..7904f8c2eb 100644
--- a/configs/nucleo-144/src/stm32_sdio.c
+++ b/configs/nucleo-144/src/stm32_sdio.c
@@ -47,10 +47,13 @@
 #include 
 #include 
 
-#include "stm32.h"
+#include "chip.h"
 #include "nucleo-144.h"
+#include "stm32_gpio.h"
+#include "stm32_sdmmc.h"
+
+#ifdef CONFIG_MMCSD
 
-#ifdef HAVE_SDIO
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -61,7 +64,7 @@
 /* Card detections requires card support and a card detection GPIO */
 
 #define HAVE_NCD   1
-#if !defined(CONFIG_STM32_SDIO) || !defined(GPIO_SDIO_NCD)
+#if !defined(GPIO_SDMMC1_NCD)
 #  undef HAVE_NCD
 #endif
 
@@ -91,8 +94,8 @@ static int stm32_ncd_interrupt(int irq, FAR void *context)
 {
   bool present;
 
-  present = !stm32_gpioread(GPIO_SDIO_NCD);
-  if (present != g_sd_inserted)
+  present = !stm32_gpioread(GPIO_SDMMC1_NCD);
+  if (g_sdio_dev && present != g_sd_inserted)
     {
       sdio_mediachange(g_sdio_dev, present);
       g_sd_inserted = present;
@@ -125,11 +128,11 @@ int stm32_sdio_initialize(void)
 
   /* Configure the card detect GPIO */
 
-  stm32_configgpio(GPIO_SDIO_NCD);
+  stm32_configgpio(GPIO_SDMMC1_NCD);
 
   /* Register an interrupt handler for the card detect pin */
 
-  stm32_gpiosetevent(GPIO_SDIO_NCD, true, true, true, stm32_ncd_interrupt);
+  stm32_gpiosetevent(GPIO_SDMMC1_NCD, true, true, true, stm32_ncd_interrupt);
 #endif
 
   /* Mount the SDIO-based MMC/SD block driver */
@@ -160,7 +163,7 @@ int stm32_sdio_initialize(void)
 #ifdef HAVE_NCD
   /* Use SD card detect pin to check if a card is g_sd_inserted */
 
-  cd_status = !stm32_gpioread(GPIO_SDIO_NCD);
+  cd_status = !stm32_gpioread(GPIO_SDMMC1_NCD);
   finfo("Card detect : %d\n", cd_status);
 
   sdio_mediachange(g_sdio_dev, cd_status);
-- 
GitLab


From 526e889c8ed45eef4cf066c729fbc437d756e892 Mon Sep 17 00:00:00 2001
From: David Sidrane 
Date: Fri, 24 Jun 2016 08:12:17 -1000
Subject: [PATCH 051/229] BUGFIX:PLLs IS2 and SAI P Calculation

---
 arch/arm/src/stm32f7/chip/stm32f74xx75xx_rcc.h | 4 ++--
 arch/arm/src/stm32f7/chip/stm32f76xx77xx_rcc.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/src/stm32f7/chip/stm32f74xx75xx_rcc.h b/arch/arm/src/stm32f7/chip/stm32f74xx75xx_rcc.h
index 881f17dc56..70c9a2a5aa 100644
--- a/arch/arm/src/stm32f7/chip/stm32f74xx75xx_rcc.h
+++ b/arch/arm/src/stm32f7/chip/stm32f74xx75xx_rcc.h
@@ -574,7 +574,7 @@
 #  define RCC_PLLI2SCFGR_PLLI2SN(n)  ((uint32_t)(n) << RCC_PLLI2SCFGR_PLLI2SN_SHIFT)
 #define RCC_PLLI2SCFGR_PLLI2SP_SHIFT (16)      /* Bits 16-17: PLLI2S division factor for SPDIFRX clock */
 #define RCC_PLLI2SCFGR_PLLI2SP_MASK  (3 << RCC_PLLI2SCFGR_PLLI2SP_SHIFT)
-#  define RCC_PLLI2SCFGR_PLLI2SP(n)  ((uint32_t)(n) << RCC_PLLI2SCFGR_PLLI2SP_SHIFT)
+#  define RCC_PLLI2SCFGR_PLLI2SP(n)  ((((n)>>1)-1) << RCC_PLLI2SCFGR_PLLI2SP_SHIFT)
 #define RCC_PLLI2SCFGR_PLLI2SQ_SHIFT (24)      /* Bits 24-27: PLLI2S division factor for SAIs clock */
 #define RCC_PLLI2SCFGR_PLLI2SQ_MASK  (15 << RCC_PLLI2SCFGR_PLLI2SQ_SHIFT)
 #  define RCC_PLLI2SCFGR_PLLI2SQ(n)  ((uint32_t)(n) << RCC_PLLI2SCFGR_PLLI2SQ_SHIFT)
@@ -589,7 +589,7 @@
 #  define RCC_PLLSAICFGR_PLLSAIN(n)  ((n) << RCC_PLLSAICFGR_PLLSAIN_SHIFT)
 #define RCC_PLLSAICFGR_PLLSAIP_SHIFT (16)      /* Bits 16-17: PLLSAI division factor for 48MHz clock */
 #define RCC_PLLSAICFGR_PLLSAIP_MASK  (3 << RCC_PLLSAICFGR_PLLSAIP_SHIFT)
-#  define RCC_PLLSAICFGR_PLLSAIP(n)  ((n) << RCC_PLLSAICFGR_PLLSAIP_SHIFT)
+#  define RCC_PLLSAICFGR_PLLSAIP(n)  ((((n)>>1)-1) << RCC_PLLSAICFGR_PLLSAIP_SHIFT)
 #define RCC_PLLSAICFGR_PLLSAIQ_SHIFT (24)      /* Bits 24-27: PLLSAI division factor for SAI clock */
 #define RCC_PLLSAICFGR_PLLSAIQ_MASK  (0x0F << RCC_PLLSAICFGR_PLLSAIQ_SHIFT)
 #  define RCC_PLLSAICFGR_PLLSAIQ(n)  ((n) << RCC_PLLSAICFGR_PLLSAIQ_SHIFT)
diff --git a/arch/arm/src/stm32f7/chip/stm32f76xx77xx_rcc.h b/arch/arm/src/stm32f7/chip/stm32f76xx77xx_rcc.h
index a63cc1911a..a1b9ed4e32 100644
--- a/arch/arm/src/stm32f7/chip/stm32f76xx77xx_rcc.h
+++ b/arch/arm/src/stm32f7/chip/stm32f76xx77xx_rcc.h
@@ -595,7 +595,7 @@
 #  define RCC_PLLI2SCFGR_PLLI2SN(n)  ((uint32_t)(n) << RCC_PLLI2SCFGR_PLLI2SN_SHIFT)
 #define RCC_PLLI2SCFGR_PLLI2SP_SHIFT (16)      /* Bits 16-17: PLLI2S division factor for SPDIFRX clock */
 #define RCC_PLLI2SCFGR_PLLI2SP_MASK  (3 << RCC_PLLI2SCFGR_PLLI2SP_SHIFT)
-#  define RCC_PLLI2SCFGR_PLLI2SP(n)  ((uint32_t)(n) << RCC_PLLI2SCFGR_PLLI2SP_SHIFT)
+#  define RCC_PLLI2SCFGR_PLLI2SP(n)  ((((n)>>1)-1) << RCC_PLLI2SCFGR_PLLI2SP_SHIFT)
 #define RCC_PLLI2SCFGR_PLLI2SQ_SHIFT (24)      /* Bits 24-27: PLLI2S division factor for SAIs clock */
 #define RCC_PLLI2SCFGR_PLLI2SQ_MASK  (15 << RCC_PLLI2SCFGR_PLLI2SQ_SHIFT)
 #  define RCC_PLLI2SCFGR_PLLI2SQ(n)  ((uint32_t)(n) << RCC_PLLI2SCFGR_PLLI2SQ_SHIFT)
@@ -610,7 +610,7 @@
 #  define RCC_PLLSAICFGR_PLLSAIN(n)  ((n) << RCC_PLLSAICFGR_PLLSAIN_SHIFT)
 #define RCC_PLLSAICFGR_PLLSAIP_SHIFT (16)      /* Bits 16-17: PLLSAI division factor for 48MHz clock */
 #define RCC_PLLSAICFGR_PLLSAIP_MASK  (3 << RCC_PLLSAICFGR_PLLSAIP_SHIFT)
-#  define RCC_PLLSAICFGR_PLLSAIP(n)  ((n) << RCC_PLLSAICFGR_PLLSAIP_SHIFT)
+#  define RCC_PLLSAICFGR_PLLSAIP(n)  ((((n)>>1)-1) << RCC_PLLSAICFGR_PLLSAIP_SHIFT)
 #define RCC_PLLSAICFGR_PLLSAIQ_SHIFT (24)      /* Bits 24-27: PLLSAI division factor for SAI clock */
 #define RCC_PLLSAICFGR_PLLSAIQ_MASK  (0x0F << RCC_PLLSAICFGR_PLLSAIQ_SHIFT)
 #  define RCC_PLLSAICFGR_PLLSAIQ(n)  ((n) << RCC_PLLSAICFGR_PLLSAIQ_SHIFT)
-- 
GitLab


From c8e73b9ceff00c515492eecefb214d00b54915e6 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sat, 25 Jun 2016 09:42:29 -0600
Subject: [PATCH 052/229] Backout most of changes from
 4d331ec09b2fc72636f86be628ea2f69381 and
 8afe721612653bd2379080e91b6c1e8b5f2d41a2.  Does not work as expected.

---
 Makefile.win          |  2 +-
 configs/Kconfig       | 31 ++++++++-----------------------
 configs/dummy/Kconfig |  4 ----
 3 files changed, 9 insertions(+), 28 deletions(-)
 delete mode 100644 configs/dummy/Kconfig

diff --git a/Makefile.win b/Makefile.win
index 5556efb79f..c1ab6a7cef 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -484,7 +484,7 @@ config: context apps_preconfig
 	$(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-conf Kconfig
 
 oldconfig: context apps_preconfig
-	$(Q) context set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-conf --oldconfig Kconfig
+	$(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-conf --oldconfig Kconfig
 
 olddefconfig: context apps_preconfig
 	$(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-conf --olddefconfig Kconfig
diff --git a/configs/Kconfig b/configs/Kconfig
index c2efce0812..7837db1897 100644
--- a/configs/Kconfig
+++ b/configs/Kconfig
@@ -1265,25 +1265,19 @@ config ARCH_BOARD_CUSTOM
 
 endchoice
 
-if !ARCH_BOARD_CUSTOM
-
-config ARCH_BOARD_CUSTOM_DIR
-	string
-	default "configs/dummy"
-
-config ARCH_BOARD_CUSTOM_DIR_RELPATH
-	bool
-	default y
-
-endif # !ARCH_BOARD_CUSTOM
-
 if ARCH_BOARD_CUSTOM
-
 menu "Custom Board Configuration"
 
+config ARCH_BOARD_CUSTOM_NAME
+	string "Custom board name"
+	default ""
+	---help---
+		This is a name for the board.  It is not used except to return the
+		information via the NSH uname command.
+
 config ARCH_BOARD_CUSTOM_DIR
 	string "Custom board directory"
-	default "configs/dummy"
+	default ""
 	---help---
 		If the custom board configuration is selected, then it is necessary
 		to also tell the build system where it can find the board directory
@@ -1300,12 +1294,6 @@ config ARCH_BOARD_CUSTOM_DIR_RELPATH
 	---help---
 		Specifies that the board directory is relative to the NuttX directory.
 
-config ARCH_BOARD_CUSTOM_NAME
-	string "Custom board name"
-	---help---
-		This is a name for the board.  It is not used except to return the
-		information via the NSH uname command.
-
 config BOARD_CUSTOM_LEDS
 	bool "Custom board LEDs"
 	default n
@@ -1858,9 +1846,6 @@ endif
 if ARCH_BOARD_SIM
 source "configs/sim/Kconfig"
 endif
-if ARCH_BOARD_CUSTOM
-source "$ARCH_BOARD_CUSTOM_DIR/Kconfig"
-endif
 
 config BOARD_CRASHDUMP
 	bool "Enable Board level logging of crash dumps"
diff --git a/configs/dummy/Kconfig b/configs/dummy/Kconfig
deleted file mode 100644
index f72f3c094c..0000000000
--- a/configs/dummy/Kconfig
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see the file kconfig-language.txt in the NuttX tools repository.
-#
-- 
GitLab


From b16fdaf1555925155ad31c35f5e6a1e5ada547a8 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sun, 26 Jun 2016 11:24:35 -0600
Subject: [PATCH 053/229] Some small improvements to GPIO driver

---
 TODO                            |  3 ++-
 drivers/ioexpander/gpio.c       |  2 +-
 include/nuttx/ioexpander/gpio.h | 14 ++++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/TODO b/TODO
index a4c960e2e1..a2c38f1d7b 100644
--- a/TODO
+++ b/TODO
@@ -938,6 +938,7 @@ o Network (net/, drivers/net)
                  TM4C         YES                     YES
                eZ80           NO                      NO
                LPC17xx        YES                     YES (not tested)
+               LPC43xx        YES                     YES (not tested)
                DMxxx NIC      NO                      NO
                PIC32          NO                      NO
                RGMP           ???                     ???
@@ -1602,7 +1603,7 @@ o Build system
   Priority:    Low.
 
   Title:       NATIVE WINDOWS BUILD BROKEN
-  Description: The way that apps/ no generates Kmenu files depends on changes added
+  Description: The way that apps/ now generates Kmenu files depends on changes added
                to apps/tools/mkkconfig.sh.  Similar changes need to be made to
                apps/tools/mkkconfig.bat to restore the Windows Native build.
                UPDATE: The mkkconfig.bat script has been updated and appears to work.
diff --git a/drivers/ioexpander/gpio.c b/drivers/ioexpander/gpio.c
index 882c2b4644..4eacefbef5 100644
--- a/drivers/ioexpander/gpio.c
+++ b/drivers/ioexpander/gpio.c
@@ -86,7 +86,7 @@ static const struct file_operations g_gpio_output_ops =
 {
   gpio_open,  /* open */
   gpio_close, /* close */
-  NULL,       /* read */
+  gpio_read,  /* read */
   gpio_write, /* write */
   NULL,       /* seek */
   gpio_ioctl  /* ioctl */
diff --git a/include/nuttx/ioexpander/gpio.h b/include/nuttx/ioexpander/gpio.h
index 1e5ae50cc7..07d6e3e0fd 100644
--- a/include/nuttx/ioexpander/gpio.h
+++ b/include/nuttx/ioexpander/gpio.h
@@ -78,19 +78,33 @@ struct gpio_common_dev_s
 
 struct gpio_input_dev_s
 {
+  /* Common fields */
+
   bool gpin_output;
   uint8_t gpin_unused[3];
+
+  /* Fields unique to input pins */
+
   CODE int (*gpin_read)(FAR struct gpio_input_dev_s *dev);
+
+  /* Lower-half private definitions may follow */
 };
 
 /* The interface to a GPIO input pin */
 
 struct gpio_output_dev_s
 {
+  /* Common fields */
+
   bool gpout_output;
   uint8_t gpout_unused[3];
+
+  /* Fields unique to output pins */
+
   CODE int (*gpout_read)(FAR struct gpio_output_dev_s *dev);
   CODE int (*gpout_write)(FAR struct gpio_output_dev_s *dev, int value);
+
+  /* Lower-half private definitions may follow */
 };
 
 /****************************************************************************
-- 
GitLab


From 1e67714c3f2e278fb969fa12ace2da042815ae09 Mon Sep 17 00:00:00 2001
From: Lok Tep 
Date: Mon, 27 Jun 2016 11:23:42 +0200
Subject: [PATCH 054/229] usb copy

---
 arch/arm/src/stm32f7/Make.defs        |    8 +
 arch/arm/src/stm32f7/chip/stm32_otg.h |  874 ++++
 arch/arm/src/stm32f7/stm32_otg.h      |  149 +
 arch/arm/src/stm32f7/stm32_otgdev.c   | 5761 +++++++++++++++++++++++++
 arch/arm/src/stm32f7/stm32_otghost.c  | 5306 +++++++++++++++++++++++
 5 files changed, 12098 insertions(+)
 create mode 100644 arch/arm/src/stm32f7/chip/stm32_otg.h
 create mode 100644 arch/arm/src/stm32f7/stm32_otg.h
 create mode 100644 arch/arm/src/stm32f7/stm32_otgdev.c
 create mode 100644 arch/arm/src/stm32f7/stm32_otghost.c

diff --git a/arch/arm/src/stm32f7/Make.defs b/arch/arm/src/stm32f7/Make.defs
index ba56b9aea4..4534212b63 100644
--- a/arch/arm/src/stm32f7/Make.defs
+++ b/arch/arm/src/stm32f7/Make.defs
@@ -151,6 +151,14 @@ ifeq ($(CONFIG_STM32F7_SDMMC1),y)
 CHIP_CSRCS += stm32_sdmmc.c
 endif
 
+ifeq ($(CONFIG_USBDEV),y)
+CHIP_CSRCS += stm32_otgdev.c
+endif
+
+ifeq ($(CONFIG_USBHOST),y)
+CHIP_CSRCS += stm32_otghost.c
+endif
+
 ifeq ($(CONFIG_STM32F7_TIM),y)
 CHIP_CSRCS += stm32_tim.c
 endif
diff --git a/arch/arm/src/stm32f7/chip/stm32_otg.h b/arch/arm/src/stm32f7/chip/stm32_otg.h
new file mode 100644
index 0000000000..474d063026
--- /dev/null
+++ b/arch/arm/src/stm32f7/chip/stm32_otg.h
@@ -0,0 +1,874 @@
+/****************************************************************************************************
+ * arch/arm/src/stm32f7/chip/stm32f_otgfs.h
+ *
+ *   Copyright (C) 2012, 2014-2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2016 Omni Hoverboards Inc. All rights reserved.
+ *   Author: Gregory Nutt 
+ *           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 __ARCH_ARM_SRC_STM32F7_CHIP_STM32_OTG_H
+#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_OTG_H
+
+/****************************************************************************************************
+ * Included Files
+ ****************************************************************************************************/
+/****************************************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************************************/
+/* General definitions */
+
+#define OTG_EPTYPE_CTRL               (0) /* Control */
+#define OTG_EPTYPE_ISOC               (1) /* Isochronous */
+#define OTG_EPTYPE_BULK               (2) /* Bulk */
+#define OTG_EPTYPE_INTR               (3) /* Interrupt */
+
+#define OTG_PID_DATA0                 (0)
+#define OTG_PID_DATA2                 (1)
+#define OTG_PID_DATA1                 (2)
+#define OTG_PID_MDATA                 (3) /* Non-control */
+#define OTG_PID_SETUP                 (3) /* Control */
+
+/* Register Offsets *********************************************************************************/
+/* Core global control and status registers */
+
+#define STM32_OTG_GOTGCTL_OFFSET      0x0000 /* Control and status register */
+#define STM32_OTG_GOTGINT_OFFSET      0x0004 /* Interrupt register */
+#define STM32_OTG_GAHBCFG_OFFSET      0x0008 /* AHB configuration register */
+#define STM32_OTG_GUSBCFG_OFFSET      0x000c /* USB configuration register */
+#define STM32_OTG_GRSTCTL_OFFSET      0x0010 /* Reset register */
+#define STM32_OTG_GINTSTS_OFFSET      0x0014 /* Core interrupt register */
+#define STM32_OTG_GINTMSK_OFFSET      0x0018 /* Interrupt mask register */
+#define STM32_OTG_GRXSTSR_OFFSET      0x001c /* Receive status debug read/OTG status read register */
+#define STM32_OTG_GRXSTSP_OFFSET      0x0020 /* Receive status debug read/OTG status pop register */
+#define STM32_OTG_GRXFSIZ_OFFSET      0x0024 /* Receive FIFO size register */
+#define STM32_OTG_HNPTXFSIZ_OFFSET    0x0028 /* Host non-periodic transmit FIFO size register */
+#define STM32_OTG_DIEPTXF0_OFFSET     0x0028 /* Endpoint 0 Transmit FIFO size */
+#define STM32_OTG_HNPTXSTS_OFFSET     0x002c /* Non-periodic transmit FIFO/queue status register */
+#define STM32_OTG_GCCFG_OFFSET        0x0038 /* General core configuration register */
+#define STM32_OTG_CID_OFFSET          0x003c /* Core ID register  */
+#define STM32_OTG_HPTXFSIZ_OFFSET     0x0100 /* Host periodic transmit FIFO size register */
+
+#define STM32_OTG_DIEPTXF_OFFSET(n)   (104+(((n)-1) << 2))
+
+/* Host-mode control and status registers */
+
+#define STM32_OTG_HCFG_OFFSET         0x0400 /* Host configuration register */
+#define STM32_OTG_HFIR_OFFSET         0x0404 /* Host frame interval register */
+#define STM32_OTG_HFNUM_OFFSET        0x0408 /* Host frame number/frame time remaining register */
+#define STM32_OTG_HPTXSTS_OFFSET      0x0410 /* Host periodic transmit FIFO/queue status register */
+#define STM32_OTG_HAINT_OFFSET        0x0414 /* Host all channels interrupt register */
+#define STM32_OTG_HAINTMSK_OFFSET     0x0418 /* Host all channels interrupt mask register */
+#define STM32_OTG_HPRT_OFFSET         0x0440 /* Host port control and status register */
+
+#define STM32_OTG_CHAN_OFFSET(n)      (0x500 + ((n) << 5)
+#define STM32_OTG_HCCHAR_CHOFFSET     0x0000 /* Host channel characteristics register */
+#define STM32_OTG_HCINT_CHOFFSET      0x0008 /* Host channel interrupt register */
+#define STM32_OTG_HCINTMSK_CHOFFSET   0x000c /* Host channel interrupt mask register */
+#define STM32_OTG_HCTSIZ_CHOFFSET     0x0010 /* Host channel interrupt register */
+
+#define STM32_OTG_HCCHAR_OFFSET(n)    (0x500 + ((n) << 5))
+
+#define STM32_OTG_HCINT_OFFSET(n)     (0x508 + ((n) << 5))
+
+#define STM32_OTG_HCINTMSK_OFFSET(n)  (0x50c + ((n) << 5))
+
+#define STM32_OTG_HCTSIZ_OFFSET(n)    (0x510 + ((n) << 5))
+
+/* Device-mode control and status registers */
+
+#define STM32_OTG_DCFG_OFFSET         0x0800 /* Device configuration register */
+#define STM32_OTG_DCTL_OFFSET         0x0804 /* Device control register */
+#define STM32_OTG_DSTS_OFFSET         0x0808 /* Device status register */
+#define STM32_OTG_DIEPMSK_OFFSET      0x0810 /* Device IN endpoint common interrupt mask register */
+#define STM32_OTG_DOEPMSK_OFFSET      0x0814 /* Device OUT endpoint common interrupt mask register */
+#define STM32_OTG_DAINT_OFFSET        0x0818 /* Device all endpoints interrupt register */
+#define STM32_OTG_DAINTMSK_OFFSET     0x081c /* All endpoints interrupt mask register */
+#define STM32_OTG_DVBUSDIS_OFFSET     0x0828 /* Device VBUS discharge time register */
+#define STM32_OTG_DVBUSPULSE_OFFSET   0x082c /* Device VBUS pulsing time register */
+#define STM32_OTG_DIEPEMPMSK_OFFSET   0x0834 /* Device IN endpoint FIFO empty interrupt mask register */
+
+#define STM32_OTG_DIEP_OFFSET(n)      (0x0900 + ((n) << 5))
+#define STM32_OTG_DIEPCTL_EPOFFSET    0x0000 /* Device endpoint control register */
+#define STM32_OTG_DIEPINT_EPOFFSET    0x0008 /* Device endpoint interrupt register */
+#define STM32_OTG_DIEPTSIZ_EPOFFSET   0x0010 /* Device IN endpoint transfer size register */
+#define STM32_OTG_DTXFSTS_EPOFFSET    0x0018 /* Device IN endpoint transmit FIFO status register */
+
+#define STM32_OTG_DIEPCTL_OFFSET(n)   (0x0900 + ((n) << 5))
+
+#define STM32_OTG_DIEPINT_OFFSET(n)   (0x0908 + ((n) << 5))
+
+#define STM32_OTG_DIEPTSIZ_OFFSET(n)  (0x910 + ((n) << 5))
+
+#define STM32_OTG_DTXFSTS_OFFSET(n)   (0x0918 + ((n) << 5))
+
+#define STM32_OTG_DOEP_OFFSET(n)      (0x0b00 + ((n) << 5))
+#define STM32_OTG_DOEPCTL_EPOFFSET    0x0000 /* Device control OUT endpoint 0 control register */
+#define STM32_OTG_DOEPINT_EPOFFSET    0x0008 /* Device endpoint-x interrupt register */
+
+#define STM32_OTG_DOEPCTL_OFFSET(n)   (0x0b00 + ((n) << 5))
+
+#define STM32_OTG_DOEPINT_OFFSET(n)   (0x0b08 + ((n) << 5))
+
+#define STM32_OTG_DOEPTSIZ_OFFSET(n)  (0x0b10 + ((n) << 5))
+
+/* Power and clock gating registers */
+
+#define STM32_OTG_PCGCCTL_OFFSET      0x0e00 /* Power and clock gating control register */
+
+/* Data FIFO (DFIFO) access registers */
+
+#define STM32_OTG_DFIFO_DEP_OFFSET(n) (0x1000 + ((n) << 12))
+#define STM32_OTG_DFIFO_HCH_OFFSET(n) (0x1000 + ((n) << 12))
+
+
+/* Register Addresses *******************************************************************************/
+
+#define STM32_OTG_GOTGCTL             (STM32_OTG_BASE+STM32_OTG_GOTGCTL_OFFSET)
+#define STM32_OTG_GOTGINT             (STM32_OTG_BASE+STM32_OTG_GOTGINT_OFFSET)
+#define STM32_OTG_GAHBCFG             (STM32_OTG_BASE+STM32_OTG_GAHBCFG_OFFSET)
+#define STM32_OTG_GUSBCFG             (STM32_OTG_BASE+STM32_OTG_GUSBCFG_OFFSET)
+#define STM32_OTG_GRSTCTL             (STM32_OTG_BASE+STM32_OTG_GRSTCTL_OFFSET)
+#define STM32_OTG_GINTSTS             (STM32_OTG_BASE+STM32_OTG_GINTSTS_OFFSET)
+#define STM32_OTG_GINTMSK             (STM32_OTG_BASE+STM32_OTG_GINTMSK_OFFSET)
+#define STM32_OTG_GRXSTSR             (STM32_OTG_BASE+STM32_OTG_GRXSTSR_OFFSET)
+#define STM32_OTG_GRXSTSP             (STM32_OTG_BASE+STM32_OTG_GRXSTSP_OFFSET)
+#define STM32_OTG_GRXFSIZ             (STM32_OTG_BASE+STM32_OTG_GRXFSIZ_OFFSET)
+#define STM32_OTG_HNPTXFSIZ           (STM32_OTG_BASE+STM32_OTG_HNPTXFSIZ_OFFSET)
+#define STM32_OTG_DIEPTXF0            (STM32_OTG_BASE+STM32_OTG_DIEPTXF0_OFFSET)
+#define STM32_OTG_HNPTXSTS            (STM32_OTG_BASE+STM32_OTG_HNPTXSTS_OFFSET)
+#define STM32_OTG_GCCFG               (STM32_OTG_BASE+STM32_OTG_GCCFG_OFFSET)
+#define STM32_OTG_CID                 (STM32_OTG_BASE+STM32_OTG_CID_OFFSET)
+#define STM32_OTG_HPTXFSIZ            (STM32_OTG_BASE+STM32_OTG_HPTXFSIZ_OFFSET)
+
+#define STM32_OTG_DIEPTXF(n)          (STM32_OTG_BASE+STM32_OTG_DIEPTXF_OFFSET(n))
+
+/* Host-mode control and status registers */
+
+#define STM32_OTG_HCFG                (STM32_OTG_BASE+STM32_OTG_HCFG_OFFSET)
+#define STM32_OTG_HFIR                (STM32_OTG_BASE+STM32_OTG_HFIR_OFFSET)
+#define STM32_OTG_HFNUM               (STM32_OTG_BASE+STM32_OTG_HFNUM_OFFSET)
+#define STM32_OTG_HPTXSTS             (STM32_OTG_BASE+STM32_OTG_HPTXSTS_OFFSET)
+#define STM32_OTG_HAINT               (STM32_OTG_BASE+STM32_OTG_HAINT_OFFSET)
+#define STM32_OTG_HAINTMSK            (STM32_OTG_BASE+STM32_OTG_HAINTMSK_OFFSET)
+#define STM32_OTG_HPRT                (STM32_OTG_BASE+STM32_OTG_HPRT_OFFSET)
+
+#define STM32_OTG_CHAN(n)             (STM32_OTG_BASE+STM32_OTG_CHAN_OFFSET(n))
+
+#define STM32_OTG_HCCHAR(n)           (STM32_OTG_BASE+STM32_OTG_HCCHAR_OFFSET(n))
+
+#define STM32_OTG_HCINT(n)            (STM32_OTG_BASE+STM32_OTG_HCINT_OFFSET(n))
+
+#define STM32_OTG_HCINTMSK(n)         (STM32_OTG_BASE+STM32_OTG_HCINTMSK_OFFSET(n))
+
+#define STM32_OTG_HCTSIZ(n)           (STM32_OTG_BASE+STM32_OTG_HCTSIZ_OFFSET(n))
+
+/* Device-mode control and status registers */
+
+#define STM32_OTG_DCFG                (STM32_OTG_BASE+STM32_OTG_DCFG_OFFSET)
+#define STM32_OTG_DCTL                (STM32_OTG_BASE+STM32_OTG_DCTL_OFFSET)
+#define STM32_OTG_DSTS                (STM32_OTG_BASE+STM32_OTG_DSTS_OFFSET)
+#define STM32_OTG_DIEPMSK             (STM32_OTG_BASE+STM32_OTG_DIEPMSK_OFFSET)
+#define STM32_OTG_DOEPMSK             (STM32_OTG_BASE+STM32_OTG_DOEPMSK_OFFSET)
+#define STM32_OTG_DAINT               (STM32_OTG_BASE+STM32_OTG_DAINT_OFFSET)
+#define STM32_OTG_DAINTMSK            (STM32_OTG_BASE+STM32_OTG_DAINTMSK_OFFSET)
+#define STM32_OTG_DVBUSDIS            (STM32_OTG_BASE+STM32_OTG_DVBUSDIS_OFFSET)
+#define STM32_OTG_DVBUSPULSE          (STM32_OTG_BASE+STM32_OTG_DVBUSPULSE_OFFSET)
+#define STM32_OTG_DIEPEMPMSK          (STM32_OTG_BASE+STM32_OTG_DIEPEMPMSK_OFFSET)
+
+#define STM32_OTG_DIEP(n)             (STM32_OTG_BASE+STM32_OTG_DIEP_OFFSET(n))
+
+#define STM32_OTG_DIEPCTL(n)          (STM32_OTG_BASE+STM32_OTG_DIEPCTL_OFFSET(n))
+
+#define STM32_OTG_DIEPINT(n)          (STM32_OTG_BASE+STM32_OTG_DIEPINT_OFFSET(n))
+
+#define STM32_OTG_DIEPTSIZ(n)         (STM32_OTG_BASE+STM32_OTG_DIEPTSIZ_OFFSET(n))
+
+#define STM32_OTG_DTXFSTS(n)          (STM32_OTG_BASE+STM32_OTG_DTXFSTS_OFFSET(n))
+
+#define STM32_OTG_DOEP(n)             (STM32_OTG_BASE+STM32_OTG_DOEP_OFFSET(n))
+
+#define STM32_OTG_DOEPCTL(n)          (STM32_OTG_BASE+STM32_OTG_DOEPCTL_OFFSET(n))
+
+#define STM32_OTG_DOEPINT(n)          (STM32_OTG_BASE+STM32_OTG_DOEPINT_OFFSET(n))
+
+#define STM32_OTG_DOEPTSIZ(n)         (STM32_OTG_BASE+STM32_OTG_DOEPTSIZ_OFFSET(n))
+
+/* Power and clock gating registers */
+
+#define STM32_OTG_PCGCCTL             (STM32_OTG_BASE+STM32_OTG_PCGCCTL_OFFSET)
+
+/* Data FIFO (DFIFO) access registers */
+
+#define STM32_OTG_DFIFO_DEP(n)        (STM32_OTG_BASE+STM32_OTG_DFIFO_DEP_OFFSET(n))
+#define STM32_OTG_DFIFO_HCH(n)        (STM32_OTG_BASE+STM32_OTG_DFIFO_HCH_OFFSET(n))
+
+
+/* Register Bitfield Definitions ********************************************************************/
+/* Core global control and status registers */
+
+/* Control and status register */
+
+#define OTG_GOTGCTL_SRQSCS            (1 << 0)  /* Bit 0:  Session request success */
+#define OTG_GOTGCTL_SRQ               (1 << 1)  /* Bit 1:  Session request */
+#define OTG_GOTGCTL_VBVALOEN          (1 << 2)  /* Bit 2:  VBUS valid override enable */
+#define OTG_GOTGCTL_VBVALOVAL         (1 << 3)  /* Bit 3:  VBUS valid override value */
+#define OTG_GOTGCTL_AVALOEN           (1 << 4)  /* Bit 4:  A-peripheral session valid override enable */
+#define OTG_GOTGCTL_AVALOVAL          (1 << 5)  /* Bit 5:  A-peripheral session valid override value */
+#define OTG_GOTGCTL_BVALOEN           (1 << 6)  /* Bit 6:  B-peripheral session valid override enable */
+#define OTG_GOTGCTL_BVALOVAL          (1 << 7)  /* Bit 7:  B-peripheral session valid override value  */
+#define OTG_GOTGCTL_HNGSCS            (1 << 8)  /* Bit 8:  Host negotiation success */
+#define OTG_GOTGCTL_HNPRQ             (1 << 9)  /* Bit 9:  HNP request */
+#define OTG_GOTGCTL_HSHNPEN           (1 << 10) /* Bit 10: host set HNP enable */
+#define OTG_GOTGCTL_DHNPEN            (1 << 11) /* Bit 11: Device HNP enabled */
+#define OTG_GOTGCTL_EHEN              (1 << 12) /* Bit 12: Embedded host enable */
+                                                  /* Bits 13-15: Reserved, must be kept at reset value */
+#define OTG_GOTGCTL_CIDSTS            (1 << 16) /* Bit 16: Connector ID status */
+#define OTG_GOTGCTL_DBCT              (1 << 17) /* Bit 17: Long/short debounce time */
+#define OTG_GOTGCTL_ASVLD             (1 << 18) /* Bit 18: A-session valid */
+#define OTG_GOTGCTL_BSVLD             (1 << 19) /* Bit 19: B-session valid */
+#define OTG_GOTGCTL_OTGVER            (1 << 20) /* Bit 20: OTG version */
+                                                  /* Bits 21-31: Reserved, must be kept at reset value */
+/* Interrupt register */
+                                                  /* Bits 1:0 Reserved, must be kept at reset value */
+#define OTG_GOTGINT_SEDET             (1 << 2)  /* Bit 2: Session end detected */
+                                                  /* Bits 3-7: Reserved, must be kept at reset value */
+#define OTG_GOTGINT_SRSSCHG           (1 << 8)  /* Bit 8: Session request success status change */
+#define OTG_GOTGINT_HNSSCHG           (1 << 9)  /* Bit 9: Host negotiation success status change */
+                                                  /* Bits 16:10 Reserved, must be kept at reset value */
+#define OTG_GOTGINT_HNGDET            (1 << 17) /* Bit 17: Host negotiation detected */
+#define OTG_GOTGINT_ADTOCHG           (1 << 18) /* Bit 18: A-device timeout change */
+#define OTG_GOTGINT_DBCDNE            (1 << 19) /* Bit 19: Debounce done */
+#define OTG_GOTGINT_IDCHNG            (1 << 20) /* Bit 20: Change in ID pin input value */
+                                                  /* Bits 21-31: Reserved, must be kept at reset value */
+
+/* AHB configuration register */
+
+#define OTG_GAHBCFG_GINTMSK           (1 << 0)  /* Bit 0: Global interrupt mask */
+                                                  /* Bits 1-6: Reserved, must be kept at reset value */
+#define OTG_GAHBCFG_TXFELVL           (1 << 7)  /* Bit 7: TxFIFO empty level */
+#define OTG_GAHBCFG_PTXFELVL          (1 << 8)  /* Bit 8: Periodic TxFIFO empty level */
+                                                  /* Bits 20-31: Reserved, must be kept at reset value */
+/* USB configuration register */
+
+#define OTG_GUSBCFG_TOCAL_SHIFT       (0)       /* Bits 0-2: FS timeout calibration */
+#define OTG_GUSBCFG_TOCAL_MASK        (7 << OTG_GUSBCFG_TOCAL_SHIFT)
+                                                  /* Bits 3-5: Reserved, must be kept at reset value */
+#define OTG_GUSBCFG_PHYSEL            (1 << 6)  /* Bit 6: Full Speed serial transceiver select */
+                                                  /* Bit 7: Reserved, must be kept at reset value */
+#define OTG_GUSBCFG_SRPCAP            (1 << 8)  /* Bit 8: SRP-capable */
+#define OTG_GUSBCFG_HNPCAP            (1 << 9)  /* Bit 9: HNP-capable */
+#define OTG_GUSBCFG_TRDT_SHIFT        (10)      /* Bits 10-13: USB turnaround time */
+#define OTG_GUSBCFG_TRDT_MASK         (15 << OTG_GUSBCFG_TRDT_SHIFT)
+#  define OTG_GUSBCFG_TRDT(n)         ((n) << OTG_GUSBCFG_TRDT_SHIFT)
+                                                  /* Bits 14-28: Reserved, must be kept at reset value */
+#define OTG_GUSBCFG_FHMOD             (1 << 29) /* Bit 29: Force host mode */
+#define OTG_GUSBCFG_FDMOD             (1 << 30) /* Bit 30: Force device mode */
+#define OTG_GUSBCFG_CTXPKT            (1 << 31) /* Bit 31: Corrupt Tx packet */
+                                                  /* Bits 20-31: Reserved, must be kept at reset value */
+/* Reset register */
+
+#define OTG_GRSTCTL_CSRST             (1 << 0)  /* Bit 0: Core soft reset */
+#define OTG_GRSTCTL_HSRST             (1 << 1)  /* Bit 1: HCLK soft reset */
+#define OTG_GRSTCTL_FCRST             (1 << 2)  /* Bit 2: Host frame counter reset */
+                                                  /* Bit 3 Reserved, must be kept at reset value */
+#define OTG_GRSTCTL_RXFFLSH           (1 << 4)  /* Bit 4: RxFIFO flush */
+#define OTG_GRSTCTL_TXFFLSH           (1 << 5)  /* Bit 5: TxFIFO flush */
+#define OTG_GRSTCTL_TXFNUM_SHIFT      (6)       /* Bits 6-10: TxFIFO number */
+#define OTG_GRSTCTL_TXFNUM_MASK       (31 << OTG_GRSTCTL_TXFNUM_SHIFT)
+#  define OTG_GRSTCTL_TXFNUM_HNONPER  (0 << OTG_GRSTCTL_TXFNUM_SHIFT)   /* Non-periodic TxFIFO flush in host mode */
+#  define OTG_GRSTCTL_TXFNUM_HPER     (1 << OTG_GRSTCTL_TXFNUM_SHIFT)   /* Periodic TxFIFO flush in host mode */
+#  define OTG_GRSTCTL_TXFNUM_HALL     (16 << OTG_GRSTCTL_TXFNUM_SHIFT)  /* Flush all the transmit FIFOs in host mode.*/
+#  define OTG_GRSTCTL_TXFNUM_D(n)     ((n) << OTG_GRSTCTL_TXFNUM_SHIFT) /* TXFIFO n flush in device mode, n=0-15 */
+#  define OTG_GRSTCTL_TXFNUM_DALL     (16 << OTG_GRSTCTL_TXFNUM_SHIFT)  /* Flush all the transmit FIFOs in device mode.*/
+                                                  /* Bits 11-31: Reserved, must be kept at reset value */
+#define OTG_GRSTCTL_AHBIDL            (1 << 31) /* Bit 31: AHB master idle */
+
+/* Core interrupt and Interrupt mask registers */
+
+#define OTG_GINTSTS_CMOD              (1 << 0)  /* Bit 0:  Current mode of operation */
+#  define OTG_GINTSTS_DEVMODE         (0)
+#  define OTG_GINTSTS_HOSTMODE        (OTG_GINTSTS_CMOD)
+#define OTG_GINT_MMIS                 (1 << 1)  /* Bit 1:  Mode mismatch interrupt */
+#define OTG_GINT_OTG                  (1 << 2)  /* Bit 2:  OTG interrupt */
+#define OTG_GINT_SOF                  (1 << 3)  /* Bit 3:  Start of frame */
+#define OTG_GINT_RXFLVL               (1 << 4)  /* Bit 4:  RxFIFO non-empty */
+#define OTG_GINT_NPTXFE               (1 << 5)  /* Bit 5:  Non-periodic TxFIFO empty */
+#define OTG_GINT_GINAKEFF             (1 << 6)  /* Bit 6:  Global IN non-periodic NAK effective */
+#define OTG_GINT_GONAKEFF             (1 << 7)  /* Bit 7:  Global OUT NAK effective */
+                                                  /* Bits 8-9: Reserved, must be kept at reset value */
+#define OTG_GINT_ESUSP                (1 << 10) /* Bit 10: Early suspend */
+#define OTG_GINT_USBSUSP              (1 << 11) /* Bit 11: USB suspend */
+#define OTG_GINT_USBRST               (1 << 12) /* Bit 12: USB reset */
+#define OTG_GINT_ENUMDNE              (1 << 13) /* Bit 13: Enumeration done */
+#define OTG_GINT_ISOODRP              (1 << 14) /* Bit 14: Isochronous OUT packet dropped interrupt */
+#define OTG_GINT_EOPF                 (1 << 15) /* Bit 15: End of periodic frame interrupt */
+                                                  /* Bits 16 Reserved, must be kept at reset value */
+#define OTG_GINTMSK_EPMISM            (1 << 17) /* Bit 17: Endpoint mismatch interrupt mask */
+#define OTG_GINT_IEP                  (1 << 18) /* Bit 18: IN endpoint interrupt */
+#define OTG_GINT_OEP                  (1 << 19) /* Bit 19: OUT endpoint interrupt */
+#define OTG_GINT_IISOIXFR             (1 << 20) /* Bit 20: Incomplete isochronous IN transfer */
+#define OTG_GINT_IISOOXFR             (1 << 21) /* Bit 21: Incomplete isochronous OUT transfer (device) */
+#define OTG_GINT_IPXFR                (1 << 21) /* Bit 21: Incomplete periodic transfer (host) */
+                                                  /* Bit 22: Reserved, must be kept at reset value */
+#define OTG_GINT_RSTDET               (1 << 23) /* Bit 23: Reset detected interrupt */
+#define OTG_GINT_HPRT                 (1 << 24) /* Bit 24: Host port interrupt */
+#define OTG_GINT_HC                   (1 << 25) /* Bit 25: Host channels interrupt */
+#define OTG_GINT_PTXFE                (1 << 26) /* Bit 26: Periodic TxFIFO empty */
+#define OTG_GINT_LPMINT               (1 << 27) /* Bit 27: LPM interrupt */
+#define OTG_GINT_CIDSCHG              (1 << 28) /* Bit 28: Connector ID status change */
+#define OTG_GINT_DISC                 (1 << 29) /* Bit 29: Disconnect detected interrupt */
+#define OTG_GINT_SRQ                  (1 << 30) /* Bit 30: Session request/new session detected interrupt */
+#define OTG_GINT_WKUP                 (1 << 31) /* Bit 31: Resume/remote wakeup detected interrupt */
+
+/* Receive status debug read/OTG status read and pop registers (host mode) */
+
+#define OTG_GRXSTSH_CHNUM_SHIFT       (0)       /* Bits 0-3: Channel number */
+#define OTG_GRXSTSH_CHNUM_MASK        (15 << OTG_GRXSTSH_CHNUM_SHIFT)
+#define OTG_GRXSTSH_BCNT_SHIFT        (4)       /* Bits 4-14: Byte count */
+#define OTG_GRXSTSH_BCNT_MASK         (0x7ff << OTG_GRXSTSH_BCNT_SHIFT)
+#define OTG_GRXSTSH_DPID_SHIFT        (15)      /* Bits 15-16: Data PID */
+#define OTG_GRXSTSH_DPID_MASK         (3 << OTG_GRXSTSH_DPID_SHIFT)
+#  define OTG_GRXSTSH_DPID_DATA0      (0 << OTG_GRXSTSH_DPID_SHIFT)
+#  define OTG_GRXSTSH_DPID_DATA2      (1 << OTG_GRXSTSH_DPID_SHIFT)
+#  define OTG_GRXSTSH_DPID_DATA1      (2 << OTG_GRXSTSH_DPID_SHIFT)
+#  define OTG_GRXSTSH_DPID_MDATA      (3 << OTG_GRXSTSH_DPID_SHIFT)
+#define OTG_GRXSTSH_PKTSTS_SHIFT      (17)      /* Bits 17-20: Packet status */
+#define OTG_GRXSTSH_PKTSTS_MASK       (15 << OTG_GRXSTSH_PKTSTS_SHIFT)
+#  define OTG_GRXSTSH_PKTSTS_INRECVD  (2 << OTG_GRXSTSH_PKTSTS_SHIFT) /* IN data packet received */
+#  define OTG_GRXSTSH_PKTSTS_INDONE   (3 << OTG_GRXSTSH_PKTSTS_SHIFT) /* IN transfer completed */
+#  define OTG_GRXSTSH_PKTSTS_DTOGERR  (5 << OTG_GRXSTSH_PKTSTS_SHIFT) /* Data toggle error */
+#  define OTG_GRXSTSH_PKTSTS_HALTED   (7 << OTG_GRXSTSH_PKTSTS_SHIFT) /* Channel halted */
+                                                  /* Bits 21-31: Reserved, must be kept at reset value */
+/* Receive status debug read/OTG status read and pop registers (device mode) */
+
+#define OTG_GRXSTSD_EPNUM_SHIFT       (0)       /* Bits 0-3: Endpoint number */
+#define OTG_GRXSTSD_EPNUM_MASK        (15 << OTG_GRXSTSD_EPNUM_SHIFT)
+#define OTG_GRXSTSD_BCNT_SHIFT        (4)       /* Bits 4-14: Byte count */
+#define OTG_GRXSTSD_BCNT_MASK         (0x7ff << OTG_GRXSTSD_BCNT_SHIFT)
+#define OTG_GRXSTSD_DPID_SHIFT        (15)      /* Bits 15-16: Data PID */
+#define OTG_GRXSTSD_DPID_MASK         (3 << OTG_GRXSTSD_DPID_SHIFT)
+#  define OTG_GRXSTSD_DPID_DATA0      (0 << OTG_GRXSTSD_DPID_SHIFT)
+#  define OTG_GRXSTSD_DPID_DATA2      (1 << OTG_GRXSTSD_DPID_SHIFT)
+#  define OTG_GRXSTSD_DPID_DATA1      (2 << OTG_GRXSTSD_DPID_SHIFT)
+#  define OTG_GRXSTSD_DPID_MDATA      (3 << OTG_GRXSTSD_DPID_SHIFT)
+#define OTG_GRXSTSD_PKTSTS_SHIFT      (17)      /* Bits 17-20: Packet status */
+#define OTG_GRXSTSD_PKTSTS_MASK       (15 << OTG_GRXSTSD_PKTSTS_SHIFT)
+#  define OTG_GRXSTSD_PKTSTS_OUTNAK     (1 << OTG_GRXSTSD_PKTSTS_SHIFT) /* Global OUT NAK */
+#  define OTG_GRXSTSD_PKTSTS_OUTRECVD   (2 << OTG_GRXSTSD_PKTSTS_SHIFT) /* OUT data packet received */
+#  define OTG_GRXSTSD_PKTSTS_OUTDONE    (3 << OTG_GRXSTSD_PKTSTS_SHIFT) /* OUT transfer completed */
+#  define OTG_GRXSTSD_PKTSTS_SETUPDONE  (4 << OTG_GRXSTSD_PKTSTS_SHIFT) /* SETUP transaction completed */
+#  define OTG_GRXSTSD_PKTSTS_SETUPRECVD (6 << OTG_GRXSTSD_PKTSTS_SHIFT) /* SETUP data packet received */
+#define OTG_GRXSTSD_FRMNUM_SHIFT      (21)      /* Bits 21-24: Frame number */
+#define OTG_GRXSTSD_FRMNUM_MASK       (15 << OTG_GRXSTSD_FRMNUM_SHIFT)
+                                                  /* Bits 25-31: Reserved, must be kept at reset value */
+/* Receive FIFO size register */
+
+#define OTG_GRXFSIZ_MASK              (0xffff)
+
+/* Host non-periodic transmit FIFO size register */
+
+#define OTG_HNPTXFSIZ_NPTXFSA_SHIFT   (0)       /* Bits 0-15: Non-periodic transmit RAM start address */
+#define OTG_HNPTXFSIZ_NPTXFSA_MASK    (0xffff << OTG_HNPTXFSIZ_NPTXFSA_SHIFT)
+#define OTG_HNPTXFSIZ_NPTXFD_SHIFT    (16)      /* Bits 16-31: Non-periodic TxFIFO depth */
+#define OTG_HNPTXFSIZ_NPTXFD_MASK     (0xffff << OTG_HNPTXFSIZ_NPTXFD_SHIFT)
+#  define OTG_HNPTXFSIZ_NPTXFD_MIN    (16 << OTG_HNPTXFSIZ_NPTXFD_SHIFT)
+#  define OTG_HNPTXFSIZ_NPTXFD_MAX    (256 << OTG_HNPTXFSIZ_NPTXFD_SHIFT)
+
+/* Endpoint 0 Transmit FIFO size */
+
+#define OTG_DIEPTXF0_TX0FD_SHIFT      (0)       /* Bits 0-15: Endpoint 0 transmit RAM start address */
+#define OTG_DIEPTXF0_TX0FD_MASK       (0xffff << OTG_DIEPTXF0_TX0FD_SHIFT)
+#define OTG_DIEPTXF0_TX0FSA_SHIFT     (16)      /* Bits 16-31: Endpoint 0 TxFIFO depth */
+#define OTG_DIEPTXF0_TX0FSA_MASK      (0xffff << OTG_DIEPTXF0_TX0FSA_SHIFT)
+#  define OTG_DIEPTXF0_TX0FSA_MIN     (16 << OTG_DIEPTXF0_TX0FSA_SHIFT)
+#  define OTG_DIEPTXF0_TX0FSA_MAX     (256 << OTG_DIEPTXF0_TX0FSA_SHIFT)
+
+/* Non-periodic transmit FIFO/queue status register */
+
+#define OTG_HNPTXSTS_NPTXFSAV_SHIFT   (0)       /* Bits 0-15: Non-periodic TxFIFO space available */
+#define OTG_HNPTXSTS_NPTXFSAV_MASK    (0xffff << OTG_HNPTXSTS_NPTXFSAV_SHIFT)
+#  define OTG_HNPTXSTS_NPTXFSAV_FULL  (0 << OTG_HNPTXSTS_NPTXFSAV_SHIFT)
+#define OTG_HNPTXSTS_NPTQXSAV_SHIFT   (16)      /* Bits 16-23: Non-periodic transmit request queue space available */
+#define OTG_HNPTXSTS_NPTQXSAV_MASK    (0xff << OTG_HNPTXSTS_NPTQXSAV_SHIFT)
+#  define OTG_HNPTXSTS_NPTQXSAV_FULL  (0 << OTG_HNPTXSTS_NPTQXSAV_SHIFT)
+#define OTG_HNPTXSTS_NPTXQTOP_SHIFT   (24)      /* Bits 24-30: Top of the non-periodic transmit request queue */
+#define OTG_HNPTXSTS_NPTXQTOP_MASK    (0x7f << OTG_HNPTXSTS_NPTXQTOP_SHIFT)
+#  define OTG_HNPTXSTS_TERMINATE      (1 << 24) /* Bit 24: Terminate (last entry for selected channel/endpoint) */
+#  define OTG_HNPTXSTS_TYPE_SHIFT     (25)      /* Bits 25-26: Status */
+#  define OTG_HNPTXSTS_TYPE_MASK      (3 << OTG_HNPTXSTS_TYPE_SHIFT)
+#    define OTG_HNPTXSTS_TYPE_INOUT   (0 << OTG_HNPTXSTS_TYPE_SHIFT) /* IN/OUT token */
+#    define OTG_HNPTXSTS_TYPE_ZLP     (1 << OTG_HNPTXSTS_TYPE_SHIFT) /* Zero-length transmit packet (device IN/host OUT) */
+#    define OTG_HNPTXSTS_TYPE_HALT    (3 << OTG_HNPTXSTS_TYPE_SHIFT) /* Channel halt command */
+#  define OTG_HNPTXSTS_CHNUM_SHIFT    (27)      /* Bits 27-30: Channel number */
+#  define OTG_HNPTXSTS_CHNUM_MASK     (15 << OTG_HNPTXSTS_CHNUM_SHIFT)
+#  define OTG_HNPTXSTS_EPNUM_SHIFT    (27)      /* Bits 27-30: Endpoint number */
+#  define OTG_HNPTXSTS_EPNUM_MASK     (15 << OTG_HNPTXSTS_EPNUM_SHIFT)
+                                                  /* Bit 31 Reserved, must be kept at reset value */
+/* General core configuration register */
+                                                  /* Bits 0-15: Reserved, must be kept at reset value */
+#define OTG_GCCFG_PWRDWN              (1 << 16) /* Bit 16: Power down */
+                                                  /* Bit 17 Reserved, must be kept at reset value */
+#define OTG_GCCFG_VBDEN               (1 << 21) /* Bit 21: USB VBUS detection enable */
+                                                  /* Bits 22-31: Reserved, must be kept at reset value */
+/* Core ID register  (32-bit product ID) */
+
+/* Host periodic transmit FIFO size register */
+
+#define OTG_HPTXFSIZ_PTXSA_SHIFT      (0)       /* Bits 0-15: Host periodic TxFIFO start address */
+#define OTG_HPTXFSIZ_PTXSA_MASK       (0xffff << OTG_HPTXFSIZ_PTXSA_SHIFT)
+#define OTG_HPTXFSIZ_PTXFD_SHIFT      (16)      /* Bits 16-31: Host periodic TxFIFO depth */
+#define OTG_HPTXFSIZ_PTXFD_MASK       (0xffff << OTG_HPTXFSIZ_PTXFD_SHIFT)
+
+/* Device IN endpoint transmit FIFOn size register */
+
+#define OTG_DIEPTXF_INEPTXSA_SHIFT    (0)       /* Bits 0-15: IN endpoint FIFOx transmit RAM start address */
+#define OTG_DIEPTXF_INEPTXSA_MASK     (0xffff << OTG_DIEPTXF_INEPTXSA_SHIFT)
+#define OTG_DIEPTXF_INEPTXFD_SHIFT    (16)       /* Bits 16-31: IN endpoint TxFIFO depth */
+#define OTG_DIEPTXF_INEPTXFD_MASK     (0xffff << OTG_DIEPTXF_INEPTXFD_SHIFT)
+#  define OTG_DIEPTXF_INEPTXFD_MIN    (16 << OTG_DIEPTXF_INEPTXFD_MASK)
+
+/* Host-mode control and status registers */
+
+/* Host configuration register */
+
+#define OTG_HCFG_FSLSPCS_SHIFT        (0)       /* Bits 0-1: FS/LS PHY clock select */
+#define OTG_HCFG_FSLSPCS_MASK         (3 << OTG_HCFG_FSLSPCS_SHIFT)
+#  define OTG_HCFG_FSLSPCS_FS48MHz    (1 << OTG_HCFG_FSLSPCS_SHIFT) /* FS host mode, PHY clock is running at 48 MHz */
+#  define OTG_HCFG_FSLSPCS_LS48MHz    (1 << OTG_HCFG_FSLSPCS_SHIFT) /* LS host mode,  Select 48 MHz PHY clock frequency */
+#  define OTG_HCFG_FSLSPCS_LS6MHz     (2 << OTG_HCFG_FSLSPCS_SHIFT) /* LS host mode, Select 6 MHz PHY clock frequency */
+#define OTG_HCFG_FSLSS                (1 << 2)  /* Bit 2: FS- and LS-only support */
+                                                  /* Bits 31:3 Reserved, must be kept at reset value */
+/* Host frame interval register */
+
+#define OTG_HFIR_MASK                 (0xffff)
+
+/* Host frame number/frame time remaining register */
+
+#define OTG_HFNUM_FRNUM_SHIFT         (0)       /* Bits 0-15: Frame number */
+#define OTG_HFNUM_FRNUM_MASK          (0xffff << OTG_HFNUM_FRNUM_SHIFT)
+#define OTG_HFNUM_FTREM_SHIFT         (16)      /* Bits 16-31: Frame time remaining */
+#define OTG_HFNUM_FTREM_MASK          (0xffff << OTG_HFNUM_FTREM_SHIFT)
+
+/* Host periodic transmit FIFO/queue status register */
+
+#define OTG_HPTXSTS_PTXFSAVL_SHIFT    (0)       /* Bits 0-15: Periodic transmit data FIFO space available */
+#define OTG_HPTXSTS_PTXFSAVL_MASK     (0xffff << OTG_HPTXSTS_PTXFSAVL_SHIFT)
+#  define OTG_HPTXSTS_PTXFSAVL_FULL   (0 << OTG_HPTXSTS_PTXFSAVL_SHIFT)
+#define OTG_HPTXSTS_PTXQSAV_SHIFT     (16)      /* Bits 16-23: Periodic transmit request queue space available */
+#define OTG_HPTXSTS_PTXQSAV_MASK      (0xff << OTG_HPTXSTS_PTXQSAV_SHIFT)
+#  define OTG_HPTXSTS_PTXQSAV_FULL    (0 << OTG_HPTXSTS_PTXQSAV_SHIFT)
+#define OTG_HPTXSTS_PTXQTOP_SHIFT     (24)      /* Bits 24-31: Top of the periodic transmit request queue */
+#define OTG_HPTXSTS_PTXQTOP_MASK      (0x7f << OTG_HPTXSTS_PTXQTOP_SHIFT)
+#  define OTG_HPTXSTS_TERMINATE       (1 << 24) /* Bit 24: Terminate (last entry for selected channel/endpoint) */
+#  define OTG_HPTXSTS_TYPE_SHIFT      (25)      /* Bits 25-26: Type */
+#  define OTG_HPTXSTS_TYPE_MASK       (3 << OTG_HPTXSTS_TYPE_SHIFT)
+#    define OTG_HPTXSTS_TYPE_INOUT    (0 << OTG_HPTXSTS_TYPE_SHIFT) /* IN/OUT token */
+#    define OTG_HPTXSTS_TYPE_ZLP      (1 << OTG_HPTXSTS_TYPE_SHIFT) /* Zero-length transmit packet */
+#    define OTG_HPTXSTS_TYPE_HALT     (3 << OTG_HPTXSTS_TYPE_SHIFT) /* Disable channel command */
+#  define OTG_HPTXSTS_EPNUM_SHIFT     (27)      /* Bits 27-30: Endpoint number */
+#  define OTG_HPTXSTS_EPNUM_MASK      (15 << OTG_HPTXSTS_EPNUM_SHIFT)
+#  define OTG_HPTXSTS_CHNUM_SHIFT     (27)      /* Bits 27-30: Channel number */
+#  define OTG_HPTXSTS_CHNUM_MASK      (15 << OTG_HPTXSTS_CHNUM_SHIFT)
+#  define OTG_HPTXSTS_ODD             (1 << 24) /* Bit 31: Send in odd (vs even) frame */
+
+/* Host all channels interrupt and all channels interrupt mask registers */
+
+#define OTG_HAINT(n)                  (1 << (n)) /* Bits 15:0 HAINTM: Channel interrupt */
+
+/* Host port control and status register */
+
+#define OTG_HPRT_PCSTS                (1 << 0)  /* Bit 0:  Port connect status */
+#define OTG_HPRT_PCDET                (1 << 1)  /* Bit 1:  Port connect detected */
+#define OTG_HPRT_PENA                 (1 << 2)  /* Bit 2:  Port enable */
+#define OTG_HPRT_PENCHNG              (1 << 3)  /* Bit 3:  Port enable/disable change */
+#define OTG_HPRT_POCA                 (1 << 4)  /* Bit 4:  Port overcurrent active */
+#define OTG_HPRT_POCCHNG              (1 << 5)  /* Bit 5:  Port overcurrent change */
+#define OTG_HPRT_PRES                 (1 << 6)  /* Bit 6:  Port resume */
+#define OTG_HPRT_PSUSP                (1 << 7)  /* Bit 7:  Port suspend */
+#define OTG_HPRT_PRST                 (1 << 8)  /* Bit 8:  Port reset */
+                                                  /* Bit 9:  Reserved, must be kept at reset value */
+#define OTG_HPRT_PLSTS_SHIFT          (10)      /* Bits 10-11: Port line status */
+#define OTG_HPRT_PLSTS_MASK           (3 << OTG_HPRT_PLSTS_SHIFT)
+#  define OTG_HPRT_PLSTS_DP           (1 << 10) /* Bit 10: Logic level of OTG_FS_FS_DP */
+#  define OTG_HPRT_PLSTS_DM           (1 << 11) /* Bit 11: Logic level of OTG_FS_FS_DM */
+#define OTG_HPRT_PPWR                 (1 << 12) /* Bit 12: Port power */
+#define OTG_HPRT_PTCTL_SHIFT          (13)      /* Bits 13-16: Port test control */
+#define OTG_HPRT_PTCTL_MASK           (15 << OTG_HPRT_PTCTL_SHIFT)
+#  define OTG_HPRT_PTCTL_DISABLED     (0 << OTG_HPRT_PTCTL_SHIFT) /* Test mode disabled */
+#  define OTG_HPRT_PTCTL_J            (1 << OTG_HPRT_PTCTL_SHIFT) /* Test_J mode */
+#  define OTG_HPRT_PTCTL_L            (2 << OTG_HPRT_PTCTL_SHIFT) /* Test_K mode */
+#  define OTG_HPRT_PTCTL_SE0_NAK      (3 << OTG_HPRT_PTCTL_SHIFT) /* Test_SE0_NAK mode */
+#  define OTG_HPRT_PTCTL_PACKET       (4 << OTG_HPRT_PTCTL_SHIFT) /* Test_Packet mode */
+#  define OTG_HPRT_PTCTL_FORCE        (5 << OTG_HPRT_PTCTL_SHIFT) /* Test_Force_Enable */
+#define OTG_HPRT_PSPD_SHIFT           (17)      /* Bits 17-18: Port speed */
+#define OTG_HPRT_PSPD_MASK            (3 << OTG_HPRT_PSPD_SHIFT)
+#  define OTG_HPRT_PSPD_FS            (1 << OTG_HPRT_PSPD_SHIFT) /* Full speed */
+#  define OTG_HPRT_PSPD_LS            (2 << OTG_HPRT_PSPD_SHIFT) /* Low speed */
+                                                  /* Bits 19-31: Reserved, must be kept at reset value */
+
+/* Host channel-n characteristics register */
+
+#define OTG_HCCHAR_MPSIZ_SHIFT        (0)       /* Bits 0-10: Maximum packet size */
+#define OTG_HCCHAR_MPSIZ_MASK         (0x7ff << OTG_HCCHAR_MPSIZ_SHIFT)
+#define OTG_HCCHAR_EPNUM_SHIFT        (11)      /* Bits 11-14: Endpoint number */
+#define OTG_HCCHAR_EPNUM_MASK         (15 << OTG_HCCHAR_EPNUM_SHIFT)
+#define OTG_HCCHAR_EPDIR              (1 << 15) /* Bit 15: Endpoint direction */
+#  define OTG_HCCHAR_EPDIR_OUT        (0)
+#  define OTG_HCCHAR_EPDIR_IN         OTG_HCCHAR_EPDIR
+                                                  /* Bit 16 Reserved, must be kept at reset value */
+#define OTG_HCCHAR_LSDEV              (1 << 17) /* Bit 17: Low-speed device */
+#define OTG_HCCHAR_EPTYP_SHIFT        (18)      /* Bits 18-19: Endpoint type */
+#define OTG_HCCHAR_EPTYP_MASK         (3 << OTG_HCCHAR_EPTYP_SHIFT)
+#  define OTG_HCCHAR_EPTYP_CTRL       (0 << OTG_HCCHAR_EPTYP_SHIFT) /* Control */
+#  define OTG_HCCHAR_EPTYP_ISOC       (1 << OTG_HCCHAR_EPTYP_SHIFT) /* Isochronous */
+#  define OTG_HCCHAR_EPTYP_BULK       (2 << OTG_HCCHAR_EPTYP_SHIFT) /* Bulk */
+#  define OTG_HCCHAR_EPTYP_INTR       (3 << OTG_HCCHAR_EPTYP_SHIFT) /* Interrupt */
+#define OTG_HCCHAR_MCNT_SHIFT         (20)      /* Bits 20-21: Multicount */
+#define OTG_HCCHAR_MCNT_MASK          (3 << OTG_HCCHAR_MCNT_SHIFT)
+#define OTG_HCCHAR_DAD_SHIFT          (22)      /* Bits 22-28: Device address */
+#define OTG_HCCHAR_DAD_MASK           (0x7f << OTG_HCCHAR_DAD_SHIFT)
+#define OTG_HCCHAR_ODDFRM             (1 << 29) /* Bit 29: Odd frame */
+#define OTG_HCCHAR_CHDIS              (1 << 30) /* Bit 30: Channel disable */
+#define OTG_HCCHAR_CHENA              (1 << 31) /* Bit 31: Channel enable */
+
+/* Host channel-n interrupt and Host channel-0 interrupt mask registers */
+
+#define OTG_HCINT_XFRC                (1 << 0)  /* Bit 0:  Transfer completed */
+#define OTG_HCINT_CHH                 (1 << 1)  /* Bit 1:  Channel halted */
+                                                  /* Bit 2:  Reserved, must be kept at reset value */
+#define OTG_HCINT_STALL               (1 << 3)  /* Bit 3:  STALL response received interrupt */
+#define OTG_HCINT_NAK                 (1 << 4)  /* Bit 4:  NAK response received interrupt */
+#define OTG_HCINT_ACK                 (1 << 5)  /* Bit 5:  ACK response received/transmitted interrupt */
+#define OTG_HCINT_NYET                (1 << 6)  /* Bit 6:  Response received interrupt */
+#define OTG_HCINT_TXERR               (1 << 7)  /* Bit 7:  Transaction error */
+#define OTG_HCINT_BBERR               (1 << 8)  /* Bit 8:  Babble error */
+#define OTG_HCINT_FRMOR               (1 << 9)  /* Bit 9:  Frame overrun */
+#define OTG_HCINT_DTERR               (1 << 10) /* Bit 10: Data toggle error */
+                                                  /* Bits 11-31 Reserved, must be kept at reset value */
+/* Host channel-n interrupt register */
+
+#define OTG_HCTSIZ_XFRSIZ_SHIFT       (0)       /* Bits 0-18: Transfer size */
+#define OTG_HCTSIZ_XFRSIZ_MASK        (0x7ffff << OTG_HCTSIZ_XFRSIZ_SHIFT)
+#define OTG_HCTSIZ_PKTCNT_SHIFT       (19)      /* Bits 19-28: Packet count */
+#define OTG_HCTSIZ_PKTCNT_MASK        (0x3ff << OTG_HCTSIZ_PKTCNT_SHIFT)
+#define OTG_HCTSIZ_DPID_SHIFT         (29)      /* Bits 29-30: Data PID */
+#define OTG_HCTSIZ_DPID_MASK          (3 << OTG_HCTSIZ_DPID_SHIFT)
+#  define OTG_HCTSIZ_DPID_DATA0       (0 << OTG_HCTSIZ_DPID_SHIFT)
+#  define OTG_HCTSIZ_DPID_DATA2       (1 << OTG_HCTSIZ_DPID_SHIFT)
+#  define OTG_HCTSIZ_DPID_DATA1       (2 << OTG_HCTSIZ_DPID_SHIFT)
+#  define OTG_HCTSIZ_DPID_MDATA       (3 << OTG_HCTSIZ_DPID_SHIFT) /* Non-control */
+#  define OTG_HCTSIZ_PID_SETUP        (3 << OTG_HCTSIZ_DPID_SHIFT) /* Control */
+                                                  /* Bit 31 Reserved, must be kept at reset value */
+/* Device-mode control and status registers */
+
+/* Device configuration register */
+
+#define OTG_DCFG_DSPD_SHIFT           (0)       /* Bits 0-1: Device speed */
+#define OTG_DCFG_DSPD_MASK            (3 << OTG_DCFG_DSPD_SHIFT)
+#  define OTG_DCFG_DSPD_FS            (3 << OTG_DCFG_DSPD_SHIFT) /* Full speed */
+#define OTG_DCFG_NZLSOHSK             (1 << 2)  /* Bit 2:  Non-zero-length status OUT handshake */
+                                                  /* Bit 3:  Reserved, must be kept at reset value */
+#define OTG_DCFG_DAD_SHIFT            (4)       /* Bits 4-10: Device address */
+#define OTG_DCFG_DAD_MASK             (0x7f << OTG_DCFG_DAD_SHIFT)
+#define OTG_DCFG_PFIVL_SHIFT          (11)      /* Bits 11-12: Periodic frame interval */
+#define OTG_DCFG_PFIVL_MASK           (3 << OTG_DCFG_PFIVL_SHIFT)
+#  define OTG_DCFG_PFIVL_80PCT        (0 << OTG_DCFG_PFIVL_SHIFT) /* 80% of the frame interval */
+#  define OTG_DCFG_PFIVL_85PCT        (1 << OTG_DCFG_PFIVL_SHIFT) /* 85% of the frame interval */
+#  define OTG_DCFG_PFIVL_90PCT        (2 << OTG_DCFG_PFIVL_SHIFT) /* 90% of the frame interval */
+#  define OTG_DCFG_PFIVL_95PCT        (3 << OTG_DCFG_PFIVL_SHIFT) /* 95% of the frame interval */
+                                                  /* Bits 13-31 Reserved, must be kept at reset value */
+/* Device control register */
+
+#define OTG_TESTMODE_DISABLED         (0) /* Test mode disabled */
+#define OTG_TESTMODE_J                (1) /* Test_J mode */
+#define OTG_TESTMODE_K                (2) /* Test_K mode */
+#define OTG_TESTMODE_SE0_NAK          (3) /* Test_SE0_NAK mode */
+#define OTG_TESTMODE_PACKET           (4) /* Test_Packet mode */
+#define OTG_TESTMODE_FORCE            (5) /* Test_Force_Enable */
+
+#define OTG_DCTL_RWUSIG               (1 << 0)  /* Bit 0:  Remote wakeup signaling */
+#define OTG_DCTL_SDIS                 (1 << 1)  /* Bit 1:  Soft disconnect */
+#define OTG_DCTL_GINSTS               (1 << 2)  /* Bit 2:  Global IN NAK status */
+#define OTG_DCTL_GONSTS               (1 << 3)  /* Bit 3:  Global OUT NAK status */
+#define OTG_DCTL_TCTL_SHIFT           (4)       /* Bits 4-6: Test control */
+#define OTG_DCTL_TCTL_MASK            (7 << OTG_DCTL_TCTL_SHIFT)
+#  define OTG_DCTL_TCTL_DISABLED      (0 << OTG_DCTL_TCTL_SHIFT) /* Test mode disabled */
+#  define OTG_DCTL_TCTL_J             (1 << OTG_DCTL_TCTL_SHIFT) /* Test_J mode */
+#  define OTG_DCTL_TCTL_K             (2 << OTG_DCTL_TCTL_SHIFT) /* Test_K mode */
+#  define OTG_DCTL_TCTL_SE0_NAK       (3 << OTG_DCTL_TCTL_SHIFT) /* Test_SE0_NAK mode */
+#  define OTG_DCTL_TCTL_PACKET        (4 << OTG_DCTL_TCTL_SHIFT) /* Test_Packet mode */
+#  define OTG_DCTL_TCTL_FORCE         (5 << OTG_DCTL_TCTL_SHIFT) /* Test_Force_Enable */
+#define OTG_DCTL_SGINAK               (1 << 7)  /* Bit 7:  Set global IN NAK */
+#define OTG_DCTL_CGINAK               (1 << 8)  /* Bit 8:  Clear global IN NAK */
+#define OTG_DCTL_SGONAK               (1 << 9)  /* Bit 9:  Set global OUT NAK */
+#define OTG_DCTL_CGONAK               (1 << 10) /* Bit 10: Clear global OUT NAK */
+#define OTG_DCTL_POPRGDNE             (1 << 11) /* Bit 11: Power-on programming done */
+                                                  /* Bits 12-31: Reserved, must be kept at reset value */
+/* Device status register */
+
+#define OTG_DSTS_SUSPSTS              (1 << 0)  /* Bit 0: Suspend status */
+#define OTG_DSTS_ENUMSPD_SHIFT        (1)       /* Bits 1-2: Enumerated speed */
+#define OTG_DSTS_ENUMSPD_MASK         (3 << OTG_DSTS_ENUMSPD_SHIFT)
+#  define OTG_DSTS_ENUMSPD_FS         (3 << OTG_DSTS_ENUMSPD_MASK) /* Full speed */
+                                                  /* Bits 4-7: Reserved, must be kept at reset value */
+#define OTG_DSTS_EERR                 (1 << 3)  /* Bit 3: Erratic error */
+#define OTG_DSTS_SOFFN_SHIFT          (8)       /* Bits 8-21: Frame number of the received SOF */
+#define OTG_DSTS_SOFFN_MASK           (0x3fff << OTG_DSTS_SOFFN_SHIFT)
+#define OTG_DSTS_SOFFN0               (1 << 8)  /* Bits 8: Frame number even/odd bit */
+#define OTG_DSTS_SOFFN_EVEN           0
+#define OTG_DSTS_SOFFN_ODD            OTG_DSTS_SOFFN0
+                                                  /* Bits 22-31: Reserved, must be kept at reset value */
+/* Device IN endpoint common interrupt mask register */
+
+#define OTG_DIEPMSK_XFRCM             (1 << 0)  /* Bit 0: Transfer completed interrupt mask */
+#define OTG_DIEPMSK_EPDM              (1 << 1)  /* Bit 1: Endpoint disabled interrupt mask */
+                                                  /* Bit 2:  Reserved, must be kept at reset value */
+#define OTG_DIEPMSK_TOM               (1 << 3)  /* Bit 3: Timeout condition mask (Non-isochronous endpoints) */
+#define OTG_DIEPMSK_ITTXFEMSK         (1 << 4)  /* Bit 4: IN token received when TxFIFO empty mask */
+#define OTG_DIEPMSK_INEPNMM           (1 << 5)  /* Bit 5: IN token received with EP mismatch mask */
+#define OTG_DIEPMSK_INEPNEM           (1 << 6)  /* Bit 6: IN endpoint NAK effective mask */
+                                                  /* Bits 7-31: Reserved, must be kept at reset value */
+/* Device OUT endpoint common interrupt mask register */
+
+#define OTG_DOEPMSK_XFRCM             (1 << 0)  /* Bit 0: Transfer completed interrupt mask */
+#define OTG_DOEPMSK_EPDM              (1 << 1)  /* Bit 1: Endpoint disabled interrupt mask */
+                                                  /* Bit 2:  Reserved, must be kept at reset value */
+#define OTG_DOEPMSK_STUPM             (1 << 3)  /* Bit 3: SETUP phase done mask */
+#define OTG_DOEPMSK_OTEPDM            (1 << 4)  /* Bit 4: OUT token received when endpoint disabled mask */
+                                                  /* Bits 5-31: Reserved, must be kept at reset value */
+/* Device all endpoints interrupt and All endpoints interrupt mask registers */
+
+#define OTG_DAINT_IEP_SHIFT           (0)      /* Bits 0-15: IN endpoint interrupt bits */
+#define OTG_DAINT_IEP_MASK            (0xffff << OTG_DAINT_IEP_SHIFT)
+#  define OTG_DAINT_IEP(n)            (1 << (n))
+#define OTG_DAINT_OEP_SHIFT           (16)      /* Bits 16-31: OUT endpoint interrupt bits */
+#define OTG_DAINT_OEP_MASK            (0xffff << OTG_DAINT_OEP_SHIFT)
+#  define OTG_DAINT_OEP(n)            (1 << ((n)+16))
+
+/* Device VBUS discharge time register */
+
+#define OTG_DVBUSDIS_MASK             (0xffff)
+
+/* Device VBUS pulsing time register */
+
+#define OTG_DVBUSPULSE_MASK           (0xfff)
+
+/* Device IN endpoint FIFO empty interrupt mask register */
+
+#define OTG_DIEPEMPMSK(n)             (1 << (n))
+
+/* Device control IN endpoint 0 control register */
+
+#define OTG_DIEPCTL0_MPSIZ_SHIFT      (0)       /* Bits 0-1: Maximum packet size */
+#define OTG_DIEPCTL0_MPSIZ_MASK       (3 << OTG_DIEPCTL0_MPSIZ_SHIFT)
+#  define OTG_DIEPCTL0_MPSIZ_64       (0 << OTG_DIEPCTL0_MPSIZ_SHIFT) /* 64 bytes */
+#  define OTG_DIEPCTL0_MPSIZ_32       (1 << OTG_DIEPCTL0_MPSIZ_SHIFT) /* 32 bytes */
+#  define OTG_DIEPCTL0_MPSIZ_16       (2 << OTG_DIEPCTL0_MPSIZ_SHIFT) /* 16 bytes */
+#  define OTG_DIEPCTL0_MPSIZ_8        (3 << OTG_DIEPCTL0_MPSIZ_SHIFT) /* 8 bytes */
+                                                  /* Bits 2-14: Reserved, must be kept at reset value */
+#define OTG_DIEPCTL0_USBAEP           (1 << 15) /* Bit 15: USB active endpoint */
+                                                  /* Bit 16: Reserved, must be kept at reset value */
+#define OTG_DIEPCTL0_NAKSTS           (1 << 17) /* Bit 17: NAK status */
+#define OTG_DIEPCTL0_EPTYP_SHIFT      (18)      /* Bits 18-19: Endpoint type */
+#define OTG_DIEPCTL0_EPTYP_MASK       (3 << OTG_DIEPCTL0_EPTYP_SHIFT)
+#  define OTG_DIEPCTL0_EPTYP_CTRL     (0 << OTG_DIEPCTL0_EPTYP_SHIFT) /* Control (hard-coded) */
+                                                  /* Bit 20: Reserved, must be kept at reset value */
+#define OTG_DIEPCTL0_STALL            (1 << 21) /* Bit 21: STALL handshake */
+#define OTG_DIEPCTL0_TXFNUM_SHIFT     (22)      /* Bits 22-25: TxFIFO number */
+#define OTG_DIEPCTL0_TXFNUM_MASK      (15 << OTG_DIEPCTL0_TXFNUM_SHIFT)
+#define OTG_DIEPCTL0_CNAK             (1 << 26) /* Bit 26: Clear NAK */
+#define OTG_DIEPCTL0_SNAK             (1 << 27) /* Bit 27: Set NAK */
+                                                  /* Bits 28-29: Reserved, must be kept at reset value */
+#define OTG_DIEPCTL0_EPDIS            (1 << 30) /* Bit 30: Endpoint disable */
+#define OTG_DIEPCTL0_EPENA            (1 << 31) /* Bit 31: Endpoint enable */
+
+/* Device control IN endpoint n control register */
+
+#define OTG_DIEPCTL_MPSIZ_SHIFT       (0)       /* Bits 0-10: Maximum packet size */
+#define OTG_DIEPCTL_MPSIZ_MASK        (0x7ff << OTG_DIEPCTL_MPSIZ_SHIFT)
+                                                  /* Bits 11-14: Reserved, must be kept at reset value */
+#define OTG_DIEPCTL_USBAEP            (1 << 15) /* Bit 15: USB active endpoint */
+#define OTG_DIEPCTL_EONUM             (1 << 16) /* Bit 16: Even/odd frame */
+#  define OTG_DIEPCTL_EVEN            (0)
+#  define OTG_DIEPCTL_ODD             OTG_DIEPCTL_EONUM
+#  define OTG_DIEPCTL_DATA0           (0)
+#  define OTG_DIEPCTL_DATA1           OTG_DIEPCTL_EONUM
+#define OTG_DIEPCTL_NAKSTS            (1 << 17) /* Bit 17: NAK status */
+#define OTG_DIEPCTL_EPTYP_SHIFT       (18)      /* Bits 18-19: Endpoint type */
+#define OTG_DIEPCTL_EPTYP_MASK        (3 << OTG_DIEPCTL_EPTYP_SHIFT)
+#  define OTG_DIEPCTL_EPTYP_CTRL      (0 << OTG_DIEPCTL_EPTYP_SHIFT) /* Control */
+#  define OTG_DIEPCTL_EPTYP_ISOC      (1 << OTG_DIEPCTL_EPTYP_SHIFT) /* Isochronous */
+#  define OTG_DIEPCTL_EPTYP_BULK      (2 << OTG_DIEPCTL_EPTYP_SHIFT) /* Bulk */
+#  define OTG_DIEPCTL_EPTYP_INTR      (3 << OTG_DIEPCTL_EPTYP_SHIFT) /* Interrupt */
+                                                  /* Bit 20: Reserved, must be kept at reset value */
+#define OTG_DIEPCTL_STALL             (1 << 21) /* Bit 21: STALL handshake */
+#define OTG_DIEPCTL_TXFNUM_SHIFT      (22)      /* Bits 22-25: TxFIFO number */
+#define OTG_DIEPCTL_TXFNUM_MASK       (15 << OTG_DIEPCTL_TXFNUM_SHIFT)
+#define OTG_DIEPCTL_CNAK              (1 << 26) /* Bit 26: Clear NAK */
+#define OTG_DIEPCTL_SNAK              (1 << 27) /* Bit 27: Set NAK */
+#define OTG_DIEPCTL_SD0PID            (1 << 28) /* Bit 28: Set DATA0 PID (interrupt/bulk) */
+#define OTG_DIEPCTL_SEVNFRM           (1 << 28) /* Bit 28: Set even frame (isochronous)) */
+#define OTG_DIEPCTL_SODDFRM           (1 << 29) /* Bit 29: Set odd frame (isochronous) */
+#define OTG_DIEPCTL_EPDIS             (1 << 30) /* Bit 30: Endpoint disable */
+#define OTG_DIEPCTL_EPENA             (1 << 31) /* Bit 31: Endpoint enable */
+
+/* Device endpoint-n interrupt register */
+
+#define OTG_DIEPINT_XFRC              (1 << 0)  /* Bit 0:  Transfer completed interrupt */
+#define OTG_DIEPINT_EPDISD            (1 << 1)  /* Bit 1:  Endpoint disabled interrupt */
+                                                  /* Bit 2:  Reserved, must be kept at reset value */
+#define OTG_DIEPINT_TOC               (1 << 3)  /* Bit 3:  Timeout condition */
+#define OTG_DIEPINT_ITTXFE            (1 << 4)  /* Bit 4:  IN token received when TxFIFO is empty */
+                                                  /* Bit 5:  Reserved, must be kept at reset value */
+#define OTG_DIEPINT_INEPNE            (1 << 6)  /* Bit 6:  IN endpoint NAK effective */
+#define OTG_DIEPINT_TXFE              (1 << 7)  /* Bit 7:  Transmit FIFO empty */
+                                                  /* Bits 8-31: Reserved, must be kept at reset value */
+/* Device IN endpoint 0 transfer size register */
+
+#define OTG_DIEPTSIZ0_XFRSIZ_SHIFT    (0)       /* Bits 0-6: Transfer size */
+#define OTG_DIEPTSIZ0_XFRSIZ_MASK     (0x7f << OTG_DIEPTSIZ0_XFRSIZ_SHIFT)
+                                                  /* Bits 7-18: Reserved, must be kept at reset value */
+#define OTG_DIEPTSIZ0_PKTCNT_SHIFT    (19)      /* Bits 19-20: Packet count */
+#define OTG_DIEPTSIZ0_PKTCNT_MASK     (3 << OTG_DIEPTSIZ0_PKTCNT_SHIFT)
+                                                  /* Bits 21-31: Reserved, must be kept at reset value */
+/* Device IN endpoint n transfer size register */
+
+#define OTG_DIEPTSIZ_XFRSIZ_SHIFT     (0)       /* Bits 0-18: Transfer size */
+#define OTG_DIEPTSIZ_XFRSIZ_MASK      (0x7ffff << OTG_DIEPTSIZ_XFRSIZ_SHIFT)
+#define OTG_DIEPTSIZ_PKTCNT_SHIFT     (19)      /* Bit 19-28: Packet count */
+#define OTG_DIEPTSIZ_PKTCNT_MASK      (0x3ff << OTG_DIEPTSIZ_PKTCNT_SHIFT)
+#define OTG_DIEPTSIZ_MCNT_SHIFT       (29)      /* Bits 29-30: Multi count */
+#define OTG_DIEPTSIZ_MCNT_MASK        (3 << OTG_DIEPTSIZ_MCNT_SHIFT)
+                                                  /* Bit 31: Reserved, must be kept at reset value */
+/* Device OUT endpoint TxFIFO status register */
+
+#define OTG_DTXFSTS_MASK              (0xffff)
+
+/* Device OUT endpoint 0 control register */
+
+#define OTG_DOEPCTL0_MPSIZ_SHIFT      (0)       /* Bits 0-1: Maximum packet size */
+#define OTG_DOEPCTL0_MPSIZ_MASK       (3 << OTG_DOEPCTL0_MPSIZ_SHIFT)
+#  define OTG_DOEPCTL0_MPSIZ_64       (0 << OTG_DOEPCTL0_MPSIZ_SHIFT) /* 64 bytes */
+#  define OTG_DOEPCTL0_MPSIZ_32       (1 << OTG_DOEPCTL0_MPSIZ_SHIFT) /* 32 bytes */
+#  define OTG_DOEPCTL0_MPSIZ_16       (2 << OTG_DOEPCTL0_MPSIZ_SHIFT) /* 16 bytes */
+#  define OTG_DOEPCTL0_MPSIZ_8        (3 << OTG_DOEPCTL0_MPSIZ_SHIFT) /* 8 bytes */
+                                                  /* Bits 2-14: Reserved, must be kept at reset value */
+#define OTG_DOEPCTL0_USBAEP           (1 << 15) /* Bit 15: USB active endpoint */
+                                                  /* Bit 16: Reserved, must be kept at reset value */
+#define OTG_DOEPCTL0_NAKSTS           (1 << 17) /* Bit 17: NAK status */
+#define OTG_DOEPCTL0_EPTYP_SHIFT      (18)      /* Bits 18-19: Endpoint type */
+#define OTG_DOEPCTL0_EPTYP_MASK       (3 << OTG_DOEPCTL0_EPTYP_SHIFT)
+#  define OTG_DOEPCTL0_EPTYP_CTRL     (0 << OTG_DOEPCTL0_EPTYP_SHIFT) /* Control (hard-coded) */
+#define OTG_DOEPCTL0_SNPM             (1 << 20) /* Bit 20: Snoop mode */
+#define OTG_DOEPCTL0_STALL            (1 << 21) /* Bit 21: STALL handshake */
+                                                  /* Bits 22-25: Reserved, must be kept at reset value */
+#define OTG_DOEPCTL0_CNAK             (1 << 26) /* Bit 26: Clear NAK */
+#define OTG_DOEPCTL0_SNAK             (1 << 27) /* Bit 27: Set NAK */
+                                                  /* Bits 28-29: Reserved, must be kept at reset value */
+#define OTG_DOEPCTL0_EPDIS            (1 << 30) /* Bit 30: Endpoint disable */
+#define OTG_DOEPCTL0_EPENA            (1 << 31) /* Bit 31: Endpoint enable */
+
+/* Device OUT endpoint n control register */
+
+#define OTG_DOEPCTL_MPSIZ_SHIFT       (0)       /* Bits 0-10: Maximum packet size */
+#define OTG_DOEPCTL_MPSIZ_MASK        (0x7ff << OTG_DOEPCTL_MPSIZ_SHIFT)
+                                                  /* Bits 11-14: Reserved, must be kept at reset value */
+#define OTG_DOEPCTL_USBAEP            (1 << 15) /* Bit 15: USB active endpoint */
+#define OTG_DOEPCTL_DPID              (1 << 16) /* Bit 16: Endpoint data PID (interrupt/buld) */
+#  define OTG_DOEPCTL_DATA0           (0)
+#  define OTG_DOEPCTL_DATA1           OTG_DOEPCTL_DPID
+#define OTG_DOEPCTL_EONUM             (1 << 16) /* Bit 16: Even/odd frame (isochronous) */
+#  define OTG_DOEPCTL_EVEN            (0)
+#  define OTG_DOEPCTL_ODD             OTG_DOEPCTL_EONUM
+#define OTG_DOEPCTL_NAKSTS            (1 << 17) /* Bit 17: NAK status */
+#define OTG_DOEPCTL_EPTYP_SHIFT       (18)      /* Bits 18-19: Endpoint type */
+#define OTG_DOEPCTL_EPTYP_MASK        (3 << OTG_DOEPCTL_EPTYP_SHIFT)
+#  define OTG_DOEPCTL_EPTYP_CTRL      (0 << OTG_DOEPCTL_EPTYP_SHIFT) /* Control */
+#  define OTG_DOEPCTL_EPTYP_ISOC      (1 << OTG_DOEPCTL_EPTYP_SHIFT) /* Isochronous */
+#  define OTG_DOEPCTL_EPTYP_BULK      (2 << OTG_DOEPCTL_EPTYP_SHIFT) /* Bulk */
+#  define OTG_DOEPCTL_EPTYP_INTR      (3 << OTG_DOEPCTL_EPTYP_SHIFT) /* Interrupt */
+#define OTG_DOEPCTL_SNPM              (1 << 20) /* Bit 20: Snoop mode */
+#define OTG_DOEPCTL_STALL             (1 << 21) /* Bit 21: STALL handshake */
+                                                  /* Bits 22-25: Reserved, must be kept at reset value */
+#define OTG_DOEPCTL_CNAK              (1 << 26) /* Bit 26: Clear NAK */
+#define OTG_DOEPCTL_SNAK              (1 << 27) /* Bit 27: Set NAK */
+#define OTG_DOEPCTL_SD0PID            (1 << 28) /* Bit 28: Set DATA0 PID (interrupt/bulk) */
+#define OTG_DOEPCTL_SEVNFRM           (1 << 28) /* Bit 28: Set even frame (isochronous) */
+#define OTG_DOEPCTL_SD1PID            (1 << 29) /* Bit 29: Set DATA1 PID (interrupt/bulk) */
+#define OTG_DOEPCTL_SODDFRM           (1 << 29) /* Bit 29: Set odd frame (isochronous */
+#define OTG_DOEPCTL_EPDIS             (1 << 30) /* Bit 30: Endpoint disable */
+#define OTG_DOEPCTL_EPENA             (1 << 31) /* Bit 31: Endpoint enable */
+
+/* Device endpoint-n interrupt register */
+
+#define OTG_DOEPINT_XFRC              (1 << 0)  /* Bit 0: Transfer completed interrupt */
+#define OTG_DOEPINT_EPDISD            (1 << 1)  /* Bit 1: Endpoint disabled interrupt */
+                                                  /* Bit 2: Reserved, must be kept at reset value */
+#define OTG_DOEPINT_SETUP             (1 << 3)  /* Bit 3: SETUP phase done */
+#define OTG_DOEPINT_OTEPDIS           (1 << 4)  /* Bit 4: OUT token received when endpoint disabled */
+                                                  /* Bit 5: Reserved, must be kept at reset value */
+#define OTG_DOEPINT_B2BSTUP           (1 << 6)  /* Bit 6: Back-to-back SETUP packets received */
+                                                  /* Bits 7-31: Reserved, must be kept at reset value */
+/* Device OUT endpoint-0 transfer size register */
+
+#define OTG_DOEPTSIZ0_XFRSIZ_SHIFT    (0)       /* Bits 0-6: Transfer size */
+#define OTG_DOEPTSIZ0_XFRSIZ_MASK     (0x7f << OTG_DOEPTSIZ0_XFRSIZ_SHIFT)
+                                                  /* Bits 7-18: Reserved, must be kept at reset value */
+#define OTG_DOEPTSIZ0_PKTCNT          (1 << 19) /* Bit 19 PKTCNT: Packet count */
+                                                  /* Bits 20-28: Reserved, must be kept at reset value */
+#define OTG_DOEPTSIZ0_STUPCNT_SHIFT   (29)      /* Bits 29-30: SETUP packet count */
+#define OTG_DOEPTSIZ0_STUPCNT_MASK    (3 << OTG_DOEPTSIZ0_STUPCNT_SHIFT)
+                                                  /* Bit 31: Reserved, must be kept at reset value */
+/* Device OUT endpoint-n transfer size register */
+
+#define OTG_DOEPTSIZ_XFRSIZ_SHIFT     (0)       /* Bits 0-18: Transfer size */
+#define OTG_DOEPTSIZ_XFRSIZ_MASK      (0x7ffff << OTG_DOEPTSIZ_XFRSIZ_SHIFT)
+#define OTG_DOEPTSIZ_PKTCNT_SHIFT     (19)      /* Bit 19-28: Packet count */
+#define OTG_DOEPTSIZ_PKTCNT_MASK      (0x3ff << OTG_DOEPTSIZ_PKTCNT_SHIFT)
+#define OTG_DOEPTSIZ_STUPCNT_SHIFT    (29)      /* Bits 29-30: SETUP packet count */
+#define OTG_DOEPTSIZ_STUPCNT_MASK     (3 << OTG_DOEPTSIZ_STUPCNT_SHIFT)
+#define OTG_DOEPTSIZ_RXDPID_SHIFT     (29)      /* Bits 29-30: Received data PID */
+#define OTG_DOEPTSIZ_RXDPID_MASK      (3 << OTG_DOEPTSIZ_RXDPID_SHIFT)
+#  define OTG_DOEPTSIZ_RXDPID_DATA0   (0 << OTG_DOEPTSIZ_RXDPID_SHIFT)
+#  define OTG_DOEPTSIZ_RXDPID_DATA2   (1 << OTG_DOEPTSIZ_RXDPID_SHIFT)
+#  define OTG_DOEPTSIZ_RXDPID_DATA1   (2 << OTG_DOEPTSIZ_RXDPID_SHIFT)
+#  define OTG_DOEPTSIZ_RXDPID_MDATA   (3 << OTG_DOEPTSIZ_RXDPID_SHIFT)
+                                                  /* Bit 31: Reserved, must be kept at reset value */
+/* Power and clock gating control register */
+
+#define OTG_PCGCCTL_STPPCLK           (1 << 0)  /* Bit 0: Stop PHY clock */
+#define OTG_PCGCCTL_GATEHCLK          (1 << 1)  /* Bit 1: Gate HCLK */
+                                                  /* Bits 2-3: Reserved, must be kept at reset value */
+#define OTG_PCGCCTL_PHYSUSP           (1 << 4)  /* Bit 4: PHY Suspended */
+                                                  /* Bits 5-31: Reserved, must be kept at reset value */
+
+#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_OTG_H */
diff --git a/arch/arm/src/stm32f7/stm32_otg.h b/arch/arm/src/stm32f7/stm32_otg.h
new file mode 100644
index 0000000000..3c60683ea3
--- /dev/null
+++ b/arch/arm/src/stm32f7/stm32_otg.h
@@ -0,0 +1,149 @@
+/************************************************************************************
+ * arch/arm/src/stm32f7/stm32_otg.h
+ *
+ *   Copyright (C) 2012-2013 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.
+ *
+ ************************************************************************************/
+
+#ifndef __ARCH_ARM_SRC_STM32F7_STM32_OTG_H
+#define __ARCH_ARM_SRC_STM32F7_STM32_OTG_H
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include 
+
+#include 
+
+#include "chip.h"
+#include "chip/stm32_otg.h"
+
+#if defined(CONFIG_STM32F7_OTGFS) || defined(CONFIG_STM32F7_OTGHS)
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+/* Configuration ********************************************************************/
+
+#ifndef CONFIG_OTG_PRI
+#  define CONFIG_OTG_PRI NVIC_SYSH_PRIORITY_DEFAULT
+#endif
+
+#if defined(CONFIG_STM32F7_OTGFS)
+#  define STM32_IRQ_OTG         STM32_IRQ_OTGFS
+#  define STM32_OTG_BASE        STM32_USBOTGFS_BASE
+#  define STM32_NENDPOINTS      (6)          /* ep0-5 x 2 for IN and OUT */
+#  define GPIO_OTG_DM           GPIO_OTGFS_DM
+#  define GPIO_OTG_DP           GPIO_OTGFS_DP
+#  define GPIO_OTG_ID           GPIO_OTGFS_ID
+#  define GPIO_OTG_SOF          GPIO_OTGFS_SOF
+#  define STM32_OTG_FIFO_SIZE   1280
+#endif
+
+#if defined(CONFIG_STM32F7_OTGHS)
+#  define STM32_IRQ_OTG         STM32_IRQ_OTGHS
+#  define STM32_OTG_BASE        STM32_USBOTGHS_BASE
+#  define STM32_NENDPOINTS      (7)          /* ep0-8 x 2 for IN and OUT but driver internals use byte to map + one bit for direction */
+#  define GPIO_OTG_DM           GPIO_OTGHS_DM
+#  define GPIO_OTG_DP           GPIO_OTGHS_DP
+#  define GPIO_OTG_ID           GPIO_OTGHS_ID
+#  define GPIO_OTG_SOF          GPIO_OTGHS_SOF
+#  define STM32_OTG_FIFO_SIZE   4096
+#endif
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+#ifndef __ASSEMBLY__
+
+#undef EXTERN
+#if defined(__cplusplus)
+#define EXTERN extern "C"
+extern "C"
+{
+#else
+#define EXTERN extern
+#endif
+
+/****************************************************************************
+ * Name: stm32_otghost_initialize
+ *
+ * Description:
+ *   Initialize USB host device controller hardware.
+ *
+ * Input Parameters:
+ *   controller -- If the device supports more than USB host controller, then
+ *     this identifies which controller is being initializeed.  Normally, this
+ *     is just zero.
+ *
+ * Returned Value:
+ *   And instance of the USB host interface.  The controlling task should
+ *   use this interface to (1) call the wait() method to wait for a device
+ *   to be connected, and (2) call the enumerate() method to bind the device
+ *   to a class driver.
+ *
+ * Assumptions:
+ * - This function should called in the initialization sequence in order
+ *   to initialize the USB device functionality.
+ * - Class drivers should be initialized prior to calling this function.
+ *   Otherwise, there is a race condition if the device is already connected.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_USBHOST
+struct usbhost_connection_s;
+FAR struct usbhost_connection_s *stm32_otghost_initialize(int controller);
+#endif
+
+/************************************************************************************
+ * Name:  stm32_usbsuspend
+ *
+ * Description:
+ *   Board logic must provide the stm32_usbsuspend logic if the OTG FS device driver
+ *   is used.  This function is called whenever the USB enters or leaves suspend
+ *   mode. This is an opportunity for the board logic to shutdown clocks, power,
+ *   etc. while the USB is suspended.
+ *
+ ************************************************************************************/
+
+void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume);
+
+#undef EXTERN
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* __ASSEMBLY__ */
+#endif /* CONFIG_STM32F7_OTGFS */
+#endif /* __ARCH_ARM_SRC_STM32F7_STM32_OTG_H */
+
diff --git a/arch/arm/src/stm32f7/stm32_otgdev.c b/arch/arm/src/stm32f7/stm32_otgdev.c
new file mode 100644
index 0000000000..7b9db010ad
--- /dev/null
+++ b/arch/arm/src/stm32f7/stm32_otgdev.c
@@ -0,0 +1,5761 @@
+/****************************************************************************
+ * arch/arm/src/stm32f7/stm32_otgdev.c
+ *
+ *   Copyright (C) 2012-2014 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 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+#include "chip.h"
+#include "stm32_gpio.h"
+#include "stm32_otg.h"
+#include "up_arch.h"
+#include "up_internal.h"
+
+
+#if defined(CONFIG_USBDEV) && (defined(CONFIG_STM32F7_OTGFS) || defined(CONFIG_STM32F7_OTGHS))
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+/* Configuration ***************************************************************/
+
+#ifndef CONFIG_USBDEV_EP0_MAXSIZE
+#  define CONFIG_USBDEV_EP0_MAXSIZE 64
+#endif
+
+#ifndef CONFIG_USBDEV_SETUP_MAXDATASIZE
+#  define CONFIG_USBDEV_SETUP_MAXDATASIZE CONFIG_USBDEV_EP0_MAXSIZE
+#endif
+
+#ifndef CONFIG_USBDEV_MAXPOWER
+#  define CONFIG_USBDEV_MAXPOWER 100  /* mA */
+#endif
+
+/* There is 1.25Kb of FIFO memory.  The default partitions this memory
+ * so that there is a TxFIFO allocated for each endpoint and with more
+ * memory provided for the common RxFIFO.  A more knowledge-able
+ * configuration would not allocate any TxFIFO space to OUT endpoints.
+ */
+
+#ifndef CONFIG_USBDEV_RXFIFO_SIZE
+#  define CONFIG_USBDEV_RXFIFO_SIZE (STM32_OTG_FIFO_SIZE - STM32_OTG_FIFO_SIZE/4/2/STM32_NENDPOINTS*4*STM32_NENDPOINTS)
+#endif
+
+#if STM32_NENDPOINTS > 0
+#  ifndef CONFIG_USBDEV_EP0_TXFIFO_SIZE
+#    define CONFIG_USBDEV_EP0_TXFIFO_SIZE ((STM32_OTG_FIFO_SIZE - CONFIG_USBDEV_RXFIFO_SIZE)/STM32_NENDPOINTS)
+#  endif
+#else
+#  define CONFIG_USBDEV_EP0_TXFIFO_SIZE 0
+#endif
+
+#if STM32_NENDPOINTS > 1
+#  ifndef CONFIG_USBDEV_EP1_TXFIFO_SIZE
+#    define CONFIG_USBDEV_EP1_TXFIFO_SIZE ((STM32_OTG_FIFO_SIZE - CONFIG_USBDEV_RXFIFO_SIZE)/STM32_NENDPOINTS)
+#  endif
+#else
+#  define CONFIG_USBDEV_EP1_TXFIFO_SIZE 0
+#endif
+
+#if STM32_NENDPOINTS > 2
+#  ifndef CONFIG_USBDEV_EP2_TXFIFO_SIZE
+#    define CONFIG_USBDEV_EP2_TXFIFO_SIZE ((STM32_OTG_FIFO_SIZE - CONFIG_USBDEV_RXFIFO_SIZE)/STM32_NENDPOINTS)
+#  endif
+#else
+#  define CONFIG_USBDEV_EP2_TXFIFO_SIZE 0
+#endif
+
+#if STM32_NENDPOINTS > 3
+#  ifndef CONFIG_USBDEV_EP3_TXFIFO_SIZE
+#    define CONFIG_USBDEV_EP3_TXFIFO_SIZE ((STM32_OTG_FIFO_SIZE - CONFIG_USBDEV_RXFIFO_SIZE)/STM32_NENDPOINTS)
+#  endif
+#else
+#  define CONFIG_USBDEV_EP3_TXFIFO_SIZE 0
+#endif
+
+#if STM32_NENDPOINTS > 4
+#  ifndef CONFIG_USBDEV_EP4_TXFIFO_SIZE
+#    define CONFIG_USBDEV_EP4_TXFIFO_SIZE ((STM32_OTG_FIFO_SIZE - CONFIG_USBDEV_RXFIFO_SIZE)/STM32_NENDPOINTS)
+#  endif
+#else
+#  define CONFIG_USBDEV_EP4_TXFIFO_SIZE 0
+#endif
+
+#if STM32_NENDPOINTS > 5
+#  ifndef CONFIG_USBDEV_EP5_TXFIFO_SIZE
+#    define CONFIG_USBDEV_EP5_TXFIFO_SIZE ((STM32_OTG_FIFO_SIZE - CONFIG_USBDEV_RXFIFO_SIZE)/STM32_NENDPOINTS)
+#  endif
+#else
+#  define CONFIG_USBDEV_EP5_TXFIFO_SIZE 0
+#endif
+
+#if STM32_NENDPOINTS > 6
+#  ifndef CONFIG_USBDEV_EP6_TXFIFO_SIZE
+#    define CONFIG_USBDEV_EP6_TXFIFO_SIZE ((STM32_OTG_FIFO_SIZE - CONFIG_USBDEV_RXFIFO_SIZE)/STM32_NENDPOINTS)
+#  endif
+#else
+#  define CONFIG_USBDEV_EP6_TXFIFO_SIZE 0
+#endif
+
+#if STM32_NENDPOINTS > 7
+#  ifndef CONFIG_USBDEV_EP7_TXFIFO_SIZE
+#    define CONFIG_USBDEV_EP7_TXFIFO_SIZE ((STM32_OTG_FIFO_SIZE - CONFIG_USBDEV_RXFIFO_SIZE)/STM32_NENDPOINTS)
+#  endif
+#else
+#  define CONFIG_USBDEV_EP7_TXFIFO_SIZE 0
+#endif
+
+#if STM32_NENDPOINTS > 8
+#  ifndef CONFIG_USBDEV_EP8_TXFIFO_SIZE
+#    define CONFIG_USBDEV_EP8_TXFIFO_SIZE ((STM32_OTG_FIFO_SIZE - CONFIG_USBDEV_RXFIFO_SIZE)/STM32_NENDPOINTS)
+#  endif
+#else
+#  define CONFIG_USBDEV_EP8_TXFIFO_SIZE 0
+#endif
+
+
+/* The actual FIFO addresses that we use must be aligned to 4-byte boundaries;
+ * FIFO sizes must be provided in units of 32-bit words.
+ */
+
+#define STM32_RXFIFO_BYTES     ((CONFIG_USBDEV_RXFIFO_SIZE + 3) & ~3)
+#define STM32_RXFIFO_WORDS     ((CONFIG_USBDEV_RXFIFO_SIZE + 3) >> 2)
+
+#define STM32_EP0_TXFIFO_BYTES ((CONFIG_USBDEV_EP0_TXFIFO_SIZE + 3) & ~3)
+#define STM32_EP0_TXFIFO_WORDS ((CONFIG_USBDEV_EP0_TXFIFO_SIZE + 3) >> 2)
+
+#define STM32_EP1_TXFIFO_BYTES ((CONFIG_USBDEV_EP1_TXFIFO_SIZE + 3) & ~3)
+#define STM32_EP1_TXFIFO_WORDS ((CONFIG_USBDEV_EP1_TXFIFO_SIZE + 3) >> 2)
+
+#define STM32_EP2_TXFIFO_BYTES ((CONFIG_USBDEV_EP2_TXFIFO_SIZE + 3) & ~3)
+#define STM32_EP2_TXFIFO_WORDS ((CONFIG_USBDEV_EP2_TXFIFO_SIZE + 3) >> 2)
+
+#define STM32_EP3_TXFIFO_BYTES ((CONFIG_USBDEV_EP3_TXFIFO_SIZE + 3) & ~3)
+#define STM32_EP3_TXFIFO_WORDS ((CONFIG_USBDEV_EP3_TXFIFO_SIZE + 3) >> 2)
+
+#define STM32_EP4_TXFIFO_BYTES ((CONFIG_USBDEV_EP4_TXFIFO_SIZE + 3) & ~3)
+#define STM32_EP4_TXFIFO_WORDS ((CONFIG_USBDEV_EP4_TXFIFO_SIZE + 3) >> 2)
+
+#define STM32_EP5_TXFIFO_BYTES ((CONFIG_USBDEV_EP5_TXFIFO_SIZE + 3) & ~3)
+#define STM32_EP5_TXFIFO_WORDS ((CONFIG_USBDEV_EP5_TXFIFO_SIZE + 3) >> 2)
+
+#define STM32_EP6_TXFIFO_BYTES ((CONFIG_USBDEV_EP6_TXFIFO_SIZE + 3) & ~3)
+#define STM32_EP6_TXFIFO_WORDS ((CONFIG_USBDEV_EP6_TXFIFO_SIZE + 3) >> 2)
+
+#define STM32_EP7_TXFIFO_BYTES ((CONFIG_USBDEV_EP7_TXFIFO_SIZE + 3) & ~3)
+#define STM32_EP7_TXFIFO_WORDS ((CONFIG_USBDEV_EP7_TXFIFO_SIZE + 3) >> 2)
+
+#define STM32_EP8_TXFIFO_BYTES ((CONFIG_USBDEV_EP8_TXFIFO_SIZE + 3) & ~3)
+#define STM32_EP8_TXFIFO_WORDS ((CONFIG_USBDEV_EP8_TXFIFO_SIZE + 3) >> 2)
+
+
+#if (STM32_RXFIFO_BYTES + \
+     STM32_EP0_TXFIFO_BYTES + STM32_EP1_TXFIFO_BYTES + STM32_EP2_TXFIFO_BYTES + STM32_EP3_TXFIFO_BYTES + \
+	 STM32_EP4_TXFIFO_BYTES + STM32_EP5_TXFIFO_BYTES + STM32_EP6_TXFIFO_BYTES + STM32_EP7_TXFIFO_BYTES + CONFIG_USBDEV_EP8_TXFIFO_SIZE   \
+	) > STM32_OTG_FIFO_SIZE
+#  error "FIFO allocations exceed FIFO memory size"
+#endif
+
+/* Debug ***********************************************************************/
+/* Trace error codes */
+
+#define STM32_TRACEERR_ALLOCFAIL            0x01
+#define STM32_TRACEERR_BADCLEARFEATURE      0x02
+#define STM32_TRACEERR_BADDEVGETSTATUS      0x03
+#define STM32_TRACEERR_BADEPNO              0x04
+#define STM32_TRACEERR_BADEPGETSTATUS       0x05
+#define STM32_TRACEERR_BADGETCONFIG         0x06
+#define STM32_TRACEERR_BADGETSETDESC        0x07
+#define STM32_TRACEERR_BADGETSTATUS         0x08
+#define STM32_TRACEERR_BADSETADDRESS        0x09
+#define STM32_TRACEERR_BADSETCONFIG         0x0a
+#define STM32_TRACEERR_BADSETFEATURE        0x0b
+#define STM32_TRACEERR_BADTESTMODE          0x0c
+#define STM32_TRACEERR_BINDFAILED           0x0d
+#define STM32_TRACEERR_DISPATCHSTALL        0x0e
+#define STM32_TRACEERR_DRIVER               0x0f
+#define STM32_TRACEERR_DRIVERREGISTERED     0x10
+#define STM32_TRACEERR_EP0NOSETUP           0x11
+#define STM32_TRACEERR_EP0SETUPSTALLED      0x12
+#define STM32_TRACEERR_EPINNULLPACKET       0x13
+#define STM32_TRACEERR_EPINUNEXPECTED       0x14
+#define STM32_TRACEERR_EPOUTNULLPACKET      0x15
+#define STM32_TRACEERR_EPOUTUNEXPECTED      0x16
+#define STM32_TRACEERR_INVALIDCTRLREQ       0x17
+#define STM32_TRACEERR_INVALIDPARMS         0x18
+#define STM32_TRACEERR_IRQREGISTRATION      0x19
+#define STM32_TRACEERR_NOEP                 0x1a
+#define STM32_TRACEERR_NOTCONFIGURED        0x1b
+#define STM32_TRACEERR_EPOUTQEMPTY          0x1c
+#define STM32_TRACEERR_EPINREQEMPTY         0x1d
+#define STM32_TRACEERR_NOOUTSETUP           0x1e
+#define STM32_TRACEERR_POLLTIMEOUT          0x1f
+
+/* Trace interrupt codes */
+
+#define STM32_TRACEINTID_USB                1       /* USB Interrupt entry/exit */
+#define STM32_TRACEINTID_INTPENDING         2       /* On each pass through the loop */
+
+#define STM32_TRACEINTID_EPOUT              (10 + 0) /* First level interrupt decode */
+#define STM32_TRACEINTID_EPIN               (10 + 1)
+#define STM32_TRACEINTID_MISMATCH           (10 + 2)
+#define STM32_TRACEINTID_WAKEUP             (10 + 3)
+#define STM32_TRACEINTID_SUSPEND            (10 + 4)
+#define STM32_TRACEINTID_SOF                (10 + 5)
+#define STM32_TRACEINTID_RXFIFO             (10 + 6)
+#define STM32_TRACEINTID_DEVRESET           (10 + 7)
+#define STM32_TRACEINTID_ENUMDNE            (10 + 8)
+#define STM32_TRACEINTID_IISOIXFR           (10 + 9)
+#define STM32_TRACEINTID_IISOOXFR           (10 + 10)
+#define STM32_TRACEINTID_SRQ                (10 + 11)
+#define STM32_TRACEINTID_OTG                (10 + 12)
+
+#define STM32_TRACEINTID_EPOUT_XFRC         (40 + 0) /* EPOUT second level decode */
+#define STM32_TRACEINTID_EPOUT_EPDISD       (40 + 1)
+#define STM32_TRACEINTID_EPOUT_SETUP        (40 + 2)
+#define STM32_TRACEINTID_DISPATCH           (40 + 3)
+
+#define STM32_TRACEINTID_GETSTATUS          (50 + 0) /* EPOUT third level decode */
+#define STM32_TRACEINTID_EPGETSTATUS        (50 + 1)
+#define STM32_TRACEINTID_DEVGETSTATUS       (50 + 2)
+#define STM32_TRACEINTID_IFGETSTATUS        (50 + 3)
+#define STM32_TRACEINTID_CLEARFEATURE       (50 + 4)
+#define STM32_TRACEINTID_SETFEATURE         (50 + 5)
+#define STM32_TRACEINTID_SETADDRESS         (50 + 6)
+#define STM32_TRACEINTID_GETSETDESC         (50 + 7)
+#define STM32_TRACEINTID_GETCONFIG          (50 + 8)
+#define STM32_TRACEINTID_SETCONFIG          (50 + 9)
+#define STM32_TRACEINTID_GETSETIF           (50 + 10)
+#define STM32_TRACEINTID_SYNCHFRAME         (50 + 11)
+
+#define STM32_TRACEINTID_EPIN_XFRC          (70 + 0) /* EPIN second level decode */
+#define STM32_TRACEINTID_EPIN_TOC           (70 + 1)
+#define STM32_TRACEINTID_EPIN_ITTXFE        (70 + 2)
+#define STM32_TRACEINTID_EPIN_EPDISD        (70 + 3)
+#define STM32_TRACEINTID_EPIN_TXFE          (70 + 4)
+
+#define STM32_TRACEINTID_EPIN_EMPWAIT       (80 + 0) /* EPIN second level decode */
+
+#define STM32_TRACEINTID_OUTNAK             (90 + 0) /* RXFLVL second level decode */
+#define STM32_TRACEINTID_OUTRECVD           (90 + 1)
+#define STM32_TRACEINTID_OUTDONE            (90 + 2)
+#define STM32_TRACEINTID_SETUPDONE          (90 + 3)
+#define STM32_TRACEINTID_SETUPRECVD         (90 + 4)
+
+/* Endpoints ******************************************************************/
+
+
+/* Odd physical endpoint numbers are IN; even are OUT */
+
+#define STM32_EPPHYIN2LOG(epphy)     ((uint8_t)(epphy)|USB_DIR_IN)
+#define STM32_EPPHYOUT2LOG(epphy)    ((uint8_t)(epphy)|USB_DIR_OUT)
+
+/* Endpoint 0 */
+
+#define EP0                          (0)
+
+/* The set of all enpoints available to the class implementation (1-3) */
+
+#define STM32_EP_AVAILABLE           (0x0e)       /* All available endpoints */
+
+/* Maximum packet sizes for full speed endpoints */
+
+#define STM32_MAXPACKET              (64)         /* Max packet size (1-64) */
+
+/* Delays **********************************************************************/
+
+#define STM32_READY_DELAY            200000
+#define STM32_FLUSH_DELAY            200000
+
+/* Request queue operations ****************************************************/
+
+#define stm32_rqempty(ep)            ((ep)->head == NULL)
+#define stm32_rqpeek(ep)             ((ep)->head)
+
+/* Standard stuff **************************************************************/
+
+#ifndef MIN
+#  define MIN(a,b) ((a) < (b) ? (a) : (b))
+#endif
+
+#ifndef MAX
+#  define MAX(a,b) ((a) > (b) ? (a) : (b))
+#endif
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/* Overall device state */
+
+enum stm32_devstate_e
+{
+  DEVSTATE_DEFAULT = 0,    /* Power-up, unconfigured state.  This state simply
+                            * means that the device is not yet been given an
+                            * address.
+                            *   SET:    At initialization, uninitialization,
+                            *           reset, and whenever the device address
+                            *           is set to zero
+                            *   TESTED: Never
+                            */
+  DEVSTATE_ADDRESSED,      /* Device address has been assigned, not no
+                            * configuration has yet been selected.
+                            *   SET:    When either a non-zero device address
+                            *           is first assigned or when the device
+                            *           is unconfigured (with configuration == 0)
+                            *   TESTED: never
+                            */
+  DEVSTATE_CONFIGURED,     /* Address assigned and configured:
+                            *   SET:    When the device has been addressed and
+                            *           an non-zero configuration has been selected.
+                            *   TESTED: In many places to assure that the USB device
+                            *           has been properly configured by the host.
+                            */
+};
+
+/* Endpoint 0 states */
+
+enum stm32_ep0state_e
+{
+  EP0STATE_IDLE = 0,       /* Idle State, leave on receiving a SETUP packet or
+                            * epsubmit:
+                            *   SET:    In stm32_epin() and stm32_epout() when
+                            *           we revert from request processing to
+                            *           SETUP processing.
+                            *   TESTED: Never
+                            */
+  EP0STATE_SETUP_OUT,      /* OUT SETUP packet received.  Waiting for the DATA
+                            * OUT phase of SETUP Packet to complete before
+                            * processing a SETUP command (without a USB request):
+                            *   SET:    Set in stm32_rxinterrupt() when SETUP OUT
+                            *           packet is received.
+                            *   TESTED: In stm32_ep0out_receive()
+                            */
+  EP0STATE_SETUP_READY,    /* IN SETUP packet received -OR- OUT SETUP packet and
+                            * accompanying data have been received.  Processing
+                            * of SETUP command will happen soon.
+                            *   SET:    (1) stm32_ep0out_receive() when the OUT
+                            *           SETUP data phase completes, or (2)
+                            *           stm32_rxinterrupt() when an IN SETUP is
+                            *           packet received.
+                            *   TESTED: Tested in stm32_epout_interrupt() when
+                            *           SETUP phase is done to see if the SETUP
+                            *           command is ready to be processed.  Also
+                            *           tested in stm32_ep0out_setup() just to
+                            *           double-check that we have a SETUP request
+                            *           and any accompanying data.
+                            */
+  EP0STATE_SETUP_PROCESS,  /* SETUP Packet is being processed by stm32_ep0out_setup():
+                            *   SET:    When SETUP packet received in EP0 OUT
+                            *   TESTED: Never
+                            */
+  EP0STATE_SETUPRESPONSE,  /* Short SETUP response write (without a USB request):
+                            *   SET:    When SETUP response is sent by
+                            *           stm32_ep0in_setupresponse()
+                            *   TESTED: Never
+                            */
+  EP0STATE_DATA_IN,        /* Waiting for data out stage (with a USB request):
+                            *   SET:    In stm32_epin_request() when a write
+                            *           request is processed on EP0.
+                            *   TESTED: In stm32_epin() to see if we should
+                            *           revert to SETUP processing.
+                            */
+  EP0STATE_DATA_OUT        /* Waiting for data in phase to complete ( with a
+                            * USB request)
+                            *   SET:    In stm32_epout_request() when a read
+                            *           request is processed on EP0.
+                            *   TESTED: In stm32_epout() to see if we should
+                            *           revert to SETUP processing
+                            */
+};
+
+/* Parsed control request */
+
+struct stm32_ctrlreq_s
+{
+  uint8_t  type;
+  uint8_t  req;
+  uint16_t value;
+  uint16_t index;
+  uint16_t len;
+};
+
+/* A container for a request so that the request may be retained in a list */
+
+struct stm32_req_s
+{
+  struct usbdev_req_s  req;           /* Standard USB request */
+  struct stm32_req_s  *flink;         /* Supports a singly linked list */
+};
+
+/* This is the internal representation of an endpoint */
+
+struct stm32_ep_s
+{
+  /* Common endpoint fields.  This must be the first thing defined in the
+   * structure so that it is possible to simply cast from struct usbdev_ep_s
+   * to struct stm32_ep_s.
+   */
+
+  struct usbdev_ep_s      ep;          /* Standard endpoint structure */
+
+  /* STM32-specific fields */
+
+  struct stm32_usbdev_s *dev;          /* Reference to private driver data */
+  struct stm32_req_s    *head;         /* Request list for this endpoint */
+  struct stm32_req_s    *tail;
+  uint8_t                epphy;        /* Physical EP address */
+  uint8_t                eptype:2;     /* Endpoint type */
+  uint8_t                active:1;     /* 1: A request is being processed */
+  uint8_t                stalled:1;    /* 1: Endpoint is stalled */
+  uint8_t                isin:1;       /* 1: IN Endpoint */
+  uint8_t                odd:1;        /* 1: Odd frame */
+  uint8_t                zlp:1;        /* 1: Transmit a zero-length-packet (IN EPs only) */
+};
+
+/* This structure retains the state of the USB device controller */
+
+struct stm32_usbdev_s
+{
+  /* Common device fields.  This must be the first thing defined in the
+   * structure so that it is possible to simply cast from struct usbdev_s
+   * to struct stm32_usbdev_s.
+   */
+
+  struct usbdev_s         usbdev;
+
+  /* The bound device class driver */
+
+  struct usbdevclass_driver_s *driver;
+
+  /* STM32-specific fields */
+
+  uint8_t                 stalled:1;     /* 1: Protocol stalled */
+  uint8_t                 selfpowered:1; /* 1: Device is self powered */
+  uint8_t                 addressed:1;   /* 1: Peripheral address has been set */
+  uint8_t                 configured:1;  /* 1: Class driver has been configured */
+  uint8_t                 wakeup:1;      /* 1: Device remote wake-up */
+  uint8_t                 dotest:1;      /* 1: Test mode selected */
+
+  uint8_t                 devstate:4;    /* See enum stm32_devstate_e */
+  uint8_t                 ep0state:4;    /* See enum stm32_ep0state_e */
+  uint8_t                 testmode:4;    /* Selected test mode */
+  uint8_t                 epavail[2];    /* Bitset of available OUT/IN endpoints */
+
+  /* E0 SETUP data buffering.
+   *
+   * ctrlreq:
+   *   The 8-byte SETUP request is received on the EP0 OUT endpoint and is
+   *   saved.
+   *
+   * ep0data
+   *   For OUT SETUP requests, the SETUP data phase must also complete before
+   *   the SETUP command can be processed.  The pack receipt logic will save
+   *   the accompanying EP0 IN data in ep0data[] before the SETUP command is
+   *   processed.
+   *
+   *   For IN SETUP requests, the DATA phase will occur AFTER the SETUP
+   *   control request is processed.  In that case, ep0data[] may be used as
+   *   the response buffer.
+   *
+   * ep0datlen
+   *   Length of OUT DATA received in ep0data[] (Not used with OUT data)
+   */
+
+  struct usb_ctrlreq_s    ctrlreq;
+  uint8_t                 ep0data[CONFIG_USBDEV_SETUP_MAXDATASIZE];
+  uint16_t                ep0datlen;
+
+  /* The endpoint lists */
+
+  struct stm32_ep_s       epin[STM32_NENDPOINTS];
+  struct stm32_ep_s       epout[STM32_NENDPOINTS];
+};
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+/* Register operations ********************************************************/
+
+#if defined(CONFIG_STM32F7_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
+# define stm32_getreg(addr)     getreg32(addr)
+# define stm32_putreg(val,addr) putreg32(val,addr)
+#endif
+
+/* Request queue operations ****************************************************/
+
+static FAR struct stm32_req_s *stm32_req_remfirst(FAR struct stm32_ep_s *privep);
+static bool       stm32_req_addlast(FAR struct stm32_ep_s *privep,
+                    FAR struct stm32_req_s *req);
+
+/* Low level data transfers and request operations *****************************/
+/* Special endpoint 0 data transfer logic */
+
+static void        stm32_ep0in_setupresponse(FAR struct stm32_usbdev_s *priv,
+                     FAR uint8_t *data, uint32_t nbytes);
+static inline void stm32_ep0in_transmitzlp(FAR struct stm32_usbdev_s *priv);
+static void        stm32_ep0in_activate(void);
+
+static void        stm32_ep0out_ctrlsetup(FAR struct stm32_usbdev_s *priv);
+
+/* IN request and TxFIFO handling */
+
+static void        stm32_txfifo_write(FAR struct stm32_ep_s *privep,
+                     FAR uint8_t *buf, int nbytes);
+static void        stm32_epin_transfer(FAR struct stm32_ep_s *privep,
+                     FAR uint8_t *buf, int nbytes);
+static void        stm32_epin_request(FAR struct stm32_usbdev_s *priv,
+                     FAR struct stm32_ep_s *privep);
+
+/* OUT request and RxFIFO handling */
+
+static void        stm32_rxfifo_read(FAR struct stm32_ep_s *privep,
+                     FAR uint8_t *dest, uint16_t len);
+static void        stm32_rxfifo_discard(FAR struct stm32_ep_s *privep, int len);
+static void        stm32_epout_complete(FAR struct stm32_usbdev_s *priv,
+                     FAR struct stm32_ep_s *privep);
+static inline void stm32_ep0out_receive(FAR struct stm32_ep_s *privep, int bcnt);
+static inline void stm32_epout_receive(FAR struct stm32_ep_s *privep, int bcnt);
+static void        stm32_epout_request(FAR struct stm32_usbdev_s *priv,
+                     FAR struct stm32_ep_s *privep);
+
+/* General request handling */
+
+static void        stm32_ep_flush(FAR struct stm32_ep_s *privep);
+static void        stm32_req_complete(FAR struct stm32_ep_s *privep,
+                     int16_t result);
+static void        stm32_req_cancel(FAR struct stm32_ep_s *privep,
+                     int16_t status);
+
+/* Interrupt handling **********************************************************/
+
+static struct      stm32_ep_s *stm32_ep_findbyaddr(struct stm32_usbdev_s *priv,
+                     uint16_t eplog);
+static int         stm32_req_dispatch(FAR struct stm32_usbdev_s *priv,
+                     FAR const struct usb_ctrlreq_s *ctrl);
+static void        stm32_usbreset(FAR struct stm32_usbdev_s *priv);
+
+/* Second level OUT endpoint interrupt processing */
+
+static inline void stm32_ep0out_testmode(FAR struct stm32_usbdev_s *priv,
+                     uint16_t index);
+static inline void stm32_ep0out_stdrequest(struct stm32_usbdev_s *priv,
+                     FAR struct stm32_ctrlreq_s *ctrlreq);
+static inline void stm32_ep0out_setup(struct stm32_usbdev_s *priv);
+static inline void stm32_epout(FAR struct stm32_usbdev_s *priv,
+                     uint8_t epno);
+static inline void stm32_epout_interrupt(FAR struct stm32_usbdev_s *priv);
+
+/* Second level IN endpoint interrupt processing */
+
+static inline void stm32_epin_runtestmode(FAR struct stm32_usbdev_s *priv);
+static inline void stm32_epin(FAR struct stm32_usbdev_s *priv, uint8_t epno);
+static inline void stm32_epin_txfifoempty(FAR struct stm32_usbdev_s *priv, int epno);
+static inline void stm32_epin_interrupt(FAR struct stm32_usbdev_s *priv);
+
+/* Other second level interrupt processing */
+
+static inline void stm32_resumeinterrupt(FAR struct stm32_usbdev_s *priv);
+static inline void stm32_suspendinterrupt(FAR struct stm32_usbdev_s *priv);
+static inline void stm32_rxinterrupt(FAR struct stm32_usbdev_s *priv);
+static inline void stm32_enuminterrupt(FAR struct stm32_usbdev_s *priv);
+#ifdef CONFIG_USBDEV_ISOCHRONOUS
+static inline void stm32_isocininterrupt(FAR struct stm32_usbdev_s *priv);
+static inline void stm32_isocoutinterrupt(FAR struct stm32_usbdev_s *priv);
+#endif
+#ifdef CONFIG_USBDEV_VBUSSENSING
+static inline void stm32_sessioninterrupt(FAR struct stm32_usbdev_s *priv);
+static inline void stm32_otginterrupt(FAR struct stm32_usbdev_s *priv);
+#endif
+
+/* First level interrupt processing */
+
+static int         stm32_usbinterrupt(int irq, FAR void *context);
+
+/* Endpoint operations *********************************************************/
+/* Global OUT NAK controls */
+
+static void        stm32_enablegonak(FAR struct stm32_ep_s *privep);
+static void        stm32_disablegonak(FAR struct stm32_ep_s *privep);
+
+/* Endpoint configuration */
+
+static int         stm32_epout_configure(FAR struct stm32_ep_s *privep,
+                     uint8_t eptype, uint16_t maxpacket);
+static int         stm32_epin_configure(FAR struct stm32_ep_s *privep,
+                     uint8_t eptype, uint16_t maxpacket);
+static int         stm32_ep_configure(FAR struct usbdev_ep_s *ep,
+                     FAR const struct usb_epdesc_s *desc, bool last);
+static void        stm32_ep0_configure(FAR struct stm32_usbdev_s *priv);
+
+/* Endpoint disable */
+
+static void        stm32_epout_disable(FAR struct stm32_ep_s *privep);
+static void        stm32_epin_disable(FAR struct stm32_ep_s *privep);
+static int         stm32_ep_disable(FAR struct usbdev_ep_s *ep);
+
+/* Endpoint request management */
+
+static FAR struct usbdev_req_s *stm32_ep_allocreq(FAR struct usbdev_ep_s *ep);
+static void        stm32_ep_freereq(FAR struct usbdev_ep_s *ep,
+                     FAR struct usbdev_req_s *);
+
+/* Endpoint buffer management */
+
+#ifdef CONFIG_USBDEV_DMA
+static void       *stm32_ep_allocbuffer(FAR struct usbdev_ep_s *ep, unsigned bytes);
+static void        stm32_ep_freebuffer(FAR struct usbdev_ep_s *ep, FAR void *buf);
+#endif
+
+/* Endpoint request submission */
+
+static int         stm32_ep_submit(FAR struct usbdev_ep_s *ep,
+                     struct usbdev_req_s *req);
+
+/* Endpoint request cancellation */
+
+static int         stm32_ep_cancel(FAR struct usbdev_ep_s *ep,
+                     struct usbdev_req_s *req);
+
+/* Stall handling */
+
+static int         stm32_epout_setstall(FAR struct stm32_ep_s *privep);
+static int         stm32_epin_setstall(FAR struct stm32_ep_s *privep);
+static int         stm32_ep_setstall(FAR struct stm32_ep_s *privep);
+static int         stm32_ep_clrstall(FAR struct stm32_ep_s *privep);
+static int         stm32_ep_stall(FAR struct usbdev_ep_s *ep, bool resume);
+static void        stm32_ep0_stall(FAR struct stm32_usbdev_s *priv);
+
+/* Endpoint allocation */
+
+static FAR struct usbdev_ep_s *stm32_ep_alloc(FAR struct usbdev_s *dev,
+                     uint8_t epno, bool in, uint8_t eptype);
+static void        stm32_ep_free(FAR struct usbdev_s *dev,
+                     FAR struct usbdev_ep_s *ep);
+
+/* USB device controller operations ********************************************/
+
+static int         stm32_getframe(struct usbdev_s *dev);
+static int         stm32_wakeup(struct usbdev_s *dev);
+static int         stm32_selfpowered(struct usbdev_s *dev, bool selfpowered);
+static int         stm32_pullup(struct usbdev_s *dev, bool enable);
+static void        stm32_setaddress(struct stm32_usbdev_s *priv,
+                     uint16_t address);
+static int         stm32_txfifo_flush(uint32_t txfnum);
+static int         stm32_rxfifo_flush(void);
+
+/* Initialization **************************************************************/
+
+static void        stm32_swinitialize(FAR struct stm32_usbdev_s *priv);
+static void        stm32_hwinitialize(FAR struct stm32_usbdev_s *priv);
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+/* Since there is only a single USB interface, all status information can be
+ * be simply retained in a single global instance.
+ */
+
+static struct stm32_usbdev_s g_otghsdev;
+
+static const struct usbdev_epops_s g_epops =
+{
+  .configure   = stm32_ep_configure,
+  .disable     = stm32_ep_disable,
+  .allocreq    = stm32_ep_allocreq,
+  .freereq     = stm32_ep_freereq,
+#ifdef CONFIG_USBDEV_DMA
+  .allocbuffer = stm32_ep_allocbuffer,
+  .freebuffer  = stm32_ep_freebuffer,
+#endif
+  .submit      = stm32_ep_submit,
+  .cancel      = stm32_ep_cancel,
+  .stall       = stm32_ep_stall,
+};
+
+static const struct usbdev_ops_s g_devops =
+{
+  .allocep     = stm32_ep_alloc,
+  .freeep      = stm32_ep_free,
+  .getframe    = stm32_getframe,
+  .wakeup      = stm32_wakeup,
+  .selfpowered = stm32_selfpowered,
+  .pullup      = stm32_pullup,
+};
+
+/* Device error strings that may be enabled for more descriptive USB trace
+ * output.
+ */
+
+#ifdef CONFIG_USBDEV_TRACE_STRINGS
+const struct trace_msg_t g_usb_trace_strings_deverror[] =
+{
+  TRACE_STR(STM32_TRACEERR_ALLOCFAIL       ),
+  TRACE_STR(STM32_TRACEERR_BADCLEARFEATURE ),
+  TRACE_STR(STM32_TRACEERR_BADDEVGETSTATUS ),
+  TRACE_STR(STM32_TRACEERR_BADEPNO         ),
+  TRACE_STR(STM32_TRACEERR_BADEPGETSTATUS  ),
+  TRACE_STR(STM32_TRACEERR_BADGETCONFIG    ),
+  TRACE_STR(STM32_TRACEERR_BADGETSETDESC   ),
+  TRACE_STR(STM32_TRACEERR_BADGETSTATUS    ),
+  TRACE_STR(STM32_TRACEERR_BADSETADDRESS   ),
+  TRACE_STR(STM32_TRACEERR_BADSETCONFIG    ),
+  TRACE_STR(STM32_TRACEERR_BADSETFEATURE   ),
+  TRACE_STR(STM32_TRACEERR_BADTESTMODE     ),
+  TRACE_STR(STM32_TRACEERR_BINDFAILED      ),
+  TRACE_STR(STM32_TRACEERR_DISPATCHSTALL   ),
+  TRACE_STR(STM32_TRACEERR_DRIVER          ),
+  TRACE_STR(STM32_TRACEERR_DRIVERREGISTERED),
+  TRACE_STR(STM32_TRACEERR_EP0NOSETUP      ),
+  TRACE_STR(STM32_TRACEERR_EP0SETUPSTALLED ),
+  TRACE_STR(STM32_TRACEERR_EPINNULLPACKET  ),
+  TRACE_STR(STM32_TRACEERR_EPINUNEXPECTED  ),
+  TRACE_STR(STM32_TRACEERR_EPOUTNULLPACKET ),
+  TRACE_STR(STM32_TRACEERR_EPOUTUNEXPECTED ),
+  TRACE_STR(STM32_TRACEERR_INVALIDCTRLREQ  ),
+  TRACE_STR(STM32_TRACEERR_INVALIDPARMS    ),
+  TRACE_STR(STM32_TRACEERR_IRQREGISTRATION ),
+  TRACE_STR(STM32_TRACEERR_NOEP            ),
+  TRACE_STR(STM32_TRACEERR_NOTCONFIGURED   ),
+  TRACE_STR(STM32_TRACEERR_EPOUTQEMPTY     ),
+  TRACE_STR(STM32_TRACEERR_EPINREQEMPTY    ),
+  TRACE_STR(STM32_TRACEERR_NOOUTSETUP      ),
+  TRACE_STR(STM32_TRACEERR_POLLTIMEOUT     ),
+  TRACE_STR_END
+};
+#endif
+
+/* Interrupt event strings that may be enabled for more descriptive USB trace
+ * output.
+ */
+
+#ifdef CONFIG_USBDEV_TRACE_STRINGS
+const struct trace_msg_t g_usb_trace_strings_intdecode[] =
+{
+  TRACE_STR(STM32_TRACEINTID_USB         ),
+  TRACE_STR(STM32_TRACEINTID_INTPENDING  ),
+  TRACE_STR(STM32_TRACEINTID_EPOUT       ),
+  TRACE_STR(STM32_TRACEINTID_EPIN        ),
+  TRACE_STR(STM32_TRACEINTID_MISMATCH    ),
+  TRACE_STR(STM32_TRACEINTID_WAKEUP      ),
+  TRACE_STR(STM32_TRACEINTID_SUSPEND     ),
+  TRACE_STR(STM32_TRACEINTID_SOF         ),
+  TRACE_STR(STM32_TRACEINTID_RXFIFO      ),
+  TRACE_STR(STM32_TRACEINTID_DEVRESET    ),
+  TRACE_STR(STM32_TRACEINTID_ENUMDNE     ),
+  TRACE_STR(STM32_TRACEINTID_IISOIXFR    ),
+  TRACE_STR(STM32_TRACEINTID_IISOOXFR    ),
+  TRACE_STR(STM32_TRACEINTID_SRQ         ),
+  TRACE_STR(STM32_TRACEINTID_OTG         ),
+  TRACE_STR(STM32_TRACEINTID_EPOUT_XFRC  ),
+  TRACE_STR(STM32_TRACEINTID_EPOUT_EPDISD),
+  TRACE_STR(STM32_TRACEINTID_EPOUT_SETUP ),
+  TRACE_STR(STM32_TRACEINTID_DISPATCH    ),
+  TRACE_STR(STM32_TRACEINTID_GETSTATUS   ),
+  TRACE_STR(STM32_TRACEINTID_EPGETSTATUS ),
+  TRACE_STR(STM32_TRACEINTID_DEVGETSTATUS),
+  TRACE_STR(STM32_TRACEINTID_IFGETSTATUS ),
+  TRACE_STR(STM32_TRACEINTID_CLEARFEATURE),
+  TRACE_STR(STM32_TRACEINTID_SETFEATURE  ),
+  TRACE_STR(STM32_TRACEINTID_SETADDRESS  ),
+  TRACE_STR(STM32_TRACEINTID_GETSETDESC  ),
+  TRACE_STR(STM32_TRACEINTID_GETCONFIG   ),
+  TRACE_STR(STM32_TRACEINTID_SETCONFIG   ),
+  TRACE_STR(STM32_TRACEINTID_GETSETIF    ),
+  TRACE_STR(STM32_TRACEINTID_SYNCHFRAME  ),
+  TRACE_STR(STM32_TRACEINTID_EPIN_XFRC   ),
+  TRACE_STR(STM32_TRACEINTID_EPIN_TOC    ),
+  TRACE_STR(STM32_TRACEINTID_EPIN_ITTXFE ),
+  TRACE_STR(STM32_TRACEINTID_EPIN_EPDISD ),
+  TRACE_STR(STM32_TRACEINTID_EPIN_TXFE   ),
+  TRACE_STR(STM32_TRACEINTID_EPIN_EMPWAIT),
+  TRACE_STR(STM32_TRACEINTID_OUTNAK      ),
+  TRACE_STR(STM32_TRACEINTID_OUTRECVD    ),
+  TRACE_STR(STM32_TRACEINTID_OUTDONE     ),
+  TRACE_STR(STM32_TRACEINTID_SETUPDONE   ),
+  TRACE_STR(STM32_TRACEINTID_SETUPRECVD  ),
+  TRACE_STR_END
+};
+#endif
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stm32_getreg
+ *
+ * Description:
+ *   Get the contents of an STM32 register
+ *
+ ****************************************************************************/
+
+#if defined(CONFIG_STM32F7_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
+static uint32_t stm32_getreg(uint32_t addr)
+{
+  static uint32_t prevaddr = 0;
+  static uint32_t preval = 0;
+  static uint32_t count = 0;
+
+  /* Read the value from the register */
+
+  uint32_t val = getreg32(addr);
+
+  /* Is this the same value that we read from the same register last time?  Are
+   * we polling the register?  If so, suppress some of the output.
+   */
+
+  if (addr == prevaddr && val == preval)
+    {
+      if (count == 0xffffffff || ++count > 3)
+        {
+          if (count == 4)
+            {
+              llerr("...\n");
+            }
+
+          return val;
+        }
+    }
+
+  /* No this is a new address or value */
+
+  else
+    {
+      /* Did we print "..." for the previous value? */
+
+      if (count > 3)
+        {
+          /* Yes.. then show how many times the value repeated */
+
+          llerr("[repeats %d more times]\n", count-3);
+        }
+
+      /* Save the new address, value, and count */
+
+      prevaddr = addr;
+      preval   = val;
+      count    = 1;
+    }
+
+  /* Show the register value read */
+
+  llerr("%08x->%08x\n", addr, val);
+  return val;
+}
+#endif
+
+/****************************************************************************
+ * Name: stm32_putreg
+ *
+ * Description:
+ *   Set the contents of an STM32 register to a value
+ *
+ ****************************************************************************/
+
+#if defined(CONFIG_STM32F7_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
+static void stm32_putreg(uint32_t val, uint32_t addr)
+{
+  /* Show the register value being written */
+
+  llerr("%08x<-%08x\n", addr, val);
+
+  /* Write the value */
+
+  putreg32(val, addr);
+}
+#endif
+
+/****************************************************************************
+ * Name: stm32_req_remfirst
+ *
+ * Description:
+ *   Remove a request from the head of an endpoint request queue
+ *
+ ****************************************************************************/
+
+static FAR struct stm32_req_s *stm32_req_remfirst(FAR struct stm32_ep_s *privep)
+{
+  FAR struct stm32_req_s *ret = privep->head;
+
+  if (ret)
+    {
+      privep->head = ret->flink;
+      if (!privep->head)
+        {
+          privep->tail = NULL;
+        }
+
+      ret->flink = NULL;
+    }
+
+  return ret;
+}
+
+/****************************************************************************
+ * Name: stm32_req_addlast
+ *
+ * Description:
+ *   Add a request to the end of an endpoint request queue
+ *
+ ****************************************************************************/
+
+static bool stm32_req_addlast(FAR struct stm32_ep_s *privep,
+                              FAR struct stm32_req_s *req)
+{
+  bool is_empty = !privep->head;
+
+  req->flink = NULL;
+  if (is_empty)
+    {
+      privep->head = req;
+      privep->tail = req;
+    }
+  else
+    {
+      privep->tail->flink = req;
+      privep->tail        = req;
+    }
+  return is_empty;
+}
+
+/****************************************************************************
+ * Name: stm32_ep0in_setupresponse
+ *
+ * Description:
+ *   Schedule a short transfer on Endpoint 0 (IN or OUT)
+ *
+ ****************************************************************************/
+
+static void stm32_ep0in_setupresponse(FAR struct stm32_usbdev_s *priv,
+                                      FAR uint8_t *buf, uint32_t nbytes)
+{
+  stm32_epin_transfer(&priv->epin[EP0], buf, nbytes);
+  priv->ep0state = EP0STATE_SETUPRESPONSE;
+  stm32_ep0out_ctrlsetup(priv);
+}
+
+/****************************************************************************
+ * Name: stm32_ep0in_transmitzlp
+ *
+ * Description:
+ *   Send a zero length packet (ZLP) on endpoint 0 IN
+ *
+ ****************************************************************************/
+
+static inline void stm32_ep0in_transmitzlp(FAR struct stm32_usbdev_s *priv)
+{
+  stm32_ep0in_setupresponse(priv, NULL, 0);
+}
+
+/****************************************************************************
+ * Name: stm32_ep0in_activate
+ *
+ * Description:
+ *   Activate the endpoint 0 IN endpoint.
+ *
+ ****************************************************************************/
+
+static void stm32_ep0in_activate(void)
+{
+  uint32_t regval;
+
+  /* Set the max packet size  of the IN EP. */
+
+  regval  = stm32_getreg(STM32_OTG_DIEPCTL(0));
+  regval &= ~OTG_DIEPCTL0_MPSIZ_MASK;
+
+#if CONFIG_USBDEV_EP0_MAXSIZE == 8
+  regval |= OTG_DIEPCTL0_MPSIZ_8;
+#elif CONFIG_USBDEV_EP0_MAXSIZE == 16
+  regval |= OTG_DIEPCTL0_MPSIZ_16;
+#elif CONFIG_USBDEV_EP0_MAXSIZE == 32
+  regval |= OTG_DIEPCTL0_MPSIZ_32;
+#elif CONFIG_USBDEV_EP0_MAXSIZE == 64
+  regval |= OTG_DIEPCTL0_MPSIZ_64;
+#else
+#  error "Unsupported value of CONFIG_USBDEV_EP0_MAXSIZE"
+#endif
+
+  stm32_putreg(regval, STM32_OTG_DIEPCTL(0));
+
+  /* Clear global IN NAK */
+
+  regval  = stm32_getreg(STM32_OTG_DCTL);
+  regval |= OTG_DCTL_CGINAK;
+  stm32_putreg(regval, STM32_OTG_DCTL);
+}
+
+/****************************************************************************
+ * Name: stm32_ep0out_ctrlsetup
+ *
+ * Description:
+ *   Setup to receive a SETUP packet.
+ *
+ ****************************************************************************/
+
+static void stm32_ep0out_ctrlsetup(FAR struct stm32_usbdev_s *priv)
+{
+  uint32_t regval;
+
+  /* Setup the hardware to perform the SETUP transfer */
+
+  regval = (USB_SIZEOF_CTRLREQ * 3 << OTG_DOEPTSIZ0_XFRSIZ_SHIFT) |
+           (OTG_DOEPTSIZ0_PKTCNT) |
+           (3 << OTG_DOEPTSIZ0_STUPCNT_SHIFT);
+  stm32_putreg(regval, STM32_OTG_DOEPTSIZ(0));
+
+  /* Then clear NAKing and enable the transfer */
+
+  regval  = stm32_getreg(STM32_OTG_DOEPCTL(0));
+  regval |= (OTG_DOEPCTL0_CNAK | OTG_DOEPCTL0_EPENA);
+  stm32_putreg(regval, STM32_OTG_DOEPCTL(0));
+}
+
+/****************************************************************************
+ * Name: stm32_txfifo_write
+ *
+ * Description:
+ *   Send data to the endpoint's TxFIFO.
+ *
+ ****************************************************************************/
+
+static void stm32_txfifo_write(FAR struct stm32_ep_s *privep,
+                               FAR uint8_t *buf, int nbytes)
+{
+  uint32_t regaddr;
+  uint32_t regval;
+  int nwords;
+  int i;
+
+  /* Convert the number of bytes to words */
+
+  nwords = (nbytes + 3) >> 2;
+
+  /* Get the TxFIFO for this endpoint (same as the endpoint number) */
+
+  regaddr = STM32_OTG_DFIFO_DEP(privep->epphy);
+
+  /* Then transfer each word to the TxFIFO */
+
+  for (i = 0; i < nwords; i++)
+    {
+      /* Read four bytes from the source buffer (to avoid unaligned accesses)
+       * and pack these into one 32-bit word (little endian).
+       */
+
+      regval  = (uint32_t)*buf++;
+      regval |= ((uint32_t)*buf++) << 8;
+      regval |= ((uint32_t)*buf++) << 16;
+      regval |= ((uint32_t)*buf++) << 24;
+
+      /* Then write the packet data to the TxFIFO */
+
+      stm32_putreg(regval, regaddr);
+    }
+}
+
+/****************************************************************************
+ * Name: stm32_epin_transfer
+ *
+ * Description:
+ *   Start the Tx data transfer
+ *
+ ****************************************************************************/
+
+static void stm32_epin_transfer(FAR struct stm32_ep_s *privep,
+                                FAR uint8_t *buf, int nbytes)
+{
+  uint32_t pktcnt;
+  uint32_t regval;
+
+  /* Read the DIEPSIZx register */
+
+  regval = stm32_getreg(STM32_OTG_DIEPTSIZ(privep->epphy));
+
+  /* Clear the XFRSIZ, PKTCNT, and MCNT field of the DIEPSIZx register */
+
+  regval &= ~(OTG_DIEPTSIZ_XFRSIZ_MASK | OTG_DIEPTSIZ_PKTCNT_MASK |
+              OTG_DIEPTSIZ_MCNT_MASK);
+
+  /* Are we sending a zero length packet (ZLP) */
+
+  if (nbytes == 0)
+    {
+      /* Yes.. leave the transfer size at zero and set the packet count to 1 */
+
+      pktcnt = 1;
+    }
+  else
+    {
+      /* No.. Program the transfer size and packet count .  First calculate:
+       *
+       * xfrsize = The total number of bytes to be sent.
+       * pktcnt  = the number of packets (of maxpacket bytes) required to
+       *   perform the transfer.
+       */
+
+      pktcnt  = ((uint32_t)nbytes + (privep->ep.maxpacket - 1)) / privep->ep.maxpacket;
+    }
+
+  /* Set the XFRSIZ and PKTCNT */
+
+  regval |= (pktcnt << OTG_DIEPTSIZ_PKTCNT_SHIFT);
+  regval |= ((uint32_t)nbytes << OTG_DIEPTSIZ_XFRSIZ_SHIFT);
+
+  /* If this is an isochronous endpoint, then set the multi-count field to
+   * the PKTCNT as well.
+   */
+
+  if (privep->eptype == USB_EP_ATTR_XFER_ISOC)
+    {
+      regval |= (pktcnt << OTG_DIEPTSIZ_MCNT_SHIFT);
+    }
+
+  /* Save DIEPSIZx register value */
+
+  stm32_putreg(regval, STM32_OTG_DIEPTSIZ(privep->epphy));
+
+  /* Read the DIEPCTLx register */
+
+  regval = stm32_getreg(STM32_OTG_DIEPCTL(privep->epphy));
+
+  /* If this is an isochronous endpoint, then set the even/odd frame bit
+   * the DIEPCTLx register.
+   */
+
+  if (privep->eptype == USB_EP_ATTR_XFER_ISOC)
+    {
+      /* Check bit 0 of the frame number of the received SOF and set the
+       * even/odd frame to match.
+       */
+
+      uint32_t status = stm32_getreg(STM32_OTG_DSTS);
+      if ((status & OTG_DSTS_SOFFN0) == OTG_DSTS_SOFFN_EVEN)
+        {
+          regval |= OTG_DIEPCTL_SEVNFRM;
+        }
+      else
+        {
+          regval |= OTG_DIEPCTL_SODDFRM;
+        }
+    }
+
+  /* EP enable, IN data in FIFO */
+
+  regval &= ~OTG_DIEPCTL_EPDIS;
+  regval |= (OTG_DIEPCTL_CNAK | OTG_DIEPCTL_EPENA);
+  stm32_putreg(regval, STM32_OTG_DIEPCTL(privep->epphy));
+
+  /* Transfer the data to the TxFIFO.  At this point, the caller has already
+   * assured that there is sufficient space in the TxFIFO to hold the transfer
+   * we can just blindly continue.
+   */
+
+  stm32_txfifo_write(privep, buf, nbytes);
+}
+
+/****************************************************************************
+ * Name: stm32_epin_request
+ *
+ * Description:
+ *   Begin or continue write request processing.
+ *
+ ****************************************************************************/
+
+static void stm32_epin_request(FAR struct stm32_usbdev_s *priv,
+                               FAR struct stm32_ep_s *privep)
+{
+  struct stm32_req_s *privreq;
+  uint32_t regaddr;
+  uint32_t regval;
+  uint8_t *buf;
+  int nbytes;
+  int nwords;
+  int bytesleft;
+
+  /* We get here in one of four possible ways.  From three interrupting
+   * events:
+   *
+   * 1. From stm32_epin as part of the transfer complete interrupt processing
+   *    This interrupt indicates that the last transfer has completed.
+   * 2. As part of the ITTXFE interrupt processing.  That interrupt indicates
+   *    that an IN token was received when the associated TxFIFO was empty.
+   * 3. From stm32_epin_txfifoempty as part of the TXFE interrupt processing.
+   *    The TXFE interrupt is only enabled when the TxFIFO is full and the
+   *    software must wait for space to become available in the TxFIFO.
+   *
+   * And this function may be called immediately when the write request is
+   * queue to start up the next transaction.
+   *
+   * 4. From stm32_ep_submit when a new write request is received WHILE the
+   *    endpoint is not active (privep->active == false).
+   */
+
+  /* Check the request from the head of the endpoint request queue */
+
+  privreq = stm32_rqpeek(privep);
+  if (!privreq)
+    {
+      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_EPINREQEMPTY), privep->epphy);
+
+      /* There is no TX transfer in progress and no new pending TX
+       * requests to send.  To stop transmitting any data on a particular
+       * IN endpoint, the application must set the IN NAK bit. To set this
+       * bit, the following field must be programmed.
+       */
+
+      regaddr = STM32_OTG_DIEPCTL(privep->epphy);
+      regval  = stm32_getreg(regaddr);
+      regval |= OTG_DIEPCTL_SNAK;
+      stm32_putreg(regval, regaddr);
+
+      /* The endpoint is no longer active */
+
+      privep->active = false;
+      return;
+    }
+
+  ullinfo("EP%d req=%p: len=%d xfrd=%d zlp=%d\n",
+          privep->epphy, privreq, privreq->req.len,
+          privreq->req.xfrd, privep->zlp);
+
+  /* Check for a special case:  If we are just starting a request (xfrd==0) and
+   * the class driver is trying to send a zero-length packet (len==0).  Then set
+   * the ZLP flag so that the packet will be sent.
+   */
+
+  if (privreq->req.len == 0)
+    {
+      /* The ZLP flag is set TRUE whenever we want to force the driver to
+       * send a zero-length-packet on the next pass through the loop (below).
+       * The flag is cleared whenever a packet is sent in the loop below.
+       */
+
+       privep->zlp = true;
+    }
+
+  /* Add one more packet to the TxFIFO.  We will wait for the transfer
+   * complete event before we add the next packet (or part of a packet
+   * to the TxFIFO).
+   *
+   * The documentation says that we can can multiple packets to the TxFIFO,
+   * but it seems that we need to get the transfer complete event before
+   * we can add the next (or maybe I have got something wrong?)
+   */
+
+#if 0
+  while (privreq->req.xfrd < privreq->req.len || privep->zlp)
+#else
+  if (privreq->req.xfrd < privreq->req.len || privep->zlp)
+#endif
+    {
+      /* Get the number of bytes left to be sent in the request */
+
+      bytesleft = privreq->req.len - privreq->req.xfrd;
+      nbytes    = bytesleft;
+
+      /* Assume no zero-length-packet on the next pass through this loop */
+
+      privep->zlp = false;
+
+      /* Limit the size of the transfer to one full packet and handle
+       * zero-length packets (ZLPs).
+       */
+
+      if (nbytes > 0)
+        {
+          /* Either send the maxpacketsize or all of the remaining data in
+           * the request.
+           */
+
+          if (nbytes >= privep->ep.maxpacket)
+            {
+              nbytes =  privep->ep.maxpacket;
+
+              /* Handle the case where this packet is exactly the
+               * maxpacketsize.  Do we need to send a zero-length packet
+               * in this case?
+               */
+
+              if (bytesleft ==  privep->ep.maxpacket &&
+                 (privreq->req.flags & USBDEV_REQFLAGS_NULLPKT) != 0)
+                {
+                  /* The ZLP flag is set TRUE whenever we want to force
+                   * the driver to send a zero-length-packet on the next
+                   * pass through this loop. The flag is cleared (above)
+                   * whenever we are committed to sending any packet and
+                   * set here when we want to force one more pass through
+                   * the loop.
+                   */
+
+                  privep->zlp = true;
+                }
+            }
+        }
+
+      /* Get the transfer size in 32-bit words */
+
+      nwords = (nbytes + 3) >> 2;
+
+      /* Get the number of 32-bit words available in the TxFIFO. The
+       * DXTFSTS indicates the amount of free space available in the
+       * endpoint TxFIFO. Values are in terms of 32-bit words:
+       *
+       *   0: Endpoint TxFIFO is full
+       *   1: 1 word available
+       *   2: 2 words available
+       *   n: n words available
+       */
+
+      regaddr = STM32_OTG_DTXFSTS(privep->epphy);
+
+      /* Check for space in the TxFIFO.  If space in the TxFIFO is not
+       * available, then set up an interrupt to resume the transfer when
+       * the TxFIFO is empty.
+       */
+
+      regval = stm32_getreg(regaddr);
+      if ((int)(regval & OTG_DTXFSTS_MASK) < nwords)
+        {
+          usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPIN_EMPWAIT), (uint16_t)regval);
+
+          /* There is insufficient space in the TxFIFO.  Wait for a TxFIFO
+           * empty interrupt and try again.
+           */
+
+          uint32_t empmsk = stm32_getreg(STM32_OTG_DIEPEMPMSK);
+          empmsk |= OTG_DIEPEMPMSK(privep->epphy);
+          stm32_putreg(empmsk, STM32_OTG_DIEPEMPMSK);
+
+          /* Terminate the transfer.  We will try again when the TxFIFO empty
+           * interrupt is received.
+           */
+
+          return;
+        }
+
+      /* Transfer data to the TxFIFO */
+
+      buf = privreq->req.buf + privreq->req.xfrd;
+      stm32_epin_transfer(privep, buf, nbytes);
+
+      /* If it was not before, the OUT endpoint is now actively transferring
+       * data.
+       */
+
+      privep->active = true;
+
+      /* EP0 is a special case */
+
+      if (privep->epphy == EP0)
+        {
+          priv->ep0state = EP0STATE_DATA_IN;
+        }
+
+      /* Update for the next time through the loop */
+
+      privreq->req.xfrd += nbytes;
+    }
+
+  /* Note that the ZLP, if any, must be sent as a separate transfer.  The need
+   * for a ZLP is indicated by privep->zlp.  If all of the bytes were sent
+   * (including any final null packet) then we are finished with the transfer
+   */
+
+  if (privreq->req.xfrd >= privreq->req.len && !privep->zlp)
+    {
+      usbtrace(TRACE_COMPLETE(privep->epphy), privreq->req.xfrd);
+
+      /* We are finished with the request (although the transfer has not
+       * yet completed).
+       */
+
+      stm32_req_complete(privep, OK);
+    }
+}
+
+/****************************************************************************
+ * Name: stm32_rxfifo_read
+ *
+ * Description:
+ *   Read packet from the RxFIFO into a read request.
+ *
+ ****************************************************************************/
+
+static void stm32_rxfifo_read(FAR struct stm32_ep_s *privep,
+                              FAR uint8_t *dest, uint16_t len)
+{
+  uint32_t regaddr;
+  int i;
+
+  /* Get the address of the RxFIFO.  Note:  there is only one RxFIFO so
+   * we might as well use the address associated with EP0.
+   */
+
+  regaddr = STM32_OTG_DFIFO_DEP(EP0);
+
+  /* Read 32-bits and write 4 x 8-bits at time (to avoid unaligned accesses) */
+
+  for (i = 0; i < len; i += 4)
+    {
+      union
+      {
+        uint32_t w;
+        uint8_t  b[4];
+      } data;
+
+      /* Read 1 x 32-bits of EP0 packet data */
+
+      data.w = stm32_getreg(regaddr);
+
+      /* Write 4 x 8-bits of EP0 packet data */
+
+      *dest++ = data.b[0];
+      *dest++ = data.b[1];
+      *dest++ = data.b[2];
+      *dest++ = data.b[3];
+    }
+}
+
+/****************************************************************************
+ * Name: stm32_rxfifo_discard
+ *
+ * Description:
+ *   Discard packet data from the RxFIFO.
+ *
+ ****************************************************************************/
+
+static void stm32_rxfifo_discard(FAR struct stm32_ep_s *privep, int len)
+{
+  if (len > 0)
+    {
+      uint32_t regaddr;
+      int i;
+
+      /* Get the address of the RxFIFO  Note:  there is only one RxFIFO so
+       * we might as well use the address associated with EP0.
+       */
+
+      regaddr = STM32_OTG_DFIFO_DEP(EP0);
+
+      /* Read 32-bits at time */
+
+      for (i = 0; i < len; i += 4)
+        {
+          volatile uint32_t data = stm32_getreg(regaddr);
+          (void)data;
+        }
+    }
+}
+
+/****************************************************************************
+ * Name: stm32_epout_complete
+ *
+ * Description:
+ *   This function is called when an OUT transfer complete interrupt is
+ *   received.  It completes the read request at the head of the endpoint's
+ *   request queue.
+ *
+ ****************************************************************************/
+
+static void stm32_epout_complete(FAR struct stm32_usbdev_s *priv,
+                                 FAR struct stm32_ep_s *privep)
+{
+  struct stm32_req_s *privreq;
+
+  /* Since a transfer just completed, there must be a read request at the head of
+   * the endpoint request queue.
+   */
+
+  privreq = stm32_rqpeek(privep);
+  DEBUGASSERT(privreq);
+
+  if (!privreq)
+    {
+      /* An OUT transfer completed, but no packet to receive the data.  This
+       * should not happen.
+       */
+
+      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_EPOUTQEMPTY), privep->epphy);
+      privep->active = false;
+      return;
+    }
+
+  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
+   * IDLE.
+   */
+
+  usbtrace(TRACE_COMPLETE(privep->epphy), privreq->req.xfrd);
+  stm32_req_complete(privep, OK);
+  privep->active = false;
+
+  /* Now set up the next read request (if any) */
+
+  stm32_epout_request(priv, privep);
+}
+
+/****************************************************************************
+ * Name: stm32_ep0out_receive
+ *
+ * Description:
+ *   This function is called from the RXFLVL interrupt handler when new incoming
+ *   data is available in the endpoint's RxFIFO.  This function will simply
+ *   copy the incoming data into pending request's data buffer.
+ *
+ ****************************************************************************/
+
+static inline void stm32_ep0out_receive(FAR struct stm32_ep_s *privep, int bcnt)
+{
+  FAR struct stm32_usbdev_s *priv;
+
+  /* Sanity Checking */
+
+  DEBUGASSERT(privep && privep->ep.priv);
+  priv = (FAR struct stm32_usbdev_s *)privep->ep.priv;
+
+  ullinfo("EP0: bcnt=%d\n", bcnt);
+  usbtrace(TRACE_READ(EP0), bcnt);
+
+  /* Verify that an OUT SETUP request as received before this data was
+   * received in the RxFIFO.
+   */
+
+  if (priv->ep0state == EP0STATE_SETUP_OUT)
+    {
+      /* Read the data into our special buffer for SETUP data */
+
+      int readlen = MIN(CONFIG_USBDEV_SETUP_MAXDATASIZE, bcnt);
+      stm32_rxfifo_read(privep, priv->ep0data, readlen);
+
+      /* Do we have to discard any excess bytes? */
+
+      stm32_rxfifo_discard(privep,  bcnt - readlen);
+
+      /* Now we can process the setup command */
+
+      privep->active  = false;
+      priv->ep0state  = EP0STATE_SETUP_READY;
+      priv->ep0datlen = readlen;
+
+      stm32_ep0out_setup(priv);
+    }
+  else
+    {
+      /* This is an error.  We don't have any idea what to do with the EP0
+       * data in this case.  Just read and discard it so that the RxFIFO
+       * does not become constipated.
+       */
+
+      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_NOOUTSETUP), priv->ep0state);
+      stm32_rxfifo_discard(privep, bcnt);
+      privep->active = false;
+    }
+}
+
+/****************************************************************************
+ * Name: stm32_epout_receive
+ *
+ * Description:
+ *   This function is called from the RXFLVL interrupt handler when new incoming
+ *   data is available in the endpoint's RxFIFO.  This function will simply
+ *   copy the incoming data into pending request's data buffer.
+ *
+ ****************************************************************************/
+
+static inline void stm32_epout_receive(FAR struct stm32_ep_s *privep, int bcnt)
+{
+  struct stm32_req_s *privreq;
+  uint8_t *dest;
+  int buflen;
+  int readlen;
+
+  /* Get a reference to the request at the head of the endpoint's request
+   * queue.
+   */
+
+  privreq = stm32_rqpeek(privep);
+  if (!privreq)
+    {
+      /* Incoming data is available in the RxFIFO, but there is no read setup
+       * to receive the receive the data.  This should not happen for data
+       * endpoints; those endpoints should have been NAKing any OUT data tokens.
+       *
+       * We should get here normally on OUT data phase following an OUT
+       * SETUP command.  EP0 data will still receive data in this case and it
+       * should not be NAKing.
+       */
+
+      if (privep->epphy == 0)
+        {
+          stm32_ep0out_receive(privep, bcnt);
+        }
+      else
+        {
+          /* Otherwise, the data is lost. This really should not happen if
+           * NAKing is working as expected.
+           */
+
+          usbtrace(TRACE_DEVERROR(STM32_TRACEERR_EPOUTQEMPTY), privep->epphy);
+
+          /* Discard the data in the RxFIFO */
+
+          stm32_rxfifo_discard(privep, bcnt);
+        }
+
+      privep->active = false;
+      return;
+    }
+
+  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 */
+
+  buflen  = privreq->req.len - privreq->req.xfrd;
+  DEBUGASSERT(buflen > 0 && buflen >= bcnt);
+  readlen = MIN(buflen, bcnt);
+
+  /* Get the destination of the data transfer */
+
+  dest = privreq->req.buf + privreq->req.xfrd;
+
+  /* Transfer the data from the RxFIFO to the request's data buffer */
+
+  stm32_rxfifo_read(privep, dest, readlen);
+
+  /* If there were more bytes in the RxFIFO than could be held in the read
+   * request, then we will have to discard those.
+   */
+
+  stm32_rxfifo_discard(privep, bcnt - readlen);
+
+  /* Update the number of bytes transferred */
+
+  privreq->req.xfrd += readlen;
+}
+
+/****************************************************************************
+ * Name: stm32_epout_request
+ *
+ * Description:
+ *   This function is called when either (1) new read request is received, or
+ *   (2) a pending receive request completes.  If there is no read in pending,
+ *   then this function will initiate the next OUT (read) operation.
+ *
+ ****************************************************************************/
+
+static void stm32_epout_request(FAR struct stm32_usbdev_s *priv,
+                                FAR struct stm32_ep_s *privep)
+{
+  struct stm32_req_s *privreq;
+  uint32_t regaddr;
+  uint32_t regval;
+  uint32_t xfrsize;
+  uint32_t pktcnt;
+
+  /* Make sure that there is not already a pending request request.  If there is,
+   * just return, leaving the newly received request in the request queue.
+   */
+
+  if (!privep->active)
+    {
+      /* Loop until a valid request is found (or the request queue is empty).
+       * The loop is only need to look at the request queue again is an invalid
+       * read request is encountered.
+       */
+
+      for (; ; )
+        {
+          /* Get a reference to the request at the head of the endpoint's request queue */
+
+          privreq = stm32_rqpeek(privep);
+          if (!privreq)
+            {
+              usbtrace(TRACE_DEVERROR(STM32_TRACEERR_EPOUTQEMPTY), privep->epphy);
+
+              /* There are no read requests to be setup.  Configure the hardware to
+               * NAK any incoming packets.  (This should already be the case.  I
+               * think that the hardware will automatically NAK after a transfer is
+               * completed until SNAK is cleared).
+               */
+
+              regaddr = STM32_OTG_DOEPCTL(privep->epphy);
+              regval  = stm32_getreg(regaddr);
+              regval |= OTG_DOEPCTL_SNAK;
+              stm32_putreg(regval, regaddr);
+
+              /* This endpoint is no longer actively transferring */
+
+              privep->active = false;
+              return;
+            }
+
+          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.
+           */
+
+          if (privreq->req.len <= 0)
+            {
+              usbtrace(TRACE_DEVERROR(STM32_TRACEERR_EPOUTNULLPACKET), 0);
+              stm32_req_complete(privep, OK);
+            }
+
+          /* Otherwise, we have a usable read request... break out of the loop */
+
+          else
+            {
+              break;
+            }
+        }
+
+      /* Setup the pending read into the request buffer.  First calculate:
+       *
+       * pktcnt  = the number of packets (of maxpacket bytes) required to
+       *   perform the transfer.
+       * xfrsize = The total number of bytes required (in units of
+       *   maxpacket bytes).
+       */
+
+      pktcnt  = (privreq->req.len + (privep->ep.maxpacket - 1)) / privep->ep.maxpacket;
+      xfrsize = pktcnt * privep->ep.maxpacket;
+
+      /* Then setup the hardware to perform this transfer */
+
+      regaddr = STM32_OTG_DOEPTSIZ(privep->epphy);
+      regval  = stm32_getreg(regaddr);
+      regval &= ~(OTG_DOEPTSIZ_XFRSIZ_MASK | OTG_DOEPTSIZ_PKTCNT_MASK);
+      regval |= (xfrsize << OTG_DOEPTSIZ_XFRSIZ_SHIFT);
+      regval |= (pktcnt  << OTG_DOEPTSIZ_PKTCNT_SHIFT);
+      stm32_putreg(regval, regaddr);
+
+      /* Then enable the transfer */
+
+      regaddr = STM32_OTG_DOEPCTL(privep->epphy);
+      regval  = stm32_getreg(regaddr);
+
+      /* When an isochronous transfer is enabled the Even/Odd frame bit must
+       * also be set appropriately.
+       */
+
+#ifdef CONFIG_USBDEV_ISOCHRONOUS
+      if (privep->eptype == USB_EP_ATTR_XFER_ISOC)
+        {
+          if (privep->odd)
+            {
+              regval |= OTG_DOEPCTL_SODDFRM;
+            }
+          else
+            {
+              regval |= OTG_DOEPCTL_SEVNFRM;
+            }
+        }
+#endif
+
+      /* Clearing NAKing and enable the transfer. */
+
+      regval |= (OTG_DOEPCTL_CNAK | OTG_DOEPCTL_EPENA);
+      stm32_putreg(regval, regaddr);
+
+      /* A transfer is now active on this endpoint */
+
+      privep->active = true;
+
+      /* EP0 is a special case.  We need to know when to switch back to
+       * normal SETUP processing.
+       */
+
+      if (privep->epphy == EP0)
+        {
+          priv->ep0state = EP0STATE_DATA_OUT;
+        }
+    }
+}
+
+/****************************************************************************
+ * Name: stm32_ep_flush
+ *
+ * Description:
+ *   Flush any primed descriptors from this ep
+ *
+ ****************************************************************************/
+
+static void stm32_ep_flush(struct stm32_ep_s *privep)
+{
+  if (privep->isin)
+    {
+      stm32_txfifo_flush(OTG_GRSTCTL_TXFNUM_D(privep->epphy));
+    }
+  else
+    {
+      stm32_rxfifo_flush();
+    }
+}
+
+/****************************************************************************
+ * Name: stm32_req_complete
+ *
+ * Description:
+ *   Handle termination of the request at the head of the endpoint request queue.
+ *
+ ****************************************************************************/
+
+static void stm32_req_complete(struct stm32_ep_s *privep, int16_t result)
+{
+  FAR struct stm32_req_s *privreq;
+
+  /* Remove the request at the head of the request list */
+
+  privreq = stm32_req_remfirst(privep);
+  DEBUGASSERT(privreq != NULL);
+
+  /* If endpoint 0, temporarily reflect the state of protocol stalled
+   * in the callback.
+   */
+
+  bool stalled = privep->stalled;
+  if (privep->epphy == EP0)
+    {
+      privep->stalled = privep->dev->stalled;
+    }
+
+  /* Save the result in the request structure */
+
+  privreq->req.result = result;
+
+  /* Callback to the request completion handler */
+
+  privreq->req.callback(&privep->ep, &privreq->req);
+
+  /* Restore the stalled indication */
+
+  privep->stalled = stalled;
+}
+
+/****************************************************************************
+ * Name: stm32_req_cancel
+ *
+ * Description:
+ *   Cancel all pending requests for an endpoint
+ *
+ ****************************************************************************/
+
+static void stm32_req_cancel(struct stm32_ep_s *privep, int16_t status)
+{
+  if (!stm32_rqempty(privep))
+    {
+      stm32_ep_flush(privep);
+    }
+
+  while (!stm32_rqempty(privep))
+    {
+      usbtrace(TRACE_COMPLETE(privep->epphy),
+               (stm32_rqpeek(privep))->req.xfrd);
+      stm32_req_complete(privep, status);
+    }
+}
+
+/****************************************************************************
+ * Name: stm32_ep_findbyaddr
+ *
+ * Description:
+ *   Find the physical endpoint structure corresponding to a logic endpoint
+ *   address
+ *
+ ****************************************************************************/
+
+static struct stm32_ep_s *stm32_ep_findbyaddr(struct stm32_usbdev_s *priv,
+                                              uint16_t eplog)
+{
+  struct stm32_ep_s *privep;
+  uint8_t epphy = USB_EPNO(eplog);
+
+  if (epphy >= STM32_NENDPOINTS)
+    {
+      return NULL;
+    }
+
+  /* Is this an IN or an OUT endpoint? */
+
+  if (USB_ISEPIN(eplog))
+    {
+      privep = &priv->epin[epphy];
+    }
+  else
+    {
+      privep = &priv->epout[epphy];
+    }
+
+  /* Return endpoint reference */
+
+  DEBUGASSERT(privep->epphy == epphy);
+  return privep;
+}
+
+/****************************************************************************
+ * Name: stm32_req_dispatch
+ *
+ * Description:
+ *   Provide unhandled setup actions to the class driver. This is logically part
+ *   of the USB interrupt handler.
+ *
+ ****************************************************************************/
+
+static int stm32_req_dispatch(struct stm32_usbdev_s *priv,
+                              const struct usb_ctrlreq_s *ctrl)
+{
+  int ret = -EIO;
+
+  usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_DISPATCH), 0);
+  if (priv->driver)
+    {
+      /* Forward to the control request to the class driver implementation */
+
+      ret = CLASS_SETUP(priv->driver, &priv->usbdev, ctrl,
+                        priv->ep0data, priv->ep0datlen);
+    }
+
+  if (ret < 0)
+    {
+      /* Stall on failure */
+
+      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_DISPATCHSTALL), 0);
+      priv->stalled = true;
+    }
+
+  return ret;
+}
+
+/****************************************************************************
+ * Name: stm32_usbreset
+ *
+ * Description:
+ *   Reset Usb engine
+ *
+ ****************************************************************************/
+
+static void stm32_usbreset(struct stm32_usbdev_s *priv)
+{
+  FAR struct stm32_ep_s *privep;
+  uint32_t regval;
+  int i;
+
+  /* Clear the Remote Wake-up Signaling */
+
+  regval = stm32_getreg(STM32_OTG_DCTL);
+  regval &= ~OTG_DCTL_RWUSIG;
+  stm32_putreg(regval, STM32_OTG_DCTL);
+
+  /* Flush the EP0 Tx FIFO */
+
+  stm32_txfifo_flush(OTG_GRSTCTL_TXFNUM_D(EP0));
+
+  /* Tell the class driver that we are disconnected. The class
+   * driver should then accept any new configurations.
+   */
+
+  if (priv->driver)
+    {
+      CLASS_DISCONNECT(priv->driver, &priv->usbdev);
+    }
+
+  /* Mark all endpoints as available */
+
+  priv->epavail[0] = STM32_EP_AVAILABLE;
+  priv->epavail[1] = STM32_EP_AVAILABLE;
+
+  /* Disable all end point interrupts */
+
+  for (i = 0; i < STM32_NENDPOINTS ; i++)
+    {
+      /* Disable endpoint interrupts */
+
+      stm32_putreg(0xff, STM32_OTG_DIEPINT(i));
+      stm32_putreg(0xff, STM32_OTG_DOEPINT(i));
+
+      /* Return write requests to the class implementation */
+
+      privep = &priv->epin[i];
+      stm32_req_cancel(privep, -ESHUTDOWN);
+
+      /* Reset IN endpoint status */
+
+      privep->stalled = false;
+
+      /* Return read requests to the class implementation */
+
+      privep = &priv->epout[i];
+      stm32_req_cancel(privep, -ESHUTDOWN);
+
+      /* Reset endpoint status */
+
+      privep->stalled = false;
+    }
+
+  stm32_putreg(0xffffffff, STM32_OTG_DAINT);
+
+  /* Mask all device endpoint interrupts except EP0 */
+
+  regval = (OTG_DAINT_IEP(EP0) | OTG_DAINT_OEP(EP0));
+  stm32_putreg(regval, STM32_OTG_DAINTMSK);
+
+  /* Unmask OUT interrupts */
+
+  regval = (OTG_DOEPMSK_XFRCM | OTG_DOEPMSK_STUPM | OTG_DOEPMSK_EPDM);
+  stm32_putreg(regval, STM32_OTG_DOEPMSK);
+
+  /* Unmask IN interrupts */
+
+  regval = (OTG_DIEPMSK_XFRCM | OTG_DIEPMSK_EPDM | OTG_DIEPMSK_TOM);
+  stm32_putreg(regval, STM32_OTG_DIEPMSK);
+
+  /* Reset device address to 0 */
+
+  stm32_setaddress(priv, 0);
+  priv->devstate = DEVSTATE_DEFAULT;
+  priv->usbdev.speed = USB_SPEED_FULL;
+
+  /* Re-configure EP0 */
+
+  stm32_ep0_configure(priv);
+
+  /* Setup EP0 to receive SETUP packets */
+
+  stm32_ep0out_ctrlsetup(priv);
+}
+
+/****************************************************************************
+ * Name: stm32_ep0out_testmode
+ *
+ * Description:
+ *   Select test mode
+ *
+ ****************************************************************************/
+
+static inline void stm32_ep0out_testmode(FAR struct stm32_usbdev_s *priv,
+                                         uint16_t index)
+{
+  uint8_t testmode;
+
+  testmode = index >> 8;
+  switch (testmode)
+    {
+    case 1:
+      priv->testmode = OTG_TESTMODE_J;
+      break;
+
+    case 2:
+      priv->testmode = OTG_TESTMODE_K;
+      break;
+
+    case 3:
+      priv->testmode = OTG_TESTMODE_SE0_NAK;
+      break;
+
+    case 4:
+      priv->testmode = OTG_TESTMODE_PACKET;
+      break;
+
+    case 5:
+      priv->testmode = OTG_TESTMODE_FORCE;
+      break;
+
+    default:
+      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADTESTMODE), testmode);
+      priv->dotest   = false;
+      priv->testmode = OTG_TESTMODE_DISABLED;
+      priv->stalled  = true;
+    }
+
+  priv->dotest = true;
+  stm32_ep0in_transmitzlp(priv);
+}
+
+/****************************************************************************
+ * Name: stm32_ep0out_stdrequest
+ *
+ * Description:
+ *   Handle a stanard request on EP0.  Pick off the things of interest to the
+ *   USB device controller driver; pass what is left to the class driver.
+ *
+ ****************************************************************************/
+
+static inline void stm32_ep0out_stdrequest(struct stm32_usbdev_s *priv,
+                                           FAR struct stm32_ctrlreq_s *ctrlreq)
+{
+  FAR struct stm32_ep_s *privep;
+
+  /* Handle standard request */
+
+  switch (ctrlreq->req)
+    {
+    case USB_REQ_GETSTATUS:
+      {
+        /* type:  device-to-host; recipient = device, interface, endpoint
+         * value: 0
+         * index: zero interface endpoint
+         * len:   2; data = status
+         */
+
+        usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_GETSTATUS), 0);
+        if (!priv->addressed ||
+             ctrlreq->len != 2 ||
+            USB_REQ_ISOUT(ctrlreq->type) ||
+            ctrlreq->value != 0)
+          {
+            priv->stalled = true;
+          }
+        else
+          {
+            switch (ctrlreq->type & USB_REQ_RECIPIENT_MASK)
+              {
+              case USB_REQ_RECIPIENT_ENDPOINT:
+                {
+                  usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPGETSTATUS), 0);
+                  privep = stm32_ep_findbyaddr(priv, ctrlreq->index);
+                  if (!privep)
+                    {
+                      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADEPGETSTATUS), 0);
+                      priv->stalled = true;
+                    }
+                  else
+                    {
+                      if (privep->stalled)
+                        {
+                          priv->ep0data[0] = (1 << USB_FEATURE_ENDPOINTHALT);
+                        }
+                      else
+                        {
+                          priv->ep0data[0] = 0; /* Not stalled */
+                        }
+
+                      priv->ep0data[1] = 0;
+                      stm32_ep0in_setupresponse(priv, priv->ep0data, 2);
+                    }
+                }
+                break;
+
+              case USB_REQ_RECIPIENT_DEVICE:
+                {
+                  if (ctrlreq->index == 0)
+                    {
+                      usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_DEVGETSTATUS), 0);
+
+                      /* Features:  Remote Wakeup and self-powered */
+
+                      priv->ep0data[0]  = (priv->selfpowered << USB_FEATURE_SELFPOWERED);
+                      priv->ep0data[0] |= (priv->wakeup      << USB_FEATURE_REMOTEWAKEUP);
+                      priv->ep0data[1]  = 0;
+
+                      stm32_ep0in_setupresponse(priv, priv->ep0data, 2);
+                    }
+                  else
+                    {
+                      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADDEVGETSTATUS), 0);
+                      priv->stalled = true;
+                    }
+                }
+                break;
+
+              case USB_REQ_RECIPIENT_INTERFACE:
+                {
+                  usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_IFGETSTATUS), 0);
+                  priv->ep0data[0] = 0;
+                  priv->ep0data[1] = 0;
+
+                  stm32_ep0in_setupresponse(priv, priv->ep0data, 2);
+                }
+                break;
+
+              default:
+                {
+                  usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADGETSTATUS), 0);
+                  priv->stalled = true;
+                }
+                break;
+              }
+          }
+      }
+      break;
+
+    case USB_REQ_CLEARFEATURE:
+      {
+        /* type:  host-to-device; recipient = device, interface or endpoint
+         * value: feature selector
+         * index: zero interface endpoint;
+         * len:   zero, data = none
+         */
+
+        usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_CLEARFEATURE), 0);
+        if (priv->addressed != 0 && ctrlreq->len == 0)
+          {
+            uint8_t recipient = ctrlreq->type & USB_REQ_RECIPIENT_MASK;
+            if (recipient == USB_REQ_RECIPIENT_ENDPOINT &&
+                ctrlreq->value == USB_FEATURE_ENDPOINTHALT &&
+                (privep = stm32_ep_findbyaddr(priv, ctrlreq->index)) != NULL)
+              {
+                stm32_ep_clrstall(privep);
+                stm32_ep0in_transmitzlp(priv);
+              }
+            else if (recipient == USB_REQ_RECIPIENT_DEVICE &&
+                     ctrlreq->value == USB_FEATURE_REMOTEWAKEUP)
+              {
+                priv->wakeup = 0;
+                stm32_ep0in_transmitzlp(priv);
+              }
+            else
+              {
+                /* Actually, I think we could just stall here. */
+
+                (void)stm32_req_dispatch(priv, &priv->ctrlreq);
+              }
+          }
+        else
+          {
+            usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADCLEARFEATURE), 0);
+            priv->stalled = true;
+          }
+      }
+      break;
+
+    case USB_REQ_SETFEATURE:
+      {
+        /* type:  host-to-device; recipient = device, interface, endpoint
+         * value: feature selector
+         * index: zero interface endpoint;
+         * len:   0; data = none
+         */
+
+        usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_SETFEATURE), 0);
+        if (priv->addressed != 0 && ctrlreq->len == 0)
+          {
+            uint8_t recipient = ctrlreq->type & USB_REQ_RECIPIENT_MASK;
+            if (recipient == USB_REQ_RECIPIENT_ENDPOINT &&
+                ctrlreq->value == USB_FEATURE_ENDPOINTHALT &&
+                (privep = stm32_ep_findbyaddr(priv, ctrlreq->index)) != NULL)
+              {
+                stm32_ep_setstall(privep);
+                stm32_ep0in_transmitzlp(priv);
+              }
+            else if (recipient == USB_REQ_RECIPIENT_DEVICE &&
+                     ctrlreq->value == USB_FEATURE_REMOTEWAKEUP)
+              {
+                priv->wakeup = 1;
+                stm32_ep0in_transmitzlp(priv);
+              }
+            else if (recipient == USB_REQ_RECIPIENT_DEVICE &&
+                     ctrlreq->value == USB_FEATURE_TESTMODE &&
+                     ((ctrlreq->index & 0xff) == 0))
+              {
+                 stm32_ep0out_testmode(priv, ctrlreq->index);
+              }
+            else if (priv->configured)
+              {
+                /* Actually, I think we could just stall here. */
+
+                (void)stm32_req_dispatch(priv, &priv->ctrlreq);
+              }
+            else
+              {
+                usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADSETFEATURE), 0);
+                priv->stalled = true;
+              }
+          }
+        else
+          {
+            usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADSETFEATURE), 0);
+            priv->stalled = true;
+          }
+      }
+      break;
+
+    case USB_REQ_SETADDRESS:
+      {
+        /* type:  host-to-device; recipient = device
+         * value: device address
+         * index: 0
+         * len:   0; data = none
+         */
+
+        usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_SETADDRESS), ctrlreq->value);
+        if ((ctrlreq->type & USB_REQ_RECIPIENT_MASK) == USB_REQ_RECIPIENT_DEVICE &&
+            ctrlreq->index  == 0 &&
+            ctrlreq->len == 0 &&
+            ctrlreq->value < 128 &&
+            priv->devstate != DEVSTATE_CONFIGURED)
+          {
+            /* Save the address.  We cannot actually change to the next address until
+             * the completion of the status phase.
+             */
+
+            stm32_setaddress(priv, (uint16_t)priv->ctrlreq.value[0]);
+            stm32_ep0in_transmitzlp(priv);
+          }
+        else
+          {
+            usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADSETADDRESS), 0);
+            priv->stalled = true;
+          }
+      }
+      break;
+
+    case USB_REQ_GETDESCRIPTOR:
+      /* type:  device-to-host; recipient = device
+       * value: descriptor type and index
+       * index: 0 or language ID;
+       * len:   descriptor len; data = descriptor
+       */
+
+    case USB_REQ_SETDESCRIPTOR:
+      /* type:  host-to-device; recipient = device
+       * value: descriptor type and index
+       * index: 0 or language ID;
+       * len:   descriptor len; data = descriptor
+       */
+
+      {
+        usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_GETSETDESC), 0);
+        if ((ctrlreq->type & USB_REQ_RECIPIENT_MASK) == USB_REQ_RECIPIENT_DEVICE)
+          {
+            (void)stm32_req_dispatch(priv, &priv->ctrlreq);
+          }
+        else
+          {
+            usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADGETSETDESC), 0);
+            priv->stalled = true;
+          }
+      }
+      break;
+
+    case USB_REQ_GETCONFIGURATION:
+      /* type:  device-to-host; recipient = device
+       * value: 0;
+       * index: 0;
+       * len:   1; data = configuration value
+       */
+
+      {
+        usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_GETCONFIG), 0);
+        if (priv->addressed &&
+           (ctrlreq->type & USB_REQ_RECIPIENT_MASK) == USB_REQ_RECIPIENT_DEVICE &&
+            ctrlreq->value == 0 &&
+            ctrlreq->index == 0 &&
+            ctrlreq->len == 1)
+          {
+            (void)stm32_req_dispatch(priv, &priv->ctrlreq);
+          }
+        else
+          {
+            usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADGETCONFIG), 0);
+            priv->stalled = true;
+          }
+      }
+      break;
+
+    case USB_REQ_SETCONFIGURATION:
+      /* type:  host-to-device; recipient = device
+       * value: configuration value
+       * index: 0;
+       * len:   0; data = none
+       */
+
+      {
+        usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_SETCONFIG), 0);
+        if (priv->addressed &&
+            (ctrlreq->type & USB_REQ_RECIPIENT_MASK) == USB_REQ_RECIPIENT_DEVICE &&
+            ctrlreq->index == 0 &&
+            ctrlreq->len == 0)
+          {
+            /* Give the configuration to the class driver */
+
+            int ret = stm32_req_dispatch(priv, &priv->ctrlreq);
+
+            /* If the class driver accepted the configuration, then mark the
+             * device state as configured (or not, depending on the
+             * configuration).
+             */
+
+            if (ret == OK)
+              {
+                uint8_t cfg = (uint8_t)ctrlreq->value;
+                if (cfg != 0)
+                  {
+                    priv->devstate   = DEVSTATE_CONFIGURED;
+                    priv->configured = true;
+                  }
+                else
+                  {
+                    priv->devstate   = DEVSTATE_ADDRESSED;
+                    priv->configured = false;
+                  }
+              }
+          }
+        else
+          {
+            usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADSETCONFIG), 0);
+            priv->stalled = true;
+          }
+      }
+      break;
+
+    case USB_REQ_GETINTERFACE:
+      /* type:  device-to-host; recipient = interface
+       * value: 0
+       * index: interface;
+       * len:   1; data = alt interface
+       */
+
+    case USB_REQ_SETINTERFACE:
+      /* type:  host-to-device; recipient = interface
+       * value: alternate setting
+       * index: interface;
+       * len:   0; data = none
+       */
+
+      {
+        usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_GETSETIF), 0);
+        (void)stm32_req_dispatch(priv, &priv->ctrlreq);
+      }
+      break;
+
+    case USB_REQ_SYNCHFRAME:
+      /* type:  device-to-host; recipient = endpoint
+       * value: 0
+       * index: endpoint;
+       * len:   2; data = frame number
+       */
+
+      {
+        usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_SYNCHFRAME), 0);
+      }
+      break;
+
+    default:
+      {
+        usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDCTRLREQ), 0);
+        priv->stalled = true;
+      }
+      break;
+    }
+}
+
+/****************************************************************************
+ * Name: stm32_ep0out_setup
+ *
+ * Description:
+ *   USB Ctrl EP Setup Event. This is logically part of the USB interrupt
+ *   handler.  This event occurs when a setup packet is receive on EP0 OUT.
+ *
+ ****************************************************************************/
+
+static inline void stm32_ep0out_setup(struct stm32_usbdev_s *priv)
+{
+  struct stm32_ctrlreq_s ctrlreq;
+
+  /* Verify that a SETUP was received */
+
+  if (priv->ep0state != EP0STATE_SETUP_READY)
+    {
+      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_EP0NOSETUP), priv->ep0state);
+      return;
+    }
+
+  /* Terminate any pending requests */
+
+  stm32_req_cancel(&priv->epout[EP0], -EPROTO);
+  stm32_req_cancel(&priv->epin[EP0],  -EPROTO);
+
+  /* Assume NOT stalled */
+
+  priv->epout[EP0].stalled = false;
+  priv->epin[EP0].stalled = false;
+  priv->stalled = false;
+
+  /* Starting to process a control request - update state */
+
+  priv->ep0state = EP0STATE_SETUP_PROCESS;
+
+  /* And extract the little-endian 16-bit values to host order */
+
+  ctrlreq.type  = priv->ctrlreq.type;
+  ctrlreq.req   = priv->ctrlreq.req;
+  ctrlreq.value = GETUINT16(priv->ctrlreq.value);
+  ctrlreq.index = GETUINT16(priv->ctrlreq.index);
+  ctrlreq.len   = GETUINT16(priv->ctrlreq.len);
+
+  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 */
+
+  if ((ctrlreq.type & USB_REQ_TYPE_MASK) != USB_REQ_TYPE_STANDARD)
+    {
+      /* Dispatch any non-standard requests */
+
+      (void)stm32_req_dispatch(priv, &priv->ctrlreq);
+    }
+  else
+    {
+      /* Handle standard requests. */
+
+      stm32_ep0out_stdrequest(priv, &ctrlreq);
+    }
+
+  /* Check if the setup processing resulted in a STALL */
+
+  if (priv->stalled)
+    {
+      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_EP0SETUPSTALLED), priv->ep0state);
+      stm32_ep0_stall(priv);
+    }
+
+  /* Reset state/data associated with thie SETUP request */
+
+   priv->ep0datlen = 0;
+}
+
+/****************************************************************************
+ * Name: stm32_epout
+ *
+ * Description:
+ *   This is part of the OUT endpoint interrupt processing.  This function
+ *   handles the OUT event for a single endpoint.
+ *
+ ****************************************************************************/
+
+static inline void stm32_epout(FAR struct stm32_usbdev_s *priv, uint8_t epno)
+{
+  FAR struct stm32_ep_s *privep;
+
+  /* Endpoint 0 is a special case. */
+
+  if (epno == 0)
+    {
+      privep = &priv->epout[EP0];
+
+      /* In the EP0STATE_DATA_OUT state, we are receiving data into the
+       * request buffer.  In that case, we must continue the request
+       * processing.
+       */
+
+      if (priv->ep0state == EP0STATE_DATA_OUT)
+        {
+          /* Continue processing data from the EP0 OUT request queue */
+
+          stm32_epout_complete(priv, privep);
+
+          /* If we are not actively processing an OUT request, then we
+           * need to setup to receive the next control request.
+           */
+
+          if (!privep->active)
+            {
+              stm32_ep0out_ctrlsetup(priv);
+              priv->ep0state = EP0STATE_IDLE;
+            }
+        }
+    }
+
+  /* For other endpoints, the only possibility is that we are continuing
+   * or finishing an OUT request.
+   */
+
+  else if (priv->devstate == DEVSTATE_CONFIGURED)
+    {
+      stm32_epout_complete(priv, &priv->epout[epno]);
+    }
+}
+
+/****************************************************************************
+ * Name: stm32_epout_interrupt
+ *
+ * Description:
+ *   USB OUT endpoint interrupt handler.  The core generates this interrupt when
+ *   there is an interrupt is pending on one of the OUT endpoints of the core.
+ *   The driver must read the OTG DAINT register to determine the exact number
+ *   of the OUT endpoint on which the interrupt occurred, and then read the
+ *   corresponding OTG DOEPINTx register to determine the exact cause of the
+ *   interrupt.
+ *
+ ****************************************************************************/
+
+static inline void stm32_epout_interrupt(FAR struct stm32_usbdev_s *priv)
+{
+  uint32_t daint;
+  uint32_t regval;
+  uint32_t doepint;
+  int epno;
+
+  /* Get the pending, enabled interrupts for the OUT endpoint from the endpoint
+   * interrupt status register.
+   */
+
+  regval  = stm32_getreg(STM32_OTG_DAINT);
+  regval &= stm32_getreg(STM32_OTG_DAINTMSK);
+  daint   = (regval & OTG_DAINT_OEP_MASK) >> OTG_DAINT_OEP_SHIFT;
+
+  if (daint == 0)
+    {
+      /* We got an interrupt, but there is no unmasked endpoint that caused
+       * it ?!  When this happens, the interrupt flag never gets cleared and
+       * we are stuck in infinite interrupt loop.
+       *
+       * This shouldn't happen if we are diligent about handling timing
+       * issues when masking endpoint interrupts. However, this workaround
+       * avoids infinite loop and allows operation to continue normally.  It
+       * works by clearing each endpoint flags, masked or not.
+       */
+
+      regval  = stm32_getreg(STM32_OTG_DAINT);
+      daint   = (regval & OTG_DAINT_OEP_MASK) >> OTG_DAINT_OEP_SHIFT;
+
+      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_EPOUTUNEXPECTED),
+               (uint16_t)regval);
+
+      epno = 0;
+      while (daint)
+        {
+          if ((daint & 1) != 0)
+            {
+              regval = stm32_getreg(STM32_OTG_DOEPINT(epno));
+              ullerr("DOEPINT(%d) = %08x\n", epno, regval);
+              stm32_putreg(0xFF, STM32_OTG_DOEPINT(epno));
+            }
+
+          epno++;
+          daint >>= 1;
+        }
+
+      return;
+    }
+
+  /* Process each pending IN endpoint interrupt */
+
+  epno = 0;
+  while (daint)
+    {
+      /* Is an OUT interrupt pending for this endpoint? */
+
+      if ((daint & 1) != 0)
+        {
+          /* Yes.. get the OUT endpoint interrupt status */
+
+          doepint  = stm32_getreg(STM32_OTG_DOEPINT(epno));
+          doepint &= stm32_getreg(STM32_OTG_DOEPMSK);
+
+          /* Transfer completed interrupt.  This interrupt is trigged when
+           * stm32_rxinterrupt() removes the last packet data from the RxFIFO.
+           * In this case, core internally sets the NAK bit for this endpoint to
+           * prevent it from receiving any more packets.
+           */
+
+          if ((doepint & OTG_DOEPINT_XFRC) != 0)
+            {
+              usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPOUT_XFRC), (uint16_t)doepint);
+
+              /* Clear the bit in DOEPINTn for this interrupt */
+
+              stm32_putreg(OTG_DOEPINT_XFRC, STM32_OTG_DOEPINT(epno));
+
+              /* Handle the RX transfer data ready event */
+
+              stm32_epout(priv, epno);
+            }
+
+          /* Endpoint disabled interrupt (ignored because this interrupt is
+           * used in polled mode by the endpoint disable logic).
+           */
+#if 1
+          /* REVISIT: */
+          if ((doepint & OTG_DOEPINT_EPDISD) != 0)
+            {
+              usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPOUT_EPDISD), (uint16_t)doepint);
+
+              /* Clear the bit in DOEPINTn for this interrupt */
+
+              stm32_putreg(OTG_DOEPINT_EPDISD, STM32_OTG_DOEPINT(epno));
+            }
+#endif
+          /* Setup Phase Done (control EPs) */
+
+          if ((doepint & OTG_DOEPINT_SETUP) != 0)
+            {
+              usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPOUT_SETUP), priv->ep0state);
+
+              /* Handle the receipt of the IN SETUP packets now (OUT setup
+               * packet processing may be delayed until the accompanying
+               * OUT DATA is received)
+               */
+
+              if (priv->ep0state == EP0STATE_SETUP_READY)
+                {
+                  stm32_ep0out_setup(priv);
+                }
+              stm32_putreg(OTG_DOEPINT_SETUP, STM32_OTG_DOEPINT(epno));
+            }
+        }
+
+      epno++;
+      daint >>= 1;
+    }
+}
+
+/****************************************************************************
+ * Name: stm32_epin_runtestmode
+ *
+ * Description:
+ *   Execute the test mode setup by the SET FEATURE request
+ *
+ ****************************************************************************/
+
+static inline void stm32_epin_runtestmode(FAR struct stm32_usbdev_s *priv)
+{
+  uint32_t regval = stm32_getreg(STM32_OTG_DCTL);
+  regval &= OTG_DCTL_TCTL_MASK;
+  regval |= (uint32_t)priv->testmode << OTG_DCTL_TCTL_SHIFT;
+  stm32_putreg(regval , STM32_OTG_DCTL);
+
+  priv->dotest = 0;
+  priv->testmode = OTG_TESTMODE_DISABLED;
+}
+
+/****************************************************************************
+ * Name: stm32_epin
+ *
+ * Description:
+ *   This is part of the IN endpoint interrupt processing.  This function
+ *   handles the IN event for a single endpoint.
+ *
+ ****************************************************************************/
+
+static inline void stm32_epin(FAR struct stm32_usbdev_s *priv, uint8_t epno)
+{
+  FAR struct stm32_ep_s *privep = &priv->epin[epno];
+
+  /* Endpoint 0 is a special case. */
+
+  if (epno == 0)
+    {
+      /* In the EP0STATE_DATA_IN state, we are sending data from request
+       * buffer.  In that case, we must continue the request processing.
+       */
+
+      if (priv->ep0state == EP0STATE_DATA_IN)
+        {
+          /* Continue processing data from the EP0 OUT request queue */
+
+          stm32_epin_request(priv, privep);
+
+          /* If we are not actively processing an OUT request, then we
+           * need to setup to receive the next control request.
+           */
+
+          if (!privep->active)
+            {
+              stm32_ep0out_ctrlsetup(priv);
+              priv->ep0state = EP0STATE_IDLE;
+            }
+        }
+
+      /* Test mode is another special case */
+
+      if (priv->dotest)
+        {
+          stm32_epin_runtestmode(priv);
+        }
+    }
+
+  /* For other endpoints, the only possibility is that we are continuing
+   * or finishing an IN request.
+   */
+
+  else if (priv->devstate == DEVSTATE_CONFIGURED)
+    {
+      /* Continue processing data from the endpoint write request queue */
+
+      stm32_epin_request(priv, privep);
+    }
+}
+
+/****************************************************************************
+ * Name: stm32_epin_txfifoempty
+ *
+ * Description:
+ *   TxFIFO empty interrupt handling
+ *
+ ****************************************************************************/
+
+static inline void stm32_epin_txfifoempty(FAR struct stm32_usbdev_s *priv, int epno)
+{
+  FAR struct stm32_ep_s *privep = &priv->epin[epno];
+
+  /* Continue processing the write request queue.  This may mean sending
+   * more data from the existing request or terminating the current requests
+   * and (perhaps) starting the IN transfer from the next write request.
+   */
+
+  stm32_epin_request(priv, privep);
+}
+
+/****************************************************************************
+ * Name: stm32_epin_interrupt
+ *
+ * Description:
+ *   USB IN endpoint interrupt handler.  The core generates this interrupt when
+ *   an interrupt is pending on one of the IN endpoints of the core. The driver
+ *   must read the OTG DAINT register to determine the exact number of the IN
+ *   endpoint on which the interrupt occurred, and then read the corresponding
+ *   OTG DIEPINTx register to determine the exact cause of the interrupt.
+ *
+ ****************************************************************************/
+
+static inline void stm32_epin_interrupt(FAR struct stm32_usbdev_s *priv)
+{
+  uint32_t diepint;
+  uint32_t daint;
+  uint32_t mask;
+  uint32_t empty;
+  int epno;
+
+  /* Get the pending, enabled interrupts for the IN endpoint from the endpoint
+   * interrupt status register.
+   */
+
+  daint  = stm32_getreg(STM32_OTG_DAINT);
+  daint &= stm32_getreg(STM32_OTG_DAINTMSK);
+  daint &= OTG_DAINT_IEP_MASK;
+
+  if (daint == 0)
+    {
+      /* We got an interrupt, but there is no unmasked endpoint that caused
+       * it ?!  When this happens, the interrupt flag never gets cleared and
+       * we are stuck in infinite interrupt loop.
+       *
+       * This shouldn't happen if we are diligent about handling timing
+       * issues when masking endpoint interrupts. However, this workaround
+       * avoids infinite loop and allows operation to continue normally.  It
+       * works by clearing each endpoint flags, masked or not.
+       */
+
+      daint  = stm32_getreg(STM32_OTG_DAINT);
+      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_EPINUNEXPECTED),
+               (uint16_t)daint);
+
+      daint &= OTG_DAINT_IEP_MASK;
+      epno = 0;
+
+      while (daint)
+        {
+          if ((daint & 1) != 0)
+            {
+              ullerr("DIEPINT(%d) = %08x\n",
+                     epno, stm32_getreg(STM32_OTG_DIEPINT(epno)));
+              stm32_putreg(0xFF, STM32_OTG_DIEPINT(epno));
+            }
+
+          epno++;
+          daint >>= 1;
+        }
+
+      return;
+    }
+
+  /* Process each pending IN endpoint interrupt */
+
+  epno = 0;
+  while (daint)
+    {
+      /* Is an IN interrupt pending for this endpoint? */
+
+      if ((daint & 1) != 0)
+        {
+          /* Get IN interrupt mask register.  Bits 0-6 correspond to enabled
+           * interrupts as will be found in the DIEPINT interrupt status
+           * register.
+           */
+
+          mask = stm32_getreg(STM32_OTG_DIEPMSK);
+
+          /* Check if the TxFIFO not empty interrupt is enabled for this
+           * endpoint in the DIEPMSK register.  Bits n corresponds to
+           * endpoint n in the register. That condition corresponds to
+           * bit 7 of the DIEPINT interrupt status register.  There is
+           * no TXFE bit in the mask register, so we fake one here.
+           */
+
+          empty = stm32_getreg(STM32_OTG_DIEPEMPMSK);
+          if ((empty & OTG_DIEPEMPMSK(epno)) != 0)
+            {
+              mask |= OTG_DIEPINT_TXFE;
+            }
+
+          /* Now, read the interrupt status and mask out all disabled
+           * interrupts.
+           */
+
+          diepint = stm32_getreg(STM32_OTG_DIEPINT(epno)) & mask;
+
+          /* Decode and process the enabled, pending interrupts */
+          /* Transfer completed interrupt */
+
+          if ((diepint & OTG_DIEPINT_XFRC) != 0)
+            {
+              usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPIN_XFRC),
+                       (uint16_t)diepint);
+
+              /* It is possible that logic may be waiting for a the
+               * TxFIFO to become empty.  We disable the TxFIFO empty
+               * interrupt here; it will be re-enabled if there is still
+               * insufficient space in the TxFIFO.
+               */
+
+              empty &= ~OTG_DIEPEMPMSK(epno);
+              stm32_putreg(empty, STM32_OTG_DIEPEMPMSK);
+              stm32_putreg(OTG_DIEPINT_XFRC, STM32_OTG_DIEPINT(epno));
+
+              /* IN transfer complete */
+
+              stm32_epin(priv, epno);
+            }
+
+          /* Timeout condition */
+
+          if ((diepint & OTG_DIEPINT_TOC) != 0)
+            {
+              usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPIN_TOC), (uint16_t)diepint);
+              stm32_putreg(OTG_DIEPINT_TOC, STM32_OTG_DIEPINT(epno));
+            }
+
+          /* IN token received when TxFIFO is empty.  Applies to non-periodic IN
+           * endpoints only.  This interrupt indicates that an IN token was received
+           * when the associated TxFIFO (periodic/non-periodic) was empty. This
+           * interrupt is asserted on the endpoint for which the IN token was
+           * received.
+           */
+
+          if ((diepint & OTG_DIEPINT_ITTXFE) != 0)
+            {
+              usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPIN_ITTXFE), (uint16_t)diepint);
+              stm32_epin_request(priv, &priv->epin[epno]);
+              stm32_putreg(OTG_DIEPINT_ITTXFE, STM32_OTG_DIEPINT(epno));
+            }
+
+          /* IN endpoint NAK effective (ignored as this used only in polled
+           * mode)
+           */
+#if 0
+          if ((diepint & OTG_DIEPINT_INEPNE) != 0)
+            {
+              usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPIN_INEPNE), (uint16_t)diepint);
+              stm32_putreg(OTG_DIEPINT_INEPNE, STM32_OTG_DIEPINT(epno));
+            }
+#endif
+          /* Endpoint disabled interrupt (ignored as this used only in polled
+           * mode)
+           */
+#if 0
+          if ((diepint & OTG_DIEPINT_EPDISD) != 0)
+            {
+              usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPIN_EPDISD), (uint16_t)diepint);
+              stm32_putreg(OTG_DIEPINT_EPDISD, STM32_OTG_DIEPINT(epno));
+            }
+#endif
+          /* Transmit FIFO empty */
+
+          if ((diepint & OTG_DIEPINT_TXFE) != 0)
+            {
+              usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPIN_TXFE), (uint16_t)diepint);
+
+              /* If we were waiting for TxFIFO to become empty, the we might have both
+               * XFRC and TXFE interrupts pending.  Since we do the same thing for both
+               * cases, ignore the TXFE if we have already processed the XFRC.
+               */
+
+              if ((diepint & OTG_DIEPINT_XFRC) == 0)
+                {
+                  /* Mask further FIFO empty interrupts.  This will be re-enabled
+                   * whenever we need to wait for a FIFO event.
+                   */
+
+                  empty &= ~OTG_DIEPEMPMSK(epno);
+                  stm32_putreg(empty, STM32_OTG_DIEPEMPMSK);
+
+                  /* Handle TxFIFO empty */
+
+                  stm32_epin_txfifoempty(priv, epno);
+                }
+
+              /* Clear the pending TxFIFO empty interrupt */
+
+              stm32_putreg(OTG_DIEPINT_TXFE, STM32_OTG_DIEPINT(epno));
+            }
+        }
+
+      epno++;
+      daint >>= 1;
+    }
+}
+
+/****************************************************************************
+ * Name: stm32_resumeinterrupt
+ *
+ * Description:
+ *   Resume/remote wakeup detected interrupt
+ *
+ ****************************************************************************/
+
+static inline void stm32_resumeinterrupt(FAR struct stm32_usbdev_s *priv)
+{
+  uint32_t regval;
+
+  /* Restart the PHY clock and un-gate USB core clock (HCLK) */
+
+#ifdef CONFIG_USBDEV_LOWPOWER
+  regval = stm32_getreg(STM32_OTG_PCGCCTL);
+  regval &= ~(OTG_PCGCCTL_STPPCLK | OTG_PCGCCTL_GATEHCLK);
+  stm32_putreg(regval, STM32_OTG_PCGCCTL);
+#endif
+
+  /* Clear remote wake-up signaling */
+
+  regval  = stm32_getreg(STM32_OTG_DCTL);
+  regval &= ~OTG_DCTL_RWUSIG;
+  stm32_putreg(regval, STM32_OTG_DCTL);
+
+  /* Restore full power -- whatever that means for this particular board */
+
+  stm32_usbsuspend((struct usbdev_s *)priv, true);
+
+  /* Notify the class driver of the resume event */
+
+  if (priv->driver)
+    {
+      CLASS_RESUME(priv->driver, &priv->usbdev);
+    }
+}
+
+/****************************************************************************
+ * Name: stm32_suspendinterrupt
+ *
+ * Description:
+ *   USB suspend interrupt
+ *
+ ****************************************************************************/
+
+static inline void stm32_suspendinterrupt(FAR struct stm32_usbdev_s *priv)
+{
+#ifdef CONFIG_USBDEV_LOWPOWER
+  uint32_t regval;
+#endif
+
+  /* Notify the class driver of the suspend event */
+
+  if (priv->driver)
+    {
+      CLASS_SUSPEND(priv->driver, &priv->usbdev);
+    }
+
+#ifdef CONFIG_USBDEV_LOWPOWER
+  /* OTG_DSTS_SUSPSTS is set as long as the suspend condition is detected
+   * on USB.  Check if we are still have the suspend condition, that we are
+   * connected to the host, and that we have been configured.
+   */
+
+  regval = stm32_getreg(STM32_OTG_DSTS);
+
+  if ((regval & OTG_DSTS_SUSPSTS) != 0 && devstate == DEVSTATE_CONFIGURED)
+    {
+      /* Switch off OTG clocking.  Setting OTG_PCGCCTL_STPPCLK stops the
+       * PHY clock.
+       */
+
+      regval = stm32_getreg(STM32_OTG_PCGCCTL);
+      regval |= OTG_PCGCCTL_STPPCLK;
+      stm32_putreg(regval, STM32_OTG_PCGCCTL);
+
+      /* Setting OTG_PCGCCTL_GATEHCLK gate HCLK to modules other than
+       * the AHB Slave and Master and wakeup logic.
+       */
+
+      regval |= OTG_PCGCCTL_GATEHCLK;
+      stm32_putreg(regval, STM32_OTG_PCGCCTL);
+    }
+#endif
+
+  /* Let the board-specific logic know that we have entered the suspend
+   * state
+   */
+
+  stm32_usbsuspend((FAR struct usbdev_s *)priv, false);
+}
+
+/****************************************************************************
+ * Name: stm32_rxinterrupt
+ *
+ * Description:
+ *   RxFIFO non-empty interrupt.  This interrupt indicates that there is at
+ *   least one packet pending to be read from the RxFIFO.
+ *
+ ****************************************************************************/
+
+static inline void stm32_rxinterrupt(FAR struct stm32_usbdev_s *priv)
+{
+  FAR struct stm32_ep_s *privep;
+  uint32_t regval;
+  int bcnt;
+  int epphy;
+
+  /* Disable the Rx status queue level interrupt */
+
+  regval = stm32_getreg(STM32_OTG_GINTMSK);
+  regval &= ~OTG_GINT_RXFLVL;
+  stm32_putreg(regval, STM32_OTG_GINTMSK);
+
+  /* Get the status from the top of the FIFO */
+
+  regval = stm32_getreg(STM32_OTG_GRXSTSP);
+
+  /* Decode status fields */
+
+  epphy  = (regval & OTG_GRXSTSD_EPNUM_MASK) >> OTG_GRXSTSD_EPNUM_SHIFT;
+
+  if (epphy < STM32_NENDPOINTS)
+    {
+      privep = &priv->epout[epphy];
+
+      /* Handle the RX event according to the packet status field */
+
+      switch (regval & OTG_GRXSTSD_PKTSTS_MASK)
+        {
+        /* Global OUT NAK.  This indicate that the global OUT NAK bit has taken
+         * effect.
+         *
+         * PKTSTS = Global OUT NAK, BCNT = 0, EPNUM = Don't Care, DPID = Don't
+         * Care.
+         */
+
+        case OTG_GRXSTSD_PKTSTS_OUTNAK:
+          {
+            usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_OUTNAK), 0);
+          }
+          break;
+
+        /* OUT data packet received.
+         *
+         * PKTSTS = DataOUT, BCNT = size of the received data OUT packet,
+         * EPNUM = EPNUM on which the packet was received, DPID = Actual Data PID.
+         */
+
+        case OTG_GRXSTSD_PKTSTS_OUTRECVD:
+          {
+            usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_OUTRECVD), epphy);
+            bcnt = (regval & OTG_GRXSTSD_BCNT_MASK) >> OTG_GRXSTSD_BCNT_SHIFT;
+            if (bcnt > 0)
+              {
+                stm32_epout_receive(privep, bcnt);
+              }
+          }
+          break;
+
+        /* OUT transfer completed.  This indicates that an OUT data transfer for
+         * the specified OUT endpoint has completed. After this entry is popped
+         * from the receive FIFO, the core asserts a Transfer Completed interrupt
+         * on the specified OUT endpoint.
+         *
+         * PKTSTS = Data OUT Transfer Done, BCNT = 0, EPNUM = OUT EP Num on
+         * which the data transfer is complete, DPID = Don't Care.
+         */
+
+        case OTG_GRXSTSD_PKTSTS_OUTDONE:
+          {
+            usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_OUTDONE), epphy);
+          }
+          break;
+
+        /* SETUP transaction completed. This indicates that the Setup stage for
+         * the specified endpoint has completed and the Data stage has started.
+         * After this entry is popped from the receive FIFO, the core asserts a
+         * Setup interrupt on the specified control OUT endpoint (triggers an
+         * interrupt).
+         *
+         * PKTSTS = Setup Stage Done, BCNT = 0, EPNUM = Control EP Num,
+         * DPID = Don't Care.
+         */
+
+        case OTG_GRXSTSD_PKTSTS_SETUPDONE:
+          {
+            usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_SETUPDONE), epphy);
+          }
+          break;
+
+        /* SETUP data packet received.  This indicates that a SETUP packet for the
+         * specified endpoint is now available for reading from the receive FIFO.
+         *
+         * PKTSTS = SETUP, BCNT = 8, EPNUM = Control EP Num, DPID = D0.
+         */
+
+        case OTG_GRXSTSD_PKTSTS_SETUPRECVD:
+          {
+            uint16_t datlen;
+
+            usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_SETUPRECVD), epphy);
+
+            /* Read EP0 setup data.  NOTE:  If multiple SETUP packets are received,
+             * the last one overwrites the previous setup packets and only that
+             * last SETUP packet will be processed.
+             */
+
+            stm32_rxfifo_read(&priv->epout[EP0], (FAR uint8_t *)&priv->ctrlreq,
+                             USB_SIZEOF_CTRLREQ);
+
+            /* Was this an IN or an OUT SETUP packet.  If it is an OUT SETUP,
+             * then we need to wait for the completion of the data phase to
+             * process the setup command.  If it is an IN SETUP packet, then
+             * we must processing the command BEFORE we enter the DATA phase.
+             *
+             * If the data associated with the OUT SETUP packet is zero length,
+             * then, of course, we don't need to wait.
+             */
+
+            datlen = GETUINT16(priv->ctrlreq.len);
+            if (USB_REQ_ISOUT(priv->ctrlreq.type) && datlen > 0)
+              {
+                /* Clear NAKSTS so that we can receive the data */
+
+                regval  = stm32_getreg(STM32_OTG_DOEPCTL(0));
+                regval |= OTG_DOEPCTL0_CNAK;
+                stm32_putreg(regval, STM32_OTG_DOEPCTL(0));
+
+                /* Wait for the data phase. */
+
+                priv->ep0state = EP0STATE_SETUP_OUT;
+              }
+            else
+              {
+                /* We can process the setup data as soon as SETUP done word is
+                 * popped of the RxFIFO.
+                 */
+
+                priv->ep0state = EP0STATE_SETUP_READY;
+              }
+          }
+          break;
+
+        default:
+          {
+            usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS),
+                     (regval & OTG_GRXSTSD_PKTSTS_MASK) >> OTG_GRXSTSD_PKTSTS_SHIFT);
+          }
+          break;
+        }
+    }
+
+  /* Enable the Rx Status Queue Level interrupt */
+
+  regval  = stm32_getreg(STM32_OTG_GINTMSK);
+  regval |= OTG_GINT_RXFLVL;
+  stm32_putreg(regval, STM32_OTG_GINTMSK);
+}
+
+/****************************************************************************
+ * Name: stm32_enuminterrupt
+ *
+ * Description:
+ *   Enumeration done interrupt
+ *
+ ****************************************************************************/
+
+static inline void stm32_enuminterrupt(FAR struct stm32_usbdev_s *priv)
+{
+  uint32_t regval;
+
+  /* Activate EP0 */
+
+  stm32_ep0in_activate();
+
+  /* Set USB turn-around time for the full speed device with internal PHY interface. */
+
+  regval  = stm32_getreg(STM32_OTG_GUSBCFG);
+  regval &= ~OTG_GUSBCFG_TRDT_MASK;
+  regval |=  OTG_GUSBCFG_TRDT(5);
+  stm32_putreg(regval, STM32_OTG_GUSBCFG);
+}
+
+/****************************************************************************
+ * Name: stm32_isocininterrupt
+ *
+ * Description:
+ *   Incomplete isochronous IN transfer interrupt.  Assertion of the incomplete
+ *   isochronous IN transfer interrupt indicates an incomplete isochronous IN
+ *   transfer on at least one of the isochronous IN endpoints.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_USBDEV_ISOCHRONOUS
+static inline void stm32_isocininterrupt(FAR struct stm32_usbdev_s *priv)
+{
+  int i;
+
+  /* The application must read the endpoint control register for all isochronous
+   * IN endpoints to detect endpoints with incomplete IN data transfers.
+   */
+
+  for (i = 0; i < STM32_NENDPOINTS; i++)
+    {
+      /* Is this an isochronous IN endpoint? */
+
+      privep = &priv->epin[i];
+      if (privep->eptype != USB_EP_ATTR_XFER_ISOC)
+        {
+          /* No... keep looking */
+
+          continue;
+        }
+
+      /* Is there an active read request on the isochronous OUT endpoint? */
+
+      if (!privep->active)
+        {
+          /* No.. the endpoint is not actively transmitting data */
+
+          continue;
+        }
+
+      /* Check if this is the endpoint that had the incomplete transfer */
+
+      regaddr = STM32_OTG_DIEPCTL(privep->epphy);
+      doepctl = stm32_getreg(regaddr);
+      dsts    = stm32_getreg(STM32_OTG_DSTS);
+
+      /* EONUM = 0:even frame, 1:odd frame
+       * SOFFN = Frame number of the received SOF
+       */
+
+      eonum = ((doepctl & OTG_DIEPCTL_EONUM) != 0);
+      soffn = ((dsts & OTG_DSTS_SOFFN0) != 0);
+
+      if (eonum != soffn)
+        {
+          /* Not this endpoint */
+
+          continue;
+        }
+
+      /* For isochronous IN endpoints with incomplete transfers,
+       * the application must discard the data in the memory and
+       * disable the endpoint.
+       */
+
+      stm32_req_complete(privep, -EIO);
+#warning "Will clear OTG_DIEPCTL_USBAEP too"
+      stm32_epin_disable(privep);
+      break;
+    }
+}
+#endif
+
+/****************************************************************************
+ * Name: stm32_isocoutinterrupt
+ *
+ * Description:
+ *   Incomplete periodic transfer interrupt
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_USBDEV_ISOCHRONOUS
+static inline void stm32_isocoutinterrupt(FAR struct stm32_usbdev_s *priv)
+{
+  FAR struct stm32_ep_s *privep;
+  FAR struct stm32_req_s *privreq;
+  uint32_t regaddr;
+  uint32_t doepctl;
+  uint32_t dsts;
+  bool eonum;
+  bool soffn;
+
+  /* When it receives an IISOOXFR interrupt, the application must read the
+   * control registers of all isochronous OUT endpoints to determine which
+   * endpoints had an incomplete transfer in the current microframe. An
+   * endpoint transfer is incomplete if both the following conditions are true:
+   *
+   *   DOEPCTLx:EONUM = DSTS:SOFFN[0], and
+   *   DOEPCTLx:EPENA = 1
+   */
+
+  for (i = 0; i < STM32_NENDPOINTS; i++)
+    {
+      /* Is this an isochronous OUT endpoint? */
+
+      privep = &priv->epout[i];
+      if (privep->eptype != USB_EP_ATTR_XFER_ISOC)
+        {
+          /* No... keep looking */
+
+          continue;
+        }
+
+      /* Is there an active read request on the isochronous OUT endpoint? */
+
+      if (!privep->active)
+        {
+          /* No.. the endpoint is not actively transmitting data */
+
+          continue;
+        }
+
+      /* Check if this is the endpoint that had the incomplete transfer */
+
+      regaddr = STM32_OTG_DOEPCTL(privep->epphy);
+      doepctl = stm32_getreg(regaddr);
+      dsts    = stm32_getreg(STM32_OTG_DSTS);
+
+      /* EONUM = 0:even frame, 1:odd frame
+       * SOFFN = Frame number of the received SOF
+       */
+
+      eonum = ((doepctl & OTG_DOEPCTL_EONUM) != 0);
+      soffn = ((dsts & OTG_DSTS_SOFFN0) != 0);
+
+      if (eonum != soffn)
+        {
+          /* Not this endpoint */
+
+          continue;
+        }
+
+      /* For isochronous OUT endpoints with incomplete transfers,
+       * the application must discard the data in the memory and
+       * disable the endpoint.
+       */
+
+      stm32_req_complete(privep, -EIO);
+#warning "Will clear OTG_DOEPCTL_USBAEP too"
+      stm32_epout_disable(privep);
+      break;
+    }
+}
+#endif
+
+/****************************************************************************
+ * Name: stm32_sessioninterrupt
+ *
+ * Description:
+ *   Session request/new session detected interrupt
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_USBDEV_VBUSSENSING
+static inline void stm32_sessioninterrupt(FAR struct stm32_usbdev_s *priv)
+{
+#warning "Missing logic"
+}
+#endif
+
+/****************************************************************************
+ * Name: stm32_otginterrupt
+ *
+ * Description:
+ *   OTG interrupt
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_USBDEV_VBUSSENSING
+static inline void stm32_otginterrupt(FAR struct stm32_usbdev_s *priv)
+{
+  uint32_t regval;
+
+  /* Check for session end detected */
+
+  regval = stm32_getreg(STM32_OTG_GOTGINT);
+  if ((regval & OTG_GOTGINT_SEDET) != 0)
+    {
+#warning "Missing logic"
+    }
+
+  /* Clear OTG interrupt */
+
+  stm32_putreg(retval, STM32_OTG_GOTGINT);
+}
+#endif
+
+/****************************************************************************
+ * Name: stm32_usbinterrupt
+ *
+ * Description:
+ *   USB interrupt handler
+ *
+ ****************************************************************************/
+
+static int stm32_usbinterrupt(int irq, FAR void *context)
+{
+  /* At present, there is only a single OTG  device support. Hence it is
+   * pre-allocated as g_otghsdev.  However, in most code, the private data
+   * structure will be referenced using the 'priv' pointer (rather than the
+   * global data) in order to simplify any future support for multiple devices.
+   */
+
+  FAR struct stm32_usbdev_s *priv = &g_otghsdev;
+  uint32_t regval;
+
+  usbtrace(TRACE_INTENTRY(STM32_TRACEINTID_USB), 0);
+
+  /* Assure that we are in device mode */
+
+  DEBUGASSERT((stm32_getreg(STM32_OTG_GINTSTS) & OTG_GINTSTS_CMOD) == OTG_GINTSTS_DEVMODE);
+
+  /* Get the state of all enabled interrupts.  We will do this repeatedly
+   * some interrupts (like RXFLVL) will generate additional interrupting
+   * events.
+   */
+
+  for (; ; )
+    {
+      /* Get the set of pending, un-masked interrupts */
+
+      regval  = stm32_getreg(STM32_OTG_GINTSTS);
+      regval &= stm32_getreg(STM32_OTG_GINTMSK);
+
+      /* Break out of the loop when there are no further pending (and
+       * unmasked) interrupts to be processes.
+       */
+
+      if (regval == 0)
+        {
+          break;
+        }
+      usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_INTPENDING), (uint16_t)regval);
+
+      /* OUT endpoint interrupt. The core sets this bit to indicate that an
+       * interrupt is pending on one of the OUT endpoints of the core.
+       */
+
+      if ((regval & OTG_GINT_OEP) != 0)
+        {
+          usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPOUT), (uint16_t)regval);
+          stm32_epout_interrupt(priv);
+          stm32_putreg(OTG_GINT_OEP, STM32_OTG_GINTSTS);
+        }
+
+      /* IN endpoint interrupt.  The core sets this bit to indicate that
+       * an interrupt is pending on one of the IN endpoints of the core.
+       */
+
+      if ((regval & OTG_GINT_IEP) != 0)
+        {
+          usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPIN), (uint16_t)regval);
+          stm32_epin_interrupt(priv);
+          stm32_putreg(OTG_GINT_IEP, STM32_OTG_GINTSTS);
+        }
+
+      /* Host/device mode mismatch error interrupt */
+
+#ifdef CONFIG_DEBUG_USB
+      if ((regval & OTG_GINT_MMIS) != 0)
+        {
+          usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_MISMATCH), (uint16_t)regval);
+          stm32_putreg(OTG_GINT_MMIS, STM32_OTG_GINTSTS);
+        }
+#endif
+
+      /* Resume/remote wakeup detected interrupt */
+
+      if ((regval & OTG_GINT_WKUP) != 0)
+        {
+          usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_WAKEUP), (uint16_t)regval);
+          stm32_resumeinterrupt(priv);
+          stm32_putreg(OTG_GINT_WKUP, STM32_OTG_GINTSTS);
+        }
+
+      /* USB suspend interrupt */
+
+      if ((regval & OTG_GINT_USBSUSP) != 0)
+        {
+          usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_SUSPEND), (uint16_t)regval);
+          stm32_suspendinterrupt(priv);
+          stm32_putreg(OTG_GINT_USBSUSP, STM32_OTG_GINTSTS);
+        }
+
+      /* Start of frame interrupt */
+
+#ifdef CONFIG_USBDEV_SOFINTERRUPT
+      if ((regval & OTG_GINT_SOF) != 0)
+        {
+          usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_SOF), (uint16_t)regval);
+          stm32_putreg(OTG_GINT_SOF, STM32_OTG_GINTSTS);
+        }
+#endif
+
+      /* RxFIFO non-empty interrupt.  Indicates that there is at least one
+       * packet pending to be read from the RxFIFO.
+       */
+
+      if ((regval & OTG_GINT_RXFLVL) != 0)
+        {
+          usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_RXFIFO), (uint16_t)regval);
+          stm32_rxinterrupt(priv);
+          stm32_putreg(OTG_GINT_RXFLVL, STM32_OTG_GINTSTS);
+        }
+
+      /* USB reset interrupt */
+
+      if ((regval & OTG_GINT_USBRST) != 0)
+        {
+          usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_DEVRESET), (uint16_t)regval);
+
+          /* Perform the device reset */
+
+          stm32_usbreset(priv);
+          usbtrace(TRACE_INTEXIT(STM32_TRACEINTID_USB), 0);
+          stm32_putreg(OTG_GINT_USBRST, STM32_OTG_GINTSTS);
+          return OK;
+        }
+
+      /* Enumeration done interrupt */
+
+      if ((regval & OTG_GINT_ENUMDNE) != 0)
+        {
+          usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_ENUMDNE), (uint16_t)regval);
+          stm32_enuminterrupt(priv);
+          stm32_putreg(OTG_GINT_ENUMDNE, STM32_OTG_GINTSTS);
+        }
+
+      /* Incomplete isochronous IN transfer interrupt.  When the core finds
+       * non-empty any of the isochronous IN endpoint FIFOs scheduled for
+       * the current frame non-empty, the core generates an IISOIXFR
+       * interrupt.
+       */
+
+#ifdef CONFIG_USBDEV_ISOCHRONOUS
+      if ((regval & OTG_GINT_IISOIXFR) != 0)
+        {
+          usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_IISOIXFR), (uint16_t)regval);
+          stm32_isocininterrupt(priv);
+          stm32_putreg(OTG_GINT_IISOIXFR, STM32_OTG_GINTSTS);
+        }
+
+      /* Incomplete isochronous OUT transfer.  For isochronous OUT
+       * endpoints, the XFRC interrupt may not always be asserted. If the
+       * core drops isochronous OUT data packets, the application could fail
+       * to detect the XFRC interrupt.  The incomplete Isochronous OUT data
+       * interrupt indicates that an XFRC interrupt was not asserted on at
+       * least one of the isochronous OUT endpoints. At this point, the
+       * endpoint with the incomplete transfer remains enabled, but no active
+       * transfers remain in progress on this endpoint on the USB.
+       */
+
+      if ((regval & OTG_GINT_IISOOXFR) != 0)
+        {
+          usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_IISOOXFR), (uint16_t)regval);
+          stm32_isocoutinterrupt(priv);
+          stm32_putreg(OTG_GINT_IISOOXFR, STM32_OTG_GINTSTS);
+        }
+#endif
+
+      /* Session request/new session detected interrupt */
+
+#ifdef CONFIG_USBDEV_VBUSSENSING
+      if ((regval & OTG_GINT_SRQ) != 0)
+        {
+          usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_SRQ), (uint16_t)regval);
+          stm32_sessioninterrupt(priv);
+          stm32_putreg(OTG_GINT_SRQ, STM32_OTG_GINTSTS);
+        }
+
+      /* OTG interrupt */
+
+      if ((regval & OTG_GINT_OTG) != 0)
+        {
+          usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_OTG), (uint16_t)regval);
+          stm32_otginterrupt(priv);
+          stm32_putreg(OTG_GINT_OTG, STM32_OTG_GINTSTS);
+        }
+#endif
+    }
+
+  usbtrace(TRACE_INTEXIT(STM32_TRACEINTID_USB), 0);
+  return OK;
+}
+
+/****************************************************************************
+ * Endpoint operations
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stm32_enablegonak
+ *
+ * Description:
+ *   Enable global OUT NAK mode
+ *
+ ****************************************************************************/
+
+static void stm32_enablegonak(FAR struct stm32_ep_s *privep)
+{
+  uint32_t regval;
+
+  /* First, make sure that there is no GNOAKEFF interrupt pending. */
+
+#if 0
+  stm32_putreg(OTG_GINT_GONAKEFF, STM32_OTG_GINTSTS);
+#endif
+
+  /* Enable Global OUT NAK mode in the core. */
+
+  regval = stm32_getreg(STM32_OTG_DCTL);
+  regval |= OTG_DCTL_SGONAK;
+  stm32_putreg(regval, STM32_OTG_DCTL);
+
+#if 0
+  /* Wait for the GONAKEFF interrupt that indicates that the OUT NAK
+   * mode is in effect.  When the interrupt handler pops the OUTNAK word
+   * from the RxFIFO, the core sets the GONAKEFF interrupt.
+   */
+
+  while ((stm32_getreg(STM32_OTG_GINTSTS) & OTG_GINT_GONAKEFF) == 0);
+  stm32_putreg(OTG_GINT_GONAKEFF, STM32_OTG_GINTSTS);
+
+#else
+  /* Since we are in the interrupt handler, we cannot wait inline for the
+   * GONAKEFF because it cannot occur until service the RXFLVL global interrupt
+   * and pop the OUTNAK word from the RxFIFO.
+   *
+   * Perhaps it is sufficient to wait for Global OUT NAK status to be reported
+   * in OTG DCTL register?
+   */
+
+  while ((stm32_getreg(STM32_OTG_DCTL) & OTG_DCTL_GONSTS) == 0);
+#endif
+}
+
+/****************************************************************************
+ * Name: stm32_disablegonak
+ *
+ * Description:
+ *   Disable global OUT NAK mode
+ *
+ ****************************************************************************/
+
+static void stm32_disablegonak(FAR struct stm32_ep_s *privep)
+{
+  uint32_t regval;
+
+  /* Set the "Clear the Global OUT NAK bit" to disable global OUT NAK mode */
+
+  regval  = stm32_getreg(STM32_OTG_DCTL);
+  regval |= OTG_DCTL_CGONAK;
+  stm32_putreg(regval, STM32_OTG_DCTL);
+}
+
+/****************************************************************************
+ * Name: stm32_epout_configure
+ *
+ * Description:
+ *   Configure an OUT endpoint, making it usable
+ *
+ * Input Parameters:
+ *   privep    - a pointer to an internal endpoint structure
+ *   eptype    - The type of the endpoint
+ *   maxpacket - The max packet size of the endpoint
+ *
+ ****************************************************************************/
+
+static int stm32_epout_configure(FAR struct stm32_ep_s *privep, uint8_t eptype,
+                                 uint16_t maxpacket)
+{
+  uint32_t mpsiz;
+  uint32_t regaddr;
+  uint32_t regval;
+
+  usbtrace(TRACE_EPCONFIGURE, privep->epphy);
+
+  /* For EP0, the packet size is encoded */
+
+  if (privep->epphy == EP0)
+    {
+      DEBUGASSERT(eptype == USB_EP_ATTR_XFER_CONTROL);
+
+      /* Map the size in bytes to the encoded value in the register */
+
+      switch (maxpacket)
+        {
+          case 8:
+            mpsiz = OTG_DOEPCTL0_MPSIZ_8;
+            break;
+
+          case 16:
+            mpsiz = OTG_DOEPCTL0_MPSIZ_16;
+            break;
+
+          case 32:
+            mpsiz = OTG_DOEPCTL0_MPSIZ_32;
+            break;
+
+          case 64:
+            mpsiz = OTG_DOEPCTL0_MPSIZ_64;
+            break;
+
+          default:
+            uerr("Unsupported maxpacket: %d\n", maxpacket);
+            return -EINVAL;
+        }
+    }
+
+  /* For other endpoints, the packet size is in bytes */
+
+  else
+    {
+      mpsiz = (maxpacket << OTG_DOEPCTL_MPSIZ_SHIFT);
+    }
+
+  /* If the endpoint is already active don't change the endpoint control
+   * register.
+   */
+
+  regaddr = STM32_OTG_DOEPCTL(privep->epphy);
+  regval  = stm32_getreg(regaddr);
+  if ((regval & OTG_DOEPCTL_USBAEP) == 0)
+    {
+      if (regval & OTG_DOEPCTL_NAKSTS)
+        {
+          regval |= OTG_DOEPCTL_CNAK;
+        }
+
+      regval &= ~(OTG_DOEPCTL_MPSIZ_MASK | OTG_DOEPCTL_EPTYP_MASK);
+      regval |= mpsiz;
+      regval |= (eptype << OTG_DOEPCTL_EPTYP_SHIFT);
+      regval |= (OTG_DOEPCTL_SD0PID | OTG_DOEPCTL_USBAEP);
+      stm32_putreg(regval, regaddr);
+
+      /* Save the endpoint configuration */
+
+      privep->ep.maxpacket = maxpacket;
+      privep->eptype       = eptype;
+      privep->stalled      = false;
+    }
+
+  /* Enable the interrupt for this endpoint */
+
+  regval = stm32_getreg(STM32_OTG_DAINTMSK);
+  regval |= OTG_DAINT_OEP(privep->epphy);
+  stm32_putreg(regval, STM32_OTG_DAINTMSK);
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stm32_epin_configure
+ *
+ * Description:
+ *   Configure an IN endpoint, making it usable
+ *
+ * Input Parameters:
+ *   privep    - a pointer to an internal endpoint structure
+ *   eptype    - The type of the endpoint
+ *   maxpacket - The max packet size of the endpoint
+ *
+ ****************************************************************************/
+
+static int stm32_epin_configure(FAR struct stm32_ep_s *privep, uint8_t eptype,
+                                uint16_t maxpacket)
+{
+  uint32_t mpsiz;
+  uint32_t regaddr;
+  uint32_t regval;
+
+  usbtrace(TRACE_EPCONFIGURE, privep->epphy);
+
+  /* For EP0, the packet size is encoded */
+
+  if (privep->epphy == EP0)
+    {
+      DEBUGASSERT(eptype == USB_EP_ATTR_XFER_CONTROL);
+
+      /* Map the size in bytes to the encoded value in the register */
+
+      switch (maxpacket)
+        {
+          case 8:
+            mpsiz = OTG_DIEPCTL0_MPSIZ_8;
+            break;
+
+          case 16:
+            mpsiz = OTG_DIEPCTL0_MPSIZ_16;
+            break;
+
+          case 32:
+            mpsiz = OTG_DIEPCTL0_MPSIZ_32;
+            break;
+
+          case 64:
+            mpsiz = OTG_DIEPCTL0_MPSIZ_64;
+            break;
+
+          default:
+            uerr("Unsupported maxpacket: %d\n", maxpacket);
+            return -EINVAL;
+        }
+    }
+
+  /* For other endpoints, the packet size is in bytes */
+
+  else
+    {
+      mpsiz = (maxpacket << OTG_DIEPCTL_MPSIZ_SHIFT);
+    }
+
+
+  /* If the endpoint is already active don't change the endpoint control
+   * register.
+   */
+
+  regaddr = STM32_OTG_DIEPCTL(privep->epphy);
+  regval  = stm32_getreg(regaddr);
+  if ((regval & OTG_DIEPCTL_USBAEP) == 0)
+    {
+      if (regval & OTG_DIEPCTL_NAKSTS)
+        {
+          regval |= OTG_DIEPCTL_CNAK;
+        }
+
+      regval &= ~(OTG_DIEPCTL_MPSIZ_MASK | OTG_DIEPCTL_EPTYP_MASK | OTG_DIEPCTL_TXFNUM_MASK);
+      regval |= mpsiz;
+      regval |= (eptype << OTG_DIEPCTL_EPTYP_SHIFT);
+      regval |= (eptype << OTG_DIEPCTL_TXFNUM_SHIFT);
+      regval |= (OTG_DIEPCTL_SD0PID | OTG_DIEPCTL_USBAEP);
+      stm32_putreg(regval, regaddr);
+
+      /* Save the endpoint configuration */
+
+      privep->ep.maxpacket = maxpacket;
+      privep->eptype       = eptype;
+      privep->stalled      = false;
+    }
+
+  /* Enable the interrupt for this endpoint */
+
+  regval = stm32_getreg(STM32_OTG_DAINTMSK);
+  regval |= OTG_DAINT_IEP(privep->epphy);
+  stm32_putreg(regval, STM32_OTG_DAINTMSK);
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stm32_ep_configure
+ *
+ * Description:
+ *   Configure endpoint, making it usable
+ *
+ * Input Parameters:
+ *   ep   - the struct usbdev_ep_s instance obtained from allocep()
+ *   desc - A struct usb_epdesc_s instance describing the endpoint
+ *   last - true if this this last endpoint to be configured.  Some hardware
+ *          needs to take special action when all of the endpoints have been
+ *          configured.
+ *
+ ****************************************************************************/
+
+static int stm32_ep_configure(FAR struct usbdev_ep_s *ep,
+                              FAR const struct usb_epdesc_s *desc,
+                              bool last)
+{
+  FAR struct stm32_ep_s *privep = (FAR struct stm32_ep_s *)ep;
+  uint16_t maxpacket;
+  uint8_t  eptype;
+  int ret;
+
+  usbtrace(TRACE_EPCONFIGURE, privep->epphy);
+  DEBUGASSERT(desc->addr == ep->eplog);
+
+  /* Initialize EP capabilities */
+
+  maxpacket = GETUINT16(desc->mxpacketsize);
+  eptype    = desc->attr & USB_EP_ATTR_XFERTYPE_MASK;
+
+  /* Setup Endpoint Control Register */
+
+  if (privep->isin)
+    {
+      ret = stm32_epin_configure(privep, eptype, maxpacket);
+    }
+  else
+    {
+      ret = stm32_epout_configure(privep, eptype, maxpacket);
+    }
+
+  return ret;
+}
+
+/****************************************************************************
+ * Name: stm32_ep0_configure
+ *
+ * Description:
+ *   Reset Usb engine
+ *
+ ****************************************************************************/
+
+static void stm32_ep0_configure(FAR struct stm32_usbdev_s *priv)
+{
+  /* Enable EP0 IN and OUT */
+
+  (void)stm32_epin_configure(&priv->epin[EP0], USB_EP_ATTR_XFER_CONTROL,
+                             CONFIG_USBDEV_EP0_MAXSIZE);
+  (void)stm32_epout_configure(&priv->epout[EP0], USB_EP_ATTR_XFER_CONTROL,
+                              CONFIG_USBDEV_EP0_MAXSIZE);
+}
+
+/****************************************************************************
+ * Name: stm32_epout_disable
+ *
+ * Description:
+ *   Diable an OUT endpoint will no longer be used
+ *
+ ****************************************************************************/
+
+static void stm32_epout_disable(FAR struct stm32_ep_s *privep)
+{
+  uint32_t regaddr;
+  uint32_t regval;
+  irqstate_t flags;
+
+  usbtrace(TRACE_EPDISABLE, privep->epphy);
+
+  /* Is this an IN or an OUT endpoint */
+
+  /* Before disabling any OUT endpoint, the application must enable
+   * Global OUT NAK mode in the core.
+   */
+
+  flags = enter_critical_section();
+  stm32_enablegonak(privep);
+
+  /* Disable the required OUT endpoint by setting the EPDIS and SNAK bits
+   * int DOECPTL register.
+   */
+
+  regaddr = STM32_OTG_DOEPCTL(privep->epphy);
+  regval  = stm32_getreg(regaddr);
+  regval &= ~OTG_DOEPCTL_USBAEP;
+  regval |= (OTG_DOEPCTL_EPDIS | OTG_DOEPCTL_SNAK);
+  stm32_putreg(regval, regaddr);
+
+  /* Wait for the EPDISD interrupt which indicates that the OUT
+   * endpoint is completely disabled.
+   */
+
+#if 0 /* Doesn't happen */
+  regaddr = STM32_OTG_DOEPINT(privep->epphy);
+  while ((stm32_getreg(regaddr) & OTG_DOEPINT_EPDISD) == 0);
+#else
+  /* REVISIT: */
+  up_udelay(10);
+#endif
+
+  /* Clear the EPDISD interrupt indication */
+
+  stm32_putreg(OTG_DOEPINT_EPDISD, STM32_OTG_DOEPINT(privep->epphy));
+
+  /* Then disable the Global OUT NAK mode to continue receiving data
+   * from other non-disabled OUT endpoints.
+   */
+
+  stm32_disablegonak(privep);
+
+  /* Disable endpoint interrupts */
+
+  regval  = stm32_getreg(STM32_OTG_DAINTMSK);
+  regval &= ~OTG_DAINT_OEP(privep->epphy);
+  stm32_putreg(regval, STM32_OTG_DAINTMSK);
+
+  /* Cancel any queued read requests */
+
+  stm32_req_cancel(privep, -ESHUTDOWN);
+
+  leave_critical_section(flags);
+}
+
+/****************************************************************************
+ * Name: stm32_epin_disable
+ *
+ * Description:
+ *   Disable an IN endpoint when it will no longer be used
+ *
+ ****************************************************************************/
+
+static void stm32_epin_disable(FAR struct stm32_ep_s *privep)
+{
+  uint32_t regaddr;
+  uint32_t regval;
+  irqstate_t flags;
+
+  usbtrace(TRACE_EPDISABLE, privep->epphy);
+
+  /* After USB reset, the endpoint will already be deactivated by the
+   * hardware. Trying to disable again will just hang in the wait.
+   */
+
+  regaddr = STM32_OTG_DIEPCTL(privep->epphy);
+  regval  = stm32_getreg(regaddr);
+  if ((regval & OTG_DIEPCTL_USBAEP) == 0)
+    {
+      return;
+    }
+
+  /* This INEPNE wait logic is suggested by reference manual, but seems
+   * to get stuck to infinite loop.
+   */
+
+#if 0
+  /* Make sure that there is no pending IPEPNE interrupt (because we are
+   * to poll this bit below).
+   */
+
+  stm32_putreg(OTG_DIEPINT_INEPNE, STM32_OTG_DIEPINT(privep->epphy));
+
+  /* Set the endpoint in NAK mode */
+
+  regaddr = STM32_OTG_DIEPCTL(privep->epphy);
+  regval  = stm32_getreg(regaddr);
+  regval &= ~OTG_DIEPCTL_USBAEP;
+  regval |= (OTG_DIEPCTL_EPDIS | OTG_DIEPCTL_SNAK);
+  stm32_putreg(regval, regaddr);
+
+  /* Wait for the INEPNE interrupt that indicates that we are now in NAK mode */
+
+  regaddr = STM32_OTG_DIEPINT(privep->epphy);
+  while ((stm32_getreg(regaddr) & OTG_DIEPINT_INEPNE) == 0);
+
+  /* Clear the INEPNE interrupt indication */
+
+  stm32_putreg(OTG_DIEPINT_INEPNE, regaddr);
+#endif
+
+  /* Deactivate and disable the endpoint by setting the EPDIS and SNAK bits
+   * the DIEPCTLx register.
+   */
+
+  flags = enter_critical_section();
+  regaddr = STM32_OTG_DIEPCTL(privep->epphy);
+  regval  = stm32_getreg(regaddr);
+  regval &= ~OTG_DIEPCTL_USBAEP;
+  regval |= (OTG_DIEPCTL_EPDIS | OTG_DIEPCTL_SNAK);
+  stm32_putreg(regval, regaddr);
+
+  /* Wait for the EPDISD interrupt which indicates that the IN
+   * endpoint is completely disabled.
+   */
+
+  regaddr = STM32_OTG_DIEPINT(privep->epphy);
+  while ((stm32_getreg(regaddr) & OTG_DIEPINT_EPDISD) == 0);
+
+  /* Clear the EPDISD interrupt indication */
+
+  stm32_putreg(OTG_DIEPINT_EPDISD, stm32_getreg(regaddr));
+
+  /* Flush any data remaining in the TxFIFO */
+
+  stm32_txfifo_flush(OTG_GRSTCTL_TXFNUM_D(privep->epphy));
+
+  /* Disable endpoint interrupts */
+
+  regval  = stm32_getreg(STM32_OTG_DAINTMSK);
+  regval &= ~OTG_DAINT_IEP(privep->epphy);
+  stm32_putreg(regval, STM32_OTG_DAINTMSK);
+
+  /* Cancel any queued write requests */
+
+  stm32_req_cancel(privep, -ESHUTDOWN);
+  leave_critical_section(flags);
+}
+
+/****************************************************************************
+ * Name: stm32_ep_disable
+ *
+ * Description:
+ *   The endpoint will no longer be used
+ *
+ ****************************************************************************/
+
+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_FEATURES
+  if (!ep)
+    {
+      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
+      return -EINVAL;
+    }
+#endif
+
+  usbtrace(TRACE_EPDISABLE, privep->epphy);
+
+  /* Is this an IN or an OUT endpoint */
+
+  if (privep->isin)
+    {
+      /* Disable the IN endpoint */
+
+      stm32_epin_disable(privep);
+    }
+  else
+    {
+      /* Disable the OUT endpoint */
+
+      stm32_epout_disable(privep);
+    }
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stm32_ep_allocreq
+ *
+ * Description:
+ *   Allocate an I/O request
+ *
+ ****************************************************************************/
+
+static FAR struct usbdev_req_s *stm32_ep_allocreq(FAR struct usbdev_ep_s *ep)
+{
+  FAR struct stm32_req_s *privreq;
+
+#ifdef CONFIG_DEBUG_FEATURES
+  if (!ep)
+    {
+      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
+      return NULL;
+    }
+#endif
+
+  usbtrace(TRACE_EPALLOCREQ, ((FAR struct stm32_ep_s *)ep)->epphy);
+
+  privreq = (FAR struct stm32_req_s *)kmm_malloc(sizeof(struct stm32_req_s));
+  if (!privreq)
+    {
+      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_ALLOCFAIL), 0);
+      return NULL;
+    }
+
+  memset(privreq, 0, sizeof(struct stm32_req_s));
+  return &privreq->req;
+}
+
+/****************************************************************************
+ * Name: stm32_ep_freereq
+ *
+ * Description:
+ *   Free an I/O request
+ *
+ ****************************************************************************/
+
+static void stm32_ep_freereq(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *req)
+{
+  FAR struct stm32_req_s *privreq = (FAR struct stm32_req_s *)req;
+
+#ifdef CONFIG_DEBUG_FEATURES
+  if (!ep || !req)
+    {
+      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
+      return;
+    }
+#endif
+
+  usbtrace(TRACE_EPFREEREQ, ((FAR struct stm32_ep_s *)ep)->epphy);
+  kmm_free(privreq);
+}
+
+/****************************************************************************
+ * Name: stm32_ep_allocbuffer
+ *
+ * Description:
+ *   Allocate an I/O buffer
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_USBDEV_DMA
+static void *stm32_ep_allocbuffer(FAR struct usbdev_ep_s *ep, unsigned bytes)
+{
+  usbtrace(TRACE_EPALLOCBUFFER, privep->epphy);
+
+#ifdef CONFIG_USBDEV_DMAMEMORY
+  return usbdev_dma_alloc(bytes);
+#else
+  return kmm_malloc(bytes);
+#endif
+}
+#endif
+
+/****************************************************************************
+ * Name: stm32_ep_freebuffer
+ *
+ * Description:
+ *   Free an I/O buffer
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_USBDEV_DMA
+static void stm32_ep_freebuffer(FAR struct usbdev_ep_s *ep, FAR void *buf)
+{
+  usbtrace(TRACE_EPFREEBUFFER, privep->epphy);
+
+#ifdef CONFIG_USBDEV_DMAMEMORY
+  usbdev_dma_free(buf);
+#else
+  kmm_free(buf);
+#endif
+}
+#endif
+
+/****************************************************************************
+ * Name: stm32_ep_submit
+ *
+ * Description:
+ *   Submit an I/O request to the endpoint
+ *
+ ****************************************************************************/
+
+static int stm32_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *req)
+{
+  FAR struct stm32_req_s *privreq = (FAR struct stm32_req_s *)req;
+  FAR struct stm32_ep_s *privep = (FAR struct stm32_ep_s *)ep;
+  FAR struct stm32_usbdev_s *priv;
+  irqstate_t flags;
+  int ret = OK;
+
+  /* Some sanity checking */
+
+#ifdef CONFIG_DEBUG_FEATURES
+  if (!req || !req->callback || !req->buf || !ep)
+    {
+      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
+      ullinfo("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
+      return -EINVAL;
+    }
+#endif
+
+  usbtrace(TRACE_EPSUBMIT, privep->epphy);
+  priv = privep->dev;
+
+#ifdef CONFIG_DEBUG_FEATURES
+  if (!priv->driver)
+    {
+      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_NOTCONFIGURED), priv->usbdev.speed);
+      return -ESHUTDOWN;
+    }
+#endif
+
+  /* Handle the request from the class driver */
+
+  req->result = -EINPROGRESS;
+  req->xfrd   = 0;
+
+  /* Disable Interrupts */
+
+  flags = enter_critical_section();
+
+  /* If we are stalled, then drop all requests on the floor */
+
+  if (privep->stalled)
+    {
+      ret = -EBUSY;
+    }
+  else
+    {
+      /* Add the new request to the request queue for the endpoint. */
+
+      if (stm32_req_addlast(privep, privreq) && !privep->active)
+        {
+          /* If a request was added to an IN endpoint, then attempt to send
+           * the request data buffer now.
+           */
+
+          if (privep->isin)
+            {
+              usbtrace(TRACE_INREQQUEUED(privep->epphy), privreq->req.len);
+
+              /* If the endpoint is not busy with another write request,
+               * then process the newly received write request now.
+               */
+
+              if (!privep->active)
+                {
+                  stm32_epin_request(priv, privep);
+                }
+            }
+
+          /* If the request was added to an OUT endpoint, then attempt to
+           * setup a read into the request data buffer now (this will, of
+           * course, fail if there is already a read in place).
+           */
+
+          else
+            {
+              usbtrace(TRACE_OUTREQQUEUED(privep->epphy), privreq->req.len);
+              stm32_epout_request(priv, privep);
+            }
+        }
+    }
+
+  leave_critical_section(flags);
+  return ret;
+}
+
+/****************************************************************************
+ * Name: stm32_ep_cancel
+ *
+ * Description:
+ *   Cancel an I/O request previously sent to an endpoint
+ *
+ ****************************************************************************/
+
+static int stm32_ep_cancel(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *req)
+{
+  FAR struct stm32_ep_s *privep = (FAR struct stm32_ep_s *)ep;
+  irqstate_t flags;
+
+#ifdef CONFIG_DEBUG_FEATURES
+  if (!ep || !req)
+    {
+      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
+      return -EINVAL;
+    }
+#endif
+
+  usbtrace(TRACE_EPCANCEL, privep->epphy);
+
+  flags = enter_critical_section();
+
+  /* FIXME: if the request is the first, then we need to flush the EP
+   *         otherwise just remove it from the list
+   *
+   *  but ... all other implementations cancel all requests ...
+   */
+
+  stm32_req_cancel(privep, -ESHUTDOWN);
+  leave_critical_section(flags);
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stm32_epout_setstall
+ *
+ * Description:
+ *   Stall an OUT endpoint
+ *
+ ****************************************************************************/
+
+static int stm32_epout_setstall(FAR struct stm32_ep_s *privep)
+{
+#if 1
+  /* This implementation follows the requirements from the STM32 F4 reference
+   * manual.
+   */
+
+  uint32_t regaddr;
+  uint32_t regval;
+
+  /* Put the core in the Global OUT NAK mode */
+
+  stm32_enablegonak(privep);
+
+  /* Disable and STALL the OUT endpoint by setting the EPDIS and STALL bits
+   * in the DOECPTL register.
+   */
+
+  regaddr = STM32_OTG_DOEPCTL(privep->epphy);
+  regval  = stm32_getreg(regaddr);
+  regval |= (OTG_DOEPCTL_EPDIS | OTG_DOEPCTL_STALL);
+  stm32_putreg(regval, regaddr);
+
+  /* Wait for the EPDISD interrupt which indicates that the OUT
+   * endpoint is completely disabled.
+   */
+
+#if 0 /* Doesn't happen */
+  regaddr = STM32_OTG_DOEPINT(privep->epphy);
+  while ((stm32_getreg(regaddr) & OTG_DOEPINT_EPDISD) == 0);
+#else
+  /* REVISIT: */
+  up_udelay(10);
+#endif
+
+  /* Disable Global OUT NAK mode */
+
+  stm32_disablegonak(privep);
+
+  /* The endpoint is now stalled */
+
+  privep->stalled = true;
+  return OK;
+#else
+  /* This implementation follows the STMicro code example. */
+  /* REVISIT: */
+
+  uint32_t regaddr;
+  uint32_t regval;
+
+  /* Stall the OUT endpoint by setting the STALL bit in the DOECPTL register. */
+
+  regaddr = STM32_OTG_DOEPCTL(privep->epphy);
+  regval  = stm32_getreg(regaddr);
+  regval |= OTG_DOEPCTL_STALL;
+  stm32_putreg(regval, regaddr);
+
+  /* The endpoint is now stalled */
+
+  privep->stalled = true;
+  return OK;
+#endif
+}
+
+/****************************************************************************
+ * Name: stm32_epin_setstall
+ *
+ * Description:
+ *   Stall an IN endpoint
+ *
+ ****************************************************************************/
+
+static int stm32_epin_setstall(FAR struct stm32_ep_s *privep)
+{
+  uint32_t regaddr;
+  uint32_t regval;
+
+  /* Get the IN endpoint device control register */
+
+  regaddr = STM32_OTG_DIEPCTL(privep->epphy);
+  regval  = stm32_getreg(regaddr);
+
+  /* Then stall the endpoint */
+
+  regval |= OTG_DIEPCTL_STALL;
+  stm32_putreg(regval, regaddr);
+
+  /* The endpoint is now stalled */
+
+  privep->stalled = true;
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stm32_ep_setstall
+ *
+ * Description:
+ *   Stall an endpoint
+ *
+ ****************************************************************************/
+
+static int stm32_ep_setstall(FAR struct stm32_ep_s *privep)
+{
+  usbtrace(TRACE_EPSTALL, privep->epphy);
+
+  /* Is this an IN endpoint? */
+
+  if (privep->isin == 1)
+    {
+      return stm32_epin_setstall(privep);
+    }
+  else
+    {
+      return stm32_epout_setstall(privep);
+    }
+}
+
+/****************************************************************************
+ * Name: stm32_ep_clrstall
+ *
+ * Description:
+ *   Resume a stalled endpoint
+ *
+ ****************************************************************************/
+
+static int stm32_ep_clrstall(FAR struct stm32_ep_s *privep)
+{
+  uint32_t regaddr;
+  uint32_t regval;
+  uint32_t stallbit;
+  uint32_t data0bit;
+
+  usbtrace(TRACE_EPRESUME, privep->epphy);
+
+  /* Is this an IN endpoint? */
+
+  if (privep->isin == 1)
+    {
+      /* Clear the stall bit in the IN endpoint device control register */
+
+      regaddr  = STM32_OTG_DIEPCTL(privep->epphy);
+      stallbit = OTG_DIEPCTL_STALL;
+      data0bit = OTG_DIEPCTL_SD0PID;
+    }
+  else
+    {
+      /* Clear the stall bit in the IN endpoint device control register */
+
+      regaddr  = STM32_OTG_DOEPCTL(privep->epphy);
+      stallbit = OTG_DOEPCTL_STALL;
+      data0bit = OTG_DOEPCTL_SD0PID;
+    }
+
+  /* Clear the stall bit */
+
+  regval  = stm32_getreg(regaddr);
+  regval &= ~stallbit;
+
+  /* Set the DATA0 pid for interrupt and bulk endpoints */
+
+  if (privep->eptype == USB_EP_ATTR_XFER_INT ||
+      privep->eptype == USB_EP_ATTR_XFER_BULK)
+    {
+      /* Writing this bit sets the DATA0 PID */
+
+      regval |= data0bit;
+    }
+
+  stm32_putreg(regval, regaddr);
+
+  /* The endpoint is no longer stalled */
+
+  privep->stalled = false;
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stm32_ep_stall
+ *
+ * Description:
+ *   Stall or resume an endpoint
+ *
+ ****************************************************************************/
+
+static int stm32_ep_stall(FAR struct usbdev_ep_s *ep, bool resume)
+{
+  FAR struct stm32_ep_s *privep = (FAR struct stm32_ep_s *)ep;
+  irqstate_t flags;
+  int ret;
+
+  /* Set or clear the stall condition as requested */
+
+  flags = enter_critical_section();
+  if (resume)
+    {
+      ret = stm32_ep_clrstall(privep);
+    }
+  else
+    {
+      ret = stm32_ep_setstall(privep);
+    }
+  leave_critical_section(flags);
+
+  return ret;
+}
+
+/****************************************************************************
+ * Name: stm32_ep0_stall
+ *
+ * Description:
+ *   Stall endpoint 0
+ *
+ ****************************************************************************/
+
+static void stm32_ep0_stall(FAR struct stm32_usbdev_s *priv)
+{
+  stm32_epin_setstall(&priv->epin[EP0]);
+  stm32_epout_setstall(&priv->epout[EP0]);
+  priv->stalled = true;
+  stm32_ep0out_ctrlsetup(priv);
+}
+
+/****************************************************************************
+ * Device operations
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stm32_ep_alloc
+ *
+ * Description:
+ *   Allocate an endpoint matching the parameters.
+ *
+ * Input Parameters:
+ *   eplog  - 7-bit logical endpoint number (direction bit ignored).  Zero means
+ *            that any endpoint matching the other requirements will suffice.  The
+ *            assigned endpoint can be found in the eplog field.
+ *   in     - true: IN (device-to-host) endpoint requested
+ *   eptype - Endpoint type.  One of {USB_EP_ATTR_XFER_ISOC, USB_EP_ATTR_XFER_BULK,
+ *            USB_EP_ATTR_XFER_INT}
+ *
+ ****************************************************************************/
+
+static FAR struct usbdev_ep_s *stm32_ep_alloc(FAR struct usbdev_s *dev,
+                                              uint8_t eplog, bool in,
+                                              uint8_t eptype)
+{
+  FAR struct stm32_usbdev_s *priv = (FAR struct stm32_usbdev_s *)dev;
+  uint8_t epavail;
+  irqstate_t flags;
+  int epphy;
+  int epno = 0;
+
+  usbtrace(TRACE_DEVALLOCEP, (uint16_t)eplog);
+
+  /* Ignore any direction bits in the logical address */
+
+  epphy = USB_EPNO(eplog);
+
+  /* Get the set of available endpoints depending on the direction */
+
+  flags = enter_critical_section();
+  epavail = priv->epavail[in];
+
+  /* A physical address of 0 means that any endpoint will do */
+
+  if (epphy > 0)
+    {
+      /* Otherwise, we will return the endpoint structure only for the requested
+       * 'logical' endpoint.  All of the other checks will still be performed.
+       *
+       * First, verify that the logical endpoint is in the range supported by
+       * by the hardware.
+       */
+
+      if (epphy >= STM32_NENDPOINTS)
+        {
+          usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADEPNO), (uint16_t)epphy);
+          return NULL;
+        }
+
+      /* Remove all of the candidate endpoints from the bitset except for the
+       * this physical endpoint number.
+       */
+
+      epavail &= (1 << epphy);
+    }
+
+  /* Is there an available endpoint? */
+
+  if (epavail)
+    {
+      /* Yes.. Select the lowest numbered endpoint in the set of available
+       * endpoints.
+       */
+
+      for (epno = 1; epno < STM32_NENDPOINTS; epno++)
+        {
+          uint8_t bit = 1 << epno;
+          if ((epavail & bit) != 0)
+            {
+              /* Mark the endpoint no longer available */
+
+              priv->epavail[in] &= ~(1 << epno);
+
+              /* And return the pointer to the standard endpoint structure */
+
+              leave_critical_section(flags);
+              return in ? &priv->epin[epno].ep : &priv->epout[epno].ep;
+            }
+        }
+
+      /* We should not get here */
+    }
+
+  usbtrace(TRACE_DEVERROR(STM32_TRACEERR_NOEP), (uint16_t)eplog);
+  leave_critical_section(flags);
+  return NULL;
+}
+
+/****************************************************************************
+ * Name: stm32_ep_free
+ *
+ * Description:
+ *   Free the previously allocated endpoint
+ *
+ ****************************************************************************/
+
+static void stm32_ep_free(FAR struct usbdev_s *dev, FAR struct usbdev_ep_s *ep)
+{
+  FAR struct stm32_usbdev_s *priv = (FAR struct stm32_usbdev_s *)dev;
+  FAR struct stm32_ep_s *privep = (FAR struct stm32_ep_s *)ep;
+  irqstate_t flags;
+
+  usbtrace(TRACE_DEVFREEEP, (uint16_t)privep->epphy);
+
+  if (priv && privep)
+    {
+      /* Mark the endpoint as available */
+
+      flags = enter_critical_section();
+      priv->epavail[privep->isin] |= (1 << privep->epphy);
+      leave_critical_section(flags);
+    }
+}
+
+/****************************************************************************
+ * Name: stm32_getframe
+ *
+ * Description:
+ *   Returns the current frame number
+ *
+ ****************************************************************************/
+
+static int stm32_getframe(struct usbdev_s *dev)
+{
+  uint32_t regval;
+
+  usbtrace(TRACE_DEVGETFRAME, 0);
+
+  /* Return the last frame number of the last SOF detected by the hardware */
+
+  regval = stm32_getreg(STM32_OTG_DSTS);
+  return (int)((regval & OTG_DSTS_SOFFN_MASK) >> OTG_DSTS_SOFFN_SHIFT);
+}
+
+/****************************************************************************
+ * Name: stm32_wakeup
+ *
+ * Description:
+ *   Exit suspend mode.
+ *
+ ****************************************************************************/
+
+static int stm32_wakeup(struct usbdev_s *dev)
+{
+  FAR struct stm32_usbdev_s *priv = (FAR struct stm32_usbdev_s *)dev;
+  uint32_t regval;
+  irqstate_t flags;
+
+  usbtrace(TRACE_DEVWAKEUP, 0);
+
+  /* Is wakeup enabled? */
+
+  flags = enter_critical_section();
+  if (priv->wakeup)
+    {
+      /* Yes... is the core suspended? */
+
+      regval = stm32_getreg(STM32_OTG_DSTS);
+      if ((regval & OTG_DSTS_SUSPSTS) != 0)
+        {
+          /* Re-start the PHY clock and un-gate USB core clock (HCLK) */
+
+#ifdef CONFIG_USBDEV_LOWPOWER
+          regval = stm32_getreg(STM32_OTG_PCGCCTL);
+          regval &= ~(OTG_PCGCCTL_STPPCLK | OTG_PCGCCTL_GATEHCLK);
+          stm32_putreg(regval, STM32_OTG_PCGCCTL);
+#endif
+          /* Activate Remote wakeup signaling */
+
+          regval  = stm32_getreg(STM32_OTG_DCTL);
+          regval |= OTG_DCTL_RWUSIG;
+          stm32_putreg(regval, STM32_OTG_DCTL);
+          up_mdelay(5);
+          regval &= ~OTG_DCTL_RWUSIG;
+          stm32_putreg(regval, STM32_OTG_DCTL);
+        }
+    }
+
+  leave_critical_section(flags);
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stm32_selfpowered
+ *
+ * Description:
+ *   Sets/clears the device self-powered feature
+ *
+ ****************************************************************************/
+
+static int stm32_selfpowered(struct usbdev_s *dev, bool selfpowered)
+{
+  FAR struct stm32_usbdev_s *priv = (FAR struct stm32_usbdev_s *)dev;
+
+  usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered);
+
+#ifdef CONFIG_DEBUG_FEATURES
+  if (!dev)
+    {
+      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
+      return -ENODEV;
+    }
+#endif
+
+  priv->selfpowered = selfpowered;
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stm32_pullup
+ *
+ * Description:
+ *   Software-controlled connect to/disconnect from USB host
+ *
+ ****************************************************************************/
+
+static int stm32_pullup(struct usbdev_s *dev, bool enable)
+{
+  uint32_t regval;
+
+  usbtrace(TRACE_DEVPULLUP, (uint16_t)enable);
+
+  irqstate_t flags = enter_critical_section();
+  regval = stm32_getreg(STM32_OTG_DCTL);
+  if (enable)
+    {
+      /* Connect the device by clearing the soft disconnect bit in the DCTL
+       * register
+       */
+
+      regval &= ~OTG_DCTL_SDIS;
+    }
+  else
+    {
+      /* Connect the device by setting the soft disconnect bit in the DCTL
+       * register
+       */
+
+      regval |= OTG_DCTL_SDIS;
+    }
+
+  stm32_putreg(regval, STM32_OTG_DCTL);
+  leave_critical_section(flags);
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stm32_setaddress
+ *
+ * Description:
+ *   Set the devices USB address
+ *
+ ****************************************************************************/
+
+static void stm32_setaddress(struct stm32_usbdev_s *priv, uint16_t address)
+{
+  uint32_t regval;
+
+  /* Set the device address in the DCFG register */
+
+  regval = stm32_getreg(STM32_OTG_DCFG);
+  regval &= ~OTG_DCFG_DAD_MASK;
+  regval |= ((uint32_t)address << OTG_DCFG_DAD_SHIFT);
+  stm32_putreg(regval, STM32_OTG_DCFG);
+
+  /* Are we now addressed?  (i.e., do we have a non-NULL device
+   * address?)
+   */
+
+  if (address != 0)
+    {
+      priv->devstate  = DEVSTATE_ADDRESSED;
+      priv->addressed = true;
+    }
+  else
+    {
+      priv->devstate  = DEVSTATE_DEFAULT;
+      priv->addressed = false;
+    }
+}
+
+/****************************************************************************
+ * Name: stm32_txfifo_flush
+ *
+ * Description:
+ *   Flush the specific TX fifo.
+ *
+ ****************************************************************************/
+
+static int stm32_txfifo_flush(uint32_t txfnum)
+{
+  uint32_t regval;
+  uint32_t timeout;
+
+  /* Initiate the TX FIFO flush operation */
+
+  regval = OTG_GRSTCTL_TXFFLSH | txfnum;
+  stm32_putreg(regval, STM32_OTG_GRSTCTL);
+
+  /* Wait for the FLUSH to complete */
+
+  for (timeout = 0; timeout < STM32_FLUSH_DELAY; timeout++)
+    {
+      regval = stm32_getreg(STM32_OTG_GRSTCTL);
+      if ((regval & OTG_GRSTCTL_TXFFLSH) == 0)
+        {
+          break;
+        }
+    }
+
+  /* Wait for 3 PHY Clocks */
+
+  up_udelay(3);
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stm32_rxfifo_flush
+ *
+ * Description:
+ *   Flush the RX fifo.
+ *
+ ****************************************************************************/
+
+static int stm32_rxfifo_flush(void)
+{
+  uint32_t regval;
+  uint32_t timeout;
+
+  /* Initiate the RX FIFO flush operation */
+
+  stm32_putreg(OTG_GRSTCTL_RXFFLSH, STM32_OTG_GRSTCTL);
+
+  /* Wait for the FLUSH to complete */
+
+  for (timeout = 0; timeout < STM32_FLUSH_DELAY; timeout++)
+    {
+      regval = stm32_getreg(STM32_OTG_GRSTCTL);
+      if ((regval & OTG_GRSTCTL_RXFFLSH) == 0)
+        {
+          break;
+        }
+    }
+
+  /* Wait for 3 PHY Clocks */
+
+  up_udelay(3);
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stm32_swinitialize
+ *
+ * Description:
+ *   Initialize all driver data structures.
+ *
+ ****************************************************************************/
+
+static void stm32_swinitialize(FAR struct stm32_usbdev_s *priv)
+{
+  FAR struct stm32_ep_s *privep;
+  int i;
+
+  /* Initialize the device state structure */
+
+  memset(priv, 0, sizeof(struct stm32_usbdev_s));
+
+  priv->usbdev.ops = &g_devops;
+  priv->usbdev.ep0 = &priv->epin[EP0].ep;
+
+  priv->epavail[0] = STM32_EP_AVAILABLE;
+  priv->epavail[1] = STM32_EP_AVAILABLE;
+
+  priv->epin[EP0].ep.priv  = priv;
+  priv->epout[EP0].ep.priv = priv;
+
+  /* Initialize the endpoint lists */
+
+  for (i = 0; i < STM32_NENDPOINTS; i++)
+    {
+      /* Set endpoint operations, reference to driver structure (not
+       * really necessary because there is only one controller), and
+       * the physical endpoint number (which is just the index to the
+       * endpoint).
+       */
+
+      privep           = &priv->epin[i];
+      privep->ep.ops   = &g_epops;
+      privep->dev      = priv;
+      privep->isin     = 1;
+
+      /* The index, i, is the physical endpoint address;  Map this
+       * to a logical endpoint address usable by the class driver.
+       */
+
+      privep->epphy    = i;
+      privep->ep.eplog = STM32_EPPHYIN2LOG(i);
+
+      /* Control until endpoint is activated */
+
+      privep->eptype       = USB_EP_ATTR_XFER_CONTROL;
+      privep->ep.maxpacket = CONFIG_USBDEV_EP0_MAXSIZE;
+    }
+
+  /* Initialize the endpoint lists */
+
+  for (i = 0; i < STM32_NENDPOINTS; i++)
+    {
+      /* Set endpoint operations, reference to driver structure (not
+       * really necessary because there is only one controller), and
+       * the physical endpoint number (which is just the index to the
+       * endpoint).
+       */
+
+      privep           = &priv->epout[i];
+      privep->ep.ops   = &g_epops;
+      privep->dev      = priv;
+
+      /* The index, i, is the physical endpoint address;  Map this
+       * to a logical endpoint address usable by the class driver.
+       */
+
+      privep->epphy    = i;
+      privep->ep.eplog = STM32_EPPHYOUT2LOG(i);
+
+      /* Control until endpoint is activated */
+
+      privep->eptype       = USB_EP_ATTR_XFER_CONTROL;
+      privep->ep.maxpacket = CONFIG_USBDEV_EP0_MAXSIZE;
+    }
+}
+
+/****************************************************************************
+ * Name: stm32_hwinitialize
+ *
+ * Description:
+ *   Configure the OTG  core for operation.
+ *
+ ****************************************************************************/
+
+static void stm32_hwinitialize(FAR struct stm32_usbdev_s *priv)
+{
+  uint32_t regval;
+  uint32_t timeout;
+  uint32_t address;
+  int i;
+
+  /* At start-up the core is in FS/HS mode. */
+
+  /* Disable global interrupts by clearing the GINTMASK bit in the GAHBCFG
+   * register; Set the TXFELVL bit in the GAHBCFG register so that TxFIFO
+   * interrupts will occur when the TxFIFO is truly empty (not just half full).
+   */
+
+  stm32_putreg(OTG_GAHBCFG_TXFELVL, STM32_OTG_GAHBCFG);
+
+#if defined(CONFIG_STM32F7_OTGHS)
+  /* Set the PHYSEL bit in the GUSBCFG register to select the OTG HS serial
+   * transceiver: "This bit is always 1 with write-only access"
+   */
+
+  regval  = stm32_getreg(STM32_OTG_GUSBCFG);
+  regval |= OTG_GUSBCFG_PHYSEL;
+  stm32_putreg(regval, STM32_OTG_GUSBCFG);
+#endif
+
+  /* Common USB OTG core initialization */
+  /* Reset after a PHY select and set Host mode.  First, wait for AHB master
+   * IDLE state.
+   */
+
+  for (timeout = 0; timeout < STM32_READY_DELAY; timeout++)
+    {
+      up_udelay(3);
+      regval = stm32_getreg(STM32_OTG_GRSTCTL);
+      if ((regval & OTG_GRSTCTL_AHBIDL) != 0)
+        {
+          break;
+        }
+    }
+
+  /* Then perform the core soft reset. */
+
+  stm32_putreg(OTG_GRSTCTL_CSRST, STM32_OTG_GRSTCTL);
+  for (timeout = 0; timeout < STM32_READY_DELAY; timeout++)
+    {
+      regval = stm32_getreg(STM32_OTG_GRSTCTL);
+      if ((regval & OTG_GRSTCTL_CSRST) == 0)
+        {
+          break;
+        }
+    }
+
+  /* Wait for 3 PHY Clocks */
+
+  up_udelay(3);
+
+  /* Deactivate the power down */
+
+
+  /* Detection Enable when set
+   */
+
+  regval  = OTG_GCCFG_PWRDWN;
+
+# ifdef CONFIG_USBDEV_VBUSSENSING
+  regval |= OTG_GCCFG_VBDEN;
+# endif
+
+
+  stm32_putreg(regval, STM32_OTG_GCCFG);
+  up_mdelay(20);
+
+  /* When VBUS sensing is not used we
+   * need to force the B session valid
+   */
+
+
+# ifndef CONFIG_USBDEV_VBUSSENSING
+  regval  =  stm32_getreg(STM32_OTG_GOTGCTL);
+  regval |= (OTG_GOTGCTL_BVALOEN | OTG_GOTGCTL_BVALOVAL);
+  stm32_putreg(regval, STM32_OTG_GOTGCTL);
+# endif
+
+
+  /* Force Device Mode */
+
+  regval  = stm32_getreg(STM32_OTG_GUSBCFG);
+  regval &= ~OTG_GUSBCFG_FHMOD;
+  regval |= OTG_GUSBCFG_FDMOD;
+  stm32_putreg(regval, STM32_OTG_GUSBCFG);
+  up_mdelay(50);
+
+  /* Initialize device mode */
+  /* Restart the PHY Clock */
+
+  stm32_putreg(0, STM32_OTG_PCGCCTL);
+
+  /* Device configuration register */
+
+  regval = stm32_getreg(STM32_OTG_DCFG);
+  regval &= ~OTG_DCFG_PFIVL_MASK;
+  regval |= OTG_DCFG_PFIVL_80PCT;
+  stm32_putreg(regval, STM32_OTG_DCFG);
+
+  /* Set full speed PHY */
+
+  regval = stm32_getreg(STM32_OTG_DCFG);
+  regval &= ~OTG_DCFG_DSPD_MASK;
+  regval |= OTG_DCFG_DSPD_FS;
+  stm32_putreg(regval, STM32_OTG_DCFG);
+
+  /* Set Rx FIFO size */
+
+  stm32_putreg(STM32_RXFIFO_WORDS, STM32_OTG_GRXFSIZ);
+
+#if STM32_NENDPOINTS > 0
+  address = STM32_RXFIFO_WORDS;
+  regval  = (address << OTG_DIEPTXF0_TX0FD_SHIFT) |
+            (STM32_EP0_TXFIFO_WORDS << OTG_DIEPTXF0_TX0FSA_SHIFT);
+  stm32_putreg(regval, STM32_OTG_DIEPTXF0);
+#endif
+
+#if STM32_NENDPOINTS > 1
+  address += STM32_EP0_TXFIFO_WORDS;
+  regval   = (address << OTG_DIEPTXF_INEPTXSA_SHIFT) |
+             (STM32_EP1_TXFIFO_WORDS << OTG_DIEPTXF_INEPTXFD_SHIFT);
+  stm32_putreg(regval, STM32_OTG_DIEPTXF(1));
+#endif
+
+#if STM32_NENDPOINTS > 2
+  address += STM32_EP1_TXFIFO_WORDS;
+  regval   = (address << OTG_DIEPTXF_INEPTXSA_SHIFT) |
+             (STM32_EP2_TXFIFO_WORDS << OTG_DIEPTXF_INEPTXFD_SHIFT);
+  stm32_putreg(regval, STM32_OTG_DIEPTXF(2));
+#endif
+
+#if STM32_NENDPOINTS > 3
+  address += STM32_EP2_TXFIFO_WORDS;
+  regval   = (address << OTG_DIEPTXF_INEPTXSA_SHIFT) |
+             (STM32_EP3_TXFIFO_WORDS << OTG_DIEPTXF_INEPTXFD_SHIFT);
+  stm32_putreg(regval, STM32_OTG_DIEPTXF(3));
+#endif
+
+#if STM32_NENDPOINTS > 4
+  address += STM32_EP3_TXFIFO_WORDS;
+  regval   = (address << OTG_DIEPTXF_INEPTXSA_SHIFT) |
+             (STM32_EP4_TXFIFO_WORDS << OTG_DIEPTXF_INEPTXFD_SHIFT);
+  stm32_putreg(regval, STM32_OTG_DIEPTXF(4));
+#endif
+
+#if STM32_NENDPOINTS > 5
+  address += STM32_EP4_TXFIFO_WORDS;
+  regval   = (address << OTG_DIEPTXF_INEPTXSA_SHIFT) |
+             (STM32_EP5_TXFIFO_WORDS << OTG_DIEPTXF_INEPTXFD_SHIFT);
+  stm32_putreg(regval, STM32_OTG_DIEPTXF(5));
+#endif
+
+#if STM32_NENDPOINTS > 6
+  address += STM32_EP5_TXFIFO_WORDS;
+  regval   = (address << OTG_DIEPTXF_INEPTXSA_SHIFT) |
+             (STM32_EP6_TXFIFO_WORDS << OTG_DIEPTXF_INEPTXFD_SHIFT);
+  stm32_putreg(regval, STM32_OTG_DIEPTXF(6));
+#endif
+
+#if STM32_NENDPOINTS > 7
+  address += STM32_EP6_TXFIFO_WORDS;
+  regval   = (address << OTG_DIEPTXF_INEPTXSA_SHIFT) |
+             (STM32_EP7_TXFIFO_WORDS << OTG_DIEPTXF_INEPTXFD_SHIFT);
+  stm32_putreg(regval, STM32_OTG_DIEPTXF(7));
+#endif
+
+#if STM32_NENDPOINTS > 8
+  address += STM32_EP7_TXFIFO_WORDS;
+  regval   = (address << OTG_DIEPTXF_INEPTXSA_SHIFT) |
+             (STM32_EP8_TXFIFO_WORDS << OTG_DIEPTXF_INEPTXFD_SHIFT);
+  stm32_putreg(regval, STM32_OTG_DIEPTXF(8));
+#endif
+
+  /* Flush the FIFOs */
+
+  stm32_txfifo_flush(OTG_GRSTCTL_TXFNUM_DALL);
+  stm32_rxfifo_flush();
+
+  /* Clear all pending Device Interrupts */
+
+  stm32_putreg(0, STM32_OTG_DIEPMSK);
+  stm32_putreg(0, STM32_OTG_DOEPMSK);
+  stm32_putreg(0, STM32_OTG_DIEPEMPMSK);
+  stm32_putreg(0xffffffff, STM32_OTG_DAINT);
+  stm32_putreg(0, STM32_OTG_DAINTMSK);
+
+  /* Configure all IN endpoints */
+
+  for (i = 0; i < STM32_NENDPOINTS; i++)
+    {
+      regval = stm32_getreg(STM32_OTG_DIEPCTL(i));
+      if ((regval & OTG_DIEPCTL_EPENA) != 0)
+        {
+          /* The endpoint is already enabled */
+
+          regval = OTG_DIEPCTL_EPENA | OTG_DIEPCTL_SNAK;
+        }
+      else
+        {
+          regval = 0;
+        }
+
+      stm32_putreg(regval, STM32_OTG_DIEPCTL(i));
+      stm32_putreg(0, STM32_OTG_DIEPTSIZ(i));
+      stm32_putreg(0xff, STM32_OTG_DIEPINT(i));
+    }
+
+  /* Configure all OUT endpoints */
+
+  for (i = 0; i < STM32_NENDPOINTS; i++)
+    {
+      regval = stm32_getreg(STM32_OTG_DOEPCTL(i));
+      if ((regval & OTG_DOEPCTL_EPENA) != 0)
+        {
+          /* The endpoint is already enabled */
+
+          regval = OTG_DOEPCTL_EPENA | OTG_DOEPCTL_SNAK;
+        }
+      else
+        {
+          regval = 0;
+        }
+
+      stm32_putreg(regval, STM32_OTG_DOEPCTL(i));
+      stm32_putreg(0, STM32_OTG_DOEPTSIZ(i));
+      stm32_putreg(0xff, STM32_OTG_DOEPINT(i));
+    }
+
+  /* Disable all interrupts. */
+
+  stm32_putreg(0, STM32_OTG_GINTMSK);
+
+  /* Clear any pending USB_OTG Interrupts */
+
+  stm32_putreg(0xffffffff, STM32_OTG_GOTGINT);
+
+  /* Clear any pending interrupts */
+
+  stm32_putreg(0xbfffffff, STM32_OTG_GINTSTS);
+
+#if defined(CONFIG_STM32F7_OTGHS)
+  /* Disable the ULPI Clock enable in RCC AHB1 Register.  This must
+   * be done because if both the ULPI and the FS PHY clock enable bits
+   * are set at the same time, the ARM never awakens from WFI due to
+   * some bug / errata in the chip.
+   */
+
+  regval = stm32_getreg(STM32_RCC_AHB1LPENR);
+  regval &= ~RCC_AHB1ENR_OTGULPIEN;
+  stm32_putreg(regval, STM32_RCC_AHB1LPENR);
+#endif
+
+  /* Enable the interrupts in the INTMSK */
+
+  regval = (OTG_GINT_RXFLVL | OTG_GINT_USBSUSP | OTG_GINT_ENUMDNE |
+            OTG_GINT_IEP | OTG_GINT_OEP | OTG_GINT_USBRST);
+
+#ifdef CONFIG_USBDEV_ISOCHRONOUS
+  regval |= (OTG_GINT_IISOIXFR | OTG_GINT_IISOOXFR);
+#endif
+
+#ifdef CONFIG_USBDEV_SOFINTERRUPT
+  regval |= OTG_GINT_SOF;
+#endif
+
+#ifdef CONFIG_USBDEV_VBUSSENSING
+  regval |= (OTG_GINT_OTG | OTG_GINT_SRQ);
+#endif
+
+#ifdef CONFIG_DEBUG_USB
+  regval |= OTG_GINT_MMIS;
+#endif
+
+  stm32_putreg(regval, STM32_OTG_GINTMSK);
+
+  /* Enable the USB global interrupt by setting GINTMSK in the global OTG
+   * AHB configuration register; Set the TXFELVL bit in the GAHBCFG
+   * register so that TxFIFO interrupts will occur when the TxFIFO is truly
+   * empty (not just half full).
+   */
+
+  stm32_putreg(OTG_GAHBCFG_GINTMSK | OTG_GAHBCFG_TXFELVL,
+               STM32_OTG_GAHBCFG);
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: up_usbinitialize
+ *
+ * Description:
+ *   Initialize USB hardware.
+ *
+ * Assumptions:
+ * - This function is called very early in the initialization sequence
+ * - PLL and GIO pin initialization is not performed here but should been in
+ *   the low-level  boot logic:  PLL1 must be configured for operation at 48MHz
+ *   and P0.23 and PO.31 in PINSEL1 must be configured for Vbus and USB connect
+ *   LED.
+ *
+ ****************************************************************************/
+
+void up_usbinitialize(void)
+{
+  /* At present, there is only a single OTG device support. Hence it is
+   * pre-allocated as g_otghsdev.  However, in most code, the private data
+   * structure will be referenced using the 'priv' pointer (rather than the
+   * global data) in order to simplify any future support for multiple devices.
+   */
+
+  FAR struct stm32_usbdev_s *priv = &g_otghsdev;
+  int ret;
+
+  usbtrace(TRACE_DEVINIT, 0);
+
+  /* Here we assume that:
+   *
+   * 1. GPIOA and OTG  peripheral clocking has already been enabled as part
+   *    of the boot sequence.
+   * 2. Board-specific logic has already enabled other board specific GPIOs
+   *    for things like soft pull-up, VBUS sensing, power controls, and over-
+   *    current detection.
+   */
+
+  /* Configure OTG alternate function pins
+   */
+
+  stm32_configgpio(GPIO_OTG_DM);
+  stm32_configgpio(GPIO_OTG_DP);
+  stm32_configgpio(GPIO_OTG_ID);    /* Only needed for OTG */
+
+  /* SOF output pin configuration is configurable. */
+
+#ifdef CONFIG_STM32F7_OTG_SOFOUTPUT
+  stm32_configgpio(GPIO_OTG_SOF);
+#endif
+
+  /* Uninitialize the hardware so that we know that we are starting from a
+   * known state. */
+
+  up_usbuninitialize();
+
+  /* Initialie the driver data structure */
+
+  stm32_swinitialize(priv);
+
+  /* Attach the OTG interrupt handler */
+
+  ret = irq_attach(STM32_IRQ_OTG, stm32_usbinterrupt);
+  if (ret < 0)
+    {
+      uerr("irq_attach failed\n", ret);
+      goto errout;
+    }
+
+  /* Initialize the USB OTG core */
+
+  stm32_hwinitialize(priv);
+
+  /* Disconnect device */
+
+  stm32_pullup(&priv->usbdev, false);
+
+  /* Reset/Re-initialize the USB hardware */
+
+  stm32_usbreset(priv);
+
+  /* Enable USB controller interrupts at the NVIC */
+
+  up_enable_irq(STM32_IRQ_OTG);
+
+#ifdef CONFIG_ARCH_IRQPRIO
+  /* Set the interrupt priority */
+
+  up_prioritize_irq(STM32_IRQ_OTG, CONFIG_OTG_PRI);
+#endif
+  return;
+
+errout:
+  up_usbuninitialize();
+}
+
+/****************************************************************************
+ * Name: up_usbuninitialize
+ ****************************************************************************/
+
+void up_usbuninitialize(void)
+{
+  /* At present, there is only a single OTG  device support. Hence it is
+   * pre-allocated as g_otghsdev.  However, in most code, the private data
+   * structure will be referenced using the 'priv' pointer (rather than the
+   * global data) in order to simplify any future support for multiple devices.
+   */
+
+  FAR struct stm32_usbdev_s *priv = &g_otghsdev;
+  irqstate_t flags;
+  int i;
+
+  usbtrace(TRACE_DEVUNINIT, 0);
+
+  if (priv->driver)
+    {
+      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_DRIVERREGISTERED), 0);
+      usbdev_unregister(priv->driver);
+    }
+
+  /* Disconnect device */
+
+  flags = enter_critical_section();
+  stm32_pullup(&priv->usbdev, false);
+  priv->usbdev.speed = USB_SPEED_UNKNOWN;
+
+  /* Disable and detach IRQs */
+
+  up_disable_irq(STM32_IRQ_OTG);
+  irq_detach(STM32_IRQ_OTG);
+
+  /* Disable all endpoint interrupts */
+
+  for (i = 0; i < STM32_NENDPOINTS; i++)
+    {
+      stm32_putreg(0xff, STM32_OTG_DIEPINT(i));
+      stm32_putreg(0xff, STM32_OTG_DOEPINT(i));
+    }
+
+  stm32_putreg(0, STM32_OTG_DIEPMSK);
+  stm32_putreg(0, STM32_OTG_DOEPMSK);
+  stm32_putreg(0, STM32_OTG_DIEPEMPMSK);
+  stm32_putreg(0, STM32_OTG_DAINTMSK);
+  stm32_putreg(0xffffffff, STM32_OTG_DAINT);
+
+  /* Flush the FIFOs */
+
+  stm32_txfifo_flush(OTG_GRSTCTL_TXFNUM_DALL);
+  stm32_rxfifo_flush();
+
+  /* TODO: Turn off USB power and clocking */
+
+  priv->devstate = DEVSTATE_DEFAULT;
+  leave_critical_section(flags);
+}
+
+/****************************************************************************
+ * Name: usbdev_register
+ *
+ * Description:
+ *   Register a USB device class driver. The class driver's bind() method will be
+ *   called to bind it to a USB device driver.
+ *
+ ****************************************************************************/
+
+int usbdev_register(struct usbdevclass_driver_s *driver)
+{
+  /* At present, there is only a single OTG  device support. Hence it is
+   * pre-allocated as g_otghsdev.  However, in most code, the private data
+   * structure will be referenced using the 'priv' pointer (rather than the
+   * global data) in order to simplify any future support for multiple devices.
+   */
+
+  FAR struct stm32_usbdev_s *priv = &g_otghsdev;
+  int ret;
+
+  usbtrace(TRACE_DEVREGISTER, 0);
+
+#ifdef CONFIG_DEBUG_FEATURES
+  if (!driver || !driver->ops->bind || !driver->ops->unbind ||
+      !driver->ops->disconnect || !driver->ops->setup)
+    {
+      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
+      return -EINVAL;
+    }
+
+  if (priv->driver)
+    {
+      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_DRIVER), 0);
+      return -EBUSY;
+    }
+#endif
+
+  /* First hook up the driver */
+
+  priv->driver = driver;
+
+  /* Then bind the class driver */
+
+  ret = CLASS_BIND(driver, &priv->usbdev);
+  if (ret)
+    {
+      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BINDFAILED), (uint16_t)-ret);
+      priv->driver = NULL;
+    }
+  else
+    {
+      /* Enable USB controller interrupts */
+
+      up_enable_irq(STM32_IRQ_OTG);
+
+      /* FIXME: nothing seems to call DEV_CONNECT(), but we need to set
+       *        the RS bit to enable the controller.  It kind of makes sense
+       *        to do this after the class has bound to us...
+       * GEN:   This bug is really in the class driver.  It should make the
+       *        soft connect when it is ready to be enumerated.  I have added
+       *        that logic to the class drivers but left this logic here.
+       */
+
+      stm32_pullup(&priv->usbdev, true);
+      priv->usbdev.speed = USB_SPEED_FULL;
+    }
+
+  return ret;
+}
+
+/****************************************************************************
+ * Name: usbdev_unregister
+ *
+ * Description:
+ *   Un-register usbdev class driver.If the USB device is connected to a USB host,
+ *   it will first disconnect().  The driver is also requested to unbind() and clean
+ *   up any device state, before this procedure finally returns.
+ *
+ ****************************************************************************/
+
+int usbdev_unregister(struct usbdevclass_driver_s *driver)
+{
+  /* At present, there is only a single OTG device support. Hence it is
+   * pre-allocated as g_otghsdev.  However, in most code, the private data
+   * structure will be referenced using the 'priv' pointer (rather than the
+   * global data) in order to simplify any future support for multiple devices.
+   */
+
+  FAR struct stm32_usbdev_s *priv = &g_otghsdev;
+  irqstate_t flags;
+
+  usbtrace(TRACE_DEVUNREGISTER, 0);
+
+#ifdef CONFIG_DEBUG_FEATURES
+  if (driver != priv->driver)
+    {
+      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
+      return -EINVAL;
+    }
+#endif
+
+  /* Reset the hardware and cancel all requests.  All requests must be
+   * canceled while the class driver is still bound.
+   */
+
+  flags = enter_critical_section();
+  stm32_usbreset(priv);
+  leave_critical_section(flags);
+
+  /* Unbind the class driver */
+
+  CLASS_UNBIND(driver, &priv->usbdev);
+
+  /* Disable USB controller interrupts */
+
+  flags = enter_critical_section();
+  up_disable_irq(STM32_IRQ_OTG);
+
+  /* Disconnect device */
+
+  stm32_pullup(&priv->usbdev, false);
+
+  /* Unhook the driver */
+
+  priv->driver = NULL;
+  leave_critical_section(flags);
+
+  return OK;
+}
+
+#endif /* CONFIG_USBDEV && CONFIG_STM32F7_OTGDEV */
diff --git a/arch/arm/src/stm32f7/stm32_otghost.c b/arch/arm/src/stm32f7/stm32_otghost.c
new file mode 100644
index 0000000000..0feb6c98da
--- /dev/null
+++ b/arch/arm/src/stm32f7/stm32_otghost.c
@@ -0,0 +1,5306 @@
+/****************************************************************************
+ * arch/arm/src/stm32f7/stm32_otghost.c
+ *
+ *   Copyright (C) 2012-2016 Gregory Nutt. All rights reserved.
+ *   Authors: 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 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+#include "chip.h"             /* Includes default GPIO settings */
+#include  /* May redefine GPIO settings */
+
+#include "up_arch.h"
+#include "up_internal.h"
+
+#include "stm32_otg.h"
+
+#if defined(CONFIG_USBHOST) && defined(CONFIG_STM32F7_OTGFS)
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+/* Configuration ***************************************************************/
+/* STM32 USB OTG FS Host Driver Support
+ *
+ * Pre-requisites
+ *
+ *  CONFIG_USBHOST      - Enable general USB host support
+ *  CONFIG_STM32F7_OTGFS  - Enable the STM32 USB OTG FS block
+ *  CONFIG_STM32F7_SYSCFG - Needed
+ *
+ * Options:
+ *
+ *  CONFIG_STM32F7_OTG_RXFIFO_SIZE - Size of the RX FIFO in 32-bit words.
+ *    Default 128 (512 bytes)
+ *  CONFIG_STM32F7_OTG_NPTXFIFO_SIZE - Size of the non-periodic Tx FIFO
+ *    in 32-bit words.  Default 96 (384 bytes)
+ *  CONFIG_STM32F7_OTG_PTXFIFO_SIZE - Size of the periodic Tx FIFO in 32-bit
+ *    words.  Default 96 (384 bytes)
+ *  CONFIG_STM32F7_OTG_DESCSIZE - Maximum size of a descriptor.  Default: 128
+ *  CONFIG_STM32F7_OTG_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_FEATURES.
+ *  CONFIG_STM32F7_USBHOST_PKTDUMP - Dump all incoming and outgoing USB
+ *    packets. Depends on CONFIG_DEBUG_FEATURES.
+ */
+
+/* Pre-requisites (partial) */
+
+#ifndef CONFIG_STM32F7_SYSCFG
+#  error "CONFIG_STM32F7_SYSCFG is required"
+#endif
+
+/* Default RxFIFO size */
+
+#ifndef CONFIG_STM32F7_OTG_RXFIFO_SIZE
+#  define CONFIG_STM32F7_OTG_RXFIFO_SIZE 128
+#endif
+
+/* Default host non-periodic Tx FIFO size */
+
+#ifndef CONFIG_STM32F7_OTG_NPTXFIFO_SIZE
+#  define CONFIG_STM32F7_OTG_NPTXFIFO_SIZE 96
+#endif
+
+/* Default host periodic Tx fifo size register */
+
+#ifndef CONFIG_STM32F7_OTG_PTXFIFO_SIZE
+#  define CONFIG_STM32F7_OTG_PTXFIFO_SIZE 96
+#endif
+
+/* Maximum size of a descriptor */
+
+#ifndef CONFIG_STM32F7_OTG_DESCSIZE
+#  define CONFIG_STM32F7_OTG_DESCSIZE 128
+#endif
+
+/* Register/packet debug depends on CONFIG_DEBUG_FEATURES */
+
+#ifndef CONFIG_DEBUG_FEATURES
+#  undef CONFIG_STM32F7_USBHOST_REGDEBUG
+#  undef CONFIG_STM32F7_USBHOST_PKTDUMP
+#endif
+
+/* HCD Setup *******************************************************************/
+/* Hardware capabilities */
+
+#define STM32_NHOST_CHANNELS      8   /* Number of host channels */
+#define STM32_MAX_PACKET_SIZE     64  /* Full speed max packet size */
+#define STM32_EP0_DEF_PACKET_SIZE 8   /* EP0 default packet size */
+#define STM32_EP0_MAX_PACKET_SIZE 64  /* EP0 FS max packet size */
+#define STM32_MAX_TX_FIFOS        15  /* Max number of TX FIFOs */
+#define STM32_MAX_PKTCOUNT        256 /* Max packet count */
+#define STM32_RETRY_COUNT         3   /* Number of ctrl transfer retries */
+
+/* Delays **********************************************************************/
+
+#define STM32_READY_DELAY         200000 /* In loop counts */
+#define STM32_FLUSH_DELAY         200000 /* In loop counts */
+#define STM32_SETUP_DELAY         SEC2TICK(5) /* 5 seconds in system ticks */
+#define STM32_DATANAK_DELAY       SEC2TICK(5) /* 5 seconds in system ticks */
+
+/* Ever-present MIN/MAX macros */
+
+#ifndef MIN
+#  define  MIN(a, b) (((a) < (b)) ? (a) : (b))
+#endif
+
+#ifndef MAX
+#  define  MAX(a, b) (((a) > (b)) ? (a) : (b))
+#endif
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/* The following enumeration represents the various states of the USB host
+ * state machine (for debug purposes only)
+ */
+
+enum stm32_smstate_e
+{
+  SMSTATE_DETACHED = 0,  /* Not attached to a device */
+  SMSTATE_ATTACHED,      /* Attached to a device */
+  SMSTATE_ENUM,          /* Attached, enumerating */
+  SMSTATE_CLASS_BOUND,   /* Enumeration complete, class bound */
+};
+
+/* This enumeration provides the reason for the channel halt. */
+
+enum stm32_chreason_e
+{
+  CHREASON_IDLE = 0,     /* Inactive (initial state) */
+  CHREASON_FREED,        /* Channel is no longer in use */
+  CHREASON_XFRC,         /* Transfer complete */
+  CHREASON_NAK,          /* NAK received */
+  CHREASON_NYET,         /* NotYet received */
+  CHREASON_STALL,        /* Endpoint stalled */
+  CHREASON_TXERR,        /* Transfer error received */
+  CHREASON_DTERR,        /* Data toggle error received */
+  CHREASON_FRMOR,        /* Frame overrun */
+  CHREASON_CANCELLED     /* Transfer cancelled */
+};
+
+/* This structure retains the state of one host channel.  NOTE: Since there
+ * is only one channel operation active at a time, some of the fields in
+ * in the structure could be moved in struct stm32_ubhost_s to achieve
+ * some memory savings.
+ */
+
+struct stm32_chan_s
+{
+  sem_t             waitsem;   /* Channel wait semaphore */
+  volatile uint8_t  result;    /* The result of the transfer */
+  volatile uint8_t  chreason;  /* Channel halt reason. See enum stm32_chreason_e */
+  uint8_t           chidx;     /* Channel index */
+  uint8_t           epno;      /* Device endpoint number (0-127) */
+  uint8_t           eptype;    /* See OTG_EPTYPE_* definitions */
+  uint8_t           funcaddr;  /* Device function address */
+  uint8_t           speed;     /* Device speed */
+  uint8_t           pid;       /* Data PID */
+  uint8_t           npackets;  /* Number of packets (for data toggle) */
+  bool              inuse;     /* True: This channel is "in use" */
+  volatile bool     indata1;   /* IN data toggle. True: DATA01 (Bulk and INTR only) */
+  volatile bool     outdata1;  /* OUT data toggle.  True: DATA01 */
+  bool              in;        /* True: IN endpoint */
+  volatile bool     waiter;    /* True: Thread is waiting for a channel event */
+  uint16_t          maxpacket; /* Max packet size */
+  uint16_t          buflen;    /* Buffer length (at start of transfer) */
+  volatile uint16_t xfrd;      /* Bytes transferred (at end of transfer) */
+  volatile uint16_t inflight;  /* Number of Tx bytes "in-flight" */
+  FAR uint8_t      *buffer;    /* Transfer buffer pointer */
+#ifdef CONFIG_USBHOST_ASYNCH
+  usbhost_asynch_t  callback;  /* Transfer complete callback */
+  FAR void         *arg;       /* Argument that accompanies the callback */
+#endif
+};
+
+/* A channel represents on uni-directional endpoint.  So, in the case of the
+ * bi-directional, control endpoint, there must be two channels to represent
+ * the endpoint.
+ */
+
+struct stm32_ctrlinfo_s
+{
+  uint8_t           inndx;     /* EP0 IN control channel index */
+  uint8_t           outndx;    /* EP0 OUT control channel index */
+};
+
+/* This structure retains the state of the USB host controller */
+
+struct stm32_usbhost_s
+{
+  /* Common device fields.  This must be the first thing defined in the
+   * structure so that it is possible to simply cast from struct usbhost_s
+   * to structstm32_usbhost_s.
+   */
+
+  struct usbhost_driver_s drvr;
+
+  /* This is the hub port description understood by class drivers */
+
+  struct usbhost_roothubport_s rhport;
+
+  /* Overall driver status */
+
+  volatile uint8_t  smstate;   /* The state of the USB host state machine */
+  uint8_t           chidx;     /* ID of channel waiting for space in Tx FIFO */
+  volatile bool     connected; /* Connected to device */
+  volatile bool     change;    /* Connection change */
+  volatile bool     pscwait;   /* True: Thread is waiting for a port event */
+  sem_t             exclsem;   /* Support mutually exclusive access */
+  sem_t             pscsem;    /* Semaphore to wait for a port event */
+  struct stm32_ctrlinfo_s ep0;  /* Root hub port EP0 description */
+
+#ifdef CONFIG_USBHOST_HUB
+  /* Used to pass external hub port events */
+
+  volatile struct usbhost_hubport_s *hport;
+#endif
+
+  /* The state of each host channel */
+
+  struct stm32_chan_s chan[STM32_MAX_TX_FIFOS];
+};
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+/* Register operations ********************************************************/
+
+#ifdef CONFIG_STM32F7_USBHOST_REGDEBUG
+static void stm32_printreg(uint32_t addr, uint32_t val, bool iswrite);
+static void stm32_checkreg(uint32_t addr, uint32_t val, bool iswrite);
+static uint32_t stm32_getreg(uint32_t addr);
+static void stm32_putreg(uint32_t addr, uint32_t value);
+#else
+# define stm32_getreg(addr)     getreg32(addr)
+# define stm32_putreg(addr,val) putreg32(val,addr)
+#endif
+
+static inline void stm32_modifyreg(uint32_t addr, uint32_t clrbits,
+                                   uint32_t setbits);
+
+#ifdef CONFIG_STM32F7_USBHOST_PKTDUMP
+#  define stm32_pktdump(m,b,n) lib_dumpbuffer(m,b,n)
+#else
+#  define stm32_pktdump(m,b,n)
+#endif
+
+/* Semaphores ******************************************************************/
+
+static void stm32_takesem(sem_t *sem);
+#define stm32_givesem(s) sem_post(s);
+
+/* Byte stream access helper functions *****************************************/
+
+static inline uint16_t stm32_getle16(const uint8_t *val);
+
+/* Channel management **********************************************************/
+
+static int stm32_chan_alloc(FAR struct stm32_usbhost_s *priv);
+static inline void stm32_chan_free(FAR struct stm32_usbhost_s *priv, int chidx);
+static inline void stm32_chan_freeall(FAR struct stm32_usbhost_s *priv);
+static void stm32_chan_configure(FAR struct stm32_usbhost_s *priv, int chidx);
+static void stm32_chan_halt(FAR struct stm32_usbhost_s *priv, int chidx,
+                            enum stm32_chreason_e chreason);
+static int stm32_chan_waitsetup(FAR struct stm32_usbhost_s *priv,
+                                FAR struct stm32_chan_s *chan);
+#ifdef CONFIG_USBHOST_ASYNCH
+static int stm32_chan_asynchsetup(FAR struct stm32_usbhost_s *priv,
+                                  FAR struct stm32_chan_s *chan,
+                                  usbhost_asynch_t callback, FAR void *arg);
+#endif
+static int stm32_chan_wait(FAR struct stm32_usbhost_s *priv,
+                           FAR struct stm32_chan_s *chan);
+static void stm32_chan_wakeup(FAR struct stm32_usbhost_s *priv,
+                              FAR struct stm32_chan_s *chan);
+static int stm32_ctrlchan_alloc(FAR struct stm32_usbhost_s *priv,
+                                uint8_t epno, uint8_t funcaddr, uint8_t speed,
+                                FAR struct stm32_ctrlinfo_s *ctrlep);
+static int stm32_ctrlep_alloc(FAR struct stm32_usbhost_s *priv,
+                              FAR const struct usbhost_epdesc_s *epdesc,
+                              FAR usbhost_ep_t *ep);
+static int stm32_xfrep_alloc(FAR struct stm32_usbhost_s *priv,
+                              FAR const struct usbhost_epdesc_s *epdesc,
+                              FAR usbhost_ep_t *ep);
+
+/* Control/data transfer logic *************************************************/
+
+static void stm32_transfer_start(FAR struct stm32_usbhost_s *priv, int chidx);
+#if 0 /* Not used */
+static inline uint16_t stm32_getframe(void);
+#endif
+static int stm32_ctrl_sendsetup(FAR struct stm32_usbhost_s *priv,
+                                FAR struct stm32_ctrlinfo_s *ep0,
+                                FAR const struct usb_ctrlreq_s *req);
+static int stm32_ctrl_senddata(FAR struct stm32_usbhost_s *priv,
+                               FAR struct stm32_ctrlinfo_s *ep0,
+                               FAR uint8_t *buffer, unsigned int buflen);
+static int stm32_ctrl_recvdata(FAR struct stm32_usbhost_s *priv,
+                               FAR struct stm32_ctrlinfo_s *ep0,
+                               FAR uint8_t *buffer, unsigned int buflen);
+static int stm32_in_setup(FAR struct stm32_usbhost_s *priv, int chidx);
+static ssize_t stm32_in_transfer(FAR struct stm32_usbhost_s *priv, int chidx,
+                                 FAR uint8_t *buffer, size_t buflen);
+#ifdef CONFIG_USBHOST_ASYNCH
+static void stm32_in_next(FAR struct stm32_usbhost_s *priv,
+                          FAR struct stm32_chan_s *chan);
+static int stm32_in_asynch(FAR struct stm32_usbhost_s *priv, int chidx,
+                           FAR uint8_t *buffer, size_t buflen,
+                           usbhost_asynch_t callback, FAR void *arg);
+#endif
+static int stm32_out_setup(FAR struct stm32_usbhost_s *priv, int chidx);
+static ssize_t stm32_out_transfer(FAR struct stm32_usbhost_s *priv, int chidx,
+                                  FAR uint8_t *buffer, size_t buflen);
+#ifdef CONFIG_USBHOST_ASYNCH
+static void stm32_out_next(FAR struct stm32_usbhost_s *priv,
+                           FAR struct stm32_chan_s *chan);
+static int stm32_out_asynch(FAR struct stm32_usbhost_s *priv, int chidx,
+                            FAR uint8_t *buffer, size_t buflen,
+                            usbhost_asynch_t callback, FAR void *arg);
+#endif
+
+/* Interrupt handling **********************************************************/
+/* Lower level interrupt handlers */
+
+static void stm32_gint_wrpacket(FAR struct stm32_usbhost_s *priv,
+                                FAR uint8_t *buffer, int chidx, int buflen);
+static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv,
+                                      int chidx);
+static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv,
+                                       int chidx);
+static void stm32_gint_connected(FAR struct stm32_usbhost_s *priv);
+static void stm32_gint_disconnected(FAR struct stm32_usbhost_s *priv);
+
+/* Second level interrupt handlers */
+
+#ifdef CONFIG_STM32F7_OTG_SOFINTR
+static inline void stm32_gint_sofisr(FAR struct stm32_usbhost_s *priv);
+#endif
+static inline void stm32_gint_rxflvlisr(FAR struct stm32_usbhost_s *priv);
+static inline void stm32_gint_nptxfeisr(FAR struct stm32_usbhost_s *priv);
+static inline void stm32_gint_ptxfeisr(FAR struct stm32_usbhost_s *priv);
+static inline void stm32_gint_hcisr(FAR struct stm32_usbhost_s *priv);
+static inline void stm32_gint_hprtisr(FAR struct stm32_usbhost_s *priv);
+static inline void stm32_gint_discisr(FAR struct stm32_usbhost_s *priv);
+static inline void stm32_gint_ipxfrisr(FAR struct stm32_usbhost_s *priv);
+
+/* First level, global interrupt handler */
+
+static int stm32_gint_isr(int irq, FAR void *context);
+
+/* Interrupt controls */
+
+static void stm32_gint_enable(void);
+static void stm32_gint_disable(void);
+static inline void stm32_hostinit_enable(void);
+static void stm32_txfe_enable(FAR struct stm32_usbhost_s *priv, int chidx);
+
+/* USB host controller operations **********************************************/
+
+static int stm32_wait(FAR struct usbhost_connection_s *conn,
+                      FAR struct usbhost_hubport_s **hport);
+static int stm32_rh_enumerate(FAR struct stm32_usbhost_s *priv,
+                              FAR struct usbhost_connection_s *conn,
+                              FAR struct usbhost_hubport_s *hport);
+static int stm32_enumerate(FAR struct usbhost_connection_s *conn,
+                           FAR struct usbhost_hubport_s *hport);
+
+static int stm32_ep0configure(FAR struct usbhost_driver_s *drvr,
+                              usbhost_ep_t ep0, uint8_t funcaddr, uint8_t speed,
+                              uint16_t maxpacketsize);
+static int stm32_epalloc(FAR struct usbhost_driver_s *drvr,
+                         FAR const FAR struct usbhost_epdesc_s *epdesc,
+                         FAR usbhost_ep_t *ep);
+static int stm32_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep);
+static int stm32_alloc(FAR struct usbhost_driver_s *drvr,
+                       FAR uint8_t **buffer, FAR size_t *maxlen);
+static int stm32_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer);
+static int stm32_ioalloc(FAR struct usbhost_driver_s *drvr,
+                         FAR uint8_t **buffer, size_t buflen);
+static int stm32_iofree(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer);
+static int stm32_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
+                        const struct usb_ctrlreq_s *req,
+                        FAR uint8_t *buffer);
+static int stm32_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
+                         FAR const struct usb_ctrlreq_s *req,
+                         FAR const uint8_t *buffer);
+static ssize_t stm32_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep,
+                              FAR uint8_t *buffer, size_t buflen);
+#ifdef CONFIG_USBHOST_ASYNCH
+static int stm32_asynch(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep,
+                        FAR uint8_t *buffer, size_t buflen,
+                        usbhost_asynch_t callback, FAR void *arg);
+#endif
+static int stm32_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep);
+#ifdef CONFIG_USBHOST_HUB
+static int stm32_connect(FAR struct usbhost_driver_s *drvr,
+                         FAR struct usbhost_hubport_s *hport,
+                         bool connected);
+#endif
+static void stm32_disconnect(FAR struct usbhost_driver_s *drvr,
+                             FAR struct usbhost_hubport_s *hport);
+
+/* Initialization **************************************************************/
+
+static void stm32_portreset(FAR struct stm32_usbhost_s *priv);
+static void stm32_flush_txfifos(uint32_t txfnum);
+static void stm32_flush_rxfifo(void);
+static void stm32_vbusdrive(FAR struct stm32_usbhost_s *priv, bool state);
+static void stm32_host_initialize(FAR struct stm32_usbhost_s *priv);
+
+static inline void stm32_sw_initialize(FAR struct stm32_usbhost_s *priv);
+static inline int stm32_hw_initialize(FAR struct stm32_usbhost_s *priv);
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* In this driver implementation, support is provided for only a single a single
+ * USB device.  All status information can be simply retained in a single global
+ * instance.
+ */
+
+static struct stm32_usbhost_s g_usbhost;
+
+/* This is the connection/enumeration interface */
+
+static struct usbhost_connection_s g_usbconn =
+{
+  .wait             = stm32_wait,
+  .enumerate        = stm32_enumerate,
+};
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stm32_printreg
+ *
+ * Description:
+ *   Print the contents of an STM32xx register operation
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_STM32F7_USBHOST_REGDEBUG
+static void stm32_printreg(uint32_t addr, uint32_t val, bool iswrite)
+{
+  llerr("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val);
+}
+#endif
+
+/****************************************************************************
+ * Name: stm32_checkreg
+ *
+ * Description:
+ *   Get the contents of an STM32 register
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_STM32F7_USBHOST_REGDEBUG
+static void stm32_checkreg(uint32_t addr, uint32_t val, bool iswrite)
+{
+  static uint32_t prevaddr = 0;
+  static uint32_t preval = 0;
+  static uint32_t count = 0;
+  static bool     prevwrite = false;
+
+  /* Is this the same value that we read from/wrote to the same register last time?
+   * Are we polling the register?  If so, suppress the output.
+   */
+
+  if (addr == prevaddr && val == preval && prevwrite == iswrite)
+    {
+      /* Yes.. Just increment the count */
+
+      count++;
+    }
+  else
+    {
+      /* No this is a new address or value or operation. Were there any
+       * duplicate accesses before this one?
+       */
+
+      if (count > 0)
+        {
+          /* Yes.. Just one? */
+
+          if (count == 1)
+            {
+              /* Yes.. Just one */
+
+              stm32_printreg(prevaddr, preval, prevwrite);
+            }
+          else
+            {
+              /* No.. More than one. */
+
+              llerr("[repeats %d more times]\n", count);
+            }
+        }
+
+      /* Save the new address, value, count, and operation for next time */
+
+      prevaddr  = addr;
+      preval    = val;
+      count     = 0;
+      prevwrite = iswrite;
+
+      /* Show the new regisgter access */
+
+      stm32_printreg(addr, val, iswrite);
+    }
+}
+#endif
+
+/****************************************************************************
+ * Name: stm32_getreg
+ *
+ * Description:
+ *   Get the contents of an STM32 register
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_STM32F7_USBHOST_REGDEBUG
+static uint32_t stm32_getreg(uint32_t addr)
+{
+  /* Read the value from the register */
+
+  uint32_t val = getreg32(addr);
+
+  /* Check if we need to print this value */
+
+  stm32_checkreg(addr, val, false);
+  return val;
+}
+#endif
+
+/****************************************************************************
+ * Name: stm32_putreg
+ *
+ * Description:
+ *   Set the contents of an STM32 register to a value
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_STM32F7_USBHOST_REGDEBUG
+static void stm32_putreg(uint32_t addr, uint32_t val)
+{
+  /* Check if we need to print this value */
+
+  stm32_checkreg(addr, val, true);
+
+  /* Write the value */
+
+  putreg32(val, addr);
+}
+#endif
+
+/****************************************************************************
+ * Name: stm32_modifyreg
+ *
+ * Description:
+ *   Modify selected bits of an STM32 register.
+ *
+ ****************************************************************************/
+
+static inline void stm32_modifyreg(uint32_t addr, uint32_t clrbits, uint32_t setbits)
+{
+  stm32_putreg(addr, (((stm32_getreg(addr)) & ~clrbits) | setbits));
+}
+
+/****************************************************************************
+ * Name: stm32_takesem
+ *
+ * Description:
+ *   This is just a wrapper to handle the annoying behavior of semaphore
+ *   waits that return due to the receipt of a signal.
+ *
+ ****************************************************************************/
+
+static void stm32_takesem(sem_t *sem)
+{
+  /* Take the semaphore (perhaps waiting) */
+
+  while (sem_wait(sem) != 0)
+    {
+      /* The only case that an error should occr here is if the wait was
+       * awakened by a signal.
+       */
+
+      ASSERT(errno == EINTR);
+    }
+}
+
+/****************************************************************************
+ * Name: stm32_getle16
+ *
+ * Description:
+ *   Get a (possibly unaligned) 16-bit little endian value.
+ *
+ ****************************************************************************/
+
+static inline uint16_t stm32_getle16(const uint8_t *val)
+{
+  return (uint16_t)val[1] << 8 | (uint16_t)val[0];
+}
+
+/****************************************************************************
+ * Name: stm32_chan_alloc
+ *
+ * Description:
+ *   Allocate a channel.
+ *
+ ****************************************************************************/
+
+static int stm32_chan_alloc(FAR struct stm32_usbhost_s *priv)
+{
+  int chidx;
+
+  /* Search the table of channels */
+
+  for (chidx = 0; chidx < STM32_NHOST_CHANNELS; chidx++)
+    {
+      /* Is this channel available? */
+
+      if (!priv->chan[chidx].inuse)
+        {
+          /* Yes... make it "in use" and return the index */
+
+          priv->chan[chidx].inuse = true;
+          return chidx;
+        }
+    }
+
+  /* All of the channels are "in-use" */
+
+  return -EBUSY;
+}
+
+/****************************************************************************
+ * Name: stm32_chan_free
+ *
+ * Description:
+ *   Free a previoiusly allocated channel.
+ *
+ ****************************************************************************/
+
+static void stm32_chan_free(FAR struct stm32_usbhost_s *priv, int chidx)
+{
+  DEBUGASSERT((unsigned)chidx < STM32_NHOST_CHANNELS);
+
+  /* Halt the channel */
+
+  stm32_chan_halt(priv, chidx, CHREASON_FREED);
+
+  /* Mark the channel available */
+
+  priv->chan[chidx].inuse = false;
+}
+
+/****************************************************************************
+ * Name: stm32_chan_freeall
+ *
+ * Description:
+ *   Free all channels.
+ *
+ ****************************************************************************/
+
+static inline void stm32_chan_freeall(FAR struct stm32_usbhost_s *priv)
+{
+  uint8_t chidx;
+
+  /* Free all host channels */
+
+  for (chidx = 2; chidx < STM32_NHOST_CHANNELS; chidx ++)
+    {
+      stm32_chan_free(priv, chidx);
+    }
+}
+
+/****************************************************************************
+ * Name: stm32_chan_configure
+ *
+ * Description:
+ *   Configure or re-configure a host channel.  Host channels are configured
+ *   when endpoint is allocated and EP0 (only) is re-configured with the
+ *   max packet size or device address changes.
+ *
+ ****************************************************************************/
+
+static void stm32_chan_configure(FAR struct stm32_usbhost_s *priv, int chidx)
+{
+  FAR struct stm32_chan_s *chan = &priv->chan[chidx];
+  uint32_t regval;
+
+  /* Clear any old pending interrupts for this host channel. */
+
+  stm32_putreg(STM32_OTG_HCINT(chidx), 0xffffffff);
+
+  /* Enable channel interrupts required for transfers on this channel. */
+
+  regval = 0;
+
+  switch (chan->eptype)
+    {
+    case OTG_EPTYPE_CTRL:
+    case OTG_EPTYPE_BULK:
+      {
+#ifdef HAVE_USBHOST_TRACE_VERBOSE
+        uint16_t intrace;
+        uint16_t outtrace;
+
+        /* Determine the definitive trace ID to use below */
+
+        if (chan->eptype == OTG_EPTYPE_CTRL)
+          {
+            intrace  = OTG_VTRACE2_CHANCONF_CTRL_IN;
+            outtrace = OTG_VTRACE2_CHANCONF_CTRL_OUT;
+          }
+        else
+          {
+            intrace  = OTG_VTRACE2_CHANCONF_BULK_IN;
+            outtrace = OTG_VTRACE2_CHANCONF_BULK_OUT;
+          }
+#endif
+
+        /* Interrupts required for CTRL and BULK endpoints */
+
+        regval |= (OTG_HCINT_XFRC  | OTG_HCINT_STALL | OTG_HCINT_NAK |
+                   OTG_HCINT_TXERR | OTG_HCINT_DTERR);
+
+        /* Additional setting for IN/OUT endpoints */
+
+        if (chan->in)
+          {
+            usbhost_vtrace2(intrace, chidx, chan->epno);
+            regval |= OTG_HCINT_BBERR;
+          }
+        else
+          {
+            usbhost_vtrace2(outtrace, chidx, chan->epno);
+            regval |= OTG_HCINT_NYET;
+          }
+      }
+      break;
+
+    case OTG_EPTYPE_INTR:
+      {
+        /* Interrupts required for INTR endpoints */
+
+        regval |= (OTG_HCINT_XFRC | OTG_HCINT_STALL | OTG_HCINT_NAK |
+                   OTG_HCINT_TXERR | OTG_HCINT_FRMOR | OTG_HCINT_DTERR);
+
+        /* Additional setting for IN endpoints */
+
+        if (chan->in)
+          {
+            usbhost_vtrace2(OTG_VTRACE2_CHANCONF_INTR_IN, chidx,
+                            chan->epno);
+            regval |= OTG_HCINT_BBERR;
+          }
+#ifdef HAVE_USBHOST_TRACE_VERBOSE
+        else
+          {
+            usbhost_vtrace2(OTG_VTRACE2_CHANCONF_INTR_OUT, chidx,
+                            chan->epno);
+          }
+#endif
+      }
+      break;
+
+    case OTG_EPTYPE_ISOC:
+      {
+        /* Interrupts required for ISOC endpoints */
+
+        regval |= (OTG_HCINT_XFRC | OTG_HCINT_ACK | OTG_HCINT_FRMOR);
+
+        /* Additional setting for IN endpoints */
+
+        if (chan->in)
+          {
+            usbhost_vtrace2(OTG_VTRACE2_CHANCONF_ISOC_IN, chidx,
+                            chan->epno);
+            regval |= (OTG_HCINT_TXERR | OTG_HCINT_BBERR);
+          }
+#ifdef HAVE_USBHOST_TRACE_VERBOSE
+        else
+          {
+            usbhost_vtrace2(OTG_VTRACE2_CHANCONF_ISOC_OUT, chidx,
+                            chan->epno);
+          }
+#endif
+      }
+      break;
+    }
+
+  stm32_putreg(STM32_OTG_HCINTMSK(chidx), regval);
+
+  /* Enable the top level host channel interrupt. */
+
+  stm32_modifyreg(STM32_OTG_HAINTMSK, 0, OTG_HAINT(chidx));
+
+  /* Make sure host channel interrupts are enabled. */
+
+  stm32_modifyreg(STM32_OTG_GINTMSK, 0, OTG_GINT_HC);
+
+  /* Program the HCCHAR register */
+
+  regval = ((uint32_t)chan->maxpacket << OTG_HCCHAR_MPSIZ_SHIFT) |
+           ((uint32_t)chan->epno      << OTG_HCCHAR_EPNUM_SHIFT) |
+           ((uint32_t)chan->eptype    << OTG_HCCHAR_EPTYP_SHIFT) |
+           ((uint32_t)chan->funcaddr  << OTG_HCCHAR_DAD_SHIFT);
+
+  /* Special case settings for low speed devices */
+
+  if (chan->speed == USB_SPEED_LOW)
+    {
+      regval |= OTG_HCCHAR_LSDEV;
+    }
+
+  /* Special case settings for IN endpoints */
+
+  if (chan->in)
+    {
+      regval |= OTG_HCCHAR_EPDIR_IN;
+    }
+
+  /* Special case settings for INTR endpoints */
+
+  if (chan->eptype == OTG_EPTYPE_INTR)
+    {
+      regval |= OTG_HCCHAR_ODDFRM;
+    }
+
+  /* Write the channel configuration */
+
+  stm32_putreg(STM32_OTG_HCCHAR(chidx), regval);
+}
+
+/****************************************************************************
+ * Name: stm32_chan_halt
+ *
+ * Description:
+ *   Halt the channel associated with 'chidx' by setting the CHannel DISable
+ *   (CHDIS) bit in in the HCCHAR register.
+ *
+ ****************************************************************************/
+
+static void stm32_chan_halt(FAR struct stm32_usbhost_s *priv, int chidx,
+                            enum stm32_chreason_e chreason)
+{
+  uint32_t hcchar;
+  uint32_t intmsk;
+  uint32_t eptype;
+  unsigned int avail;
+
+  /* Save the reason for the halt.  We need this in the channel halt interrupt
+   * handling logic to know what to do next.
+   */
+
+  usbhost_vtrace2(OTG_VTRACE2_CHANHALT, chidx, chreason);
+
+  priv->chan[chidx].chreason = (uint8_t)chreason;
+
+  /* "The application can disable any channel by programming the OTG_FS_HCCHARx
+   *  register with the CHDIS and CHENA bits set to 1. This enables the OTG_FS
+   *  host to flush the posted requests (if any) and generates a channel halted
+   *  interrupt. The application must wait for the CHH interrupt in OTG_FS_HCINTx
+   *  before reallocating the channel for other transactions.  The OTG_FS host
+   *  does not interrupt the transaction that has already been started on the
+   *  USB."
+   */
+
+  hcchar  = stm32_getreg(STM32_OTG_HCCHAR(chidx));
+  hcchar |= (OTG_HCCHAR_CHDIS | OTG_HCCHAR_CHENA);
+
+  /* Get the endpoint type from the HCCHAR register */
+
+  eptype = hcchar & OTG_HCCHAR_EPTYP_MASK;
+
+  /* Check for space in the Tx FIFO to issue the halt.
+   *
+   * "Before disabling a channel, the application must ensure that there is at
+   *  least one free space available in the non-periodic request queue (when
+   *  disabling a non-periodic channel) or the periodic request queue (when
+   *  disabling a periodic channel). The application can simply flush the
+   *  posted requests when the Request queue is full (before disabling the
+   *  channel), by programming the OTG_FS_HCCHARx register with the CHDIS bit
+   *  set to 1, and the CHENA bit cleared to 0.
+   */
+
+  if (eptype == OTG_HCCHAR_EPTYP_CTRL || eptype == OTG_HCCHAR_EPTYP_BULK)
+    {
+      /* Get the number of words available in the non-periodic Tx FIFO. */
+
+      avail = stm32_getreg(STM32_OTG_HNPTXSTS) & OTG_HNPTXSTS_NPTXFSAV_MASK;
+    }
+  else /* if (eptype == OTG_HCCHAR_EPTYP_ISOC || eptype == OTG_HCCHAR_EPTYP_INTR) */
+    {
+      /* Get the number of words available in the non-periodic Tx FIFO. */
+
+      avail = stm32_getreg(STM32_OTG_HPTXSTS) & OTG_HPTXSTS_PTXFSAVL_MASK;
+    }
+
+  /* Check if there is any space available in the Tx FIFO. */
+
+  if (avail == 0)
+    {
+      /* The Tx FIFO is full... disable the channel to flush the requests */
+
+      hcchar &= ~OTG_HCCHAR_CHENA;
+    }
+
+  /* Unmask the CHannel Halted (CHH) interrupt */
+
+  intmsk  = stm32_getreg(STM32_OTG_HCINTMSK(chidx));
+  intmsk |= OTG_HCINT_CHH;
+  stm32_putreg(STM32_OTG_HCINTMSK(chidx), intmsk);
+
+  /* Halt the channel by setting CHDIS (and maybe CHENA) in the HCCHAR */
+
+  stm32_putreg(STM32_OTG_HCCHAR(chidx), hcchar);
+}
+
+/****************************************************************************
+ * Name: stm32_chan_waitsetup
+ *
+ * Description:
+ *   Set the request for the transfer complete event well BEFORE enabling the
+ *   transfer (as soon as we are absolutely committed to the to avoid transfer).
+ *   We do this to minimize race conditions.  This logic would have to be expanded
+ *   if we want to have more than one packet in flight at a time!
+ *
+ * Assumptions:
+ *   Called from a normal thread context BEFORE the transfer has been started.
+ *
+ ****************************************************************************/
+
+static int stm32_chan_waitsetup(FAR struct stm32_usbhost_s *priv,
+                                FAR struct stm32_chan_s *chan)
+{
+  irqstate_t flags = enter_critical_section();
+  int        ret   = -ENODEV;
+
+  /* Is the device still connected? */
+
+  if (priv->connected)
+    {
+      /* Yes.. then set waiter to indicate that we expect to be informed when
+       * either (1) the device is disconnected, or (2) the transfer completed.
+       */
+
+      chan->waiter   = true;
+#ifdef CONFIG_USBHOST_ASYNCH
+      chan->callback = NULL;
+      chan->arg      = NULL;
+#endif
+      ret            = OK;
+    }
+
+  leave_critical_section(flags);
+  return ret;
+}
+
+/****************************************************************************
+ * Name: stm32_chan_asynchsetup
+ *
+ * Description:
+ *   Set the request for the transfer complete event well BEFORE enabling the
+ *   transfer (as soon as we are absolutely committed to the to avoid transfer).
+ *   We do this to minimize race conditions.  This logic would have to be expanded
+ *   if we want to have more than one packet in flight at a time!
+ *
+ * Assumptions:
+ *   Might be called from the level of an interrupt handler
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_USBHOST_ASYNCH
+static int stm32_chan_asynchsetup(FAR struct stm32_usbhost_s *priv,
+                                  FAR struct stm32_chan_s *chan,
+                                  usbhost_asynch_t callback, FAR void *arg)
+{
+  irqstate_t flags = enter_critical_section();
+  int        ret   = -ENODEV;
+
+  /* Is the device still connected? */
+
+  if (priv->connected)
+    {
+      /* Yes.. then set waiter to indicate that we expect to be informed when
+       * either (1) the device is disconnected, or (2) the transfer completed.
+       */
+
+      chan->waiter   = false;
+      chan->callback = callback;
+      chan->arg      = arg;
+      ret            = OK;
+    }
+
+  leave_critical_section(flags);
+  return ret;
+}
+#endif
+
+/****************************************************************************
+ * Name: stm32_chan_wait
+ *
+ * Description:
+ *   Wait for a transfer on a channel to complete.
+ *
+ * Assumptions:
+ *   Called from a normal thread context
+ *
+ ****************************************************************************/
+
+static int stm32_chan_wait(FAR struct stm32_usbhost_s *priv,
+                           FAR struct stm32_chan_s *chan)
+{
+  irqstate_t flags;
+  int ret;
+
+  /* Disable interrupts so that the following operations will be atomic.  On
+   * the OTG FS global interrupt needs to be disabled.  However, here we disable
+   * all interrupts to exploit that fact that interrupts will be re-enabled
+   * while we wait.
+   */
+
+  flags = enter_critical_section();
+
+  /* Loop, testing for an end of transfer condition.  The channel 'result'
+   * was set to EBUSY and 'waiter' was set to true before the transfer; 'waiter'
+   * will be set to false and 'result' will be set appropriately when the
+   * transfer is completed.
+   */
+
+  do
+    {
+      /* Wait for the transfer to complete.  NOTE the transfer may already
+       * completed before we get here or the transfer may complete while we
+       * wait here.
+       */
+
+      ret = sem_wait(&chan->waitsem);
+
+      /* sem_wait should succeed.  But it is possible that we could be
+       * awakened by a signal too.
+       */
+
+      DEBUGASSERT(ret == OK || get_errno() == EINTR);
+    }
+  while (chan->waiter);
+
+  /* The transfer is complete re-enable interrupts and return the result */
+
+  ret = -(int)chan->result;
+  leave_critical_section(flags);
+  return ret;
+}
+
+/****************************************************************************
+ * Name: stm32_chan_wakeup
+ *
+ * Description:
+ *   A channel transfer has completed... wakeup any threads waiting for the
+ *   transfer to complete.
+ *
+ * Assumptions:
+ *   This function is called from the transfer complete interrupt handler for
+ *   the channel.  Interrupts are disabled.
+ *
+ ****************************************************************************/
+
+static void stm32_chan_wakeup(FAR struct stm32_usbhost_s *priv,
+                              FAR struct stm32_chan_s *chan)
+{
+  /* Is the transfer complete? */
+
+  if (chan->result != EBUSY)
+    {
+      /* Is there a thread waiting for this transfer to complete? */
+
+      if (chan->waiter)
+        {
+#ifdef CONFIG_USBHOST_ASYNCH
+          /* Yes.. there should not also be a callback scheduled */
+
+          DEBUGASSERT(chan->callback == NULL);
+#endif
+          /* Wake'em up! */
+
+          usbhost_vtrace2(chan->in ? OTG_VTRACE2_CHANWAKEUP_IN :
+                                     OTG_VTRACE2_CHANWAKEUP_OUT,
+                          chan->epno, chan->result);
+
+          stm32_givesem(&chan->waitsem);
+          chan->waiter = false;
+        }
+
+#ifdef CONFIG_USBHOST_ASYNCH
+      /* No.. is an asynchronous callback expected when the transfer
+       * completes?
+       */
+
+      else if (chan->callback)
+        {
+          /* Handle continuation of IN/OUT pipes */
+
+          if (chan->in)
+            {
+              stm32_in_next(priv, chan);
+            }
+          else
+            {
+              stm32_out_next(priv, chan);
+            }
+        }
+#endif
+    }
+}
+
+/****************************************************************************
+ * Name: stm32_ctrlchan_alloc
+ *
+ * Description:
+ *   Allocate and configured channels for a control pipe.
+ *
+ ****************************************************************************/
+
+static int stm32_ctrlchan_alloc(FAR struct stm32_usbhost_s *priv,
+                                uint8_t epno, uint8_t funcaddr, uint8_t speed,
+                                FAR struct stm32_ctrlinfo_s *ctrlep)
+{
+  FAR struct stm32_chan_s *chan;
+  int inndx;
+  int outndx;
+
+  outndx = stm32_chan_alloc(priv);
+  if (outndx < 0)
+    {
+      return -ENOMEM;
+    }
+
+  ctrlep->outndx  = outndx;
+  chan            = &priv->chan[outndx];
+  chan->epno      = epno;
+  chan->in        = false;
+  chan->eptype    = OTG_EPTYPE_CTRL;
+  chan->funcaddr  = funcaddr;
+  chan->speed     = speed;
+  chan->maxpacket = STM32_EP0_DEF_PACKET_SIZE;
+  chan->indata1   = false;
+  chan->outdata1  = false;
+
+  /* Configure control OUT channels */
+
+  stm32_chan_configure(priv, outndx);
+
+  /* Allocate and initialize the control IN channel */
+
+  inndx = stm32_chan_alloc(priv);
+  if (inndx < 0)
+    {
+      stm32_chan_free(priv, outndx);
+      return -ENOMEM;
+    }
+
+  ctrlep->inndx   = inndx;
+  chan            = &priv->chan[inndx];
+  chan->epno      = epno;
+  chan->in        = true;
+  chan->eptype    = OTG_EPTYPE_CTRL;
+  chan->funcaddr  = funcaddr;
+  chan->speed     = speed;
+  chan->maxpacket = STM32_EP0_DEF_PACKET_SIZE;
+  chan->indata1   = false;
+  chan->outdata1  = false;
+
+  /* Configure control IN channels */
+
+  stm32_chan_configure(priv, inndx);
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stm32_ctrlep_alloc
+ *
+ * Description:
+ *   Allocate a container and channels for control pipe.
+ *
+ * Input Parameters:
+ *   priv - The private USB host driver state.
+ *   epdesc - Describes the endpoint to be allocated.
+ *   ep - A memory location provided by the caller in which to receive the
+ *      allocated endpoint descriptor.
+ *
+ * Returned Values:
+ *   On success, zero (OK) is returned. On a failure, a negated errno value is
+ *   returned indicating the nature of the failure
+ *
+ * Assumptions:
+ *   This function will *not* be called from an interrupt handler.
+ *
+ ****************************************************************************/
+
+static int stm32_ctrlep_alloc(FAR struct stm32_usbhost_s *priv,
+                              FAR const struct usbhost_epdesc_s *epdesc,
+                              FAR usbhost_ep_t *ep)
+{
+  FAR struct usbhost_hubport_s *hport;
+  FAR struct stm32_ctrlinfo_s *ctrlep;
+  int ret;
+
+  /* Sanity check.  NOTE that this method should only be called if a device is
+   * connected (because we need a valid low speed indication).
+   */
+
+  DEBUGASSERT(epdesc->hport != NULL);
+  hport = epdesc->hport;
+
+  /* Allocate a container for the control endpoint */
+
+  ctrlep = (FAR struct stm32_ctrlinfo_s *)kmm_malloc(sizeof(struct stm32_ctrlinfo_s));
+  if (ctrlep == NULL)
+    {
+      uerr("ERROR: Failed to allocate control endpoint container\n");
+      return -ENOMEM;
+    }
+
+  /* Then allocate and configure the IN/OUT channnels  */
+
+  ret = stm32_ctrlchan_alloc(priv, epdesc->addr & USB_EPNO_MASK,
+                             hport->funcaddr, hport->speed, ctrlep);
+  if (ret < 0)
+    {
+      uerr("ERROR: stm32_ctrlchan_alloc failed: %d\n", ret);
+      kmm_free(ctrlep);
+      return ret;
+    }
+
+  /* Return a pointer to the control pipe container as the pipe "handle" */
+
+  *ep = (usbhost_ep_t)ctrlep;
+  return OK;
+}
+
+/************************************************************************************
+ * Name: stm32_xfrep_alloc
+ *
+ * Description:
+ *   Allocate and configure one unidirectional endpoint.
+ *
+ * Input Parameters:
+ *   priv - The private USB host driver state.
+ *   epdesc - Describes the endpoint to be allocated.
+ *   ep - A memory location provided by the caller in which to receive the
+ *      allocated endpoint descriptor.
+ *
+ * Returned Values:
+ *   On success, zero (OK) is returned. On a failure, a negated errno value is
+ *   returned indicating the nature of the failure
+ *
+ * Assumptions:
+ *   This function will *not* be called from an interrupt handler.
+ *
+ ************************************************************************************/
+
+static int stm32_xfrep_alloc(FAR struct stm32_usbhost_s *priv,
+                              FAR const struct usbhost_epdesc_s *epdesc,
+                              FAR usbhost_ep_t *ep)
+{
+  struct usbhost_hubport_s *hport;
+  FAR struct stm32_chan_s *chan;
+  int chidx;
+
+  /* Sanity check.  NOTE that this method should only be called if a device is
+   * connected (because we need a valid low speed indication).
+   */
+
+  DEBUGASSERT(epdesc->hport != NULL);
+  hport = epdesc->hport;
+
+  /* Allocate a host channel for the endpoint */
+
+  chidx = stm32_chan_alloc(priv);
+  if (chidx < 0)
+    {
+      uerr("ERROR: Failed to allocate a host channel\n");
+      return -ENOMEM;
+    }
+
+  /* Decode the endpoint descriptor to initialize the channel data structures.
+   * Note:  Here we depend on the fact that the endpoint point type is
+   * encoded in the same way in the endpoint descriptor as it is in the OTG
+   * HS hardware.
+   */
+
+  chan            = &priv->chan[chidx];
+  chan->epno      = epdesc->addr & USB_EPNO_MASK;
+  chan->in        = epdesc->in;
+  chan->eptype    = epdesc->xfrtype;
+  chan->funcaddr  = hport->funcaddr;
+  chan->speed     = hport->speed;
+  chan->maxpacket = epdesc->mxpacketsize;
+  chan->indata1   = false;
+  chan->outdata1  = false;
+
+  /* Then configure the endpoint */
+
+  stm32_chan_configure(priv, chidx);
+
+  /* Return the index to the allocated channel as the endpoint "handle" */
+
+  *ep = (usbhost_ep_t)chidx;
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stm32_transfer_start
+ *
+ * Description:
+ *   Start at transfer on the select IN or OUT channel.
+ *
+ ****************************************************************************/
+
+static void stm32_transfer_start(FAR struct stm32_usbhost_s *priv, int chidx)
+{
+  FAR struct stm32_chan_s *chan;
+  uint32_t regval;
+  unsigned int npackets;
+  unsigned int maxpacket;
+  unsigned int avail;
+  unsigned int wrsize;
+  unsigned int minsize;
+
+  /* Set up the initial state of the transfer */
+
+  chan           = &priv->chan[chidx];
+
+  usbhost_vtrace2(OTG_VTRACE2_STARTTRANSFER, chidx, chan->buflen);
+
+  chan->result   = EBUSY;
+  chan->inflight = 0;
+  chan->xfrd     = 0;
+  priv->chidx    = chidx;
+
+  /* Compute the expected number of packets associated to the transfer.
+   * If the transfer length is zero (or less than the size of one maximum
+   * size packet), then one packet is expected.
+   */
+
+  /* If the transfer size is greater than one packet, then calculate the
+   * number of packets that will be received/sent, including any partial
+   * final packet.
+   */
+
+  maxpacket = chan->maxpacket;
+
+  if (chan->buflen > maxpacket)
+    {
+      npackets = (chan->buflen + maxpacket - 1) / maxpacket;
+
+      /* Clip if the buffer length if it exceeds the maximum number of
+       * packets that can be transferred (this should not happen).
+       */
+
+      if (npackets > STM32_MAX_PKTCOUNT)
+        {
+          npackets = STM32_MAX_PKTCOUNT;
+          chan->buflen = STM32_MAX_PKTCOUNT * maxpacket;
+          usbhost_trace2(OTG_TRACE2_CLIP, chidx, chan->buflen);
+        }
+    }
+  else
+    {
+      /* One packet will be sent/received (might be a zero length packet) */
+
+      npackets = 1;
+    }
+
+  /* If it is an IN transfer, then adjust the size of the buffer UP to
+   * a full number of packets.  Hmmm... couldn't this cause an overrun
+   * into unallocated memory?
+   */
+
+#if 0 /* Think about this */
+  if (chan->in)
+    {
+      /* Force the buffer length to an even multiple of maxpacket */
+
+      chan->buflen = npackets * maxpacket;
+    }
+#endif
+
+  /* Save the number of packets in the transfer.  We will need this in
+   * order to set the next data toggle correctly when the transfer
+   * completes.
+   */
+
+  chan->npackets = (uint8_t)npackets;
+
+  /* Setup the HCTSIZn register */
+
+  regval = ((uint32_t)chan->buflen << OTG_HCTSIZ_XFRSIZ_SHIFT) |
+           ((uint32_t)npackets << OTG_HCTSIZ_PKTCNT_SHIFT) |
+           ((uint32_t)chan->pid << OTG_HCTSIZ_DPID_SHIFT);
+  stm32_putreg(STM32_OTG_HCTSIZ(chidx), regval);
+
+  /* Setup the HCCHAR register: Frame oddness and host channel enable */
+
+  regval = stm32_getreg(STM32_OTG_HCCHAR(chidx));
+
+  /* Set/clear the Odd Frame bit.  Check for an even frame; if so set Odd
+   * Frame. This field is applicable for only periodic (isochronous and
+   * interrupt) channels.
+   */
+
+  if ((stm32_getreg(STM32_OTG_HFNUM) & 1) == 0)
+    {
+      regval |= OTG_HCCHAR_ODDFRM;
+    }
+  else
+    {
+      regval &= ~OTG_HCCHAR_ODDFRM;
+    }
+
+  regval &= ~OTG_HCCHAR_CHDIS;
+  regval |= OTG_HCCHAR_CHENA;
+  stm32_putreg(STM32_OTG_HCCHAR(chidx), regval);
+
+  /* If this is an out transfer, then we need to do more.. we need to copy
+   * the outgoing data into the correct TxFIFO.
+   */
+
+  if (!chan->in && chan->buflen > 0)
+    {
+      /* Handle non-periodic (CTRL and BULK) OUT transfers differently than
+       * periodic (INTR and ISOC) OUT transfers.
+       */
+
+      minsize = MIN(chan->buflen, chan->maxpacket);
+
+      switch (chan->eptype)
+        {
+        case OTG_EPTYPE_CTRL: /* Non periodic transfer */
+        case OTG_EPTYPE_BULK:
+          {
+            /* Read the Non-periodic Tx FIFO status register */
+
+            regval = stm32_getreg(STM32_OTG_HNPTXSTS);
+            avail  = ((regval & OTG_HNPTXSTS_NPTXFSAV_MASK) >> OTG_HNPTXSTS_NPTXFSAV_SHIFT) << 2;
+          }
+          break;
+
+        /* Periodic transfer */
+
+        case OTG_EPTYPE_INTR:
+        case OTG_EPTYPE_ISOC:
+          {
+            /* Read the Non-periodic Tx FIFO status register */
+
+            regval = stm32_getreg(STM32_OTG_HPTXSTS);
+            avail  = ((regval & OTG_HPTXSTS_PTXFSAVL_MASK) >> OTG_HPTXSTS_PTXFSAVL_SHIFT) << 2;
+          }
+          break;
+
+        default:
+          DEBUGASSERT(false);
+          return;
+        }
+
+      /* Is there space in the TxFIFO to hold the minimum size packet? */
+
+      if (minsize <= avail)
+        {
+          /* Yes.. Get the size of the biggest thing that we can put in the Tx FIFO now */
+
+          wrsize = chan->buflen;
+          if (wrsize > avail)
+            {
+              /* Clip the write size to the number of full, max sized packets
+               * that will fit in the Tx FIFO.
+               */
+
+              unsigned int wrpackets = avail / chan->maxpacket;
+              wrsize = wrpackets * chan->maxpacket;
+            }
+
+          /* Write packet into the Tx FIFO. */
+
+          stm32_gint_wrpacket(priv, chan->buffer, chidx, wrsize);
+        }
+
+      /* Did we put the entire buffer into the Tx FIFO? */
+
+      if (chan->buflen > avail)
+        {
+          /* No, there was insufficient space to hold the entire transfer ...
+           * Enable the Tx FIFO interrupt to handle the transfer when the Tx
+           * FIFO becomes empty.
+           */
+
+           stm32_txfe_enable(priv, chidx);
+        }
+    }
+}
+
+/****************************************************************************
+ * Name: stm32_getframe
+ *
+ * Description:
+ *   Get the current frame number.  The frame number (FRNUM) field increments
+ *   when a new SOF is transmitted on the USB, and is cleared to 0 when it
+ *   reaches 0x3fff.
+ *
+ ****************************************************************************/
+
+#if 0 /* Not used */
+static inline uint16_t stm32_getframe(void)
+{
+  return (uint16_t)(stm32_getreg(STM32_OTG_HFNUM) & OTG_HFNUM_FRNUM_MASK);
+}
+#endif
+
+/****************************************************************************
+ * Name: stm32_ctrl_sendsetup
+ *
+ * Description:
+ *   Send an IN/OUT SETUP packet.
+ *
+ ****************************************************************************/
+
+static int stm32_ctrl_sendsetup(FAR struct stm32_usbhost_s *priv,
+                                FAR struct stm32_ctrlinfo_s *ep0,
+                                FAR const struct usb_ctrlreq_s *req)
+{
+  FAR struct stm32_chan_s *chan;
+  systime_t start;
+  systime_t elapsed;
+  int ret;
+
+  /* Loop while the device reports NAK (and a timeout is not exceeded */
+
+  chan  = &priv->chan[ep0->outndx];
+  start = clock_systimer();
+
+  do
+    {
+      /* Send the  SETUP packet */
+
+      chan->pid    = OTG_PID_SETUP;
+      chan->buffer = (FAR uint8_t *)req;
+      chan->buflen = USB_SIZEOF_CTRLREQ;
+      chan->xfrd   = 0;
+
+      /* Set up for the wait BEFORE starting the transfer */
+
+      ret = stm32_chan_waitsetup(priv, chan);
+      if (ret < 0)
+        {
+          usbhost_trace1(OTG_TRACE1_DEVDISCONN, 0);
+          return ret;
+        }
+
+      /* Start the transfer */
+
+      stm32_transfer_start(priv, ep0->outndx);
+
+      /* Wait for the transfer to complete */
+
+      ret = stm32_chan_wait(priv, chan);
+
+      /* Return on success and for all failures other than EAGAIN.  EAGAIN
+       * means that the device NAKed the SETUP command and that we should
+       * try a few more times.
+       */
+
+      if (ret != -EAGAIN)
+        {
+          /* Output some debug information if the transfer failed */
+
+          if (ret < 0)
+            {
+              usbhost_trace1(OTG_TRACE1_TRNSFRFAILED, ret);
+            }
+
+          /* Return the result in any event */
+
+          return ret;
+        }
+
+      /* Get the elapsed time (in frames) */
+
+      elapsed = clock_systimer() - start;
+    }
+  while (elapsed < STM32_SETUP_DELAY);
+
+  return -ETIMEDOUT;
+}
+
+/****************************************************************************
+ * Name: stm32_ctrl_senddata
+ *
+ * Description:
+ *   Send data in the data phase of an OUT control transfer.  Or send status
+ *   in the status phase of an IN control transfer
+ *
+ ****************************************************************************/
+
+static int stm32_ctrl_senddata(FAR struct stm32_usbhost_s *priv,
+                               FAR struct stm32_ctrlinfo_s *ep0,
+                               FAR uint8_t *buffer, unsigned int buflen)
+{
+  FAR struct stm32_chan_s *chan = &priv->chan[ep0->outndx];
+  int ret;
+
+  /* Save buffer information */
+
+  chan->buffer = buffer;
+  chan->buflen = buflen;
+  chan->xfrd   = 0;
+
+  /* Set the DATA PID */
+
+  if (buflen == 0)
+    {
+      /* For status OUT stage with buflen == 0, set PID DATA1 */
+
+      chan->outdata1 = true;
+    }
+
+  /* Set the Data PID as per the outdata1 boolean */
+
+  chan->pid = chan->outdata1 ? OTG_PID_DATA1 : OTG_PID_DATA0;
+
+  /* Set up for the wait BEFORE starting the transfer */
+
+  ret = stm32_chan_waitsetup(priv, chan);
+  if (ret < 0)
+    {
+      usbhost_trace1(OTG_TRACE1_DEVDISCONN, 0);
+      return ret;
+    }
+
+  /* Start the transfer */
+
+  stm32_transfer_start(priv, ep0->outndx);
+
+  /* Wait for the transfer to complete and return the result */
+
+  return stm32_chan_wait(priv, chan);
+}
+
+/****************************************************************************
+ * Name: stm32_ctrl_recvdata
+ *
+ * Description:
+ *   Receive data in the data phase of an IN control transfer.  Or receive status
+ *   in the status phase of an OUT control transfer
+ *
+ ****************************************************************************/
+
+static int stm32_ctrl_recvdata(FAR struct stm32_usbhost_s *priv,
+                               FAR struct stm32_ctrlinfo_s *ep0,
+                               FAR uint8_t *buffer, unsigned int buflen)
+{
+  FAR struct stm32_chan_s *chan = &priv->chan[ep0->inndx];
+  int ret;
+
+  /* Save buffer information */
+
+  chan->pid    = OTG_PID_DATA1;
+  chan->buffer = buffer;
+  chan->buflen = buflen;
+  chan->xfrd   = 0;
+
+  /* Set up for the wait BEFORE starting the transfer */
+
+  ret = stm32_chan_waitsetup(priv, chan);
+  if (ret < 0)
+    {
+      usbhost_trace1(OTG_TRACE1_DEVDISCONN, 0);
+      return ret;
+    }
+
+  /* Start the transfer */
+
+  stm32_transfer_start(priv, ep0->inndx);
+
+  /* Wait for the transfer to complete and return the result */
+
+  return stm32_chan_wait(priv, chan);
+}
+
+/****************************************************************************
+ * Name: stm32_in_setup
+ *
+ * Description:
+ *   Initiate an IN transfer on an bulk, interrupt, or isochronous pipe.
+ *
+ ****************************************************************************/
+
+static int stm32_in_setup(FAR struct stm32_usbhost_s *priv, int chidx)
+{
+  FAR struct stm32_chan_s *chan;
+
+  /* Set up for the transfer based on the direction and the endpoint type */
+
+  chan = &priv->chan[chidx];
+  switch (chan->eptype)
+    {
+    default:
+    case OTG_EPTYPE_CTRL: /* Control */
+      {
+        /* This kind of transfer on control endpoints other than EP0 are not
+         * currently supported
+         */
+
+        return -ENOSYS;
+      }
+
+    case OTG_EPTYPE_ISOC: /* Isochronous */
+      {
+        /* Set up the IN data PID */
+
+        usbhost_vtrace2(OTG_VTRACE2_ISOCIN, chidx, chan->buflen);
+        chan->pid = OTG_PID_DATA0;
+      }
+      break;
+
+    case OTG_EPTYPE_BULK: /* Bulk */
+      {
+        /* Setup the IN data PID */
+
+        usbhost_vtrace2(OTG_VTRACE2_BULKIN, chidx, chan->buflen);
+        chan->pid = chan->indata1 ? OTG_PID_DATA1 : OTG_PID_DATA0;
+      }
+      break;
+
+    case OTG_EPTYPE_INTR: /* Interrupt */
+      {
+        /* Setup the IN data PID */
+
+        usbhost_vtrace2(OTG_VTRACE2_INTRIN, chidx, chan->buflen);
+        chan->pid = chan->indata1 ? OTG_PID_DATA1 : OTG_PID_DATA0;
+      }
+      break;
+    }
+
+  /* Start the transfer */
+
+  stm32_transfer_start(priv, chidx);
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stm32_in_transfer
+ *
+ * Description:
+ *   Transfer 'buflen' bytes into 'buffer' from an IN channel.
+ *
+ ****************************************************************************/
+
+static ssize_t stm32_in_transfer(FAR struct stm32_usbhost_s *priv, int chidx,
+                                 FAR uint8_t *buffer, size_t buflen)
+{
+  FAR struct stm32_chan_s *chan;
+  systime_t start;
+  systime_t elapsed;
+  int ret;
+
+  /* Loop until the transfer completes (i.e., buflen is decremented to zero)
+   * or a fatal error occurs (any error other than a simple NAK)
+   */
+
+  chan         = &priv->chan[chidx];
+  chan->buffer = buffer;
+  chan->buflen = buflen;
+  chan->xfrd   = 0;
+
+  start = clock_systimer();
+  while (chan->xfrd < chan->buflen)
+    {
+      /* Set up for the wait BEFORE starting the transfer */
+
+      ret = stm32_chan_waitsetup(priv, chan);
+      if (ret < 0)
+        {
+          usbhost_trace1(OTG_TRACE1_DEVDISCONN, 0);
+          return (ssize_t)ret;
+        }
+
+      /* Set up for the transfer based on the direction and the endpoint type */
+
+      ret = stm32_in_setup(priv, chidx);
+      if (ret < 0)
+        {
+          uerr("ERROR: stm32_in_setup failed: %d\n", ret);
+          return (ssize_t)ret;
+        }
+
+      /* Wait for the transfer to complete and get the result */
+
+      ret = stm32_chan_wait(priv, chan);
+
+      /* EAGAIN indicates that the device NAKed the transfer and we need
+       * do try again.  Anything else (success or other errors) will
+       * cause use to return
+       */
+
+      if (ret < 0)
+        {
+          usbhost_trace1(OTG_TRACE1_TRNSFRFAILED, ret);
+
+          /* Check for a special case:  If (1) the transfer was NAKed and (2)
+           * no Tx FIFO empty or Rx FIFO not-empty event occurred, then we
+           * should be able to just flush the Rx and Tx FIFOs and try again.
+           * We can detect this latter case because the then the transfer
+           * buffer pointer and buffer size will be unaltered.
+           */
+
+          elapsed = clock_systimer() - start;
+          if (ret != -EAGAIN ||                  /* Not a NAK condition OR */
+              elapsed >= STM32_DATANAK_DELAY ||  /* Timeout has elapsed OR */
+              chan->xfrd > 0)                    /* Data has been partially transferred */
+            {
+              /* Break out and return the error */
+
+              uerr("ERROR: stm32_chan_wait failed: %d\n", ret);
+              return (ssize_t)ret;
+            }
+        }
+    }
+
+  return (ssize_t)chan->xfrd;
+}
+
+/****************************************************************************
+ * Name: stm32_in_next
+ *
+ * Description:
+ *   Initiate the next of a sequence of asynchronous transfers.
+ *
+ * Assumptions:
+ *   This function is always called from an interrupt handler
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_USBHOST_ASYNCH
+static void stm32_in_next(FAR struct stm32_usbhost_s *priv,
+                          FAR struct stm32_chan_s *chan)
+{
+  usbhost_asynch_t callback;
+  FAR void *arg;
+  ssize_t nbytes;
+  int result;
+  int ret;
+
+  /* Is the full transfer complete? Did the last chunk transfer complete OK? */
+
+  result = -(int)chan->result;
+  if (chan->xfrd < chan->buflen && result == OK)
+    {
+      /* Yes.. Set up for the next transfer based on the direction and the
+       * endpoint type
+       */
+
+      ret = stm32_in_setup(priv, chan->chidx);
+      if (ret >= 0)
+        {
+          return;
+        }
+
+      uerr("ERROR: stm32_in_setup failed: %d\n", ret);
+      result = ret;
+    }
+
+  /* The transfer is complete, with or without an error */
+
+  uinfo("Transfer complete:  %d\n", result);
+
+  /* Extract the callback information */
+
+  callback       = chan->callback;
+  arg            = chan->arg;
+  nbytes         = chan->xfrd;
+
+  chan->callback = NULL;
+  chan->arg      = NULL;
+  chan->xfrd     = 0;
+
+  /* Then perform the callback */
+
+  if (result < 0)
+    {
+      nbytes = (ssize_t)result;
+    }
+
+  callback(arg, nbytes);
+}
+#endif
+
+/****************************************************************************
+ * Name: stm32_in_asynch
+ *
+ * Description:
+ *   Initiate the first of a sequence of asynchronous transfers.
+ *
+ * Assumptions:
+ *   This function is never called from an interrupt handler
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_USBHOST_ASYNCH
+static int stm32_in_asynch(FAR struct stm32_usbhost_s *priv, int chidx,
+                           FAR uint8_t *buffer, size_t buflen,
+                           usbhost_asynch_t callback, FAR void *arg)
+{
+  FAR struct stm32_chan_s *chan;
+  int ret;
+
+  /* Set up for the transfer data and callback BEFORE starting the first transfer */
+
+  chan         = &priv->chan[chidx];
+  chan->buffer = buffer;
+  chan->buflen = buflen;
+  chan->xfrd   = 0;
+
+  ret = stm32_chan_asynchsetup(priv, chan, callback, arg);
+  if (ret < 0)
+    {
+      uerr("ERROR: stm32_chan_asynchsetup failed: %d\n", ret);
+      return ret;
+    }
+
+  /* Set up for the transfer based on the direction and the endpoint type */
+
+  ret = stm32_in_setup(priv, chidx);
+  if (ret < 0)
+    {
+      uerr("ERROR: stm32_in_setup failed: %d\n", ret);
+    }
+
+  /* And return with the transfer pending */
+
+  return ret;
+}
+#endif
+
+/****************************************************************************
+ * Name: stm32_out_setup
+ *
+ * Description:
+ *   Initiate an OUT transfer on an bulk, interrupt, or isochronous pipe.
+ *
+ ****************************************************************************/
+
+static int stm32_out_setup(FAR struct stm32_usbhost_s *priv, int chidx)
+{
+  FAR struct stm32_chan_s *chan;
+
+  /* Set up for the transfer based on the direction and the endpoint type */
+
+  chan = &priv->chan[chidx];
+  switch (chan->eptype)
+    {
+    default:
+    case OTG_EPTYPE_CTRL: /* Control */
+      {
+        /* This kind of transfer on control endpoints other than EP0 are not
+         * currently supported
+         */
+
+        return -ENOSYS;
+      }
+
+    case OTG_EPTYPE_ISOC: /* Isochronous */
+      {
+        /* Set up the OUT data PID */
+
+        usbhost_vtrace2(OTG_VTRACE2_ISOCOUT, chidx, chan->buflen);
+        chan->pid = OTG_PID_DATA0;
+      }
+      break;
+
+    case OTG_EPTYPE_BULK: /* Bulk */
+      {
+        /* Setup the OUT data PID */
+
+        usbhost_vtrace2(OTG_VTRACE2_BULKOUT, chidx, chan->buflen);
+        chan->pid = chan->outdata1 ? OTG_PID_DATA1 : OTG_PID_DATA0;
+      }
+      break;
+
+    case OTG_EPTYPE_INTR: /* Interrupt */
+      {
+        /* Setup the OUT data PID */
+
+        usbhost_vtrace2(OTG_VTRACE2_INTROUT, chidx, chan->buflen);
+        chan->pid = chan->outdata1 ? OTG_PID_DATA1 : OTG_PID_DATA0;
+
+        /* Toggle the OUT data PID for the next transfer */
+
+        chan->outdata1 ^= true;
+      }
+      break;
+    }
+
+  /* Start the transfer */
+
+  stm32_transfer_start(priv, chidx);
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stm32_out_transfer
+ *
+ * Description:
+ *   Transfer the 'buflen' bytes in 'buffer' through an OUT channel.
+ *
+ ****************************************************************************/
+
+static ssize_t stm32_out_transfer(FAR struct stm32_usbhost_s *priv, int chidx,
+                                  FAR uint8_t *buffer, size_t buflen)
+{
+  FAR struct stm32_chan_s *chan;
+  systime_t start;
+  systime_t elapsed;
+  size_t xfrlen;
+  ssize_t xfrd;
+  int ret;
+
+  /* Loop until the transfer completes (i.e., buflen is decremented to zero)
+   * or a fatal error occurs (any error other than a simple NAK)
+   */
+
+  chan  = &priv->chan[chidx];
+  start = clock_systimer();
+  xfrd  = 0;
+
+  while (buflen > 0)
+    {
+      /* Transfer one packet at a time.  The hardware is capable of queueing
+       * multiple OUT packets, but I just haven't figured out how to handle
+       * the case where a single OUT packet in the group is NAKed.
+       */
+
+      xfrlen       = MIN(chan->maxpacket, buflen);
+      chan->buffer = buffer;
+      chan->buflen = xfrlen;
+      chan->xfrd   = 0;
+
+      /* Set up for the wait BEFORE starting the transfer */
+
+      ret = stm32_chan_waitsetup(priv, chan);
+      if (ret < 0)
+        {
+          usbhost_trace1(OTG_TRACE1_DEVDISCONN, 0);
+          return (ssize_t)ret;
+        }
+
+      /* Set up for the transfer based on the direction and the endpoint type */
+
+      ret = stm32_out_setup(priv, chidx);
+      if (ret < 0)
+        {
+          uerr("ERROR: stm32_out_setup failed: %d\n", ret);
+          return (ssize_t)ret;
+        }
+
+      /* Wait for the transfer to complete and get the result */
+
+      ret = stm32_chan_wait(priv, chan);
+
+      /* Handle transfer failures */
+
+      if (ret < 0)
+        {
+          usbhost_trace1(OTG_TRACE1_TRNSFRFAILED, ret);
+
+          /* Check for a special case:  If (1) the transfer was NAKed and (2)
+           * no Tx FIFO empty or Rx FIFO not-empty event occurred, then we
+           * should be able to just flush the Rx and Tx FIFOs and try again.
+           * We can detect this latter case because the then the transfer
+           * buffer pointer and buffer size will be unaltered.
+           */
+
+          elapsed = clock_systimer() - start;
+          if (ret != -EAGAIN ||                  /* Not a NAK condition OR */
+              elapsed >= STM32_DATANAK_DELAY ||  /* Timeout has elapsed OR */
+              chan->xfrd > 0)                    /* Data has been partially transferred */
+            {
+              /* Break out and return the error */
+
+              uerr("ERROR: stm32_chan_wait failed: %d\n", ret);
+              return (ssize_t)ret;
+            }
+
+          /* Is this flush really necessary? What does the hardware do with the
+           * data in the FIFO when the NAK occurs?  Does it discard it?
+           */
+
+          stm32_flush_txfifos(OTG_GRSTCTL_TXFNUM_HALL);
+
+          /* Get the device a little time to catch up.  Then retry the transfer
+           * using the same buffer pointer and length.
+           */
+
+          usleep(20*1000);
+        }
+      else
+        {
+          /* Successfully transferred.  Update the buffer pointer and length */
+
+          buffer += xfrlen;
+          buflen -= xfrlen;
+          xfrd   += chan->xfrd;
+        }
+    }
+
+  return xfrd;
+}
+
+/****************************************************************************
+ * Name: stm32_out_next
+ *
+ * Description:
+ *   Initiate the next of a sequence of asynchronous transfers.
+ *
+ * Assumptions:
+ *   This function is always called from an interrupt handler
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_USBHOST_ASYNCH
+static void stm32_out_next(FAR struct stm32_usbhost_s *priv,
+                           FAR struct stm32_chan_s *chan)
+{
+  usbhost_asynch_t callback;
+  FAR void *arg;
+  ssize_t nbytes;
+  int result;
+  int ret;
+
+  /* Is the full transfer complete? Did the last chunk transfer complete OK? */
+
+  result = -(int)chan->result;
+  if (chan->xfrd < chan->buflen && result == OK)
+    {
+      /* Yes.. Set up for the next transfer based on the direction and the
+       * endpoint type
+       */
+
+      ret = stm32_out_setup(priv, chan->chidx);
+      if (ret >= 0)
+        {
+          return;
+        }
+
+      uerr("ERROR: stm32_out_setup failed: %d\n", ret);
+      result = ret;
+    }
+
+  /* The transfer is complete, with or without an error */
+
+  uinfo("Transfer complete:  %d\n", result);
+
+  /* Extract the callback information */
+
+  callback       = chan->callback;
+  arg            = chan->arg;
+  nbytes         = chan->xfrd;
+
+  chan->callback = NULL;
+  chan->arg      = NULL;
+  chan->xfrd     = 0;
+
+  /* Then perform the callback */
+
+  if (result < 0)
+    {
+      nbytes = (ssize_t)result;
+    }
+
+  callback(arg, nbytes);
+}
+#endif
+
+/****************************************************************************
+ * Name: stm32_out_asynch
+ *
+ * Description:
+ *   Initiate the first of a sequence of asynchronous transfers.
+ *
+ * Assumptions:
+ *   This function is never called from an interrupt handler
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_USBHOST_ASYNCH
+static int stm32_out_asynch(FAR struct stm32_usbhost_s *priv, int chidx,
+                            FAR uint8_t *buffer, size_t buflen,
+                            usbhost_asynch_t callback, FAR void *arg)
+{
+  FAR struct stm32_chan_s *chan;
+  int ret;
+
+  /* Set up for the transfer data and callback BEFORE starting the first transfer */
+
+  chan         = &priv->chan[chidx];
+  chan->buffer = buffer;
+  chan->buflen = buflen;
+  chan->xfrd   = 0;
+
+  ret = stm32_chan_asynchsetup(priv, chan, callback, arg);
+  if (ret < 0)
+    {
+      uerr("ERROR: stm32_chan_asynchsetup failed: %d\n", ret);
+      return ret;
+    }
+
+  /* Set up for the transfer based on the direction and the endpoint type */
+
+  ret = stm32_out_setup(priv, chidx);
+  if (ret < 0)
+    {
+      uerr("ERROR: stm32_out_setup failed: %d\n", ret);
+    }
+
+  /* And return with the transfer pending */
+
+  return ret;
+}
+#endif
+
+/****************************************************************************
+ * Name: stm32_gint_wrpacket
+ *
+ * Description:
+ *   Transfer the 'buflen' bytes in 'buffer' to the Tx FIFO associated with
+ *   'chidx' (non-DMA).
+ *
+ ****************************************************************************/
+
+static void stm32_gint_wrpacket(FAR struct stm32_usbhost_s *priv,
+                                FAR uint8_t *buffer, int chidx, int buflen)
+{
+  FAR uint32_t *src;
+  uint32_t fifo;
+  int buflen32;
+
+  stm32_pktdump("Sending", buffer, buflen);
+
+  /* Get the number of 32-byte words associated with this byte size */
+
+  buflen32 = (buflen + 3) >> 2;
+
+  /* Get the address of the Tx FIFO associated with this channel */
+
+  fifo = STM32_OTG_DFIFO_HCH(chidx);
+
+  /* Transfer all of the data into the Tx FIFO */
+
+  src = (FAR uint32_t *)buffer;
+  for (; buflen32 > 0; buflen32--)
+    {
+      uint32_t data = *src++;
+      stm32_putreg(fifo, data);
+    }
+
+  /* Increment the count of bytes "in-flight" in the Tx FIFO */
+
+  priv->chan[chidx].inflight += buflen;
+}
+
+/****************************************************************************
+ * Name: stm32_gint_hcinisr
+ *
+ * Description:
+ *   USB OTG FS host IN channels interrupt handler
+ *
+ *   One the completion of the transfer, the channel result byte may be set as
+ *   follows:
+ *
+ *     OK     - Transfer completed successfully
+ *     EAGAIN - If devices NAKs the transfer or NYET occurs
+ *     EPERM  - If the endpoint stalls
+ *     EIO    - On a TX or data toggle error
+ *     EPIPE  - Frame overrun
+ *
+ *   EBUSY in the result field indicates that the transfer has not completed.
+ *
+ ****************************************************************************/
+
+static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv,
+                                      int chidx)
+{
+  FAR struct stm32_chan_s *chan = &priv->chan[chidx];
+  uint32_t regval;
+  uint32_t pending;
+
+  /* Read the HCINT register to get the pending HC interrupts.  Read the
+   * HCINTMSK register to get the set of enabled HC interrupts.
+   */
+
+  pending = stm32_getreg(STM32_OTG_HCINT(chidx));
+  regval  = stm32_getreg(STM32_OTG_HCINTMSK(chidx));
+
+  /* AND the two to get the set of enabled, pending HC interrupts */
+
+  pending &= regval;
+  ullinfo("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending);
+
+  /* Check for a pending ACK response received/transmitted (ACK) interrupt */
+
+  if ((pending & OTG_HCINT_ACK) != 0)
+    {
+      /* Clear the pending the ACK response received/transmitted (ACK) interrupt */
+
+      stm32_putreg(STM32_OTG_HCINT(chidx), OTG_HCINT_ACK);
+    }
+
+  /* Check for a pending STALL response receive (STALL) interrupt */
+
+  else if ((pending & OTG_HCINT_STALL) != 0)
+    {
+      /* Clear the NAK and STALL Conditions. */
+
+      stm32_putreg(STM32_OTG_HCINT(chidx), (OTG_HCINT_NAK | OTG_HCINT_STALL));
+
+      /* Halt the channel when a STALL, TXERR, BBERR or DTERR interrupt is
+       * received on the channel.
+       */
+
+      stm32_chan_halt(priv, chidx, CHREASON_STALL);
+
+      /* When there is a STALL, clear any pending NAK so that it is not
+       * processed below.
+       */
+
+      pending &= ~OTG_HCINT_NAK;
+    }
+
+  /* Check for a pending Data Toggle ERRor (DTERR) interrupt */
+
+  else if ((pending & OTG_HCINT_DTERR) != 0)
+    {
+      /* Halt the channel when a STALL, TXERR, BBERR or DTERR interrupt is
+       * received on the channel.
+       */
+
+      stm32_chan_halt(priv, chidx, CHREASON_DTERR);
+
+      /* Clear the NAK and data toggle error conditions */
+
+      stm32_putreg(STM32_OTG_HCINT(chidx), (OTG_HCINT_NAK | OTG_HCINT_DTERR));
+    }
+
+  /* Check for a pending FRaMe OverRun (FRMOR) interrupt */
+
+  if ((pending & OTG_HCINT_FRMOR) != 0)
+    {
+      /* Halt the channel -- the CHH interrupt is expected next */
+
+      stm32_chan_halt(priv, chidx, CHREASON_FRMOR);
+
+      /* Clear the FRaMe OverRun (FRMOR) condition */
+
+      stm32_putreg(STM32_OTG_HCINT(chidx), OTG_HCINT_FRMOR);
+    }
+
+  /* Check for a pending TransFeR Completed (XFRC) interrupt */
+
+  else if ((pending & OTG_HCINT_XFRC) != 0)
+    {
+      /* Clear the TransFeR Completed (XFRC) condition */
+
+      stm32_putreg(STM32_OTG_HCINT(chidx), OTG_HCINT_XFRC);
+
+      /* Then handle the transfer completion event based on the endpoint type */
+
+      if (chan->eptype == OTG_EPTYPE_CTRL || chan->eptype == OTG_EPTYPE_BULK)
+        {
+          /* Halt the channel -- the CHH interrupt is expected next */
+
+          stm32_chan_halt(priv, chidx, CHREASON_XFRC);
+
+          /* Clear any pending NAK condition.  The 'indata1' data toggle
+           * should have been appropriately updated by the RxFIFO
+           * logic as each packet was received.
+           */
+
+          stm32_putreg(STM32_OTG_HCINT(chidx), OTG_HCINT_NAK);
+        }
+      else if (chan->eptype == OTG_EPTYPE_INTR)
+        {
+          /* Force the next transfer on an ODD frame */
+
+          regval = stm32_getreg(STM32_OTG_HCCHAR(chidx));
+          regval |= OTG_HCCHAR_ODDFRM;
+          stm32_putreg(STM32_OTG_HCCHAR(chidx), regval);
+
+          /* Set the request done state */
+
+          chan->result = OK;
+        }
+    }
+
+  /* Check for a pending CHannel Halted (CHH) interrupt */
+
+  else if ((pending & OTG_HCINT_CHH) != 0)
+    {
+      /* Mask the CHannel Halted (CHH) interrupt */
+
+      regval  = stm32_getreg(STM32_OTG_HCINTMSK(chidx));
+      regval &= ~OTG_HCINT_CHH;
+      stm32_putreg(STM32_OTG_HCINTMSK(chidx), regval);
+
+      /* Update the request state based on the host state machine state */
+
+      if (chan->chreason == CHREASON_XFRC)
+        {
+          /* Set the request done result */
+
+          chan->result = OK;
+        }
+      else if (chan->chreason == CHREASON_STALL)
+        {
+          /* Set the request stall result */
+
+          chan->result = EPERM;
+        }
+      else if ((chan->chreason == CHREASON_TXERR) ||
+               (chan->chreason == CHREASON_DTERR))
+        {
+          /* Set the request I/O error result */
+
+          chan->result = EIO;
+        }
+      else if (chan->chreason == CHREASON_NAK)
+        {
+          /* Halt on NAK only happens on an INTR channel.  Fetch the HCCHAR register
+           * and check for an interrupt endpoint.
+           */
+
+          regval = stm32_getreg(STM32_OTG_HCCHAR(chidx));
+          if ((regval & OTG_HCCHAR_EPTYP_MASK) == OTG_HCCHAR_EPTYP_INTR)
+            {
+              /* Toggle the IN data toggle (Used by Bulk and INTR only) */
+
+              chan->indata1 ^= true;
+            }
+
+          /* Set the NAK error result */
+
+          chan->result = EAGAIN;
+        }
+      else /* if (chan->chreason == CHREASON_FRMOR) */
+        {
+          /* Set the frame overrun error result */
+
+          chan->result = EPIPE;
+        }
+
+      /* Clear the CHannel Halted (CHH) condition */
+
+      stm32_putreg(STM32_OTG_HCINT(chidx), OTG_HCINT_CHH);
+    }
+
+  /* Check for a pending Transaction ERror (TXERR) interrupt */
+
+  else if ((pending & OTG_HCINT_TXERR) != 0)
+    {
+      /* Halt the channel when a STALL, TXERR, BBERR or DTERR interrupt is
+       * received on the channel.
+       */
+
+      stm32_chan_halt(priv, chidx, CHREASON_TXERR);
+
+      /* Clear the Transaction ERror (TXERR) condition */
+
+      stm32_putreg(STM32_OTG_HCINT(chidx), OTG_HCINT_TXERR);
+    }
+
+  /* Check for a pending NAK response received (NAK) interrupt */
+
+  else if ((pending & OTG_HCINT_NAK) != 0)
+    {
+      /* For a BULK transfer, the hardware is capable of retrying
+       * automatically on a NAK.  However, this is not always
+       * what we need to do.  So we always halt the transfer and
+       * return control to high level logic in the event of a NAK.
+       */
+
+#if 1
+      /* Halt the interrupt channel */
+
+      if (chan->eptype == OTG_EPTYPE_INTR)
+        {
+          /* Halt the channel -- the CHH interrupt is expected next */
+
+          stm32_chan_halt(priv, chidx, CHREASON_NAK);
+        }
+
+      /* Re-activate CTRL and BULK channels.
+       * REVISIT: This can cause a lot of interrupts!
+       */
+
+      else if (chan->eptype == OTG_EPTYPE_CTRL ||
+               chan->eptype == OTG_EPTYPE_BULK)
+        {
+          /* Re-activate the channel by clearing CHDIS and assuring that
+           * CHENA is set
+           */
+
+          regval  = stm32_getreg(STM32_OTG_HCCHAR(chidx));
+          regval |= OTG_HCCHAR_CHENA;
+          regval &= ~OTG_HCCHAR_CHDIS;
+          stm32_putreg(STM32_OTG_HCCHAR(chidx), regval);
+        }
+#else
+      /* Halt all transfers on the NAK -- the CHH interrupt is expected next */
+
+      stm32_chan_halt(priv, chidx, CHREASON_NAK);
+#endif
+
+      /* Clear the NAK condition */
+
+      stm32_putreg(STM32_OTG_HCINT(chidx), OTG_HCINT_NAK);
+    }
+
+  /* Check for a transfer complete event */
+
+  stm32_chan_wakeup(priv, chan);
+}
+
+/****************************************************************************
+ * Name: stm32_gint_hcoutisr
+ *
+ * Description:
+ *   USB OTG FS host OUT channels interrupt handler
+ *
+ *   One the completion of the transfer, the channel result byte may be set as
+ *   follows:
+ *
+ *     OK     - Transfer completed successfully
+ *     EAGAIN - If devices NAKs the transfer or NYET occurs
+ *     EPERM  - If the endpoint stalls
+ *     EIO    - On a TX or data toggle error
+ *     EPIPE  - Frame overrun
+ *
+ *   EBUSY in the result field indicates that the transfer has not completed.
+ *
+ ****************************************************************************/
+
+static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv,
+                                       int chidx)
+{
+  FAR struct stm32_chan_s *chan = &priv->chan[chidx];
+  uint32_t regval;
+  uint32_t pending;
+
+  /* Read the HCINT register to get the pending HC interrupts.  Read the
+   * HCINTMSK register to get the set of enabled HC interrupts.
+   */
+
+  pending = stm32_getreg(STM32_OTG_HCINT(chidx));
+  regval  = stm32_getreg(STM32_OTG_HCINTMSK(chidx));
+
+  /* AND the two to get the set of enabled, pending HC interrupts */
+
+  pending &= regval;
+  ullinfo("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending);
+
+  /* Check for a pending ACK response received/transmitted (ACK) interrupt */
+
+  if ((pending & OTG_HCINT_ACK) != 0)
+    {
+      /* Clear the pending the ACK response received/transmitted (ACK) interrupt */
+
+      stm32_putreg(STM32_OTG_HCINT(chidx), OTG_HCINT_ACK);
+    }
+
+  /* Check for a pending FRaMe OverRun (FRMOR) interrupt */
+
+  else if ((pending & OTG_HCINT_FRMOR) != 0)
+    {
+      /* Halt the channel (probably not necessary for FRMOR) */
+
+      stm32_chan_halt(priv, chidx, CHREASON_FRMOR);
+
+      /* Clear the pending the FRaMe OverRun (FRMOR) interrupt */
+
+      stm32_putreg(STM32_OTG_HCINT(chidx), OTG_HCINT_FRMOR);
+    }
+
+  /* Check for a pending TransFeR Completed (XFRC) interrupt */
+
+  else if ((pending & OTG_HCINT_XFRC) != 0)
+    {
+      /* Decrement the number of bytes remaining by the number of
+       * bytes that were "in-flight".
+       */
+
+      priv->chan[chidx].buffer  += priv->chan[chidx].inflight;
+      priv->chan[chidx].xfrd    += priv->chan[chidx].inflight;
+      priv->chan[chidx].inflight = 0;
+
+      /* Halt the channel -- the CHH interrupt is expected next */
+
+      stm32_chan_halt(priv, chidx, CHREASON_XFRC);
+
+      /* Clear the pending the TransFeR Completed (XFRC) interrupt */
+
+      stm32_putreg(STM32_OTG_HCINT(chidx), OTG_HCINT_XFRC);
+    }
+
+  /* Check for a pending STALL response receive (STALL) interrupt */
+
+  else if ((pending & OTG_HCINT_STALL) != 0)
+    {
+      /* Clear the pending the STALL response receiv (STALL) interrupt */
+
+      stm32_putreg(STM32_OTG_HCINT(chidx), OTG_HCINT_STALL);
+
+      /* Halt the channel when a STALL, TXERR, BBERR or DTERR interrupt is
+       * received on the channel.
+       */
+
+      stm32_chan_halt(priv, chidx, CHREASON_STALL);
+    }
+
+  /* Check for a pending NAK response received (NAK) interrupt */
+
+  else if ((pending & OTG_HCINT_NAK) != 0)
+    {
+      /* Halt the channel  -- the CHH interrupt is expected next */
+
+      stm32_chan_halt(priv, chidx, CHREASON_NAK);
+
+      /* Clear the pending the NAK response received (NAK) interrupt */
+
+      stm32_putreg(STM32_OTG_HCINT(chidx), OTG_HCINT_NAK);
+    }
+
+  /* Check for a pending Transaction ERror (TXERR) interrupt */
+
+  else if ((pending & OTG_HCINT_TXERR) != 0)
+    {
+      /* Halt the channel when a STALL, TXERR, BBERR or DTERR interrupt is
+       * received on the channel.
+       */
+
+      stm32_chan_halt(priv, chidx, CHREASON_TXERR);
+
+      /* Clear the pending the Transaction ERror (TXERR) interrupt */
+
+      stm32_putreg(STM32_OTG_HCINT(chidx), OTG_HCINT_TXERR);
+    }
+
+  /* Check for a NYET interrupt */
+
+#if 0 /* NYET is a reserved bit in the HCINT register */
+  else if ((pending & OTG_HCINT_NYET) != 0)
+    {
+      /* Halt the channel */
+
+      stm32_chan_halt(priv, chidx, CHREASON_NYET);
+
+      /* Clear the pending the NYET interrupt */
+
+      stm32_putreg(STM32_OTG_HCINT(chidx), OTG_HCINT_NYET);
+    }
+#endif
+
+  /* Check for a pending Data Toggle ERRor (DTERR) interrupt */
+
+  else if (pending & OTG_HCINT_DTERR)
+    {
+      /* Halt the channel when a STALL, TXERR, BBERR or DTERR interrupt is
+       * received on the channel.
+       */
+
+      stm32_chan_halt(priv, chidx, CHREASON_DTERR);
+
+      /* Clear the pending the Data Toggle ERRor (DTERR) and NAK interrupts */
+
+      stm32_putreg(STM32_OTG_HCINT(chidx), (OTG_HCINT_DTERR | OTG_HCINT_NAK));
+    }
+
+  /* Check for a pending CHannel Halted (CHH) interrupt */
+
+  else if ((pending & OTG_HCINT_CHH) != 0)
+    {
+      /* Mask the CHannel Halted (CHH) interrupt */
+
+      regval  = stm32_getreg(STM32_OTG_HCINTMSK(chidx));
+      regval &= ~OTG_HCINT_CHH;
+      stm32_putreg(STM32_OTG_HCINTMSK(chidx), regval);
+
+      if (chan->chreason == CHREASON_XFRC)
+        {
+          /* Set the request done result */
+
+          chan->result = OK;
+
+          /* Read the HCCHAR register to get the HCCHAR register to get
+           * the endpoint type.
+           */
+
+          regval = stm32_getreg(STM32_OTG_HCCHAR(chidx));
+
+          /* Is it a bulk endpoint?  Were an odd number of packets
+           * transferred?
+           */
+
+          if ((regval & OTG_HCCHAR_EPTYP_MASK) == OTG_HCCHAR_EPTYP_BULK &&
+              (chan->npackets & 1) != 0)
+            {
+              /* Yes to both... toggle the data out PID */
+
+              chan->outdata1 ^= true;
+            }
+        }
+      else if (chan->chreason == CHREASON_NAK ||
+               chan->chreason == CHREASON_NYET)
+        {
+          /* Set the try again later result */
+
+          chan->result = EAGAIN;
+        }
+      else if (chan->chreason == CHREASON_STALL)
+        {
+          /* Set the request stall result */
+
+          chan->result = EPERM;
+        }
+      else if ((chan->chreason == CHREASON_TXERR) ||
+               (chan->chreason == CHREASON_DTERR))
+        {
+          /* Set the I/O failure result */
+
+          chan->result = EIO;
+        }
+      else /* if (chan->chreason == CHREASON_FRMOR) */
+        {
+          /* Set the frame error result */
+
+          chan->result = EPIPE;
+        }
+
+      /* Clear the pending the CHannel Halted (CHH) interrupt */
+
+      stm32_putreg(STM32_OTG_HCINT(chidx), OTG_HCINT_CHH);
+    }
+
+  /* Check for a transfer complete event */
+
+  stm32_chan_wakeup(priv, chan);
+}
+
+/****************************************************************************
+ * Name: stm32_gint_connected
+ *
+ * Description:
+ *   Handle a connection event.
+ *
+ ****************************************************************************/
+
+static void stm32_gint_connected(FAR struct stm32_usbhost_s *priv)
+{
+  /* We we previously disconnected? */
+
+  if (!priv->connected)
+    {
+      /* Yes.. then now we are connected */
+
+      usbhost_vtrace1(OTG_VTRACE1_CONNECTED, 0);
+      priv->connected = true;
+      priv->change    = true;
+      DEBUGASSERT(priv->smstate == SMSTATE_DETACHED);
+
+      /* Notify any waiters */
+
+      priv->smstate = SMSTATE_ATTACHED;
+      if (priv->pscwait)
+        {
+          stm32_givesem(&priv->pscsem);
+          priv->pscwait = false;
+        }
+    }
+}
+
+/****************************************************************************
+ * Name: stm32_gint_disconnected
+ *
+ * Description:
+ *   Handle a disconnection event.
+ *
+ ****************************************************************************/
+
+static void stm32_gint_disconnected(FAR struct stm32_usbhost_s *priv)
+{
+  /* Were we previously connected? */
+
+  if (priv->connected)
+    {
+      /* Yes.. then we no longer connected */
+
+      usbhost_vtrace1(OTG_VTRACE1_DISCONNECTED, 0);
+
+      /* Are we bound to a class driver? */
+
+      if (priv->rhport.hport.devclass)
+        {
+          /* Yes.. Disconnect the class driver */
+
+          CLASS_DISCONNECTED(priv->rhport.hport.devclass);
+          priv->rhport.hport.devclass = NULL;
+        }
+
+      /* Re-Initialize Host for new Enumeration */
+
+      priv->smstate   = SMSTATE_DETACHED;
+      priv->connected = false;
+      priv->change    = true;
+      stm32_chan_freeall(priv);
+
+      priv->rhport.hport.speed = USB_SPEED_FULL;
+
+      /* Notify any waiters that there is a change in the connection state */
+
+      if (priv->pscwait)
+        {
+          stm32_givesem(&priv->pscsem);
+          priv->pscwait = false;
+        }
+    }
+}
+
+/****************************************************************************
+ * Name: stm32_gint_sofisr
+ *
+ * Description:
+ *   USB OTG FS start-of-frame interrupt handler
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_STM32F7_OTG_SOFINTR
+static inline void stm32_gint_sofisr(FAR struct stm32_usbhost_s *priv)
+{
+  /* Handle SOF interrupt */
+#warning "Do what?"
+
+  /* Clear pending SOF interrupt */
+
+  stm32_putreg(STM32_OTG_GINTSTS, OTG_GINT_SOF);
+}
+#endif
+
+/****************************************************************************
+ * Name: stm32_gint_rxflvlisr
+ *
+ * Description:
+ *   USB OTG FS RxFIFO non-empty interrupt handler
+ *
+ ****************************************************************************/
+
+static inline void stm32_gint_rxflvlisr(FAR struct stm32_usbhost_s *priv)
+{
+  FAR uint32_t *dest;
+  uint32_t grxsts;
+  uint32_t intmsk;
+  uint32_t hcchar;
+  uint32_t hctsiz;
+  uint32_t fifo;
+  int bcnt;
+  int bcnt32;
+  int chidx;
+  int i;
+
+  /* Disable the RxFIFO non-empty interrupt */
+
+  intmsk  = stm32_getreg(STM32_OTG_GINTMSK);
+  intmsk &= ~OTG_GINT_RXFLVL;
+  stm32_putreg(STM32_OTG_GINTMSK, intmsk);
+
+  /* Read and pop the next status from the Rx FIFO */
+
+  grxsts = stm32_getreg(STM32_OTG_GRXSTSP);
+  ullinfo("GRXSTS: %08x\n", grxsts);
+
+  /* Isolate the channel number/index in the status word */
+
+  chidx = (grxsts & OTG_GRXSTSH_CHNUM_MASK) >> OTG_GRXSTSH_CHNUM_SHIFT;
+
+  /* Get the host channel characteristics register (HCCHAR) for this channel */
+
+  hcchar = stm32_getreg(STM32_OTG_HCCHAR(chidx));
+
+  /* Then process the interrupt according to the packet status */
+
+  switch (grxsts & OTG_GRXSTSH_PKTSTS_MASK)
+    {
+    case OTG_GRXSTSH_PKTSTS_INRECVD: /* IN data packet received */
+      {
+        /* Read the data into the host buffer. */
+
+        bcnt = (grxsts & OTG_GRXSTSH_BCNT_MASK) >> OTG_GRXSTSH_BCNT_SHIFT;
+        if (bcnt > 0 && priv->chan[chidx].buffer != NULL)
+          {
+            /* Transfer the packet from the Rx FIFO into the user buffer */
+
+            dest   = (FAR uint32_t *)priv->chan[chidx].buffer;
+            fifo   = STM32_OTG_DFIFO_HCH(0);
+            bcnt32 = (bcnt + 3) >> 2;
+
+            for (i = 0; i < bcnt32; i++)
+              {
+                *dest++ = stm32_getreg(fifo);
+              }
+
+            stm32_pktdump("Received", priv->chan[chidx].buffer, bcnt);
+
+            /* Toggle the IN data pid (Used by Bulk and INTR only) */
+
+            priv->chan[chidx].indata1 ^= true;
+
+            /* Manage multiple packet transfers */
+
+            priv->chan[chidx].buffer += bcnt;
+            priv->chan[chidx].xfrd   += bcnt;
+
+            /* Check if more packets are expected */
+
+            hctsiz = stm32_getreg(STM32_OTG_HCTSIZ(chidx));
+            if ((hctsiz & OTG_HCTSIZ_PKTCNT_MASK) != 0)
+              {
+                /* Re-activate the channel when more packets are expected */
+
+                hcchar |= OTG_HCCHAR_CHENA;
+                hcchar &= ~OTG_HCCHAR_CHDIS;
+                stm32_putreg(STM32_OTG_HCCHAR(chidx), hcchar);
+              }
+          }
+      }
+      break;
+
+    case OTG_GRXSTSH_PKTSTS_INDONE:  /* IN transfer completed */
+    case OTG_GRXSTSH_PKTSTS_DTOGERR: /* Data toggle error */
+    case OTG_GRXSTSH_PKTSTS_HALTED:  /* Channel halted */
+    default:
+      break;
+    }
+
+  /* Re-enable the RxFIFO non-empty interrupt */
+
+  intmsk |= OTG_GINT_RXFLVL;
+  stm32_putreg(STM32_OTG_GINTMSK, intmsk);
+}
+
+/****************************************************************************
+ * Name: stm32_gint_nptxfeisr
+ *
+ * Description:
+ *   USB OTG FS non-periodic TxFIFO empty interrupt handler
+ *
+ ****************************************************************************/
+
+static inline void stm32_gint_nptxfeisr(FAR struct stm32_usbhost_s *priv)
+{
+  FAR struct stm32_chan_s *chan;
+  uint32_t     regval;
+  unsigned int wrsize;
+  unsigned int avail;
+  unsigned int chidx;
+
+  /* Recover the index of the channel that is waiting for space in the Tx
+   * FIFO.
+   */
+
+  chidx = priv->chidx;
+  chan  = &priv->chan[chidx];
+
+  /* Reduce the buffer size by the number of bytes that were previously placed
+   * in the Tx FIFO.
+   */
+
+  chan->buffer  += chan->inflight;
+  chan->xfrd    += chan->inflight;
+  chan->inflight = 0;
+
+  /* If we have now transferred the entire buffer, then this transfer is
+   * complete (this case really should never happen because we disable
+   * the NPTXFE interrupt on the final packet).
+   */
+
+  if (chan->xfrd >= chan->buflen)
+    {
+      /* Disable further Tx FIFO empty interrupts and bail. */
+
+      stm32_modifyreg(STM32_OTG_GINTMSK, OTG_GINT_NPTXFE, 0);
+      return;
+    }
+
+  /* Read the status from the top of the non-periodic TxFIFO */
+
+  regval = stm32_getreg(STM32_OTG_HNPTXSTS);
+
+  /* Extract the number of bytes available in the non-periodic Tx FIFO. */
+
+  avail = ((regval & OTG_HNPTXSTS_NPTXFSAV_MASK) >> OTG_HNPTXSTS_NPTXFSAV_SHIFT) << 2;
+
+  /* Get the size to put in the Tx FIFO now */
+
+  wrsize = chan->buflen - chan->xfrd;
+
+  /* Get minimal size packet that can be sent.  Something is seriously
+   * configured wrong if one packet will not fit into the empty Tx FIFO.
+   */
+
+  DEBUGASSERT(wrsize > 0 && avail >= MIN(wrsize, chan->maxpacket));
+  if (wrsize > avail)
+    {
+      /* Clip the write size to the number of full, max sized packets
+       * that will fit in the Tx FIFO.
+       */
+
+      unsigned int wrpackets = avail / chan->maxpacket;
+      wrsize = wrpackets * chan->maxpacket;
+    }
+
+  /* Otherwise, this will be the last packet to be sent in this transaction.
+   * We now need to disable further NPTXFE interrupts.
+   */
+
+  else
+    {
+      stm32_modifyreg(STM32_OTG_GINTMSK, OTG_GINT_NPTXFE, 0);
+    }
+
+  /* Write the next group of packets into the Tx FIFO */
+
+  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);
+}
+
+/****************************************************************************
+ * Name: stm32_gint_ptxfeisr
+ *
+ * Description:
+ *   USB OTG FS periodic TxFIFO empty interrupt handler
+ *
+ ****************************************************************************/
+
+static inline void stm32_gint_ptxfeisr(FAR struct stm32_usbhost_s *priv)
+{
+  FAR struct stm32_chan_s *chan;
+  uint32_t     regval;
+  unsigned int wrsize;
+  unsigned int avail;
+  unsigned int chidx;
+
+  /* Recover the index of the channel that is waiting for space in the Tx
+   * FIFO.
+   */
+
+  chidx = priv->chidx;
+  chan  = &priv->chan[chidx];
+
+  /* Reduce the buffer size by the number of bytes that were previously placed
+   * in the Tx FIFO.
+   */
+
+  chan->buffer  += chan->inflight;
+  chan->xfrd    += chan->inflight;
+  chan->inflight = 0;
+
+  /* If we have now transfered the entire buffer, then this transfer is
+   * complete (this case really should never happen because we disable
+   * the PTXFE interrupt on the final packet).
+   */
+
+  if (chan->xfrd >= chan->buflen)
+    {
+      /* Disable further Tx FIFO empty interrupts and bail. */
+
+      stm32_modifyreg(STM32_OTG_GINTMSK, OTG_GINT_PTXFE, 0);
+      return;
+    }
+
+  /* Read the status from the top of the periodic TxFIFO */
+
+  regval = stm32_getreg(STM32_OTG_HPTXSTS);
+
+  /* Extract the number of bytes available in the periodic Tx FIFO. */
+
+  avail = ((regval & OTG_HPTXSTS_PTXFSAVL_MASK) >> OTG_HPTXSTS_PTXFSAVL_SHIFT) << 2;
+
+  /* Get the size to put in the Tx FIFO now */
+
+  wrsize = chan->buflen - chan->xfrd;
+
+  /* Get minimal size packet that can be sent.  Something is seriously
+   * configured wrong if one packet will not fit into the empty Tx FIFO.
+   */
+
+  DEBUGASSERT(wrsize && avail >= MIN(wrsize, chan->maxpacket));
+  if (wrsize > avail)
+    {
+      /* Clip the write size to the number of full, max sized packets
+       * that will fit in the Tx FIFO.
+       */
+
+      unsigned int wrpackets = avail / chan->maxpacket;
+      wrsize = wrpackets * chan->maxpacket;
+    }
+
+  /* Otherwise, this will be the last packet to be sent in this transaction.
+   * We now need to disable further PTXFE interrupts.
+   */
+
+  else
+    {
+      stm32_modifyreg(STM32_OTG_GINTMSK, OTG_GINT_PTXFE, 0);
+    }
+
+  /* Write the next group of packets into the Tx FIFO */
+
+  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);
+}
+
+/****************************************************************************
+ * Name: stm32_gint_hcisr
+ *
+ * Description:
+ *   USB OTG FS host channels interrupt handler
+ *
+ ****************************************************************************/
+
+static inline void stm32_gint_hcisr(FAR struct stm32_usbhost_s *priv)
+{
+  uint32_t haint;
+  uint32_t hcchar;
+  int i = 0;
+
+  /* Read the Host all channels interrupt register and test each bit in the
+   * register. Each bit i, i=0...(STM32_NHOST_CHANNELS-1), corresponds to
+   * a pending interrupt on channel i.
+   */
+
+  haint = stm32_getreg(STM32_OTG_HAINT);
+  for (i = 0; i < STM32_NHOST_CHANNELS; i++)
+    {
+      /* Is an interrupt pending on this channel? */
+
+      if ((haint & OTG_HAINT(i)) != 0)
+        {
+          /* Yes... read the HCCHAR register to get the direction bit */
+
+          hcchar = stm32_getreg(STM32_OTG_HCCHAR(i));
+
+          /* Was this an interrupt on an IN or an OUT channel? */
+
+          if ((hcchar & OTG_HCCHAR_EPDIR) != 0)
+            {
+              /* Handle the HC IN channel interrupt */
+
+              stm32_gint_hcinisr(priv, i);
+            }
+          else
+            {
+              /* Handle the HC OUT channel interrupt */
+
+              stm32_gint_hcoutisr(priv, i);
+            }
+        }
+    }
+}
+
+/****************************************************************************
+ * Name: stm32_gint_hprtisr
+ *
+ * Description:
+ *   USB OTG FS host port interrupt handler
+ *
+ ****************************************************************************/
+
+static inline void stm32_gint_hprtisr(FAR struct stm32_usbhost_s *priv)
+{
+  uint32_t hprt;
+  uint32_t newhprt;
+  uint32_t hcfg;
+
+  usbhost_vtrace1(OTG_VTRACE1_GINT_HPRT, 0);
+  /* Read the port status and control register (HPRT) */
+
+  hprt = stm32_getreg(STM32_OTG_HPRT);
+
+  /* Setup to clear the interrupt bits in GINTSTS by setting the corresponding
+   * bits in the HPRT.  The HCINT interrupt bit is cleared when the appropriate
+   * status bits in the HPRT register are cleared.
+   */
+
+  newhprt = hprt & ~(OTG_HPRT_PENA    | OTG_HPRT_PCDET  |
+                     OTG_HPRT_PENCHNG | OTG_HPRT_POCCHNG);
+
+  /* Check for Port Overcurrent CHaNGe (POCCHNG) */
+
+  if ((hprt & OTG_HPRT_POCCHNG) != 0)
+    {
+      /* Set up to clear the POCCHNG status in the new HPRT contents. */
+
+      usbhost_vtrace1(OTG_VTRACE1_GINT_HPRT_POCCHNG, 0);
+      newhprt |= OTG_HPRT_POCCHNG;
+    }
+
+  /* Check for Port Connect DETected (PCDET).  The core sets this bit when a
+   * device connection is detected.
+   */
+
+  if ((hprt & OTG_HPRT_PCDET) != 0)
+    {
+      /* Set up to clear the PCDET status in the new HPRT contents. Then
+       * process the new connection event.
+       */
+
+      usbhost_vtrace1(OTG_VTRACE1_GINT_HPRT_PCDET, 0);
+      newhprt |= OTG_HPRT_PCDET;
+      stm32_portreset(priv);
+      stm32_gint_connected(priv);
+    }
+
+  /* Check for Port Enable CHaNGed (PENCHNG) */
+
+  if ((hprt & OTG_HPRT_PENCHNG) != 0)
+    {
+      /* Set up to clear the PENCHNG status in the new HPRT contents. */
+
+      usbhost_vtrace1(OTG_VTRACE1_GINT_HPRT_PENCHNG, 0);
+      newhprt |= OTG_HPRT_PENCHNG;
+
+      /* Was the port enabled? */
+
+      if ((hprt & OTG_HPRT_PENA) != 0)
+        {
+          /* Yes.. handle the new connection event */
+
+          stm32_gint_connected(priv);
+
+          /* Check the Host ConFiGuration register (HCFG) */
+
+          hcfg = stm32_getreg(STM32_OTG_HCFG);
+
+          /* Is this a low speed or full speed connection (OTG FS does not
+           * support high speed)
+           */
+
+          if ((hprt & OTG_HPRT_PSPD_MASK) == OTG_HPRT_PSPD_LS)
+            {
+              /* Set the Host Frame Interval Register for the 6KHz speed */
+
+              usbhost_vtrace1(OTG_VTRACE1_GINT_HPRT_LSDEV, 0);
+              stm32_putreg(STM32_OTG_HFIR, 6000);
+
+              /* Are we switching from FS to LS? */
+
+              if ((hcfg & OTG_HCFG_FSLSPCS_MASK) != OTG_HCFG_FSLSPCS_LS6MHz)
+                {
+                  usbhost_vtrace1(OTG_VTRACE1_GINT_HPRT_FSLSSW, 0);
+
+                  /* Yes... configure for LS */
+
+                  hcfg &= ~OTG_HCFG_FSLSPCS_MASK;
+                  hcfg |= OTG_HCFG_FSLSPCS_LS6MHz;
+                  stm32_putreg(STM32_OTG_HCFG, hcfg);
+
+                  /* And reset the port */
+
+                  stm32_portreset(priv);
+                }
+            }
+          else /* if ((hprt & OTG_HPRT_PSPD_MASK) == OTG_HPRT_PSPD_FS) */
+            {
+
+              usbhost_vtrace1(OTG_VTRACE1_GINT_HPRT_FSDEV, 0);
+              stm32_putreg(STM32_OTG_HFIR, 48000);
+
+              /* Are we switching from LS to FS? */
+
+              if ((hcfg & OTG_HCFG_FSLSPCS_MASK) != OTG_HCFG_FSLSPCS_FS48MHz)
+                {
+
+                  usbhost_vtrace1(OTG_VTRACE1_GINT_HPRT_LSFSSW, 0);
+                  /* Yes... configure for FS */
+
+                  hcfg &= ~OTG_HCFG_FSLSPCS_MASK;
+                  hcfg |= OTG_HCFG_FSLSPCS_FS48MHz;
+                  stm32_putreg(STM32_OTG_HCFG, hcfg);
+
+                  /* And reset the port */
+
+                  stm32_portreset(priv);
+                }
+            }
+        }
+    }
+
+  /* Clear port interrupts by setting bits in the HPRT */
+
+  stm32_putreg(STM32_OTG_HPRT, newhprt);
+}
+
+/****************************************************************************
+ * Name: stm32_gint_discisr
+ *
+ * Description:
+ *   USB OTG FS disconnect detected interrupt handler
+ *
+ ****************************************************************************/
+
+static inline void stm32_gint_discisr(FAR struct stm32_usbhost_s *priv)
+{
+  /* Handle the disconnection event */
+
+  stm32_gint_disconnected(priv);
+
+  /* Clear the dicsonnect interrupt */
+
+  stm32_putreg(STM32_OTG_GINTSTS, OTG_GINT_DISC);
+}
+
+/****************************************************************************
+ * Name: stm32_gint_ipxfrisr
+ *
+ * Description:
+ *   USB OTG FS incomplete periodic interrupt handler
+ *
+ ****************************************************************************/
+
+static inline void stm32_gint_ipxfrisr(FAR struct stm32_usbhost_s *priv)
+{
+  uint32_t regval;
+
+  /* CHENA : Set to enable the channel
+   * CHDIS : Set to stop transmitting/receiving data on a channel
+   */
+
+  regval = stm32_getreg(STM32_OTG_HCCHAR(0));
+  regval |= (OTG_HCCHAR_CHDIS | OTG_HCCHAR_CHENA);
+  stm32_putreg(STM32_OTG_HCCHAR(0), regval);
+
+  /* Clear the incomplete isochronous OUT interrupt */
+
+  stm32_putreg(STM32_OTG_GINTSTS, OTG_GINT_IPXFR);
+}
+
+/****************************************************************************
+ * Name: stm32_gint_isr
+ *
+ * Description:
+ *   USB OTG FS global interrupt handler
+ *
+ ****************************************************************************/
+
+static int stm32_gint_isr(int irq, FAR void *context)
+{
+  /* At present, there is only support for a single OTG FS host. Hence it is
+   * pre-allocated as g_usbhost.  However, in most code, the private data
+   * structure will be referenced using the 'priv' pointer (rather than the
+   * global data) in order to simplify any future support for multiple devices.
+   */
+
+  FAR struct stm32_usbhost_s *priv = &g_usbhost;
+  uint32_t pending;
+
+  /* If OTG were supported, we would need to check if we are in host or
+   * device mode when the global interrupt occurs.  Here we support only
+   * host mode
+   */
+
+  /* Loop while there are pending interrupts to process.  This loop may save a
+   * little interrupt handling overhead.
+   */
+
+  for (; ; )
+    {
+      /* Get the unmasked bits in the GINT status */
+
+      pending  = stm32_getreg(STM32_OTG_GINTSTS);
+      pending &= stm32_getreg(STM32_OTG_GINTMSK);
+
+      /* Return from the interrupt when there are no further pending
+       * interrupts.
+       */
+
+      if (pending == 0)
+        {
+          return OK;
+        }
+
+      /* Otherwise, process each pending, unmasked GINT interrupts */
+
+      /* Handle the start of frame interrupt */
+
+#ifdef CONFIG_STM32F7_OTG_SOFINTR
+      if ((pending & OTG_GINT_SOF) != 0)
+        {
+          usbhost_vtrace1(OTG_VTRACE1_GINT_SOF, 0);
+          stm32_gint_sofisr(priv);
+        }
+#endif
+
+      /* Handle the RxFIFO non-empty interrupt */
+
+      if ((pending & OTG_GINT_RXFLVL) != 0)
+        {
+          usbhost_vtrace1(OTG_VTRACE1_GINT_RXFLVL, 0);
+          stm32_gint_rxflvlisr(priv);
+        }
+
+      /* Handle the non-periodic TxFIFO empty interrupt */
+
+      if ((pending & OTG_GINT_NPTXFE) != 0)
+        {
+          usbhost_vtrace1(OTG_VTRACE1_GINT_NPTXFE, 0);
+          stm32_gint_nptxfeisr(priv);
+        }
+
+      /* Handle the periodic TxFIFO empty interrupt */
+
+      if ((pending & OTG_GINT_PTXFE) != 0)
+        {
+          usbhost_vtrace1(OTG_VTRACE1_GINT_PTXFE, 0);
+          stm32_gint_ptxfeisr(priv);
+        }
+
+      /* Handle the host channels interrupt */
+
+      if ((pending & OTG_GINT_HC) != 0)
+        {
+          usbhost_vtrace1(OTG_VTRACE1_GINT_HC, 0);
+          stm32_gint_hcisr(priv);
+        }
+
+      /* Handle the host port interrupt */
+
+      if ((pending & OTG_GINT_HPRT) != 0)
+        {
+          stm32_gint_hprtisr(priv);
+        }
+
+      /* Handle the disconnect detected interrupt */
+
+      if ((pending & OTG_GINT_DISC) != 0)
+        {
+          usbhost_vtrace1(OTG_VTRACE1_GINT_DISC, 0);
+          stm32_gint_discisr(priv);
+        }
+
+      /* Handle the incomplete periodic transfer */
+
+      if ((pending & OTG_GINT_IPXFR) != 0)
+        {
+          usbhost_vtrace1(OTG_VTRACE1_GINT_IPXFR, 0);
+          stm32_gint_ipxfrisr(priv);
+        }
+    }
+
+  /* We won't get here */
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stm32_gint_enable and stm32_gint_disable
+ *
+ * Description:
+ *   Respectively enable or disable the global OTG FS interrupt.
+ *
+ * Input Parameters:
+ *   None
+ *
+ * Returned Value:
+ *   None
+ *
+ ****************************************************************************/
+
+static void stm32_gint_enable(void)
+{
+  uint32_t regval;
+
+  /* Set the GINTMSK bit to unmask the interrupt */
+
+  regval  = stm32_getreg(STM32_OTG_GAHBCFG);
+  regval |= OTG_GAHBCFG_GINTMSK;
+  stm32_putreg(STM32_OTG_GAHBCFG, regval);
+}
+
+static void stm32_gint_disable(void)
+{
+  uint32_t regval;
+
+  /* Clear the GINTMSK bit to mask the interrupt */
+
+  regval  = stm32_getreg(STM32_OTG_GAHBCFG);
+  regval &= ~OTG_GAHBCFG_GINTMSK;
+  stm32_putreg(STM32_OTG_GAHBCFG, regval);
+}
+
+/****************************************************************************
+ * Name: stm32_hostinit_enable
+ *
+ * Description:
+ *   Enable host interrupts.
+ *
+ * Input Parameters:
+ *   None
+ *
+ * Returned Value:
+ *   None
+ *
+ ****************************************************************************/
+
+static inline void stm32_hostinit_enable(void)
+{
+  uint32_t regval;
+
+  /* Disable all interrupts. */
+
+  stm32_putreg(STM32_OTG_GINTMSK, 0);
+
+  /* Clear any pending interrupts. */
+
+  stm32_putreg(STM32_OTG_GINTSTS, 0xffffffff);
+
+  /* Clear any pending USB OTG Interrupts (should be done elsewhere if OTG is supported) */
+
+  stm32_putreg(STM32_OTG_GOTGINT, 0xffffffff);
+
+  /* Clear any pending USB OTG interrupts */
+
+  stm32_putreg(STM32_OTG_GINTSTS, 0xbfffffff);
+
+  /* Enable the host interrupts */
+  /* Common interrupts:
+   *
+   *   OTG_GINT_WKUP     : Resume/remote wakeup detected interrupt
+   *   OTG_GINT_USBSUSP  : USB suspend
+   */
+
+  regval = (OTG_GINT_WKUP | OTG_GINT_USBSUSP);
+
+  /* If OTG were supported, we would need to enable the following as well:
+   *
+   *   OTG_GINT_OTG      : OTG interrupt
+   *   OTG_GINT_SRQ      : Session request/new session detected interrupt
+   *   OTG_GINT_CIDSCHG  : Connector ID status change
+   */
+
+  /* Host-specific interrupts
+   *
+   *   OTG_GINT_SOF      : Start of frame
+   *   OTG_GINT_RXFLVL   : RxFIFO non-empty
+   *   OTG_GINT_IISOOXFR : Incomplete isochronous OUT transfer
+   *   OTG_GINT_HPRT     : Host port interrupt
+   *   OTG_GINT_HC       : Host channels interrupt
+   *   OTG_GINT_DISC     : Disconnect detected interrupt
+   */
+
+#ifdef CONFIG_STM32F7_OTG_SOFINTR
+  regval |= (OTG_GINT_SOF    | OTG_GINT_RXFLVL   | OTG_GINT_IISOOXFR |
+             OTG_GINT_HPRT   | OTG_GINT_HC       | OTG_GINT_DISC);
+#else
+  regval |= (OTG_GINT_RXFLVL | OTG_GINT_IPXFR    | OTG_GINT_HPRT     |
+             OTG_GINT_HC     | OTG_GINT_DISC);
+#endif
+  stm32_putreg(STM32_OTG_GINTMSK, regval);
+}
+
+/****************************************************************************
+ * Name: stm32_txfe_enable
+ *
+ * Description:
+ *   Enable Tx FIFO empty interrupts.  This is necessary when the entire
+ *   transfer will not fit into Tx FIFO.  The transfer will then be completed
+ *   when the Tx FIFO is empty.  NOTE:  The Tx FIFO interrupt is disabled
+ *   the fifo empty interrupt handler when the transfer is complete.
+ *
+ * Input Parameters:
+ *   priv - Driver state structure reference
+ *   chidx - The channel that requires the Tx FIFO empty interrupt
+ *
+ * Returned Value:
+ *   None
+ *
+ * Assumptions:
+ *   Called from user task context.  Interrupts must be disabled to assure
+ *   exclusive access to the GINTMSK register.
+ *
+ ****************************************************************************/
+
+static void stm32_txfe_enable(FAR struct stm32_usbhost_s *priv, int chidx)
+{
+  FAR struct stm32_chan_s *chan = &priv->chan[chidx];
+  irqstate_t flags;
+  uint32_t regval;
+
+  /* Disable all interrupts so that we have exclusive access to the GINTMSK
+   * (it would be sufficent just to disable the GINT interrupt).
+   */
+
+  flags = enter_critical_section();
+
+  /* Should we enable the periodic or non-peridic Tx FIFO empty interrupts */
+
+  regval = stm32_getreg(STM32_OTG_GINTMSK);
+  switch (chan->eptype)
+    {
+    default:
+    case OTG_EPTYPE_CTRL: /* Non periodic transfer */
+    case OTG_EPTYPE_BULK:
+      regval |= OTG_GINT_NPTXFE;
+      break;
+
+    case OTG_EPTYPE_INTR: /* Periodic transfer */
+    case OTG_EPTYPE_ISOC:
+      regval |= OTG_GINT_PTXFE;
+      break;
+    }
+
+  /* Enable interrupts */
+
+  stm32_putreg(STM32_OTG_GINTMSK, regval);
+  leave_critical_section(flags);
+}
+
+/****************************************************************************
+ * USB Host Controller Operations
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stm32_wait
+ *
+ * Description:
+ *   Wait for a device to be connected or disconnected to/from a hub port.
+ *
+ * Input Parameters:
+ *   conn - The USB host connection instance obtained as a parameter from the call to
+ *      the USB driver initialization logic.
+ *   hport - The location to return the hub port descriptor that detected the
+ *      connection related event.
+ *
+ * Returned Values:
+ *   Zero (OK) is returned on success when a device in connected or
+ *   disconnected. This function will not return until either (1) a device is
+ *   connected or disconnect to/from any hub port or until (2) some failure
+ *   occurs.  On a failure, a negated errno value is returned indicating the
+ *   nature of the failure
+ *
+ * Assumptions:
+ *   - Called from a single thread so no mutual exclusion is required.
+ *   - Never called from an interrupt handler.
+ *
+ ****************************************************************************/
+
+static int stm32_wait(FAR struct usbhost_connection_s *conn,
+                      FAR struct usbhost_hubport_s **hport)
+{
+  FAR struct stm32_usbhost_s *priv = &g_usbhost;
+  struct usbhost_hubport_s *connport;
+  irqstate_t flags;
+
+  /* Loop until a change in connection state is detected */
+
+  flags = enter_critical_section();
+  for (; ; )
+    {
+      /* Is there a change in the connection state of the single root hub
+       * port?
+       */
+
+      if (priv->change)
+        {
+          connport = &priv->rhport.hport;
+
+          /* Yes. Remember the new state */
+
+          connport->connected = priv->connected;
+          priv->change = false;
+
+          /* And return the root hub port */
+
+          *hport = connport;
+          leave_critical_section(flags);
+
+          uinfo("RHport Connected: %s\n", connport->connected ? "YES" : "NO");
+          return OK;
+        }
+
+#ifdef CONFIG_USBHOST_HUB
+      /* Is a device connected to an external hub? */
+
+      if (priv->hport)
+        {
+          /* Yes.. return the external hub port */
+
+          connport = (struct usbhost_hubport_s *)priv->hport;
+          priv->hport = NULL;
+
+          *hport = connport;
+          leave_critical_section(flags);
+
+          uinfo("Hub port Connected: %s\n", connport->connected ? "YES" : "NO");
+          return OK;
+        }
+#endif
+
+      /* Wait for the next connection event */
+
+      priv->pscwait = true;
+      stm32_takesem(&priv->pscsem);
+    }
+}
+
+/****************************************************************************
+ * Name: stm32_enumerate
+ *
+ * Description:
+ *   Enumerate the connected device.  As part of this enumeration process,
+ *   the driver will (1) get the device's configuration descriptor, (2)
+ *   extract the class ID info from the configuration descriptor, (3) call
+ *   usbhost_findclass() to find the class that supports this device, (4)
+ *   call the create() method on the struct usbhost_registry_s interface
+ *   to get a class instance, and finally (5) call the connect() method
+ *   of the struct usbhost_class_s interface.  After that, the class is in
+ *   charge of the sequence of operations.
+ *
+ * Input Parameters:
+ *   conn - The USB host connection instance obtained as a parameter from
+ *      the call to the USB driver initialization logic.
+ *   hport - The descriptor of the hub port that has the newly connected
+ *      device.
+ *
+ * Returned Values:
+ *   On success, zero (OK) is returned. On a failure, a negated errno value is
+ *   returned indicating the nature of the failure
+ *
+ * Assumptions:
+ *   This function will *not* be called from an interrupt handler.
+ *
+ ****************************************************************************/
+
+static int stm32_rh_enumerate(FAR struct stm32_usbhost_s *priv,
+                              FAR struct usbhost_connection_s *conn,
+                              FAR struct usbhost_hubport_s *hport)
+{
+  uint32_t regval;
+  int ret;
+
+  DEBUGASSERT(conn != NULL && hport != NULL && hport->port == 0);
+
+  /* Are we connected to a device?  The caller should have called the wait()
+   * method first to be assured that a device is connected.
+   */
+
+  while (!priv->connected)
+    {
+      /* No, return an error */
+
+      usbhost_trace1(OTG_TRACE1_DEVDISCONN, 0);
+      return -ENODEV;
+    }
+
+  DEBUGASSERT(priv->smstate == SMSTATE_ATTACHED);
+
+  /* USB 2.0 spec says at least 50ms delay before port reset.  We wait 100ms. */
+
+  usleep(100*1000);
+
+  /* Reset the host port */
+
+  stm32_portreset(priv);
+
+  /* Get the current device speed */
+
+  regval = stm32_getreg(STM32_OTG_HPRT);
+  if ((regval & OTG_HPRT_PSPD_MASK) == OTG_HPRT_PSPD_LS)
+    {
+      priv->rhport.hport.speed = USB_SPEED_LOW;
+    }
+  else
+    {
+      priv->rhport.hport.speed = USB_SPEED_FULL;
+    }
+
+  /* Allocate and initialize the root hub port EP0 channels */
+
+  ret = stm32_ctrlchan_alloc(priv, 0, 0, priv->rhport.hport.speed, &priv->ep0);
+  if (ret < 0)
+    {
+      uerr("ERROR: Failed to allocate a control endpoint: %d\n", ret);
+    }
+
+  return ret;
+}
+
+static int stm32_enumerate(FAR struct usbhost_connection_s *conn,
+                           FAR struct usbhost_hubport_s *hport)
+{
+  FAR struct stm32_usbhost_s *priv = &g_usbhost;
+  int ret;
+
+  DEBUGASSERT(hport);
+
+  /* If this is a connection on the root hub, then we need to go to
+   * little more effort to get the device speed.  If it is a connection
+   * on an external hub, then we already have that information.
+   */
+
+#ifdef CONFIG_USBHOST_HUB
+  if (ROOTHUB(hport))
+#endif
+    {
+      ret = stm32_rh_enumerate(priv, conn, hport);
+      if (ret < 0)
+        {
+          return ret;
+        }
+    }
+
+  /* Then let the common usbhost_enumerate do the real enumeration. */
+
+  uinfo("Enumerate the device\n");
+  priv->smstate = SMSTATE_ENUM;
+  ret = usbhost_enumerate(hport, &hport->devclass);
+
+  /* The enumeration may fail either because of some HCD interfaces failure
+   * or because the device class is not supported.  In either case, we just
+   * need to perform the disconnection operation and make ready for a new
+   * enumeration.
+   */
+
+  if (ret < 0)
+    {
+      /* Return to the disconnected state */
+
+      uerr("ERROR: Enumeration failed: %d\n", ret);
+      stm32_gint_disconnected(priv);
+    }
+
+  return ret;
+}
+
+/************************************************************************************
+ * Name: stm32_ep0configure
+ *
+ * Description:
+ *   Configure endpoint 0.  This method is normally used internally by the
+ *   enumerate() method but is made available at the interface to support an
+ *   external implementation of the enumeration logic.
+ *
+ * Input Parameters:
+ *   drvr - The USB host driver instance obtained as a parameter from the call to
+ *      the class create() method.
+ *   ep0 - The (opaque) EP0 endpoint instance
+ *   funcaddr - The USB address of the function containing the endpoint that EP0
+ *     controls
+ *   speed - The speed of the port USB_SPEED_LOW, _FULL, or _HIGH
+ *   maxpacketsize - The maximum number of bytes that can be sent to or
+ *    received from the endpoint in a single data packet
+ *
+ * Returned Values:
+ *   On success, zero (OK) is returned. On a failure, a negated errno value is
+ *   returned indicating the nature of the failure
+ *
+ * Assumptions:
+ *   This function will *not* be called from an interrupt handler.
+ *
+ ************************************************************************************/
+
+static int stm32_ep0configure(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
+                              uint8_t funcaddr, uint8_t speed,
+                              uint16_t maxpacketsize)
+{
+  FAR struct stm32_usbhost_s *priv = (FAR struct stm32_usbhost_s *)drvr;
+  FAR struct stm32_ctrlinfo_s *ep0info = (FAR struct stm32_ctrlinfo_s *)ep0;
+  FAR struct stm32_chan_s *chan;
+
+  DEBUGASSERT(drvr != NULL && ep0info != NULL && funcaddr < 128 &&
+              maxpacketsize <= 64);
+
+  /* We must have exclusive access to the USB host hardware and state structures */
+
+  stm32_takesem(&priv->exclsem);
+
+  /* Configure the EP0 OUT channel */
+
+  chan            = &priv->chan[ep0info->outndx];
+  chan->funcaddr  = funcaddr;
+  chan->speed     = speed;
+  chan->maxpacket = maxpacketsize;
+
+  stm32_chan_configure(priv, ep0info->outndx);
+
+  /* Configure the EP0 IN channel */
+
+  chan            = &priv->chan[ep0info->inndx];
+  chan->funcaddr  = funcaddr;
+  chan->speed     = speed;
+  chan->maxpacket = maxpacketsize;
+
+  stm32_chan_configure(priv, ep0info->inndx);
+
+  stm32_givesem(&priv->exclsem);
+  return OK;
+}
+
+/************************************************************************************
+ * Name: stm32_epalloc
+ *
+ * Description:
+ *   Allocate and configure one endpoint.
+ *
+ * Input Parameters:
+ *   drvr - The USB host driver instance obtained as a parameter from the call to
+ *      the class create() method.
+ *   epdesc - Describes the endpoint to be allocated.
+ *   ep - A memory location provided by the caller in which to receive the
+ *      allocated endpoint descriptor.
+ *
+ * Returned Values:
+ *   On success, zero (OK) is returned. On a failure, a negated errno value is
+ *   returned indicating the nature of the failure
+ *
+ * Assumptions:
+ *   This function will *not* be called from an interrupt handler.
+ *
+ ************************************************************************************/
+
+static int stm32_epalloc(FAR struct usbhost_driver_s *drvr,
+                         FAR const struct usbhost_epdesc_s *epdesc,
+                         FAR usbhost_ep_t *ep)
+{
+  FAR struct stm32_usbhost_s *priv = (FAR struct stm32_usbhost_s *)drvr;
+  int ret;
+
+  /* Sanity check.  NOTE that this method should only be called if a device is
+   * connected (because we need a valid low speed indication).
+   */
+
+  DEBUGASSERT(drvr != 0 && epdesc != NULL && ep != NULL);
+
+  /* We must have exclusive access to the USB host hardware and state structures */
+
+  stm32_takesem(&priv->exclsem);
+
+  /* Handler control pipes differently from other endpoint types.  This is
+   * because the normal, "transfer" endpoints are unidirectional an require
+   * only a single channel.  Control endpoints, however, are bi-diretional
+   * and require two channels, one for the IN and one for the OUT direction.
+   */
+
+  if (epdesc->xfrtype == OTG_EPTYPE_CTRL)
+    {
+      ret = stm32_ctrlep_alloc(priv, epdesc, ep);
+    }
+  else
+    {
+      ret = stm32_xfrep_alloc(priv, epdesc, ep);
+    }
+
+  stm32_givesem(&priv->exclsem);
+  return ret;
+}
+
+/************************************************************************************
+ * Name: stm32_epfree
+ *
+ * Description:
+ *   Free and endpoint previously allocated by DRVR_EPALLOC.
+ *
+ * Input Parameters:
+ *   drvr - The USB host driver instance obtained as a parameter from the call to
+ *      the class create() method.
+ *   ep - The endpoint to be freed.
+ *
+ * Returned Values:
+ *   On success, zero (OK) is returned. On a failure, a negated errno value is
+ *   returned indicating the nature of the failure
+ *
+ * Assumptions:
+ *   This function will *not* be called from an interrupt handler.
+ *
+ ************************************************************************************/
+
+static int stm32_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep)
+{
+  FAR struct stm32_usbhost_s *priv = (FAR struct stm32_usbhost_s *)drvr;
+
+  DEBUGASSERT(priv);
+
+  /* We must have exclusive access to the USB host hardware and state structures */
+
+  stm32_takesem(&priv->exclsem);
+
+  /* A single channel is represent by an index in the range of 0 to STM32_MAX_TX_FIFOS.
+   * Otherwise, the ep must be a pointer to an allocated control endpoint structure.
+   */
+
+  if ((uintptr_t)ep < STM32_MAX_TX_FIFOS)
+    {
+      /* Halt the channel and mark the channel available */
+
+      stm32_chan_free(priv, (int)ep);
+    }
+  else
+    {
+      /* Halt both control channel and mark the channels available */
+
+      FAR struct stm32_ctrlinfo_s *ctrlep = (FAR struct stm32_ctrlinfo_s *)ep;
+      stm32_chan_free(priv, ctrlep->inndx);
+      stm32_chan_free(priv, ctrlep->outndx);
+
+      /* And free the control endpoint container */
+
+      kmm_free(ctrlep);
+    }
+
+  stm32_givesem(&priv->exclsem);
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stm32_alloc
+ *
+ * Description:
+ *   Some hardware supports special memory in which request and descriptor data can
+ *   be accessed more efficiently.  This method provides a mechanism to allocate
+ *   the request/descriptor memory.  If the underlying hardware does not support
+ *   such "special" memory, this functions may simply map to kmm_malloc.
+ *
+ *   This interface was optimized under a particular assumption.  It was assumed
+ *   that the driver maintains a pool of small, pre-allocated buffers for descriptor
+ *   traffic.  NOTE that size is not an input, but an output:  The size of the
+ *   pre-allocated buffer is returned.
+ *
+ * Input Parameters:
+ *   drvr - The USB host driver instance obtained as a parameter from the call to
+ *      the class create() method.
+ *   buffer - The address of a memory location provided by the caller in which to
+ *     return the allocated buffer memory address.
+ *   maxlen - The address of a memory location provided by the caller in which to
+ *     return the maximum size of the allocated buffer memory.
+ *
+ * Returned Values:
+ *   On success, zero (OK) is returned. On a failure, a negated errno value is
+ *   returned indicating the nature of the failure
+ *
+ * Assumptions:
+ *   - Called from a single thread so no mutual exclusion is required.
+ *   - Never called from an interrupt handler.
+ *
+ ****************************************************************************/
+
+static int stm32_alloc(FAR struct usbhost_driver_s *drvr,
+                       FAR uint8_t **buffer, FAR size_t *maxlen)
+{
+  FAR uint8_t *alloc;
+
+  DEBUGASSERT(drvr && buffer && maxlen);
+
+  /* There is no special memory requirement for the STM32. */
+
+  alloc = (FAR uint8_t *)kmm_malloc(CONFIG_STM32F7_OTG_DESCSIZE);
+  if (!alloc)
+    {
+      return -ENOMEM;
+    }
+
+  /* Return the allocated address and size of the descriptor buffer */
+
+  *buffer = alloc;
+  *maxlen = CONFIG_STM32F7_OTG_DESCSIZE;
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stm32_free
+ *
+ * Description:
+ *   Some hardware supports special memory in which request and descriptor data can
+ *   be accessed more efficiently.  This method provides a mechanism to free that
+ *   request/descriptor memory.  If the underlying hardware does not support
+ *   such "special" memory, this functions may simply map to kmm_free().
+ *
+ * Input Parameters:
+ *   drvr - The USB host driver instance obtained as a parameter from the call to
+ *      the class create() method.
+ *   buffer - The address of the allocated buffer memory to be freed.
+ *
+ * Returned Values:
+ *   On success, zero (OK) is returned. On a failure, a negated errno value is
+ *   returned indicating the nature of the failure
+ *
+ * Assumptions:
+ *   - Never called from an interrupt handler.
+ *
+ ****************************************************************************/
+
+static int stm32_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer)
+{
+  /* There is no special memory requirement */
+
+  DEBUGASSERT(drvr && buffer);
+  kmm_free(buffer);
+  return OK;
+}
+
+/************************************************************************************
+ * Name: stm32_ioalloc
+ *
+ * Description:
+ *   Some hardware supports special memory in which larger IO buffers can
+ *   be accessed more efficiently.  This method provides a mechanism to allocate
+ *   the request/descriptor memory.  If the underlying hardware does not support
+ *   such "special" memory, this functions may simply map to kmm_malloc.
+ *
+ *   This interface differs from DRVR_ALLOC in that the buffers are variable-sized.
+ *
+ * Input Parameters:
+ *   drvr - The USB host driver instance obtained as a parameter from the call to
+ *      the class create() method.
+ *   buffer - The address of a memory location provided by the caller in which to
+ *     return the allocated buffer memory address.
+ *   buflen - The size of the buffer required.
+ *
+ * Returned Values:
+ *   On success, zero (OK) is returned. On a failure, a negated errno value is
+ *   returned indicating the nature of the failure
+ *
+ * Assumptions:
+ *   This function will *not* be called from an interrupt handler.
+ *
+ ************************************************************************************/
+
+static int stm32_ioalloc(FAR struct usbhost_driver_s *drvr,
+                         FAR uint8_t **buffer, size_t buflen)
+{
+  FAR uint8_t *alloc;
+
+  DEBUGASSERT(drvr && buffer && buflen > 0);
+
+  /* There is no special memory requirement */
+
+  alloc = (FAR uint8_t *)kmm_malloc(buflen);
+  if (!alloc)
+    {
+      return -ENOMEM;
+    }
+
+  /* Return the allocated buffer */
+
+  *buffer = alloc;
+  return OK;
+}
+
+/************************************************************************************
+ * Name: stm32_iofree
+ *
+ * Description:
+ *   Some hardware supports special memory in which IO data can  be accessed more
+ *   efficiently.  This method provides a mechanism to free that IO buffer
+ *   memory.  If the underlying hardware does not support such "special" memory,
+ *   this functions may simply map to kmm_free().
+ *
+ * Input Parameters:
+ *   drvr - The USB host driver instance obtained as a parameter from the call to
+ *      the class create() method.
+ *   buffer - The address of the allocated buffer memory to be freed.
+ *
+ * Returned Values:
+ *   On success, zero (OK) is returned. On a failure, a negated errno value is
+ *   returned indicating the nature of the failure
+ *
+ * Assumptions:
+ *   This function will *not* be called from an interrupt handler.
+ *
+ ************************************************************************************/
+
+static int stm32_iofree(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer)
+{
+  /* There is no special memory requirement */
+
+  DEBUGASSERT(drvr && buffer);
+  kmm_free(buffer);
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stm32_ctrlin and stm32_ctrlout
+ *
+ * Description:
+ *   Process a IN or OUT request on the control endpoint.  These methods
+ *   will enqueue the request and wait for it to complete.  Only one transfer may be
+ *   queued; Neither these methods nor the transfer() method can be called again
+ *   until the control transfer functions returns.
+ *
+ *   These are blocking methods; these functions will not return until the
+ *   control transfer has completed.
+ *
+ * Input Parameters:
+ *   drvr - The USB host driver instance obtained as a parameter from the call to
+ *      the class create() method.
+ *   ep0 - The control endpoint to send/receive the control request.
+ *   req - Describes the request to be sent.  This request must lie in memory
+ *      created by DRVR_ALLOC.
+ *   buffer - A buffer used for sending the request and for returning any
+ *     responses.  This buffer must be large enough to hold the length value
+ *     in the request description. buffer must have been allocated using DRVR_ALLOC.
+ *
+ *   NOTE: On an IN transaction, req and buffer may refer to the same allocated
+ *   memory.
+ *
+ * Returned Values:
+ *   On success, zero (OK) is returned. On a failure, a negated errno value is
+ *   returned indicating the nature of the failure
+ *
+ * Assumptions:
+ *   - Called from a single thread so no mutual exclusion is required.
+ *   - Never called from an interrupt handler.
+ *
+ ****************************************************************************/
+
+static int stm32_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
+                        FAR const struct usb_ctrlreq_s *req,
+                        FAR uint8_t *buffer)
+{
+  FAR struct stm32_usbhost_s *priv = (FAR struct stm32_usbhost_s *)drvr;
+  FAR struct stm32_ctrlinfo_s *ep0info = (FAR struct stm32_ctrlinfo_s *)ep0;
+  uint16_t buflen;
+  systime_t start;
+  systime_t elapsed;
+  int retries;
+  int ret;
+
+  DEBUGASSERT(priv != NULL && ep0info != NULL && req != NULL);
+  usbhost_vtrace2(OTG_VTRACE2_CTRLIN, req->type, req->req);
+  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]);
+
+  /* Extract values from the request */
+
+  buflen = stm32_getle16(req->len);
+
+  /* We must have exclusive access to the USB host hardware and state structures */
+
+  stm32_takesem(&priv->exclsem);
+
+  /* Loop, retrying until the retry time expires */
+
+  for (retries = 0; retries < STM32_RETRY_COUNT; retries++)
+    {
+      /* Send the SETUP request */
+
+      ret = stm32_ctrl_sendsetup(priv, ep0info, req);
+      if (ret < 0)
+        {
+          usbhost_trace1(OTG_TRACE1_SENDSETUP, -ret);
+          continue;
+        }
+
+      /* Get the start time.  Loop again until the timeout expires */
+
+      start = clock_systimer();
+      do
+        {
+          /* Handle the IN data phase (if any) */
+
+          if (buflen > 0)
+            {
+              ret = stm32_ctrl_recvdata(priv, ep0info, buffer, buflen);
+              if (ret < 0)
+                {
+                  usbhost_trace1(OTG_TRACE1_RECVDATA, -ret);
+                }
+            }
+
+          /* Handle the status OUT phase */
+
+          if (ret == OK)
+            {
+              priv->chan[ep0info->outndx].outdata1 ^= true;
+              ret = stm32_ctrl_senddata(priv, ep0info, NULL, 0);
+              if (ret == OK)
+                {
+                  /* All success transactions exit here */
+
+                  stm32_givesem(&priv->exclsem);
+                  return OK;
+                }
+
+              usbhost_trace1(OTG_TRACE1_SENDDATA, ret < 0 ? -ret : ret);
+            }
+
+          /* Get the elapsed time (in frames) */
+
+          elapsed = clock_systimer() - start;
+        }
+      while (elapsed < STM32_DATANAK_DELAY);
+    }
+
+  /* All failures exit here after all retries and timeouts have been exhausted */
+
+  stm32_givesem(&priv->exclsem);
+  return -ETIMEDOUT;
+}
+
+static int stm32_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
+                         FAR const struct usb_ctrlreq_s *req,
+                         FAR const uint8_t *buffer)
+{
+  FAR struct stm32_usbhost_s *priv = (FAR struct stm32_usbhost_s *)drvr;
+  FAR struct stm32_ctrlinfo_s *ep0info = (FAR struct stm32_ctrlinfo_s *)ep0;
+  uint16_t buflen;
+  systime_t start;
+  systime_t elapsed;
+  int retries;
+  int ret;
+
+  DEBUGASSERT(priv != NULL && ep0info != NULL && req != NULL);
+  usbhost_vtrace2(OTG_VTRACE2_CTRLOUT, req->type, req->req);
+  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]);
+
+  /* Extract values from the request */
+
+  buflen = stm32_getle16(req->len);
+
+  /* We must have exclusive access to the USB host hardware and state structures */
+
+  stm32_takesem(&priv->exclsem);
+
+  /* Loop, retrying until the retry time expires */
+
+  for (retries = 0; retries < STM32_RETRY_COUNT; retries++)
+    {
+      /* Send the SETUP request */
+
+      ret = stm32_ctrl_sendsetup(priv, ep0info, req);
+      if (ret < 0)
+        {
+          usbhost_trace1(OTG_TRACE1_SENDSETUP, -ret);
+          continue;
+        }
+
+      /* Get the start time.  Loop again until the timeout expires */
+
+      start = clock_systimer();
+      do
+        {
+          /* Handle the data OUT phase (if any) */
+
+          if (buflen > 0)
+            {
+              /* Start DATA out transfer (only one DATA packet) */
+
+              priv->chan[ep0info->outndx].outdata1 = true;
+              ret = stm32_ctrl_senddata(priv, ep0info, NULL, 0);
+              if (ret < 0)
+                {
+                  usbhost_trace1(OTG_TRACE1_SENDDATA, -ret);
+                }
+            }
+
+          /* Handle the status IN phase */
+
+          if (ret == OK)
+            {
+              ret = stm32_ctrl_recvdata(priv, ep0info, NULL, 0);
+              if (ret == OK)
+                {
+                  /* All success transactins exit here */
+
+                  stm32_givesem(&priv->exclsem);
+                  return OK;
+                }
+
+              usbhost_trace1(OTG_TRACE1_RECVDATA, ret < 0 ? -ret : ret);
+            }
+
+          /* Get the elapsed time (in frames) */
+
+          elapsed = clock_systimer() - start;
+        }
+      while (elapsed < STM32_DATANAK_DELAY);
+    }
+
+  /* All failures exit here after all retries and timeouts have been exhausted */
+
+  stm32_givesem(&priv->exclsem);
+  return -ETIMEDOUT;
+}
+
+/****************************************************************************
+ * Name: stm32_transfer
+ *
+ * Description:
+ *   Process a request to handle a transfer descriptor.  This method will
+ *   enqueue the transfer request, blocking until the transfer completes. Only
+ *   one transfer may be  queued; Neither this method nor the ctrlin or
+ *   ctrlout methods can be called again until this function returns.
+ *
+ *   This is a blocking method; this functions will not return until the
+ *   transfer has completed.
+ *
+ * Input Parameters:
+ *   drvr - The USB host driver instance obtained as a parameter from the call to
+ *      the class create() method.
+ *   ep - The IN or OUT endpoint descriptor for the device endpoint on which to
+ *      perform the transfer.
+ *   buffer - A buffer containing the data to be sent (OUT endpoint) or received
+ *     (IN endpoint).  buffer must have been allocated using DRVR_ALLOC
+ *   buflen - The length of the data to be sent or received.
+ *
+ * Returned Values:
+ *   On success, a non-negative value is returned that indicates the number
+ *   of bytes successfully transferred.  On a failure, a negated errno value is
+ *   returned that indicates the nature of the failure:
+ *
+ *     EAGAIN - If devices NAKs the transfer (or NYET or other error where
+ *              it may be appropriate to restart the entire transaction).
+ *     EPERM  - If the endpoint stalls
+ *     EIO    - On a TX or data toggle error
+ *     EPIPE  - Overrun errors
+ *
+ * Assumptions:
+ *   - Called from a single thread so no mutual exclusion is required.
+ *   - Never called from an interrupt handler.
+ *
+ ****************************************************************************/
+
+static ssize_t stm32_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep,
+                              FAR uint8_t *buffer, size_t buflen)
+{
+  FAR struct stm32_usbhost_s *priv  = (FAR struct stm32_usbhost_s *)drvr;
+  unsigned int chidx = (unsigned int)ep;
+  ssize_t nbytes;
+
+  uinfo("chidx: %d buflen: %d\n",  (unsigned int)ep, buflen);
+
+  DEBUGASSERT(priv && buffer && chidx < STM32_MAX_TX_FIFOS && buflen > 0);
+
+  /* We must have exclusive access to the USB host hardware and state structures */
+
+  stm32_takesem(&priv->exclsem);
+
+  /* Handle IN and OUT transfer slightly differently */
+
+  if (priv->chan[chidx].in)
+    {
+      nbytes = stm32_in_transfer(priv, chidx, buffer, buflen);
+    }
+  else
+    {
+      nbytes = stm32_out_transfer(priv, chidx, buffer, buflen);
+    }
+
+  stm32_givesem(&priv->exclsem);
+  return nbytes;
+}
+
+/****************************************************************************
+ * Name: stm32_asynch
+ *
+ * Description:
+ *   Process a request to handle a transfer descriptor.  This method will
+ *   enqueue the transfer request and return immediately.  When the transfer
+ *   completes, the the callback will be invoked with the provided transfer.
+ *   This method is useful for receiving interrupt transfers which may come
+ *   infrequently.
+ *
+ *   Only one transfer may be queued; Neither this method nor the ctrlin or
+ *   ctrlout methods can be called again until the transfer completes.
+ *
+ * Input Parameters:
+ *   drvr - The USB host driver instance obtained as a parameter from the call to
+ *      the class create() method.
+ *   ep - The IN or OUT endpoint descriptor for the device endpoint on which to
+ *      perform the transfer.
+ *   buffer - A buffer containing the data to be sent (OUT endpoint) or received
+ *     (IN endpoint).  buffer must have been allocated using DRVR_ALLOC
+ *   buflen - The length of the data to be sent or received.
+ *   callback - This function will be called when the transfer completes.
+ *   arg - The arbitrary parameter that will be passed to the callback function
+ *     when the transfer completes.
+ *
+ * Returned Values:
+ *   On success, zero (OK) is returned. On a failure, a negated errno value is
+ *   returned indicating the nature of the failure
+ *
+ * Assumptions:
+ *   - Called from a single thread so no mutual exclusion is required.
+ *   - Never called from an interrupt handler.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_USBHOST_ASYNCH
+static int stm32_asynch(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep,
+                        FAR uint8_t *buffer, size_t buflen,
+                        usbhost_asynch_t callback, FAR void *arg)
+{
+  FAR struct stm32_usbhost_s *priv  = (FAR struct stm32_usbhost_s *)drvr;
+  unsigned int chidx = (unsigned int)ep;
+  int ret;
+
+  uinfo("chidx: %d buflen: %d\n",  (unsigned int)ep, buflen);
+
+  DEBUGASSERT(priv && buffer && chidx < STM32_MAX_TX_FIFOS && buflen > 0);
+
+  /* We must have exclusive access to the USB host hardware and state structures */
+
+  stm32_takesem(&priv->exclsem);
+
+  /* Handle IN and OUT transfer slightly differently */
+
+  if (priv->chan[chidx].in)
+    {
+      ret = stm32_in_asynch(priv, chidx, buffer, buflen, callback, arg);
+    }
+  else
+    {
+      ret = stm32_out_asynch(priv, chidx, buffer, buflen, callback, arg);
+    }
+
+  stm32_givesem(&priv->exclsem);
+  return ret;
+}
+#endif /* CONFIG_USBHOST_ASYNCH */
+
+/************************************************************************************
+ * Name: stm32_cancel
+ *
+ * Description:
+ *   Cancel a pending transfer on an endpoint.  Cancelled synchronous or
+ *   asynchronous transfer will complete normally with the error -ESHUTDOWN.
+ *
+ * Input Parameters:
+ *   drvr - The USB host driver instance obtained as a parameter from the call to
+ *      the class create() method.
+ *   ep - The IN or OUT endpoint descriptor for the device endpoint on which an
+ *      asynchronous transfer should be transferred.
+ *
+ * Returned Values:
+ *   On success, zero (OK) is returned. On a failure, a negated errno value is
+ *   returned indicating the nature of the failure.
+ *
+ ************************************************************************************/
+
+static int stm32_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep)
+{
+  FAR struct stm32_usbhost_s *priv  = (FAR struct stm32_usbhost_s *)drvr;
+  FAR struct stm32_chan_s *chan;
+  unsigned int chidx = (unsigned int)ep;
+  irqstate_t flags;
+
+  uinfo("chidx: %u: %d\n",  chidx);
+
+  DEBUGASSERT(priv && chidx < STM32_MAX_TX_FIFOS);
+  chan = &priv->chan[chidx];
+
+  /* We need to disable interrupts to avoid race conditions with the asynchronous
+   * completion of the transfer being cancelled.
+   */
+
+  flags = enter_critical_section();
+
+  /* Halt the channel */
+
+  stm32_chan_halt(priv, chidx, CHREASON_CANCELLED);
+  chan->result = -ESHUTDOWN;
+
+  /* Is there a thread waiting for this transfer to complete? */
+
+  if (chan->waiter)
+    {
+#ifdef CONFIG_USBHOST_ASYNCH
+      /* Yes.. there should not also be a callback scheduled */
+
+      DEBUGASSERT(chan->callback == NULL);
+#endif
+
+      /* Wake'em up! */
+
+      stm32_givesem(&chan->waitsem);
+      chan->waiter = false;
+    }
+
+#ifdef CONFIG_USBHOST_ASYNCH
+  /* No.. is an asynchronous callback expected when the transfer
+   * completes?
+   */
+
+  else if (chan->callback)
+    {
+      usbhost_asynch_t callback;
+      FAR void *arg;
+
+      /* Extract the callback information */
+
+      callback       = chan->callback;
+      arg            = chan->arg;
+
+      chan->callback = NULL;
+      chan->arg      = NULL;
+      chan->xfrd     = 0;
+
+      /* Then perform the callback */
+
+      callback(arg, -ESHUTDOWN);
+    }
+#endif
+
+  leave_critical_section(flags);
+  return OK;
+}
+
+/************************************************************************************
+ * Name: stm32_connect
+ *
+ * Description:
+ *   New connections may be detected by an attached hub.  This method is the
+ *   mechanism that is used by the hub class to introduce a new connection
+ *   and port description to the system.
+ *
+ * Input Parameters:
+ *   drvr - The USB host driver instance obtained as a parameter from the call to
+ *      the class create() method.
+ *   hport - The descriptor of the hub port that detected the connection
+ *      related event
+ *   connected - True: device connected; false: device disconnected
+ *
+ * Returned Values:
+ *   On success, zero (OK) is returned. On a failure, a negated errno value is
+ *   returned indicating the nature of the failure.
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_USBHOST_HUB
+static int stm32_connect(FAR struct usbhost_driver_s *drvr,
+                         FAR struct usbhost_hubport_s *hport,
+                         bool connected)
+{
+  FAR struct stm32_usbhost_s *priv = (FAR struct stm32_usbhost_s *)drvr;
+  irqstate_t flags;
+
+  DEBUGASSERT(priv != NULL && hport != NULL);
+
+  /* Set the connected/disconnected flag */
+
+  hport->connected = connected;
+  ullinfo("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO");
+
+  /* Report the connection event */
+
+  flags = enter_critical_section();
+  priv->hport = hport;
+  if (priv->pscwait)
+    {
+      priv->pscwait = false;
+      stm32_givesem(&priv->pscsem);
+    }
+
+  leave_critical_section(flags);
+  return OK;
+}
+#endif
+
+/****************************************************************************
+ * Name: stm32_disconnect
+ *
+ * Description:
+ *   Called by the class when an error occurs and driver has been disconnected.
+ *   The USB host driver should discard the handle to the class instance (it is
+ *   stale) and not attempt any further interaction with the class driver instance
+ *   (until a new instance is received from the create() method).  The driver
+ *   should not called the class' disconnected() method.
+ *
+ * Input Parameters:
+ *   drvr - The USB host driver instance obtained as a parameter from the call to
+ *      the class create() method.
+ *   hport - The port from which the device is being disconnected.  Might be a port
+ *      on a hub.
+ *
+ * Returned Values:
+ *   None
+ *
+ * Assumptions:
+ *   - Only a single class bound to a single device is supported.
+ *   - Never called from an interrupt handler.
+ *
+ ****************************************************************************/
+
+static void stm32_disconnect(FAR struct usbhost_driver_s *drvr,
+                             FAR struct usbhost_hubport_s *hport)
+{
+  DEBUGASSERT(hport != NULL);
+  hport->devclass = NULL;
+}
+
+/****************************************************************************
+ * Initialization
+ ****************************************************************************/
+/****************************************************************************
+ * Name: stm32_portreset
+ *
+ * Description:
+ *   Reset the USB host port.
+ *
+ *   NOTE: "Before starting to drive a USB reset, the application waits for the
+ *   OTG interrupt triggered by the debounce done bit (DBCDNE bit in
+ *   OTG_FS_GOTGINT), which indicates that the bus is stable again after the
+ *   electrical debounce caused by the attachment of a pull-up resistor on DP
+ *   (FS) or DM (LS).
+ *
+ * Input Parameters:
+ *   priv -- USB host driver private data structure.
+ *
+ * Returned Value:
+ *   None
+ *
+ ****************************************************************************/
+
+static void stm32_portreset(FAR struct stm32_usbhost_s *priv)
+{
+  uint32_t regval;
+
+  regval  = stm32_getreg(STM32_OTG_HPRT);
+  regval &= ~(OTG_HPRT_PENA | OTG_HPRT_PCDET | OTG_HPRT_PENCHNG |
+              OTG_HPRT_POCCHNG);
+  regval |= OTG_HPRT_PRST;
+  stm32_putreg(STM32_OTG_HPRT, regval);
+
+  up_mdelay(20);
+
+  regval &= ~OTG_HPRT_PRST;
+  stm32_putreg(STM32_OTG_HPRT, regval);
+
+  up_mdelay(20);
+}
+
+/****************************************************************************
+ * Name: stm32_flush_txfifos
+ *
+ * Description:
+ *   Flush the selected Tx FIFO.
+ *
+ * Input Parameters:
+ *   txfnum -- USB host driver private data structure.
+ *
+ * Returned Value:
+ *   None.
+ *
+ ****************************************************************************/
+
+static void stm32_flush_txfifos(uint32_t txfnum)
+{
+  uint32_t regval;
+  uint32_t timeout;
+
+  /* Initiate the TX FIFO flush operation */
+
+  regval = OTG_GRSTCTL_TXFFLSH | txfnum;
+  stm32_putreg(STM32_OTG_GRSTCTL, regval);
+
+  /* Wait for the FLUSH to complete */
+
+  for (timeout = 0; timeout < STM32_FLUSH_DELAY; timeout++)
+    {
+      regval = stm32_getreg(STM32_OTG_GRSTCTL);
+      if ((regval & OTG_GRSTCTL_TXFFLSH) == 0)
+        {
+          break;
+        }
+    }
+
+  /* Wait for 3 PHY Clocks */
+
+  up_udelay(3);
+}
+
+/****************************************************************************
+ * Name: stm32_flush_rxfifo
+ *
+ * Description:
+ *   Flush the Rx FIFO.
+ *
+ * Input Parameters:
+ *   priv -- USB host driver private data structure.
+ *
+ * Returned Value:
+ *   None.
+ *
+ ****************************************************************************/
+
+static void stm32_flush_rxfifo(void)
+{
+  uint32_t regval;
+  uint32_t timeout;
+
+  /* Initiate the RX FIFO flush operation */
+
+  stm32_putreg(STM32_OTG_GRSTCTL, OTG_GRSTCTL_RXFFLSH);
+
+  /* Wait for the FLUSH to complete */
+
+  for (timeout = 0; timeout < STM32_FLUSH_DELAY; timeout++)
+    {
+      regval = stm32_getreg(STM32_OTG_GRSTCTL);
+      if ((regval & OTG_GRSTCTL_RXFFLSH) == 0)
+        {
+          break;
+        }
+    }
+
+  /* Wait for 3 PHY Clocks */
+
+  up_udelay(3);
+}
+
+/****************************************************************************
+ * Name: stm32_vbusdrive
+ *
+ * Description:
+ *   Drive the Vbus +5V.
+ *
+ * Input Parameters:
+ *   priv  - USB host driver private data structure.
+ *   state - True: Drive, False: Don't drive
+ *
+ * Returned Value:
+ *   None.
+ *
+ ****************************************************************************/
+
+static void stm32_vbusdrive(FAR struct stm32_usbhost_s *priv, bool state)
+{
+  uint32_t regval;
+
+  /* Enable/disable the external charge pump */
+
+  stm32_usbhost_vbusdrive(0, state);
+
+  /* Turn on the Host port power. */
+
+  regval = stm32_getreg(STM32_OTG_HPRT);
+  regval &= ~(OTG_HPRT_PENA | OTG_HPRT_PCDET | OTG_HPRT_PENCHNG |
+              OTG_HPRT_POCCHNG);
+
+  if (((regval & OTG_HPRT_PPWR) == 0) && state)
+    {
+      regval |= OTG_HPRT_PPWR;
+      stm32_putreg(STM32_OTG_HPRT, regval);
+    }
+
+  if (((regval & OTG_HPRT_PPWR) != 0) && !state)
+    {
+      regval &= ~OTG_HPRT_PPWR;
+      stm32_putreg(STM32_OTG_HPRT, regval);
+    }
+
+  up_mdelay(200);
+}
+
+/****************************************************************************
+ * Name: stm32_host_initialize
+ *
+ * Description:
+ *   Initialize/re-initialize hardware for host mode operation.  At present,
+ *   this function is called only from stm32_hw_initialize().  But if OTG mode
+ *   were supported, this function would also be called to swtich between
+ *   host and device modes on a connector ID change interrupt.
+ *
+ * Input Parameters:
+ *   priv -- USB host driver private data structure.
+ *
+ * Returned Value:
+ *   None.
+ *
+ ****************************************************************************/
+
+static void stm32_host_initialize(FAR struct stm32_usbhost_s *priv)
+{
+  uint32_t regval;
+  uint32_t offset;
+  int i;
+
+  /* Restart the PHY Clock */
+
+  stm32_putreg(STM32_OTG_PCGCCTL, 0);
+
+  /* Initialize Host Configuration (HCFG) register */
+
+  regval  = stm32_getreg(STM32_OTG_HCFG);
+  regval &= ~OTG_HCFG_FSLSPCS_MASK;
+  regval |= OTG_HCFG_FSLSPCS_FS48MHz;
+  stm32_putreg(STM32_OTG_HCFG, regval);
+
+  /* Reset the host port */
+
+  stm32_portreset(priv);
+
+  /* Clear the FS-/LS-only support bit in the HCFG register */
+
+  regval = stm32_getreg(STM32_OTG_HCFG);
+  regval &= ~OTG_HCFG_FSLSS;
+  stm32_putreg(STM32_OTG_HCFG, regval);
+
+  /* Carve up FIFO memory for the Rx FIFO and the periodic and non-periodic Tx FIFOs */
+  /* Configure Rx FIFO size (GRXFSIZ) */
+
+  stm32_putreg(STM32_OTG_GRXFSIZ, CONFIG_STM32F7_OTG_RXFIFO_SIZE);
+  offset = CONFIG_STM32F7_OTG_RXFIFO_SIZE;
+
+  /* Setup the host non-periodic Tx FIFO size (HNPTXFSIZ) */
+
+  regval = (offset | (CONFIG_STM32F7_OTG_NPTXFIFO_SIZE << OTG_HNPTXFSIZ_NPTXFD_SHIFT));
+  stm32_putreg(STM32_OTG_HNPTXFSIZ, regval);
+  offset += CONFIG_STM32F7_OTG_NPTXFIFO_SIZE;
+
+  /* Set up the host periodic Tx fifo size register (HPTXFSIZ) */
+
+  regval = (offset | (CONFIG_STM32F7_OTG_PTXFIFO_SIZE << OTG_HPTXFSIZ_PTXFD_SHIFT));
+  stm32_putreg(STM32_OTG_HPTXFSIZ, regval);
+
+  /* If OTG were supported, we sould need to clear HNP enable bit in the
+   * USB_OTG control register about here.
+   */
+
+  /* Flush all FIFOs */
+
+  stm32_flush_txfifos(OTG_GRSTCTL_TXFNUM_HALL);
+  stm32_flush_rxfifo();
+
+  /* Clear all pending HC Interrupts */
+
+  for (i = 0; i < STM32_NHOST_CHANNELS; i++)
+    {
+      stm32_putreg(STM32_OTG_HCINT(i), 0xffffffff);
+      stm32_putreg(STM32_OTG_HCINTMSK(i), 0);
+    }
+
+  /* Driver Vbus +5V (the smoke test).  Should be done elsewhere in OTG
+   * mode.
+   */
+
+  stm32_vbusdrive(priv, true);
+
+  /* Enable host interrupts */
+
+  stm32_hostinit_enable();
+}
+
+/****************************************************************************
+ * Name: stm32_sw_initialize
+ *
+ * Description:
+ *   One-time setup of the host driver state structure.
+ *
+ * Input Parameters:
+ *   priv -- USB host driver private data structure.
+ *
+ * Returned Value:
+ *   None.
+ *
+ ****************************************************************************/
+
+static inline void stm32_sw_initialize(FAR struct stm32_usbhost_s *priv)
+{
+  FAR struct usbhost_driver_s *drvr;
+  FAR struct usbhost_hubport_s *hport;
+  int i;
+
+  /* Initialize the device operations */
+
+  drvr                 = &priv->drvr;
+  drvr->ep0configure   = stm32_ep0configure;
+  drvr->epalloc        = stm32_epalloc;
+  drvr->epfree         = stm32_epfree;
+  drvr->alloc          = stm32_alloc;
+  drvr->free           = stm32_free;
+  drvr->ioalloc        = stm32_ioalloc;
+  drvr->iofree         = stm32_iofree;
+  drvr->ctrlin         = stm32_ctrlin;
+  drvr->ctrlout        = stm32_ctrlout;
+  drvr->transfer       = stm32_transfer;
+#ifdef CONFIG_USBHOST_ASYNCH
+  drvr->asynch         = stm32_asynch;
+#endif
+  drvr->cancel         = stm32_cancel;
+#ifdef CONFIG_USBHOST_HUB
+  drvr->connect        = stm32_connect;
+#endif
+  drvr->disconnect     = stm32_disconnect;
+
+  /* Initialize the public port representation */
+
+  hport                = &priv->rhport.hport;
+  hport->drvr          = drvr;
+#ifdef CONFIG_USBHOST_HUB
+  hport->parent        = NULL;
+#endif
+  hport->ep0           = (usbhost_ep_t)&priv->ep0;
+  hport->speed         = USB_SPEED_FULL;
+
+  /* Initialize function address generation logic */
+
+  usbhost_devaddr_initialize(&priv->rhport);
+
+  /* Initialize semaphores */
+
+  sem_init(&priv->pscsem,  0, 0);
+  sem_init(&priv->exclsem, 0, 1);
+
+  /* Initialize the driver state data */
+
+  priv->smstate   = SMSTATE_DETACHED;
+  priv->connected = false;
+  priv->change    = false;
+
+  /* Put all of the channels back in their initial, allocated state */
+
+  memset(priv->chan, 0, STM32_MAX_TX_FIFOS * sizeof(struct stm32_chan_s));
+
+  /* Initialize each channel */
+
+  for (i = 0; i < STM32_MAX_TX_FIFOS; i++)
+    {
+      FAR struct stm32_chan_s *chan = &priv->chan[i];
+      chan->chidx = i;
+      sem_init(&chan->waitsem,  0, 0);
+    }
+}
+
+/****************************************************************************
+ * Name: stm32_hw_initialize
+ *
+ * Description:
+ *   One-time setup of the host controller harware for normal operations.
+ *
+ * Input Parameters:
+ *   priv -- USB host driver private data structure.
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static inline int stm32_hw_initialize(FAR struct stm32_usbhost_s *priv)
+{
+  uint32_t regval;
+  unsigned long timeout;
+
+  /* Set the PHYSEL bit in the GUSBCFG register to select the OTG FS serial
+   * transceiver: "This bit is always 1 with write-only access"
+   */
+
+  regval = stm32_getreg(STM32_OTG_GUSBCFG);
+  regval |= OTG_GUSBCFG_PHYSEL;
+  stm32_putreg(STM32_OTG_GUSBCFG, regval);
+
+  /* Reset after a PHY select and set Host mode.  First, wait for AHB master
+   * IDLE state.
+   */
+
+  for (timeout = 0; timeout < STM32_READY_DELAY; timeout++)
+    {
+      up_udelay(3);
+      regval = stm32_getreg(STM32_OTG_GRSTCTL);
+      if ((regval & OTG_GRSTCTL_AHBIDL) != 0)
+        {
+          break;
+        }
+    }
+
+  /* Then perform the core soft reset. */
+
+  stm32_putreg(STM32_OTG_GRSTCTL, OTG_GRSTCTL_CSRST);
+  for (timeout = 0; timeout < STM32_READY_DELAY; timeout++)
+    {
+      regval = stm32_getreg(STM32_OTG_GRSTCTL);
+      if ((regval & OTG_GRSTCTL_CSRST) == 0)
+        {
+          break;
+        }
+    }
+
+  /* Wait for 3 PHY Clocks */
+
+  up_udelay(3);
+
+  /* Deactivate the power down */
+
+  regval  = (OTG_GCCFG_PWRDWN | OTG_GCCFG_VBUSASEN | OTG_GCCFG_VBUSBSEN);
+#ifndef CONFIG_USBDEV_VBUSSENSING
+  regval |= OTG_GCCFG_NOVBUSSENS;
+#endif
+#ifdef CONFIG_STM32F7_OTG_SOFOUTPUT
+  regval |= OTG_GCCFG_SOFOUTEN;
+#endif
+  stm32_putreg(STM32_OTG_GCCFG, regval);
+  up_mdelay(20);
+
+  /* Initialize OTG features:  In order to support OTP, the HNPCAP and SRPCAP
+   * bits would need to be set in the GUSBCFG register about here.
+   */
+
+  /* Force Host Mode */
+
+  regval  = stm32_getreg(STM32_OTG_GUSBCFG);
+  regval &= ~OTG_GUSBCFG_FDMOD;
+  regval |= OTG_GUSBCFG_FHMOD;
+  stm32_putreg(STM32_OTG_GUSBCFG, regval);
+  up_mdelay(50);
+
+  /* Initialize host mode and return success */
+
+  stm32_host_initialize(priv);
+  return OK;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stm32_otgfshost_initialize
+ *
+ * Description:
+ *   Initialize USB host device controller hardware.
+ *
+ * Input Parameters:
+ *   controller -- If the device supports more than USB host controller, then
+ *     this identifies which controller is being initialized.  Normally, this
+ *     is just zero.
+ *
+ * Returned Value:
+ *   And instance of the USB host interface.  The controlling task should
+ *   use this interface to (1) call the wait() method to wait for a device
+ *   to be connected, and (2) call the enumerate() method to bind the device
+ *   to a class driver.
+ *
+ * Assumptions:
+ * - This function should called in the initialization sequence in order
+ *   to initialize the USB device functionality.
+ * - Class drivers should be initialized prior to calling this function.
+ *   Otherwise, there is a race condition if the device is already connected.
+ *
+ ****************************************************************************/
+
+FAR struct usbhost_connection_s *stm32_otgfshost_initialize(int controller)
+{
+  /* At present, there is only support for a single OTG FS host. Hence it is
+   * pre-allocated as g_usbhost.  However, in most code, the private data
+   * structure will be referenced using the 'priv' pointer (rather than the
+   * global data) in order to simplify any future support for multiple devices.
+   */
+
+  FAR struct stm32_usbhost_s *priv = &g_usbhost;
+
+  /* Sanity checks */
+
+  DEBUGASSERT(controller == 0);
+
+  /* Make sure that interrupts from the OTG FS core are disabled */
+
+  stm32_gint_disable();
+
+  /* Reset the state of the host driver */
+
+  stm32_sw_initialize(priv);
+
+  /* Alternate function pin configuration.  Here we assume that:
+   *
+   * 1. GPIOA, SYSCFG, and OTG FS peripheral clocking have already been\
+   *    enabled as part of the boot sequence.
+   * 2. Board-specific logic has already enabled other board specific GPIOs
+   *    for things like soft pull-up, VBUS sensing, power controls, and over-
+   *    current detection.
+   */
+
+  /* Configure OTG FS alternate function pins for DM, DP, ID, and SOF.
+   *
+   * PIN* SIGNAL      DIRECTION
+   * ---- ----------- ----------
+   * PA8  OTG_FS_SOF  SOF clock output
+   * PA9  OTG_FS_VBUS VBUS input for device, Driven by external regulator by
+   *                  host (not an alternate function)
+   * PA10 OTG_FS_ID   OTG ID pin (only needed in Dual mode)
+   * PA11 OTG_FS_DM   D- I/O
+   * PA12 OTG_FS_DP   D+ I/O
+   *
+   * *Pins may vary from device-to-device.
+   */
+
+  stm32_configgpio(GPIO_OTG_DM);
+  stm32_configgpio(GPIO_OTG_DP);
+  stm32_configgpio(GPIO_OTG_ID);    /* Only needed for OTG */
+
+  /* SOF output pin configuration is configurable */
+
+#ifdef CONFIG_STM32F7_OTG_SOFOUTPUT
+  stm32_configgpio(GPIO_OTG_SOF);
+#endif
+
+  /* Initialize the USB OTG FS core */
+
+  stm32_hw_initialize(priv);
+
+  /* Attach USB host controller interrupt handler */
+
+  if (irq_attach(STM32_IRQ_OTGFS, stm32_gint_isr) != 0)
+    {
+      usbhost_trace1(OTG_TRACE1_IRQATTACH, 0);
+      return NULL;
+    }
+
+  /* Enable USB OTG FS global interrupts */
+
+  stm32_gint_enable();
+
+  /* Enable interrupts at the interrupt controller */
+
+  up_enable_irq(STM32_IRQ_OTGFS);
+  return &g_usbconn;
+}
+
+#endif /* CONFIG_USBHOST && CONFIG_STM32F7_OTGFS */
-- 
GitLab


From 10985347e3226f7fb981a39b982a6166c285403b Mon Sep 17 00:00:00 2001
From: Mateusz Szafoni 
Date: Mon, 27 Jun 2016 13:41:41 +0200
Subject: [PATCH 055/229] Add olimex-stm32-e407 to configs

---
 configs/Kconfig                               |   13 +
 configs/README.txt                            |    4 +
 configs/olimex-stm32-e407/Kconfig             |    8 +
 configs/olimex-stm32-e407/README.txt          |    6 +
 configs/olimex-stm32-e407/include/board.h     |  289 ++++
 configs/olimex-stm32-e407/nsh/Make.defs       |  113 ++
 configs/olimex-stm32-e407/nsh/defconfig       | 1184 ++++++++++++++++
 configs/olimex-stm32-e407/nsh/setenv.sh       |   80 ++
 configs/olimex-stm32-e407/scripts/ld.script   |  122 ++
 configs/olimex-stm32-e407/src/Makefile        |   83 ++
 .../olimex-stm32-e407/src/olimex-stm32-e407.h |  247 ++++
 configs/olimex-stm32-e407/src/stm32_adc.c     |  187 +++
 configs/olimex-stm32-e407/src/stm32_appinit.c |  237 ++++
 .../olimex-stm32-e407/src/stm32_autoleds.c    |  110 ++
 configs/olimex-stm32-e407/src/stm32_boot.c    |  123 ++
 configs/olimex-stm32-e407/src/stm32_buttons.c |  150 ++
 configs/olimex-stm32-e407/src/stm32_can.c     |  130 ++
 configs/olimex-stm32-e407/src/stm32_usb.c     |  336 +++++
 .../olimex-stm32-e407/src/stm32_userleds.c    |  106 ++
 configs/olimex-stm32-e407/usbnsh/Make.defs    |  113 ++
 configs/olimex-stm32-e407/usbnsh/defconfig    | 1237 +++++++++++++++++
 configs/olimex-stm32-e407/usbnsh/setenv.sh    |   80 ++
 22 files changed, 4958 insertions(+)
 create mode 100644 configs/olimex-stm32-e407/Kconfig
 create mode 100644 configs/olimex-stm32-e407/README.txt
 create mode 100644 configs/olimex-stm32-e407/include/board.h
 create mode 100644 configs/olimex-stm32-e407/nsh/Make.defs
 create mode 100644 configs/olimex-stm32-e407/nsh/defconfig
 create mode 100755 configs/olimex-stm32-e407/nsh/setenv.sh
 create mode 100644 configs/olimex-stm32-e407/scripts/ld.script
 create mode 100644 configs/olimex-stm32-e407/src/Makefile
 create mode 100644 configs/olimex-stm32-e407/src/olimex-stm32-e407.h
 create mode 100644 configs/olimex-stm32-e407/src/stm32_adc.c
 create mode 100644 configs/olimex-stm32-e407/src/stm32_appinit.c
 create mode 100644 configs/olimex-stm32-e407/src/stm32_autoleds.c
 create mode 100644 configs/olimex-stm32-e407/src/stm32_boot.c
 create mode 100644 configs/olimex-stm32-e407/src/stm32_buttons.c
 create mode 100644 configs/olimex-stm32-e407/src/stm32_can.c
 create mode 100644 configs/olimex-stm32-e407/src/stm32_usb.c
 create mode 100644 configs/olimex-stm32-e407/src/stm32_userleds.c
 create mode 100644 configs/olimex-stm32-e407/usbnsh/Make.defs
 create mode 100644 configs/olimex-stm32-e407/usbnsh/defconfig
 create mode 100755 configs/olimex-stm32-e407/usbnsh/setenv.sh

diff --git a/configs/Kconfig b/configs/Kconfig
index 7837db1897..6c0cec2ba7 100644
--- a/configs/Kconfig
+++ b/configs/Kconfig
@@ -518,6 +518,15 @@ config ARCH_BOARD_OLIMEX_STM32H407
 		toolchain* under Linux or Cygwin. See the http://www.olimex.com for
 		further information. This board features the STMicro STM32F407ZGT6 (144pins).
 
+config ARCH_BOARD_OLIMEX_STM32E407
+	bool "Olimex STM32 E407 board"
+	depends on ARCH_CHIP_STM32F407ZG
+	select ARCH_HAVE_LEDS
+	select ARCH_HAVE_BUTTONS
+	select ARCH_HAVE_IRQBUTTONS
+	---help---
+		Olimex STM32 E407 board based on the STMicro STM32F407ZGT6 (144pins).
+
 config ARCH_BOARD_OLIMEX_STM32P107
 	bool "Olimex STM32 P107 board"
 	depends on ARCH_CHIP_STM32F107VC
@@ -1375,6 +1384,7 @@ config ARCH_BOARD
 	default "olimex-lpc-h3131"         if ARCH_BOARD_OLIMEX_LPC_H3131
 	default "olimex-stm32-h405"        if ARCH_BOARD_OLIMEX_STM32H405
 	default "olimex-stm32-h407"        if ARCH_BOARD_OLIMEX_STM32H407
+	default "olimex-stm32-e407"        if ARCH_BOARD_OLIMEX_STM32E407
 	default "olimex-stm32-p107"        if ARCH_BOARD_OLIMEX_STM32P107
 	default "olimex-stm32-p207"        if ARCH_BOARD_OLIMEX_STM32P207
 	default "olimex-strp711"           if ARCH_BOARD_OLIMEX_STRP711
@@ -1642,6 +1652,9 @@ endif
 if ARCH_BOARD_OLIMEX_STM32H407
 source "configs/olimex-stm32-h407/Kconfig"
 endif
+if ARCH_BOARD_OLIMEX_STM32E407
+source "configs/olimex-stm32-e407/Kconfig"
+endif
 if ARCH_BOARD_OLIMEX_STM32P107
 source "configs/olimex-stm32-p107/Kconfig"
 endif
diff --git a/configs/README.txt b/configs/README.txt
index 2e4c4aad95..dca332ae85 100644
--- a/configs/README.txt
+++ b/configs/README.txt
@@ -438,6 +438,10 @@ configs/olimex-stm32-h407
   further information. This board features the STMicro STM32F407ZGT6 (144
   pins). Contributed by Neil Hancock.
 
+configs/olimex-stm32-e407
+  Olimex STM32 E407 board based on the STMicro STM32F407ZGT6 (144pins).
+  Contributed by Mateusz Szafoni.
+
 configs/olimex-stm32-p107
   This port uses the Olimex STM32-P107 board (STM32F107VC) and a GNU arm-nuttx-elf
   toolchain* under Linux or Cygwin. See the https://www.olimex.com/dev/stm32-p107.html
diff --git a/configs/olimex-stm32-e407/Kconfig b/configs/olimex-stm32-e407/Kconfig
new file mode 100644
index 0000000000..7e553c5436
--- /dev/null
+++ b/configs/olimex-stm32-e407/Kconfig
@@ -0,0 +1,8 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+if ARCH_BOARD_OLIMEX_STM32E407
+
+endif
diff --git a/configs/olimex-stm32-e407/README.txt b/configs/olimex-stm32-e407/README.txt
new file mode 100644
index 0000000000..0b6e02eee7
--- /dev/null
+++ b/configs/olimex-stm32-e407/README.txt
@@ -0,0 +1,6 @@
+README
+======
+The Olimex STM32-E407 configuration is based on the configuration olimex-stm32-h407 and stm32f4discovery.
+
+nsh - Basic shell run on USART2.
+usbnsh - Basic shell run on the virtual serial port.
diff --git a/configs/olimex-stm32-e407/include/board.h b/configs/olimex-stm32-e407/include/board.h
new file mode 100644
index 0000000000..d74fd06f76
--- /dev/null
+++ b/configs/olimex-stm32-e407/include/board.h
@@ -0,0 +1,289 @@
+/************************************************************************************
+ * configs/olimex-stm32-e407/include/board.h
+ *
+ *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt 
+ *           Modified for H407 Neil Hancock
+ *           Modified for E407 Mateusz Szafoni
+ *
+ * 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 __CONFIGS_OLIMEX_STM32_E407_INCLUDE_BOARD_H
+#define __CONFIGS_OLIMEX_STM32_E407_INCLUDE_BOARD_H 1
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include 
+
+#ifndef __ASSEMBLY__
+#  include 
+#  include 
+#endif
+
+#ifdef __KERNEL__
+#  include "stm32_rcc.h"
+#  include "stm32_sdio.h"
+#  include "stm32.h"
+#endif
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+/* Clocking *************************************************************************/
+/* The Olimex-STM32-E407 board features a 12MHz crystal and
+ * a 32kHz RTC backup crystal.
+ *
+ * This is the canonical configuration:
+ *   System Clock source           : PLL (HSE)
+ *   SYSCLK(Hz)                    : 168000000    Determined by PLL configuration
+ *   HCLK(Hz)                      : 168000000    (STM32_RCC_CFGR_HPRE)
+ *   AHB Prescaler                 : 1            (STM32_RCC_CFGR_HPRE)
+ *   APB1 Prescaler                : 4            (STM32_RCC_CFGR_PPRE1)
+ *   APB2 Prescaler                : 2            (STM32_RCC_CFGR_PPRE2)
+ *   HSE Frequency(Hz)             : 8000000      (STM32_BOARD_XTAL)
+ *   PLLM                          : 8            (STM32_PLLCFG_PLLM)
+ *   PLLN                          : 336          (STM32_PLLCFG_PLLN)
+ *   PLLP                          : 2            (STM32_PLLCFG_PLLP)
+ *   PLLQ                          : 7            (STM32_PLLCFG_PLLQ)
+ *   Main regulator output voltage : Scale1 mode  Needed for high speed SYSCLK
+ *   Flash Latency(WS)             : 5
+ *   Prefetch Buffer               : OFF
+ *   Instruction cache             : ON
+ *   Data cache                    : ON
+ *   Require 48MHz for USB OTG FS, : Enabled
+ *   SDIO and RNG clock
+ */
+
+/* HSI - 16 MHz RC factory-trimmed
+ * LSI - 32 KHz RC (30-60KHz, uncalibrated)
+ * HSE - On-board crystal frequency is 12MHz
+ * LSE - 32.768 kHz
+ * STM32F407ZGT6 - too 168Mhz
+ */
+
+#define STM32_BOARD_XTAL        12000000ul
+
+#define STM32_HSI_FREQUENCY     16000000ul
+#define STM32_LSI_FREQUENCY     32000
+#define STM32_HSE_FREQUENCY     STM32_BOARD_XTAL
+#define STM32_LSE_FREQUENCY     32768
+
+/* Main PLL Configuration.
+ *
+ * PLL source is HSE
+ * PLL_VCO = (STM32_HSE_FREQUENCY / PLLM) * PLLN
+ *         = (25,000,000 / 12) * 360
+ *         = 240,000,000
+ * SYSCLK  = PLL_VCO / PLLP
+ *         = 240,000,000 / 2 = 120,000,000
+ * USB OTG FS, SDIO and RNG Clock
+ *         =  PLL_VCO / PLLQ
+ *         = 240,000,000 / 5 = 48,000,000
+ *         = 48,000,000
+ *
+ *  Xtal     /M  *n  /P         SysClk AHB HCLK  APB1     PCLK1
+ * 12Mhz HSE /12 336 /2 PLLCLK 168Mhz  /1  168    /4     42Mhz
+ * 12Mhz HSE /6  168 /2 PLLCLK 168Mhz  /1  168    /4     42Mhz
+ */
+
+#define STM32_PLLCFG_PLLM       RCC_PLLCFG_PLLM(3)
+#define STM32_PLLCFG_PLLN       RCC_PLLCFG_PLLN(84)
+#define STM32_PLLCFG_PLLP       RCC_PLLCFG_PLLP_2
+#define STM32_PLLCFG_PLLQ       RCC_PLLCFG_PLLQ(5)
+#define STM32_PLLCFG_PLLQ       RCC_PLLCFG_PLLQ(7)
+
+#define STM32_SYSCLK_FREQUENCY  168000000ul
+
+/* AHB clock (HCLK) is SYSCLK (168MHz) */
+
+#define STM32_RCC_CFGR_HPRE     RCC_CFGR_HPRE_SYSCLK  /* HCLK  = SYSCLK / 1 */
+#define STM32_HCLK_FREQUENCY    STM32_SYSCLK_FREQUENCY
+#define STM32_BOARD_HCLK        STM32_HCLK_FREQUENCY  /* same as above, to satisfy compiler */
+
+/* APB1 clock (PCLK1) is HCLK/4 (42MHz) */
+
+#define STM32_RCC_CFGR_PPRE1    RCC_CFGR_PPRE1_HCLKd4     /* PCLK1 = HCLK / 4 */
+#define STM32_PCLK1_FREQUENCY   (STM32_HCLK_FREQUENCY/4)
+
+/* Timers driven from APB1 will be twice PCLK1 */
+
+#define STM32_APB1_TIM2_CLKIN   (2*STM32_PCLK1_FREQUENCY)
+#define STM32_APB1_TIM3_CLKIN   (2*STM32_PCLK1_FREQUENCY)
+#define STM32_APB1_TIM4_CLKIN   (2*STM32_PCLK1_FREQUENCY)
+#define STM32_APB1_TIM5_CLKIN   (2*STM32_PCLK1_FREQUENCY)
+#define STM32_APB1_TIM6_CLKIN   (2*STM32_PCLK1_FREQUENCY)
+#define STM32_APB1_TIM7_CLKIN   (2*STM32_PCLK1_FREQUENCY)
+#define STM32_APB1_TIM12_CLKIN  (2*STM32_PCLK1_FREQUENCY)
+#define STM32_APB1_TIM13_CLKIN  (2*STM32_PCLK1_FREQUENCY)
+#define STM32_APB1_TIM14_CLKIN  (2*STM32_PCLK1_FREQUENCY)
+
+/* APB2 clock (PCLK2) is HCLK/2  */
+
+#define STM32_RCC_CFGR_PPRE2    RCC_CFGR_PPRE2_HCLKd2     /* PCLK2 = HCLK / 2 */
+#define STM32_PCLK2_FREQUENCY   (STM32_HCLK_FREQUENCY/2)
+
+/* Timers driven from APB2 will be twice PCLK2 */
+
+#define STM32_APB2_TIM1_CLKIN   (2*STM32_PCLK2_FREQUENCY)
+#define STM32_APB2_TIM8_CLKIN   (2*STM32_PCLK2_FREQUENCY)
+#define STM32_APB2_TIM9_CLKIN   (2*STM32_PCLK2_FREQUENCY)
+#define STM32_APB2_TIM10_CLKIN  (2*STM32_PCLK2_FREQUENCY)
+#define STM32_APB2_TIM11_CLKIN  (2*STM32_PCLK2_FREQUENCY)
+
+/* Timer Frequencies, if APBx is set to 1, frequency is same to APBx
+ * otherwise frequency is 2xAPBx.
+ * Note: TIM1,8 are on APB2, others on APB1
+ */
+
+#define STM32_TIM18_FREQUENCY   STM32_HCLK_FREQUENCY
+#define STM32_TIM27_FREQUENCY   STM32_HCLK_FREQUENCY
+
+/* LED definitions ******************************************************************/
+/* If CONFIG_ARCH_LEDS is not defined, then the user can control the status LED in any
+ * way.  The following definitions are used to access individual LEDs.
+ */
+
+/* LED index values for use with board_userled() */
+
+#define BOARD_LED_STATUS  0
+#define BOARD_NLEDS       1
+
+/* LED bits for use with board_userled_all() */
+
+#define BOARD_LED_STATUS_BIT    (1 << BOARD_LED1)
+
+/* If CONFIG_ARCH_LEDs is defined, then NuttX will control the status LED of the
+ * Olimex STM32-E405.  The following definitions describe how NuttX controls the LEDs:
+ */
+
+#define LED_STARTED       0  /* LED_STATUS on */
+#define LED_HEAPALLOCATE  1  /* no change */
+#define LED_IRQSENABLED   2  /* no change */
+#define LED_STACKCREATED  3  /* no change */
+#define LED_INIRQ         4  /* no change */
+#define LED_SIGNAL        5  /* no change */
+#define LED_ASSERTION     6  /* LED_STATUS off */
+#define LED_PANIC         7  /* LED_STATUS blinking */
+
+/* Button definitions ***************************************************************/
+/* The Olimex STM32-E405 supports one buttons: */
+
+#define BUTTON_BUT     0
+#define NUM_BUTTONS    1
+
+#define BUTTON_BUT_BIT (1 << BUTTON_BUT)
+
+/* Alternate function pin selections ************************************************/
+
+/* USART1 */
+#define GPIO_USART1_RX    GPIO_USART1_RX_2 /* PB7 */
+#define GPIO_USART1_TX    GPIO_USART1_TX_2 /* PB6 */
+
+/* USART2 */
+#define GPIO_USART2_RX    GPIO_USART2_RX_2 /* PD6 */
+#define GPIO_USART2_TX    GPIO_USART2_TX_2 /* PD5 */
+
+/* USART3 */
+#define GPIO_USART3_RX    GPIO_USART3_RX_1 /* PB11 */
+#define GPIO_USART3_TX    GPIO_USART3_TX_1 /* PB10 */
+
+/* CAN */
+#define GPIO_CAN1_RX      GPIO_CAN1_RX_2 /* PB8 */
+#define GPIO_CAN1_TX      GPIO_CAN1_TX_2 /* PB9 */
+
+/* I2C */
+#define GPIO_I2C1_SCL GPIO_I2C1_SCL_1 /* PB6 */
+#define GPIO_I2C1_SDA GPIO_I2C1_SDA_1 /* PB7 */
+
+/* Ethernet *************************************************************************/
+
+#if defined(CONFIG_STM32_ETHMAC)
+/* RMII interface to the LAN8720 PHY */
+
+#  ifndef CONFIG_STM32_RMII
+#    error CONFIG_STM32_RMII must be defined
+#  endif
+
+/* Clocking is provided by an external 50Mhz XTAL */
+
+#  ifndef CONFIG_STM32_RMII_EXTCLK
+#    error CONFIG_STM32_RMII_EXTCLK must be defined
+#  endif
+
+/* Pin disambiguation */
+
+#  define GPIO_ETH_MII_COL    GPIO_ETH_MII_COL_1 /* PA3 */
+#  define GPIO_ETH_RMII_TXD0  GPIO_ETH_RMII_TXD0_2 /* PG13 */
+#  define GPIO_ETH_RMII_TXD1  GPIO_ETH_RMII_TXD1_2 /* PG14 */
+#  define GPIO_ETH_RMII_TX_EN GPIO_ETH_RMII_TX_EN_2 /* PG11 */
+
+#endif
+
+/*******************************************************************************
+ * Public Data
+ ******************************************************************************/
+
+#ifndef __ASSEMBLY__
+
+#undef EXTERN
+#if defined(__cplusplus)
+#define EXTERN extern "C"
+extern "C"
+{
+#else
+#define EXTERN extern
+#endif
+
+/******************************************************************************
+ * Public Function Prototypes
+ *****************************************************************************/
+
+/******************************************************************************
+ * Name: stm32_boardinitialize
+ *
+ * Description:
+ *   All STM32 architectures must provide the following entry point.  This entry point
+ *   is called early in the initialization -- after all memory has been configured
+ *   and mapped but before any devices have been initialized.
+ *
+ *****************************************************************************/
+
+void stm32_boardinitialize(void);
+
+#undef EXTERN
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* __ASSEMBLY__ */
+#endif /* __CONFIGS_OLIMEX_STM32_E407_INCLUDE_BOARD_H */
diff --git a/configs/olimex-stm32-e407/nsh/Make.defs b/configs/olimex-stm32-e407/nsh/Make.defs
new file mode 100644
index 0000000000..0e26b1cf37
--- /dev/null
+++ b/configs/olimex-stm32-e407/nsh/Make.defs
@@ -0,0 +1,113 @@
+############################################################################
+# configs/olimex-stm32-e407/nsh/Make.defs
+#
+#   Copyright (C) 2011-2012 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.
+#
+############################################################################
+
+include ${TOPDIR}/.config
+include ${TOPDIR}/tools/Config.mk
+include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
+
+LDSCRIPT = ld.script
+
+ifeq ($(WINTOOL),y)
+  # Windows-native toolchains
+  DIRLINK = $(TOPDIR)/tools/copydir.sh
+  DIRUNLINK = $(TOPDIR)/tools/unlink.sh
+  MKDEP = $(TOPDIR)/tools/mkwindeps.sh
+  ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
+  ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
+  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
+else
+  # Linux/Cygwin-native toolchain
+  MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
+  ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
+  ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
+  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
+endif
+
+CC = $(CROSSDEV)gcc
+CXX = $(CROSSDEV)g++
+CPP = $(CROSSDEV)gcc -E
+LD = $(CROSSDEV)ld
+AR = $(ARCROSSDEV)ar rcs
+NM = $(ARCROSSDEV)nm
+OBJCOPY = $(CROSSDEV)objcopy
+OBJDUMP = $(CROSSDEV)objdump
+
+ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
+ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
+
+ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
+  ARCHOPTIMIZATION = -g
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
+endif
+
+ARCHCFLAGS = -fno-builtin
+ARCHCXXFLAGS = -fno-builtin -fno-exceptions -fno-rtti
+ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
+ARCHWARNINGSXX = -Wall -Wshadow -Wundef
+ARCHDEFINES =
+ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
+
+CFLAGS = $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
+CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
+CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
+AFLAGS = $(CFLAGS) -D__ASSEMBLY__
+
+NXFLATLDFLAGS1 = -r -d -warn-common
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
+LDNXFLATFLAGS = -e main -s 2048
+
+ASMEXT = .S
+OBJEXT = .o
+LIBEXT = .a
+EXEEXT =
+
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
+  LDFLAGS += -nostartfiles -nodefaultlibs
+endif
+ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
+  LDFLAGS += -g
+endif
+
+
+HOSTCC = gcc
+HOSTINCLUDES = -I.
+HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe
+HOSTLDFLAGS =
+
diff --git a/configs/olimex-stm32-e407/nsh/defconfig b/configs/olimex-stm32-e407/nsh/defconfig
new file mode 100644
index 0000000000..cbd209fa72
--- /dev/null
+++ b/configs/olimex-stm32-e407/nsh/defconfig
@@ -0,0 +1,1184 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Nuttx/ Configuration
+#
+
+#
+# Build Setup
+#
+# CONFIG_EXPERIMENTAL is not set
+# CONFIG_DEFAULT_SMALL is not set
+CONFIG_HOST_LINUX=y
+# CONFIG_HOST_OSX is not set
+# CONFIG_HOST_WINDOWS is not set
+# CONFIG_HOST_OTHER is not set
+# CONFIG_WINDOWS_NATIVE is not set
+# CONFIG_WINDOWS_CYGWIN is not set
+# CONFIG_WINDOWS_MSYS is not set
+# CONFIG_WINDOWS_OTHER is not set
+
+#
+# Build Configuration
+#
+# CONFIG_APPS_DIR="../apps"
+CONFIG_BUILD_FLAT=y
+# CONFIG_BUILD_2PASS is not set
+
+#
+# Binary Output Formats
+#
+# CONFIG_RRLOAD_BINARY is not set
+CONFIG_INTELHEX_BINARY=y
+# CONFIG_MOTOROLA_SREC is not set
+CONFIG_RAW_BINARY=y
+# CONFIG_UBOOT_UIMAGE is not set
+
+#
+# Customize Header Files
+#
+# CONFIG_ARCH_STDINT_H is not set
+# CONFIG_ARCH_STDBOOL_H is not set
+# CONFIG_ARCH_MATH_H is not set
+# CONFIG_ARCH_FLOAT_H is not set
+# CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
+
+#
+# Debug Options
+#
+CONFIG_DEBUG_ALERT=y
+# CONFIG_DEBUG_FEATURES is not set
+CONFIG_ARCH_HAVE_STACKCHECK=y
+# CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
+# CONFIG_DEBUG_SYMBOLS is not set
+CONFIG_ARCH_HAVE_CUSTOMOPT=y
+# CONFIG_DEBUG_NOOPT is not set
+# CONFIG_DEBUG_CUSTOMOPT is not set
+CONFIG_DEBUG_FULLOPT=y
+
+#
+# System Type
+#
+CONFIG_ARCH_ARM=y
+# CONFIG_ARCH_AVR is not set
+# CONFIG_ARCH_HC is not set
+# CONFIG_ARCH_MIPS is not set
+# CONFIG_ARCH_RGMP is not set
+# CONFIG_ARCH_SH is not set
+# CONFIG_ARCH_SIM is not set
+# CONFIG_ARCH_X86 is not set
+# CONFIG_ARCH_Z16 is not set
+# CONFIG_ARCH_Z80 is not set
+CONFIG_ARCH="arm"
+
+#
+# ARM Options
+#
+# CONFIG_ARCH_CHIP_A1X is not set
+# CONFIG_ARCH_CHIP_C5471 is not set
+# CONFIG_ARCH_CHIP_CALYPSO is not set
+# CONFIG_ARCH_CHIP_DM320 is not set
+# CONFIG_ARCH_CHIP_EFM32 is not set
+# CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
+# CONFIG_ARCH_CHIP_KINETIS is not set
+# CONFIG_ARCH_CHIP_KL is not set
+# CONFIG_ARCH_CHIP_LM is not set
+# CONFIG_ARCH_CHIP_TIVA is not set
+# CONFIG_ARCH_CHIP_LPC11XX is not set
+# CONFIG_ARCH_CHIP_LPC17XX is not set
+# CONFIG_ARCH_CHIP_LPC214X is not set
+# CONFIG_ARCH_CHIP_LPC2378 is not set
+# CONFIG_ARCH_CHIP_LPC31XX is not set
+# CONFIG_ARCH_CHIP_LPC43XX is not set
+# CONFIG_ARCH_CHIP_NUC1XX is not set
+# CONFIG_ARCH_CHIP_SAMA5 is not set
+# CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
+# CONFIG_ARCH_CHIP_SAM34 is not set
+# CONFIG_ARCH_CHIP_SAMV7 is not set
+CONFIG_ARCH_CHIP_STM32=y
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
+# CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
+# CONFIG_ARCH_ARM7TDMI is not set
+# CONFIG_ARCH_ARM926EJS is not set
+# CONFIG_ARCH_ARM920T is not set
+# CONFIG_ARCH_CORTEXM0 is not set
+# CONFIG_ARCH_CORTEXM3 is not set
+CONFIG_ARCH_CORTEXM4=y
+# CONFIG_ARCH_CORTEXM7 is not set
+# CONFIG_ARCH_CORTEXA5 is not set
+# CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
+CONFIG_ARCH_FAMILY="armv7-m"
+CONFIG_ARCH_CHIP="stm32"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
+# CONFIG_ARMV7M_USEBASEPRI is not set
+CONFIG_ARCH_HAVE_CMNVECTOR=y
+# CONFIG_ARMV7M_CMNVECTOR is not set
+# CONFIG_ARMV7M_LAZYFPU is not set
+CONFIG_ARCH_HAVE_FPU=y
+# CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_FPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
+# CONFIG_ARM_MPU is not set
+
+#
+# ARMV7M Configuration Options
+#
+# CONFIG_ARMV7M_HAVE_ICACHE is not set
+# CONFIG_ARMV7M_HAVE_DCACHE is not set
+# CONFIG_ARMV7M_HAVE_ITCM is not set
+# CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARW is not set
+# CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
+# CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
+# CONFIG_ARMV7M_TOOLCHAIN_CODEREDW is not set
+# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW is not set
+# CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM is not set
+CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y
+# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW is not set
+# CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE is not set
+CONFIG_ARMV7M_HAVE_STACKCHECK=y
+# CONFIG_ARMV7M_STACKCHECK is not set
+# CONFIG_ARMV7M_ITMSYSLOG is not set
+# CONFIG_SERIAL_TERMIOS is not set
+
+#
+# STM32 Configuration Options
+#
+# CONFIG_ARCH_CHIP_STM32L151C6 is not set
+# CONFIG_ARCH_CHIP_STM32L151C8 is not set
+# CONFIG_ARCH_CHIP_STM32L151CB is not set
+# CONFIG_ARCH_CHIP_STM32L151R6 is not set
+# CONFIG_ARCH_CHIP_STM32L151R8 is not set
+# CONFIG_ARCH_CHIP_STM32L151RB is not set
+# CONFIG_ARCH_CHIP_STM32L151V6 is not set
+# CONFIG_ARCH_CHIP_STM32L151V8 is not set
+# CONFIG_ARCH_CHIP_STM32L151VB is not set
+# CONFIG_ARCH_CHIP_STM32L152C6 is not set
+# CONFIG_ARCH_CHIP_STM32L152C8 is not set
+# CONFIG_ARCH_CHIP_STM32L152CB is not set
+# CONFIG_ARCH_CHIP_STM32L152R6 is not set
+# CONFIG_ARCH_CHIP_STM32L152R8 is not set
+# CONFIG_ARCH_CHIP_STM32L152RB is not set
+# CONFIG_ARCH_CHIP_STM32L152V6 is not set
+# CONFIG_ARCH_CHIP_STM32L152V8 is not set
+# CONFIG_ARCH_CHIP_STM32L152VB is not set
+# CONFIG_ARCH_CHIP_STM32L162ZD is not set
+# CONFIG_ARCH_CHIP_STM32L162VE is not set
+# CONFIG_ARCH_CHIP_STM32F100C8 is not set
+# CONFIG_ARCH_CHIP_STM32F100CB is not set
+# CONFIG_ARCH_CHIP_STM32F100R8 is not set
+# CONFIG_ARCH_CHIP_STM32F100RB is not set
+# CONFIG_ARCH_CHIP_STM32F100RC is not set
+# CONFIG_ARCH_CHIP_STM32F100RD is not set
+# CONFIG_ARCH_CHIP_STM32F100RE is not set
+# CONFIG_ARCH_CHIP_STM32F100V8 is not set
+# CONFIG_ARCH_CHIP_STM32F100VB is not set
+# CONFIG_ARCH_CHIP_STM32F100VC is not set
+# CONFIG_ARCH_CHIP_STM32F100VD is not set
+# CONFIG_ARCH_CHIP_STM32F100VE is not set
+# CONFIG_ARCH_CHIP_STM32F102CB is not set
+# CONFIG_ARCH_CHIP_STM32F103T8 is not set
+# CONFIG_ARCH_CHIP_STM32F103TB is not set
+# CONFIG_ARCH_CHIP_STM32F103C4 is not set
+# CONFIG_ARCH_CHIP_STM32F103C8 is not set
+# CONFIG_ARCH_CHIP_STM32F103CB is not set
+# CONFIG_ARCH_CHIP_STM32F103R8 is not set
+# CONFIG_ARCH_CHIP_STM32F103RB is not set
+# CONFIG_ARCH_CHIP_STM32F103RC is not set
+# CONFIG_ARCH_CHIP_STM32F103RD is not set
+# CONFIG_ARCH_CHIP_STM32F103RE is not set
+# CONFIG_ARCH_CHIP_STM32F103RG is not set
+# CONFIG_ARCH_CHIP_STM32F103V8 is not set
+# CONFIG_ARCH_CHIP_STM32F103VB is not set
+# CONFIG_ARCH_CHIP_STM32F103VC is not set
+# CONFIG_ARCH_CHIP_STM32F103VE is not set
+# CONFIG_ARCH_CHIP_STM32F103ZE is not set
+# CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
+# CONFIG_ARCH_CHIP_STM32F107VC is not set
+# CONFIG_ARCH_CHIP_STM32F205RG is not set
+# CONFIG_ARCH_CHIP_STM32F207IG is not set
+# CONFIG_ARCH_CHIP_STM32F207ZE is not set
+# CONFIG_ARCH_CHIP_STM32F302K6 is not set
+# CONFIG_ARCH_CHIP_STM32F302K8 is not set
+# CONFIG_ARCH_CHIP_STM32F302CB is not set
+# CONFIG_ARCH_CHIP_STM32F302CC is not set
+# CONFIG_ARCH_CHIP_STM32F302RB is not set
+# CONFIG_ARCH_CHIP_STM32F302RC is not set
+# CONFIG_ARCH_CHIP_STM32F302VB is not set
+# CONFIG_ARCH_CHIP_STM32F302VC is not set
+# CONFIG_ARCH_CHIP_STM32F303K6 is not set
+# CONFIG_ARCH_CHIP_STM32F303K8 is not set
+# CONFIG_ARCH_CHIP_STM32F303C6 is not set
+# CONFIG_ARCH_CHIP_STM32F303C8 is not set
+# CONFIG_ARCH_CHIP_STM32F303CB is not set
+# CONFIG_ARCH_CHIP_STM32F303CC is not set
+# CONFIG_ARCH_CHIP_STM32F303RB is not set
+# CONFIG_ARCH_CHIP_STM32F303RC is not set
+# CONFIG_ARCH_CHIP_STM32F303RD is not set
+# CONFIG_ARCH_CHIP_STM32F303RE is not set
+# CONFIG_ARCH_CHIP_STM32F303VB is not set
+# CONFIG_ARCH_CHIP_STM32F303VC is not set
+# CONFIG_ARCH_CHIP_STM32F372C8 is not set
+# CONFIG_ARCH_CHIP_STM32F372R8 is not set
+# CONFIG_ARCH_CHIP_STM32F372V8 is not set
+# CONFIG_ARCH_CHIP_STM32F372CB is not set
+# CONFIG_ARCH_CHIP_STM32F372RB is not set
+# CONFIG_ARCH_CHIP_STM32F372VB is not set
+# CONFIG_ARCH_CHIP_STM32F372CC is not set
+# CONFIG_ARCH_CHIP_STM32F372RC is not set
+# CONFIG_ARCH_CHIP_STM32F372VC is not set
+# CONFIG_ARCH_CHIP_STM32F373C8 is not set
+# CONFIG_ARCH_CHIP_STM32F373R8 is not set
+# CONFIG_ARCH_CHIP_STM32F373V8 is not set
+# CONFIG_ARCH_CHIP_STM32F373CB is not set
+# CONFIG_ARCH_CHIP_STM32F373RB is not set
+# CONFIG_ARCH_CHIP_STM32F373VB is not set
+# CONFIG_ARCH_CHIP_STM32F373CC is not set
+# CONFIG_ARCH_CHIP_STM32F373RC is not set
+# CONFIG_ARCH_CHIP_STM32F373VC is not set
+# CONFIG_ARCH_CHIP_STM32F401RE is not set
+# CONFIG_ARCH_CHIP_STM32F411RE is not set
+# CONFIG_ARCH_CHIP_STM32F411VE is not set
+# CONFIG_ARCH_CHIP_STM32F405RG is not set
+# CONFIG_ARCH_CHIP_STM32F405VG is not set
+# CONFIG_ARCH_CHIP_STM32F405ZG is not set
+# CONFIG_ARCH_CHIP_STM32F407VE is not set
+# CONFIG_ARCH_CHIP_STM32F407VG is not set
+# CONFIG_ARCH_CHIP_STM32F407ZE is not set
+CONFIG_ARCH_CHIP_STM32F407ZG=y
+# CONFIG_ARCH_CHIP_STM32F407IE is not set
+# CONFIG_ARCH_CHIP_STM32F407IG is not set
+# CONFIG_ARCH_CHIP_STM32F427V is not set
+# CONFIG_ARCH_CHIP_STM32F427Z is not set
+# CONFIG_ARCH_CHIP_STM32F427I is not set
+# CONFIG_ARCH_CHIP_STM32F429V is not set
+# CONFIG_ARCH_CHIP_STM32F429Z is not set
+# CONFIG_ARCH_CHIP_STM32F429I is not set
+# CONFIG_ARCH_CHIP_STM32F429B is not set
+# CONFIG_ARCH_CHIP_STM32F429N is not set
+# CONFIG_ARCH_CHIP_STM32F446M is not set
+# CONFIG_ARCH_CHIP_STM32F446R is not set
+# CONFIG_ARCH_CHIP_STM32F446V is not set
+# CONFIG_ARCH_CHIP_STM32F446Z is not set
+# CONFIG_ARCH_CHIP_STM32F469A is not set
+# CONFIG_ARCH_CHIP_STM32F469I is not set
+# CONFIG_ARCH_CHIP_STM32F469B is not set
+# CONFIG_ARCH_CHIP_STM32F469N is not set
+CONFIG_STM32_FLASH_CONFIG_DEFAULT=y
+# CONFIG_STM32_FLASH_CONFIG_4 is not set
+# CONFIG_STM32_FLASH_CONFIG_6 is not set
+# CONFIG_STM32_FLASH_CONFIG_8 is not set
+# CONFIG_STM32_FLASH_CONFIG_B is not set
+# CONFIG_STM32_FLASH_CONFIG_C is not set
+# CONFIG_STM32_FLASH_CONFIG_D is not set
+# CONFIG_STM32_FLASH_CONFIG_E is not set
+# CONFIG_STM32_FLASH_CONFIG_F is not set
+# CONFIG_STM32_FLASH_CONFIG_G is not set
+# CONFIG_STM32_FLASH_CONFIG_I is not set
+# CONFIG_STM32_STM32L15XX is not set
+# CONFIG_STM32_ENERGYLITE is not set
+# CONFIG_STM32_STM32F10XX is not set
+# CONFIG_STM32_VALUELINE is not set
+# CONFIG_STM32_CONNECTIVITYLINE is not set
+# CONFIG_STM32_PERFORMANCELINE is not set
+# CONFIG_STM32_USBACCESSLINE is not set
+# CONFIG_STM32_HIGHDENSITY is not set
+# CONFIG_STM32_MEDIUMDENSITY is not set
+# CONFIG_STM32_LOWDENSITY is not set
+# CONFIG_STM32_STM32F20XX is not set
+# CONFIG_STM32_STM32F205 is not set
+# CONFIG_STM32_STM32F207 is not set
+# CONFIG_STM32_STM32F30XX is not set
+# CONFIG_STM32_STM32F302 is not set
+# CONFIG_STM32_STM32F303 is not set
+# CONFIG_STM32_STM32F37XX is not set
+CONFIG_STM32_STM32F40XX=y
+# CONFIG_STM32_STM32F401 is not set
+# CONFIG_STM32_STM32F411 is not set
+# CONFIG_STM32_STM32F405 is not set
+CONFIG_STM32_STM32F407=y
+# CONFIG_STM32_STM32F427 is not set
+# CONFIG_STM32_STM32F429 is not set
+# CONFIG_STM32_STM32F446 is not set
+# CONFIG_STM32_STM32F469 is not set
+# CONFIG_STM32_DFU is not set
+
+#
+# STM32 Peripheral Support
+#
+CONFIG_STM32_HAVE_CCM=y
+# CONFIG_STM32_HAVE_USBDEV is not set
+CONFIG_STM32_HAVE_OTGFS=y
+CONFIG_STM32_HAVE_FSMC=y
+# CONFIG_STM32_HAVE_LTDC is not set
+CONFIG_STM32_HAVE_USART3=y
+CONFIG_STM32_HAVE_UART4=y
+CONFIG_STM32_HAVE_UART5=y
+CONFIG_STM32_HAVE_USART6=y
+# CONFIG_STM32_HAVE_UART7 is not set
+# CONFIG_STM32_HAVE_UART8 is not set
+CONFIG_STM32_HAVE_TIM1=y
+CONFIG_STM32_HAVE_TIM2=y
+CONFIG_STM32_HAVE_TIM3=y
+CONFIG_STM32_HAVE_TIM4=y
+CONFIG_STM32_HAVE_TIM5=y
+CONFIG_STM32_HAVE_TIM6=y
+CONFIG_STM32_HAVE_TIM7=y
+CONFIG_STM32_HAVE_TIM8=y
+CONFIG_STM32_HAVE_TIM9=y
+CONFIG_STM32_HAVE_TIM10=y
+CONFIG_STM32_HAVE_TIM11=y
+CONFIG_STM32_HAVE_TIM12=y
+CONFIG_STM32_HAVE_TIM13=y
+CONFIG_STM32_HAVE_TIM14=y
+# CONFIG_STM32_HAVE_TIM15 is not set
+# CONFIG_STM32_HAVE_TIM16 is not set
+# CONFIG_STM32_HAVE_TIM17 is not set
+CONFIG_STM32_HAVE_ADC2=y
+CONFIG_STM32_HAVE_ADC3=y
+# CONFIG_STM32_HAVE_ADC4 is not set
+# CONFIG_STM32_HAVE_ADC1_DMA is not set
+# CONFIG_STM32_HAVE_ADC2_DMA is not set
+# CONFIG_STM32_HAVE_ADC3_DMA is not set
+# CONFIG_STM32_HAVE_ADC4_DMA is not set
+CONFIG_STM32_HAVE_CAN1=y
+CONFIG_STM32_HAVE_CAN2=y
+CONFIG_STM32_HAVE_DAC1=y
+CONFIG_STM32_HAVE_DAC2=y
+CONFIG_STM32_HAVE_RNG=y
+CONFIG_STM32_HAVE_ETHMAC=y
+CONFIG_STM32_HAVE_I2C2=y
+CONFIG_STM32_HAVE_I2C3=y
+CONFIG_STM32_HAVE_SPI2=y
+CONFIG_STM32_HAVE_SPI3=y
+# CONFIG_STM32_HAVE_SPI4 is not set
+# CONFIG_STM32_HAVE_SPI5 is not set
+# CONFIG_STM32_HAVE_SPI6 is not set
+# CONFIG_STM32_HAVE_SAIPLL is not set
+# CONFIG_STM32_HAVE_I2SPLL is not set
+# CONFIG_STM32_ADC1 is not set
+# CONFIG_STM32_ADC2 is not set
+# CONFIG_STM32_ADC3 is not set
+# CONFIG_STM32_BKPSRAM is not set
+# CONFIG_STM32_CAN1 is not set
+# CONFIG_STM32_CAN2 is not set
+# CONFIG_STM32_CCMDATARAM is not set
+# CONFIG_STM32_CRC is not set
+# CONFIG_STM32_CRYP is not set
+# CONFIG_STM32_DMA1 is not set
+# CONFIG_STM32_DMA2 is not set
+# CONFIG_STM32_DAC1 is not set
+# CONFIG_STM32_DAC2 is not set
+# CONFIG_STM32_DCMI is not set
+# CONFIG_STM32_ETHMAC is not set
+# CONFIG_STM32_FSMC is not set
+# CONFIG_STM32_HASH is not set
+# CONFIG_STM32_I2C1 is not set
+# CONFIG_STM32_I2C2 is not set
+# CONFIG_STM32_I2C3 is not set
+# CONFIG_STM32_OTGFS is not set
+# CONFIG_STM32_OTGHS is not set
+CONFIG_STM32_PWR=y
+# CONFIG_STM32_RNG is not set
+# CONFIG_STM32_SDIO is not set
+# CONFIG_STM32_SPI1 is not set
+# CONFIG_STM32_SPI2 is not set
+# CONFIG_STM32_SPI3 is not set
+CONFIG_STM32_SYSCFG=y
+# CONFIG_STM32_TIM1 is not set
+# CONFIG_STM32_TIM2 is not set
+# CONFIG_STM32_TIM3 is not set
+# CONFIG_STM32_TIM4 is not set
+# CONFIG_STM32_TIM5 is not set
+# CONFIG_STM32_TIM6 is not set
+# CONFIG_STM32_TIM7 is not set
+# CONFIG_STM32_TIM8 is not set
+# CONFIG_STM32_TIM9 is not set
+# CONFIG_STM32_TIM10 is not set
+# CONFIG_STM32_TIM11 is not set
+# CONFIG_STM32_TIM12 is not set
+# CONFIG_STM32_TIM13 is not set
+# CONFIG_STM32_TIM14 is not set
+# CONFIG_STM32_USART1 is not set
+CONFIG_STM32_USART2=y
+# CONFIG_STM32_USART3 is not set
+# CONFIG_STM32_UART4 is not set
+# CONFIG_STM32_UART5 is not set
+# CONFIG_STM32_USART6 is not set
+# CONFIG_STM32_IWDG is not set
+# CONFIG_STM32_WWDG is not set
+CONFIG_STM32_SPI=y
+# CONFIG_STM32_NOEXT_VECTORS is not set
+
+#
+# Alternate Pin Mapping
+#
+# CONFIG_STM32_FLASH_PREFETCH is not set
+# CONFIG_STM32_JTAG_DISABLE is not set
+# CONFIG_STM32_JTAG_FULL_ENABLE is not set
+# CONFIG_STM32_JTAG_NOJNTRST_ENABLE is not set
+CONFIG_STM32_JTAG_SW_ENABLE=y
+# CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG is not set
+# CONFIG_STM32_FORCEPOWER is not set
+# CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
+# CONFIG_STM32_CCMEXCLUDE is not set
+
+#
+# Timer Configuration
+#
+# CONFIG_STM32_TIM1_CAP is not set
+# CONFIG_STM32_TIM2_CAP is not set
+# CONFIG_STM32_TIM3_CAP is not set
+# CONFIG_STM32_TIM4_CAP is not set
+# CONFIG_STM32_TIM5_CAP is not set
+# CONFIG_STM32_TIM8_CAP is not set
+# CONFIG_STM32_TIM9_CAP is not set
+# CONFIG_STM32_TIM10_CAP is not set
+# CONFIG_STM32_TIM11_CAP is not set
+# CONFIG_STM32_TIM12_CAP is not set
+# CONFIG_STM32_TIM13_CAP is not set
+# CONFIG_STM32_TIM14_CAP is not set
+CONFIG_STM32_USART=y
+CONFIG_STM32_SERIALDRIVER=y
+
+#
+# U[S]ART Configuration
+#
+
+#
+# U[S]ART Device Configuration
+#
+CONFIG_STM32_USART2_SERIALDRIVER=y
+# CONFIG_STM32_USART2_1WIREDRIVER is not set
+# CONFIG_USART2_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
+# CONFIG_SERIAL_DISABLE_REORDERING is not set
+# CONFIG_STM32_FLOWCONTROL_BROKEN is not set
+# CONFIG_STM32_USART_BREAKS is not set
+# CONFIG_STM32_USART_SINGLEWIRE is not set
+
+#
+# SPI Configuration
+#
+# CONFIG_STM32_SPI_INTERRUPTS is not set
+# CONFIG_STM32_SPI_DMA is not set
+# CONFIG_STM32_HAVE_RTC_COUNTER is not set
+# CONFIG_STM32_HAVE_RTC_SUBSECONDS is not set
+
+#
+# USB FS Host Configuration
+#
+
+#
+# USB HS Host Configuration
+#
+
+#
+# USB Host Debug Configuration
+#
+
+#
+# USB Device Configuration
+#
+
+#
+# Architecture Options
+#
+# CONFIG_ARCH_NOINTC is not set
+# CONFIG_ARCH_VECNOTIRQ is not set
+# CONFIG_ARCH_DMA is not set
+CONFIG_ARCH_HAVE_IRQPRIO=y
+# CONFIG_ARCH_L2CACHE is not set
+# CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
+# CONFIG_ARCH_HAVE_ADDRENV is not set
+# CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
+CONFIG_ARCH_HAVE_VFORK=y
+# CONFIG_ARCH_HAVE_MMU is not set
+CONFIG_ARCH_HAVE_MPU=y
+# CONFIG_ARCH_NAND_HWECC is not set
+# CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
+# CONFIG_ARCH_USE_MPU is not set
+# CONFIG_ARCH_IRQPRIO is not set
+CONFIG_ARCH_STACKDUMP=y
+# CONFIG_ENDIAN_BIG is not set
+# CONFIG_ARCH_IDLE_CUSTOM is not set
+# CONFIG_ARCH_HAVE_RAMFUNCS is not set
+CONFIG_ARCH_HAVE_RAMVECTORS=y
+# CONFIG_ARCH_RAMVECTORS is not set
+
+#
+# Board Settings
+#
+CONFIG_BOARD_LOOPSPERMSEC=16717
+# CONFIG_ARCH_CALIBRATION is not set
+
+#
+# Interrupt options
+#
+CONFIG_ARCH_HAVE_INTERRUPTSTACK=y
+CONFIG_ARCH_INTERRUPTSTACK=0
+CONFIG_ARCH_HAVE_HIPRI_INTERRUPT=y
+# CONFIG_ARCH_HIPRI_INTERRUPT is not set
+
+#
+# Boot options
+#
+# CONFIG_BOOT_RUNFROMEXTSRAM is not set
+CONFIG_BOOT_RUNFROMFLASH=y
+# CONFIG_BOOT_RUNFROMISRAM is not set
+# CONFIG_BOOT_RUNFROMSDRAM is not set
+# CONFIG_BOOT_COPYTORAM is not set
+
+#
+# Boot Memory Configuration
+#
+CONFIG_RAM_START=0x20000000
+CONFIG_RAM_SIZE=114688
+# CONFIG_ARCH_HAVE_SDRAM is not set
+
+#
+# Board Selection
+#
+CONFIG_ARCH_BOARD_OLIMEX_STM32E407=y
+CONFIG_ARCH_BOARD="olimex-stm32-e407"
+
+#
+# Common Board Options
+#
+CONFIG_ARCH_HAVE_LEDS=y
+CONFIG_ARCH_LEDS=y
+CONFIG_ARCH_HAVE_BUTTONS=y
+CONFIG_ARCH_BUTTONS=y
+CONFIG_ARCH_HAVE_IRQBUTTONS=y
+# CONFIG_ARCH_IRQBUTTONS is not set
+CONFIG_NSH_MMCSDMINOR=0
+
+#
+# Board-Specific Options
+#
+
+#
+# RTOS Features
+#
+CONFIG_DISABLE_OS_API=y
+# CONFIG_DISABLE_POSIX_TIMERS is not set
+# CONFIG_DISABLE_PTHREAD is not set
+# CONFIG_DISABLE_SIGNALS is not set
+# CONFIG_DISABLE_MQUEUE is not set
+# CONFIG_DISABLE_ENVIRON is not set
+
+#
+# Clocks and Timers
+#
+CONFIG_USEC_PER_TICK=10000
+# CONFIG_SYSTEM_TIME64 is not set
+# CONFIG_CLOCK_MONOTONIC is not set
+# CONFIG_JULIAN_TIME is not set
+CONFIG_START_YEAR=2011
+CONFIG_START_MONTH=12
+CONFIG_START_DAY=6
+CONFIG_MAX_WDOGPARMS=2
+CONFIG_PREALLOC_WDOGS=16
+CONFIG_WDOG_INTRESERVE=4
+CONFIG_PREALLOC_TIMERS=4
+
+#
+# Tasks and Scheduling
+#
+# CONFIG_INIT_NONE is not set
+CONFIG_INIT_ENTRYPOINT=y
+# CONFIG_INIT_FILEPATH is not set
+CONFIG_USER_ENTRYPOINT="nsh_main"
+CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
+CONFIG_TASK_NAME_SIZE=31
+CONFIG_MAX_TASKS=16
+# CONFIG_SCHED_HAVE_PARENT is not set
+CONFIG_SCHED_WAITPID=y
+
+#
+# Pthread Options
+#
+# CONFIG_MUTEX_TYPES is not set
+CONFIG_NPTHREAD_KEYS=4
+
+#
+# Performance Monitoring
+#
+# CONFIG_SCHED_CPULOAD is not set
+# CONFIG_SCHED_INSTRUMENTATION is not set
+
+#
+# Files and I/O
+#
+CONFIG_DEV_CONSOLE=y
+# CONFIG_FDCLONE_DISABLE is not set
+# CONFIG_FDCLONE_STDIO is not set
+CONFIG_SDCLONE_DISABLE=y
+CONFIG_NFILE_DESCRIPTORS=8
+CONFIG_NFILE_STREAMS=8
+CONFIG_NAME_MAX=32
+# CONFIG_PRIORITY_INHERITANCE is not set
+
+#
+# RTOS hooks
+#
+# CONFIG_BOARD_INITIALIZE is not set
+# CONFIG_SCHED_STARTHOOK is not set
+# CONFIG_SCHED_ATEXIT is not set
+# CONFIG_SCHED_ONEXIT is not set
+
+#
+# Signal Numbers
+#
+CONFIG_SIG_SIGUSR1=1
+CONFIG_SIG_SIGUSR2=2
+CONFIG_SIG_SIGALARM=3
+CONFIG_SIG_SIGCONDTIMEDOUT=16
+
+#
+# POSIX Message Queue Options
+#
+CONFIG_PREALLOC_MQ_MSGS=4
+CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
+
+#
+# Work queue support
+#
+# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_SCHED_HPWORK is not set
+# CONFIG_SCHED_LPWORK is not set
+
+#
+# Stack and heap information
+#
+CONFIG_IDLETHREAD_STACKSIZE=1024
+CONFIG_USERMAIN_STACKSIZE=2048
+CONFIG_PTHREAD_STACK_MIN=256
+CONFIG_PTHREAD_STACK_DEFAULT=2048
+# CONFIG_LIB_SYSCALL is not set
+
+#
+# Device Drivers
+#
+CONFIG_DISABLE_POLL=y
+CONFIG_DEV_NULL=y
+# CONFIG_DEV_ZERO is not set
+# CONFIG_DEV_LOOP is not set
+
+#
+# Buffering
+#
+# CONFIG_DRVR_WRITEBUFFER is not set
+# CONFIG_DRVR_READAHEAD is not set
+# CONFIG_RAMDISK is not set
+# CONFIG_CAN is not set
+# CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
+# CONFIG_PWM is not set
+# CONFIG_ARCH_HAVE_I2CRESET is not set
+# CONFIG_I2C is not set
+# CONFIG_SPI is not set
+# CONFIG_SPI_SLAVE is not set
+# CONFIG_SPI_EXCHANGE is not set
+# CONFIG_SPI_CMDDATA is not set
+# CONFIG_SPI_CALLBACK is not set
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_HWFEATURES is not set
+# CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
+# CONFIG_I2S is not set
+
+#
+# Timer Driver Support
+#
+# CONFIG_TIMER is not set
+# CONFIG_RTC is not set
+# CONFIG_WATCHDOG is not set
+# CONFIG_ANALOG is not set
+# CONFIG_AUDIO_DEVICES is not set
+# CONFIG_VIDEO_DEVICES is not set
+# CONFIG_BCH is not set
+# CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
+# CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
+# CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
+# CONFIG_MTD is not set
+# CONFIG_EEPROM is not set
+# CONFIG_PIPES is not set
+# CONFIG_PM is not set
+# CONFIG_POWER is not set
+# CONFIG_SENSORS is not set
+# CONFIG_SERCOMM_CONSOLE is not set
+CONFIG_SERIAL=y
+# CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
+# CONFIG_16550_UART is not set
+# CONFIG_UART_SERIALDRIVER is not set
+# CONFIG_UART0_SERIALDRIVER is not set
+# CONFIG_UART1_SERIALDRIVER is not set
+# CONFIG_UART2_SERIALDRIVER is not set
+# CONFIG_UART3_SERIALDRIVER is not set
+# CONFIG_UART4_SERIALDRIVER is not set
+# CONFIG_UART5_SERIALDRIVER is not set
+# CONFIG_UART6_SERIALDRIVER is not set
+# CONFIG_UART7_SERIALDRIVER is not set
+# CONFIG_UART8_SERIALDRIVER is not set
+# CONFIG_SCI0_SERIALDRIVER is not set
+# CONFIG_SCI1_SERIALDRIVER is not set
+# CONFIG_USART0_SERIALDRIVER is not set
+# CONFIG_USART1_SERIALDRIVER is not set
+CONFIG_USART2_SERIALDRIVER=y
+# CONFIG_USART3_SERIALDRIVER is not set
+# CONFIG_USART4_SERIALDRIVER is not set
+# CONFIG_USART5_SERIALDRIVER is not set
+# CONFIG_USART6_SERIALDRIVER is not set
+# CONFIG_USART7_SERIALDRIVER is not set
+# CONFIG_USART8_SERIALDRIVER is not set
+# CONFIG_OTHER_UART_SERIALDRIVER is not set
+CONFIG_MCU_SERIAL=y
+CONFIG_STANDARD_SERIAL=y
+# CONFIG_SERIAL_IFLOWCONTROL is not set
+# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
+CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
+CONFIG_USART2_SERIAL_CONSOLE=y
+# CONFIG_OTHER_SERIAL_CONSOLE is not set
+# CONFIG_NO_SERIAL_CONSOLE is not set
+
+#
+# USART2 Configuration
+#
+CONFIG_USART2_RXBUFSIZE=128
+CONFIG_USART2_TXBUFSIZE=128
+CONFIG_USART2_BAUD=115200
+CONFIG_USART2_BITS=8
+CONFIG_USART2_PARITY=0
+CONFIG_USART2_2STOP=0
+# CONFIG_USART2_IFLOWCONTROL is not set
+# CONFIG_USART2_OFLOWCONTROL is not set
+# CONFIG_USART2_DMA is not set
+# CONFIG_USBDEV is not set
+# CONFIG_USBHOST is not set
+# CONFIG_DRIVERS_WIRELESS is not set
+
+#
+# System Logging
+#
+# CONFIG_ARCH_SYSLOG is not set
+# CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+
+#
+# Networking Support
+#
+# CONFIG_ARCH_HAVE_NET is not set
+# CONFIG_ARCH_HAVE_PHY is not set
+# CONFIG_NET is not set
+
+#
+# Crypto API
+#
+# CONFIG_CRYPTO is not set
+
+#
+# File Systems
+#
+
+#
+# File system configuration
+#
+# CONFIG_DISABLE_MOUNTPOINT is not set
+# CONFIG_FS_AUTOMOUNTER is not set
+# CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
+CONFIG_FS_READABLE=y
+# CONFIG_FS_WRITABLE is not set
+# CONFIG_FS_NAMED_SEMAPHORES is not set
+CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
+# CONFIG_FS_RAMMAP is not set
+# CONFIG_FS_FAT is not set
+# CONFIG_FS_NXFFS is not set
+# CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
+# CONFIG_FS_SMARTFS is not set
+# CONFIG_FS_BINFS is not set
+CONFIG_FS_PROCFS=y
+# CONFIG_FS_PROCFS_REGISTER is not set
+
+#
+# Exclude individual procfs entries
+#
+# CONFIG_FS_PROCFS_EXCLUDE_PROCESS is not set
+# CONFIG_FS_PROCFS_EXCLUDE_UPTIME is not set
+# CONFIG_FS_PROCFS_EXCLUDE_MOUNTS is not set
+# CONFIG_FS_UNIONFS is not set
+
+#
+# Graphics Support
+#
+# CONFIG_NX is not set
+
+#
+# Memory Management
+#
+# CONFIG_MM_SMALL is not set
+CONFIG_MM_REGIONS=2
+# CONFIG_ARCH_HAVE_HEAP2 is not set
+# CONFIG_GRAN is not set
+
+#
+# Audio Support
+#
+# CONFIG_AUDIO is not set
+
+#
+# Wireless Support
+#
+
+#
+# Binary Loader
+#
+# CONFIG_BINFMT_DISABLE is not set
+# CONFIG_BINFMT_EXEPATH is not set
+# CONFIG_NXFLAT is not set
+# CONFIG_ELF is not set
+CONFIG_BUILTIN=y
+# CONFIG_PIC is not set
+# CONFIG_SYMTAB_ORDEREDBYNAME is not set
+
+#
+# Library Routines
+#
+
+#
+# Standard C Library Options
+#
+CONFIG_STDIO_BUFFER_SIZE=64
+CONFIG_STDIO_LINEBUFFER=y
+CONFIG_NUNGET_CHARS=2
+CONFIG_LIB_HOMEDIR="/"
+# CONFIG_LIBM is not set
+# CONFIG_NOPRINTF_FIELDWIDTH is not set
+# CONFIG_LIBC_FLOATINGPOINT is not set
+CONFIG_LIBC_LONG_LONG=y
+# CONFIG_LIBC_IOCTL_VARIADIC is not set
+CONFIG_LIB_RAND_ORDER=1
+# CONFIG_EOL_IS_CR is not set
+# CONFIG_EOL_IS_LF is not set
+# CONFIG_EOL_IS_BOTH_CRLF is not set
+CONFIG_EOL_IS_EITHER_CRLF=y
+# CONFIG_LIBC_EXECFUNCS is not set
+CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
+CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
+# CONFIG_LIBC_STRERROR is not set
+# CONFIG_LIBC_PERROR_STDOUT is not set
+CONFIG_ARCH_LOWPUTC=y
+# CONFIG_LIBC_LOCALTIME is not set
+# CONFIG_TIME_EXTENDED is not set
+CONFIG_LIB_SENDFILE_BUFSIZE=512
+# CONFIG_ARCH_ROMGETC is not set
+# CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
+
+#
+# Non-standard Library Support
+#
+# CONFIG_LIB_CRC64_FAST is not set
+# CONFIG_LIB_KBDCODEC is not set
+# CONFIG_LIB_SLCDCODEC is not set
+
+#
+# Basic CXX Support
+#
+# CONFIG_C99_BOOL8 is not set
+CONFIG_HAVE_CXX=y
+CONFIG_HAVE_CXXINITIALIZE=y
+# CONFIG_CXX_NEWLONG is not set
+
+#
+# uClibc++ Standard C++ Library
+#
+# CONFIG_UCLIBCXX is not set
+
+#
+# Application Configuration
+#
+
+#
+# Built-In Applications
+#
+CONFIG_BUILTIN_PROXY_STACKSIZE=1024
+
+#
+# CAN Utilities
+#
+
+#
+# Examples
+#
+# CONFIG_EXAMPLES_BUTTONS is not set
+# CONFIG_EXAMPLES_CHAT is not set
+# CONFIG_EXAMPLES_CONFIGDATA is not set
+# CONFIG_EXAMPLES_CPUHOG is not set
+# CONFIG_EXAMPLES_CXXTEST is not set
+# CONFIG_EXAMPLES_DHCPD is not set
+# CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FTPC is not set
+# CONFIG_EXAMPLES_FTPD is not set
+CONFIG_EXAMPLES_HELLO=y
+CONFIG_EXAMPLES_HELLOXX=y
+# CONFIG_EXAMPLES_HIDKBD is not set
+# CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
+# CONFIG_EXAMPLES_MM is not set
+# CONFIG_EXAMPLES_MODBUS is not set
+# CONFIG_EXAMPLES_MOUNT is not set
+# CONFIG_EXAMPLES_NRF24L01TERM is not set
+CONFIG_EXAMPLES_NSH=y
+CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+# CONFIG_EXAMPLES_NULL is not set
+# CONFIG_EXAMPLES_NX is not set
+# CONFIG_EXAMPLES_NXFFS is not set
+# CONFIG_EXAMPLES_NXHELLO is not set
+# CONFIG_EXAMPLES_NXIMAGE is not set
+# CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
+# CONFIG_EXAMPLES_NXTEXT is not set
+# CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
+# CONFIG_EXAMPLES_PIPE is not set
+# CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
+# CONFIG_EXAMPLES_RGMP is not set
+# CONFIG_EXAMPLES_SENDMAIL is not set
+# CONFIG_EXAMPLES_SERIALBLASTER is not set
+# CONFIG_EXAMPLES_SERIALRX is not set
+# CONFIG_EXAMPLES_SERLOOP is not set
+# CONFIG_EXAMPLES_SLCD is not set
+# CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
+# CONFIG_EXAMPLES_SMP is not set
+# CONFIG_EXAMPLES_TCPECHO is not set
+# CONFIG_EXAMPLES_TELNETD is not set
+# CONFIG_EXAMPLES_TIFF is not set
+# CONFIG_EXAMPLES_TOUCHSCREEN is not set
+# CONFIG_EXAMPLES_USBTERM is not set
+# CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
+#
+# Graphics Support
+#
+# CONFIG_TIFF is not set
+# CONFIG_GRAPHICS_TRAVELER is not set
+
+#
+# Interpreters
+#
+# CONFIG_INTERPRETERS_BAS is not set
+# CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
+
+#
+# FreeModBus
+#
+# CONFIG_MODBUS is not set
+
+#
+# Network Utilities
+#
+# CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
+# CONFIG_NETUTILS_FTPC is not set
+# CONFIG_NETUTILS_JSON is not set
+# CONFIG_NETUTILS_SMTP is not set
+
+#
+# NSH Library
+#
+CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
+
+#
+# Command Line Configuration
+#
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
+CONFIG_NSH_LINELEN=64
+# CONFIG_NSH_DISABLE_SEMICOLON is not set
+# CONFIG_NSH_CMDPARMS is not set
+CONFIG_NSH_MAXARGUMENTS=6
+# CONFIG_NSH_ARGCAT is not set
+CONFIG_NSH_NESTDEPTH=3
+# CONFIG_NSH_DISABLEBG is not set
+CONFIG_NSH_BUILTIN_APPS=y
+
+#
+# Disable Individual commands
+#
+# CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
+# CONFIG_NSH_DISABLE_CAT is not set
+# CONFIG_NSH_DISABLE_CD is not set
+# CONFIG_NSH_DISABLE_CP is not set
+# CONFIG_NSH_DISABLE_CMP is not set
+CONFIG_NSH_DISABLE_DATE=y
+# CONFIG_NSH_DISABLE_DD is not set
+# CONFIG_NSH_DISABLE_DF is not set
+# CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
+# CONFIG_NSH_DISABLE_ECHO is not set
+# CONFIG_NSH_DISABLE_EXEC is not set
+# CONFIG_NSH_DISABLE_EXIT is not set
+# CONFIG_NSH_DISABLE_FREE is not set
+# CONFIG_NSH_DISABLE_GET is not set
+# CONFIG_NSH_DISABLE_HELP is not set
+# CONFIG_NSH_DISABLE_HEXDUMP is not set
+# CONFIG_NSH_DISABLE_IFCONFIG is not set
+# CONFIG_NSH_DISABLE_IFUPDOWN is not set
+# CONFIG_NSH_DISABLE_KILL is not set
+# CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
+# CONFIG_NSH_DISABLE_LS is not set
+# CONFIG_NSH_DISABLE_MB is not set
+# CONFIG_NSH_DISABLE_MKDIR is not set
+# CONFIG_NSH_DISABLE_MKFIFO is not set
+# CONFIG_NSH_DISABLE_MKRD is not set
+# CONFIG_NSH_DISABLE_MH is not set
+# CONFIG_NSH_DISABLE_MOUNT is not set
+# CONFIG_NSH_DISABLE_MV is not set
+# CONFIG_NSH_DISABLE_MW is not set
+# CONFIG_NSH_DISABLE_PS is not set
+# CONFIG_NSH_DISABLE_PUT is not set
+# CONFIG_NSH_DISABLE_PWD is not set
+# CONFIG_NSH_DISABLE_RM is not set
+# CONFIG_NSH_DISABLE_RMDIR is not set
+# CONFIG_NSH_DISABLE_SET is not set
+# CONFIG_NSH_DISABLE_SH is not set
+# CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
+# CONFIG_NSH_DISABLE_TEST is not set
+# CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
+# CONFIG_NSH_DISABLE_UNSET is not set
+# CONFIG_NSH_DISABLE_USLEEP is not set
+# CONFIG_NSH_DISABLE_WGET is not set
+# CONFIG_NSH_DISABLE_XD is not set
+
+#
+# Configure Command Options
+#
+# CONFIG_NSH_CMDOPT_DF_H is not set
+CONFIG_NSH_CODECS_BUFSIZE=128
+# CONFIG_NSH_CMDOPT_HEXDUMP is not set
+CONFIG_NSH_PROC_MOUNTPOINT="/proc"
+CONFIG_NSH_FILEIOSIZE=512
+
+#
+# Scripting Support
+#
+# CONFIG_NSH_DISABLESCRIPT is not set
+# CONFIG_NSH_DISABLE_ITEF is not set
+# CONFIG_NSH_DISABLE_LOOPS is not set
+
+#
+# Console Configuration
+#
+CONFIG_NSH_CONSOLE=y
+# CONFIG_NSH_ALTCONDEV is not set
+# CONFIG_NSH_ARCHINIT is not set
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
+
+#
+# NxWidgets/NxWM
+#
+
+#
+# Platform-specific Support
+#
+# CONFIG_PLATFORM_CONFIGDATA is not set
+
+#
+# System Libraries and NSH Add-Ons
+#
+# CONFIG_SYSTEM_CLE is not set
+# CONFIG_SYSTEM_CUTERM is not set
+# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_RAMTEST is not set
+CONFIG_READLINE_HAVE_EXTMATCH=y
+CONFIG_SYSTEM_READLINE=y
+CONFIG_READLINE_ECHO=y
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
+# CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
+# CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/olimex-stm32-e407/nsh/setenv.sh b/configs/olimex-stm32-e407/nsh/setenv.sh
new file mode 100755
index 0000000000..ded7c15537
--- /dev/null
+++ b/configs/olimex-stm32-e407/nsh/setenv.sh
@@ -0,0 +1,80 @@
+#!/bin/bash
+# configs/olimex-stm32-e407/nsh/setenv.sh
+#
+#   Copyright (C) 2011-2012 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.
+#
+
+if [ "$_" = "$0" ] ; then
+  echo "You must source this script, not run it!" 1>&2
+  exit 1
+fi
+
+WD=`pwd`
+if [ ! -x "setenv.sh" ]; then
+  echo "This script must be executed from the top-level NuttX build directory"
+  exit 1
+fi
+
+if [ -z "${PATH_ORIG}" ]; then
+  export PATH_ORIG="${PATH}"
+fi
+
+# This is the Cygwin path to the location where I installed the RIDE
+# toolchain under windows.  You will also have to edit this if you install
+# the RIDE toolchain in any other location
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
+
+# This is the Cygwin path to the location where I installed the CodeSourcery
+# toolchain under windows.  You will also have to edit this if you install
+# the CodeSourcery toolchain in any other location
+export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin"
+#export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin"
+
+# This is the location where I installed the ARM "GNU Tools for ARM Embedded Processors"
+# You can this free toolchain here https://launchpad.net/gcc-arm-embedded
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/GNU Tools ARM Embedded/4.9 2015q2/bin"
+
+# These are the Cygwin paths to the locations where I installed the Atollic
+# toolchain under windows.  You will also have to edit this if you install
+# the Atollic toolchain in any other location.  /usr/bin is added before
+# the Atollic bin path because there is are binaries named gcc.exe and g++.exe
+# at those locations as well.
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
+
+# This is the Cygwin path to the location where I build the buildroot
+# toolchain.
+#export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+
+# Add the path to the toolchain to the PATH variable
+export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
+
+echo "PATH : ${PATH}"
diff --git a/configs/olimex-stm32-e407/scripts/ld.script b/configs/olimex-stm32-e407/scripts/ld.script
new file mode 100644
index 0000000000..8cb28bca07
--- /dev/null
+++ b/configs/olimex-stm32-e407/scripts/ld.script
@@ -0,0 +1,122 @@
+/****************************************************************************
+ * configs/olimex-stm32-h405/scripts/ld.script
+ *
+ *   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.
+ *
+ ****************************************************************************/
+
+/* The STM32F407ZGT6 has 1024Kb of FLASH beginning at address 0x0800:0000 and
+ * 192Kb of SRAM. SRAM is split up into two blocks:
+ *
+ * 1) 112Kb of SRAM beginning at address 0x2000:0000
+ * 2)  16Kb of SRAM beginning at address 0x2001:c000
+ * 3)  64Kb of SRAM beginning at address 0x2002:0000
+ *
+ * When booting from FLASH, FLASH memory is aliased to address 0x0000:0000
+ * where the code expects to begin execution by jumping to the entry point in
+ * the 0x0800:0000 address
+ * range.
+ */
+
+MEMORY
+{
+	flash (rx) : ORIGIN = 0x08000000, LENGTH = 1024K
+	sram (rwx) : ORIGIN = 0x20000000, LENGTH = 112K
+}
+
+OUTPUT_ARCH(arm)
+ENTRY(_stext)
+SECTIONS
+{
+	.text : {
+		_stext = ABSOLUTE(.);
+		*(.vectors)
+		*(.text .text.*)
+		*(.fixup)
+		*(.gnu.warning)
+		*(.rodata .rodata.*)
+		*(.gnu.linkonce.t.*)
+		*(.glue_7)
+		*(.glue_7t)
+		*(.got)
+		*(.gcc_except_table)
+		*(.gnu.linkonce.r.*)
+		_etext = ABSOLUTE(.);
+	} > flash
+
+	.init_section : {
+		_sinit = ABSOLUTE(.);
+		*(.init_array .init_array.*)
+		_einit = ABSOLUTE(.);
+	} > flash
+
+	.ARM.extab : {
+		*(.ARM.extab*)
+	} > flash
+
+	__exidx_start = ABSOLUTE(.);
+	.ARM.exidx : {
+		*(.ARM.exidx*)
+	} > flash
+	__exidx_end = ABSOLUTE(.);
+
+	_eronly = ABSOLUTE(.);
+
+	.data : {
+		_sdata = ABSOLUTE(.);
+		*(.data .data.*)
+		*(.gnu.linkonce.d.*)
+		CONSTRUCTORS
+		_edata = ABSOLUTE(.);
+	} > sram AT > flash
+
+	.bss : {
+		_sbss = ABSOLUTE(.);
+		*(.bss .bss.*)
+		*(.gnu.linkonce.b.*)
+		*(COMMON)
+		_ebss = ABSOLUTE(.);
+	} > sram
+
+	/* Stabs debugging sections. */
+	.stab 0 : { *(.stab) }
+	.stabstr 0 : { *(.stabstr) }
+	.stab.excl 0 : { *(.stab.excl) }
+	.stab.exclstr 0 : { *(.stab.exclstr) }
+	.stab.index 0 : { *(.stab.index) }
+	.stab.indexstr 0 : { *(.stab.indexstr) }
+	.comment 0 : { *(.comment) }
+	.debug_abbrev 0 : { *(.debug_abbrev) }
+	.debug_info 0 : { *(.debug_info) }
+	.debug_line 0 : { *(.debug_line) }
+	.debug_pubnames 0 : { *(.debug_pubnames) }
+	.debug_aranges 0 : { *(.debug_aranges) }
+}
diff --git a/configs/olimex-stm32-e407/src/Makefile b/configs/olimex-stm32-e407/src/Makefile
new file mode 100644
index 0000000000..652e7a5577
--- /dev/null
+++ b/configs/olimex-stm32-e407/src/Makefile
@@ -0,0 +1,83 @@
+############################################################################
+# configs/olimex-stm32-e407/src/Makefile
+#
+#   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.
+#
+############################################################################
+
+-include $(TOPDIR)/Make.defs
+
+ASRCS =
+CSRCS = stm32_boot.c
+
+ifeq ($(CONFIG_ARCH_LEDS),y)
+CSRCS += stm32_autoleds.c
+else
+CSRCS += stm32_userleds.c
+endif
+
+ifeq ($(CONFIG_ARCH_BUTTONS),y)
+CSRCS +=  stm32_buttons.c
+endif
+
+ifeq ($(CONFIG_NSH_LIBRARY),y)
+CSRCS += stm32_appinit.c
+endif
+
+ifeq ($(CONFIG_ARCH_IDLE_CUSTOM),y)
+CSRCS += stm32_idle.c
+endif
+
+ifeq ($(CONFIG_STM32_FSMC),y)
+CSRCS += stm32_extmem.c
+endif
+
+ifeq ($(CONFIG_STM32_OTGFS),y)
+CSRCS += stm32_usb.c
+endif
+
+ifeq ($(CONFIG_STM32_OTGHS),y)
+CSRCS += stm32_usb.c
+endif
+
+ifeq ($(CONFIG_ADC),y)
+CSRCS +=  stm32_adc.c
+endif
+
+ifeq ($(CONFIG_CAN),y)
+CSRCS += stm32_can.c
+endif
+
+ifeq ($(CONFIG_ARCH_FPU),y)
+CSRCS += stm32_ostest.c
+endif
+
+include $(TOPDIR)/configs/Board.mk
diff --git a/configs/olimex-stm32-e407/src/olimex-stm32-e407.h b/configs/olimex-stm32-e407/src/olimex-stm32-e407.h
new file mode 100644
index 0000000000..da817eddd4
--- /dev/null
+++ b/configs/olimex-stm32-e407/src/olimex-stm32-e407.h
@@ -0,0 +1,247 @@
+/****************************************************************************
+ * configs/olimex-stm32-e407/src/olimex-stm32-e407.h
+ *
+ *   Copyright (C) 2014 Max Holtzberg. All rights reserved.
+ *   Author: Max Holtzberg 
+ *
+ * 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 __CONFIGS_OLIMEX_STM32_E407_SRC_H
+#define __CONFIGS_OLIMEX_STM32_E407_SRC_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include 
+#include 
+#include 
+#include 
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Configuration from stm32f4discovert*/
+
+/* Assume that we have everything */
+
+#define HAVE_USBDEV     1
+#define HAVE_USBHOST    1
+#define HAVE_USBMONITOR 1
+#define HAVE_SDIO       1
+#define HAVE_RTC_DRIVER 1
+#define HAVE_ELF        1
+#define HAVE_NETMONITOR 1
+
+/* Can't support USB host or device features if USB OTG FS is not enabled */
+
+#ifndef CONFIG_STM32_OTGFS
+#  undef HAVE_USBDEV
+#  undef HAVE_USBHOST
+#  undef HAVE_USBMONITOR
+#endif
+
+/* Can't support USB device monitor if USB device is not enabled */
+
+#ifndef CONFIG_USBDEV
+#  undef HAVE_USBDEV
+#  undef HAVE_USBMONITOR
+#endif
+
+/* Can't support USB host is USB host is not enabled */
+
+#ifndef CONFIG_USBHOST
+#  undef HAVE_USBHOST
+#endif
+
+/* Check if we should enable the USB monitor before starting NSH */
+
+#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_SYSTEM_USBMONITOR)
+#  undef HAVE_USBMONITOR
+#endif
+
+/* ELF */
+
+#if defined(CONFIG_BINFMT_DISABLE) || !defined(CONFIG_ELF)
+#  undef HAVE_ELF
+#endif
+
+/* NSH Network monitor  */
+
+#if !defined(CONFIG_NET) || !defined(CONFIG_STM32_EMACMAC)
+#  undef HAVE_NETMONITOR
+#endif
+
+#if !defined(CONFIG_NSH_NETINIT_THREAD) || !defined(CONFIG_ARCH_PHY_INTERRUPT) || \
+    !defined(CONFIG_NETDEV_PHY_IOCTL) || !defined(CONFIG_NET_UDP) || \
+     defined(CONFIG_DISABLE_SIGNALS)
+#  undef HAVE_NETMONITOR
+#endif
+
+/* The NSH Network Monitor cannot be used with the STM32F4DIS-BB base board.
+ * That is because the LAN8720 is configured in REF_CLK OUT mode.  In that
+ * mode, the PHY interrupt is not supported.  The NINT pin serves instead as
+ * REFLCK0.
+ */
+
+#ifdef CONFIG_STM32F4DISBB
+#  undef HAVE_NETMONITOR
+#endif
+
+/* procfs File System */
+
+#ifdef CONFIG_FS_PROCFS
+#  ifdef CONFIG_NSH_PROC_MOUNTPOINT
+#    define STM32_PROCFS_MOUNTPOINT CONFIG_NSH_PROC_MOUNTPOINT
+#  else
+#    define STM32_PROCFS_MOUNTPOINT "/proc"
+#  endif
+#endif
+
+/* Olimex-STM32-E407 GPIOs ****************************************************/
+/* LEDs */
+
+#define GPIO_LED_STATUS (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz|\
+                         GPIO_OUTPUT_CLEAR|GPIO_PORTC|GPIO_PIN13)
+
+/* BUTTONS -- NOTE that all have EXTI interrupts configured */
+
+#define MIN_IRQBUTTON   BUTTON_BUT
+#define MAX_IRQBUTTON   BUTTON_BUT
+#define NUM_IRQBUTTONS  1
+
+#define GPIO_BTN_BUT   (GPIO_INPUT|GPIO_FLOAT|GPIO_EXTI|GPIO_PORTA|GPIO_PIN0)
+
+/* USB OTG FS - USB-A connector
+ *
+ * PC4  OTG_FS_VBUS VBUS sensing
+ * PB0  OTG_FS_PowerSwitchOn
+ * PB1  OTG_FS_Overcurrent
+ */
+
+#define GPIO_OTGFS_VBUS   (GPIO_INPUT|GPIO_FLOAT|GPIO_SPEED_100MHz|\
+                           GPIO_OPENDRAIN|GPIO_PORTA|GPIO_PIN9)
+#define GPIO_OTGFS_PWRON  (GPIO_OUTPUT|GPIO_FLOAT|GPIO_SPEED_100MHz|\
+                           GPIO_PUSHPULL|GPIO_PORTB|GPIO_PIN0)
+
+#ifdef CONFIG_USBHOST
+#  define GPIO_OTGFS_OVER (GPIO_INPUT|GPIO_EXTI|GPIO_FLOAT|\
+                           GPIO_SPEED_100MHz|GPIO_PUSHPULL|\
+                           GPIO_PORTB|GPIO_PIN1)
+
+#else
+#  define GPIO_OTGFS_OVER (GPIO_INPUT|GPIO_FLOAT|GPIO_SPEED_100MHz|\
+                           GPIO_PUSHPULL|GPIO_PORTB|GPIO_PIN1)
+#endif
+
+
+/* USB OTG HS - miniUSB connector
+ *
+ * PB13  OTG_HS_VBUS VBUS sensing (also connected to the green LED)
+ * PA8  OTG_HS_PowerSwitchOn
+ * PF11  OTG_HS_Overcurrent
+ */
+
+#define GPIO_OTGHS_VBUS (GPIO_INPUT|GPIO_FLOAT|GPIO_SPEED_100MHz|GPIO_OPENDRAIN|GPIO_PORTB|GPIO_PIN13)
+#define GPIO_OTGHS_PWRON (GPIO_OUTPUT|GPIO_OUTPUT_SET|GPIO_FLOAT|GPIO_SPEED_100MHz|GPIO_PUSHPULL|GPIO_PORTA|GPIO_PIN8)
+
+#ifdef CONFIG_USBHOST
+#  define GPIO_OTGHS_OVER  (GPIO_INPUT|GPIO_EXTI|GPIO_FLOAT|GPIO_SPEED_100MHz|GPIO_PUSHPULL|GPIO_PORTF|GPIO_PIN11)
+
+#else
+#  define GPIO_OTGHS_OVER  (GPIO_INPUT|GPIO_FLOAT|GPIO_SPEED_100MHz|GPIO_PUSHPULL|GPIO_PORTF|GPIO_PIN11)
+#endif
+
+/****************************************************************************************************
+ * Public Types
+ ****************************************************************************************************/
+
+/****************************************************************************************************
+ * Public data
+ ****************************************************************************************************/
+
+#ifndef __ASSEMBLY__
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Name: stm32_usbinitialize
+ *
+ * Description:
+ *   Called from stm32_usbinitialize very early in initialization to setup USB-related
+ *   GPIO pins for the Olimex-STM32-H405 board.
+ *
+ ************************************************************************************/
+
+#if defined(CONFIG_STM32_OTGFS) || defined(CONFIG_STM32_OTGHS)
+void weak_function stm32_usbinitialize(void);
+#endif
+
+/****************************************************************************
+ * Name: stm32_sdio_initialize
+ *
+ * Description:
+ *   Initialize SDIO-based MMC/SD card support
+ *
+ ****************************************************************************/
+
+#if !defined(CONFIG_DISABLE_MOUNTPOINT) && defined(CONFIG_STM32_SDIO)
+int stm32_sdio_initialize(void);
+#endif
+
+/************************************************************************************
+ * Name: stm32_adc_initialize
+ *
+ * Description:
+ *   Called at application startup time to initialize the ADC functionality.
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_ADC
+int stm32_adc_initialize(void);
+#endif
+
+/************************************************************************************
+ * Name: stm32_can_initialize
+ *
+ * Description:
+ *   Called at application startup time to initialize the CAN functionality.
+ *
+ ************************************************************************************/
+
+#if defined(CONFIG_CAN) && (defined(CONFIG_STM32_CAN1) || defined(CONFIG_STM32_CAN2))
+int stm32_can_initialize(void);
+#endif
+
+#endif  /* __ASSEMBLY__ */
+#endif /* __CONFIGS_OLIMEX_STM32_E407_SRC_INTERNAL_H */
diff --git a/configs/olimex-stm32-e407/src/stm32_adc.c b/configs/olimex-stm32-e407/src/stm32_adc.c
new file mode 100644
index 0000000000..98ff8b85f3
--- /dev/null
+++ b/configs/olimex-stm32-e407/src/stm32_adc.c
@@ -0,0 +1,187 @@
+/************************************************************************************
+ * configs/olimex-stm32-e407/src/stm32_adc.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 
+
+#include 
+#include 
+#include 
+
+#include "chip.h"
+#include "stm32_adc.h"
+#include "olimex-stm32-e407.h"
+
+#ifdef CONFIG_ADC
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+/* Configuration ********************************************************************/
+/* Up to 3 ADC interfaces are supported */
+
+#if STM32_NADC < 3
+#  undef CONFIG_STM32_ADC3
+#endif
+
+#if STM32_NADC < 2
+#  undef CONFIG_STM32_ADC2
+#endif
+
+#if STM32_NADC < 1
+#  undef CONFIG_STM32_ADC1
+#endif
+
+#if defined(CONFIG_STM32_ADC1) || defined(CONFIG_STM32_ADC2) || defined(CONFIG_STM32_ADC3)
+#ifndef CONFIG_STM32_ADC1
+#  warning "Channel information only available for ADC1"
+#endif
+
+/* The number of ADC channels in the conversion list */
+
+#define ADC1_NCHANNELS 1//14
+
+/************************************************************************************
+ * Private Data
+ ************************************************************************************/
+/* The Olimex STM32-P405 has a 10 Kohm potentiometer AN_TR connected to PC0
+ * ADC123_IN10
+ */
+
+/* Identifying number of each ADC channel: Variable Resistor.
+ *
+ * {1,  2,  3, 4,  5,  6, 7,  8,  9, 10, 11, 12, 13, 15};
+ */
+
+#ifdef CONFIG_STM32_ADC1
+static const uint8_t  g_chanlist[ADC1_NCHANNELS] = {1};
+
+/* Configurations of pins used byte each ADC channels
+ *
+ * {GPIO_ADC1_IN1,  GPIO_ADC1_IN2,  GPIO_ADC1_IN3, GPIO_ADC1_IN4,  GPIO_ADC1_IN5, 
+ *  GPIO_ADC1_IN6,  GPIO_ADC1_IN7,  GPIO_ADC1_IN8,  GPIO_ADC1_IN9, GPIO_ADC1_IN10,
+ *  GPIO_ADC1_IN11, GPIO_ADC1_IN12, GPIO_ADC1_IN13, GPIO_ADC1_IN15};
+ */
+
+static const uint32_t g_pinlist[ADC1_NCHANNELS]  = {GPIO_ADC1_IN1};
+#endif
+
+/************************************************************************************
+ * Private Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Name: board_adc_setup
+ *
+ * Description:
+ *   All STM32 architectures must provide the following interface to work with
+ *   examples/adc.
+ *
+ ************************************************************************************/
+
+int board_adc_setup(void)
+{
+  return stm32_adc_initialize();
+}
+
+/************************************************************************************
+ * Name: stm32_adc_initialize
+ *
+ * Description:
+ *   Called at application startup time to initialize the ADC functionality.
+ *
+ ************************************************************************************/
+
+int stm32_adc_initialize(void)
+{
+#ifdef CONFIG_STM32_ADC1
+  static bool initialized = false;
+  struct adc_dev_s *adc;
+  int ret;
+  int i;
+
+  /* Check if we have already initialized */
+
+  if (!initialized)
+    {
+      /* Configure the pins as analog inputs for the selected channels */
+
+      for (i = 0; i < ADC1_NCHANNELS; i++)
+        {
+          stm32_configgpio(g_pinlist[i]);
+        }
+
+      /* Call stm32_adcinitialize() to get an instance of the ADC interface */
+
+      adc = stm32_adcinitialize(1, g_chanlist, ADC1_NCHANNELS);
+      if (adc == NULL)
+        {
+          adbg("ERROR: Failed to get ADC interface\n");
+          return -ENODEV;
+        }
+
+      /* Register the ADC driver at "/dev/adc0" */
+
+      ret = adc_register("/dev/adc0", adc);
+      if (ret < 0)
+        {
+          adbg("adc_register failed: %d\n", ret);
+          return ret;
+        }
+
+      /* Now we are initialized */
+
+      initialized = true;
+    }
+
+  return OK;
+#else
+  return -ENOSYS;
+#endif
+}
+
+#endif /* CONFIG_STM32_ADC1 || CONFIG_STM32_ADC2 || CONFIG_STM32_ADC3 */
+#endif /* CONFIG_ADC */
diff --git a/configs/olimex-stm32-e407/src/stm32_appinit.c b/configs/olimex-stm32-e407/src/stm32_appinit.c
new file mode 100644
index 0000000000..7707fa4c07
--- /dev/null
+++ b/configs/olimex-stm32-e407/src/stm32_appinit.c
@@ -0,0 +1,237 @@
+/****************************************************************************
+ * config/olimex-stm32-e407/src/stm32_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 
+#include 
+#include 
+
+#include 
+
+#ifdef CONFIG_SYSTEM_USBMONITOR
+#  include 
+#endif
+
+#ifdef CONFIG_STM32_OTGFS
+#  include "stm32_usbhost.h"
+#endif
+
+#include "stm32.h"
+#include "olimex-stm32-e407.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Configuration ************************************************************/
+
+#define HAVE_USBDEV     1
+#define HAVE_USBHOST    1
+#define HAVE_USBMONITOR 1
+/* #define HAVE_I2CTOOL    1 */
+
+/* Can't support USB host or device features if USB OTG HS is not enabled */
+
+#ifndef CONFIG_STM32_OTGHS
+#  undef HAVE_USBDEV
+#  undef HAVE_USBHOST
+#  undef HAVE_USBMONITOR
+#endif
+
+/* Can't support USB device monitor if USB device is not enabled */
+
+#ifndef CONFIG_USBDEV
+#  undef HAVE_USBDEV
+#  undef HAVE_USBMONITOR
+#endif
+
+/* Can't support USB host is USB host is not enabled */
+
+#ifndef CONFIG_USBHOST
+#  undef HAVE_USBHOST
+#endif
+
+/* Check if we should enable the USB monitor before starting NSH */
+
+#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_SYSTEM_USBMONITOR)
+#  undef HAVE_USBMONITOR
+#endif
+
+#if !defined(CONFIG_STM32_CAN1) && !defined(CONFIG_STM32_CAN2)
+#  undef CONFIG_CAN
+#endif
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stm32_i2c_register
+ *
+ * Description:
+ *   Register one I2C drivers for the I2C tool.
+ *
+ ****************************************************************************/
+
+#ifdef HAVE_I2CTOOL
+static void stm32_i2c_register(int bus)
+{
+  FAR struct i2c_master_s *i2c;
+  int ret;
+
+  i2c = stm32_i2cbus_initialize(bus);
+  if (i2c == NULL)
+    {
+      _err("ERROR: Failed to get I2C%d interface\n", bus);
+    }
+  else
+    {
+      ret = i2c_register(i2c, bus);
+      if (ret < 0)
+        {
+          _err("ERROR: Failed to register I2C%d driver: %d\n", bus, ret);
+          stm32_i2cbus_uninitialize(i2c);
+        }
+    }
+}
+#endif
+
+/****************************************************************************
+ * Name: stm32_i2ctool
+ *
+ * Description:
+ *   Register I2C drivers for the I2C tool.
+ *
+ ****************************************************************************/
+
+#ifdef HAVE_I2CTOOL
+static void stm32_i2ctool(void)
+{
+#ifdef CONFIG_STM32_I2C1
+  stm32_i2c_register(1);
+#endif
+#ifdef CONFIG_STM32_I2C2
+  stm32_i2c_register(2);
+#endif
+#ifdef CONFIG_STM32_I2C3
+  stm32_i2c_register(3);
+#endif
+}
+#else
+#  define stm32_i2ctool()
+#endif
+
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: board_app_initialize
+ *
+ * Description:
+ *   Perform architecture specific initialization
+ *
+ *   CONFIG_LIB_BOARDCTL=y :
+ *     Called from the NSH library
+ *
+ *   CONFIG_BOARD_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, &&
+ *   CONFIG_LIB_BOARDCTL=n :
+ *     Called from board_initialize().
+ *
+ ****************************************************************************/
+
+int board_app_initialize(uintptr_t arg)
+{
+#if defined(CONFIG_CAN) || defined(CONFIG_ADC)
+  int ret;
+#endif
+
+  /* Register I2C drivers on behalf of the I2C tool */
+
+  stm32_i2ctool();
+
+
+#ifdef CONFIG_CAN
+  /* Configure on-board CAN if CAN support has been selected. */
+
+  ret = stm32_can_initialize();
+  if (ret != OK)
+    {
+      syslog(LOG_ERR, "ERROR: Failed to initialize CAN: %d\n", ret);
+    }
+#endif
+
+#ifdef CONFIG_ADC
+  /* Configure on-board ADCs if ADC support has been selected. */
+
+  ret = stm32_adc_initialize();
+  if (ret != OK)
+    {
+      syslog(LOG_ERR, "ERROR: Failed to initialize ADC: %d\n", ret);
+    }
+#endif
+
+#ifdef HAVE_USBHOST
+  /* Initialize USB host operation.  stm32_usbhost_initialize() starts a thread
+   * will monitor for USB connection and disconnection events.
+   */
+
+  ret = stm32_usbhost_initialize();
+  if (ret != OK)
+    {
+      syslog(LOG_ERR, "ERROR: Failed to initialize USB host: %d\n", ret);
+      return ret;
+    }
+#endif
+
+#ifdef HAVE_USBMONITOR
+  /* Start the USB Monitor */
+
+  ret = usbmonitor_start(0, NULL);
+  if (ret != OK)
+    {
+      syslog(LOG_ERR, "ERROR: Failed to start USB monitor: %d\n", ret);
+    }
+#endif
+
+  return OK;
+}
diff --git a/configs/olimex-stm32-e407/src/stm32_autoleds.c b/configs/olimex-stm32-e407/src/stm32_autoleds.c
new file mode 100644
index 0000000000..7704300f67
--- /dev/null
+++ b/configs/olimex-stm32-e407/src/stm32_autoleds.c
@@ -0,0 +1,110 @@
+/****************************************************************************
+ * configs/olimex-stm32-e407/src/stm32_autoleds.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 
+#include 
+
+#include 
+#include 
+
+#include "chip.h"
+#include "up_arch.h"
+#include "up_internal.h"
+#include "stm32.h"
+#include "olimex-stm32-e407.h"
+
+#ifdef CONFIG_ARCH_LEDS
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: board_autoled_initialize
+ ****************************************************************************/
+
+void board_autoled_initialize(void)
+{
+   /* Configure LED_STATUS GPIO for output */
+
+   stm32_configgpio(GPIO_LED_STATUS);
+}
+
+/****************************************************************************
+ * Name: board_autoled_on
+ ****************************************************************************/
+
+void board_autoled_on(int led)
+{
+  if (led == LED_STARTED)
+    {
+      stm32_gpiowrite(GPIO_LED_STATUS, true);
+    }
+
+  if (led == LED_ASSERTION || led == LED_PANIC)
+    {
+      stm32_gpiowrite(GPIO_LED_STATUS, false);
+    }
+}
+
+/****************************************************************************
+ * Name: board_autoled_off
+ ****************************************************************************/
+
+void board_autoled_off(int led)
+{
+  if (led == LED_STARTED)
+    {
+      stm32_gpiowrite(GPIO_LED_STATUS, false);
+    }
+
+  if (led == LED_ASSERTION || led == LED_PANIC)
+    {
+      stm32_gpiowrite(GPIO_LED_STATUS, true);
+    }
+}
+
+#endif /* CONFIG_ARCH_LEDS */
diff --git a/configs/olimex-stm32-e407/src/stm32_boot.c b/configs/olimex-stm32-e407/src/stm32_boot.c
new file mode 100644
index 0000000000..8cbc66ef09
--- /dev/null
+++ b/configs/olimex-stm32-e407/src/stm32_boot.c
@@ -0,0 +1,123 @@
+/************************************************************************************
+ * configs/olimex-stm32-e407/src/stm32_boot.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 
+#include 
+#include 
+
+#include "up_arch.h"
+#include "olimex-stm32-e407.h"
+#include "stm32_ccm.h"
+
+#include "stm32.h"
+#include "stm32_i2c.h"
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Name: stm32_boardinitialize
+ *
+ * Description:
+ *   All STM32 architectures must provide the following entry point.  This entry point
+ *   is called early in the intitialization -- after all memory has been configured
+ *   and mapped but before any devices have been initialized.
+ *
+ ************************************************************************************/
+
+void stm32_boardinitialize(void)
+{
+#if defined(CONFIG_STM32_OTGFS) || defined(CONFIG_STM32_OTGHS)
+  /* Initialize USB if the 1) OTG FS controller is in the configuration and 2)
+   * disabled, and 3) the weak function stm32_usbinitialize() has been brought
+   * into the build. Presumeably either CONFIG_USBDEV is also selected.
+   */
+
+  if (stm32_usbinitialize)
+    {
+      stm32_usbinitialize();
+    }
+#endif
+
+#ifdef CONFIG_ARCH_LEDS
+  /* Configure on-board LEDs if LED support has been selected. */
+
+  board_autoled_initialize();
+#endif
+
+#ifdef CONFIG_ARCH_BUTTONS
+  /* Configure on-board BUTTONs if BUTTON support has been selected. */
+
+  board_button_initialize();
+#endif
+
+
+}
+
+/****************************************************************************
+ * Name: board_initialize
+ *
+ * Description:
+ *   If CONFIG_BOARD_INITIALIZE is selected, then an additional
+ *   initialization call will be performed in the boot-up sequence to a
+ *   function called board_initialize().  board_initialize() will be
+ *   called immediately after up_intitialize() is called and just before the
+ *   initial application is started.  This additional initialization phase
+ *   may be used, for example, to initialize board-specific device drivers.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_BOARD_INITIALIZE
+void board_initialize(void)
+{
+#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_LIB_BOARDCTL)
+  /* Perform NSH initialization here instead of from the NSH.  This
+   * alternative NSH initialization is necessary when NSH is ran in user-space
+   * but the initialization function must run in kernel space.
+   */
+
+  board_app_initialize();
+#endif
+}
+#endif
diff --git a/configs/olimex-stm32-e407/src/stm32_buttons.c b/configs/olimex-stm32-e407/src/stm32_buttons.c
new file mode 100644
index 0000000000..b857a76802
--- /dev/null
+++ b/configs/olimex-stm32-e407/src/stm32_buttons.c
@@ -0,0 +1,150 @@
+/****************************************************************************
+ * configs/olimex-stm32-e407/src/stm32_buttons.c
+ *
+ *   Copyright (C) 2014-2015 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 
+
+#include "olimex-stm32-e407.h"
+
+#ifdef CONFIG_ARCH_BUTTONS
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/* Pin configuration for each Olimex-STM32-H405 button.  This array is indexed by
+ * the BUTTON_* definitions in board.h
+ */
+
+static const uint32_t g_buttons[NUM_BUTTONS] =
+{
+  GPIO_BTN_BUT
+};
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: board_button_initialize
+ *
+ * Description:
+ *   board_button_initialize() must be called to initialize button resources.  After
+ *   that, board_buttons() may be called to collect the current state of all
+ *   buttons or board_button_irq() may be called to register button interrupt
+ *   handlers.
+ *
+ ****************************************************************************/
+
+void board_button_initialize(void)
+{
+  int i;
+
+  /* Configure the GPIO pins as inputs.  NOTE that EXTI interrupts are
+   * configured for all pins.
+   */
+
+  for (i = 0; i < NUM_BUTTONS; i++)
+    {
+      stm32_configgpio(g_buttons[i]);
+    }
+}
+
+/****************************************************************************
+ * Name: board_buttons
+ ****************************************************************************/
+
+uint8_t board_buttons(void)
+{
+  uint8_t ret = 0;
+
+  /* Check that state of each key */
+
+  if (!stm32_gpioread(g_buttons[BUTTON_BUT]))
+    {
+      ret |= BUTTON_BUT_BIT;
+    }
+
+  return ret;
+}
+
+/************************************************************************************
+ * Button support.
+ *
+ * Description:
+ *   board_button_initialize() must be called to initialize button resources.  After
+ *   that, board_buttons() may be called to collect the current state of all
+ *   buttons or board_button_irq() may be called to register button interrupt
+ *   handlers.
+ *
+ *   After board_button_initialize() has been called, board_buttons() may be called to
+ *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
+ *   with each bit associated with a button.  See the BUTTON_*_BIT
+ *   definitions in board.h for the meaning of each bit.
+ *
+ *   board_button_irq() may be called to register an interrupt handler that will
+ *   be called when a button is depressed or released.  The ID value is a
+ *   button enumeration value that uniquely identifies a button resource. See the
+ *   BUTTON_* definitions in board.h for the meaning of enumeration
+ *   value.  The previous interrupt handler address is returned (so that it may
+ *   restored, if so desired).
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_ARCH_IRQBUTTONS
+xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+{
+  xcpt_t oldhandler = NULL;
+
+  /* The following should be atomic */
+
+  if (id >= MIN_IRQBUTTON && id <= MAX_IRQBUTTON)
+    {
+      oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true, irqhandler);
+    }
+
+  return oldhandler;
+}
+#endif
+#endif /* CONFIG_ARCH_BUTTONS */
diff --git a/configs/olimex-stm32-e407/src/stm32_can.c b/configs/olimex-stm32-e407/src/stm32_can.c
new file mode 100644
index 0000000000..2fb54bd194
--- /dev/null
+++ b/configs/olimex-stm32-e407/src/stm32_can.c
@@ -0,0 +1,130 @@
+/************************************************************************************
+ * configs/olimex-stm32-405/src/stm32_can.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 
+#include 
+#include 
+#include "stm32.h"
+#include "stm32_can.h"
+#include "olimex-stm32-e407.h"
+
+#if defined(CONFIG_CAN) && (defined(CONFIG_STM32_CAN1) || defined(CONFIG_STM32_CAN2))
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+/* Configuration ********************************************************************/
+
+#if defined(CONFIG_STM32_CAN1) && defined(CONFIG_STM32_CAN2)
+#  warning "Both CAN1 and CAN2 are enabled.  Only CAN1 is used."
+#  undef CONFIG_STM32_CAN2
+#endif
+
+#ifdef CONFIG_STM32_CAN1
+#  define CAN_PORT 1
+#else
+#  define CAN_PORT 2
+#endif
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Name: board_can_initialize
+ *
+ * Description:
+ *   All STM32 architectures must provide the following interface to work with
+ *   examples/can.
+ *
+ ************************************************************************************/
+
+int board_can_initialize(void)
+{
+  return stm32_can_initialize();
+}
+
+/****************************************************************************************************
+ * Name: stm32_can_initialize
+ *
+ * Description:
+ *   Called at application startup time to initialize the CAN functionality.
+ *
+ ****************************************************************************************************/
+
+int stm32_can_initialize(void)
+{
+  static bool initialized = false;
+  struct can_dev_s *can;
+  int ret;
+
+  /* Check if we have already initialized */
+
+  if (!initialized)
+    {
+      /* Call stm32_caninitialize() to get an instance of the CAN interface */
+
+      can = stm32_caninitialize(CAN_PORT);
+      if (can == NULL)
+        {
+          candbg("ERROR:  Failed to get CAN interface\n");
+          return -ENODEV;
+        }
+
+      /* Register the CAN driver at "/dev/can0" */
+
+      ret = can_register("/dev/can0", can);
+      if (ret < 0)
+        {
+          candbg("ERROR: can_register failed: %d\n", ret);
+          return ret;
+        }
+
+      /* Now we are initialized */
+
+      initialized = true;
+    }
+
+  return OK;
+}
+
+#endif /* CONFIG_CAN && (CONFIG_STM32_CAN1 || CONFIG_STM32_CAN2) */
diff --git a/configs/olimex-stm32-e407/src/stm32_usb.c b/configs/olimex-stm32-e407/src/stm32_usb.c
new file mode 100644
index 0000000000..fc505deb06
--- /dev/null
+++ b/configs/olimex-stm32-e407/src/stm32_usb.c
@@ -0,0 +1,336 @@
+/************************************************************************************
+ * configs/stm32f4discovery/src/stm32_usb.c
+ *
+ *   Copyright (C) 2012-2013, 2015 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 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+
+#include "up_arch.h"
+#include "stm32.h"
+#include "stm32_otgfs.h"
+#include "olimex-stm32-e407.h"
+
+#ifdef CONFIG_STM32_OTGFS
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+#if defined(CONFIG_USBDEV) || defined(CONFIG_USBHOST)
+#  define HAVE_USB 1
+#else
+#  warning "CONFIG_STM32_OTGFS is enabled but neither CONFIG_USBDEV nor CONFIG_USBHOST"
+#  undef HAVE_USB
+#endif
+
+#ifndef CONFIG_STM32F4DISCO_USBHOST_PRIO
+#  define CONFIG_STM32F4DISCO_USBHOST_PRIO 100
+#endif
+
+#ifndef CONFIG_STM32F4DISCO_USBHOST_STACKSIZE
+#  define CONFIG_STM32F4DISCO_USBHOST_STACKSIZE 1024
+#endif
+
+/************************************************************************************
+ * Private Data
+ ************************************************************************************/
+
+#ifdef CONFIG_USBHOST
+static struct usbhost_connection_s *g_usbconn;
+#endif
+
+/************************************************************************************
+ * Private Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Name: usbhost_waiter
+ *
+ * Description:
+ *   Wait for USB devices to be connected.
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_USBHOST
+static int usbhost_waiter(int argc, char *argv[])
+{
+  struct usbhost_hubport_s *hport;
+
+  uinfo("Running\n");
+  for (;;)
+    {
+      /* Wait for the device to change state */
+
+      DEBUGVERIFY(CONN_WAIT(g_usbconn, &hport));
+      uinfo("%s\n", hport->connected ? "connected" : "disconnected");
+
+      /* Did we just become connected? */
+
+      if (hport->connected)
+        {
+          /* Yes.. enumerate the newly connected device */
+
+          (void)CONN_ENUMERATE(g_usbconn, hport);
+        }
+    }
+
+  /* Keep the compiler from complaining */
+
+  return 0;
+}
+#endif
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Name: stm32_usbinitialize
+ *
+ * Description:
+ *   Called from stm32_usbinitialize very early in inialization to setup USB-related
+ *   GPIO pins for the STM32F4Discovery board.
+ *
+ ************************************************************************************/
+
+void stm32_usbinitialize(void)
+{
+  /* The OTG FS has an internal soft pull-up.  No GPIO configuration is required */
+
+  /* Configure the OTG FS VBUS sensing GPIO, Power On, and Overcurrent GPIOs */
+
+#ifdef CONFIG_STM32_OTGFS
+  stm32_configgpio(GPIO_OTGFS_VBUS);
+  stm32_configgpio(GPIO_OTGFS_PWRON);
+  stm32_configgpio(GPIO_OTGFS_OVER);
+#endif
+}
+
+/***********************************************************************************
+ * Name: stm32_usbhost_initialize
+ *
+ * Description:
+ *   Called at application startup time to initialize the USB host functionality.
+ *   This function will start a thread that will monitor for device
+ *nnnn   connection/disconnection events.
+ *
+ ***********************************************************************************/
+
+#ifdef CONFIG_USBHOST
+int stm32_usbhost_initialize(void)
+{
+  int pid;
+#if defined(CONFIG_USBHOST_HUB)    || defined(CONFIG_USBHOST_MSC) || \
+    defined(CONFIG_USBHOST_HIDKBD) || defined(CONFIG_USBHOST_HIDMOUSE)
+  int ret;
+#endif
+
+  /* First, register all of the class drivers needed to support the drivers
+   * that we care about:
+   */
+
+  uvdbg("Register class drivers\n");
+
+#ifdef CONFIG_USBHOST_HUB
+  /* Initialize USB hub class support */
+
+  ret = usbhost_hub_initialize();
+  if (ret < 0)
+    {
+      uerr("ERROR: usbhost_hub_initialize failed: %d\n", ret);
+    }
+#endif
+
+#ifdef CONFIG_USBHOST_MSC
+  /* Register the USB mass storage class class */
+
+  ret = usbhost_msc_initialize();
+  if (ret != OK)
+    {
+      uerr("ERROR: Failed to register the mass storage class: %d\n", ret);
+    }
+#endif
+
+#ifdef CONFIG_USBHOST_CDCACM
+  /* Register the CDC/ACM serial class */
+
+  ret = usbhost_cdcacm_initialize();
+  if (ret != OK)
+    {
+      uerr("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
+    }
+#endif
+
+#ifdef CONFIG_USBHOST_HIDKBD
+  /* Initialize the HID keyboard class */
+
+  ret = usbhost_kbdinit();
+  if (ret != OK)
+    {
+      uerr("Failed to register the HID keyboard class\n");
+    }
+#endif
+
+#ifdef CONFIG_USBHOST_HIDMOUSE
+  /* Initialize the HID mouse class */
+
+  ret = usbhost_mouse_init();
+  if (ret != OK)
+    {
+      uerr("Failed to register the HID mouse class\n");
+    }
+#endif
+
+  /* Then get an instance of the USB host interface */
+
+  uinfo("Initialize USB host\n");
+  g_usbconn = stm32_otgfshost_initialize(0);
+  if (g_usbconn)
+    {
+      /* Start a thread to handle device connection. */
+
+      uinfo("Start usbhost_waiter\n");
+
+      pid = task_create("usbhost", CONFIG_STM32F4DISCO_USBHOST_PRIO,
+                        CONFIG_STM32F4DISCO_USBHOST_STACKSIZE,
+                        (main_t)usbhost_waiter, (FAR char * const *)NULL);
+      return pid < 0 ? -ENOEXEC : OK;
+    }
+
+  return -ENODEV;
+}
+#endif
+
+/***********************************************************************************
+ * Name: stm32_usbhost_vbusdrive
+ *
+ * Description:
+ *   Enable/disable driving of VBUS 5V output.  This function must be provided be
+ *   each platform that implements the STM32 OTG FS host interface
+ *
+ *   "On-chip 5 V VBUS generation is not supported. For this reason, a charge pump
+ *    or, if 5 V are available on the application board, a basic power switch, must
+ *    be added externally to drive the 5 V VBUS line. The external charge pump can
+ *    be driven by any GPIO output. When the application decides to power on VBUS
+ *    using the chosen GPIO, it must also set the port power bit in the host port
+ *    control and status register (PPWR bit in OTG_FS_HPRT).
+ *
+ *   "The application uses this field to control power to this port, and the core
+ *    clears this bit on an overcurrent condition."
+ *
+ * Input Parameters:
+ *   iface - For future growth to handle multiple USB host interface.  Should be zero.
+ *   enable - true: enable VBUS power; false: disable VBUS power
+ *
+ * Returned Value:
+ *   None
+ *
+ ***********************************************************************************/
+
+#ifdef CONFIG_USBHOST
+void stm32_usbhost_vbusdrive(int iface, bool enable)
+{
+  DEBUGASSERT(iface == 0);
+
+  if (enable)
+    {
+      /* Enable the Power Switch by driving the enable pin low */
+
+      stm32_gpiowrite(GPIO_OTGFS_PWRON, false);
+    }
+  else
+    {
+      /* Disable the Power Switch by driving the enable pin high */
+
+      stm32_gpiowrite(GPIO_OTGFS_PWRON, true);
+    }
+}
+#endif
+
+/************************************************************************************
+ * Name: stm32_setup_overcurrent
+ *
+ * Description:
+ *   Setup to receive an interrupt-level callback if an overcurrent condition is
+ *   detected.
+ *
+ * Input Parameter:
+ *   handler - New overcurrent interrupt handler
+ *
+ * Returned value:
+ *   Old overcurrent interrupt handler
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_USBHOST
+xcpt_t stm32_setup_overcurrent(xcpt_t handler)
+{
+  return stm32_gpiosetevent(GPIO_OTGFS_OVER, true, true, true, handler);
+}
+#endif
+
+/************************************************************************************
+ * Name:  stm32_usbsuspend
+ *
+ * Description:
+ *   Board logic must provide the stm32_usbsuspend logic if the USBDEV driver is
+ *   used.  This function is called whenever the USB enters or leaves suspend mode.
+ *   This is an opportunity for the board logic to shutdown clocks, power, etc.
+ *   while the USB is suspended.
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_USBDEV
+void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
+{
+  uinfo("resume: %d\n", resume);
+}
+#endif
+
+#endif /* CONFIG_STM32_OTGFS */
diff --git a/configs/olimex-stm32-e407/src/stm32_userleds.c b/configs/olimex-stm32-e407/src/stm32_userleds.c
new file mode 100644
index 0000000000..f927f73862
--- /dev/null
+++ b/configs/olimex-stm32-e407/src/stm32_userleds.c
@@ -0,0 +1,106 @@
+/****************************************************************************
+ * configs/olimex-stm32-e407/src/stm32_leds.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 
+#include 
+#include 
+#include 
+
+#include "chip.h"
+#include "up_arch.h"
+#include "up_internal.h"
+#include "stm32.h"
+#include "olimex-stm32-e407.h"
+
+#ifndef CONFIG_ARCH_LEDS
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+/* This array maps an LED number to GPIO pin configuration */
+
+static uint32_t g_ledcfg[BOARD_NLEDS] =
+{
+  GPIO_LED_STATUS
+};
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: board_userled_initialize
+ ****************************************************************************/
+
+void board_userled_initialize(void)
+{
+   /* Configure LED1-4 GPIOs for output */
+
+   stm32_configgpio(GPIO_LED_STATUS);
+}
+
+/****************************************************************************
+ * Name: board_userled
+ ****************************************************************************/
+
+void board_userled(int led, bool ledon)
+{
+  if ((unsigned)led < BOARD_NLEDS)
+    {
+      stm32_gpiowrite(g_ledcfg[led], ledon);
+    }
+}
+
+/****************************************************************************
+ * Name: board_userled_all
+ ****************************************************************************/
+
+void board_userled_all(uint8_t ledset)
+{
+  stm32_gpiowrite(GPIO_LED_STATUS, (ledset & BOARD_LED1_BIT) != 0);
+}
+
+#endif /* !CONFIG_ARCH_LEDS */
diff --git a/configs/olimex-stm32-e407/usbnsh/Make.defs b/configs/olimex-stm32-e407/usbnsh/Make.defs
new file mode 100644
index 0000000000..a9a8ab3992
--- /dev/null
+++ b/configs/olimex-stm32-e407/usbnsh/Make.defs
@@ -0,0 +1,113 @@
+############################################################################
+# configs/olimex-stm32-e407/usbnsh/Make.defs
+#
+#   Copyright (C) 2013 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.
+#
+############################################################################
+
+include ${TOPDIR}/.config
+include ${TOPDIR}/tools/Config.mk
+include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
+
+LDSCRIPT = ld.script
+
+ifeq ($(WINTOOL),y)
+  # Windows-native toolchains
+  DIRLINK = $(TOPDIR)/tools/copydir.sh
+  DIRUNLINK = $(TOPDIR)/tools/unlink.sh
+  MKDEP = $(TOPDIR)/tools/mkwindeps.sh
+  ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
+  ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
+  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
+else
+  # Linux/Cygwin-native toolchain
+  MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
+  ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
+  ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
+  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
+endif
+
+CC = $(CROSSDEV)gcc
+CXX = $(CROSSDEV)g++
+CPP = $(CROSSDEV)gcc -E
+LD = $(CROSSDEV)ld
+AR = $(ARCROSSDEV)ar rcs
+NM = $(ARCROSSDEV)nm
+OBJCOPY = $(CROSSDEV)objcopy
+OBJDUMP = $(CROSSDEV)objdump
+
+ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
+ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
+
+ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
+  ARCHOPTIMIZATION = -g
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
+endif
+
+ARCHCFLAGS = -fno-builtin
+ARCHCXXFLAGS = -fno-builtin -fno-exceptions -fno-rtti
+ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
+ARCHWARNINGSXX = -Wall -Wshadow -Wundef
+ARCHDEFINES =
+ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
+
+CFLAGS = $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
+CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
+CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
+AFLAGS = $(CFLAGS) -D__ASSEMBLY__
+
+NXFLATLDFLAGS1 = -r -d -warn-common
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
+LDNXFLATFLAGS = -e main -s 2048
+
+ASMEXT = .S
+OBJEXT = .o
+LIBEXT = .a
+EXEEXT =
+
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
+  LDFLAGS += -nostartfiles -nodefaultlibs
+endif
+ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
+  LDFLAGS += -g
+endif
+
+
+HOSTCC = gcc
+HOSTINCLUDES = -I.
+HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe
+HOSTLDFLAGS =
+
diff --git a/configs/olimex-stm32-e407/usbnsh/defconfig b/configs/olimex-stm32-e407/usbnsh/defconfig
new file mode 100644
index 0000000000..fdd456571c
--- /dev/null
+++ b/configs/olimex-stm32-e407/usbnsh/defconfig
@@ -0,0 +1,1237 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Nuttx/ Configuration
+#
+
+#
+# Build Setup
+#
+# CONFIG_EXPERIMENTAL is not set
+# CONFIG_DEFAULT_SMALL is not set
+CONFIG_HOST_LINUX=y
+# CONFIG_HOST_OSX is not set
+# CONFIG_HOST_WINDOWS is not set
+# CONFIG_HOST_OTHER is not set
+# CONFIG_WINDOWS_NATIVE is not set
+# CONFIG_WINDOWS_CYGWIN is not set
+# CONFIG_WINDOWS_MSYS is not set
+# CONFIG_WINDOWS_OTHER is not set
+
+#
+# Build Configuration
+#
+# CONFIG_APPS_DIR="../apps"
+CONFIG_BUILD_FLAT=y
+# CONFIG_BUILD_2PASS is not set
+
+#
+# Binary Output Formats
+#
+# CONFIG_RRLOAD_BINARY is not set
+CONFIG_INTELHEX_BINARY=y
+# CONFIG_MOTOROLA_SREC is not set
+CONFIG_RAW_BINARY=y
+# CONFIG_UBOOT_UIMAGE is not set
+
+#
+# Customize Header Files
+#
+# CONFIG_ARCH_STDINT_H is not set
+# CONFIG_ARCH_STDBOOL_H is not set
+# CONFIG_ARCH_MATH_H is not set
+# CONFIG_ARCH_FLOAT_H is not set
+# CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
+
+#
+# Debug Options
+#
+CONFIG_DEBUG_ALERT=y
+# CONFIG_DEBUG_FEATURES is not set
+CONFIG_ARCH_HAVE_STACKCHECK=y
+# CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
+# CONFIG_DEBUG_SYMBOLS is not set
+CONFIG_ARCH_HAVE_CUSTOMOPT=y
+# CONFIG_DEBUG_NOOPT is not set
+# CONFIG_DEBUG_CUSTOMOPT is not set
+CONFIG_DEBUG_FULLOPT=y
+
+#
+# System Type
+#
+CONFIG_ARCH_ARM=y
+# CONFIG_ARCH_AVR is not set
+# CONFIG_ARCH_HC is not set
+# CONFIG_ARCH_MIPS is not set
+# CONFIG_ARCH_RGMP is not set
+# CONFIG_ARCH_SH is not set
+# CONFIG_ARCH_SIM is not set
+# CONFIG_ARCH_X86 is not set
+# CONFIG_ARCH_Z16 is not set
+# CONFIG_ARCH_Z80 is not set
+CONFIG_ARCH="arm"
+
+#
+# ARM Options
+#
+# CONFIG_ARCH_CHIP_A1X is not set
+# CONFIG_ARCH_CHIP_C5471 is not set
+# CONFIG_ARCH_CHIP_CALYPSO is not set
+# CONFIG_ARCH_CHIP_DM320 is not set
+# CONFIG_ARCH_CHIP_EFM32 is not set
+# CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
+# CONFIG_ARCH_CHIP_KINETIS is not set
+# CONFIG_ARCH_CHIP_KL is not set
+# CONFIG_ARCH_CHIP_LM is not set
+# CONFIG_ARCH_CHIP_TIVA is not set
+# CONFIG_ARCH_CHIP_LPC11XX is not set
+# CONFIG_ARCH_CHIP_LPC17XX is not set
+# CONFIG_ARCH_CHIP_LPC214X is not set
+# CONFIG_ARCH_CHIP_LPC2378 is not set
+# CONFIG_ARCH_CHIP_LPC31XX is not set
+# CONFIG_ARCH_CHIP_LPC43XX is not set
+# CONFIG_ARCH_CHIP_NUC1XX is not set
+# CONFIG_ARCH_CHIP_SAMA5 is not set
+# CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
+# CONFIG_ARCH_CHIP_SAM34 is not set
+# CONFIG_ARCH_CHIP_SAMV7 is not set
+CONFIG_ARCH_CHIP_STM32=y
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
+# CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
+# CONFIG_ARCH_ARM7TDMI is not set
+# CONFIG_ARCH_ARM926EJS is not set
+# CONFIG_ARCH_ARM920T is not set
+# CONFIG_ARCH_CORTEXM0 is not set
+# CONFIG_ARCH_CORTEXM3 is not set
+CONFIG_ARCH_CORTEXM4=y
+# CONFIG_ARCH_CORTEXM7 is not set
+# CONFIG_ARCH_CORTEXA5 is not set
+# CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
+CONFIG_ARCH_FAMILY="armv7-m"
+CONFIG_ARCH_CHIP="stm32"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
+# CONFIG_ARMV7M_USEBASEPRI is not set
+CONFIG_ARCH_HAVE_CMNVECTOR=y
+# CONFIG_ARMV7M_CMNVECTOR is not set
+# CONFIG_ARMV7M_LAZYFPU is not set
+CONFIG_ARCH_HAVE_FPU=y
+# CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_FPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
+# CONFIG_ARM_MPU is not set
+
+#
+# ARMV7M Configuration Options
+#
+# CONFIG_ARMV7M_HAVE_ICACHE is not set
+# CONFIG_ARMV7M_HAVE_DCACHE is not set
+# CONFIG_ARMV7M_HAVE_ITCM is not set
+# CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARW is not set
+# CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
+# CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
+# CONFIG_ARMV7M_TOOLCHAIN_CODEREDW is not set
+# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW is not set
+# CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM is not set
+CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y
+# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW is not set
+# CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE is not set
+CONFIG_ARMV7M_HAVE_STACKCHECK=y
+# CONFIG_ARMV7M_STACKCHECK is not set
+# CONFIG_ARMV7M_ITMSYSLOG is not set
+# CONFIG_SERIAL_TERMIOS is not set
+
+#
+# STM32 Configuration Options
+#
+# CONFIG_ARCH_CHIP_STM32L151C6 is not set
+# CONFIG_ARCH_CHIP_STM32L151C8 is not set
+# CONFIG_ARCH_CHIP_STM32L151CB is not set
+# CONFIG_ARCH_CHIP_STM32L151R6 is not set
+# CONFIG_ARCH_CHIP_STM32L151R8 is not set
+# CONFIG_ARCH_CHIP_STM32L151RB is not set
+# CONFIG_ARCH_CHIP_STM32L151V6 is not set
+# CONFIG_ARCH_CHIP_STM32L151V8 is not set
+# CONFIG_ARCH_CHIP_STM32L151VB is not set
+# CONFIG_ARCH_CHIP_STM32L152C6 is not set
+# CONFIG_ARCH_CHIP_STM32L152C8 is not set
+# CONFIG_ARCH_CHIP_STM32L152CB is not set
+# CONFIG_ARCH_CHIP_STM32L152R6 is not set
+# CONFIG_ARCH_CHIP_STM32L152R8 is not set
+# CONFIG_ARCH_CHIP_STM32L152RB is not set
+# CONFIG_ARCH_CHIP_STM32L152V6 is not set
+# CONFIG_ARCH_CHIP_STM32L152V8 is not set
+# CONFIG_ARCH_CHIP_STM32L152VB is not set
+# CONFIG_ARCH_CHIP_STM32L162ZD is not set
+# CONFIG_ARCH_CHIP_STM32L162VE is not set
+# CONFIG_ARCH_CHIP_STM32F100C8 is not set
+# CONFIG_ARCH_CHIP_STM32F100CB is not set
+# CONFIG_ARCH_CHIP_STM32F100R8 is not set
+# CONFIG_ARCH_CHIP_STM32F100RB is not set
+# CONFIG_ARCH_CHIP_STM32F100RC is not set
+# CONFIG_ARCH_CHIP_STM32F100RD is not set
+# CONFIG_ARCH_CHIP_STM32F100RE is not set
+# CONFIG_ARCH_CHIP_STM32F100V8 is not set
+# CONFIG_ARCH_CHIP_STM32F100VB is not set
+# CONFIG_ARCH_CHIP_STM32F100VC is not set
+# CONFIG_ARCH_CHIP_STM32F100VD is not set
+# CONFIG_ARCH_CHIP_STM32F100VE is not set
+# CONFIG_ARCH_CHIP_STM32F102CB is not set
+# CONFIG_ARCH_CHIP_STM32F103T8 is not set
+# CONFIG_ARCH_CHIP_STM32F103TB is not set
+# CONFIG_ARCH_CHIP_STM32F103C4 is not set
+# CONFIG_ARCH_CHIP_STM32F103C8 is not set
+# CONFIG_ARCH_CHIP_STM32F103CB is not set
+# CONFIG_ARCH_CHIP_STM32F103R8 is not set
+# CONFIG_ARCH_CHIP_STM32F103RB is not set
+# CONFIG_ARCH_CHIP_STM32F103RC is not set
+# CONFIG_ARCH_CHIP_STM32F103RD is not set
+# CONFIG_ARCH_CHIP_STM32F103RE is not set
+# CONFIG_ARCH_CHIP_STM32F103RG is not set
+# CONFIG_ARCH_CHIP_STM32F103V8 is not set
+# CONFIG_ARCH_CHIP_STM32F103VB is not set
+# CONFIG_ARCH_CHIP_STM32F103VC is not set
+# CONFIG_ARCH_CHIP_STM32F103VE is not set
+# CONFIG_ARCH_CHIP_STM32F103ZE is not set
+# CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
+# CONFIG_ARCH_CHIP_STM32F107VC is not set
+# CONFIG_ARCH_CHIP_STM32F205RG is not set
+# CONFIG_ARCH_CHIP_STM32F207IG is not set
+# CONFIG_ARCH_CHIP_STM32F207ZE is not set
+# CONFIG_ARCH_CHIP_STM32F302K6 is not set
+# CONFIG_ARCH_CHIP_STM32F302K8 is not set
+# CONFIG_ARCH_CHIP_STM32F302CB is not set
+# CONFIG_ARCH_CHIP_STM32F302CC is not set
+# CONFIG_ARCH_CHIP_STM32F302RB is not set
+# CONFIG_ARCH_CHIP_STM32F302RC is not set
+# CONFIG_ARCH_CHIP_STM32F302VB is not set
+# CONFIG_ARCH_CHIP_STM32F302VC is not set
+# CONFIG_ARCH_CHIP_STM32F303K6 is not set
+# CONFIG_ARCH_CHIP_STM32F303K8 is not set
+# CONFIG_ARCH_CHIP_STM32F303C6 is not set
+# CONFIG_ARCH_CHIP_STM32F303C8 is not set
+# CONFIG_ARCH_CHIP_STM32F303CB is not set
+# CONFIG_ARCH_CHIP_STM32F303CC is not set
+# CONFIG_ARCH_CHIP_STM32F303RB is not set
+# CONFIG_ARCH_CHIP_STM32F303RC is not set
+# CONFIG_ARCH_CHIP_STM32F303RD is not set
+# CONFIG_ARCH_CHIP_STM32F303RE is not set
+# CONFIG_ARCH_CHIP_STM32F303VB is not set
+# CONFIG_ARCH_CHIP_STM32F303VC is not set
+# CONFIG_ARCH_CHIP_STM32F372C8 is not set
+# CONFIG_ARCH_CHIP_STM32F372R8 is not set
+# CONFIG_ARCH_CHIP_STM32F372V8 is not set
+# CONFIG_ARCH_CHIP_STM32F372CB is not set
+# CONFIG_ARCH_CHIP_STM32F372RB is not set
+# CONFIG_ARCH_CHIP_STM32F372VB is not set
+# CONFIG_ARCH_CHIP_STM32F372CC is not set
+# CONFIG_ARCH_CHIP_STM32F372RC is not set
+# CONFIG_ARCH_CHIP_STM32F372VC is not set
+# CONFIG_ARCH_CHIP_STM32F373C8 is not set
+# CONFIG_ARCH_CHIP_STM32F373R8 is not set
+# CONFIG_ARCH_CHIP_STM32F373V8 is not set
+# CONFIG_ARCH_CHIP_STM32F373CB is not set
+# CONFIG_ARCH_CHIP_STM32F373RB is not set
+# CONFIG_ARCH_CHIP_STM32F373VB is not set
+# CONFIG_ARCH_CHIP_STM32F373CC is not set
+# CONFIG_ARCH_CHIP_STM32F373RC is not set
+# CONFIG_ARCH_CHIP_STM32F373VC is not set
+# CONFIG_ARCH_CHIP_STM32F401RE is not set
+# CONFIG_ARCH_CHIP_STM32F411RE is not set
+# CONFIG_ARCH_CHIP_STM32F411VE is not set
+# CONFIG_ARCH_CHIP_STM32F405RG is not set
+# CONFIG_ARCH_CHIP_STM32F405VG is not set
+# CONFIG_ARCH_CHIP_STM32F405ZG is not set
+# CONFIG_ARCH_CHIP_STM32F407VE is not set
+# CONFIG_ARCH_CHIP_STM32F407VG is not set
+# CONFIG_ARCH_CHIP_STM32F407ZE is not set
+CONFIG_ARCH_CHIP_STM32F407ZG=y
+# CONFIG_ARCH_CHIP_STM32F407IE is not set
+# CONFIG_ARCH_CHIP_STM32F407IG is not set
+# CONFIG_ARCH_CHIP_STM32F427V is not set
+# CONFIG_ARCH_CHIP_STM32F427Z is not set
+# CONFIG_ARCH_CHIP_STM32F427I is not set
+# CONFIG_ARCH_CHIP_STM32F429V is not set
+# CONFIG_ARCH_CHIP_STM32F429Z is not set
+# CONFIG_ARCH_CHIP_STM32F429I is not set
+# CONFIG_ARCH_CHIP_STM32F429B is not set
+# CONFIG_ARCH_CHIP_STM32F429N is not set
+# CONFIG_ARCH_CHIP_STM32F446M is not set
+# CONFIG_ARCH_CHIP_STM32F446R is not set
+# CONFIG_ARCH_CHIP_STM32F446V is not set
+# CONFIG_ARCH_CHIP_STM32F446Z is not set
+# CONFIG_ARCH_CHIP_STM32F469A is not set
+# CONFIG_ARCH_CHIP_STM32F469I is not set
+# CONFIG_ARCH_CHIP_STM32F469B is not set
+# CONFIG_ARCH_CHIP_STM32F469N is not set
+CONFIG_STM32_FLASH_CONFIG_DEFAULT=y
+# CONFIG_STM32_FLASH_CONFIG_4 is not set
+# CONFIG_STM32_FLASH_CONFIG_6 is not set
+# CONFIG_STM32_FLASH_CONFIG_8 is not set
+# CONFIG_STM32_FLASH_CONFIG_B is not set
+# CONFIG_STM32_FLASH_CONFIG_C is not set
+# CONFIG_STM32_FLASH_CONFIG_D is not set
+# CONFIG_STM32_FLASH_CONFIG_E is not set
+# CONFIG_STM32_FLASH_CONFIG_F is not set
+# CONFIG_STM32_FLASH_CONFIG_G is not set
+# CONFIG_STM32_FLASH_CONFIG_I is not set
+# CONFIG_STM32_STM32L15XX is not set
+# CONFIG_STM32_ENERGYLITE is not set
+# CONFIG_STM32_STM32F10XX is not set
+# CONFIG_STM32_VALUELINE is not set
+# CONFIG_STM32_CONNECTIVITYLINE is not set
+# CONFIG_STM32_PERFORMANCELINE is not set
+# CONFIG_STM32_USBACCESSLINE is not set
+# CONFIG_STM32_HIGHDENSITY is not set
+# CONFIG_STM32_MEDIUMDENSITY is not set
+# CONFIG_STM32_LOWDENSITY is not set
+# CONFIG_STM32_STM32F20XX is not set
+# CONFIG_STM32_STM32F205 is not set
+# CONFIG_STM32_STM32F207 is not set
+# CONFIG_STM32_STM32F30XX is not set
+# CONFIG_STM32_STM32F302 is not set
+# CONFIG_STM32_STM32F303 is not set
+# CONFIG_STM32_STM32F37XX is not set
+CONFIG_STM32_STM32F40XX=y
+# CONFIG_STM32_STM32F401 is not set
+# CONFIG_STM32_STM32F411 is not set
+# CONFIG_STM32_STM32F405 is not set
+CONFIG_STM32_STM32F407=y
+# CONFIG_STM32_STM32F427 is not set
+# CONFIG_STM32_STM32F429 is not set
+# CONFIG_STM32_STM32F446 is not set
+# CONFIG_STM32_STM32F469 is not set
+# CONFIG_STM32_DFU is not set
+
+#
+# STM32 Peripheral Support
+#
+CONFIG_STM32_HAVE_CCM=y
+# CONFIG_STM32_HAVE_USBDEV is not set
+CONFIG_STM32_HAVE_OTGFS=y
+CONFIG_STM32_HAVE_FSMC=y
+# CONFIG_STM32_HAVE_LTDC is not set
+CONFIG_STM32_HAVE_USART3=y
+CONFIG_STM32_HAVE_UART4=y
+CONFIG_STM32_HAVE_UART5=y
+CONFIG_STM32_HAVE_USART6=y
+# CONFIG_STM32_HAVE_UART7 is not set
+# CONFIG_STM32_HAVE_UART8 is not set
+CONFIG_STM32_HAVE_TIM1=y
+CONFIG_STM32_HAVE_TIM2=y
+CONFIG_STM32_HAVE_TIM3=y
+CONFIG_STM32_HAVE_TIM4=y
+CONFIG_STM32_HAVE_TIM5=y
+CONFIG_STM32_HAVE_TIM6=y
+CONFIG_STM32_HAVE_TIM7=y
+CONFIG_STM32_HAVE_TIM8=y
+CONFIG_STM32_HAVE_TIM9=y
+CONFIG_STM32_HAVE_TIM10=y
+CONFIG_STM32_HAVE_TIM11=y
+CONFIG_STM32_HAVE_TIM12=y
+CONFIG_STM32_HAVE_TIM13=y
+CONFIG_STM32_HAVE_TIM14=y
+# CONFIG_STM32_HAVE_TIM15 is not set
+# CONFIG_STM32_HAVE_TIM16 is not set
+# CONFIG_STM32_HAVE_TIM17 is not set
+CONFIG_STM32_HAVE_ADC2=y
+CONFIG_STM32_HAVE_ADC3=y
+# CONFIG_STM32_HAVE_ADC4 is not set
+# CONFIG_STM32_HAVE_ADC1_DMA is not set
+# CONFIG_STM32_HAVE_ADC2_DMA is not set
+# CONFIG_STM32_HAVE_ADC3_DMA is not set
+# CONFIG_STM32_HAVE_ADC4_DMA is not set
+CONFIG_STM32_HAVE_CAN1=y
+CONFIG_STM32_HAVE_CAN2=y
+CONFIG_STM32_HAVE_DAC1=y
+CONFIG_STM32_HAVE_DAC2=y
+CONFIG_STM32_HAVE_RNG=y
+CONFIG_STM32_HAVE_ETHMAC=y
+CONFIG_STM32_HAVE_I2C2=y
+CONFIG_STM32_HAVE_I2C3=y
+CONFIG_STM32_HAVE_SPI2=y
+CONFIG_STM32_HAVE_SPI3=y
+# CONFIG_STM32_HAVE_SPI4 is not set
+# CONFIG_STM32_HAVE_SPI5 is not set
+# CONFIG_STM32_HAVE_SPI6 is not set
+# CONFIG_STM32_HAVE_SAIPLL is not set
+# CONFIG_STM32_HAVE_I2SPLL is not set
+# CONFIG_STM32_ADC1 is not set
+# CONFIG_STM32_ADC2 is not set
+# CONFIG_STM32_ADC3 is not set
+# CONFIG_STM32_BKPSRAM is not set
+# CONFIG_STM32_CAN1 is not set
+# CONFIG_STM32_CAN2 is not set
+# CONFIG_STM32_CCMDATARAM is not set
+# CONFIG_STM32_CRC is not set
+# CONFIG_STM32_CRYP is not set
+# CONFIG_STM32_DMA1 is not set
+# CONFIG_STM32_DMA2 is not set
+# CONFIG_STM32_DAC1 is not set
+# CONFIG_STM32_DAC2 is not set
+# CONFIG_STM32_DCMI is not set
+# CONFIG_STM32_ETHMAC is not set
+# CONFIG_STM32_FSMC is not set
+# CONFIG_STM32_HASH is not set
+# CONFIG_STM32_I2C1 is not set
+# CONFIG_STM32_I2C2 is not set
+# CONFIG_STM32_I2C3 is not set
+CONFIG_STM32_OTGFS=y
+# CONFIG_STM32_OTGHS is not set
+CONFIG_STM32_PWR=y
+# CONFIG_STM32_RNG is not set
+# CONFIG_STM32_SDIO is not set
+# CONFIG_STM32_SPI1 is not set
+# CONFIG_STM32_SPI2 is not set
+# CONFIG_STM32_SPI3 is not set
+CONFIG_STM32_SYSCFG=y
+# CONFIG_STM32_TIM1 is not set
+# CONFIG_STM32_TIM2 is not set
+# CONFIG_STM32_TIM3 is not set
+# CONFIG_STM32_TIM4 is not set
+# CONFIG_STM32_TIM5 is not set
+# CONFIG_STM32_TIM6 is not set
+# CONFIG_STM32_TIM7 is not set
+# CONFIG_STM32_TIM8 is not set
+# CONFIG_STM32_TIM9 is not set
+# CONFIG_STM32_TIM10 is not set
+# CONFIG_STM32_TIM11 is not set
+# CONFIG_STM32_TIM12 is not set
+# CONFIG_STM32_TIM13 is not set
+# CONFIG_STM32_TIM14 is not set
+# CONFIG_STM32_USART1 is not set
+CONFIG_STM32_USART2=y
+# CONFIG_STM32_USART3 is not set
+# CONFIG_STM32_UART4 is not set
+# CONFIG_STM32_UART5 is not set
+# CONFIG_STM32_USART6 is not set
+# CONFIG_STM32_IWDG is not set
+# CONFIG_STM32_WWDG is not set
+# CONFIG_STM32_SPI is not set
+# CONFIG_STM32_NOEXT_VECTORS is not set
+
+#
+# Alternate Pin Mapping
+#
+# CONFIG_STM32_FLASH_PREFETCH is not set
+# CONFIG_STM32_JTAG_DISABLE is not set
+# CONFIG_STM32_JTAG_FULL_ENABLE is not set
+# CONFIG_STM32_JTAG_NOJNTRST_ENABLE is not set
+CONFIG_STM32_JTAG_SW_ENABLE=y
+# CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG is not set
+# CONFIG_STM32_FORCEPOWER is not set
+# CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
+# CONFIG_STM32_CCMEXCLUDE is not set
+
+#
+# Timer Configuration
+#
+# CONFIG_STM32_TIM1_CAP is not set
+# CONFIG_STM32_TIM2_CAP is not set
+# CONFIG_STM32_TIM3_CAP is not set
+# CONFIG_STM32_TIM4_CAP is not set
+# CONFIG_STM32_TIM5_CAP is not set
+# CONFIG_STM32_TIM8_CAP is not set
+# CONFIG_STM32_TIM9_CAP is not set
+# CONFIG_STM32_TIM10_CAP is not set
+# CONFIG_STM32_TIM11_CAP is not set
+# CONFIG_STM32_TIM12_CAP is not set
+# CONFIG_STM32_TIM13_CAP is not set
+# CONFIG_STM32_TIM14_CAP is not set
+CONFIG_STM32_USART=y
+CONFIG_STM32_SERIALDRIVER=y
+
+#
+# U[S]ART Configuration
+#
+
+#
+# U[S]ART Device Configuration
+#
+CONFIG_STM32_USART2_SERIALDRIVER=y
+# CONFIG_STM32_USART2_1WIREDRIVER is not set
+# CONFIG_USART2_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
+# CONFIG_SERIAL_DISABLE_REORDERING is not set
+# CONFIG_STM32_FLOWCONTROL_BROKEN is not set
+# CONFIG_STM32_USART_BREAKS is not set
+# CONFIG_STM32_USART_SINGLEWIRE is not set
+
+#
+# SPI Configuration
+#
+# CONFIG_STM32_SPI_INTERRUPTS is not set
+# CONFIG_STM32_SPI_DMA is not set
+# CONFIG_STM32_HAVE_RTC_COUNTER is not set
+# CONFIG_STM32_HAVE_RTC_SUBSECONDS is not set
+
+#
+# USB FS Host Configuration
+#
+
+#
+# USB HS Host Configuration
+#
+
+#
+# USB Host Debug Configuration
+#
+
+#
+# USB Device Configuration
+#
+
+#
+# Architecture Options
+#
+# CONFIG_ARCH_NOINTC is not set
+# CONFIG_ARCH_VECNOTIRQ is not set
+# CONFIG_ARCH_DMA is not set
+CONFIG_ARCH_HAVE_IRQPRIO=y
+# CONFIG_ARCH_L2CACHE is not set
+# CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
+# CONFIG_ARCH_HAVE_ADDRENV is not set
+# CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
+CONFIG_ARCH_HAVE_VFORK=y
+# CONFIG_ARCH_HAVE_MMU is not set
+CONFIG_ARCH_HAVE_MPU=y
+# CONFIG_ARCH_NAND_HWECC is not set
+# CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
+# CONFIG_ARCH_USE_MPU is not set
+# CONFIG_ARCH_IRQPRIO is not set
+CONFIG_ARCH_STACKDUMP=y
+# CONFIG_ENDIAN_BIG is not set
+# CONFIG_ARCH_IDLE_CUSTOM is not set
+# CONFIG_ARCH_HAVE_RAMFUNCS is not set
+CONFIG_ARCH_HAVE_RAMVECTORS=y
+# CONFIG_ARCH_RAMVECTORS is not set
+
+#
+# Board Settings
+#
+CONFIG_BOARD_LOOPSPERMSEC=16717
+# CONFIG_ARCH_CALIBRATION is not set
+
+#
+# Interrupt options
+#
+CONFIG_ARCH_HAVE_INTERRUPTSTACK=y
+CONFIG_ARCH_INTERRUPTSTACK=0
+CONFIG_ARCH_HAVE_HIPRI_INTERRUPT=y
+# CONFIG_ARCH_HIPRI_INTERRUPT is not set
+
+#
+# Boot options
+#
+# CONFIG_BOOT_RUNFROMEXTSRAM is not set
+CONFIG_BOOT_RUNFROMFLASH=y
+# CONFIG_BOOT_RUNFROMISRAM is not set
+# CONFIG_BOOT_RUNFROMSDRAM is not set
+# CONFIG_BOOT_COPYTORAM is not set
+
+#
+# Boot Memory Configuration
+#
+CONFIG_RAM_START=0x20000000
+CONFIG_RAM_SIZE=114688
+# CONFIG_ARCH_HAVE_SDRAM is not set
+
+#
+# Board Selection
+#
+CONFIG_ARCH_BOARD_OLIMEX_STM32E407=y
+CONFIG_ARCH_BOARD="olimex-stm32-e407"
+
+#
+# Common Board Options
+#
+CONFIG_ARCH_HAVE_LEDS=y
+CONFIG_ARCH_LEDS=y
+CONFIG_ARCH_HAVE_BUTTONS=y
+CONFIG_ARCH_BUTTONS=y
+CONFIG_ARCH_HAVE_IRQBUTTONS=y
+# CONFIG_ARCH_IRQBUTTONS is not set
+CONFIG_NSH_MMCSDMINOR=0
+
+#
+# Board-Specific Options
+#
+# CONFIG_STM32F4DISBB is not set
+CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_RESET is not set
+# CONFIG_BOARDCTL_UNIQUEID is not set
+CONFIG_BOARDCTL_USBDEVCTRL=y
+# CONFIG_BOARDCTL_TSCTEST is not set
+# CONFIG_BOARDCTL_ADCTEST is not set
+# CONFIG_BOARDCTL_PWMTEST is not set
+# CONFIG_BOARDCTL_GRAPHICS is not set
+# CONFIG_BOARDCTL_IOCTL is not set
+
+#
+# RTOS Features
+#
+CONFIG_DISABLE_OS_API=y
+# CONFIG_DISABLE_POSIX_TIMERS is not set
+# CONFIG_DISABLE_PTHREAD is not set
+# CONFIG_DISABLE_SIGNALS is not set
+# CONFIG_DISABLE_MQUEUE is not set
+# CONFIG_DISABLE_ENVIRON is not set
+
+#
+# Clocks and Timers
+#
+CONFIG_USEC_PER_TICK=10000
+# CONFIG_SYSTEM_TIME64 is not set
+# CONFIG_CLOCK_MONOTONIC is not set
+# CONFIG_JULIAN_TIME is not set
+CONFIG_START_YEAR=2013
+CONFIG_START_MONTH=1
+CONFIG_START_DAY=27
+CONFIG_MAX_WDOGPARMS=2
+CONFIG_PREALLOC_WDOGS=8
+CONFIG_WDOG_INTRESERVE=1
+CONFIG_PREALLOC_TIMERS=4
+
+#
+# Tasks and Scheduling
+#
+# CONFIG_INIT_NONE is not set
+CONFIG_INIT_ENTRYPOINT=y
+# CONFIG_INIT_FILEPATH is not set
+CONFIG_USER_ENTRYPOINT="nsh_main"
+CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
+CONFIG_TASK_NAME_SIZE=31
+CONFIG_MAX_TASKS=16
+# CONFIG_SCHED_HAVE_PARENT is not set
+CONFIG_SCHED_WAITPID=y
+
+#
+# Pthread Options
+#
+# CONFIG_MUTEX_TYPES is not set
+CONFIG_NPTHREAD_KEYS=4
+
+#
+# Performance Monitoring
+#
+# CONFIG_SCHED_CPULOAD is not set
+# CONFIG_SCHED_INSTRUMENTATION is not set
+
+#
+# Files and I/O
+#
+# CONFIG_DEV_CONSOLE is not set
+# CONFIG_FDCLONE_DISABLE is not set
+# CONFIG_FDCLONE_STDIO is not set
+CONFIG_SDCLONE_DISABLE=y
+CONFIG_NFILE_DESCRIPTORS=8
+CONFIG_NFILE_STREAMS=8
+CONFIG_NAME_MAX=32
+# CONFIG_PRIORITY_INHERITANCE is not set
+
+#
+# RTOS hooks
+#
+# CONFIG_BOARD_INITIALIZE is not set
+# CONFIG_SCHED_STARTHOOK is not set
+# CONFIG_SCHED_ATEXIT is not set
+# CONFIG_SCHED_ONEXIT is not set
+
+#
+# Signal Numbers
+#
+CONFIG_SIG_SIGUSR1=1
+CONFIG_SIG_SIGUSR2=2
+CONFIG_SIG_SIGALARM=3
+CONFIG_SIG_SIGCONDTIMEDOUT=16
+
+#
+# POSIX Message Queue Options
+#
+CONFIG_PREALLOC_MQ_MSGS=4
+CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
+
+#
+# Work queue support
+#
+# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_SCHED_HPWORK is not set
+# CONFIG_SCHED_LPWORK is not set
+
+#
+# Stack and heap information
+#
+CONFIG_IDLETHREAD_STACKSIZE=2048
+CONFIG_USERMAIN_STACKSIZE=2048
+CONFIG_PTHREAD_STACK_MIN=256
+CONFIG_PTHREAD_STACK_DEFAULT=2048
+# CONFIG_LIB_SYSCALL is not set
+
+#
+# Device Drivers
+#
+CONFIG_DISABLE_POLL=y
+CONFIG_DEV_NULL=y
+# CONFIG_DEV_ZERO is not set
+# CONFIG_DEV_LOOP is not set
+
+#
+# Buffering
+#
+# CONFIG_DRVR_WRITEBUFFER is not set
+# CONFIG_DRVR_READAHEAD is not set
+# CONFIG_RAMDISK is not set
+# CONFIG_CAN is not set
+# CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
+# CONFIG_PWM is not set
+CONFIG_ARCH_HAVE_I2CRESET=y
+# CONFIG_I2C is not set
+CONFIG_SPI=y
+# CONFIG_SPI_SLAVE is not set
+CONFIG_SPI_EXCHANGE=y
+# CONFIG_SPI_CMDDATA is not set
+# CONFIG_SPI_CALLBACK is not set
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_HWFEATURES is not set
+# CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
+# CONFIG_I2S is not set
+
+#
+# Timer Driver Support
+#
+# CONFIG_TIMER is not set
+# CONFIG_RTC is not set
+# CONFIG_WATCHDOG is not set
+# CONFIG_ANALOG is not set
+# CONFIG_AUDIO_DEVICES is not set
+# CONFIG_VIDEO_DEVICES is not set
+# CONFIG_BCH is not set
+# CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
+
+#
+# LCD Driver Support
+#
+# CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
+# CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
+# CONFIG_MTD is not set
+# CONFIG_EEPROM is not set
+# CONFIG_PIPES is not set
+# CONFIG_PM is not set
+# CONFIG_POWER is not set
+# CONFIG_SENSORS is not set
+# CONFIG_SERCOMM_CONSOLE is not set
+CONFIG_SERIAL=y
+CONFIG_SERIAL_REMOVABLE=y
+# CONFIG_SERIAL_CONSOLE is not set
+# CONFIG_16550_UART is not set
+# CONFIG_UART_SERIALDRIVER is not set
+# CONFIG_UART0_SERIALDRIVER is not set
+# CONFIG_UART1_SERIALDRIVER is not set
+# CONFIG_UART2_SERIALDRIVER is not set
+# CONFIG_UART3_SERIALDRIVER is not set
+# CONFIG_UART4_SERIALDRIVER is not set
+# CONFIG_UART5_SERIALDRIVER is not set
+# CONFIG_UART6_SERIALDRIVER is not set
+# CONFIG_UART7_SERIALDRIVER is not set
+# CONFIG_UART8_SERIALDRIVER is not set
+# CONFIG_SCI0_SERIALDRIVER is not set
+# CONFIG_SCI1_SERIALDRIVER is not set
+# CONFIG_USART0_SERIALDRIVER is not set
+# CONFIG_USART1_SERIALDRIVER is not set
+CONFIG_USART2_SERIALDRIVER=y
+# CONFIG_USART3_SERIALDRIVER is not set
+# CONFIG_USART4_SERIALDRIVER is not set
+# CONFIG_USART5_SERIALDRIVER is not set
+# CONFIG_USART6_SERIALDRIVER is not set
+# CONFIG_USART7_SERIALDRIVER is not set
+# CONFIG_USART8_SERIALDRIVER is not set
+# CONFIG_OTHER_UART_SERIALDRIVER is not set
+CONFIG_MCU_SERIAL=y
+CONFIG_STANDARD_SERIAL=y
+# CONFIG_SERIAL_IFLOWCONTROL is not set
+# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
+CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
+# CONFIG_USART2_SERIAL_CONSOLE is not set
+# CONFIG_OTHER_SERIAL_CONSOLE is not set
+CONFIG_NO_SERIAL_CONSOLE=y
+
+#
+# USART2 Configuration
+#
+CONFIG_USART2_RXBUFSIZE=256
+CONFIG_USART2_TXBUFSIZE=256
+CONFIG_USART2_BAUD=115200
+CONFIG_USART2_BITS=8
+CONFIG_USART2_PARITY=0
+CONFIG_USART2_2STOP=0
+# CONFIG_USART2_IFLOWCONTROL is not set
+# CONFIG_USART2_OFLOWCONTROL is not set
+# CONFIG_USART2_DMA is not set
+CONFIG_USBDEV=y
+
+#
+# USB Device Controller Driver Options
+#
+# CONFIG_USBDEV_ISOCHRONOUS is not set
+# CONFIG_USBDEV_DUALSPEED is not set
+CONFIG_USBDEV_SELFPOWERED=y
+# CONFIG_USBDEV_BUSPOWERED is not set
+CONFIG_USBDEV_MAXPOWER=100
+# CONFIG_USBDEV_DMA is not set
+# CONFIG_ARCH_USBDEV_STALLQUEUE is not set
+# CONFIG_USBDEV_TRACE is not set
+
+#
+# USB Device Class Driver Options
+#
+# CONFIG_USBDEV_COMPOSITE is not set
+# CONFIG_PL2303 is not set
+CONFIG_CDCACM=y
+CONFIG_CDCACM_CONSOLE=y
+CONFIG_CDCACM_EP0MAXPACKET=64
+CONFIG_CDCACM_EPINTIN=1
+CONFIG_CDCACM_EPINTIN_FSSIZE=64
+CONFIG_CDCACM_EPINTIN_HSSIZE=64
+CONFIG_CDCACM_EPBULKOUT=3
+CONFIG_CDCACM_EPBULKOUT_FSSIZE=64
+CONFIG_CDCACM_EPBULKOUT_HSSIZE=512
+CONFIG_CDCACM_EPBULKIN=2
+CONFIG_CDCACM_EPBULKIN_FSSIZE=64
+CONFIG_CDCACM_EPBULKIN_HSSIZE=512
+CONFIG_CDCACM_NRDREQS=4
+CONFIG_CDCACM_NWRREQS=4
+CONFIG_CDCACM_BULKIN_REQLEN=96
+CONFIG_CDCACM_RXBUFSIZE=256
+CONFIG_CDCACM_TXBUFSIZE=256
+CONFIG_CDCACM_VENDORID=0x0525
+CONFIG_CDCACM_PRODUCTID=0xa4a7
+CONFIG_CDCACM_VENDORSTR="NuttX"
+CONFIG_CDCACM_PRODUCTSTR="CDC/ACM Serial"
+# CONFIG_USBMSC is not set
+# CONFIG_USBHOST is not set
+# CONFIG_DRIVERS_WIRELESS is not set
+
+#
+# System Logging
+#
+# CONFIG_ARCH_SYSLOG is not set
+# CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+# CONFIG_SYSLOG_SERIAL_CONSOLE is not set
+CONFIG_SYSLOG_CHAR=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+CONFIG_SYSLOG_CHAR_CRLF=y
+CONFIG_SYSLOG_DEVPATH="/dev/ttyS0"
+
+#
+# Networking Support
+#
+# CONFIG_ARCH_HAVE_NET is not set
+# CONFIG_ARCH_HAVE_PHY is not set
+# CONFIG_NET is not set
+
+#
+# Crypto API
+#
+# CONFIG_CRYPTO is not set
+
+#
+# File Systems
+#
+
+#
+# File system configuration
+#
+# CONFIG_DISABLE_MOUNTPOINT is not set
+# CONFIG_FS_AUTOMOUNTER is not set
+# CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
+CONFIG_FS_READABLE=y
+# CONFIG_FS_WRITABLE is not set
+# CONFIG_FS_NAMED_SEMAPHORES is not set
+CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
+# CONFIG_FS_RAMMAP is not set
+# CONFIG_FS_FAT is not set
+# CONFIG_FS_NXFFS is not set
+# CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
+# CONFIG_FS_SMARTFS is not set
+# CONFIG_FS_BINFS is not set
+CONFIG_FS_PROCFS=y
+# CONFIG_FS_PROCFS_REGISTER is not set
+
+#
+# Exclude individual procfs entries
+#
+# CONFIG_FS_PROCFS_EXCLUDE_PROCESS is not set
+# CONFIG_FS_PROCFS_EXCLUDE_UPTIME is not set
+# CONFIG_FS_PROCFS_EXCLUDE_MOUNTS is not set
+# CONFIG_FS_UNIONFS is not set
+
+#
+# Graphics Support
+#
+# CONFIG_NX is not set
+
+#
+# Memory Management
+#
+# CONFIG_MM_SMALL is not set
+CONFIG_MM_REGIONS=2
+# CONFIG_ARCH_HAVE_HEAP2 is not set
+# CONFIG_GRAN is not set
+
+#
+# Audio Support
+#
+# CONFIG_AUDIO is not set
+
+#
+# Wireless Support
+#
+
+#
+# Binary Loader
+#
+# CONFIG_BINFMT_DISABLE is not set
+# CONFIG_BINFMT_EXEPATH is not set
+# CONFIG_NXFLAT is not set
+# CONFIG_ELF is not set
+CONFIG_BUILTIN=y
+# CONFIG_PIC is not set
+# CONFIG_SYMTAB_ORDEREDBYNAME is not set
+
+#
+# Library Routines
+#
+
+#
+# Standard C Library Options
+#
+CONFIG_STDIO_BUFFER_SIZE=64
+CONFIG_STDIO_LINEBUFFER=y
+CONFIG_NUNGET_CHARS=2
+CONFIG_LIB_HOMEDIR="/"
+# CONFIG_LIBM is not set
+# CONFIG_NOPRINTF_FIELDWIDTH is not set
+# CONFIG_LIBC_FLOATINGPOINT is not set
+CONFIG_LIBC_LONG_LONG=y
+# CONFIG_LIBC_IOCTL_VARIADIC is not set
+CONFIG_LIB_RAND_ORDER=1
+# CONFIG_EOL_IS_CR is not set
+# CONFIG_EOL_IS_LF is not set
+# CONFIG_EOL_IS_BOTH_CRLF is not set
+CONFIG_EOL_IS_EITHER_CRLF=y
+# CONFIG_LIBC_EXECFUNCS is not set
+CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
+CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
+# CONFIG_LIBC_STRERROR is not set
+# CONFIG_LIBC_PERROR_STDOUT is not set
+CONFIG_ARCH_LOWPUTC=y
+# CONFIG_LIBC_LOCALTIME is not set
+# CONFIG_TIME_EXTENDED is not set
+CONFIG_LIB_SENDFILE_BUFSIZE=512
+# CONFIG_ARCH_ROMGETC is not set
+# CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
+
+#
+# Non-standard Library Support
+#
+# CONFIG_LIB_CRC64_FAST is not set
+# CONFIG_LIB_KBDCODEC is not set
+# CONFIG_LIB_SLCDCODEC is not set
+
+#
+# Basic CXX Support
+#
+# CONFIG_C99_BOOL8 is not set
+CONFIG_HAVE_CXX=y
+CONFIG_HAVE_CXXINITIALIZE=y
+# CONFIG_CXX_NEWLONG is not set
+
+#
+# uClibc++ Standard C++ Library
+#
+# CONFIG_UCLIBCXX is not set
+
+#
+# Application Configuration
+#
+
+#
+# Built-In Applications
+#
+CONFIG_BUILTIN_PROXY_STACKSIZE=1024
+
+#
+# CAN Utilities
+#
+
+#
+# Examples
+#
+# CONFIG_EXAMPLES_BUTTONS is not set
+# CONFIG_EXAMPLES_CHAT is not set
+# CONFIG_EXAMPLES_CONFIGDATA is not set
+# CONFIG_EXAMPLES_CPUHOG is not set
+# CONFIG_EXAMPLES_CXXTEST is not set
+# CONFIG_EXAMPLES_DHCPD is not set
+# CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FTPC is not set
+# CONFIG_EXAMPLES_FTPD is not set
+CONFIG_EXAMPLES_HELLO=y
+CONFIG_EXAMPLES_HELLOXX=y
+# CONFIG_EXAMPLES_HIDKBD is not set
+# CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
+# CONFIG_EXAMPLES_MM is not set
+# CONFIG_EXAMPLES_MODBUS is not set
+# CONFIG_EXAMPLES_MOUNT is not set
+# CONFIG_EXAMPLES_NRF24L01TERM is not set
+CONFIG_EXAMPLES_NSH=y
+CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+# CONFIG_EXAMPLES_NULL is not set
+# CONFIG_EXAMPLES_NX is not set
+# CONFIG_EXAMPLES_NXFFS is not set
+# CONFIG_EXAMPLES_NXHELLO is not set
+# CONFIG_EXAMPLES_NXIMAGE is not set
+# CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
+# CONFIG_EXAMPLES_NXTEXT is not set
+# CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
+# CONFIG_EXAMPLES_PIPE is not set
+# CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
+# CONFIG_EXAMPLES_RGMP is not set
+# CONFIG_EXAMPLES_SENDMAIL is not set
+# CONFIG_EXAMPLES_SERIALBLASTER is not set
+# CONFIG_EXAMPLES_SERIALRX is not set
+# CONFIG_EXAMPLES_SERLOOP is not set
+# CONFIG_EXAMPLES_SLCD is not set
+# CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
+# CONFIG_EXAMPLES_SMP is not set
+# CONFIG_EXAMPLES_TCPECHO is not set
+# CONFIG_EXAMPLES_TELNETD is not set
+# CONFIG_EXAMPLES_TIFF is not set
+# CONFIG_EXAMPLES_TOUCHSCREEN is not set
+# CONFIG_EXAMPLES_USBSERIAL is not set
+# CONFIG_EXAMPLES_USBTERM is not set
+# CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
+#
+# Graphics Support
+#
+# CONFIG_TIFF is not set
+# CONFIG_GRAPHICS_TRAVELER is not set
+
+#
+# Interpreters
+#
+# CONFIG_INTERPRETERS_BAS is not set
+# CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
+
+#
+# FreeModBus
+#
+# CONFIG_MODBUS is not set
+
+#
+# Network Utilities
+#
+# CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
+# CONFIG_NETUTILS_FTPC is not set
+# CONFIG_NETUTILS_JSON is not set
+# CONFIG_NETUTILS_SMTP is not set
+
+#
+# NSH Library
+#
+CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
+
+#
+# Command Line Configuration
+#
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
+CONFIG_NSH_LINELEN=64
+# CONFIG_NSH_DISABLE_SEMICOLON is not set
+CONFIG_NSH_CMDPARMS=y
+CONFIG_NSH_MAXARGUMENTS=6
+CONFIG_NSH_ARGCAT=y
+CONFIG_NSH_NESTDEPTH=3
+# CONFIG_NSH_DISABLEBG is not set
+CONFIG_NSH_BUILTIN_APPS=y
+
+#
+# Disable Individual commands
+#
+# CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
+# CONFIG_NSH_DISABLE_CAT is not set
+# CONFIG_NSH_DISABLE_CD is not set
+# CONFIG_NSH_DISABLE_CP is not set
+# CONFIG_NSH_DISABLE_CMP is not set
+CONFIG_NSH_DISABLE_DATE=y
+# CONFIG_NSH_DISABLE_DD is not set
+# CONFIG_NSH_DISABLE_DF is not set
+# CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
+# CONFIG_NSH_DISABLE_ECHO is not set
+# CONFIG_NSH_DISABLE_EXEC is not set
+# CONFIG_NSH_DISABLE_EXIT is not set
+# CONFIG_NSH_DISABLE_FREE is not set
+# CONFIG_NSH_DISABLE_GET is not set
+# CONFIG_NSH_DISABLE_HELP is not set
+# CONFIG_NSH_DISABLE_HEXDUMP is not set
+# CONFIG_NSH_DISABLE_IFCONFIG is not set
+# CONFIG_NSH_DISABLE_IFUPDOWN is not set
+# CONFIG_NSH_DISABLE_KILL is not set
+# CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
+# CONFIG_NSH_DISABLE_LS is not set
+# CONFIG_NSH_DISABLE_MB is not set
+# CONFIG_NSH_DISABLE_MKDIR is not set
+# CONFIG_NSH_DISABLE_MKFIFO is not set
+# CONFIG_NSH_DISABLE_MKRD is not set
+# CONFIG_NSH_DISABLE_MH is not set
+# CONFIG_NSH_DISABLE_MOUNT is not set
+# CONFIG_NSH_DISABLE_MV is not set
+# CONFIG_NSH_DISABLE_MW is not set
+# CONFIG_NSH_DISABLE_PS is not set
+# CONFIG_NSH_DISABLE_PUT is not set
+# CONFIG_NSH_DISABLE_PWD is not set
+# CONFIG_NSH_DISABLE_RM is not set
+# CONFIG_NSH_DISABLE_RMDIR is not set
+# CONFIG_NSH_DISABLE_SET is not set
+# CONFIG_NSH_DISABLE_SH is not set
+# CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
+# CONFIG_NSH_DISABLE_TEST is not set
+# CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
+# CONFIG_NSH_DISABLE_UNSET is not set
+# CONFIG_NSH_DISABLE_USLEEP is not set
+# CONFIG_NSH_DISABLE_WGET is not set
+# CONFIG_NSH_DISABLE_XD is not set
+
+#
+# Configure Command Options
+#
+CONFIG_NSH_CMDOPT_DF_H=y
+CONFIG_NSH_CODECS_BUFSIZE=128
+CONFIG_NSH_CMDOPT_HEXDUMP=y
+CONFIG_NSH_PROC_MOUNTPOINT="/proc"
+CONFIG_NSH_FILEIOSIZE=512
+
+#
+# Scripting Support
+#
+# CONFIG_NSH_DISABLESCRIPT is not set
+# CONFIG_NSH_DISABLE_ITEF is not set
+# CONFIG_NSH_DISABLE_LOOPS is not set
+
+#
+# Console Configuration
+#
+CONFIG_NSH_CONSOLE=y
+# CONFIG_NSH_USBCONSOLE is not set
+# CONFIG_NSH_ALTCONDEV is not set
+CONFIG_NSH_ARCHINIT=y
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
+
+#
+# NxWidgets/NxWM
+#
+
+#
+# Platform-specific Support
+#
+# CONFIG_PLATFORM_CONFIGDATA is not set
+
+#
+# System Libraries and NSH Add-Ons
+#
+# CONFIG_SYSTEM_CDCACM is not set
+# CONFIG_SYSTEM_CLE is not set
+# CONFIG_SYSTEM_CUTERM is not set
+# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_RAMTEST is not set
+CONFIG_READLINE_HAVE_EXTMATCH=y
+CONFIG_SYSTEM_READLINE=y
+CONFIG_READLINE_ECHO=y
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
+# CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
+# CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/olimex-stm32-e407/usbnsh/setenv.sh b/configs/olimex-stm32-e407/usbnsh/setenv.sh
new file mode 100755
index 0000000000..e5b5af7104
--- /dev/null
+++ b/configs/olimex-stm32-e407/usbnsh/setenv.sh
@@ -0,0 +1,80 @@
+#!/bin/bash
+# configs/olimex-stm32-e407/usbnsh/setenv.sh
+#
+#   Copyright (C) 2013 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.
+#
+
+if [ "$_" = "$0" ] ; then
+  echo "You must source this script, not run it!" 1>&2
+  exit 1
+fi
+
+WD=`pwd`
+if [ ! -x "setenv.sh" ]; then
+  echo "This script must be executed from the top-level NuttX build directory"
+  exit 1
+fi
+
+if [ -z "${PATH_ORIG}" ]; then
+  export PATH_ORIG="${PATH}"
+fi
+
+# This is the Cygwin path to the location where I installed the RIDE
+# toolchain under windows.  You will also have to edit this if you install
+# the RIDE toolchain in any other location
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
+
+# This is the Cygwin path to the location where I installed the CodeSourcery
+# toolchain under windows.  You will also have to edit this if you install
+# the CodeSourcery toolchain in any other location
+export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin"
+#export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin"
+
+# This is the location where I installed the ARM "GNU Tools for ARM Embedded Processors"
+# You can this free toolchain here https://launchpad.net/gcc-arm-embedded
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/GNU Tools ARM Embedded/4.9 2015q2/bin"
+
+# These are the Cygwin paths to the locations where I installed the Atollic
+# toolchain under windows.  You will also have to edit this if you install
+# the Atollic toolchain in any other location.  /usr/bin is added before
+# the Atollic bin path because there is are binaries named gcc.exe and g++.exe
+# at those locations as well.
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
+
+# This is the Cygwin path to the location where I build the buildroot
+# toolchain.
+#export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+
+# Add the path to the toolchain to the PATH varialble
+export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
+
+echo "PATH : ${PATH}"
-- 
GitLab


From 82bb42aa93be403421b484b3b5d5af38546c5f31 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 27 Jun 2016 07:43:32 -0600
Subject: [PATCH 056/229] Trivial changes from review of last PR

---
 arch/arm/src/stm32f7/chip/stm32_otg.h |  4 +-
 arch/arm/src/stm32f7/stm32_otg.h      |  3 +-
 arch/arm/src/stm32f7/stm32_otgdev.c   | 51 +++++++++++-----------
 arch/arm/src/stm32f7/stm32_otghost.c  | 61 +++++++++++++--------------
 4 files changed, 59 insertions(+), 60 deletions(-)

diff --git a/arch/arm/src/stm32f7/chip/stm32_otg.h b/arch/arm/src/stm32f7/chip/stm32_otg.h
index 474d063026..874dd26563 100644
--- a/arch/arm/src/stm32f7/chip/stm32_otg.h
+++ b/arch/arm/src/stm32f7/chip/stm32_otg.h
@@ -1,7 +1,7 @@
 /****************************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32f_otgfs.h
+ * arch/arm/src/stm32f7/chip/stm32f_otg.h
  *
- *   Copyright (C) 2012, 2014-2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012, 2014-2016 Gregory Nutt. All rights reserved.
  *   Copyright (C) 2016 Omni Hoverboards Inc. All rights reserved.
  *   Author: Gregory Nutt 
  *           Paul Alexander Patience 
diff --git a/arch/arm/src/stm32f7/stm32_otg.h b/arch/arm/src/stm32f7/stm32_otg.h
index 3c60683ea3..7eba65a61b 100644
--- a/arch/arm/src/stm32f7/stm32_otg.h
+++ b/arch/arm/src/stm32f7/stm32_otg.h
@@ -1,7 +1,7 @@
 /************************************************************************************
  * arch/arm/src/stm32f7/stm32_otg.h
  *
- *   Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012-2013, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -146,4 +146,3 @@ void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume);
 #endif /* __ASSEMBLY__ */
 #endif /* CONFIG_STM32F7_OTGFS */
 #endif /* __ARCH_ARM_SRC_STM32F7_STM32_OTG_H */
-
diff --git a/arch/arm/src/stm32f7/stm32_otgdev.c b/arch/arm/src/stm32f7/stm32_otgdev.c
index 7b9db010ad..f2f8289042 100644
--- a/arch/arm/src/stm32f7/stm32_otgdev.c
+++ b/arch/arm/src/stm32f7/stm32_otgdev.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * arch/arm/src/stm32f7/stm32_otgdev.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
@@ -63,12 +63,14 @@
 #include "up_internal.h"
 
 
-#if defined(CONFIG_USBDEV) && (defined(CONFIG_STM32F7_OTGFS) || defined(CONFIG_STM32F7_OTGHS))
+#if defined(CONFIG_USBDEV) && (defined(CONFIG_STM32F7_OTGFS) || \
+    defined(CONFIG_STM32F7_OTGHS))
 
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
-/* Configuration ***************************************************************/
+
+/* Configuration ************************************************************/
 
 #ifndef CONFIG_USBDEV_EP0_MAXSIZE
 #  define CONFIG_USBDEV_EP0_MAXSIZE 64
@@ -164,7 +166,6 @@
 #  define CONFIG_USBDEV_EP8_TXFIFO_SIZE 0
 #endif
 
-
 /* The actual FIFO addresses that we use must be aligned to 4-byte boundaries;
  * FIFO sizes must be provided in units of 32-bit words.
  */
@@ -202,8 +203,8 @@
 
 #if (STM32_RXFIFO_BYTES + \
      STM32_EP0_TXFIFO_BYTES + STM32_EP1_TXFIFO_BYTES + STM32_EP2_TXFIFO_BYTES + STM32_EP3_TXFIFO_BYTES + \
-	 STM32_EP4_TXFIFO_BYTES + STM32_EP5_TXFIFO_BYTES + STM32_EP6_TXFIFO_BYTES + STM32_EP7_TXFIFO_BYTES + CONFIG_USBDEV_EP8_TXFIFO_SIZE   \
-	) > STM32_OTG_FIFO_SIZE
+     STM32_EP4_TXFIFO_BYTES + STM32_EP5_TXFIFO_BYTES + STM32_EP6_TXFIFO_BYTES + STM32_EP7_TXFIFO_BYTES + CONFIG_USBDEV_EP8_TXFIFO_SIZE   \
+    ) > STM32_OTG_FIFO_SIZE
 #  error "FIFO allocations exceed FIFO memory size"
 #endif
 
@@ -295,7 +296,6 @@
 
 /* Endpoints ******************************************************************/
 
-
 /* Odd physical endpoint numbers are IN; even are OUT */
 
 #define STM32_EPPHYIN2LOG(epphy)     ((uint8_t)(epphy)|USB_DIR_IN)
@@ -527,7 +527,7 @@ struct stm32_usbdev_s
  * Private Function Prototypes
  ****************************************************************************/
 
-/* Register operations ********************************************************/
+/* Register operations ******************************************************/
 
 #if defined(CONFIG_STM32F7_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_FEATURES)
 static uint32_t    stm32_getreg(uint32_t addr);
@@ -537,13 +537,13 @@ static void        stm32_putreg(uint32_t val, uint32_t addr);
 # define stm32_putreg(val,addr) putreg32(val,addr)
 #endif
 
-/* Request queue operations ****************************************************/
+/* Request queue operations **************************************************/
 
 static FAR struct stm32_req_s *stm32_req_remfirst(FAR struct stm32_ep_s *privep);
 static bool       stm32_req_addlast(FAR struct stm32_ep_s *privep,
                     FAR struct stm32_req_s *req);
 
-/* Low level data transfers and request operations *****************************/
+/* Low level data transfers and request operations ***************************/
 /* Special endpoint 0 data transfer logic */
 
 static void        stm32_ep0in_setupresponse(FAR struct stm32_usbdev_s *priv,
@@ -582,7 +582,7 @@ static void        stm32_req_complete(FAR struct stm32_ep_s *privep,
 static void        stm32_req_cancel(FAR struct stm32_ep_s *privep,
                      int16_t status);
 
-/* Interrupt handling **********************************************************/
+/* Interrupt handling ********************************************************/
 
 static struct      stm32_ep_s *stm32_ep_findbyaddr(struct stm32_usbdev_s *priv,
                      uint16_t eplog);
@@ -605,7 +605,8 @@ static inline void stm32_epout_interrupt(FAR struct stm32_usbdev_s *priv);
 
 static inline void stm32_epin_runtestmode(FAR struct stm32_usbdev_s *priv);
 static inline void stm32_epin(FAR struct stm32_usbdev_s *priv, uint8_t epno);
-static inline void stm32_epin_txfifoempty(FAR struct stm32_usbdev_s *priv, int epno);
+static inline void stm32_epin_txfifoempty(FAR struct stm32_usbdev_s *priv,
+                     int epno);
 static inline void stm32_epin_interrupt(FAR struct stm32_usbdev_s *priv);
 
 /* Other second level interrupt processing */
@@ -658,8 +659,10 @@ static void        stm32_ep_freereq(FAR struct usbdev_ep_s *ep,
 /* Endpoint buffer management */
 
 #ifdef CONFIG_USBDEV_DMA
-static void       *stm32_ep_allocbuffer(FAR struct usbdev_ep_s *ep, unsigned bytes);
-static void        stm32_ep_freebuffer(FAR struct usbdev_ep_s *ep, FAR void *buf);
+static void       *stm32_ep_allocbuffer(FAR struct usbdev_ep_s *ep,
+                     unsigned bytes);
+static void        stm32_ep_freebuffer(FAR struct usbdev_ep_s *ep,
+                     FAR void *buf);
 #endif
 
 /* Endpoint request submission */
@@ -707,6 +710,7 @@ static void        stm32_hwinitialize(FAR struct stm32_usbdev_s *priv);
 /****************************************************************************
  * Private Data
  ****************************************************************************/
+
 /* Since there is only a single USB interface, all status information can be
  * be simply retained in a single global instance.
  */
@@ -833,10 +837,6 @@ const struct trace_msg_t g_usb_trace_strings_intdecode[] =
 };
 #endif
 
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -975,6 +975,7 @@ static bool stm32_req_addlast(FAR struct stm32_ep_s *privep,
       privep->tail->flink = req;
       privep->tail        = req;
     }
+
   return is_empty;
 }
 
@@ -3822,8 +3823,8 @@ static void stm32_disablegonak(FAR struct stm32_ep_s *privep)
  *
  ****************************************************************************/
 
-static int stm32_epout_configure(FAR struct stm32_ep_s *privep, uint8_t eptype,
-                                 uint16_t maxpacket)
+static int stm32_epout_configure(FAR struct stm32_ep_s *privep,
+                                 uint8_t eptype, uint16_t maxpacket)
 {
   uint32_t mpsiz;
   uint32_t regaddr;
@@ -3917,8 +3918,8 @@ static int stm32_epout_configure(FAR struct stm32_ep_s *privep, uint8_t eptype,
  *
  ****************************************************************************/
 
-static int stm32_epin_configure(FAR struct stm32_ep_s *privep, uint8_t eptype,
-                                uint16_t maxpacket)
+static int stm32_epin_configure(FAR struct stm32_ep_s *privep,
+                                uint8_t eptype, uint16_t maxpacket)
 {
   uint32_t mpsiz;
   uint32_t regaddr;
@@ -3979,7 +3980,8 @@ static int stm32_epin_configure(FAR struct stm32_ep_s *privep, uint8_t eptype,
           regval |= OTG_DIEPCTL_CNAK;
         }
 
-      regval &= ~(OTG_DIEPCTL_MPSIZ_MASK | OTG_DIEPCTL_EPTYP_MASK | OTG_DIEPCTL_TXFNUM_MASK);
+      regval &= ~(OTG_DIEPCTL_MPSIZ_MASK | OTG_DIEPCTL_EPTYP_MASK |
+                  OTG_DIEPCTL_TXFNUM_MASK);
       regval |= mpsiz;
       regval |= (eptype << OTG_DIEPCTL_EPTYP_SHIFT);
       regval |= (eptype << OTG_DIEPCTL_TXFNUM_SHIFT);
@@ -5493,7 +5495,8 @@ void up_usbinitialize(void)
   /* At present, there is only a single OTG device support. Hence it is
    * pre-allocated as g_otghsdev.  However, in most code, the private data
    * structure will be referenced using the 'priv' pointer (rather than the
-   * global data) in order to simplify any future support for multiple devices.
+   * global data) in order to simplify any future support for multiple
+   * devices.
    */
 
   FAR struct stm32_usbdev_s *priv = &g_otghsdev;
diff --git a/arch/arm/src/stm32f7/stm32_otghost.c b/arch/arm/src/stm32f7/stm32_otghost.c
index 0feb6c98da..c6f25c6769 100644
--- a/arch/arm/src/stm32f7/stm32_otghost.c
+++ b/arch/arm/src/stm32f7/stm32_otghost.c
@@ -72,7 +72,8 @@
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
-/* Configuration ***************************************************************/
+
+/* Configuration ************************************************************/
 /* STM32 USB OTG FS Host Driver Support
  *
  * Pre-requisites
@@ -135,7 +136,7 @@
 #  undef CONFIG_STM32F7_USBHOST_PKTDUMP
 #endif
 
-/* HCD Setup *******************************************************************/
+/* HCD Setup ****************************************************************/
 /* Hardware capabilities */
 
 #define STM32_NHOST_CHANNELS      8   /* Number of host channels */
@@ -146,7 +147,7 @@
 #define STM32_MAX_PKTCOUNT        256 /* Max packet count */
 #define STM32_RETRY_COUNT         3   /* Number of ctrl transfer retries */
 
-/* Delays **********************************************************************/
+/* Delays *******************************************************************/
 
 #define STM32_READY_DELAY         200000 /* In loop counts */
 #define STM32_FLUSH_DELAY         200000 /* In loop counts */
@@ -281,7 +282,7 @@ struct stm32_usbhost_s
  * Private Function Prototypes
  ****************************************************************************/
 
-/* Register operations ********************************************************/
+/* Register operations ******************************************************/
 
 #ifdef CONFIG_STM32F7_USBHOST_REGDEBUG
 static void stm32_printreg(uint32_t addr, uint32_t val, bool iswrite);
@@ -302,16 +303,16 @@ static inline void stm32_modifyreg(uint32_t addr, uint32_t clrbits,
 #  define stm32_pktdump(m,b,n)
 #endif
 
-/* Semaphores ******************************************************************/
+/* Semaphores ***************************************************************/
 
 static void stm32_takesem(sem_t *sem);
 #define stm32_givesem(s) sem_post(s);
 
-/* Byte stream access helper functions *****************************************/
+/* Byte stream access helper functions **************************************/
 
 static inline uint16_t stm32_getle16(const uint8_t *val);
 
-/* Channel management **********************************************************/
+/* Channel management *******************************************************/
 
 static int stm32_chan_alloc(FAR struct stm32_usbhost_s *priv);
 static inline void stm32_chan_free(FAR struct stm32_usbhost_s *priv, int chidx);
@@ -340,7 +341,7 @@ static int stm32_xfrep_alloc(FAR struct stm32_usbhost_s *priv,
                               FAR const struct usbhost_epdesc_s *epdesc,
                               FAR usbhost_ep_t *ep);
 
-/* Control/data transfer logic *************************************************/
+/* Control/data transfer logic **********************************************/
 
 static void stm32_transfer_start(FAR struct stm32_usbhost_s *priv, int chidx);
 #if 0 /* Not used */
@@ -376,7 +377,7 @@ static int stm32_out_asynch(FAR struct stm32_usbhost_s *priv, int chidx,
                             usbhost_asynch_t callback, FAR void *arg);
 #endif
 
-/* Interrupt handling **********************************************************/
+/* Interrupt handling *******************************************************/
 /* Lower level interrupt handlers */
 
 static void stm32_gint_wrpacket(FAR struct stm32_usbhost_s *priv,
@@ -412,7 +413,7 @@ static void stm32_gint_disable(void);
 static inline void stm32_hostinit_enable(void);
 static void stm32_txfe_enable(FAR struct stm32_usbhost_s *priv, int chidx);
 
-/* USB host controller operations **********************************************/
+/* USB host controller operations *******************************************/
 
 static int stm32_wait(FAR struct usbhost_connection_s *conn,
                       FAR struct usbhost_hubport_s **hport);
@@ -457,7 +458,7 @@ static int stm32_connect(FAR struct usbhost_driver_s *drvr,
 static void stm32_disconnect(FAR struct usbhost_driver_s *drvr,
                              FAR struct usbhost_hubport_s *hport);
 
-/* Initialization **************************************************************/
+/* Initialization ***********************************************************/
 
 static void stm32_portreset(FAR struct stm32_usbhost_s *priv);
 static void stm32_flush_txfifos(uint32_t txfnum);
@@ -487,10 +488,6 @@ static struct usbhost_connection_s g_usbconn =
   .enumerate        = stm32_enumerate,
 };
 
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -625,7 +622,8 @@ static void stm32_putreg(uint32_t addr, uint32_t val)
  *
  ****************************************************************************/
 
-static inline void stm32_modifyreg(uint32_t addr, uint32_t clrbits, uint32_t setbits)
+static inline void stm32_modifyreg(uint32_t addr, uint32_t clrbits,
+                                   uint32_t setbits)
 {
   stm32_putreg(addr, (((stm32_getreg(addr)) & ~clrbits) | setbits));
 }
@@ -987,10 +985,10 @@ static void stm32_chan_halt(FAR struct stm32_usbhost_s *priv, int chidx,
  * Name: stm32_chan_waitsetup
  *
  * Description:
- *   Set the request for the transfer complete event well BEFORE enabling the
- *   transfer (as soon as we are absolutely committed to the to avoid transfer).
- *   We do this to minimize race conditions.  This logic would have to be expanded
- *   if we want to have more than one packet in flight at a time!
+ *   Set the request for the transfer complete event well BEFORE enabling
+ *   the transfer (as soon as we are absolutely committed to the transfer).
+ *   We do this to minimize race conditions.  This logic would have to be
+ *   expanded if we want to have more than one packet in flight at a time!
  *
  * Assumptions:
  *   Called from a normal thread context BEFORE the transfer has been started.
@@ -1082,9 +1080,9 @@ static int stm32_chan_wait(FAR struct stm32_usbhost_s *priv,
   int ret;
 
   /* Disable interrupts so that the following operations will be atomic.  On
-   * the OTG FS global interrupt needs to be disabled.  However, here we disable
-   * all interrupts to exploit that fact that interrupts will be re-enabled
-   * while we wait.
+   * the OTG FS global interrupt needs to be disabled.  However, here we
+   * disable all interrupts to exploit that fact that interrupts will be re-
+   * enabled while we wait.
    */
 
   flags = enter_critical_section();
@@ -1256,8 +1254,8 @@ static int stm32_ctrlchan_alloc(FAR struct stm32_usbhost_s *priv,
  *      allocated endpoint descriptor.
  *
  * Returned Values:
- *   On success, zero (OK) is returned. On a failure, a negated errno value is
- *   returned indicating the nature of the failure
+ *   On success, zero (OK) is returned. On a failure, a negated errno value
+ *   is returned indicating the nature of the failure
  *
  * Assumptions:
  *   This function will *not* be called from an interrupt handler.
@@ -1305,7 +1303,7 @@ static int stm32_ctrlep_alloc(FAR struct stm32_usbhost_s *priv,
   return OK;
 }
 
-/************************************************************************************
+/****************************************************************************
  * Name: stm32_xfrep_alloc
  *
  * Description:
@@ -1318,13 +1316,13 @@ static int stm32_ctrlep_alloc(FAR struct stm32_usbhost_s *priv,
  *      allocated endpoint descriptor.
  *
  * Returned Values:
- *   On success, zero (OK) is returned. On a failure, a negated errno value is
- *   returned indicating the nature of the failure
+ *   On success, zero (OK) is returned. On a failure, a negated errno value
+ *   is returned indicating the nature of the failure
  *
  * Assumptions:
  *   This function will *not* be called from an interrupt handler.
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 static int stm32_xfrep_alloc(FAR struct stm32_usbhost_s *priv,
                               FAR const struct usbhost_epdesc_s *epdesc,
@@ -2500,8 +2498,8 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv,
         }
       else if (chan->chreason == CHREASON_NAK)
         {
-          /* Halt on NAK only happens on an INTR channel.  Fetch the HCCHAR register
-           * and check for an interrupt endpoint.
+          /* Halt on NAK only happens on an INTR channel.  Fetch the HCCHAR
+           * register and check for an interrupt endpoint.
            */
 
           regval = stm32_getreg(STM32_OTG_HCCHAR(chidx));
@@ -3466,7 +3464,6 @@ static int stm32_gint_isr(int irq, FAR void *context)
         }
 
       /* Otherwise, process each pending, unmasked GINT interrupts */
-
       /* Handle the start of frame interrupt */
 
 #ifdef CONFIG_STM32F7_OTG_SOFINTR
-- 
GitLab


From 43d73012553084ffcc8092549a8c832854ddd7c6 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 27 Jun 2016 08:00:01 -0600
Subject: [PATCH 057/229] Trivial changes from review of last PR

---
 configs/olimex-stm32-e407/nsh/Make.defs       |  3 +-
 configs/olimex-stm32-e407/scripts/ld.script   |  2 +-
 .../olimex-stm32-e407/src/olimex-stm32-e407.h | 29 ++++++------
 configs/olimex-stm32-e407/src/stm32_appinit.c |  1 -
 .../olimex-stm32-e407/src/stm32_autoleds.c    |  4 --
 configs/olimex-stm32-e407/src/stm32_boot.c    |  2 -
 configs/olimex-stm32-e407/src/stm32_buttons.c | 47 ++++++++++---------
 configs/olimex-stm32-e407/src/stm32_can.c     |  4 +-
 configs/olimex-stm32-e407/src/stm32_usb.c     |  2 +-
 configs/olimex-stm32-h407/scripts/ld.script   |  2 +-
 configs/olimex-stm32-h407/src/stm32_buttons.c | 38 +++++++--------
 configs/olimex-stm32-h407/src/stm32_can.c     |  4 +-
 12 files changed, 65 insertions(+), 73 deletions(-)

diff --git a/configs/olimex-stm32-e407/nsh/Make.defs b/configs/olimex-stm32-e407/nsh/Make.defs
index 0e26b1cf37..5b53bc4e2a 100644
--- a/configs/olimex-stm32-e407/nsh/Make.defs
+++ b/configs/olimex-stm32-e407/nsh/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/olimex-stm32-e407/nsh/Make.defs
 #
-#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011-2012, 2016 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt 
 #
 # Redistribution and use in source and binary forms, with or without
@@ -110,4 +110,3 @@ HOSTCC = gcc
 HOSTINCLUDES = -I.
 HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe
 HOSTLDFLAGS =
-
diff --git a/configs/olimex-stm32-e407/scripts/ld.script b/configs/olimex-stm32-e407/scripts/ld.script
index 8cb28bca07..d24be46787 100644
--- a/configs/olimex-stm32-e407/scripts/ld.script
+++ b/configs/olimex-stm32-e407/scripts/ld.script
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/olimex-stm32-h405/scripts/ld.script
+ * configs/olimex-stm32-e407/scripts/ld.script
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
diff --git a/configs/olimex-stm32-e407/src/olimex-stm32-e407.h b/configs/olimex-stm32-e407/src/olimex-stm32-e407.h
index da817eddd4..2c4a751abd 100644
--- a/configs/olimex-stm32-e407/src/olimex-stm32-e407.h
+++ b/configs/olimex-stm32-e407/src/olimex-stm32-e407.h
@@ -162,7 +162,6 @@
                            GPIO_PUSHPULL|GPIO_PORTB|GPIO_PIN1)
 #endif
 
-
 /* USB OTG HS - miniUSB connector
  *
  * PB13  OTG_HS_VBUS VBUS sensing (also connected to the green LED)
@@ -180,28 +179,28 @@
 #  define GPIO_OTGHS_OVER  (GPIO_INPUT|GPIO_FLOAT|GPIO_SPEED_100MHz|GPIO_PUSHPULL|GPIO_PORTF|GPIO_PIN11)
 #endif
 
-/****************************************************************************************************
+/****************************************************************************
  * Public Types
- ****************************************************************************************************/
+ ****************************************************************************/
 
-/****************************************************************************************************
+/****************************************************************************
  * Public data
- ****************************************************************************************************/
+ ****************************************************************************/
 
 #ifndef __ASSEMBLY__
 
-/************************************************************************************
+/****************************************************************************
  * Public Functions
- ************************************************************************************/
+ ****************************************************************************/
 
-/************************************************************************************
+/****************************************************************************
  * Name: stm32_usbinitialize
  *
  * Description:
- *   Called from stm32_usbinitialize very early in initialization to setup USB-related
- *   GPIO pins for the Olimex-STM32-H405 board.
+ *   Called from stm32_usbinitialize very early in initialization to setup
+ *   USB-related GPIO pins for the Olimex-STM32-H405 board.
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 #if defined(CONFIG_STM32_OTGFS) || defined(CONFIG_STM32_OTGHS)
 void weak_function stm32_usbinitialize(void);
@@ -219,25 +218,25 @@ void weak_function stm32_usbinitialize(void);
 int stm32_sdio_initialize(void);
 #endif
 
-/************************************************************************************
+/****************************************************************************
  * Name: stm32_adc_initialize
  *
  * Description:
  *   Called at application startup time to initialize the ADC functionality.
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 #ifdef CONFIG_ADC
 int stm32_adc_initialize(void);
 #endif
 
-/************************************************************************************
+/****************************************************************************
  * Name: stm32_can_initialize
  *
  * Description:
  *   Called at application startup time to initialize the CAN functionality.
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 #if defined(CONFIG_CAN) && (defined(CONFIG_STM32_CAN1) || defined(CONFIG_STM32_CAN2))
 int stm32_can_initialize(void);
diff --git a/configs/olimex-stm32-e407/src/stm32_appinit.c b/configs/olimex-stm32-e407/src/stm32_appinit.c
index 7707fa4c07..40a0cbf7ed 100644
--- a/configs/olimex-stm32-e407/src/stm32_appinit.c
+++ b/configs/olimex-stm32-e407/src/stm32_appinit.c
@@ -159,7 +159,6 @@ static void stm32_i2ctool(void)
 #  define stm32_i2ctool()
 #endif
 
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
diff --git a/configs/olimex-stm32-e407/src/stm32_autoleds.c b/configs/olimex-stm32-e407/src/stm32_autoleds.c
index 7704300f67..0b46a0e677 100644
--- a/configs/olimex-stm32-e407/src/stm32_autoleds.c
+++ b/configs/olimex-stm32-e407/src/stm32_autoleds.c
@@ -54,10 +54,6 @@
 
 #ifdef CONFIG_ARCH_LEDS
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
diff --git a/configs/olimex-stm32-e407/src/stm32_boot.c b/configs/olimex-stm32-e407/src/stm32_boot.c
index 8cbc66ef09..cad3479aa1 100644
--- a/configs/olimex-stm32-e407/src/stm32_boot.c
+++ b/configs/olimex-stm32-e407/src/stm32_boot.c
@@ -91,8 +91,6 @@ void stm32_boardinitialize(void)
 
   board_button_initialize();
 #endif
-
-
 }
 
 /****************************************************************************
diff --git a/configs/olimex-stm32-e407/src/stm32_buttons.c b/configs/olimex-stm32-e407/src/stm32_buttons.c
index b857a76802..951df8ef1c 100644
--- a/configs/olimex-stm32-e407/src/stm32_buttons.c
+++ b/configs/olimex-stm32-e407/src/stm32_buttons.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/olimex-stm32-e407/src/stm32_buttons.c
  *
- *   Copyright (C) 2014-2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2014-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -53,8 +53,8 @@
  * Private Functions
  ****************************************************************************/
 
-/* Pin configuration for each Olimex-STM32-H405 button.  This array is indexed by
- * the BUTTON_* definitions in board.h
+/* Pin configuration for each Olimex-STM32-H405 button.  This array is
+ * indexed by the BUTTON_* definitions in board.h
  */
 
 static const uint32_t g_buttons[NUM_BUTTONS] =
@@ -70,10 +70,10 @@ static const uint32_t g_buttons[NUM_BUTTONS] =
  * Name: board_button_initialize
  *
  * Description:
- *   board_button_initialize() must be called to initialize button resources.  After
- *   that, board_buttons() may be called to collect the current state of all
- *   buttons or board_button_irq() may be called to register button interrupt
- *   handlers.
+ *   board_button_initialize() must be called to initialize button resources.
+ *   After that, board_buttons() may be called to collect the current state
+ *   of all buttons or board_button_irq() may be called to register button
+ *   interrupt handlers.
  *
  ****************************************************************************/
 
@@ -109,28 +109,28 @@ uint8_t board_buttons(void)
   return ret;
 }
 
-/************************************************************************************
+/****************************************************************************
  * Button support.
  *
  * Description:
- *   board_button_initialize() must be called to initialize button resources.  After
- *   that, board_buttons() may be called to collect the current state of all
- *   buttons or board_button_irq() may be called to register button interrupt
- *   handlers.
+ *   board_button_initialize() must be called to initialize button resources.
+ *   After that, board_buttons() may be called to collect the current state
+ *   of all buttons or board_button_irq() may be called to register button
+ *   interrupt handlers.
  *
- *   After board_button_initialize() has been called, board_buttons() may be called to
- *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
- *   with each bit associated with a button.  See the BUTTON_*_BIT
+ *   After board_button_initialize() has been called, board_buttons() may be
+ *   called to collect the state of all buttons.  board_buttons() returns an
+ *   8-bit bit set with each bit associated with a button.  See the BUTTON_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
- *   board_button_irq() may be called to register an interrupt handler that will
- *   be called when a button is depressed or released.  The ID value is a
- *   button enumeration value that uniquely identifies a button resource. See the
- *   BUTTON_* definitions in board.h for the meaning of enumeration
- *   value.  The previous interrupt handler address is returned (so that it may
- *   restored, if so desired).
+ *   board_button_irq() may be called to register an interrupt handler that
+ *   will be called when a button is depressed or released.  The ID value is
+ *   a button enumeration value that uniquely identifies a button resource.
+ *   See the BUTTON_* definitions in board.h for the meaning of enumeration
+ *   value.  The previous interrupt handler address is returned (so that it
+ *   may restored, if so desired).
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
 xcpt_t board_button_irq(int id, xcpt_t irqhandler)
@@ -141,7 +141,8 @@ xcpt_t board_button_irq(int id, xcpt_t irqhandler)
 
   if (id >= MIN_IRQBUTTON && id <= MAX_IRQBUTTON)
     {
-      oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true, irqhandler);
+      oldhandler =
+        stm32_gpiosetevent(g_buttons[id], true, true, true, irqhandler);
     }
 
   return oldhandler;
diff --git a/configs/olimex-stm32-e407/src/stm32_can.c b/configs/olimex-stm32-e407/src/stm32_can.c
index 2fb54bd194..d4fa00aa4c 100644
--- a/configs/olimex-stm32-e407/src/stm32_can.c
+++ b/configs/olimex-stm32-e407/src/stm32_can.c
@@ -83,13 +83,13 @@ int board_can_initialize(void)
   return stm32_can_initialize();
 }
 
-/****************************************************************************************************
+/************************************************************************************
  * Name: stm32_can_initialize
  *
  * Description:
  *   Called at application startup time to initialize the CAN functionality.
  *
- ****************************************************************************************************/
+ ************************************************************************************/
 
 int stm32_can_initialize(void)
 {
diff --git a/configs/olimex-stm32-e407/src/stm32_usb.c b/configs/olimex-stm32-e407/src/stm32_usb.c
index fc505deb06..db93fcbf17 100644
--- a/configs/olimex-stm32-e407/src/stm32_usb.c
+++ b/configs/olimex-stm32-e407/src/stm32_usb.c
@@ -1,7 +1,7 @@
 /************************************************************************************
  * configs/stm32f4discovery/src/stm32_usb.c
  *
- *   Copyright (C) 2012-2013, 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012-2013, 2015-2916 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/configs/olimex-stm32-h407/scripts/ld.script b/configs/olimex-stm32-h407/scripts/ld.script
index 8cb28bca07..a476753cf2 100644
--- a/configs/olimex-stm32-h407/scripts/ld.script
+++ b/configs/olimex-stm32-h407/scripts/ld.script
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/olimex-stm32-h405/scripts/ld.script
+ * configs/olimex-stm32-h407/scripts/ld.script
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
diff --git a/configs/olimex-stm32-h407/src/stm32_buttons.c b/configs/olimex-stm32-h407/src/stm32_buttons.c
index 24bcc1ee34..47873bf39b 100644
--- a/configs/olimex-stm32-h407/src/stm32_buttons.c
+++ b/configs/olimex-stm32-h407/src/stm32_buttons.c
@@ -70,10 +70,10 @@ static const uint32_t g_buttons[NUM_BUTTONS] =
  * Name: board_button_initialize
  *
  * Description:
- *   board_button_initialize() must be called to initialize button resources.  After
- *   that, board_buttons() may be called to collect the current state of all
- *   buttons or board_button_irq() may be called to register button interrupt
- *   handlers.
+ *   board_button_initialize() must be called to initialize button resources.
+ *   After that, board_buttons() may be called to collect the current state
+ *   of all buttons or board_button_irq() may be called to register button
+ *   interrupt handlers.
  *
  ****************************************************************************/
 
@@ -109,28 +109,28 @@ uint8_t board_buttons(void)
   return ret;
 }
 
-/************************************************************************************
+/****************************************************************************
  * Button support.
  *
  * Description:
- *   board_button_initialize() must be called to initialize button resources.  After
- *   that, board_buttons() may be called to collect the current state of all
- *   buttons or board_button_irq() may be called to register button interrupt
- *   handlers.
+ *   board_button_initialize() must be called to initialize button resources.
+ *   After that, board_buttons() may be called to collect the current state
+ *   of all buttons or board_button_irq() may be called to register button
+ *   interrupt handlers.
  *
- *   After board_button_initialize() has been called, board_buttons() may be called to
- *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
- *   with each bit associated with a button.  See the BUTTON_*_BIT
+ *   After board_button_initialize() has been called, board_buttons() may be
+ *   called to collect the state of all buttons.  board_buttons() returns an
+ *   8-bit bit set with each bit associated with a button.  See the BUTTON_*_BIT
  *   definitions in board.h for the meaning of each bit.
  *
- *   board_button_irq() may be called to register an interrupt handler that will
- *   be called when a button is depressed or released.  The ID value is a
- *   button enumeration value that uniquely identifies a button resource. See the
- *   BUTTON_* definitions in board.h for the meaning of enumeration
- *   value.  The previous interrupt handler address is returned (so that it may
- *   restored, if so desired).
+ *   board_button_irq() may be called to register an interrupt handler that
+ *   will be called when a button is depressed or released.  The ID value is
+ *   a button enumeration value that uniquely identifies a button resource.
+ *   See the BUTTON_* definitions in board.h for the meaning of enumeration
+ *   value.  The previous interrupt handler address is returned (so that it
+ *   may restored, if so desired).
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
 xcpt_t board_button_irq(int id, xcpt_t irqhandler)
diff --git a/configs/olimex-stm32-h407/src/stm32_can.c b/configs/olimex-stm32-h407/src/stm32_can.c
index d293ee960c..c401e0c411 100644
--- a/configs/olimex-stm32-h407/src/stm32_can.c
+++ b/configs/olimex-stm32-h407/src/stm32_can.c
@@ -83,13 +83,13 @@ int board_can_initialize(void)
   return stm32_can_initialize();
 }
 
-/****************************************************************************************************
+/************************************************************************************
  * Name: stm32_can_initialize
  *
  * Description:
  *   Called at application startup time to initialize the CAN functionality.
  *
- ****************************************************************************************************/
+ ************************************************************************************/
 
 int stm32_can_initialize(void)
 {
-- 
GitLab


From 3d5e690977467be190f61c1eefeebb79c11a9545 Mon Sep 17 00:00:00 2001
From: Michael Spahlinger 
Date: Mon, 27 Jun 2016 08:11:54 -0600
Subject: [PATCH 058/229]  Shadow-Mode: The output- and configuration registers
 of the IO-Expander  are held in the microcontrollers memory and only written
 to the IO-Expander.  This reduces bus traffic and is more error-proof than
 the normal read-  modify-write operation.

 Retry Mode: If enabled and an error occurs while writing to the IO-Expander the
 current transmission is automatically repeated once.
---
 drivers/ioexpander/Kconfig   | 20 ++++++++++++
 drivers/ioexpander/pca9555.c | 61 ++++++++++++++++++++++++++++++++++--
 drivers/ioexpander/pca9555.h |  6 ++--
 3 files changed, 82 insertions(+), 5 deletions(-)

diff --git a/drivers/ioexpander/Kconfig b/drivers/ioexpander/Kconfig
index fd6abd7715..de3b5d09a1 100644
--- a/drivers/ioexpander/Kconfig
+++ b/drivers/ioexpander/Kconfig
@@ -52,6 +52,26 @@ config IOEXPANDER_MULTIPIN
 		This settings enable the definition of routines for
 		optimized simultaneous access to multiple pins.
 
+config IOEXPANDER_SHADOW_MODE
+	bool "Use Shadow Mode instead of Read-Modify-Write Operations"
+	default n
+	---help---
+		This setting enables a mode where the output and pin
+		configuration registers are held in RAM.
+		With this for example we do not need to read back the
+		output-register every time we want to change one pin.
+		We do instead change the bit in the internal register
+		and then just write this register to the IO-Expander.
+		This reduces bus traffic and eliminates the problem of
+		EMC-caused toggling of output pins.
+
+config IOEXPANDER_RETRY
+	bool "Retry to send commands and data at I2C communication errors"
+	default n
+	---help---
+		Retry to send commands and data if a I2C-communication
+		error occurs (eg. caused by EMC).
+
 endif # IOEXPANDER
 
 config DEV_GPIO
diff --git a/drivers/ioexpander/pca9555.c b/drivers/ioexpander/pca9555.c
index c01f7c37a5..34000d07eb 100644
--- a/drivers/ioexpander/pca9555.c
+++ b/drivers/ioexpander/pca9555.c
@@ -223,11 +223,20 @@ static int pca9555_setbit(FAR struct pca9555_dev_s *pca, uint8_t addr,
 
   buf[0] = addr;
 
+#ifdef CONFIG_IOEXPANDER_SHADOW_MODE
+  /* Get the shadowed register value */
+
+  buf[1] = pca->sreg[addr];
+
+#else
+  /* Get the register value from the IO-Expander */
+
   ret = pca9555_writeread(pca, &buf[0], 1, &buf[1], 1);
   if (ret < 0)
     {
       return ret;
     }
+#endif
 
   if (bitval)
     {
@@ -238,7 +247,23 @@ static int pca9555_setbit(FAR struct pca9555_dev_s *pca, uint8_t addr,
       buf[1] &= ~(1 << pin);
     }
 
-  return pca9555_write(pca, buf, 2);
+#ifdef CONFIG_IOEXPANDER_SHADOW_MODE
+  /* Save the new register value in the shadow register */
+
+  pca->sreg[addr] = buf[1];
+#endif
+
+  ret = pca9555_write(pca, buf, 2);
+#ifdef CONFIG_IOEXPANDER_RETRY
+  if (ret != OK)
+    {
+      /* Try again (only once) */
+
+      ret = pca9555_write(pca, buf, 2);
+    }
+#endif
+
+  return ret;
 }
 
 /****************************************************************************
@@ -271,6 +296,12 @@ static int pca9555_getbit(FAR struct pca9555_dev_s *pca, uint8_t addr,
       return ret;
     }
 
+#ifdef CONFIG_IOEXPANDER_SHADOW_MODE
+  /* Save the new register value in the shadow register */
+
+  pca->sreg[addr] = buf;
+#endif
+
   *val = (buf >> pin) & 1;
   return OK;
 }
@@ -417,6 +448,13 @@ static int pca9555_getmultibits(FAR struct pca9555_dev_s *pca, uint8_t addr,
       return ret;
     }
 
+#ifdef CONFIG_IOEXPANDER_SHADOW_MODE
+  /* Save the new register value in the shadow register */
+
+  pca->sreg[addr]   = buf[0];
+  pca->sreg[addr+1] = buf[1];
+#endif
+
   /* Read the requested bits */
 
   for (i = 0; i < count; i++)
@@ -465,15 +503,22 @@ static int pca9555_multiwritepin(FAR struct ioexpander_dev_s *dev,
 
   /* Start by reading both registers, whatever the pins to change. We could
    * attempt to read one port only if all pins were on the same port, but
-   * this would not save much. */
+   * this would not save much.
+   */
 
+#ifndef CONFIG_IOEXPANDER_SHADOW_MODE
   ret = pca9555_writeread(pca, &addr, 1, &buf[1], 2);
   if (ret < 0)
     {
-
       pca9555_unlock(pca);
       return ret;
     }
+#else
+  /* In Shadow-Mode we "read" the pin status from the shadow registers */
+
+  buf[1] = pca->sreg[addr];
+  buf[2] = pca->sreg[addr+1];
+#endif
 
   /* Apply the user defined changes */
 
@@ -505,6 +550,11 @@ static int pca9555_multiwritepin(FAR struct ioexpander_dev_s *dev,
   /* Now write back the new pins states */
 
   buf[0] = addr;
+#ifdef CONFIG_IOEXPANDER_SHADOW_MODE
+  /* Save the new register values in the shadow register */
+  pca->sreg[addr] = buf[1];
+  pca->sreg[addr+1] = buf[2];
+#endif
   ret = pca9555_write(pca, buf, 3);
 
   pca9555_unlock(pca);
@@ -585,6 +635,11 @@ static void pca9555_irqworker(void *arg)
   ret = pca9555_writeread(pca, &addr, 1, buf, 2);
   if (ret == OK)
     {
+#ifdef CONFIG_IOEXPANDER_SHADOW_MODE
+      /* Don't forget to update the shadow registers at this point */
+
+      pca->sreg[addr] = buf;
+#endif
       bits = ((unsigned int)buf[0] << 8) | buf[1];
 
       /* If signal PID is registered, enqueue signal. */
diff --git a/drivers/ioexpander/pca9555.h b/drivers/ioexpander/pca9555.h
index 39435f23d6..7152a58bb1 100644
--- a/drivers/ioexpander/pca9555.h
+++ b/drivers/ioexpander/pca9555.h
@@ -61,6 +61,7 @@
 /********************************************************************************************
  * Pre-processor Definitions
  ********************************************************************************************/
+
 /* Configuration ****************************************************************************/
 /* Prerequisites:
  *   CONFIG_I2C
@@ -118,11 +119,12 @@ struct pca9555_dev_s
 {
   struct ioexpander_dev_s      dev;     /* Nested structure to allow casting as public gpio
                                          * expander. */
-
+#ifdef CONFIG_IOEXPANDER_SHADOW_MODE
+  uint8_t sreg[8];                      /* Shadowed registers of the PCA9555 */
+#endif
 #ifdef CONFIG_PCA9555_MULTIPLE
   FAR struct pca9555_dev_s    *flink;   /* Supports a singly linked list of drivers */
 #endif
-
   FAR struct pca9555_config_s *config;  /* Board configuration data */
   FAR struct i2c_master_s     *i2c;     /* Saved I2C driver instance */
   sem_t                        exclsem; /* Mutual exclusion */
-- 
GitLab


From cbb36416aba6454ca17a27db6a41b2706e079c58 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 27 Jun 2016 09:52:50 -0600
Subject: [PATCH 059/229] Need to use back- not forward-slash in character
 constant

---
 drivers/syslog/syslog_devchannel.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/syslog/syslog_devchannel.c b/drivers/syslog/syslog_devchannel.c
index fbc912ad78..e0251efc8e 100644
--- a/drivers/syslog/syslog_devchannel.c
+++ b/drivers/syslog/syslog_devchannel.c
@@ -102,11 +102,11 @@ static int syslog_devchan_putc(int ch)
 
   /* Check for a linefeed */
 
-  if (ch == '/n')
+  if (ch == '\n')
     {
       /* Pre-pend a carriage return */
 
-      ret = syslog_dev_putc('/r');
+      ret = syslog_dev_putc('\r');
       if (ret < 0)
         {
           return ret;
-- 
GitLab


From 79ff375b66fdb147481048a2a453046509b6e873 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 27 Jun 2016 09:57:01 -0600
Subject: [PATCH 060/229] Refresh configurations

---
 configs/olimex-stm32-e407/nsh/defconfig    | 46 ++++++++--------------
 configs/olimex-stm32-e407/usbnsh/defconfig | 35 +++++++---------
 2 files changed, 32 insertions(+), 49 deletions(-)

diff --git a/configs/olimex-stm32-e407/nsh/defconfig b/configs/olimex-stm32-e407/nsh/defconfig
index cbd209fa72..012c6c9168 100644
--- a/configs/olimex-stm32-e407/nsh/defconfig
+++ b/configs/olimex-stm32-e407/nsh/defconfig
@@ -12,10 +12,6 @@ CONFIG_HOST_LINUX=y
 # CONFIG_HOST_OSX is not set
 # CONFIG_HOST_WINDOWS is not set
 # CONFIG_HOST_OTHER is not set
-# CONFIG_WINDOWS_NATIVE is not set
-# CONFIG_WINDOWS_CYGWIN is not set
-# CONFIG_WINDOWS_MSYS is not set
-# CONFIG_WINDOWS_OTHER is not set
 
 #
 # Build Configuration
@@ -143,15 +139,11 @@ CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
-# CONFIG_ARMV7M_TOOLCHAIN_IARW is not set
-# CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
-# CONFIG_ARMV7M_TOOLCHAIN_CODEREDW is not set
-# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW is not set
-# CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
+# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
 CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y
-# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW is not set
-# CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE is not set
 CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARMV7M_STACKCHECK is not set
 # CONFIG_ARMV7M_ITMSYSLOG is not set
@@ -424,7 +416,6 @@ CONFIG_STM32_USART2=y
 # CONFIG_STM32_USART6 is not set
 # CONFIG_STM32_IWDG is not set
 # CONFIG_STM32_WWDG is not set
-CONFIG_STM32_SPI=y
 # CONFIG_STM32_NOEXT_VECTORS is not set
 
 #
@@ -476,12 +467,6 @@ CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
 # CONFIG_STM32_USART_SINGLEWIRE is not set
-
-#
-# SPI Configuration
-#
-# CONFIG_STM32_SPI_INTERRUPTS is not set
-# CONFIG_STM32_SPI_DMA is not set
 # CONFIG_STM32_HAVE_RTC_COUNTER is not set
 # CONFIG_STM32_HAVE_RTC_SUBSECONDS is not set
 
@@ -562,7 +547,9 @@ CONFIG_RAM_SIZE=114688
 #
 # Board Selection
 #
+# CONFIG_ARCH_BOARD_OLIMEX_STM32H407 is not set
 CONFIG_ARCH_BOARD_OLIMEX_STM32E407=y
+# CONFIG_ARCH_BOARD_CUSTOM is not set
 CONFIG_ARCH_BOARD="olimex-stm32-e407"
 
 #
@@ -574,11 +561,12 @@ CONFIG_ARCH_HAVE_BUTTONS=y
 CONFIG_ARCH_BUTTONS=y
 CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # CONFIG_ARCH_IRQBUTTONS is not set
-CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Board-Specific Options
 #
+# CONFIG_BOARD_CRASHDUMP is not set
+# CONFIG_LIB_BOARDCTL is not set
 
 #
 # RTOS Features
@@ -700,18 +688,9 @@ CONFIG_DEV_NULL=y
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
 # CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
-# CONFIG_ARCH_HAVE_I2CRESET is not set
+CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_I2C is not set
 # CONFIG_SPI is not set
-# CONFIG_SPI_SLAVE is not set
-# CONFIG_SPI_EXCHANGE is not set
-# CONFIG_SPI_CMDDATA is not set
-# CONFIG_SPI_CALLBACK is not set
-# CONFIG_SPI_BITBANG is not set
-# CONFIG_SPI_HWFEATURES is not set
-# CONFIG_SPI_CRCGENERATION is not set
-# CONFIG_SPI_CS_CONTROL is not set
-# CONFIG_SPI_CS_DELAY_CONTROL is not set
 # CONFIG_I2S is not set
 
 #
@@ -725,7 +704,12 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
 
 #
 # LCD Driver Support
@@ -975,7 +959,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 CONFIG_EXAMPLES_HELLO=y
+CONFIG_EXAMPLES_HELLO_PRIORITY=100
+CONFIG_EXAMPLES_HELLO_STACKSIZE=2048
 CONFIG_EXAMPLES_HELLOXX=y
+CONFIG_EXAMPLES_HELLOXX_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_HIDKBD is not set
 # CONFIG_EXAMPLES_IGMP is not set
 # CONFIG_EXAMPLES_JSON is not set
@@ -1128,6 +1115,7 @@ CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Configure Command Options
diff --git a/configs/olimex-stm32-e407/usbnsh/defconfig b/configs/olimex-stm32-e407/usbnsh/defconfig
index fdd456571c..0010a33bb1 100644
--- a/configs/olimex-stm32-e407/usbnsh/defconfig
+++ b/configs/olimex-stm32-e407/usbnsh/defconfig
@@ -12,10 +12,6 @@ CONFIG_HOST_LINUX=y
 # CONFIG_HOST_OSX is not set
 # CONFIG_HOST_WINDOWS is not set
 # CONFIG_HOST_OTHER is not set
-# CONFIG_WINDOWS_NATIVE is not set
-# CONFIG_WINDOWS_CYGWIN is not set
-# CONFIG_WINDOWS_MSYS is not set
-# CONFIG_WINDOWS_OTHER is not set
 
 #
 # Build Configuration
@@ -143,15 +139,11 @@ CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARMV7M_HAVE_DCACHE is not set
 # CONFIG_ARMV7M_HAVE_ITCM is not set
 # CONFIG_ARMV7M_HAVE_DTCM is not set
-# CONFIG_ARMV7M_TOOLCHAIN_IARW is not set
-# CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
-# CONFIG_ARMV7M_TOOLCHAIN_CODEREDW is not set
-# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW is not set
-# CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
+# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
 CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y
-# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW is not set
-# CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE is not set
 CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARMV7M_STACKCHECK is not set
 # CONFIG_ARMV7M_ITMSYSLOG is not set
@@ -424,7 +416,6 @@ CONFIG_STM32_USART2=y
 # CONFIG_STM32_USART6 is not set
 # CONFIG_STM32_IWDG is not set
 # CONFIG_STM32_WWDG is not set
-# CONFIG_STM32_SPI is not set
 # CONFIG_STM32_NOEXT_VECTORS is not set
 
 #
@@ -476,12 +467,6 @@ CONFIG_STM32_USART2_SERIALDRIVER=y
 # CONFIG_STM32_FLOWCONTROL_BROKEN is not set
 # CONFIG_STM32_USART_BREAKS is not set
 # CONFIG_STM32_USART_SINGLEWIRE is not set
-
-#
-# SPI Configuration
-#
-# CONFIG_STM32_SPI_INTERRUPTS is not set
-# CONFIG_STM32_SPI_DMA is not set
 # CONFIG_STM32_HAVE_RTC_COUNTER is not set
 # CONFIG_STM32_HAVE_RTC_SUBSECONDS is not set
 
@@ -562,7 +547,9 @@ CONFIG_RAM_SIZE=114688
 #
 # Board Selection
 #
+# CONFIG_ARCH_BOARD_OLIMEX_STM32H407 is not set
 CONFIG_ARCH_BOARD_OLIMEX_STM32E407=y
+# CONFIG_ARCH_BOARD_CUSTOM is not set
 CONFIG_ARCH_BOARD="olimex-stm32-e407"
 
 #
@@ -574,12 +561,11 @@ CONFIG_ARCH_HAVE_BUTTONS=y
 CONFIG_ARCH_BUTTONS=y
 CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # CONFIG_ARCH_IRQBUTTONS is not set
-CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Board-Specific Options
 #
-# CONFIG_STM32F4DISBB is not set
+# CONFIG_BOARD_CRASHDUMP is not set
 CONFIG_LIB_BOARDCTL=y
 # CONFIG_BOARDCTL_RESET is not set
 # CONFIG_BOARDCTL_UNIQUEID is not set
@@ -735,7 +721,12 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
 
 #
 # LCD Driver Support
@@ -1025,7 +1016,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 CONFIG_EXAMPLES_HELLO=y
+CONFIG_EXAMPLES_HELLO_PRIORITY=100
+CONFIG_EXAMPLES_HELLO_STACKSIZE=2048
 CONFIG_EXAMPLES_HELLOXX=y
+CONFIG_EXAMPLES_HELLOXX_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_HIDKBD is not set
 # CONFIG_EXAMPLES_IGMP is not set
 # CONFIG_EXAMPLES_JSON is not set
@@ -1179,6 +1173,7 @@ CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Configure Command Options
-- 
GitLab


From 2a19e16eb08af136a41928c903aa4ba2b6baee3f Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 27 Jun 2016 11:22:38 -0600
Subject: [PATCH 061/229] libc/hex2bin:  Move the portable library portion of
 apps/system/hex2bin to nuttx/libc/hex2bin where it can be shared with the OS
 internals.

---
 configs/arduino-due/nsh/defconfig             |   2 +-
 configs/arduino-mega2560/hello/defconfig      |   2 +-
 configs/arduino-mega2560/nsh/defconfig        |   2 +-
 configs/c5471evm/httpd/defconfig              |   2 +-
 configs/c5471evm/nettest/defconfig            |   2 +-
 configs/c5471evm/nsh/defconfig                |   2 +-
 configs/cc3200-launchpad/nsh/defconfig        |   2 +-
 configs/cloudctrl/nsh/defconfig               |   2 +-
 configs/compal_e86/nsh_highram/defconfig      |   2 +-
 configs/compal_e88/nsh_highram/defconfig      |   2 +-
 configs/compal_e99/nsh_compalram/defconfig    |   2 +-
 configs/compal_e99/nsh_highram/defconfig      |   2 +-
 configs/dk-tm4c129x/ipv6/defconfig            |   2 +-
 configs/dk-tm4c129x/nsh/defconfig             |   2 +-
 configs/ea3131/nsh/defconfig                  |   2 +-
 configs/ea3131/pgnsh/defconfig                |   2 +-
 configs/ea3131/usbserial/defconfig            |   2 +-
 configs/ea3152/ostest/defconfig               |   2 +-
 configs/eagle100/httpd/defconfig              |   2 +-
 configs/eagle100/nettest/defconfig            |   2 +-
 configs/eagle100/nsh/defconfig                |   2 +-
 configs/eagle100/nxflat/defconfig             |   2 +-
 configs/eagle100/thttpd/defconfig             |   2 +-
 configs/efm32-g8xx-stk/nsh/defconfig          |   2 +-
 configs/efm32gg-stk3700/nsh/defconfig         |   2 +-
 configs/ekk-lm3s9b96/nsh/defconfig            |   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/nsh/defconfig            |   2 +-
 configs/freedom-kl25z/minnsh/defconfig        |   2 +-
 configs/freedom-kl25z/nsh/defconfig           |   2 +-
 configs/freedom-kl26z/minnsh/defconfig        |   2 +-
 configs/freedom-kl26z/nsh/defconfig           |   2 +-
 configs/hymini-stm32v/buttons/defconfig       |   2 +-
 configs/hymini-stm32v/nsh/defconfig           |   2 +-
 configs/hymini-stm32v/nsh2/defconfig          |   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/launchxl-tms57004/nsh/defconfig       |   2 +-
 configs/lincoln60/netnsh/defconfig            |   2 +-
 configs/lincoln60/nsh/defconfig               |   2 +-
 configs/lincoln60/thttpd-binfs/defconfig      |   2 +-
 configs/lm3s6432-s2e/nsh/defconfig            |   2 +-
 configs/lm3s6965-ek/discover/defconfig        |   2 +-
 configs/lm3s6965-ek/nsh/defconfig             |   2 +-
 configs/lm3s6965-ek/nx/defconfig              |   2 +-
 configs/lm3s6965-ek/tcpecho/defconfig         |   2 +-
 configs/lm3s8962-ek/nsh/defconfig             |   2 +-
 configs/lm3s8962-ek/nx/defconfig              |   2 +-
 configs/lm4f120-launchpad/nsh/defconfig       |   2 +-
 configs/lpc4330-xplorer/nsh/defconfig         |   2 +-
 configs/lpc4337-ws/nsh/defconfig              |   2 +-
 configs/lpc4357-evb/nsh/defconfig             |   2 +-
 configs/lpc4370-link2/nsh/defconfig           |   2 +-
 configs/lpcxpresso-lpc1115/minnsh/defconfig   |   2 +-
 configs/lpcxpresso-lpc1115/nsh/defconfig      |   2 +-
 configs/lpcxpresso-lpc1768/dhcpd/defconfig    |   2 +-
 configs/lpcxpresso-lpc1768/nsh/defconfig      |   2 +-
 configs/lpcxpresso-lpc1768/nx/defconfig       |   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/usbnsh/defconfig                |   2 +-
 configs/mbed/hidkbd/defconfig                 |   2 +-
 configs/mbed/nsh/defconfig                    |   2 +-
 configs/mcu123-lpc214x/composite/defconfig    |   2 +-
 configs/mcu123-lpc214x/nsh/defconfig          |   2 +-
 configs/mcu123-lpc214x/usbmsc/defconfig       |   2 +-
 configs/mcu123-lpc214x/usbserial/defconfig    |   2 +-
 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/usbnsh/defconfig       |   2 +-
 configs/mirtoo/nsh/defconfig                  |   2 +-
 configs/mirtoo/nxffs/defconfig                |   2 +-
 configs/moteino-mega/hello/defconfig          |   2 +-
 configs/moteino-mega/nsh/defconfig            |   2 +-
 configs/moxa/nsh/defconfig                    |   2 +-
 configs/mx1ads/ostest/defconfig               |   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-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/uavcan/defconfig        |   2 +-
 configs/nucleo-f4x1re/f401-nsh/defconfig      |   2 +-
 configs/nucleo-f4x1re/f411-nsh/defconfig      |   2 +-
 configs/nucleo-l476rg/nsh/defconfig           |   2 +-
 configs/nutiny-nuc120/nsh/defconfig           |   2 +-
 .../olimex-efm32g880f128-stk/nsh/defconfig    |   2 +-
 configs/olimex-lpc-h3131/nsh/defconfig        |   2 +-
 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 +-
 .../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/defconfig          |   2 +-
 configs/olimex-stm32-e407/nsh/defconfig       |   2 +-
 configs/olimex-stm32-e407/usbnsh/defconfig    |   2 +-
 configs/olimex-stm32-h405/usbnsh/defconfig    |   2 +-
 configs/olimex-stm32-h407/nsh/defconfig       |   2 +-
 configs/olimex-stm32-p107/nsh/defconfig       |   2 +-
 configs/olimex-stm32-p207/nsh/defconfig       |   2 +-
 configs/olimex-strp711/nettest/defconfig      |   2 +-
 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/tiny/defconfig        |   2 +-
 configs/open1788/knsh/defconfig               |   2 +-
 configs/open1788/nsh/defconfig                |   2 +-
 configs/open1788/nxlines/defconfig            |   2 +-
 configs/pcblogic-pic32mx/nsh/defconfig        |   2 +-
 configs/pcduino-a10/nsh/defconfig             |   2 +-
 configs/pic32mx-starterkit/nsh/defconfig      |   2 +-
 configs/pic32mx-starterkit/nsh2/defconfig     |   2 +-
 configs/pic32mx7mmb/nsh/defconfig             |   2 +-
 configs/pic32mz-starterkit/nsh/defconfig      |   2 +-
 configs/pirelli_dpl10/nsh_highram/defconfig   |   2 +-
 configs/sabre-6quad/nsh/defconfig             |   2 +-
 configs/sabre-6quad/smp/defconfig             |   2 +-
 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/sam4e-ek/nsh/defconfig                |   2 +-
 configs/sam4e-ek/nxwm/defconfig               |   2 +-
 configs/sam4e-ek/usbnsh/defconfig             |   2 +-
 configs/sam4l-xplained/nsh/defconfig          |   2 +-
 configs/sam4s-xplained-pro/nsh/defconfig      |   2 +-
 configs/sam4s-xplained/nsh/defconfig          |   2 +-
 configs/sama5d2-xult/nsh/defconfig            |   2 +-
 configs/sama5d3-xplained/bridge/defconfig     |   2 +-
 configs/sama5d3-xplained/nsh/defconfig        |   2 +-
 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/sama5d4-ek/at25boot/defconfig         |   4 +-
 configs/sama5d4-ek/bridge/defconfig           |   2 +-
 configs/sama5d4-ek/dramboot/defconfig         |   4 +-
 configs/sama5d4-ek/elf/defconfig              |   2 +-
 configs/sama5d4-ek/ipv6/defconfig             |   2 +-
 configs/sama5d4-ek/knsh/defconfig             |   2 +-
 configs/sama5d4-ek/nsh/defconfig              |   2 +-
 configs/sama5d4-ek/nxwm/defconfig             |   2 +-
 configs/sama5d4-ek/ramtest/defconfig          |   2 +-
 configs/sama5d4-ek/src/at25_main.c            |   4 +-
 configs/sama5d4-ek/src/dram_main.c            |   2 +-
 configs/samd20-xplained/nsh/defconfig         |   2 +-
 configs/samd21-xplained/nsh/defconfig         |   2 +-
 configs/same70-xplained/netnsh/defconfig      |   2 +-
 configs/same70-xplained/nsh/defconfig         |   2 +-
 configs/saml21-xplained/nsh/defconfig         |   2 +-
 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/vnc/defconfig             |   2 +-
 configs/samv71-xult/vnxwm/defconfig           |   2 +-
 configs/shenzhou/nsh/defconfig                |   2 +-
 configs/shenzhou/nxwm/defconfig               |   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/spark/composite/defconfig             |   2 +-
 configs/spark/nsh/defconfig                   |   2 +-
 configs/spark/usbmsc/defconfig                |   2 +-
 configs/spark/usbnsh/defconfig                |   2 +-
 configs/spark/usbserial/defconfig             |   2 +-
 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/usbmsc/defconfig        |   2 +-
 configs/stm3210e-eval/usbserial/defconfig     |   2 +-
 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/telnetd/defconfig       |   2 +-
 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/telnetd/defconfig       |   2 +-
 configs/stm3240g-eval/webserver/defconfig     |   2 +-
 configs/stm3240g-eval/xmlrpc/defconfig        |   2 +-
 configs/stm32_tiny/nsh/defconfig              |   2 +-
 configs/stm32_tiny/usbnsh/defconfig           |   2 +-
 configs/stm32f103-minimum/minnsh/defconfig    |   2 +-
 configs/stm32f103-minimum/nsh/defconfig       |   2 +-
 configs/stm32f103-minimum/usbnsh/defconfig    |   2 +-
 configs/stm32f3discovery/nsh/defconfig        |   2 +-
 configs/stm32f3discovery/usbnsh/defconfig     |   2 +-
 configs/stm32f411e-disco/nsh/defconfig        |   2 +-
 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/usbmsc/defconfig     |   2 +-
 configs/stm32f429i-disco/usbnsh/defconfig     |   2 +-
 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/uavcan/defconfig     |   2 +-
 configs/stm32f4discovery/usbnsh/defconfig     |   2 +-
 configs/stm32f4discovery/winbuild/defconfig   |   2 +-
 configs/stm32f746-ws/nsh/defconfig            |   2 +-
 configs/stm32f746g-disco/netnsh/defconfig     |   2 +-
 configs/stm32f746g-disco/nsh/defconfig        |   2 +-
 configs/stm32l476vg-disco/nsh/defconfig       |   2 +-
 configs/stm32ldiscovery/nsh/defconfig         |   2 +-
 configs/stm32vldiscovery/nsh/defconfig        |   2 +-
 configs/sure-pic32mx/nsh/defconfig            |   2 +-
 configs/sure-pic32mx/usbnsh/defconfig         |   2 +-
 configs/teensy-2.0/hello/defconfig            |   2 +-
 configs/teensy-2.0/nsh/defconfig              |   2 +-
 configs/teensy-2.0/usbmsc/defconfig           |   2 +-
 configs/teensy-3.x/nsh/defconfig              |   2 +-
 configs/teensy-3.x/usbnsh/defconfig           |   2 +-
 configs/teensy-lc/nsh/defconfig               |   2 +-
 configs/tm4c123g-launchpad/nsh/defconfig      |   2 +-
 configs/tm4c1294-launchpad/ipv6/defconfig     |   2 +-
 configs/tm4c1294-launchpad/nsh/defconfig      |   2 +-
 configs/twr-k60n512/nsh/defconfig             |   2 +-
 configs/u-blox-c027/nsh/defconfig             |   2 +-
 configs/ubw32/nsh/defconfig                   |   2 +-
 configs/viewtool-stm32f107/highpri/defconfig  |   2 +-
 configs/viewtool-stm32f107/netnsh/defconfig   |   2 +-
 configs/viewtool-stm32f107/nsh/defconfig      |   2 +-
 configs/z8encore000zco/ostest/defconfig       |   2 +-
 configs/z8f64200100kit/ostest/defconfig       |   2 +-
 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/thttpd/defconfig        |   2 +-
 configs/zp214xpa/nsh/defconfig                |   2 +-
 configs/zp214xpa/nxlines/defconfig            |   2 +-
 include/hex2bin.h                             | 244 ++++++
 libc/Kconfig                                  |   7 +
 libc/Makefile                                 |   1 +
 libc/README.txt                               |   3 +-
 libc/hex2bin/Make.defs                        |  47 ++
 libc/hex2bin/lib_fhex2mem.c                   | 103 +++
 libc/hex2bin/lib_hex2bin.c                    | 705 ++++++++++++++++++
 libc/hex2bin/lib_hex2mem.c                    | 103 +++
 315 files changed, 1522 insertions(+), 311 deletions(-)
 create mode 100644 include/hex2bin.h
 create mode 100644 libc/hex2bin/Make.defs
 create mode 100644 libc/hex2bin/lib_fhex2mem.c
 create mode 100644 libc/hex2bin/lib_hex2bin.c
 create mode 100644 libc/hex2bin/lib_hex2mem.c

diff --git a/configs/arduino-due/nsh/defconfig b/configs/arduino-due/nsh/defconfig
index eb780c0556..f3ee262739 100644
--- a/configs/arduino-due/nsh/defconfig
+++ b/configs/arduino-due/nsh/defconfig
@@ -900,7 +900,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/arduino-mega2560/hello/defconfig b/configs/arduino-mega2560/hello/defconfig
index fe1eb43cfc..129b81c480 100644
--- a/configs/arduino-mega2560/hello/defconfig
+++ b/configs/arduino-mega2560/hello/defconfig
@@ -577,7 +577,7 @@ CONFIG_EXAMPLES_HELLO=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/arduino-mega2560/nsh/defconfig b/configs/arduino-mega2560/nsh/defconfig
index 5c56184899..fb6c5ddeae 100644
--- a/configs/arduino-mega2560/nsh/defconfig
+++ b/configs/arduino-mega2560/nsh/defconfig
@@ -668,7 +668,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/c5471evm/httpd/defconfig b/configs/c5471evm/httpd/defconfig
index 8407b01b8a..e7a99b4301 100644
--- a/configs/c5471evm/httpd/defconfig
+++ b/configs/c5471evm/httpd/defconfig
@@ -796,7 +796,7 @@ CONFIG_NETUTILS_HTTPD_KEEPALIVE_DISABLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/c5471evm/nettest/defconfig b/configs/c5471evm/nettest/defconfig
index 386d69a57d..4c63b6f380 100644
--- a/configs/c5471evm/nettest/defconfig
+++ b/configs/c5471evm/nettest/defconfig
@@ -787,7 +787,7 @@ CONFIG_NETUTILS_NETLIB=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/c5471evm/nsh/defconfig b/configs/c5471evm/nsh/defconfig
index ea349bf244..204c435266 100644
--- a/configs/c5471evm/nsh/defconfig
+++ b/configs/c5471evm/nsh/defconfig
@@ -931,7 +931,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/cc3200-launchpad/nsh/defconfig b/configs/cc3200-launchpad/nsh/defconfig
index 8fbff6d4eb..ef25a4302f 100644
--- a/configs/cc3200-launchpad/nsh/defconfig
+++ b/configs/cc3200-launchpad/nsh/defconfig
@@ -875,7 +875,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/cloudctrl/nsh/defconfig b/configs/cloudctrl/nsh/defconfig
index ec0165b7f3..c881714fe9 100644
--- a/configs/cloudctrl/nsh/defconfig
+++ b/configs/cloudctrl/nsh/defconfig
@@ -1411,7 +1411,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/compal_e86/nsh_highram/defconfig b/configs/compal_e86/nsh_highram/defconfig
index 4e47505113..f3366ba3c1 100644
--- a/configs/compal_e86/nsh_highram/defconfig
+++ b/configs/compal_e86/nsh_highram/defconfig
@@ -797,7 +797,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/compal_e88/nsh_highram/defconfig b/configs/compal_e88/nsh_highram/defconfig
index 41fd85249b..90d01e3045 100644
--- a/configs/compal_e88/nsh_highram/defconfig
+++ b/configs/compal_e88/nsh_highram/defconfig
@@ -797,7 +797,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/compal_e99/nsh_compalram/defconfig b/configs/compal_e99/nsh_compalram/defconfig
index d2a8f010e5..0d5d9a0ac8 100644
--- a/configs/compal_e99/nsh_compalram/defconfig
+++ b/configs/compal_e99/nsh_compalram/defconfig
@@ -830,7 +830,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/compal_e99/nsh_highram/defconfig b/configs/compal_e99/nsh_highram/defconfig
index 778ad9d60e..c126366add 100644
--- a/configs/compal_e99/nsh_highram/defconfig
+++ b/configs/compal_e99/nsh_highram/defconfig
@@ -971,7 +971,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/dk-tm4c129x/ipv6/defconfig b/configs/dk-tm4c129x/ipv6/defconfig
index b67e6e377d..817e669b1d 100644
--- a/configs/dk-tm4c129x/ipv6/defconfig
+++ b/configs/dk-tm4c129x/ipv6/defconfig
@@ -1156,7 +1156,7 @@ CONFIG_NSH_MAX_ROUNDTRIP=20
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=6
diff --git a/configs/dk-tm4c129x/nsh/defconfig b/configs/dk-tm4c129x/nsh/defconfig
index aa70c473d9..0fb4448227 100644
--- a/configs/dk-tm4c129x/nsh/defconfig
+++ b/configs/dk-tm4c129x/nsh/defconfig
@@ -1156,7 +1156,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=6
diff --git a/configs/ea3131/nsh/defconfig b/configs/ea3131/nsh/defconfig
index b453649255..d53178fc42 100644
--- a/configs/ea3131/nsh/defconfig
+++ b/configs/ea3131/nsh/defconfig
@@ -828,7 +828,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/ea3131/pgnsh/defconfig b/configs/ea3131/pgnsh/defconfig
index 0be35cb7ec..a49bd3421f 100644
--- a/configs/ea3131/pgnsh/defconfig
+++ b/configs/ea3131/pgnsh/defconfig
@@ -905,7 +905,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/ea3131/usbserial/defconfig b/configs/ea3131/usbserial/defconfig
index 4af07a8c24..9b050fb1c4 100644
--- a/configs/ea3131/usbserial/defconfig
+++ b/configs/ea3131/usbserial/defconfig
@@ -777,7 +777,7 @@ CONFIG_EXAMPLES_USBSERIAL_BUFSIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/ea3152/ostest/defconfig b/configs/ea3152/ostest/defconfig
index 7c590ebf44..542bde2f8a 100644
--- a/configs/ea3152/ostest/defconfig
+++ b/configs/ea3152/ostest/defconfig
@@ -712,7 +712,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/eagle100/httpd/defconfig b/configs/eagle100/httpd/defconfig
index 19ed517f66..9db394eac5 100644
--- a/configs/eagle100/httpd/defconfig
+++ b/configs/eagle100/httpd/defconfig
@@ -930,7 +930,7 @@ CONFIG_NETUTILS_HTTPD_KEEPALIVE_DISABLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/eagle100/nettest/defconfig b/configs/eagle100/nettest/defconfig
index deb0cd9e48..b19e984e04 100644
--- a/configs/eagle100/nettest/defconfig
+++ b/configs/eagle100/nettest/defconfig
@@ -920,7 +920,7 @@ CONFIG_NETUTILS_NETLIB=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/eagle100/nsh/defconfig b/configs/eagle100/nsh/defconfig
index f39a61f2ae..452f24ecde 100644
--- a/configs/eagle100/nsh/defconfig
+++ b/configs/eagle100/nsh/defconfig
@@ -1126,7 +1126,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/eagle100/nxflat/defconfig b/configs/eagle100/nxflat/defconfig
index 00b4c87cf2..f328bb6c89 100644
--- a/configs/eagle100/nxflat/defconfig
+++ b/configs/eagle100/nxflat/defconfig
@@ -789,7 +789,7 @@ CONFIG_EXAMPLES_NXFLAT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/eagle100/thttpd/defconfig b/configs/eagle100/thttpd/defconfig
index 191ad33765..da9c32d88c 100644
--- a/configs/eagle100/thttpd/defconfig
+++ b/configs/eagle100/thttpd/defconfig
@@ -954,7 +954,7 @@ CONFIG_THTTPD_TILDE_MAP_NONE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/efm32-g8xx-stk/nsh/defconfig b/configs/efm32-g8xx-stk/nsh/defconfig
index b641b4264e..082ffa6848 100644
--- a/configs/efm32-g8xx-stk/nsh/defconfig
+++ b/configs/efm32-g8xx-stk/nsh/defconfig
@@ -819,7 +819,7 @@ CONFIG_SYSTEM_CLE=y
 CONFIG_SYSTEM_CLE_DEBUGLEVEL=0
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/efm32gg-stk3700/nsh/defconfig b/configs/efm32gg-stk3700/nsh/defconfig
index 74c43841d3..79397ebf07 100644
--- a/configs/efm32gg-stk3700/nsh/defconfig
+++ b/configs/efm32gg-stk3700/nsh/defconfig
@@ -819,7 +819,7 @@ CONFIG_SYSTEM_CLE=y
 CONFIG_SYSTEM_CLE_DEBUGLEVEL=0
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/ekk-lm3s9b96/nsh/defconfig b/configs/ekk-lm3s9b96/nsh/defconfig
index ee98426b9e..4141e117c2 100644
--- a/configs/ekk-lm3s9b96/nsh/defconfig
+++ b/configs/ekk-lm3s9b96/nsh/defconfig
@@ -1118,7 +1118,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/ez80f910200kitg/ostest/defconfig b/configs/ez80f910200kitg/ostest/defconfig
index cdd48e8e11..555cbad837 100644
--- a/configs/ez80f910200kitg/ostest/defconfig
+++ b/configs/ez80f910200kitg/ostest/defconfig
@@ -666,7 +666,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
diff --git a/configs/ez80f910200zco/dhcpd/defconfig b/configs/ez80f910200zco/dhcpd/defconfig
index a46d818161..fd28494460 100644
--- a/configs/ez80f910200zco/dhcpd/defconfig
+++ b/configs/ez80f910200zco/dhcpd/defconfig
@@ -834,7 +834,7 @@ CONFIG_NETUTILS_NETLIB=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
diff --git a/configs/ez80f910200zco/httpd/defconfig b/configs/ez80f910200zco/httpd/defconfig
index 1d8f5613c8..9f7bb65145 100644
--- a/configs/ez80f910200zco/httpd/defconfig
+++ b/configs/ez80f910200zco/httpd/defconfig
@@ -843,7 +843,7 @@ CONFIG_NETUTILS_HTTPD_KEEPALIVE_DISABLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
diff --git a/configs/ez80f910200zco/nettest/defconfig b/configs/ez80f910200zco/nettest/defconfig
index 0975adabd0..a1f8e711fc 100644
--- a/configs/ez80f910200zco/nettest/defconfig
+++ b/configs/ez80f910200zco/nettest/defconfig
@@ -833,7 +833,7 @@ CONFIG_NETUTILS_NETLIB=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
diff --git a/configs/ez80f910200zco/nsh/defconfig b/configs/ez80f910200zco/nsh/defconfig
index 241877ecd1..92bc839c27 100644
--- a/configs/ez80f910200zco/nsh/defconfig
+++ b/configs/ez80f910200zco/nsh/defconfig
@@ -1007,7 +1007,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/ez80f910200zco/poll/defconfig b/configs/ez80f910200zco/poll/defconfig
index f24325f577..f3bc5693e0 100644
--- a/configs/ez80f910200zco/poll/defconfig
+++ b/configs/ez80f910200zco/poll/defconfig
@@ -834,7 +834,7 @@ CONFIG_NETUTILS_NETLIB=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
diff --git a/configs/fire-stm32v2/nsh/defconfig b/configs/fire-stm32v2/nsh/defconfig
index 425af3af49..0190388cd3 100644
--- a/configs/fire-stm32v2/nsh/defconfig
+++ b/configs/fire-stm32v2/nsh/defconfig
@@ -1456,7 +1456,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=1
diff --git a/configs/freedom-kl25z/minnsh/defconfig b/configs/freedom-kl25z/minnsh/defconfig
index 0b7545d9c1..8a7b3f9062 100644
--- a/configs/freedom-kl25z/minnsh/defconfig
+++ b/configs/freedom-kl25z/minnsh/defconfig
@@ -786,7 +786,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/freedom-kl25z/nsh/defconfig b/configs/freedom-kl25z/nsh/defconfig
index 932777e502..639cc13063 100644
--- a/configs/freedom-kl25z/nsh/defconfig
+++ b/configs/freedom-kl25z/nsh/defconfig
@@ -816,7 +816,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/freedom-kl26z/minnsh/defconfig b/configs/freedom-kl26z/minnsh/defconfig
index d68ba77924..3356a63965 100644
--- a/configs/freedom-kl26z/minnsh/defconfig
+++ b/configs/freedom-kl26z/minnsh/defconfig
@@ -786,7 +786,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/freedom-kl26z/nsh/defconfig b/configs/freedom-kl26z/nsh/defconfig
index c6c7dc985f..4e8d2b0f70 100644
--- a/configs/freedom-kl26z/nsh/defconfig
+++ b/configs/freedom-kl26z/nsh/defconfig
@@ -816,7 +816,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/hymini-stm32v/buttons/defconfig b/configs/hymini-stm32v/buttons/defconfig
index bed31efc27..a1d993bdc0 100644
--- a/configs/hymini-stm32v/buttons/defconfig
+++ b/configs/hymini-stm32v/buttons/defconfig
@@ -1013,7 +1013,7 @@ CONFIG_EXAMPLES_BUTTONS_NAME7="Button 7"
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/hymini-stm32v/nsh/defconfig b/configs/hymini-stm32v/nsh/defconfig
index 44bc062c76..0411715e50 100644
--- a/configs/hymini-stm32v/nsh/defconfig
+++ b/configs/hymini-stm32v/nsh/defconfig
@@ -1134,7 +1134,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/hymini-stm32v/nsh2/defconfig b/configs/hymini-stm32v/nsh2/defconfig
index 6613d88a84..3e00b1e478 100644
--- a/configs/hymini-stm32v/nsh2/defconfig
+++ b/configs/hymini-stm32v/nsh2/defconfig
@@ -1415,7 +1415,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/hymini-stm32v/usbmsc/defconfig b/configs/hymini-stm32v/usbmsc/defconfig
index 75652b23a6..50290a135f 100644
--- a/configs/hymini-stm32v/usbmsc/defconfig
+++ b/configs/hymini-stm32v/usbmsc/defconfig
@@ -1094,7 +1094,7 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/hymini-stm32v/usbnsh/defconfig b/configs/hymini-stm32v/usbnsh/defconfig
index 5ac1d3cc08..c794400467 100644
--- a/configs/hymini-stm32v/usbnsh/defconfig
+++ b/configs/hymini-stm32v/usbnsh/defconfig
@@ -1158,7 +1158,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/hymini-stm32v/usbserial/defconfig b/configs/hymini-stm32v/usbserial/defconfig
index 8f3d549fe2..0771b22ef0 100644
--- a/configs/hymini-stm32v/usbserial/defconfig
+++ b/configs/hymini-stm32v/usbserial/defconfig
@@ -1056,7 +1056,7 @@ CONFIG_EXAMPLES_USBSERIAL_BUFSIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/kwikstik-k40/ostest/defconfig b/configs/kwikstik-k40/ostest/defconfig
index dcf0bda3c3..befa76725d 100644
--- a/configs/kwikstik-k40/ostest/defconfig
+++ b/configs/kwikstik-k40/ostest/defconfig
@@ -761,7 +761,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/launchxl-tms57004/nsh/defconfig b/configs/launchxl-tms57004/nsh/defconfig
index ce89fc88bf..5dac2700b4 100644
--- a/configs/launchxl-tms57004/nsh/defconfig
+++ b/configs/launchxl-tms57004/nsh/defconfig
@@ -857,7 +857,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_I2CTOOL is not set
 # CONFIG_SYSTEM_INSTALL is not set
diff --git a/configs/lincoln60/netnsh/defconfig b/configs/lincoln60/netnsh/defconfig
index 265907de16..eb4939104c 100644
--- a/configs/lincoln60/netnsh/defconfig
+++ b/configs/lincoln60/netnsh/defconfig
@@ -1113,7 +1113,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/lincoln60/nsh/defconfig b/configs/lincoln60/nsh/defconfig
index 223015351e..2b99c9a39e 100644
--- a/configs/lincoln60/nsh/defconfig
+++ b/configs/lincoln60/nsh/defconfig
@@ -871,7 +871,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/lincoln60/thttpd-binfs/defconfig b/configs/lincoln60/thttpd-binfs/defconfig
index a59c0d2ee5..41f2b81909 100644
--- a/configs/lincoln60/thttpd-binfs/defconfig
+++ b/configs/lincoln60/thttpd-binfs/defconfig
@@ -971,7 +971,7 @@ CONFIG_THTTPD_TILDE_MAP_NONE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/lm3s6432-s2e/nsh/defconfig b/configs/lm3s6432-s2e/nsh/defconfig
index 36f502dc4d..cbf540affc 100644
--- a/configs/lm3s6432-s2e/nsh/defconfig
+++ b/configs/lm3s6432-s2e/nsh/defconfig
@@ -1089,7 +1089,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/lm3s6965-ek/discover/defconfig b/configs/lm3s6965-ek/discover/defconfig
index a7c640c03d..abe5b4dce6 100644
--- a/configs/lm3s6965-ek/discover/defconfig
+++ b/configs/lm3s6965-ek/discover/defconfig
@@ -1123,7 +1123,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/lm3s6965-ek/nsh/defconfig b/configs/lm3s6965-ek/nsh/defconfig
index a7c640c03d..abe5b4dce6 100644
--- a/configs/lm3s6965-ek/nsh/defconfig
+++ b/configs/lm3s6965-ek/nsh/defconfig
@@ -1123,7 +1123,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/lm3s6965-ek/nx/defconfig b/configs/lm3s6965-ek/nx/defconfig
index 25f91bb2a3..b9c138e539 100644
--- a/configs/lm3s6965-ek/nx/defconfig
+++ b/configs/lm3s6965-ek/nx/defconfig
@@ -926,7 +926,7 @@ CONFIG_EXAMPLES_NX_EXTERNINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/lm3s6965-ek/tcpecho/defconfig b/configs/lm3s6965-ek/tcpecho/defconfig
index a0b8bd8847..eef4cfa398 100644
--- a/configs/lm3s6965-ek/tcpecho/defconfig
+++ b/configs/lm3s6965-ek/tcpecho/defconfig
@@ -971,7 +971,7 @@ CONFIG_WEBCLIENT_TIMEOUT=10
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/lm3s8962-ek/nsh/defconfig b/configs/lm3s8962-ek/nsh/defconfig
index 6cf80ae026..fbfabcd052 100644
--- a/configs/lm3s8962-ek/nsh/defconfig
+++ b/configs/lm3s8962-ek/nsh/defconfig
@@ -1132,7 +1132,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/lm3s8962-ek/nx/defconfig b/configs/lm3s8962-ek/nx/defconfig
index 30bf76afc8..5f8a28db20 100644
--- a/configs/lm3s8962-ek/nx/defconfig
+++ b/configs/lm3s8962-ek/nx/defconfig
@@ -936,7 +936,7 @@ CONFIG_EXAMPLES_NX_EXTERNINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/lm4f120-launchpad/nsh/defconfig b/configs/lm4f120-launchpad/nsh/defconfig
index 6d41ced7f3..f69c7c3089 100644
--- a/configs/lm4f120-launchpad/nsh/defconfig
+++ b/configs/lm4f120-launchpad/nsh/defconfig
@@ -892,7 +892,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/lpc4330-xplorer/nsh/defconfig b/configs/lpc4330-xplorer/nsh/defconfig
index 045cd709d0..96cee0346b 100644
--- a/configs/lpc4330-xplorer/nsh/defconfig
+++ b/configs/lpc4330-xplorer/nsh/defconfig
@@ -892,7 +892,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/lpc4337-ws/nsh/defconfig b/configs/lpc4337-ws/nsh/defconfig
index ebe47a6fc9..128ae9ca59 100644
--- a/configs/lpc4337-ws/nsh/defconfig
+++ b/configs/lpc4337-ws/nsh/defconfig
@@ -962,7 +962,7 @@ CONFIG_SYSTEM_CDCACM_DEVMINOR=0
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=0
diff --git a/configs/lpc4357-evb/nsh/defconfig b/configs/lpc4357-evb/nsh/defconfig
index a94de720c8..58f05c236e 100644
--- a/configs/lpc4357-evb/nsh/defconfig
+++ b/configs/lpc4357-evb/nsh/defconfig
@@ -884,7 +884,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/lpc4370-link2/nsh/defconfig b/configs/lpc4370-link2/nsh/defconfig
index 96822e9ab2..f740cfd7bf 100644
--- a/configs/lpc4370-link2/nsh/defconfig
+++ b/configs/lpc4370-link2/nsh/defconfig
@@ -958,7 +958,7 @@ CONFIG_SYSTEM_CDCACM_DEVMINOR=0
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=0
diff --git a/configs/lpcxpresso-lpc1115/minnsh/defconfig b/configs/lpcxpresso-lpc1115/minnsh/defconfig
index 6a1ef9c5e3..ea60c5f721 100644
--- a/configs/lpcxpresso-lpc1115/minnsh/defconfig
+++ b/configs/lpcxpresso-lpc1115/minnsh/defconfig
@@ -754,7 +754,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/lpcxpresso-lpc1115/nsh/defconfig b/configs/lpcxpresso-lpc1115/nsh/defconfig
index 26382b3c07..22a4a0c7dc 100644
--- a/configs/lpcxpresso-lpc1115/nsh/defconfig
+++ b/configs/lpcxpresso-lpc1115/nsh/defconfig
@@ -781,7 +781,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/lpcxpresso-lpc1768/dhcpd/defconfig b/configs/lpcxpresso-lpc1768/dhcpd/defconfig
index 1ab45ab5e9..5cb3db6d55 100644
--- a/configs/lpcxpresso-lpc1768/dhcpd/defconfig
+++ b/configs/lpcxpresso-lpc1768/dhcpd/defconfig
@@ -916,7 +916,7 @@ CONFIG_NETUTILS_NETLIB=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/lpcxpresso-lpc1768/nsh/defconfig b/configs/lpcxpresso-lpc1768/nsh/defconfig
index d50765a428..873e93ae07 100644
--- a/configs/lpcxpresso-lpc1768/nsh/defconfig
+++ b/configs/lpcxpresso-lpc1768/nsh/defconfig
@@ -1153,7 +1153,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/lpcxpresso-lpc1768/nx/defconfig b/configs/lpcxpresso-lpc1768/nx/defconfig
index 62553fce52..b1e82a5645 100644
--- a/configs/lpcxpresso-lpc1768/nx/defconfig
+++ b/configs/lpcxpresso-lpc1768/nx/defconfig
@@ -905,7 +905,7 @@ CONFIG_EXAMPLES_NX_EXTERNINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/lpcxpresso-lpc1768/thttpd/defconfig b/configs/lpcxpresso-lpc1768/thttpd/defconfig
index be0fb5fbaf..dc17b59f8b 100644
--- a/configs/lpcxpresso-lpc1768/thttpd/defconfig
+++ b/configs/lpcxpresso-lpc1768/thttpd/defconfig
@@ -955,7 +955,7 @@ CONFIG_THTTPD_TILDE_MAP_NONE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/lpcxpresso-lpc1768/usbmsc/defconfig b/configs/lpcxpresso-lpc1768/usbmsc/defconfig
index 405c185791..ed1b761bcb 100644
--- a/configs/lpcxpresso-lpc1768/usbmsc/defconfig
+++ b/configs/lpcxpresso-lpc1768/usbmsc/defconfig
@@ -839,7 +839,7 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/maple/nsh/defconfig b/configs/maple/nsh/defconfig
index 47b1e70d77..63cc78c6e0 100644
--- a/configs/maple/nsh/defconfig
+++ b/configs/maple/nsh/defconfig
@@ -1118,7 +1118,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/maple/nx/defconfig b/configs/maple/nx/defconfig
index 8b16664414..558ed3d218 100644
--- a/configs/maple/nx/defconfig
+++ b/configs/maple/nx/defconfig
@@ -1333,7 +1333,7 @@ CONFIG_USBDEV_MINOR=0
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_I2CTOOL is not set
 # CONFIG_SYSTEM_INSTALL is not set
diff --git a/configs/maple/usbnsh/defconfig b/configs/maple/usbnsh/defconfig
index 4976608c7f..4729d5ca13 100644
--- a/configs/maple/usbnsh/defconfig
+++ b/configs/maple/usbnsh/defconfig
@@ -1154,7 +1154,7 @@ CONFIG_USBDEV_MINOR=0
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_I2CTOOL is not set
 # CONFIG_SYSTEM_INSTALL is not set
diff --git a/configs/mbed/hidkbd/defconfig b/configs/mbed/hidkbd/defconfig
index 58136eab01..78b35bd634 100644
--- a/configs/mbed/hidkbd/defconfig
+++ b/configs/mbed/hidkbd/defconfig
@@ -800,7 +800,7 @@ CONFIG_EXAMPLES_HIDKBD_DEVNAME="/dev/kbda"
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/mbed/nsh/defconfig b/configs/mbed/nsh/defconfig
index 95999a5e56..617dbe793b 100644
--- a/configs/mbed/nsh/defconfig
+++ b/configs/mbed/nsh/defconfig
@@ -924,7 +924,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/mcu123-lpc214x/composite/defconfig b/configs/mcu123-lpc214x/composite/defconfig
index f98119041d..6d83b3045b 100644
--- a/configs/mcu123-lpc214x/composite/defconfig
+++ b/configs/mcu123-lpc214x/composite/defconfig
@@ -845,7 +845,7 @@ CONFIG_SYSTEM_COMPOSITE_BUFSIZE=256
 # CONFIG_SYSTEM_COMPOSITE_DEBUGMM is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/mcu123-lpc214x/nsh/defconfig b/configs/mcu123-lpc214x/nsh/defconfig
index 9b7c8536ea..73c0d6685f 100644
--- a/configs/mcu123-lpc214x/nsh/defconfig
+++ b/configs/mcu123-lpc214x/nsh/defconfig
@@ -846,7 +846,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/mcu123-lpc214x/usbmsc/defconfig b/configs/mcu123-lpc214x/usbmsc/defconfig
index 250bab2762..6815a2fab6 100644
--- a/configs/mcu123-lpc214x/usbmsc/defconfig
+++ b/configs/mcu123-lpc214x/usbmsc/defconfig
@@ -792,7 +792,7 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/mcu123-lpc214x/usbserial/defconfig b/configs/mcu123-lpc214x/usbserial/defconfig
index f682875dd6..0fd83ba665 100644
--- a/configs/mcu123-lpc214x/usbserial/defconfig
+++ b/configs/mcu123-lpc214x/usbserial/defconfig
@@ -758,7 +758,7 @@ CONFIG_EXAMPLES_USBSERIAL_BUFSIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/mikroe-stm32f4/fulldemo/defconfig b/configs/mikroe-stm32f4/fulldemo/defconfig
index 828f56c1aa..1091be92d6 100644
--- a/configs/mikroe-stm32f4/fulldemo/defconfig
+++ b/configs/mikroe-stm32f4/fulldemo/defconfig
@@ -1739,7 +1739,7 @@ CONFIG_PLATFORM_CONFIGDATA=y
 # CONFIG_SYSTEM_CUTERM is not set
 CONFIG_SYSTEM_FLASH_ERASEALL=y
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 CONFIG_SYSTEM_NXPLAYER=y
diff --git a/configs/mikroe-stm32f4/kostest/defconfig b/configs/mikroe-stm32f4/kostest/defconfig
index a190dc6c56..5a711c2010 100644
--- a/configs/mikroe-stm32f4/kostest/defconfig
+++ b/configs/mikroe-stm32f4/kostest/defconfig
@@ -1312,7 +1312,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/mikroe-stm32f4/nsh/defconfig b/configs/mikroe-stm32f4/nsh/defconfig
index 75d7044bea..6a58a8add3 100644
--- a/configs/mikroe-stm32f4/nsh/defconfig
+++ b/configs/mikroe-stm32f4/nsh/defconfig
@@ -1243,7 +1243,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CUTERM is not set
 CONFIG_SYSTEM_FLASH_ERASEALL=y
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/mikroe-stm32f4/nx/defconfig b/configs/mikroe-stm32f4/nx/defconfig
index 461a9672d0..0a73409cf4 100644
--- a/configs/mikroe-stm32f4/nx/defconfig
+++ b/configs/mikroe-stm32f4/nx/defconfig
@@ -1199,7 +1199,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/mikroe-stm32f4/nxlines/defconfig b/configs/mikroe-stm32f4/nxlines/defconfig
index e290831de8..a83f543825 100644
--- a/configs/mikroe-stm32f4/nxlines/defconfig
+++ b/configs/mikroe-stm32f4/nxlines/defconfig
@@ -1200,7 +1200,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/mikroe-stm32f4/nxtext/defconfig b/configs/mikroe-stm32f4/nxtext/defconfig
index d2cd5abd8b..73fdaa7411 100644
--- a/configs/mikroe-stm32f4/nxtext/defconfig
+++ b/configs/mikroe-stm32f4/nxtext/defconfig
@@ -1209,7 +1209,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/mikroe-stm32f4/usbnsh/defconfig b/configs/mikroe-stm32f4/usbnsh/defconfig
index 8f1a390106..666bf64382 100644
--- a/configs/mikroe-stm32f4/usbnsh/defconfig
+++ b/configs/mikroe-stm32f4/usbnsh/defconfig
@@ -1293,7 +1293,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CUTERM is not set
 CONFIG_SYSTEM_FLASH_ERASEALL=y
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/mirtoo/nsh/defconfig b/configs/mirtoo/nsh/defconfig
index 578532c82c..81c76714ba 100644
--- a/configs/mirtoo/nsh/defconfig
+++ b/configs/mirtoo/nsh/defconfig
@@ -879,7 +879,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/mirtoo/nxffs/defconfig b/configs/mirtoo/nxffs/defconfig
index 0531feb699..229dcf2e0f 100644
--- a/configs/mirtoo/nxffs/defconfig
+++ b/configs/mirtoo/nxffs/defconfig
@@ -943,7 +943,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/moteino-mega/hello/defconfig b/configs/moteino-mega/hello/defconfig
index ddc57e49e3..50794734d6 100644
--- a/configs/moteino-mega/hello/defconfig
+++ b/configs/moteino-mega/hello/defconfig
@@ -578,7 +578,7 @@ CONFIG_EXAMPLES_HELLO=y
 #
 # Intel HEX to binary conversion
 #
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # I2C tool
diff --git a/configs/moteino-mega/nsh/defconfig b/configs/moteino-mega/nsh/defconfig
index f2590d782d..f01eb772ea 100644
--- a/configs/moteino-mega/nsh/defconfig
+++ b/configs/moteino-mega/nsh/defconfig
@@ -663,7 +663,7 @@ CONFIG_NSH_CONSOLE=y
 #
 # Intel HEX to binary conversion
 #
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # I2C tool
diff --git a/configs/moxa/nsh/defconfig b/configs/moxa/nsh/defconfig
index 2408d18fdb..29d3c50617 100644
--- a/configs/moxa/nsh/defconfig
+++ b/configs/moxa/nsh/defconfig
@@ -999,7 +999,7 @@ CONFIG_NSH_LOGIN_FAILCOUNT=3
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/mx1ads/ostest/defconfig b/configs/mx1ads/ostest/defconfig
index 6c09f16ac8..1ed8296f8d 100644
--- a/configs/mx1ads/ostest/defconfig
+++ b/configs/mx1ads/ostest/defconfig
@@ -692,7 +692,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/ntosd-dm320/nettest/defconfig b/configs/ntosd-dm320/nettest/defconfig
index 560e82a279..6cefdd76bb 100644
--- a/configs/ntosd-dm320/nettest/defconfig
+++ b/configs/ntosd-dm320/nettest/defconfig
@@ -829,7 +829,7 @@ CONFIG_NETUTILS_NETLIB=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/ntosd-dm320/nsh/defconfig b/configs/ntosd-dm320/nsh/defconfig
index 7ec57fecca..91b26d4055 100644
--- a/configs/ntosd-dm320/nsh/defconfig
+++ b/configs/ntosd-dm320/nsh/defconfig
@@ -1022,7 +1022,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/ntosd-dm320/poll/defconfig b/configs/ntosd-dm320/poll/defconfig
index 4bf627a38a..45e393b8e1 100644
--- a/configs/ntosd-dm320/poll/defconfig
+++ b/configs/ntosd-dm320/poll/defconfig
@@ -832,7 +832,7 @@ CONFIG_NETUTILS_NETLIB=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/ntosd-dm320/thttpd/defconfig b/configs/ntosd-dm320/thttpd/defconfig
index 04dcca72bd..e17efe6802 100644
--- a/configs/ntosd-dm320/thttpd/defconfig
+++ b/configs/ntosd-dm320/thttpd/defconfig
@@ -872,7 +872,7 @@ CONFIG_THTTPD_TILDE_MAP_NONE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/ntosd-dm320/udp/defconfig b/configs/ntosd-dm320/udp/defconfig
index 6b37219e68..e6e82675dc 100644
--- a/configs/ntosd-dm320/udp/defconfig
+++ b/configs/ntosd-dm320/udp/defconfig
@@ -825,7 +825,7 @@ CONFIG_NETUTILS_NETLIB=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/ntosd-dm320/webserver/defconfig b/configs/ntosd-dm320/webserver/defconfig
index dd23e42cf9..d3d1aecf5c 100644
--- a/configs/ntosd-dm320/webserver/defconfig
+++ b/configs/ntosd-dm320/webserver/defconfig
@@ -839,7 +839,7 @@ CONFIG_NETUTILS_HTTPD_KEEPALIVE_DISABLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/nucleo-144/f746-evalos/defconfig b/configs/nucleo-144/f746-evalos/defconfig
index e95085b7c8..7ca43debd2 100644
--- a/configs/nucleo-144/f746-evalos/defconfig
+++ b/configs/nucleo-144/f746-evalos/defconfig
@@ -1035,7 +1035,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/nucleo-144/f746-nsh/defconfig b/configs/nucleo-144/f746-nsh/defconfig
index d20123a2f0..697bedb51a 100644
--- a/configs/nucleo-144/f746-nsh/defconfig
+++ b/configs/nucleo-144/f746-nsh/defconfig
@@ -1013,7 +1013,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/nucleo-144/f767-evalos/defconfig b/configs/nucleo-144/f767-evalos/defconfig
index 6393ea7d18..767cdf7da9 100644
--- a/configs/nucleo-144/f767-evalos/defconfig
+++ b/configs/nucleo-144/f767-evalos/defconfig
@@ -1039,7 +1039,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/nucleo-144/f767-nsh/defconfig b/configs/nucleo-144/f767-nsh/defconfig
index c7eb54a599..b97dfe2d9a 100644
--- a/configs/nucleo-144/f767-nsh/defconfig
+++ b/configs/nucleo-144/f767-nsh/defconfig
@@ -1017,7 +1017,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/nucleo-f303re/adc/defconfig b/configs/nucleo-f303re/adc/defconfig
index d8aeb57c28..e66c60de33 100644
--- a/configs/nucleo-f303re/adc/defconfig
+++ b/configs/nucleo-f303re/adc/defconfig
@@ -962,7 +962,7 @@ CONFIG_EXAMPLES_ADC_SWTRIG=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/nucleo-f303re/can/defconfig b/configs/nucleo-f303re/can/defconfig
index d25a894c12..c19a6a4487 100644
--- a/configs/nucleo-f303re/can/defconfig
+++ b/configs/nucleo-f303re/can/defconfig
@@ -964,7 +964,7 @@ CONFIG_EXAMPLES_CAN_READWRITE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/nucleo-f303re/nxlines/defconfig b/configs/nucleo-f303re/nxlines/defconfig
index aa42977bb4..ef5f106ef2 100644
--- a/configs/nucleo-f303re/nxlines/defconfig
+++ b/configs/nucleo-f303re/nxlines/defconfig
@@ -1121,7 +1121,7 @@ CONFIG_EXAMPLES_NXLINES_EXTERNINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/nucleo-f303re/pwm/defconfig b/configs/nucleo-f303re/pwm/defconfig
index bb9fdd5178..677e667268 100644
--- a/configs/nucleo-f303re/pwm/defconfig
+++ b/configs/nucleo-f303re/pwm/defconfig
@@ -1068,7 +1068,7 @@ CONFIG_SYSTEM_CLE=y
 CONFIG_SYSTEM_CLE_DEBUGLEVEL=0
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/nucleo-f303re/serialrx/defconfig b/configs/nucleo-f303re/serialrx/defconfig
index e758d84d1f..117e0db998 100644
--- a/configs/nucleo-f303re/serialrx/defconfig
+++ b/configs/nucleo-f303re/serialrx/defconfig
@@ -1028,7 +1028,7 @@ CONFIG_EXAMPLES_SERIALRX_PRINTSTR=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/nucleo-f303re/uavcan/defconfig b/configs/nucleo-f303re/uavcan/defconfig
index 9dd992e89d..f85d04410b 100644
--- a/configs/nucleo-f303re/uavcan/defconfig
+++ b/configs/nucleo-f303re/uavcan/defconfig
@@ -979,7 +979,7 @@ CONFIG_EXAMPLES_UAVCAN_NODE_NAME="org.nuttx.apps.examples.uavcan"
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/nucleo-f4x1re/f401-nsh/defconfig b/configs/nucleo-f4x1re/f401-nsh/defconfig
index e52ef7184c..75cc5e9964 100644
--- a/configs/nucleo-f4x1re/f401-nsh/defconfig
+++ b/configs/nucleo-f4x1re/f401-nsh/defconfig
@@ -1120,7 +1120,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/nucleo-f4x1re/f411-nsh/defconfig b/configs/nucleo-f4x1re/f411-nsh/defconfig
index fa44765d45..3a0fd7511a 100644
--- a/configs/nucleo-f4x1re/f411-nsh/defconfig
+++ b/configs/nucleo-f4x1re/f411-nsh/defconfig
@@ -1122,7 +1122,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/nucleo-l476rg/nsh/defconfig b/configs/nucleo-l476rg/nsh/defconfig
index 4556a51c97..968758596e 100644
--- a/configs/nucleo-l476rg/nsh/defconfig
+++ b/configs/nucleo-l476rg/nsh/defconfig
@@ -992,7 +992,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/nutiny-nuc120/nsh/defconfig b/configs/nutiny-nuc120/nsh/defconfig
index f86db749b4..60b35489d0 100644
--- a/configs/nutiny-nuc120/nsh/defconfig
+++ b/configs/nutiny-nuc120/nsh/defconfig
@@ -819,7 +819,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/olimex-efm32g880f128-stk/nsh/defconfig b/configs/olimex-efm32g880f128-stk/nsh/defconfig
index 0949f6717c..067455ef3e 100644
--- a/configs/olimex-efm32g880f128-stk/nsh/defconfig
+++ b/configs/olimex-efm32g880f128-stk/nsh/defconfig
@@ -812,7 +812,7 @@ CONFIG_SYSTEM_CLE=y
 CONFIG_SYSTEM_CLE_DEBUGLEVEL=0
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/olimex-lpc-h3131/nsh/defconfig b/configs/olimex-lpc-h3131/nsh/defconfig
index fa56b2ff44..a76cfde83d 100644
--- a/configs/olimex-lpc-h3131/nsh/defconfig
+++ b/configs/olimex-lpc-h3131/nsh/defconfig
@@ -827,7 +827,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/olimex-lpc1766stk/ftpc/defconfig b/configs/olimex-lpc1766stk/ftpc/defconfig
index 441fb62dbf..8fc1fe6010 100644
--- a/configs/olimex-lpc1766stk/ftpc/defconfig
+++ b/configs/olimex-lpc1766stk/ftpc/defconfig
@@ -1120,7 +1120,7 @@ CONFIG_NSH_MAX_ROUNDTRIP=20
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/olimex-lpc1766stk/hidkbd/defconfig b/configs/olimex-lpc1766stk/hidkbd/defconfig
index 5d8034a214..f4dd6913b9 100644
--- a/configs/olimex-lpc1766stk/hidkbd/defconfig
+++ b/configs/olimex-lpc1766stk/hidkbd/defconfig
@@ -827,7 +827,7 @@ CONFIG_EXAMPLES_HIDKBD_ENCODED=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/olimex-lpc1766stk/hidmouse/defconfig b/configs/olimex-lpc1766stk/hidmouse/defconfig
index 1f504dd9d8..77d8930168 100644
--- a/configs/olimex-lpc1766stk/hidmouse/defconfig
+++ b/configs/olimex-lpc1766stk/hidmouse/defconfig
@@ -1119,7 +1119,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/olimex-lpc1766stk/nettest/defconfig b/configs/olimex-lpc1766stk/nettest/defconfig
index 90de87d3f0..f53218ac1c 100644
--- a/configs/olimex-lpc1766stk/nettest/defconfig
+++ b/configs/olimex-lpc1766stk/nettest/defconfig
@@ -915,7 +915,7 @@ CONFIG_NETUTILS_NETLIB=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/olimex-lpc1766stk/nsh/defconfig b/configs/olimex-lpc1766stk/nsh/defconfig
index 0a6e134afc..7b565ed90c 100644
--- a/configs/olimex-lpc1766stk/nsh/defconfig
+++ b/configs/olimex-lpc1766stk/nsh/defconfig
@@ -1132,7 +1132,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/olimex-lpc1766stk/nx/defconfig b/configs/olimex-lpc1766stk/nx/defconfig
index ccad8743ea..f774a4d7ca 100644
--- a/configs/olimex-lpc1766stk/nx/defconfig
+++ b/configs/olimex-lpc1766stk/nx/defconfig
@@ -913,7 +913,7 @@ CONFIG_EXAMPLES_NX_EXTERNINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/olimex-lpc1766stk/slip-httpd/defconfig b/configs/olimex-lpc1766stk/slip-httpd/defconfig
index a19664a5ed..6033db7243 100644
--- a/configs/olimex-lpc1766stk/slip-httpd/defconfig
+++ b/configs/olimex-lpc1766stk/slip-httpd/defconfig
@@ -917,7 +917,7 @@ CONFIG_THTTPD_TILDE_MAP_NONE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/olimex-lpc1766stk/thttpd-binfs/defconfig b/configs/olimex-lpc1766stk/thttpd-binfs/defconfig
index ed2da29d9e..bf7ea99772 100644
--- a/configs/olimex-lpc1766stk/thttpd-binfs/defconfig
+++ b/configs/olimex-lpc1766stk/thttpd-binfs/defconfig
@@ -968,7 +968,7 @@ CONFIG_THTTPD_TILDE_MAP_NONE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/olimex-lpc1766stk/thttpd-nxflat/defconfig b/configs/olimex-lpc1766stk/thttpd-nxflat/defconfig
index 2db964db32..f53e7d5f4a 100644
--- a/configs/olimex-lpc1766stk/thttpd-nxflat/defconfig
+++ b/configs/olimex-lpc1766stk/thttpd-nxflat/defconfig
@@ -956,7 +956,7 @@ CONFIG_THTTPD_TILDE_MAP_NONE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/olimex-lpc1766stk/usbmsc/defconfig b/configs/olimex-lpc1766stk/usbmsc/defconfig
index 35799df910..2ddcb5ccbd 100644
--- a/configs/olimex-lpc1766stk/usbmsc/defconfig
+++ b/configs/olimex-lpc1766stk/usbmsc/defconfig
@@ -840,7 +840,7 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/olimex-lpc1766stk/usbserial/defconfig b/configs/olimex-lpc1766stk/usbserial/defconfig
index 2daf97a61c..7010288b62 100644
--- a/configs/olimex-lpc1766stk/usbserial/defconfig
+++ b/configs/olimex-lpc1766stk/usbserial/defconfig
@@ -809,7 +809,7 @@ CONFIG_EXAMPLES_USBSERIAL_BUFSIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/olimex-lpc1766stk/zmodem/defconfig b/configs/olimex-lpc1766stk/zmodem/defconfig
index fbcfccd144..3ea8b1c647 100644
--- a/configs/olimex-lpc1766stk/zmodem/defconfig
+++ b/configs/olimex-lpc1766stk/zmodem/defconfig
@@ -1145,7 +1145,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/olimex-lpc2378/nsh/defconfig b/configs/olimex-lpc2378/nsh/defconfig
index 226f178aae..e6cba4b36f 100644
--- a/configs/olimex-lpc2378/nsh/defconfig
+++ b/configs/olimex-lpc2378/nsh/defconfig
@@ -795,7 +795,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/olimex-stm32-e407/nsh/defconfig b/configs/olimex-stm32-e407/nsh/defconfig
index 012c6c9168..dab00f77d1 100644
--- a/configs/olimex-stm32-e407/nsh/defconfig
+++ b/configs/olimex-stm32-e407/nsh/defconfig
@@ -1157,7 +1157,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/olimex-stm32-e407/usbnsh/defconfig b/configs/olimex-stm32-e407/usbnsh/defconfig
index 0010a33bb1..9e1752b9a8 100644
--- a/configs/olimex-stm32-e407/usbnsh/defconfig
+++ b/configs/olimex-stm32-e407/usbnsh/defconfig
@@ -1217,7 +1217,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/olimex-stm32-h405/usbnsh/defconfig b/configs/olimex-stm32-h405/usbnsh/defconfig
index ef7d128fb9..807518f873 100644
--- a/configs/olimex-stm32-h405/usbnsh/defconfig
+++ b/configs/olimex-stm32-h405/usbnsh/defconfig
@@ -1245,7 +1245,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/olimex-stm32-h407/nsh/defconfig b/configs/olimex-stm32-h407/nsh/defconfig
index 4acf5a553f..9c4da0d2fe 100644
--- a/configs/olimex-stm32-h407/nsh/defconfig
+++ b/configs/olimex-stm32-h407/nsh/defconfig
@@ -1156,7 +1156,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/olimex-stm32-p107/nsh/defconfig b/configs/olimex-stm32-p107/nsh/defconfig
index 1065df7ce9..49aeb5af03 100644
--- a/configs/olimex-stm32-p107/nsh/defconfig
+++ b/configs/olimex-stm32-p107/nsh/defconfig
@@ -1366,7 +1366,7 @@ CONFIG_NSH_MAX_ROUNDTRIP=20
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/olimex-stm32-p207/nsh/defconfig b/configs/olimex-stm32-p207/nsh/defconfig
index ec99e3837a..bcd74d2971 100644
--- a/configs/olimex-stm32-p207/nsh/defconfig
+++ b/configs/olimex-stm32-p207/nsh/defconfig
@@ -1431,7 +1431,7 @@ CONFIG_NSH_MAX_ROUNDTRIP=20
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/olimex-strp711/nettest/defconfig b/configs/olimex-strp711/nettest/defconfig
index 1dc0270463..0d4a5ee0fb 100644
--- a/configs/olimex-strp711/nettest/defconfig
+++ b/configs/olimex-strp711/nettest/defconfig
@@ -878,7 +878,7 @@ CONFIG_NETUTILS_NETLIB=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/olimex-strp711/nsh/defconfig b/configs/olimex-strp711/nsh/defconfig
index ed9e622b0d..9297050392 100644
--- a/configs/olimex-strp711/nsh/defconfig
+++ b/configs/olimex-strp711/nsh/defconfig
@@ -856,7 +856,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/olimexino-stm32/can/defconfig b/configs/olimexino-stm32/can/defconfig
index 9366accf05..dbb0994a9d 100644
--- a/configs/olimexino-stm32/can/defconfig
+++ b/configs/olimexino-stm32/can/defconfig
@@ -1206,7 +1206,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_I2CTOOL is not set
 # CONFIG_SYSTEM_INSTALL is not set
diff --git a/configs/olimexino-stm32/composite/defconfig b/configs/olimexino-stm32/composite/defconfig
index a58f83346f..9a409e6460 100644
--- a/configs/olimexino-stm32/composite/defconfig
+++ b/configs/olimexino-stm32/composite/defconfig
@@ -1314,7 +1314,7 @@ CONFIG_SYSTEM_COMPOSITE_BUFSIZE=256
 # CONFIG_SYSTEM_COMPOSITE_DEBUGMM is not set
 # CONFIG_SYSTEM_CUTERM is not set
 CONFIG_SYSTEM_FREE=y
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/olimexino-stm32/nsh/defconfig b/configs/olimexino-stm32/nsh/defconfig
index e963472cb3..5770095755 100644
--- a/configs/olimexino-stm32/nsh/defconfig
+++ b/configs/olimexino-stm32/nsh/defconfig
@@ -1229,7 +1229,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 CONFIG_SYSTEM_FREE=y
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/olimexino-stm32/smallnsh/defconfig b/configs/olimexino-stm32/smallnsh/defconfig
index 6a870a7f6e..a8ff93b3ff 100644
--- a/configs/olimexino-stm32/smallnsh/defconfig
+++ b/configs/olimexino-stm32/smallnsh/defconfig
@@ -1166,7 +1166,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/olimexino-stm32/tiny/defconfig b/configs/olimexino-stm32/tiny/defconfig
index 0e5679272c..9bf4ddeff9 100644
--- a/configs/olimexino-stm32/tiny/defconfig
+++ b/configs/olimexino-stm32/tiny/defconfig
@@ -1074,7 +1074,7 @@ CONFIG_EXAMPLES_CAN_READWRITE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/open1788/knsh/defconfig b/configs/open1788/knsh/defconfig
index aa2c88fd4a..73ef473d54 100644
--- a/configs/open1788/knsh/defconfig
+++ b/configs/open1788/knsh/defconfig
@@ -903,7 +903,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/open1788/nsh/defconfig b/configs/open1788/nsh/defconfig
index 53981b180c..c7da461f8b 100644
--- a/configs/open1788/nsh/defconfig
+++ b/configs/open1788/nsh/defconfig
@@ -913,7 +913,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/open1788/nxlines/defconfig b/configs/open1788/nxlines/defconfig
index 38f0eb053d..3ba4b262f9 100644
--- a/configs/open1788/nxlines/defconfig
+++ b/configs/open1788/nxlines/defconfig
@@ -941,7 +941,7 @@ CONFIG_EXAMPLES_NXLINES_BPP=32
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/pcblogic-pic32mx/nsh/defconfig b/configs/pcblogic-pic32mx/nsh/defconfig
index 4f23559c87..d5cb127e3f 100644
--- a/configs/pcblogic-pic32mx/nsh/defconfig
+++ b/configs/pcblogic-pic32mx/nsh/defconfig
@@ -894,7 +894,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/pcduino-a10/nsh/defconfig b/configs/pcduino-a10/nsh/defconfig
index 3fbc6318cf..8de6365d1a 100644
--- a/configs/pcduino-a10/nsh/defconfig
+++ b/configs/pcduino-a10/nsh/defconfig
@@ -896,7 +896,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/pic32mx-starterkit/nsh/defconfig b/configs/pic32mx-starterkit/nsh/defconfig
index 2c2994b8f6..4e62e0aaa9 100644
--- a/configs/pic32mx-starterkit/nsh/defconfig
+++ b/configs/pic32mx-starterkit/nsh/defconfig
@@ -958,7 +958,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/pic32mx-starterkit/nsh2/defconfig b/configs/pic32mx-starterkit/nsh2/defconfig
index fb7a8299c9..e348af2a4c 100644
--- a/configs/pic32mx-starterkit/nsh2/defconfig
+++ b/configs/pic32mx-starterkit/nsh2/defconfig
@@ -1172,7 +1172,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/pic32mx7mmb/nsh/defconfig b/configs/pic32mx7mmb/nsh/defconfig
index cf40beab3b..bd048635e3 100644
--- a/configs/pic32mx7mmb/nsh/defconfig
+++ b/configs/pic32mx7mmb/nsh/defconfig
@@ -1235,7 +1235,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/pic32mz-starterkit/nsh/defconfig b/configs/pic32mz-starterkit/nsh/defconfig
index 706ddbd17d..2e34b71f23 100644
--- a/configs/pic32mz-starterkit/nsh/defconfig
+++ b/configs/pic32mz-starterkit/nsh/defconfig
@@ -885,7 +885,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/pirelli_dpl10/nsh_highram/defconfig b/configs/pirelli_dpl10/nsh_highram/defconfig
index a0008f818b..0928bf0425 100644
--- a/configs/pirelli_dpl10/nsh_highram/defconfig
+++ b/configs/pirelli_dpl10/nsh_highram/defconfig
@@ -798,7 +798,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sabre-6quad/nsh/defconfig b/configs/sabre-6quad/nsh/defconfig
index fe2e625a2d..1ab7f2c4c5 100644
--- a/configs/sabre-6quad/nsh/defconfig
+++ b/configs/sabre-6quad/nsh/defconfig
@@ -869,7 +869,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sabre-6quad/smp/defconfig b/configs/sabre-6quad/smp/defconfig
index 6028bfb91c..5ca09504dc 100644
--- a/configs/sabre-6quad/smp/defconfig
+++ b/configs/sabre-6quad/smp/defconfig
@@ -877,7 +877,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sam3u-ek/knsh/defconfig b/configs/sam3u-ek/knsh/defconfig
index a14dcebcab..fdd4d7852b 100644
--- a/configs/sam3u-ek/knsh/defconfig
+++ b/configs/sam3u-ek/knsh/defconfig
@@ -918,7 +918,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sam3u-ek/nsh/defconfig b/configs/sam3u-ek/nsh/defconfig
index ceb2c36d2c..e2a4ed5993 100644
--- a/configs/sam3u-ek/nsh/defconfig
+++ b/configs/sam3u-ek/nsh/defconfig
@@ -913,7 +913,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sam3u-ek/nx/defconfig b/configs/sam3u-ek/nx/defconfig
index 86a492c375..499368e153 100644
--- a/configs/sam3u-ek/nx/defconfig
+++ b/configs/sam3u-ek/nx/defconfig
@@ -914,7 +914,7 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sam3u-ek/nxwm/defconfig b/configs/sam3u-ek/nxwm/defconfig
index 3966522e3e..713b5e2f36 100644
--- a/configs/sam3u-ek/nxwm/defconfig
+++ b/configs/sam3u-ek/nxwm/defconfig
@@ -1253,7 +1253,7 @@ CONFIG_NXWM_HEXCALCULATOR_FONTID=5
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sam4e-ek/nsh/defconfig b/configs/sam4e-ek/nsh/defconfig
index 8664c7d7a0..1104c510bf 100644
--- a/configs/sam4e-ek/nsh/defconfig
+++ b/configs/sam4e-ek/nsh/defconfig
@@ -1235,7 +1235,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/sam4e-ek/nxwm/defconfig b/configs/sam4e-ek/nxwm/defconfig
index 5948ce08b8..378d28ba11 100644
--- a/configs/sam4e-ek/nxwm/defconfig
+++ b/configs/sam4e-ek/nxwm/defconfig
@@ -1588,7 +1588,7 @@ CONFIG_NXWM_HEXCALCULATOR_FONTID=5
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/sam4e-ek/usbnsh/defconfig b/configs/sam4e-ek/usbnsh/defconfig
index 0ea1481ce8..a422f34571 100644
--- a/configs/sam4e-ek/usbnsh/defconfig
+++ b/configs/sam4e-ek/usbnsh/defconfig
@@ -1275,7 +1275,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/sam4l-xplained/nsh/defconfig b/configs/sam4l-xplained/nsh/defconfig
index c848386d6b..34dd699cd7 100644
--- a/configs/sam4l-xplained/nsh/defconfig
+++ b/configs/sam4l-xplained/nsh/defconfig
@@ -922,7 +922,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sam4s-xplained-pro/nsh/defconfig b/configs/sam4s-xplained-pro/nsh/defconfig
index eae881f10a..9e87745c51 100644
--- a/configs/sam4s-xplained-pro/nsh/defconfig
+++ b/configs/sam4s-xplained-pro/nsh/defconfig
@@ -1082,7 +1082,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sam4s-xplained/nsh/defconfig b/configs/sam4s-xplained/nsh/defconfig
index 10afa826f1..6d4512f72c 100644
--- a/configs/sam4s-xplained/nsh/defconfig
+++ b/configs/sam4s-xplained/nsh/defconfig
@@ -895,7 +895,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sama5d2-xult/nsh/defconfig b/configs/sama5d2-xult/nsh/defconfig
index bbedda8697..86220f7ed3 100644
--- a/configs/sama5d2-xult/nsh/defconfig
+++ b/configs/sama5d2-xult/nsh/defconfig
@@ -1076,7 +1076,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 CONFIG_SYSTEM_NXPLAYER=y
diff --git a/configs/sama5d3-xplained/bridge/defconfig b/configs/sama5d3-xplained/bridge/defconfig
index a32be2985d..f1fb1d5578 100644
--- a/configs/sama5d3-xplained/bridge/defconfig
+++ b/configs/sama5d3-xplained/bridge/defconfig
@@ -1077,7 +1077,7 @@ CONFIG_NETUTILS_NETLIB=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 CONFIG_SYSTEM_RAMTEST=y
diff --git a/configs/sama5d3-xplained/nsh/defconfig b/configs/sama5d3-xplained/nsh/defconfig
index 7733b5bd39..8a42f500de 100644
--- a/configs/sama5d3-xplained/nsh/defconfig
+++ b/configs/sama5d3-xplained/nsh/defconfig
@@ -949,7 +949,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sama5d3x-ek/demo/defconfig b/configs/sama5d3x-ek/demo/defconfig
index 318b920ec8..c142bb83eb 100644
--- a/configs/sama5d3x-ek/demo/defconfig
+++ b/configs/sama5d3x-ek/demo/defconfig
@@ -1149,7 +1149,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sama5d3x-ek/hello/defconfig b/configs/sama5d3x-ek/hello/defconfig
index 711ff3aab8..bd18ec1393 100644
--- a/configs/sama5d3x-ek/hello/defconfig
+++ b/configs/sama5d3x-ek/hello/defconfig
@@ -809,7 +809,7 @@ CONFIG_EXAMPLES_HELLO_STACKSIZE=2048
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sama5d3x-ek/norboot/defconfig b/configs/sama5d3x-ek/norboot/defconfig
index f097303188..0eae073a7b 100644
--- a/configs/sama5d3x-ek/norboot/defconfig
+++ b/configs/sama5d3x-ek/norboot/defconfig
@@ -823,7 +823,7 @@ CONFIG_EXAMPLES_HELLO_STACKSIZE=2048
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sama5d3x-ek/nsh/defconfig b/configs/sama5d3x-ek/nsh/defconfig
index a83632746f..28ddf8a820 100644
--- a/configs/sama5d3x-ek/nsh/defconfig
+++ b/configs/sama5d3x-ek/nsh/defconfig
@@ -962,7 +962,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sama5d3x-ek/nx/defconfig b/configs/sama5d3x-ek/nx/defconfig
index a9110cb257..204384004c 100644
--- a/configs/sama5d3x-ek/nx/defconfig
+++ b/configs/sama5d3x-ek/nx/defconfig
@@ -982,7 +982,7 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sama5d3x-ek/nxplayer/defconfig b/configs/sama5d3x-ek/nxplayer/defconfig
index 222d4832fe..421064ada2 100644
--- a/configs/sama5d3x-ek/nxplayer/defconfig
+++ b/configs/sama5d3x-ek/nxplayer/defconfig
@@ -1095,7 +1095,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_I2CTOOL is not set
 # CONFIG_SYSTEM_INSTALL is not set
diff --git a/configs/sama5d3x-ek/nxwm/defconfig b/configs/sama5d3x-ek/nxwm/defconfig
index d9ca7a5576..aa75930aca 100644
--- a/configs/sama5d3x-ek/nxwm/defconfig
+++ b/configs/sama5d3x-ek/nxwm/defconfig
@@ -1341,7 +1341,7 @@ CONFIG_NXWM_HEXCALCULATOR_FONTID=6
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sama5d3x-ek/ov2640/defconfig b/configs/sama5d3x-ek/ov2640/defconfig
index 62fc4177eb..e117995124 100644
--- a/configs/sama5d3x-ek/ov2640/defconfig
+++ b/configs/sama5d3x-ek/ov2640/defconfig
@@ -892,7 +892,7 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_I2CTOOL is not set
 # CONFIG_SYSTEM_INSTALL is not set
diff --git a/configs/sama5d4-ek/at25boot/defconfig b/configs/sama5d4-ek/at25boot/defconfig
index 7fec0ba4aa..542da7876c 100644
--- a/configs/sama5d4-ek/at25boot/defconfig
+++ b/configs/sama5d4-ek/at25boot/defconfig
@@ -927,8 +927,8 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-CONFIG_SYSTEM_HEX2BIN=y
-# CONFIG_SYSTEM_HEX2BIN_DEBUG is not set
+CONFIG_LIB_HEX2BIN=y
+# CONFIG_LIB_HEX2BIN_DEBUG is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sama5d4-ek/bridge/defconfig b/configs/sama5d4-ek/bridge/defconfig
index 76a5894a9d..dc6c38984f 100644
--- a/configs/sama5d4-ek/bridge/defconfig
+++ b/configs/sama5d4-ek/bridge/defconfig
@@ -1110,7 +1110,7 @@ CONFIG_NETUTILS_NETLIB=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 CONFIG_SYSTEM_RAMTEST=y
diff --git a/configs/sama5d4-ek/dramboot/defconfig b/configs/sama5d4-ek/dramboot/defconfig
index 2069204439..9734228456 100644
--- a/configs/sama5d4-ek/dramboot/defconfig
+++ b/configs/sama5d4-ek/dramboot/defconfig
@@ -878,8 +878,8 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-CONFIG_SYSTEM_HEX2BIN=y
-# CONFIG_SYSTEM_HEX2BIN_DEBUG is not set
+CONFIG_LIB_HEX2BIN=y
+# CONFIG_LIB_HEX2BIN_DEBUG is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sama5d4-ek/elf/defconfig b/configs/sama5d4-ek/elf/defconfig
index 7b2b355e2d..0fc6184246 100644
--- a/configs/sama5d4-ek/elf/defconfig
+++ b/configs/sama5d4-ek/elf/defconfig
@@ -931,7 +931,7 @@ CONFIG_EXAMPLES_ELF_CXXINITIALIZE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_I2CTOOL is not set
 # CONFIG_SYSTEM_INSTALL is not set
diff --git a/configs/sama5d4-ek/ipv6/defconfig b/configs/sama5d4-ek/ipv6/defconfig
index a5400f4e90..d25afb5066 100644
--- a/configs/sama5d4-ek/ipv6/defconfig
+++ b/configs/sama5d4-ek/ipv6/defconfig
@@ -1594,7 +1594,7 @@ CONFIG_NSH_MAX_ROUNDTRIP=20
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=0
diff --git a/configs/sama5d4-ek/knsh/defconfig b/configs/sama5d4-ek/knsh/defconfig
index d08f54cfd0..64f29e3e05 100644
--- a/configs/sama5d4-ek/knsh/defconfig
+++ b/configs/sama5d4-ek/knsh/defconfig
@@ -1074,7 +1074,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sama5d4-ek/nsh/defconfig b/configs/sama5d4-ek/nsh/defconfig
index bf72a2a86b..7758f5bd93 100644
--- a/configs/sama5d4-ek/nsh/defconfig
+++ b/configs/sama5d4-ek/nsh/defconfig
@@ -1595,7 +1595,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=0
diff --git a/configs/sama5d4-ek/nxwm/defconfig b/configs/sama5d4-ek/nxwm/defconfig
index add09daf5f..3bf40dbcad 100644
--- a/configs/sama5d4-ek/nxwm/defconfig
+++ b/configs/sama5d4-ek/nxwm/defconfig
@@ -1784,7 +1784,7 @@ CONFIG_NXWM_MEDIAPLAYER_MINVOLUMEHEIGHT=6
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=0
diff --git a/configs/sama5d4-ek/ramtest/defconfig b/configs/sama5d4-ek/ramtest/defconfig
index 00c135747e..3c618b6365 100644
--- a/configs/sama5d4-ek/ramtest/defconfig
+++ b/configs/sama5d4-ek/ramtest/defconfig
@@ -976,7 +976,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 CONFIG_SYSTEM_RAMTEST=y
diff --git a/configs/sama5d4-ek/src/at25_main.c b/configs/sama5d4-ek/src/at25_main.c
index 078ee1725d..699f613b10 100644
--- a/configs/sama5d4-ek/src/at25_main.c
+++ b/configs/sama5d4-ek/src/at25_main.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/sama5d4-ek/src/at25_main.c
  *
- *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2014, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,10 +47,10 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
-#include 
 
 #include "sama5d4-ek.h"
 
diff --git a/configs/sama5d4-ek/src/dram_main.c b/configs/sama5d4-ek/src/dram_main.c
index a36b646646..e84a9ddcff 100644
--- a/configs/sama5d4-ek/src/dram_main.c
+++ b/configs/sama5d4-ek/src/dram_main.c
@@ -41,9 +41,9 @@
 
 #include 
 #include 
+#include 
 
 #include 
-#include 
 
 #include "up_arch.h"
 #include "mmu.h"
diff --git a/configs/samd20-xplained/nsh/defconfig b/configs/samd20-xplained/nsh/defconfig
index 5b77260e57..e647799717 100644
--- a/configs/samd20-xplained/nsh/defconfig
+++ b/configs/samd20-xplained/nsh/defconfig
@@ -897,7 +897,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/samd21-xplained/nsh/defconfig b/configs/samd21-xplained/nsh/defconfig
index 4b5a9b44ce..c11eec68eb 100644
--- a/configs/samd21-xplained/nsh/defconfig
+++ b/configs/samd21-xplained/nsh/defconfig
@@ -895,7 +895,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/same70-xplained/netnsh/defconfig b/configs/same70-xplained/netnsh/defconfig
index 0f03d530c1..0161adc368 100644
--- a/configs/same70-xplained/netnsh/defconfig
+++ b/configs/same70-xplained/netnsh/defconfig
@@ -1291,7 +1291,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=0
diff --git a/configs/same70-xplained/nsh/defconfig b/configs/same70-xplained/nsh/defconfig
index cb89c826f1..00beab0a5b 100644
--- a/configs/same70-xplained/nsh/defconfig
+++ b/configs/same70-xplained/nsh/defconfig
@@ -1056,7 +1056,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=0
diff --git a/configs/saml21-xplained/nsh/defconfig b/configs/saml21-xplained/nsh/defconfig
index 7d37c41d4e..6aa541a803 100644
--- a/configs/saml21-xplained/nsh/defconfig
+++ b/configs/saml21-xplained/nsh/defconfig
@@ -883,7 +883,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/samv71-xult/knsh/defconfig b/configs/samv71-xult/knsh/defconfig
index 64d931ab93..f405320699 100644
--- a/configs/samv71-xult/knsh/defconfig
+++ b/configs/samv71-xult/knsh/defconfig
@@ -1046,7 +1046,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=0
diff --git a/configs/samv71-xult/module/defconfig b/configs/samv71-xult/module/defconfig
index dcd165c2ae..82ec913424 100644
--- a/configs/samv71-xult/module/defconfig
+++ b/configs/samv71-xult/module/defconfig
@@ -973,7 +973,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/samv71-xult/mxtxplnd/defconfig b/configs/samv71-xult/mxtxplnd/defconfig
index 24970c51a2..f0313670b6 100644
--- a/configs/samv71-xult/mxtxplnd/defconfig
+++ b/configs/samv71-xult/mxtxplnd/defconfig
@@ -1197,7 +1197,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=0
diff --git a/configs/samv71-xult/netnsh/defconfig b/configs/samv71-xult/netnsh/defconfig
index 90595673e0..3f47a88525 100644
--- a/configs/samv71-xult/netnsh/defconfig
+++ b/configs/samv71-xult/netnsh/defconfig
@@ -1295,7 +1295,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=0
diff --git a/configs/samv71-xult/nsh/defconfig b/configs/samv71-xult/nsh/defconfig
index 03913ee6a1..b7c95d30e7 100644
--- a/configs/samv71-xult/nsh/defconfig
+++ b/configs/samv71-xult/nsh/defconfig
@@ -1058,7 +1058,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=0
diff --git a/configs/samv71-xult/nxwm/defconfig b/configs/samv71-xult/nxwm/defconfig
index c6e14be293..c385829eb1 100644
--- a/configs/samv71-xult/nxwm/defconfig
+++ b/configs/samv71-xult/nxwm/defconfig
@@ -1377,7 +1377,7 @@ CONFIG_NXWM_HEXCALCULATOR_FONTID=5
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=0
diff --git a/configs/samv71-xult/vnc/defconfig b/configs/samv71-xult/vnc/defconfig
index df447f54cf..46715eda2a 100644
--- a/configs/samv71-xult/vnc/defconfig
+++ b/configs/samv71-xult/vnc/defconfig
@@ -1375,7 +1375,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_I2CTOOL is not set
 # CONFIG_SYSTEM_INSTALL is not set
diff --git a/configs/samv71-xult/vnxwm/defconfig b/configs/samv71-xult/vnxwm/defconfig
index f4327906b8..71d57c33be 100644
--- a/configs/samv71-xult/vnxwm/defconfig
+++ b/configs/samv71-xult/vnxwm/defconfig
@@ -1566,7 +1566,7 @@ CONFIG_NXWM_HEXCALCULATOR_FONTID=5
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_I2CTOOL is not set
 # CONFIG_SYSTEM_INSTALL is not set
diff --git a/configs/shenzhou/nsh/defconfig b/configs/shenzhou/nsh/defconfig
index af9e915439..2ef672ff69 100644
--- a/configs/shenzhou/nsh/defconfig
+++ b/configs/shenzhou/nsh/defconfig
@@ -1394,7 +1394,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/shenzhou/nxwm/defconfig b/configs/shenzhou/nxwm/defconfig
index dd76d669aa..944936912a 100644
--- a/configs/shenzhou/nxwm/defconfig
+++ b/configs/shenzhou/nxwm/defconfig
@@ -1721,7 +1721,7 @@ CONFIG_NXWM_HEXCALCULATOR_FONTID=5
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/shenzhou/thttpd/defconfig b/configs/shenzhou/thttpd/defconfig
index a1150884ef..64cb41b517 100644
--- a/configs/shenzhou/thttpd/defconfig
+++ b/configs/shenzhou/thttpd/defconfig
@@ -1499,7 +1499,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/sim/bas/defconfig b/configs/sim/bas/defconfig
index 0045828f2e..28b919a3ee 100644
--- a/configs/sim/bas/defconfig
+++ b/configs/sim/bas/defconfig
@@ -717,7 +717,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sim/configdata/defconfig b/configs/sim/configdata/defconfig
index 1f8af42edf..7b5ffd275e 100644
--- a/configs/sim/configdata/defconfig
+++ b/configs/sim/configdata/defconfig
@@ -625,7 +625,7 @@ CONFIG_PLATFORM_CONFIGDATA=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sim/cxxtest/defconfig b/configs/sim/cxxtest/defconfig
index aceb1fc38d..11b482a728 100644
--- a/configs/sim/cxxtest/defconfig
+++ b/configs/sim/cxxtest/defconfig
@@ -600,7 +600,7 @@ CONFIG_EXAMPLES_CXXTEST=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sim/mount/defconfig b/configs/sim/mount/defconfig
index 60d8ee2f28..e9031cd22e 100644
--- a/configs/sim/mount/defconfig
+++ b/configs/sim/mount/defconfig
@@ -598,7 +598,7 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sim/mtdpart/defconfig b/configs/sim/mtdpart/defconfig
index df0f7c19a4..74c851f7f2 100644
--- a/configs/sim/mtdpart/defconfig
+++ b/configs/sim/mtdpart/defconfig
@@ -607,7 +607,7 @@ CONFIG_EXAMPLES_MTDPART_NPARTITIONS=3
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sim/mtdrwb/defconfig b/configs/sim/mtdrwb/defconfig
index f7da4507c0..6e56c95229 100644
--- a/configs/sim/mtdrwb/defconfig
+++ b/configs/sim/mtdrwb/defconfig
@@ -639,7 +639,7 @@ CONFIG_EXAMPLES_MTDRWB_NEBLOCKS=32
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sim/nettest/defconfig b/configs/sim/nettest/defconfig
index a5124f251a..f16f365741 100644
--- a/configs/sim/nettest/defconfig
+++ b/configs/sim/nettest/defconfig
@@ -728,7 +728,7 @@ CONFIG_NETUTILS_NETLIB=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
diff --git a/configs/sim/nsh/defconfig b/configs/sim/nsh/defconfig
index b0eb7f0c9f..1cd2e2842c 100644
--- a/configs/sim/nsh/defconfig
+++ b/configs/sim/nsh/defconfig
@@ -764,7 +764,7 @@ CONFIG_NSH_LOGIN_FAILCOUNT=3
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sim/nsh2/defconfig b/configs/sim/nsh2/defconfig
index bc6571c458..baefa6fdce 100644
--- a/configs/sim/nsh2/defconfig
+++ b/configs/sim/nsh2/defconfig
@@ -841,7 +841,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sim/nx/defconfig b/configs/sim/nx/defconfig
index 688161175d..8c2777349d 100644
--- a/configs/sim/nx/defconfig
+++ b/configs/sim/nx/defconfig
@@ -672,7 +672,7 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sim/nx11/defconfig b/configs/sim/nx11/defconfig
index d1987dc8ab..b43102e8d6 100644
--- a/configs/sim/nx11/defconfig
+++ b/configs/sim/nx11/defconfig
@@ -674,7 +674,7 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sim/nxffs/defconfig b/configs/sim/nxffs/defconfig
index 1cd792167e..49f9a76e56 100644
--- a/configs/sim/nxffs/defconfig
+++ b/configs/sim/nxffs/defconfig
@@ -596,7 +596,7 @@ CONFIG_EXAMPLES_NXFFS_NLOOPS=100
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sim/nxlines/defconfig b/configs/sim/nxlines/defconfig
index 28f3880aed..4bb0377e58 100644
--- a/configs/sim/nxlines/defconfig
+++ b/configs/sim/nxlines/defconfig
@@ -813,7 +813,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sim/nxwm/defconfig b/configs/sim/nxwm/defconfig
index 9287f229bd..9413d2dbe6 100644
--- a/configs/sim/nxwm/defconfig
+++ b/configs/sim/nxwm/defconfig
@@ -969,7 +969,7 @@ CONFIG_NXWM_CALIBRATION_LISTENERSTACK=2048
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sim/ostest/defconfig b/configs/sim/ostest/defconfig
index 8928a46a2e..e96b5b2232 100644
--- a/configs/sim/ostest/defconfig
+++ b/configs/sim/ostest/defconfig
@@ -608,7 +608,7 @@ CONFIG_EXAMPLES_OSTEST_WAITRESULT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
diff --git a/configs/sim/pashello/defconfig b/configs/sim/pashello/defconfig
index c82757a6aa..0b9ea16bb0 100644
--- a/configs/sim/pashello/defconfig
+++ b/configs/sim/pashello/defconfig
@@ -576,7 +576,7 @@ CONFIG_INTERPRETERS_PCODE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sim/touchscreen/defconfig b/configs/sim/touchscreen/defconfig
index 01012d9eed..7be0481745 100644
--- a/configs/sim/touchscreen/defconfig
+++ b/configs/sim/touchscreen/defconfig
@@ -694,7 +694,7 @@ CONFIG_EXAMPLES_TOUCHSCREEN_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sim/traveler/defconfig b/configs/sim/traveler/defconfig
index 4c260ef894..b38a951a5e 100644
--- a/configs/sim/traveler/defconfig
+++ b/configs/sim/traveler/defconfig
@@ -638,7 +638,7 @@ CONFIG_GRAPHICS_TRAVELER_DEBUG_LEVEL=0
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 CONFIG_FSUTILS_INIFILE=y
 CONFIG_FSUTILS_INIFILE_MAXLINE=256
 CONFIG_FSUTILS_INIFILE_DEBUGLEVEL=0
diff --git a/configs/sim/udgram/defconfig b/configs/sim/udgram/defconfig
index 2c747306d8..7ed422934d 100644
--- a/configs/sim/udgram/defconfig
+++ b/configs/sim/udgram/defconfig
@@ -852,7 +852,7 @@ CONFIG_NSH_MAX_ROUNDTRIP=20
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/sim/unionfs/defconfig b/configs/sim/unionfs/defconfig
index 7bfe0b1ec3..077ef2661c 100644
--- a/configs/sim/unionfs/defconfig
+++ b/configs/sim/unionfs/defconfig
@@ -715,7 +715,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sim/ustream/defconfig b/configs/sim/ustream/defconfig
index 54a6507131..38338722ee 100644
--- a/configs/sim/ustream/defconfig
+++ b/configs/sim/ustream/defconfig
@@ -847,7 +847,7 @@ CONFIG_NSH_MAX_ROUNDTRIP=20
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/spark/composite/defconfig b/configs/spark/composite/defconfig
index 1ef402810f..41d30670c1 100644
--- a/configs/spark/composite/defconfig
+++ b/configs/spark/composite/defconfig
@@ -1294,7 +1294,7 @@ CONFIG_SYSTEM_COMPOSITE_BUFSIZE=256
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/spark/nsh/defconfig b/configs/spark/nsh/defconfig
index 749fdc5e65..7f11b68191 100644
--- a/configs/spark/nsh/defconfig
+++ b/configs/spark/nsh/defconfig
@@ -1280,7 +1280,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/spark/usbmsc/defconfig b/configs/spark/usbmsc/defconfig
index 9e05a1f1b4..62739204b3 100644
--- a/configs/spark/usbmsc/defconfig
+++ b/configs/spark/usbmsc/defconfig
@@ -1242,7 +1242,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/spark/usbnsh/defconfig b/configs/spark/usbnsh/defconfig
index 1316e8034d..f4f917398e 100644
--- a/configs/spark/usbnsh/defconfig
+++ b/configs/spark/usbnsh/defconfig
@@ -1225,7 +1225,7 @@ CONFIG_USBDEV_MINOR=0
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/spark/usbserial/defconfig b/configs/spark/usbserial/defconfig
index 76625f70fa..ef18937031 100644
--- a/configs/spark/usbserial/defconfig
+++ b/configs/spark/usbserial/defconfig
@@ -1161,7 +1161,7 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm3210e-eval/buttons/defconfig b/configs/stm3210e-eval/buttons/defconfig
index 6253cf2193..15ea4b7396 100644
--- a/configs/stm3210e-eval/buttons/defconfig
+++ b/configs/stm3210e-eval/buttons/defconfig
@@ -1021,7 +1021,7 @@ CONFIG_EXAMPLES_BUTTONS_NAME7="UP"
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm3210e-eval/composite/defconfig b/configs/stm3210e-eval/composite/defconfig
index fa4db610c0..ac8c38d7e3 100644
--- a/configs/stm3210e-eval/composite/defconfig
+++ b/configs/stm3210e-eval/composite/defconfig
@@ -1185,7 +1185,7 @@ CONFIG_SYSTEM_COMPOSITE_BUFSIZE=256
 # CONFIG_SYSTEM_COMPOSITE_DEBUGMM is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm3210e-eval/nsh/defconfig b/configs/stm3210e-eval/nsh/defconfig
index fc951bb2b6..0f9a0ad3e8 100644
--- a/configs/stm3210e-eval/nsh/defconfig
+++ b/configs/stm3210e-eval/nsh/defconfig
@@ -1222,7 +1222,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm3210e-eval/nsh2/defconfig b/configs/stm3210e-eval/nsh2/defconfig
index e5f10041dd..1497a49383 100644
--- a/configs/stm3210e-eval/nsh2/defconfig
+++ b/configs/stm3210e-eval/nsh2/defconfig
@@ -1419,7 +1419,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=1
diff --git a/configs/stm3210e-eval/nx/defconfig b/configs/stm3210e-eval/nx/defconfig
index 451e9024a9..655e709976 100644
--- a/configs/stm3210e-eval/nx/defconfig
+++ b/configs/stm3210e-eval/nx/defconfig
@@ -1197,7 +1197,7 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm3210e-eval/nxterm/defconfig b/configs/stm3210e-eval/nxterm/defconfig
index 02bf3d366a..50f19608b6 100644
--- a/configs/stm3210e-eval/nxterm/defconfig
+++ b/configs/stm3210e-eval/nxterm/defconfig
@@ -1289,7 +1289,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm3210e-eval/pm/defconfig b/configs/stm3210e-eval/pm/defconfig
index b23c795374..59f7f4a72c 100644
--- a/configs/stm3210e-eval/pm/defconfig
+++ b/configs/stm3210e-eval/pm/defconfig
@@ -1342,7 +1342,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm3210e-eval/usbmsc/defconfig b/configs/stm3210e-eval/usbmsc/defconfig
index 4914b222ed..8f34178618 100644
--- a/configs/stm3210e-eval/usbmsc/defconfig
+++ b/configs/stm3210e-eval/usbmsc/defconfig
@@ -1099,7 +1099,7 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm3210e-eval/usbserial/defconfig b/configs/stm3210e-eval/usbserial/defconfig
index f8223e3a14..e28ddba956 100644
--- a/configs/stm3210e-eval/usbserial/defconfig
+++ b/configs/stm3210e-eval/usbserial/defconfig
@@ -1062,7 +1062,7 @@ CONFIG_EXAMPLES_USBSERIAL_BUFSIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm3220g-eval/dhcpd/defconfig b/configs/stm3220g-eval/dhcpd/defconfig
index 0d999829ee..5bd2028bcf 100644
--- a/configs/stm3220g-eval/dhcpd/defconfig
+++ b/configs/stm3220g-eval/dhcpd/defconfig
@@ -1197,7 +1197,7 @@ CONFIG_NETUTILS_NETLIB=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm3220g-eval/nettest/defconfig b/configs/stm3220g-eval/nettest/defconfig
index 061c77ea53..a2f0466d3b 100644
--- a/configs/stm3220g-eval/nettest/defconfig
+++ b/configs/stm3220g-eval/nettest/defconfig
@@ -1195,7 +1195,7 @@ CONFIG_NETUTILS_NETLIB=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm3220g-eval/nsh/defconfig b/configs/stm3220g-eval/nsh/defconfig
index fd7610f652..d7743130a1 100644
--- a/configs/stm3220g-eval/nsh/defconfig
+++ b/configs/stm3220g-eval/nsh/defconfig
@@ -1422,7 +1422,7 @@ CONFIG_NSH_MAX_ROUNDTRIP=20
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_I2CTOOL is not set
 # CONFIG_SYSTEM_INSTALL is not set
diff --git a/configs/stm3220g-eval/nsh2/defconfig b/configs/stm3220g-eval/nsh2/defconfig
index 263355865c..5565d734b7 100644
--- a/configs/stm3220g-eval/nsh2/defconfig
+++ b/configs/stm3220g-eval/nsh2/defconfig
@@ -1438,7 +1438,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=1
diff --git a/configs/stm3220g-eval/nxwm/defconfig b/configs/stm3220g-eval/nxwm/defconfig
index 1ab3afe832..30457480d5 100644
--- a/configs/stm3220g-eval/nxwm/defconfig
+++ b/configs/stm3220g-eval/nxwm/defconfig
@@ -1754,7 +1754,7 @@ CONFIG_NXWM_HEXCALCULATOR_FONTID=5
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_I2CTOOL is not set
 # CONFIG_SYSTEM_INSTALL is not set
diff --git a/configs/stm3220g-eval/telnetd/defconfig b/configs/stm3220g-eval/telnetd/defconfig
index 9e57584d8e..9e0ac7839f 100644
--- a/configs/stm3220g-eval/telnetd/defconfig
+++ b/configs/stm3220g-eval/telnetd/defconfig
@@ -1192,7 +1192,7 @@ CONFIG_NETUTILS_TELNETD=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm3240g-eval/dhcpd/defconfig b/configs/stm3240g-eval/dhcpd/defconfig
index 368ea6cf04..d83dbbbcc5 100644
--- a/configs/stm3240g-eval/dhcpd/defconfig
+++ b/configs/stm3240g-eval/dhcpd/defconfig
@@ -1201,7 +1201,7 @@ CONFIG_NETUTILS_NETLIB=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm3240g-eval/discover/defconfig b/configs/stm3240g-eval/discover/defconfig
index a6948166b7..126b6e8cc1 100644
--- a/configs/stm3240g-eval/discover/defconfig
+++ b/configs/stm3240g-eval/discover/defconfig
@@ -1266,7 +1266,7 @@ CONFIG_NETUTILS_NETLIB=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_I2CTOOL is not set
 # CONFIG_SYSTEM_INSTALL is not set
diff --git a/configs/stm3240g-eval/knxwm/defconfig b/configs/stm3240g-eval/knxwm/defconfig
index 0c9c596c53..68cd61dc90 100644
--- a/configs/stm3240g-eval/knxwm/defconfig
+++ b/configs/stm3240g-eval/knxwm/defconfig
@@ -1430,7 +1430,7 @@ CONFIG_NXWM_HEXCALCULATOR_FONTID=5
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_I2CTOOL is not set
 # CONFIG_SYSTEM_INSTALL is not set
diff --git a/configs/stm3240g-eval/nettest/defconfig b/configs/stm3240g-eval/nettest/defconfig
index 42672a45da..76c0f2e2e3 100644
--- a/configs/stm3240g-eval/nettest/defconfig
+++ b/configs/stm3240g-eval/nettest/defconfig
@@ -1199,7 +1199,7 @@ CONFIG_NETUTILS_NETLIB=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm3240g-eval/nsh/defconfig b/configs/stm3240g-eval/nsh/defconfig
index 82ba6591df..159479c01c 100644
--- a/configs/stm3240g-eval/nsh/defconfig
+++ b/configs/stm3240g-eval/nsh/defconfig
@@ -1411,7 +1411,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=1
diff --git a/configs/stm3240g-eval/nsh2/defconfig b/configs/stm3240g-eval/nsh2/defconfig
index 2d7a66a331..195f485d54 100644
--- a/configs/stm3240g-eval/nsh2/defconfig
+++ b/configs/stm3240g-eval/nsh2/defconfig
@@ -1442,7 +1442,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=1
diff --git a/configs/stm3240g-eval/nxterm/defconfig b/configs/stm3240g-eval/nxterm/defconfig
index 9c793c79c6..c432e13841 100644
--- a/configs/stm3240g-eval/nxterm/defconfig
+++ b/configs/stm3240g-eval/nxterm/defconfig
@@ -1541,7 +1541,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=1
diff --git a/configs/stm3240g-eval/nxwm/defconfig b/configs/stm3240g-eval/nxwm/defconfig
index d12bd75e53..fdcaf161de 100644
--- a/configs/stm3240g-eval/nxwm/defconfig
+++ b/configs/stm3240g-eval/nxwm/defconfig
@@ -1759,7 +1759,7 @@ CONFIG_NXWM_HEXCALCULATOR_FONTID=5
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_I2CTOOL is not set
 # CONFIG_SYSTEM_INSTALL is not set
diff --git a/configs/stm3240g-eval/telnetd/defconfig b/configs/stm3240g-eval/telnetd/defconfig
index 7a6aa7a884..8ab255c4e8 100644
--- a/configs/stm3240g-eval/telnetd/defconfig
+++ b/configs/stm3240g-eval/telnetd/defconfig
@@ -1196,7 +1196,7 @@ CONFIG_NETUTILS_TELNETD=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm3240g-eval/webserver/defconfig b/configs/stm3240g-eval/webserver/defconfig
index 916ec6c8d0..de6911b785 100644
--- a/configs/stm3240g-eval/webserver/defconfig
+++ b/configs/stm3240g-eval/webserver/defconfig
@@ -1440,7 +1440,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_I2CTOOL is not set
 # CONFIG_SYSTEM_INSTALL is not set
diff --git a/configs/stm3240g-eval/xmlrpc/defconfig b/configs/stm3240g-eval/xmlrpc/defconfig
index 24cc0a0c4d..558a3803ea 100644
--- a/configs/stm3240g-eval/xmlrpc/defconfig
+++ b/configs/stm3240g-eval/xmlrpc/defconfig
@@ -1261,7 +1261,7 @@ CONFIG_XMLRPC_STRINGSIZE=64
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_I2CTOOL is not set
 # CONFIG_SYSTEM_INSTALL is not set
diff --git a/configs/stm32_tiny/nsh/defconfig b/configs/stm32_tiny/nsh/defconfig
index efa50a903f..33ccfb5562 100644
--- a/configs/stm32_tiny/nsh/defconfig
+++ b/configs/stm32_tiny/nsh/defconfig
@@ -1126,7 +1126,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm32_tiny/usbnsh/defconfig b/configs/stm32_tiny/usbnsh/defconfig
index 847b090897..66e45a74a9 100644
--- a/configs/stm32_tiny/usbnsh/defconfig
+++ b/configs/stm32_tiny/usbnsh/defconfig
@@ -1143,7 +1143,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm32f103-minimum/minnsh/defconfig b/configs/stm32f103-minimum/minnsh/defconfig
index da3a0941ce..09b5db03bf 100644
--- a/configs/stm32f103-minimum/minnsh/defconfig
+++ b/configs/stm32f103-minimum/minnsh/defconfig
@@ -1046,7 +1046,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm32f103-minimum/nsh/defconfig b/configs/stm32f103-minimum/nsh/defconfig
index ee5bcaeee3..5b5fbf73fa 100644
--- a/configs/stm32f103-minimum/nsh/defconfig
+++ b/configs/stm32f103-minimum/nsh/defconfig
@@ -1101,7 +1101,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm32f103-minimum/usbnsh/defconfig b/configs/stm32f103-minimum/usbnsh/defconfig
index 9a0e984177..701dab067e 100644
--- a/configs/stm32f103-minimum/usbnsh/defconfig
+++ b/configs/stm32f103-minimum/usbnsh/defconfig
@@ -1143,7 +1143,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm32f3discovery/nsh/defconfig b/configs/stm32f3discovery/nsh/defconfig
index 4cb1dfd5e2..09e1c665ff 100644
--- a/configs/stm32f3discovery/nsh/defconfig
+++ b/configs/stm32f3discovery/nsh/defconfig
@@ -1172,7 +1172,7 @@ CONFIG_SYSTEM_CDCACM_DEVMINOR=0
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm32f3discovery/usbnsh/defconfig b/configs/stm32f3discovery/usbnsh/defconfig
index 3d771a5f99..bfc67b744d 100644
--- a/configs/stm32f3discovery/usbnsh/defconfig
+++ b/configs/stm32f3discovery/usbnsh/defconfig
@@ -1187,7 +1187,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm32f411e-disco/nsh/defconfig b/configs/stm32f411e-disco/nsh/defconfig
index 1845e9d48a..378f737c2c 100644
--- a/configs/stm32f411e-disco/nsh/defconfig
+++ b/configs/stm32f411e-disco/nsh/defconfig
@@ -1106,7 +1106,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm32f429i-disco/extflash/defconfig b/configs/stm32f429i-disco/extflash/defconfig
index f4e687e9af..72fa8f02fd 100644
--- a/configs/stm32f429i-disco/extflash/defconfig
+++ b/configs/stm32f429i-disco/extflash/defconfig
@@ -1257,7 +1257,7 @@ CONFIG_PLATFORM_CONFIGDATA=y
 # CONFIG_SYSTEM_CUTERM is not set
 CONFIG_SYSTEM_FLASH_ERASEALL=y
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm32f429i-disco/lcd/defconfig b/configs/stm32f429i-disco/lcd/defconfig
index cca650004b..61403bc297 100644
--- a/configs/stm32f429i-disco/lcd/defconfig
+++ b/configs/stm32f429i-disco/lcd/defconfig
@@ -1300,7 +1300,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm32f429i-disco/ltdc/defconfig b/configs/stm32f429i-disco/ltdc/defconfig
index 138dacd2e6..ac7f9e336f 100644
--- a/configs/stm32f429i-disco/ltdc/defconfig
+++ b/configs/stm32f429i-disco/ltdc/defconfig
@@ -1349,7 +1349,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm32f429i-disco/nsh/defconfig b/configs/stm32f429i-disco/nsh/defconfig
index 1489366940..fd8f1dffed 100644
--- a/configs/stm32f429i-disco/nsh/defconfig
+++ b/configs/stm32f429i-disco/nsh/defconfig
@@ -1154,7 +1154,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm32f429i-disco/usbmsc/defconfig b/configs/stm32f429i-disco/usbmsc/defconfig
index c041a1a207..a2ef06d9ca 100644
--- a/configs/stm32f429i-disco/usbmsc/defconfig
+++ b/configs/stm32f429i-disco/usbmsc/defconfig
@@ -1199,7 +1199,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm32f429i-disco/usbnsh/defconfig b/configs/stm32f429i-disco/usbnsh/defconfig
index 9b72f2bf72..a25d95b509 100644
--- a/configs/stm32f429i-disco/usbnsh/defconfig
+++ b/configs/stm32f429i-disco/usbnsh/defconfig
@@ -1218,7 +1218,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 CONFIG_SYSTEM_RAMTEST=y
diff --git a/configs/stm32f4discovery/cxxtest/defconfig b/configs/stm32f4discovery/cxxtest/defconfig
index ccb07593a8..70f37d0b32 100644
--- a/configs/stm32f4discovery/cxxtest/defconfig
+++ b/configs/stm32f4discovery/cxxtest/defconfig
@@ -1040,7 +1040,7 @@ CONFIG_EXAMPLES_CXXTEST_CXXINITIALIZE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm32f4discovery/elf/defconfig b/configs/stm32f4discovery/elf/defconfig
index fcf650368e..8bdd64b1b2 100644
--- a/configs/stm32f4discovery/elf/defconfig
+++ b/configs/stm32f4discovery/elf/defconfig
@@ -1060,7 +1060,7 @@ CONFIG_EXAMPLES_ELF_DEVPATH="/dev/ram0"
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm32f4discovery/ipv6/defconfig b/configs/stm32f4discovery/ipv6/defconfig
index 8e11faeb12..397b216393 100644
--- a/configs/stm32f4discovery/ipv6/defconfig
+++ b/configs/stm32f4discovery/ipv6/defconfig
@@ -1455,7 +1455,7 @@ CONFIG_NSH_MAX_ROUNDTRIP=20
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/stm32f4discovery/kostest/defconfig b/configs/stm32f4discovery/kostest/defconfig
index 1d1f1c310c..6219fe09a9 100644
--- a/configs/stm32f4discovery/kostest/defconfig
+++ b/configs/stm32f4discovery/kostest/defconfig
@@ -1041,7 +1041,7 @@ CONFIG_EXAMPLES_OSTEST_WAITRESULT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm32f4discovery/netnsh/defconfig b/configs/stm32f4discovery/netnsh/defconfig
index 0ba6e71679..2e78007b4b 100644
--- a/configs/stm32f4discovery/netnsh/defconfig
+++ b/configs/stm32f4discovery/netnsh/defconfig
@@ -1460,7 +1460,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_MDIO is not set
diff --git a/configs/stm32f4discovery/nsh/defconfig b/configs/stm32f4discovery/nsh/defconfig
index 9db07e2797..7fa1c99d9e 100644
--- a/configs/stm32f4discovery/nsh/defconfig
+++ b/configs/stm32f4discovery/nsh/defconfig
@@ -1173,7 +1173,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm32f4discovery/nxlines/defconfig b/configs/stm32f4discovery/nxlines/defconfig
index 5c1a2c8438..ede193ec75 100644
--- a/configs/stm32f4discovery/nxlines/defconfig
+++ b/configs/stm32f4discovery/nxlines/defconfig
@@ -1301,7 +1301,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm32f4discovery/pm/defconfig b/configs/stm32f4discovery/pm/defconfig
index 80912483b2..b58f62296b 100644
--- a/configs/stm32f4discovery/pm/defconfig
+++ b/configs/stm32f4discovery/pm/defconfig
@@ -1197,7 +1197,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm32f4discovery/posix_spawn/defconfig b/configs/stm32f4discovery/posix_spawn/defconfig
index 54d5abeea9..a896c31400 100644
--- a/configs/stm32f4discovery/posix_spawn/defconfig
+++ b/configs/stm32f4discovery/posix_spawn/defconfig
@@ -1062,7 +1062,7 @@ CONFIG_EXAMPLES_POSIXSPAWN_DEVPATH="/dev/ram0"
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm32f4discovery/rgbled/defconfig b/configs/stm32f4discovery/rgbled/defconfig
index d7f39c44ce..10e9ac486d 100644
--- a/configs/stm32f4discovery/rgbled/defconfig
+++ b/configs/stm32f4discovery/rgbled/defconfig
@@ -1214,7 +1214,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm32f4discovery/uavcan/defconfig b/configs/stm32f4discovery/uavcan/defconfig
index fcdac447bc..1104383234 100644
--- a/configs/stm32f4discovery/uavcan/defconfig
+++ b/configs/stm32f4discovery/uavcan/defconfig
@@ -1008,7 +1008,7 @@ CONFIG_EXAMPLES_UAVCAN_NODE_NAME="org.nuttx.apps.examples.uavcan"
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm32f4discovery/usbnsh/defconfig b/configs/stm32f4discovery/usbnsh/defconfig
index b85e4d4869..405bdea939 100644
--- a/configs/stm32f4discovery/usbnsh/defconfig
+++ b/configs/stm32f4discovery/usbnsh/defconfig
@@ -1224,7 +1224,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm32f4discovery/winbuild/defconfig b/configs/stm32f4discovery/winbuild/defconfig
index e52bc101ae..dcdefd1af5 100644
--- a/configs/stm32f4discovery/winbuild/defconfig
+++ b/configs/stm32f4discovery/winbuild/defconfig
@@ -934,7 +934,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
diff --git a/configs/stm32f746-ws/nsh/defconfig b/configs/stm32f746-ws/nsh/defconfig
index 88c143a392..8eaa8c0357 100644
--- a/configs/stm32f746-ws/nsh/defconfig
+++ b/configs/stm32f746-ws/nsh/defconfig
@@ -1059,7 +1059,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=1
diff --git a/configs/stm32f746g-disco/netnsh/defconfig b/configs/stm32f746g-disco/netnsh/defconfig
index 7774a4b116..4ecc44075f 100644
--- a/configs/stm32f746g-disco/netnsh/defconfig
+++ b/configs/stm32f746g-disco/netnsh/defconfig
@@ -1289,7 +1289,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/stm32f746g-disco/nsh/defconfig b/configs/stm32f746g-disco/nsh/defconfig
index 73f36d894f..3f71f4a39e 100644
--- a/configs/stm32f746g-disco/nsh/defconfig
+++ b/configs/stm32f746g-disco/nsh/defconfig
@@ -1015,7 +1015,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm32l476vg-disco/nsh/defconfig b/configs/stm32l476vg-disco/nsh/defconfig
index 7bb5a7b16c..9d451b5fa2 100644
--- a/configs/stm32l476vg-disco/nsh/defconfig
+++ b/configs/stm32l476vg-disco/nsh/defconfig
@@ -1085,7 +1085,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm32ldiscovery/nsh/defconfig b/configs/stm32ldiscovery/nsh/defconfig
index 17293ae1cb..2e13a6c77d 100644
--- a/configs/stm32ldiscovery/nsh/defconfig
+++ b/configs/stm32ldiscovery/nsh/defconfig
@@ -1069,7 +1069,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/stm32vldiscovery/nsh/defconfig b/configs/stm32vldiscovery/nsh/defconfig
index c40099da62..588a4f9703 100644
--- a/configs/stm32vldiscovery/nsh/defconfig
+++ b/configs/stm32vldiscovery/nsh/defconfig
@@ -1124,7 +1124,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sure-pic32mx/nsh/defconfig b/configs/sure-pic32mx/nsh/defconfig
index 48a49bdb44..271065aa30 100644
--- a/configs/sure-pic32mx/nsh/defconfig
+++ b/configs/sure-pic32mx/nsh/defconfig
@@ -908,7 +908,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/sure-pic32mx/usbnsh/defconfig b/configs/sure-pic32mx/usbnsh/defconfig
index e37fa61f70..ba6b357806 100644
--- a/configs/sure-pic32mx/usbnsh/defconfig
+++ b/configs/sure-pic32mx/usbnsh/defconfig
@@ -952,7 +952,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/teensy-2.0/hello/defconfig b/configs/teensy-2.0/hello/defconfig
index 01eeae917e..9442cd2b09 100644
--- a/configs/teensy-2.0/hello/defconfig
+++ b/configs/teensy-2.0/hello/defconfig
@@ -583,7 +583,7 @@ CONFIG_EXAMPLES_HELLO_STACKSIZE=2048
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/teensy-2.0/nsh/defconfig b/configs/teensy-2.0/nsh/defconfig
index b1bbef7702..125663eb91 100644
--- a/configs/teensy-2.0/nsh/defconfig
+++ b/configs/teensy-2.0/nsh/defconfig
@@ -678,7 +678,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/teensy-2.0/usbmsc/defconfig b/configs/teensy-2.0/usbmsc/defconfig
index 5facac91d5..1d9b27f4c3 100644
--- a/configs/teensy-2.0/usbmsc/defconfig
+++ b/configs/teensy-2.0/usbmsc/defconfig
@@ -660,7 +660,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_FSUTILS_INIFILE is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/teensy-3.x/nsh/defconfig b/configs/teensy-3.x/nsh/defconfig
index cc089e31f5..7698ce0696 100644
--- a/configs/teensy-3.x/nsh/defconfig
+++ b/configs/teensy-3.x/nsh/defconfig
@@ -878,7 +878,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/teensy-3.x/usbnsh/defconfig b/configs/teensy-3.x/usbnsh/defconfig
index 41fb535e7a..ed6662a776 100644
--- a/configs/teensy-3.x/usbnsh/defconfig
+++ b/configs/teensy-3.x/usbnsh/defconfig
@@ -939,7 +939,7 @@ CONFIG_SYSTEM_CDCACM_DEVMINOR=0
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 CONFIG_SYSTEM_HEXED=y
 CONFIG_SYSTEM_HEXED_STACKSIZE=2048
 CONFIG_SYSTEM_HEXED_PRIORITY=100
diff --git a/configs/teensy-lc/nsh/defconfig b/configs/teensy-lc/nsh/defconfig
index 73ad8e5634..9954cea330 100644
--- a/configs/teensy-lc/nsh/defconfig
+++ b/configs/teensy-lc/nsh/defconfig
@@ -866,7 +866,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/tm4c123g-launchpad/nsh/defconfig b/configs/tm4c123g-launchpad/nsh/defconfig
index 0a6233316e..34f15d3063 100644
--- a/configs/tm4c123g-launchpad/nsh/defconfig
+++ b/configs/tm4c123g-launchpad/nsh/defconfig
@@ -902,7 +902,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/tm4c1294-launchpad/ipv6/defconfig b/configs/tm4c1294-launchpad/ipv6/defconfig
index 47b86bf68c..4676156316 100644
--- a/configs/tm4c1294-launchpad/ipv6/defconfig
+++ b/configs/tm4c1294-launchpad/ipv6/defconfig
@@ -1125,7 +1125,7 @@ CONFIG_NSH_MAX_ROUNDTRIP=20
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=6
diff --git a/configs/tm4c1294-launchpad/nsh/defconfig b/configs/tm4c1294-launchpad/nsh/defconfig
index 15a4e83331..8457971387 100644
--- a/configs/tm4c1294-launchpad/nsh/defconfig
+++ b/configs/tm4c1294-launchpad/nsh/defconfig
@@ -1126,7 +1126,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=6
diff --git a/configs/twr-k60n512/nsh/defconfig b/configs/twr-k60n512/nsh/defconfig
index 65e1a1a01c..7a495c00e6 100644
--- a/configs/twr-k60n512/nsh/defconfig
+++ b/configs/twr-k60n512/nsh/defconfig
@@ -871,7 +871,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/u-blox-c027/nsh/defconfig b/configs/u-blox-c027/nsh/defconfig
index eff1c86df1..1070431c04 100644
--- a/configs/u-blox-c027/nsh/defconfig
+++ b/configs/u-blox-c027/nsh/defconfig
@@ -1244,7 +1244,7 @@ CONFIG_SYSTEM_CLE=y
 CONFIG_SYSTEM_CLE_DEBUGLEVEL=0
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/ubw32/nsh/defconfig b/configs/ubw32/nsh/defconfig
index 3a39c3883f..bb42583973 100644
--- a/configs/ubw32/nsh/defconfig
+++ b/configs/ubw32/nsh/defconfig
@@ -929,7 +929,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/viewtool-stm32f107/highpri/defconfig b/configs/viewtool-stm32f107/highpri/defconfig
index 578e69700c..1799fad74c 100644
--- a/configs/viewtool-stm32f107/highpri/defconfig
+++ b/configs/viewtool-stm32f107/highpri/defconfig
@@ -1018,7 +1018,7 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/viewtool-stm32f107/netnsh/defconfig b/configs/viewtool-stm32f107/netnsh/defconfig
index 93163ab9c2..a868878204 100644
--- a/configs/viewtool-stm32f107/netnsh/defconfig
+++ b/configs/viewtool-stm32f107/netnsh/defconfig
@@ -1350,7 +1350,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/viewtool-stm32f107/nsh/defconfig b/configs/viewtool-stm32f107/nsh/defconfig
index 8a9aec6580..ecb91533d6 100644
--- a/configs/viewtool-stm32f107/nsh/defconfig
+++ b/configs/viewtool-stm32f107/nsh/defconfig
@@ -1113,7 +1113,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/z8encore000zco/ostest/defconfig b/configs/z8encore000zco/ostest/defconfig
index 499f1d6ea8..9f47341e90 100644
--- a/configs/z8encore000zco/ostest/defconfig
+++ b/configs/z8encore000zco/ostest/defconfig
@@ -658,7 +658,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
diff --git a/configs/z8f64200100kit/ostest/defconfig b/configs/z8f64200100kit/ostest/defconfig
index 0d9e7ba4e7..1373c7e857 100644
--- a/configs/z8f64200100kit/ostest/defconfig
+++ b/configs/z8f64200100kit/ostest/defconfig
@@ -659,7 +659,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
diff --git a/configs/zkit-arm-1769/hello/defconfig b/configs/zkit-arm-1769/hello/defconfig
index 183e232cfb..60e67adb45 100644
--- a/configs/zkit-arm-1769/hello/defconfig
+++ b/configs/zkit-arm-1769/hello/defconfig
@@ -924,7 +924,7 @@ CONFIG_EXAMPLES_HELLO_STACKSIZE=2048
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/zkit-arm-1769/nsh/defconfig b/configs/zkit-arm-1769/nsh/defconfig
index 10d3e98357..dd6372c82c 100644
--- a/configs/zkit-arm-1769/nsh/defconfig
+++ b/configs/zkit-arm-1769/nsh/defconfig
@@ -1125,7 +1125,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/zkit-arm-1769/nxhello/defconfig b/configs/zkit-arm-1769/nxhello/defconfig
index 6412e6686f..4e3a8d38a1 100644
--- a/configs/zkit-arm-1769/nxhello/defconfig
+++ b/configs/zkit-arm-1769/nxhello/defconfig
@@ -1253,7 +1253,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/zkit-arm-1769/thttpd/defconfig b/configs/zkit-arm-1769/thttpd/defconfig
index 124e511bfc..2128387906 100644
--- a/configs/zkit-arm-1769/thttpd/defconfig
+++ b/configs/zkit-arm-1769/thttpd/defconfig
@@ -956,7 +956,7 @@ CONFIG_THTTPD_TILDE_MAP_NONE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/zp214xpa/nsh/defconfig b/configs/zp214xpa/nsh/defconfig
index 4f9e75d13b..54d6a26c8f 100644
--- a/configs/zp214xpa/nsh/defconfig
+++ b/configs/zp214xpa/nsh/defconfig
@@ -800,7 +800,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/zp214xpa/nxlines/defconfig b/configs/zp214xpa/nxlines/defconfig
index 95d24c8369..6754cfcc32 100644
--- a/configs/zp214xpa/nxlines/defconfig
+++ b/configs/zp214xpa/nxlines/defconfig
@@ -859,7 +859,7 @@ CONFIG_EXAMPLES_NXLINES_EXTERNINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_LIB_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/include/hex2bin.h b/include/hex2bin.h
new file mode 100644
index 0000000000..3217c54560
--- /dev/null
+++ b/include/hex2bin.h
@@ -0,0 +1,244 @@
+/****************************************************************************
+ * include/hex2bin.h
+ *
+ *   Copyright (C) 2014, 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.
+ *
+ ****************************************************************************/
+
+#ifndef __INCLUDE_HEX2BIN_H
+#define __INCLUDE_HEX2BIN_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include 
+
+#include 
+
+#ifdef CONFIG_LIB_HEX2BIN
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Some environments may return CR as end-of-line, others LF, and others
+ * both.  If not specified, the logic here assumes either (but not both) as
+ * the default.
+ */
+
+#if defined(CONFIG_EOL_IS_CR)
+#  undef  CONFIG_EOL_IS_LF
+#  undef  CONFIG_EOL_IS_BOTH_CRLF
+#  undef  CONFIG_EOL_IS_EITHER_CRLF
+#elif defined(CONFIG_EOL_IS_LF)
+#  undef  CONFIG_EOL_IS_CR
+#  undef  CONFIG_EOL_IS_BOTH_CRLF
+#  undef  CONFIG_EOL_IS_EITHER_CRLF
+#elif defined(CONFIG_EOL_IS_BOTH_CRLF)
+#  undef  CONFIG_EOL_IS_CR
+#  undef  CONFIG_EOL_IS_LF
+#  undef  CONFIG_EOL_IS_EITHER_CRLF
+#elif defined(CONFIG_EOL_IS_EITHER_CRLF)
+#  undef  CONFIG_EOL_IS_CR
+#  undef  CONFIG_EOL_IS_LF
+#  undef  CONFIG_EOL_IS_BOTH_CRLF
+#else
+#  undef  CONFIG_EOL_IS_CR
+#  undef  CONFIG_EOL_IS_LF
+#  undef  CONFIG_EOL_IS_BOTH_CRLF
+#  define CONFIG_EOL_IS_EITHER_CRLF 1
+#endif
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/* Intel HEX data steams are normally in big endian order.  The following
+ * enumeration selects other ordering.
+ */
+
+enum hex2bin_swap_e
+{
+  HEX2BIN_NOSWAP = 0, /* No swap, stream is in the correct byte order */
+  HEX2BIN_SWAP16 = 1, /* Swap bytes in 16-bit values */
+  HEX2BIN_SWAP32 = 2  /* Swap bytes in 32-bit values */
+};
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+#ifdef __cplusplus
+#define EXTERN extern "C"
+extern "C"
+{
+#else
+#define EXTERN extern
+#endif
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: hex2bin
+ *
+ * Description:
+ *   Read the Intel HEX ASCII data provided on the serial IN stream and write
+ *   the binary to the seek-able serial OUT stream.
+ *
+ *   These streams may be files or, in another usage example, the IN stream
+ *   could be a serial port and the OUT stream could be a memory stream.  This
+ *   would decode and write the serial input to memory.
+ *
+ * Input Parameters:
+ *   instream  - The incoming stream from which Intel HEX data will be
+ *               received.
+ *   outstream - The outgoing stream in which binary data will be written.
+ *   baseaddr  - The base address of the outgoing stream.  Seeking in the
+ *               output stream will be relative to this address.
+ *   endpaddr  - The end address (plus 1) of the outgoing stream.  This
+ *               value is used only for range checking.  endpaddr must
+ *               be larger than baseaddr.  A zero value for endpaddr
+ *               disables range checking.
+ *   swap      - Controls byte ordering.  See enum hex2bin_swap_e for
+ *               description of the values.
+ *
+ * Returned Value
+ *   Zero (OK) is returned on success; a negated errno value is returned on
+ *   failure.
+ *
+ ****************************************************************************/
+
+struct lib_instream_s;
+struct lib_sostream_s;
+int hex2bin(FAR struct lib_instream_s *instream,
+            FAR struct lib_sostream_s *outstream, uint32_t baseaddr,
+            uint32_t endpaddr, enum hex2bin_swap_e swap);
+
+/****************************************************************************
+ * Name hex2mem
+ *
+ * Description:
+ *   Read the Intel HEX ASCII data provided on the file descriptor 'fd' and
+ *   write the binary to memory.
+ *
+ *   If, for example, fd is zero (corresponding to stdin), then the HEX
+ *   ASCII data would be taken from the console and written to memory.
+ *
+ * Input Parameters:
+ *   fd        - The file descriptor from which Intel HEX data will be
+ *               received.
+ *   baseaddr  - The base address of the memory region stream.
+ *   endpaddr  - The end address (plus 1) of the memory region.
+ *   swap      - Controls byte ordering.  See enum hex2bin_swap_e for
+ *               description of the values.
+ *
+ * Returned Value
+ *   Zero (OK) is returned on success; a negated errno value is returned on
+ *   failure.
+ *
+ ****************************************************************************/
+
+int hex2mem(int fd, uint32_t baseaddr, uint32_t endpaddr,
+            enum hex2bin_swap_e swap);
+
+/****************************************************************************
+ * Name fhex2mem
+ *
+ * Description:
+ *   Read the Intel HEX ASCII data provided on the standard stream
+ *   'instream' and write the binary to memory.
+ *
+ *   If, for example, instream is stdin, then the HEX ASCII data would be
+ *   taken from the console and written to memory.
+ *
+ * Input Parameters:
+ *   instream  - The incoming standard stream from which Intel HEX data
+ *               will be received.
+ *   baseaddr  - The base address of the memory region stream.
+ *   endpaddr  - The end address (plus 1) of the memory region.
+ *   swap      - Controls byte ordering.  See enum hex2bin_swap_e for
+ *               description of the values.
+ *
+ * Returned Value
+ *   Zero (OK) is returned on success; a negated errno value is returned on
+ *   failure.
+ *
+ ****************************************************************************/
+
+int fhex2mem(FAR FILE *instream, uint32_t baseaddr, uint32_t endpaddr,
+             enum hex2bin_swap_e swap);
+
+/****************************************************************************
+ * Name: hex2bin_main
+ *
+ * Description:
+ *   Main entry point when hex2bin is built as an NSH built-in task.
+ *
+ * Input Parameters:
+ *   Standard task inputs
+ *
+ * Returned Value
+ *   EXIT_SUCESS on success; EXIT_FAILURE on failure
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_SYSTEM_HEX2BIN_BUILTIN
+int hex2bin_main(int argc, char **argv);
+#endif /* CONFIG_SYSTEM_HEX2BIN_BUILTIN */
+
+/****************************************************************************
+ * Name: hex2mem_main
+ *
+ * Description:
+ *   Main entry point when hex2mem is built as an NSH built-in task.
+ *
+ * Input Parameters:
+ *   Standard task inputs
+ *
+ * Returned Value
+ *   EXIT_SUCESS on success; EXIT_FAILURE on failure
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_SYSTEM_HEX2MEM_BUILTIN
+int hex2mem_main(int argc, char **argv);
+#endif /* CONFIG_SYSTEM_HEX2MEM_BUILTIN */
+
+#undef EXTERN
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CONFIG_SYSTEM_HEX2BIN */
+#endif /* __INCLUDE_HEX2BIN_H */
diff --git a/libc/Kconfig b/libc/Kconfig
index 59f41f73ed..cd72a0e7cd 100644
--- a/libc/Kconfig
+++ b/libc/Kconfig
@@ -877,3 +877,10 @@ config LIB_SLCDCODEC
 		include/nuttx/lcd/slcd_codec.h.  While not correctly a part of the C
 		library, it is included here because the encoding side of this
 		interface must be accessible by end user programs.
+
+config LIB_HEX2BIN
+	bool "Intel HEX to binary conversion library"
+	default n
+	---help---
+		Build in support for conversions from Intel Hex format to binary.
+		This selection enables the interfaces of include/hex2bin.h.
diff --git a/libc/Makefile b/libc/Makefile
index f07366f076..ff0a89a3be 100644
--- a/libc/Makefile
+++ b/libc/Makefile
@@ -65,6 +65,7 @@ include aio/Make.defs
 include audio/Make.defs
 include dirent/Make.defs
 include fixedmath/Make.defs
+include hex2bin/Make.defs
 include libgen/Make.defs
 include math/Make.defs
 include misc/Make.defs
diff --git a/libc/README.txt b/libc/README.txt
index 6ccc1dd53b..24d8cdfe1c 100644
--- a/libc/README.txt
+++ b/libc/README.txt
@@ -28,7 +28,8 @@ The files in the libc/ directory are organized (mostly) according which file
 in the include/ directory provides the prototype for library functions.  So
 we have:
 
-  audio     - This part of the audio system: nuttx/audio/audio.h
+  audio     - This part of he audio system: nuttx/audio/audio.h
+  hex2bin   - hex2bin.h
   libgen    - libgen.h
   fixedmath - fixedmath.h
   math      - math.h
diff --git a/libc/hex2bin/Make.defs b/libc/hex2bin/Make.defs
new file mode 100644
index 0000000000..e1ce1f5d46
--- /dev/null
+++ b/libc/hex2bin/Make.defs
@@ -0,0 +1,47 @@
+############################################################################
+# libc/hex2bin/Make.defs
+#
+#   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.
+#
+############################################################################
+
+ifeq ($(CONFIG_LIB_HEX2BIN),y)
+
+# Add the hex2bin sources to the build
+
+CSRCS += lib_fhex2mem.c  lib_hex2bin.c  lib_hex2mem.c
+
+# Add the hex2bin directory to the build
+
+DEPPATH += --dep-path hex2bin
+VPATH += :hex2bin
+
+endif
diff --git a/libc/hex2bin/lib_fhex2mem.c b/libc/hex2bin/lib_fhex2mem.c
new file mode 100644
index 0000000000..1967dd1ade
--- /dev/null
+++ b/libc/hex2bin/lib_fhex2mem.c
@@ -0,0 +1,103 @@
+/****************************************************************************
+ * libc/hex2bin/fhex2mem.c
+ *
+ *   Copyright (C) 2014, 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 
+
+#ifdef CONFIG_LIB_HEX2BIN
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name fhex2mem
+ *
+ * Description:
+ *   Read the Intel HEX ASCII data provided on the standard stream
+ *   'instream' and write the binary to memory.
+ *
+ *   If, for example, instream is stdin, then the HEX ASCII data would be
+ *   taken from the console and written to memory.
+ *
+ * Input Parameters:
+ *   instream  - The incoming standard stream from which Intel HEX data
+ *               will be received.
+ *   baseaddr  - The base address of the memory region stream.
+ *   endpaddr  - The end address (plus 1) of the memory region.
+ *   swap      - Controls byte ordering.  See enum hex2bin_swap_e for
+ *               description of the values.
+ *
+ * Returned Value
+ *   Zero (OK) is returned on success; a negated errno value is returned on
+ *   failure.
+ *
+ ****************************************************************************/
+
+int fhex2mem(FAR FILE *instream, uint32_t baseaddr, uint32_t endpaddr,
+             enum hex2bin_swap_e swap)
+{
+  struct lib_stdinstream_s stdinstream;
+  struct lib_memsostream_s memoutstream;
+
+  /* Check memory addresses */
+
+  DEBUGASSERT(instream != NULL && endpaddr > baseaddr);
+
+  /* Wrap the file descriptor as raw stream; wrap the memory as a memory
+   * stream.
+   */
+
+  lib_stdinstream(&stdinstream, instream);
+  lib_memsostream(&memoutstream, (FAR char *)baseaddr,
+                  (int)(endpaddr - baseaddr));
+
+  /* And do the deed */
+
+  return hex2bin(&stdinstream.public, &memoutstream.public,
+                 (uint32_t)baseaddr, (uint32_t)endpaddr,
+                 (enum hex2bin_swap_e)swap);
+}
+
+#endif /* CONFIG_LIB_HEX2BIN */
diff --git a/libc/hex2bin/lib_hex2bin.c b/libc/hex2bin/lib_hex2bin.c
new file mode 100644
index 0000000000..2dc5d32d97
--- /dev/null
+++ b/libc/hex2bin/lib_hex2bin.c
@@ -0,0 +1,705 @@
+/****************************************************************************
+ * libc/hex2bin/hex2bin.c
+ *
+ *   Copyright (C) 2014, 2016 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt 
+ *
+ * References:
+ *   - http://en.wikipedia.org/wiki/Intel_HEX
+ *   - Hexadecimal Object File Format Specification, Revision A January 6,
+ *     1988, Intel
+ *
+ * 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 
+
+#ifdef CONFIG_LIB_HEX2BIN
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* ASCII record sizes */
+
+#define BYTECOUNT_ASCSIZE      2
+#define ADDRESS_ASCSIZE        4
+#define RECTYPE_ASCSIZE        2
+
+#define BYTECOUNT_LINENDX      (0)
+#define ADDRESS_LINENDX        (BYTECOUNT_LINENDX + BYTECOUNT_ASCSIZE)
+#define RECTYPE_LINENDX        (ADDRESS_LINENDX + ADDRESS_ASCSIZE)
+#define DATA_LINENDX           (RECTYPE_LINENDX + RECTYPE_ASCSIZE)
+#define HEADER_ASCSIZE          DATA_LINENDX
+
+#define CHECKSUM_ASCSIZE       2
+#define TRAILER_SIZE           (CHECKSUM_ASCSIZE)
+
+#define MAXDATA_BINSIZE        255
+#define RECORD_ASCSIZE(n)      (HEADER_ASCSIZE + TRAILER_SIZE + 2*(n))
+#define MAXRECORD_ASCSIZE      RECORD_ASCSIZE(MAXDATA_BINSIZE)
+#define MINRECORD_ASCSIZE      RECORD_ASCSIZE(0)
+#define LINE_ALLOC             MAXRECORD_ASCSIZE
+
+/* Binary record sizes */
+
+#define BYTECOUNT_BINSIZE      1
+#define ADDRESS_BINSIZE        2
+#define RECTYPE_BINSIZE        1
+
+#define BYTECOUNT_BINNDX       (0)
+#define ADDRESS_BINNDX         (BYTECOUNT_BINNDX + BYTECOUNT_BINSIZE)
+#define RECTYPE_BINNDX         (ADDRESS_BINNDX + ADDRESS_BINSIZE)
+#define DATA_BINNDX            (RECTYPE_BINNDX + RECTYPE_BINSIZE)
+#define HEADER_BINSIZE         DATA_BINNDX
+
+#define CHECKSUM_BINSIZE       1
+#define TRAILER_BINSIZE        CHECKSUM_BINSIZE
+
+#define RECORD_BINSIZE(n)      (HEADER_BINSIZE + TRAILER_BINSIZE + (n))
+#define MAXRECORD_BINSIZE      RECORD_BINSIZE(MAXDATA_BINSIZE)
+#define MINRECORD_BKINSIZE     RECORD_BINSIZE(0)
+#define BIN_ALLOC              MAXRECORD_BINSIZE
+
+/* Record start code */
+
+#define RECORD_STARTCODE       ':'
+
+/* Record Types */
+
+#define RECORD_DATA            0  /* Data */
+#define RECORD_EOF             1  /* End of file */
+#define RECORD_EXT_SEGADDR     2  /* Extended segment address record */
+#define RECORD_START_SEGADDR   3  /* Start segment address record */
+#define RECORD_EXT_LINADDR     4  /* Extended linear address record */
+#define RECORD_START_LINADDR   5  /* Start linear address record */
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nibble2bin
+ ****************************************************************************/
+
+static int nibble2bin(uint8_t ascii)
+{
+  if (ascii >= '0' && ascii <= '9')
+    {
+      return (ascii - 0x30);
+    }
+  else if (ascii >= 'a' && ascii <= 'f')
+    {
+      return (ascii - 'a' + 10);
+    }
+  else if (ascii >= 'A' && ascii <= 'F')
+    {
+      return (ascii - 'A' + 10);
+    }
+
+  return -EINVAL;
+}
+
+/****************************************************************************
+ * Name: byte2bin
+ ****************************************************************************/
+
+static int byte2bin(FAR const uint8_t *ascii)
+{
+  int nibble;
+  int byte;
+
+  /* Get the MS nibble (big endian order) */
+
+  nibble = nibble2bin(*ascii++);
+  if (nibble < 0)
+    {
+      return nibble;
+    }
+
+  byte = (nibble << 4);
+
+  /* Get the MS nibble */
+
+  nibble = nibble2bin(*ascii);
+  if (nibble < 0)
+    {
+      return nibble;
+    }
+
+  byte |= nibble;
+  return byte;
+}
+
+/****************************************************************************
+ * Name: word2bin
+ ****************************************************************************/
+
+#if 0 /* Not used */
+static int word2bin(FAR const char *ascii)
+{
+  int byte;
+  int word;
+
+  /* Get the MS byte (big endian order) */
+
+  byte = word2bin(ascii);
+  if (byte < 0)
+    {
+      return byte;
+    }
+
+  word = (byte << 8);
+
+  /* Get the MS byte */
+
+  byte = word2bin(ascii + 2);
+  if (byte < 0)
+    {
+      return byte;
+    }
+
+  word |= byte;
+  return word;
+}
+#endif
+
+/****************************************************************************
+ * Name: data2bin
+ ****************************************************************************/
+
+int data2bin(FAR uint8_t* dest, FAR const uint8_t *src, int nsrcbytes)
+{
+  int byte;
+
+  /* An even number of source bytes is expected */
+
+  if ((nsrcbytes & 1) != 0)
+    {
+      return -EINVAL;
+    }
+
+  /* Convert src bytes in groups of 2, writing one byte to the output on each
+   * pass through the loop. */
+
+  while (nsrcbytes > 0)
+    {
+      /* Get the MS nibble (big endian order) */
+
+      byte = byte2bin(src);
+      if (byte < 0)
+        {
+          return byte;
+        }
+
+      src += 2;
+
+      /* And write the byte to the destination */
+
+      *dest++ = byte;
+      nsrcbytes -= 2;
+    }
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: readstream
+ ****************************************************************************/
+
+static int readstream(FAR struct lib_instream_s *instream,
+                      FAR uint8_t *line, unsigned int lineno)
+{
+  int nbytes = 0;
+  int ch;
+
+  /* Skip until the beginning of line start code is encountered */
+
+  ch = instream->get(instream);
+  while (ch != RECORD_STARTCODE && ch != EOF)
+    {
+      ch = instream->get(instream);
+    }
+
+  /* Skip over the startcode */
+
+  if (ch != EOF)
+    {
+      ch = instream->get(instream);
+    }
+
+  /* Then read, verify, and buffer until the end of line is encountered */
+
+  while (ch != EOF && nbytes < (MAXRECORD_ASCSIZE-1))
+    {
+#if defined(CONFIG_EOL_IS_LF)
+      if (ch == '\n')
+        {
+          *line = '\0';
+          return nbytes;
+        }
+
+#elif defined(CONFIG_EOL_IS_BOTH_CRLF)
+      if (ch == '\r')
+        {
+          continue;
+        }
+      else if (ch == '\n')
+        {
+          *line = '\0';
+          return nbytes;
+        }
+#elif defined(CONFIG_EOL_IS_CR)
+      if (ch == '\r')
+        {
+          *line = '\0';
+          return nbytes;
+        }
+#elif defined(CONFIG_EOL_IS_EITHER_CRLF)
+      if (ch == '\n' || ch == '\r')
+        {
+          *line = '\0';
+          return nbytes;
+        }
+#endif
+      /* Only hex data goes into the line buffer */
+
+      else if (isxdigit(ch))
+        {
+          *line++ = ch;
+          nbytes++;
+        }
+      else if (!isspace(ch)) /* Not expected */
+        {
+          lerr("Line %u ERROR: Unexpected character %c[%02x] in stream\n",
+               lineno, isprint(ch) ? ch : '.', ch);
+          break;
+        }
+
+      /* Read the next character from the input stream */
+
+      ch = instream->get(instream);
+    }
+
+  /* Some error occurred: Unexpected EOF, line too long, or bad character in
+   * stream
+   */
+
+  lerr("Line %u ERROR: Failed to read line. %d characters read\n",
+       lineno, nbytes);
+  return EOF;
+}
+
+/****************************************************************************
+ * Name: hex2bin_swap16 and hex2bin_swap32
+ ****************************************************************************/
+
+static inline void hex2bin_swap16(FAR uint8_t *data, int bytecount)
+{
+  for (; bytecount > 0; bytecount -= 2)
+    {
+      uint8_t b0 = data[0];
+      uint8_t b1 = data[1];
+
+      *data++ = b1;
+      *data++ = b0;
+    }
+}
+
+static inline void hex2bin_swap32(FAR uint8_t *data, int bytecount)
+{
+  for (; bytecount > 0; bytecount -= 4)
+    {
+      uint8_t b0 = data[0];
+      uint8_t b1 = data[1];
+      uint8_t b2 = data[2];
+      uint8_t b3 = data[3];
+
+      *data++ = b3;
+      *data++ = b2;
+      *data++ = b1;
+      *data++ = b0;
+    }
+}
+
+/****************************************************************************
+ * Name: writedata
+ ****************************************************************************/
+
+static inline void writedata(FAR struct lib_sostream_s *outstream,
+                             FAR uint8_t *data, int bytecount)
+{
+  for (; bytecount > 0; bytecount--)
+    {
+      outstream->put(outstream, *data++);
+    }
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: hex2bin
+ *
+ * Description:
+ *   Read the Intel HEX ASCII data provided on the serial IN stream and write
+ *   the binary to the seek-able serial OUT stream.
+ *
+ *   These streams may be files or, in another usage example, the IN stream
+ *   could be a serial port and the OUT stream could be a memory stream.  This
+ *   would decode and write the serial input to memory.
+ *
+ * Input Parameters:
+ *   instream  - The incoming stream from which Intel HEX data will be
+ *               received.
+ *   outstream - The outgoing stream in which binary data will be written.
+ *   baseaddr  - The base address of the outgoing stream.  Seeking in the
+ *               output stream will be relative to this address.
+ *   endpaddr  - The end address (plus 1) of the outgoing stream.  This
+ *               value is used only for range checking.  endpaddr must
+ *               be larger than baseaddr.  A zero value for endpaddr
+ *               disables range checking.
+ *   swap      - Controls byte ordering.  See enum hex2bin_swap_e for
+ *               description of the values.
+ *
+ * Returned Value
+ *   Zero (OK) is returned on success; a negated errno value is returned on
+ *   failure.
+ *
+ ****************************************************************************/
+
+int hex2bin(FAR struct lib_instream_s *instream,
+            FAR struct lib_sostream_s *outstream, uint32_t baseaddr,
+            uint32_t endpaddr, enum hex2bin_swap_e swap)
+{
+  FAR uint8_t *alloc;
+  FAR uint8_t *line;
+  FAR uint8_t *bin;
+  int nbytes;
+  int bytecount;
+  uint32_t address;
+  uint32_t endaddr;
+  uint32_t expected;
+  uint16_t extension;
+  uint16_t address16;
+  uint8_t checksum;
+  unsigned int lineno;
+  int i;
+  int ret = OK;
+
+  /* Allocate buffer memory */
+
+  alloc = (FAR uint8_t *)malloc(LINE_ALLOC + BIN_ALLOC);
+  if (alloc == NULL)
+    {
+      lerr("ERROR: Failed to allocate memory\n");
+      return -ENOMEM;
+    }
+
+  line = alloc;
+  bin  = &alloc[LINE_ALLOC];
+
+  extension = 0;
+  expected = 0;
+  lineno = 0;
+
+  while ((nbytes = readstream(instream, line, lineno)) != EOF)
+    {
+      /* Increment the line number */
+
+      lineno++;
+
+      /* Did we read enough data to do anything? */
+
+      if (nbytes < MINRECORD_ASCSIZE)
+        {
+          lerr("Line %u ERROR: Record too short: %d\n", lineno, nbytes);
+          goto errout_with_einval;
+        }
+
+      /* We should always read an even number of bytes */
+
+      if ((nbytes & 1) != 0)
+        {
+          lerr("Line %u ERROR: Record length is odd: %d\n", lineno, nbytes);
+          goto errout_with_einval;
+        }
+
+      /* Get the data byte count */
+
+      bytecount = byte2bin(&line[BYTECOUNT_LINENDX]);
+      if (bytecount < 0)
+        {
+          lerr("Line %u ERROR: Failed to read bytecount: %d\n",
+               lineno, bytecount);
+          ret = bytecount;
+          goto errout_with_buffers;
+        }
+
+      /* Verify that the bytecount matches the length of the record */
+
+      if (RECORD_ASCSIZE(bytecount) != nbytes)
+        {
+          lerr("Line %u ERROR: Expected %d bytes, read %d\n",
+               lineno, RECORD_ASCSIZE(bytecount), nbytes);
+          goto errout_with_einval;
+        }
+
+      /* Convert the entire line to binary.  We need to do this for
+       * checksum calculation which includes the entire line (minus
+       * the start code and the checksum at the end of the line itself)
+       */
+
+      ret = data2bin(bin, line, nbytes);
+      if (ret < 0)
+        {
+          lerr("Line %u ERROR: Failed to convert line to binary: %d\n",
+               lineno, ret);
+          goto errout_with_buffers;
+        }
+
+      /* Calculate and verify the checksum over all of the data */
+
+      nbytes >>= 1;  /* Number of bytes in bin[] */
+      checksum = 0;
+
+      for (i = 0; i < nbytes; i++)
+        {
+          checksum += bin[i];
+        }
+
+      if (checksum != 0)
+        {
+          lerr("Line %u ERROR: Bad checksum %02x\n", lineno, checksum);
+          goto errout_with_einval;
+        }
+
+      /* Get the 16-bit (unextended) address from the record */
+
+      address16 = (uint16_t)bin[ADDRESS_BINNDX] << 8 |
+                  (uint16_t)bin[ADDRESS_BINNDX+1];
+
+      /* Handle the record by its record type */
+
+      switch (bin[RECTYPE_BINNDX])
+        {
+        case RECORD_DATA: /* Data */
+          {
+            /* Swap data in place in the binary buffer as required */
+
+            switch (swap)
+              {
+              case HEX2BIN_NOSWAP: /* No swap, stream is the correct byte order */
+                break;
+
+              case HEX2BIN_SWAP16: /* Swap bytes in 16-bit values */
+                {
+                  if ((bytecount & 1) != 0)
+                    {
+                      lerr("Line %d ERROR: Byte count %d is not a multiple of 2\n",
+                           lineno, bytecount);
+                       goto errout_with_einval;
+                    }
+
+                  /* Do the byte swap */
+
+                  hex2bin_swap16(&bin[DATA_BINNDX], bytecount);
+                }
+                break;
+
+              case HEX2BIN_SWAP32: /* Swap bytes in 32-bit values */
+                {
+                  if ((bytecount & 3) != 0)
+                    {
+                      lerr("Line %d ERROR: Byte count %d is not a multiple of 4\n",
+                           lineno, bytecount);
+                       goto errout_with_einval;
+                    }
+
+                  /* Do the byte swap */
+
+                  hex2bin_swap32(&bin[DATA_BINNDX], bytecount);
+                }
+                break;
+
+              default:
+                {
+                  lerr("ERROR: Invalid swap argument: %d\n", swap);
+                  goto errout_with_einval;
+                }
+              }
+
+            /* Get and verify the full 32-bit address */
+
+            address = ((uint32_t)extension << 16) | (uint32_t)address16;
+            endaddr = address + bytecount;
+
+            if (address < baseaddr || (endpaddr != 0 && endaddr >= endpaddr))
+              {
+                lerr("Line %d ERROR: Extended address %08lx is out of range\n",
+                     lineno, (unsigned long)address);
+                goto errout_with_einval;
+              }
+
+            /* Seek to the correct position in the OUT stream if we have
+             * made an unexpected jump in the data address.
+             */
+
+            if (address != expected)
+              {
+                off_t pos = outstream->seek(outstream, address - baseaddr, SEEK_SET);
+                if (pos == (off_t)-1)
+                  {
+                    lerr("Line %u ERROR: Seek to address %08lu failed\n",
+                         lineno, (unsigned long)address);
+                    ret = -ESPIPE;
+                    goto errout_with_buffers;
+                  }
+              }
+
+            /* Transfer data to the OUT stream */
+
+            writedata(outstream, &bin[DATA_BINNDX], bytecount);
+
+            /* This is the next data address that we expect to see */
+
+            expected = address + bytecount;
+          }
+          break;
+
+        case RECORD_EOF: /* End of file */
+          /*  End Of File record.  Must occur exactly once per file in the
+           * last line of the file. The byte count is 00 and the data field
+           * is empty. Usually the address field is also 0000.
+           */
+
+          if (bytecount == 0)
+            {
+              ret = OK;
+              goto exit_with_buffers;
+            }
+
+          lerr("Line %u ERROR: Nonzero bytecount %d in EOF\n",
+               lineno, bytecount);
+          goto errout_with_einval;
+
+        case RECORD_EXT_SEGADDR: /* Extended segment address record */
+          /* The address specified by the data field is multiplied by 16
+           * (shifted 4 bits left) and added to the subsequent data record
+           * addresses. This allows addressing of up to a megabyte of
+           * address space. The address field of this record has to be
+           * 0000, the byte count is 02 (the segment is 16-bit). The
+           * least significant hex digit of the segment address is always
+           * 0.
+           */
+
+          if (bytecount != 2 || address16 != 0 || bin[DATA_BINNDX+1] != 0)
+            {
+              lerr("Line %u ERROR: Invalid segment address\n", lineno);
+              lerr("  bytecount=%d address=%04x segment=%02x%02x\n",
+                   bytecount, address16, bin[DATA_BINNDX],
+                   bin[DATA_BINNDX+1]);
+              goto errout_with_einval;
+            }
+
+          extension = (uint16_t)bin[DATA_BINNDX];
+          break;
+
+        case RECORD_START_SEGADDR: /* Start segment address record */
+          /* For 80x86 processors, it specifies the initial content of
+           * the CS:IP registers. The address field is 0000, the byte
+           * count is 04, the first two bytes are the CS value, the
+           * latter two are the IP value.
+           */
+
+          break;
+
+        case RECORD_EXT_LINADDR: /* Extended linear address record */
+          /* The address field is 0000, the byte count is 02. The two
+           * data bytes (two hex digit pairs in big endian order)
+           * represent the upper 16 bits of the 32 bit address for
+           * all subsequent 00 type records until the next 04 type
+           * record comes. If there is not a 04 type record, the
+           * upper 16 bits default to 0000. To get the absolute
+           * address for subsequent 00 type records, the address
+           * specified by the data field of the most recent 04 record
+           * is added to the 00 record addresses.
+           */
+
+          if (bytecount != 2 || address16 != 0)
+            {
+              lerr("Line %u ERROR: Invalid linear address\n", lineno);
+              lerr("  bytecount=%d address=%04x\n", bytecount, address16);
+              goto errout_with_einval;
+            }
+
+          extension = (uint16_t)bin[DATA_BINNDX] << 8 |
+                      (uint16_t)bin[DATA_BINNDX+1];
+          break;
+
+        case RECORD_START_LINADDR: /* Start linear address record */
+          /* The address field is 0000, the byte count is 04. The 4
+           * data bytes represent the 32-bit value loaded into the EIP
+           * register of the 80386 and higher CPU.
+           */
+
+          break;
+
+        default:
+          break;
+        }
+    }
+
+  lerr("ERROR: No EOF record found\n");
+
+errout_with_einval:
+  ret = -EINVAL;
+
+errout_with_buffers:
+exit_with_buffers:
+  free(alloc);
+  return ret;
+}
+
+#endif /* CONFIG_LIB_HEX2BIN */
diff --git a/libc/hex2bin/lib_hex2mem.c b/libc/hex2bin/lib_hex2mem.c
new file mode 100644
index 0000000000..12c284cf54
--- /dev/null
+++ b/libc/hex2bin/lib_hex2mem.c
@@ -0,0 +1,103 @@
+/****************************************************************************
+ * libc/hex2bin/hex2mem.c
+ *
+ *   Copyright (C) 2014, 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 
+
+#ifdef CONFIG_LIB_HEX2BIN
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name hex2mem
+ *
+ * Description:
+ *   Read the Intel HEX ASCII data provided on the file descriptor 'fd' and
+ *   write the binary to memory.
+ *
+ *   If, for example, fd is zero (stdin), then the HEX ASCII data would be
+ *   taken from the console and written to memory.
+ *
+ * Input Parameters:
+ *   fd        - The file descriptor from which Intel HEX data will be
+ *               received.
+ *   baseaddr  - The base address of the memory region stream.
+ *   endpaddr  - The end address (plus 1) of the memory region.
+ *   swap      - Controls byte ordering.  See enum hex2bin_swap_e for
+ *               description of the values.
+ *
+ * Returned Value
+ *   Zero (OK) is returned on success; a negated errno value is returned on
+ *   failure.
+ *
+ ****************************************************************************/
+
+int hex2mem(int fd, uint32_t baseaddr, uint32_t endpaddr,
+            enum hex2bin_swap_e swap)
+{
+  struct lib_rawinstream_s rawinstream;
+  struct lib_memsostream_s memoutstream;
+
+  /* Check memory addresses */
+
+  DEBUGASSERT(fd >= 0 && endpaddr > baseaddr);
+
+  /* Wrap the file descriptor as raw stream; wrap the memory as a memory
+   * stream.
+   */
+
+  lib_rawinstream(&rawinstream, fd);
+  lib_memsostream(&memoutstream, (FAR char *)baseaddr,
+                  (int)(endpaddr - baseaddr));
+
+  /* And do the deed */
+
+  return hex2bin(&rawinstream.public, &memoutstream.public,
+                 (uint32_t)baseaddr, (uint32_t)endpaddr,
+                 (enum hex2bin_swap_e)swap);
+}
+
+#endif /* CONFIG_LIB_HEX2BIN */
-- 
GitLab


From 1b5bef5325d824691d487190fd7a57a110cb242d Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 27 Jun 2016 11:15:37 -0600
Subject: [PATCH 062/229] STM32 CAN: Fix an error when filter methods were
 ported from STM32L4

---
 arch/arm/src/stm32/stm32_can.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/src/stm32/stm32_can.c b/arch/arm/src/stm32/stm32_can.c
index c8193f65f4..78404f48c6 100644
--- a/arch/arm/src/stm32/stm32_can.c
+++ b/arch/arm/src/stm32/stm32_can.c
@@ -127,13 +127,13 @@ static void stm32can_dumpfiltregs(FAR struct stm32_can_s *priv,
 
 /* Filtering (todo) */
 
-static int  stm32l4can_addextfilter(FAR struct stm32l4_can_s *priv,
+static int  stm32can_addextfilter(FAR struct stm32_can_s *priv,
               FAR struct canioc_extfilter_s *arg);
-static int  stm32l4can_delextfilter(FAR struct stm32l4_can_s *priv,
+static int  stm32can_delextfilter(FAR struct stm32_can_s *priv,
               int arg);
-static int  stm32l4can_addstdfilter(FAR struct stm32l4_can_s *priv,
+static int  stm32can_addstdfilter(FAR struct stm32_can_s *priv,
               FAR struct canioc_stdfilter_s *arg);
-static int  stm32l4can_delstdfilter(FAR struct stm32l4_can_s *priv,
+static int  stm32can_delstdfilter(FAR struct stm32_can_s *priv,
               int arg);
 
 /* CAN driver methods */
-- 
GitLab


From 047ea89c30165f8d96c52d23b2097f7c72b9acaa Mon Sep 17 00:00:00 2001
From: David Sidrane 
Date: Mon, 27 Jun 2016 08:27:44 -1000
Subject: [PATCH 063/229] Fixed config for D1 only

---
 arch/arm/src/stm32f7/stm32_sdmmc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/src/stm32f7/stm32_sdmmc.c b/arch/arm/src/stm32f7/stm32_sdmmc.c
index d7d78f3006..cf78614e41 100644
--- a/arch/arm/src/stm32f7/stm32_sdmmc.c
+++ b/arch/arm/src/stm32f7/stm32_sdmmc.c
@@ -3171,7 +3171,7 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno)
        */
 #ifndef CONFIG_SDIO_MUXBUS
         stm32_configgpio(GPIO_SDMMC1_D0);
-#ifndef CONFIG_SDMMC_WIDTH_D1_ONLY
+#ifndef CONFIG_SDMMC1_WIDTH_D1_ONLY
         stm32_configgpio(GPIO_SDMMC1_D1);
         stm32_configgpio(GPIO_SDMMC1_D2);
         stm32_configgpio(GPIO_SDMMC1_D3);
@@ -3195,7 +3195,7 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno)
 
 #ifndef CONFIG_SDIO_MUXBUS
         stm32_configgpio(GPIO_SDMMC2_D0);
-#ifndef CONFIG_SDMMC_WIDTH_D1_ONLY
+#ifndef CONFIG_SDMMC2_WIDTH_D1_ONLY
         stm32_configgpio(GPIO_SDMMC2_D1);
         stm32_configgpio(GPIO_SDMMC2_D2);
         stm32_configgpio(GPIO_SDMMC2_D3);
-- 
GitLab


From fba8f4c05b0a1a11d3231160e5afd0aa688cced0 Mon Sep 17 00:00:00 2001
From: David Sidrane 
Date: Mon, 27 Jun 2016 08:28:30 -1000
Subject: [PATCH 064/229] Moved NCD to PC6

---
 configs/nucleo-144/src/nucleo-144.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/nucleo-144/src/nucleo-144.h b/configs/nucleo-144/src/nucleo-144.h
index 2d070539d2..e5fa337340 100644
--- a/configs/nucleo-144/src/nucleo-144.h
+++ b/configs/nucleo-144/src/nucleo-144.h
@@ -141,7 +141,7 @@
 #ifdef HAVE_SDIO
 
 #  if defined(CONFIG_STM32F7_SDMMC1)
-#    define GPIO_SDMMC1_NCD (GPIO_INPUT|GPIO_FLOAT|GPIO_EXTI | GPIO_PORTC | GPIO_PIN11)
+#    define GPIO_SDMMC1_NCD (GPIO_INPUT|GPIO_FLOAT|GPIO_EXTI | GPIO_PORTC | GPIO_PIN6)
 #  endif
 
 #  if defined(CONFIG_NSH_MMCSDSLOTNO) && (CONFIG_NSH_MMCSDSLOTNO != 0)
-- 
GitLab


From 67ea1127678bfe9d210a84e98f1aa8a2ff7074a2 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 27 Jun 2016 13:08:13 -0600
Subject: [PATCH 065/229] Update ChangeLog

---
 ChangeLog       | 23 +++++++++++++++++------
 libc/README.txt |  3 +++
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 226425ca8f..80f20422bf 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -12139,14 +12139,10 @@
 	* arch/arm/arc/sam34: DAC bugfix: DACC_WPMR_WPKEY_MASK -> DACC_WPMR_WPKEY. 
 	  Timer bugfix:  Fix ops check in TCIOC_STOP.  From Wolfgang Reissnegge
 	  (2016-06-23).
+	* configs/nucleo-144: Added SDMMC support to Nucleo-144. From David
+	  Sidrane (2016-06-23).
 	* arch/arm/src/stm32: Port STM32L4 CAN IOCTLs to STM32.  From Sebastien
 	  Lorquet (2016-06-24).
-	* configs/Konfig:Add configuration logic to include a Kconfig file in
-	  each custom configuration.  Includes adding a dummy custom board
-	  configuration directory.  A consequence of this that each custom board
-	  directory will now need to contain a Kconfig file.  NOTE also that
-	  the new board directory does not take effect in the configuration
-	  menus until the NEXT time you run 'make menuconfig' (2016-06-24).
 	* drivers/ioexpander:  Add support for a very simple GPIO driver.  It
 	  supports only pre-conrigured input and output pins and only basic
 	  input and output operations (2016-06-24).
@@ -12171,3 +12167,18 @@
 	  necessary because otherwise you cannot read back the correct line
 	  status of Open-Drain Outputs and this is needed by the twi_reset
 	  function.  From Michael Spahlinger (2016-06-24)
+	* arch/arm/src/stm32f7:  BUGFIX:PLLs IS2 and SAI P Calculation. From
+	  David Sidrane (2016-06-24).
+	* arch/arm/src/stm32f7: USB support.  From Lok Tep (2016-06-27).
+	* configs/olimex-stm32-e407:  Add support for Olimex STM32 E407
+	  board.  From Mateusz Szafoni (2016-06-27).
+	* drivers/ioexpander: Shadow-Mode: The output- and configuration
+	  registers of the IO-Expander are held in the microcontrollers memory
+	  and only written to the IO-Expander.  This reduces bus traffic and
+	  is more error-proof than the normal read-modify-write operation. Retry
+	  Mode: If enabled and an error occurs while writing to the IO-Expander
+	  the current transmission is automatically repeated once. From Michael
+	  Spahlinger (2016-06-27).
+	* libc/hex2bin:  Move the portable library portion of apps/system/hex2bin
+	  to nuttx/libc/hex2bin where it can be shared with the OS internals
+	  (2016-06-27).
diff --git a/libc/README.txt b/libc/README.txt
index 24d8cdfe1c..4b329205eb 100644
--- a/libc/README.txt
+++ b/libc/README.txt
@@ -44,6 +44,9 @@ we have:
   time      - time.h
   unistd    - unistd.h
 
+Most of these are "standard" header files; some are not: hex2bin.h and
+fixemath.h are non-standard.
+
 There is also a misc/ subdirectory that contains various internal functions
 and interfaces from header files that are too few to warrant their own sub-
 directory:
-- 
GitLab


From 02b23358e5e1dbe4f64e82d6687cb4518408cbe8 Mon Sep 17 00:00:00 2001
From: David Sidrane 
Date: Mon, 27 Jun 2016 09:54:28 -1000
Subject: [PATCH 066/229] Update Authors

---
 arch/arm/src/stm32f7/stm32_sdmmc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/src/stm32f7/stm32_sdmmc.c b/arch/arm/src/stm32f7/stm32_sdmmc.c
index cf78614e41..e05523e46b 100644
--- a/arch/arm/src/stm32f7/stm32_sdmmc.c
+++ b/arch/arm/src/stm32f7/stm32_sdmmc.c
@@ -2,7 +2,8 @@
  * arch/arm/src/stm32f7/stm32_sdmmc.c
  *
  *   Copyright (C) 2009, 2011-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
-- 
GitLab


From 6c7ea4695af0c8cc424dda46ad0aad7d3255238f Mon Sep 17 00:00:00 2001
From: David Sidrane 
Date: Mon, 27 Jun 2016 09:59:13 -1000
Subject: [PATCH 067/229] Syslog changes incoperated

---
 arch/arm/src/stm32f7/stm32_otgdev.c  | 21 +++++++++++----------
 arch/arm/src/stm32f7/stm32_otghost.c | 13 +++++++------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/arch/arm/src/stm32f7/stm32_otgdev.c b/arch/arm/src/stm32f7/stm32_otgdev.c
index f2f8289042..6a776976e2 100644
--- a/arch/arm/src/stm32f7/stm32_otgdev.c
+++ b/arch/arm/src/stm32f7/stm32_otgdev.c
@@ -2,7 +2,8 @@
  * arch/arm/src/stm32f7/stm32_otgdev.c
  *
  *   Copyright (C) 2012-2014, 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
@@ -1276,7 +1277,7 @@ static void stm32_epin_request(FAR struct stm32_usbdev_s *priv,
       return;
     }
 
-  ullinfo("EP%d req=%p: len=%d xfrd=%d zlp=%d\n",
+  uinfo("EP%d req=%p: len=%d xfrd=%d zlp=%d\n",
           privep->epphy, privreq, privreq->req.len,
           privreq->req.xfrd, privep->zlp);
 
@@ -1542,7 +1543,7 @@ static void stm32_epout_complete(FAR struct stm32_usbdev_s *priv,
       return;
     }
 
-  ullinfo("EP%d: len=%d xfrd=%d\n",
+  uinfo("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
@@ -1577,7 +1578,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;
 
-  ullinfo("EP0: bcnt=%d\n", bcnt);
+  uinfo("EP0: bcnt=%d\n", bcnt);
   usbtrace(TRACE_READ(EP0), bcnt);
 
   /* Verify that an OUT SETUP request as received before this data was
@@ -1670,7 +1671,7 @@ static inline void stm32_epout_receive(FAR struct stm32_ep_s *privep, int bcnt)
       return;
     }
 
-  ullinfo("EP%d: len=%d xfrd=%d\n", privep->epphy, privreq->req.len, privreq->req.xfrd);
+  uinfo("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 */
@@ -1754,7 +1755,7 @@ static void stm32_epout_request(FAR struct stm32_usbdev_s *priv,
               return;
             }
 
-          ullinfo("EP%d: len=%d\n", privep->epphy, privreq->req.len);
+          uinfo("EP%d: len=%d\n", privep->epphy, privreq->req.len);
 
           /* Ignore any attempt to receive a zero length packet (this really
            * should not happen.
@@ -2548,7 +2549,7 @@ static inline void stm32_ep0out_setup(struct stm32_usbdev_s *priv)
   ctrlreq.index = GETUINT16(priv->ctrlreq.index);
   ctrlreq.len   = GETUINT16(priv->ctrlreq.len);
 
-  ullinfo("type=%02x req=%02x value=%04x index=%04x len=%04x\n",
+  uinfo("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 */
@@ -2683,7 +2684,7 @@ static inline void stm32_epout_interrupt(FAR struct stm32_usbdev_s *priv)
           if ((daint & 1) != 0)
             {
               regval = stm32_getreg(STM32_OTG_DOEPINT(epno));
-              ullerr("DOEPINT(%d) = %08x\n", epno, regval);
+              uerr("DOEPINT(%d) = %08x\n", epno, regval);
               stm32_putreg(0xFF, STM32_OTG_DOEPINT(epno));
             }
 
@@ -2913,7 +2914,7 @@ static inline void stm32_epin_interrupt(FAR struct stm32_usbdev_s *priv)
         {
           if ((daint & 1) != 0)
             {
-              ullerr("DIEPINT(%d) = %08x\n",
+              uerr("DIEPINT(%d) = %08x\n",
                      epno, stm32_getreg(STM32_OTG_DIEPINT(epno)));
               stm32_putreg(0xFF, STM32_OTG_DIEPINT(epno));
             }
@@ -4393,7 +4394,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);
-      ullinfo("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
+      uinfo("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
       return -EINVAL;
     }
 #endif
diff --git a/arch/arm/src/stm32f7/stm32_otghost.c b/arch/arm/src/stm32f7/stm32_otghost.c
index c6f25c6769..69ac3fbe68 100644
--- a/arch/arm/src/stm32f7/stm32_otghost.c
+++ b/arch/arm/src/stm32f7/stm32_otghost.c
@@ -3,6 +3,7 @@
  *
  *   Copyright (C) 2012-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
@@ -2368,7 +2369,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;
-  ullinfo("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending);
+  uinfo("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending);
 
   /* Check for a pending ACK response received/transmitted (ACK) interrupt */
 
@@ -2629,7 +2630,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;
-  ullinfo("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending);
+  uinfo("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending);
 
   /* Check for a pending ACK response received/transmitted (ACK) interrupt */
 
@@ -2947,7 +2948,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_OTG_GRXSTSP);
-  ullinfo("GRXSTS: %08x\n", grxsts);
+  uinfo("GRXSTS: %08x\n", grxsts);
 
   /* Isolate the channel number/index in the status word */
 
@@ -3100,7 +3101,7 @@ static inline void stm32_gint_nptxfeisr(FAR struct stm32_usbhost_s *priv)
 
   /* Write the next group of packets into the Tx FIFO */
 
-  ullinfo("HNPTXSTS: %08x chidx: %d avail: %d buflen: %d xfrd: %d wrsize: %d\n",
+  uinfo("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);
@@ -3188,7 +3189,7 @@ static inline void stm32_gint_ptxfeisr(FAR struct stm32_usbhost_s *priv)
 
   /* Write the next group of packets into the Tx FIFO */
 
-  ullinfo("HPTXSTS: %08x chidx: %d avail: %d buflen: %d xfrd: %d wrsize: %d\n",
+  uinfo("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);
@@ -4724,7 +4725,7 @@ static int stm32_connect(FAR struct usbhost_driver_s *drvr,
   /* Set the connected/disconnected flag */
 
   hport->connected = connected;
-  ullinfo("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO");
+  uinfo("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO");
 
   /* Report the connection event */
 
-- 
GitLab


From 8ebd10e8e1e7d0b477de677535799433dafe98aa Mon Sep 17 00:00:00 2001
From: David Sidrane 
Date: Mon, 27 Jun 2016 10:00:29 -1000
Subject: [PATCH 068/229] Added USB otg device to Nucleo-144

---
 configs/nucleo-144/src/Makefile     |   4 +
 configs/nucleo-144/src/nucleo-144.h |  37 ++++
 configs/nucleo-144/src/stm32_boot.c |   4 +
 configs/nucleo-144/src/stm32_usb.c  | 329 ++++++++++++++++++++++++++++
 4 files changed, 374 insertions(+)
 create mode 100644 configs/nucleo-144/src/stm32_usb.c

diff --git a/configs/nucleo-144/src/Makefile b/configs/nucleo-144/src/Makefile
index ca3ede019c..452465e256 100644
--- a/configs/nucleo-144/src/Makefile
+++ b/configs/nucleo-144/src/Makefile
@@ -64,4 +64,8 @@ ifeq ($(CONFIG_MMCSD),y)
 CSRCS += stm32_sdio.c
 endif
 
+ifeq ($(CONFIG_STM32F7_OTGFS),y)
+CSRCS += stm32_usb.c
+endif
+
 include $(TOPDIR)/configs/Board.mk
diff --git a/configs/nucleo-144/src/nucleo-144.h b/configs/nucleo-144/src/nucleo-144.h
index e5fa337340..5aa52e4073 100644
--- a/configs/nucleo-144/src/nucleo-144.h
+++ b/configs/nucleo-144/src/nucleo-144.h
@@ -169,6 +169,29 @@
 #  endif
 #endif
 
+/* USB OTG FS
+ *
+ * PA9  OTG_FS_VBUS VBUS sensing (also connected to the green LED)
+ * PC0  OTG_FS_PowerSwitchOn
+ * PD5  OTG_FS_Overcurrent
+ */
+
+#define GPIO_OTGFS_VBUS   (GPIO_INPUT|GPIO_FLOAT|GPIO_SPEED_100MHz|\
+                           GPIO_OPENDRAIN|GPIO_PORTA|GPIO_PIN9)
+
+#define GPIO_OTGFS_PWRON  (GPIO_OUTPUT|GPIO_FLOAT|GPIO_SPEED_100MHz|\
+                           GPIO_PUSHPULL|GPIO_PORTG|GPIO_PIN6)
+
+#ifdef CONFIG_USBHOST
+#  define GPIO_OTGFS_OVER (GPIO_INPUT|GPIO_EXTI|GPIO_FLOAT|\
+                           GPIO_SPEED_100MHz|GPIO_PUSHPULL|\
+                           GPIO_PORTG|GPIO_PIN7)
+
+#else
+#  define GPIO_OTGFS_OVER (GPIO_INPUT|GPIO_FLOAT|GPIO_SPEED_100MHz|\
+                           GPIO_PUSHPULL|GPIO_PORTG|GPIO_PIN7)
+#endif
+
 /************************************************************************************
  * Public data
  ************************************************************************************/
@@ -245,5 +268,19 @@ int board_adc_initialize(void);
 int stm32_sdio_initialize(void);
 #endif
 
+/************************************************************************************
+ * Name: stm32_usbinitialize
+ *
+ * Description:
+ *   Called from stm32_usbinitialize very early in inialization to setup USB-related
+ *   GPIO pins for the nucleo-144 board.
+ *
+ ************************************************************************************/
+
+
+#ifdef CONFIG_STM32F7_OTGFS
+void stm32_usbinitialize(void);
+#endif
+
 #endif /* __ASSEMBLY__ */
 #endif /* __CONFIGS_NUCLEO_144_SRC_NUCLEO_144_H */
diff --git a/configs/nucleo-144/src/stm32_boot.c b/configs/nucleo-144/src/stm32_boot.c
index 6e767a2975..684ade8176 100644
--- a/configs/nucleo-144/src/stm32_boot.c
+++ b/configs/nucleo-144/src/stm32_boot.c
@@ -70,6 +70,10 @@ void stm32_boardinitialize(void)
   board_autoled_initialize();
 #endif
 
+#if defined(CONFIG_STM32F7_OTGFS) || defined(CONFIG_STM32F7_HOST)
+  stm32_usbinitialize();
+#endif
+
 #if defined(CONFIG_SPI)
   /* Configure SPI chip selects */
 
diff --git a/configs/nucleo-144/src/stm32_usb.c b/configs/nucleo-144/src/stm32_usb.c
new file mode 100644
index 0000000000..1cb422a78c
--- /dev/null
+++ b/configs/nucleo-144/src/stm32_usb.c
@@ -0,0 +1,329 @@
+/************************************************************************************
+ * configs//nucleo-144/src/stm32_usb.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.
+ *
+ ************************************************************************************/
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+
+#include "up_arch.h"
+#include "chip.h"
+#include "stm32_gpio.h"
+#include "stm32_otg.h"
+#include "nucleo-144.h"
+
+#ifdef CONFIG_STM32F7_OTGFS
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+#if defined(CONFIG_USBDEV) || defined(CONFIG_USBHOST)
+#  define HAVE_USB 1
+#else
+#  warning "CONFIG_STM32_OTGFS is enabled but neither CONFIG_USBDEV nor CONFIG_USBHOST"
+#  undef HAVE_USB
+#endif
+
+#ifndef CONFIG_NUCLEO144_USBHOST_PRIO
+#  define CONFIG_NUCLEO144_USBHOST_PRIO 100
+#endif
+
+#ifndef CONFIG_NUCLEO_USBHOST_STACKSIZE
+#  define CONFIG_NUCLEO_USBHOST_STACKSIZE 1024
+#endif
+
+/************************************************************************************
+ * Private Data
+ ************************************************************************************/
+
+#ifdef CONFIG_USBHOST
+static struct usbhost_connection_s *g_usbconn;
+#endif
+
+/************************************************************************************
+ * Private Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Name: usbhost_waiter
+ *
+ * Description:
+ *   Wait for USB devices to be connected.
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_USBHOST
+static int usbhost_waiter(int argc, char *argv[])
+{
+  struct usbhost_hubport_s *hport;
+
+  uinfo("Running\n");
+  for (;;)
+    {
+      /* Wait for the device to change state */
+
+      DEBUGVERIFY(CONN_WAIT(g_usbconn, &hport));
+      uinfo("%s\n", hport->connected ? "connected" : "disconnected");
+
+      /* Did we just become connected? */
+
+      if (hport->connected)
+        {
+          /* Yes.. enumerate the newly connected device */
+
+          (void)CONN_ENUMERATE(g_usbconn, hport);
+        }
+    }
+
+  /* Keep the compiler from complaining */
+
+  return 0;
+}
+#endif
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Name: stm32_usbinitialize
+ *
+ * Description:
+ *   Called from stm32_usbinitialize very early in inialization to setup USB-related
+ *   GPIO pins for the nucleo-144 board.
+ *
+ ************************************************************************************/
+
+void stm32_usbinitialize(void)
+{
+  /* The OTG FS has an internal soft pull-up.  No GPIO configuration is required */
+
+  /* Configure the OTG FS VBUS sensing GPIO, Power On, and Overcurrent GPIOs */
+
+#ifdef CONFIG_STM32F7_OTGFS
+  stm32_configgpio(GPIO_OTGFS_VBUS);
+  stm32_configgpio(GPIO_OTGFS_PWRON);
+  stm32_configgpio(GPIO_OTGFS_OVER);
+#endif
+}
+
+/***********************************************************************************
+ * Name: stm32_usbhost_initialize
+ *
+ * Description:
+ *   Called at application startup time to initialize the USB host functionality.
+ *   This function will start a thread that will monitor for device
+ *   connection/disconnection events.
+ *
+ ***********************************************************************************/
+
+#ifdef CONFIG_USBHOST
+int stm32_usbhost_initialize(void)
+{
+  int pid;
+#if defined(CONFIG_USBHOST_HUB)    || defined(CONFIG_USBHOST_MSC) || \
+    defined(CONFIG_USBHOST_HIDKBD) || defined(CONFIG_USBHOST_HIDMOUSE)
+  int ret;
+#endif
+
+  /* First, register all of the class drivers needed to support the drivers
+   * that we care about:
+   */
+
+  uinfo("Register class drivers\n");
+
+#ifdef CONFIG_USBHOST_HUB
+  /* Initialize USB hub class support */
+
+  ret = usbhost_hub_initialize();
+  if (ret < 0)
+    {
+      uerr("ERROR: usbhost_hub_initialize failed: %d\n", ret);
+    }
+#endif
+
+#ifdef CONFIG_USBHOST_MSC
+  /* Register the USB mass storage class class */
+
+  ret = usbhost_msc_initialize();
+  if (ret != OK)
+    {
+      uerr("ERROR: Failed to register the mass storage class: %d\n", ret);
+    }
+#endif
+
+#ifdef CONFIG_USBHOST_CDCACM
+  /* Register the CDC/ACM serial class */
+
+  ret = usbhost_cdcacm_initialize();
+  if (ret != OK)
+    {
+      uerr("ERROR: Failed to register the CDC/ACM serial class: %d\n", ret);
+    }
+#endif
+
+#ifdef CONFIG_USBHOST_HIDKBD
+  /* Initialize the HID keyboard class */
+
+  ret = usbhost_kbdinit();
+  if (ret != OK)
+    {
+      uerr("ERROR: Failed to register the HID keyboard class\n");
+    }
+#endif
+
+#ifdef CONFIG_USBHOST_HIDMOUSE
+  /* Initialize the HID mouse class */
+
+  ret = usbhost_mouse_init();
+  if (ret != OK)
+    {
+      uerr("ERROR: Failed to register the HID mouse class\n");
+    }
+#endif
+
+  /* Then get an instance of the USB host interface */
+
+  uinfo("Initialize USB host\n");
+  g_usbconn = stm32_otgfshost_initialize(0);
+  if (g_usbconn)
+    {
+      /* Start a thread to handle device connection. */
+
+      uinfo("Start usbhost_waiter\n");
+
+      pid = task_create("usbhost", CONFIG_STM32F4DISCO_USBHOST_PRIO,
+                        CONFIG_STM32F4DISCO_USBHOST_STACKSIZE,
+                        (main_t)usbhost_waiter, (FAR char * const *)NULL);
+      return pid < 0 ? -ENOEXEC : OK;
+    }
+
+  return -ENODEV;
+}
+#endif
+
+/***********************************************************************************
+ * Name: stm32_usbhost_vbusdrive
+ *
+ * Description:
+ *   Enable/disable driving of VBUS 5V output.  This function must be provided be
+ *   each platform that implements the STM32 OTG FS host interface
+ *
+ *   "On-chip 5 V VBUS generation is not supported. For this reason, a charge pump
+ *    or, if 5 V are available on the application board, a basic power switch, must
+ *    be added externally to drive the 5 V VBUS line. The external charge pump can
+ *    be driven by any GPIO output. When the application decides to power on VBUS
+ *    using the chosen GPIO, it must also set the port power bit in the host port
+ *    control and status register (PPWR bit in OTG_FS_HPRT).
+ *
+ *   "The application uses this field to control power to this port, and the core
+ *    clears this bit on an overcurrent condition."
+ *
+ * Input Parameters:
+ *   iface - For future growth to handle multiple USB host interface.  Should be zero.
+ *   enable - true: enable VBUS power; false: disable VBUS power
+ *
+ * Returned Value:
+ *   None
+ *
+ ***********************************************************************************/
+
+#ifdef CONFIG_USBHOST
+void stm32_usbhost_vbusdrive(int iface, bool enable)
+{
+  DEBUGASSERT(iface == 0);
+
+  /* Set the Power Switch by driving the active low enable pin */
+
+  stm32_gpiowrite(GPIO_OTGFS_PWRON, !enable);
+}
+#endif
+
+/************************************************************************************
+ * Name: stm32_setup_overcurrent
+ *
+ * Description:
+ *   Setup to receive an interrupt-level callback if an overcurrent condition is
+ *   detected.
+ *
+ * Input Parameter:
+ *   handler - New overcurrent interrupt handler
+ *
+ * Returned value:
+ *   Old overcurrent interrupt handler
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_USBHOST
+xcpt_t stm32_setup_overcurrent(xcpt_t handler)
+{
+  return stm32_gpiosetevent(GPIO_OTGFS_OVER, true, true, true, handler);
+}
+#endif
+
+/************************************************************************************
+ * Name:  stm32_usbsuspend
+ *
+ * Description:
+ *   Board logic must provide the stm32_usbsuspend logic if the USBDEV driver is
+ *   used.  This function is called whenever the USB enters or leaves suspend mode.
+ *   This is an opportunity for the board logic to shutdown clocks, power, etc.
+ *   while the USB is suspended.
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_USBDEV
+void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume)
+{
+  uinfo("resume: %d\n", resume);
+}
+#endif
+
+#endif /* CONFIG_STM32_OTGFS */
-- 
GitLab


From 8e26d4c8e0a2975da737b8cc7e8aeb67b41c111f Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 27 Jun 2016 15:15:41 -0600
Subject: [PATCH 069/229] STM32 CAN: More fixes for compilation errors due to
 blind leverage of STM32L4 CAN filter IOCTLs to STM32

---
 arch/arm/src/stm32/stm32_can.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/arch/arm/src/stm32/stm32_can.c b/arch/arm/src/stm32/stm32_can.c
index 78404f48c6..48f184a678 100644
--- a/arch/arm/src/stm32/stm32_can.c
+++ b/arch/arm/src/stm32/stm32_can.c
@@ -127,10 +127,12 @@ static void stm32can_dumpfiltregs(FAR struct stm32_can_s *priv,
 
 /* Filtering (todo) */
 
+#ifdef CONFIG_CAN_EXTID
 static int  stm32can_addextfilter(FAR struct stm32_can_s *priv,
               FAR struct canioc_extfilter_s *arg);
 static int  stm32can_delextfilter(FAR struct stm32_can_s *priv,
               int arg);
+#endif
 static int  stm32can_addstdfilter(FAR struct stm32_can_s *priv,
               FAR struct canioc_stdfilter_s *arg);
 static int  stm32can_delstdfilter(FAR struct stm32_can_s *priv,
@@ -1987,11 +1989,13 @@ static int stm32can_filterinit(FAR struct stm32_can_s *priv)
  *
  ****************************************************************************/
 
-static int  stm32can_addextfilter(FAR struct stm32_can_s *priv,
-                                    FAR struct canioc_extfilter_s *arg)
+#ifdef CONFIG_CAN_EXTID
+static int stm32can_addextfilter(FAR struct stm32_can_s *priv,
+                                 FAR struct canioc_extfilter_s *arg)
 {
   return -ENOTTY;
 }
+#endif
 
 /****************************************************************************
  * Name: stm32can_delextfilter
@@ -2011,13 +2015,15 @@ static int  stm32can_addextfilter(FAR struct stm32_can_s *priv,
  *
  ****************************************************************************/
 
+#ifdef CONFIG_CAN_EXTID
 static int  stm32can_delextfilter(FAR struct stm32_can_s *priv, int arg)
 {
   return -ENOTTY;
 }
+#endif
 
 /****************************************************************************
- * Name: stm32can_addextfilter
+ * Name: stm32can_addstdfilter
  *
  * Description:
  *   Add a filter for standard CAN IDs
@@ -2033,8 +2039,8 @@ static int  stm32can_delextfilter(FAR struct stm32_can_s *priv, int arg)
  *
  ****************************************************************************/
 
-static int  stm32can_addstdfilter(FAR struct stm32_can_s *priv,
-                                    FAR struct canioc_stdfilter_s *arg)
+static int stm32can_addstdfilter(FAR struct stm32_can_s *priv,
+                                 FAR struct canioc_stdfilter_s *arg)
 {
   return -ENOTTY;
 }
-- 
GitLab


From d4408264ec32425b74657bd3afb7fada7a8fbf8e Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 27 Jun 2016 15:18:45 -0600
Subject: [PATCH 070/229] STM32 CAN fixes need to be backported to STM32L4 as
 well

---
 arch/arm/src/stm32l4/stm32l4_can.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/arch/arm/src/stm32l4/stm32l4_can.c b/arch/arm/src/stm32l4/stm32l4_can.c
index 2d65032c33..a6c40af4e0 100644
--- a/arch/arm/src/stm32l4/stm32l4_can.c
+++ b/arch/arm/src/stm32l4/stm32l4_can.c
@@ -130,10 +130,12 @@ static void stm32l4can_dumpfiltregs(FAR struct stm32l4_can_s *priv,
 
 /* Filtering (todo) */
 
+#ifdef CONFIG_CAN_EXTID
 static int  stm32l4can_addextfilter(FAR struct stm32l4_can_s *priv,
               FAR struct canioc_extfilter_s *arg);
 static int  stm32l4can_delextfilter(FAR struct stm32l4_can_s *priv,
               int arg);
+#endif
 static int  stm32l4can_addstdfilter(FAR struct stm32l4_can_s *priv,
               FAR struct canioc_stdfilter_s *arg);
 static int  stm32l4can_delstdfilter(FAR struct stm32l4_can_s *priv,
@@ -1928,11 +1930,13 @@ static int stm32l4can_filterinit(FAR struct stm32l4_can_s *priv)
  *
  ****************************************************************************/
 
-static int  stm32l4can_addextfilter(FAR struct stm32l4_can_s *priv,
-                                    FAR struct canioc_extfilter_s *arg)
+#ifdef CONFIG_CAN_EXTID
+static int stm32l4can_addextfilter(FAR struct stm32l4_can_s *priv,
+                                   FAR struct canioc_extfilter_s *arg)
 {
   return -ENOTTY;
 }
+#endif
 
 /****************************************************************************
  * Name: stm32l4can_delextfilter
@@ -1952,13 +1956,15 @@ static int  stm32l4can_addextfilter(FAR struct stm32l4_can_s *priv,
  *
  ****************************************************************************/
 
-static int  stm32l4can_delextfilter(FAR struct stm32l4_can_s *priv, int arg)
+#ifdef CONFIG_CAN_EXTID
+static int stm32l4can_delextfilter(FAR struct stm32l4_can_s *priv, int arg)
 {
   return -ENOTTY;
 }
+#endif
 
 /****************************************************************************
- * Name: stm32l4can_addextfilter
+ * Name: stm32l4can_addstdfilter
  *
  * Description:
  *   Add a filter for standard CAN IDs
@@ -1974,8 +1980,8 @@ static int  stm32l4can_delextfilter(FAR struct stm32l4_can_s *priv, int arg)
  *
  ****************************************************************************/
 
-static int  stm32l4can_addstdfilter(FAR struct stm32l4_can_s *priv,
-                                    FAR struct canioc_stdfilter_s *arg)
+static int stm32l4can_addstdfilter(FAR struct stm32l4_can_s *priv,
+                                   FAR struct canioc_stdfilter_s *arg)
 {
   return -ENOTTY;
 }
@@ -1998,7 +2004,7 @@ static int  stm32l4can_addstdfilter(FAR struct stm32l4_can_s *priv,
  *
  ****************************************************************************/
 
-static int  stm32l4can_delstdfilter(FAR struct stm32l4_can_s *priv, int arg)
+static int stm32l4can_delstdfilter(FAR struct stm32l4_can_s *priv, int arg)
 {
   return -ENOTTY;
 }
-- 
GitLab


From 89a79e8ac0ef2b4cfa77778858d58fa819c8ea3c Mon Sep 17 00:00:00 2001
From: David Sidrane 
Date: Mon, 27 Jun 2016 15:56:21 -1000
Subject: [PATCH 071/229] Double faulting on Idle task with 0 stack

---
 arch/arm/src/common/up_checkstack.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm/src/common/up_checkstack.c b/arch/arm/src/common/up_checkstack.c
index 55f89388e3..cce1a9874a 100644
--- a/arch/arm/src/common/up_checkstack.c
+++ b/arch/arm/src/common/up_checkstack.c
@@ -84,6 +84,10 @@ static size_t do_stackcheck(uintptr_t alloc, size_t size)
   FAR uint32_t *ptr;
   size_t mark;
 
+  if (size == 0)
+    {
+      return 0;
+    }
   /* Get aligned addresses of the top and bottom of the stack */
 #ifdef CONFIG_TLS
   /* Skip over the TLS data structure at the bottom of the stack */
-- 
GitLab


From 20d2a0a3d7c209d770de16de3a1739db42b6cd12 Mon Sep 17 00:00:00 2001
From: David Sidrane 
Date: Mon, 27 Jun 2016 16:11:53 -1000
Subject: [PATCH 072/229] Added bbsram test to Nucleo-144

---
 configs/nucleo-144/src/Makefile              |   4 +
 configs/nucleo-144/src/nucleo-144.h          |   6 +
 configs/nucleo-144/src/stm32_appinitialize.c |   3 +
 configs/nucleo-144/src/stm32_bbsram.c        | 448 +++++++++++++++++++
 4 files changed, 461 insertions(+)
 create mode 100644 configs/nucleo-144/src/stm32_bbsram.c

diff --git a/configs/nucleo-144/src/Makefile b/configs/nucleo-144/src/Makefile
index 452465e256..846122801b 100644
--- a/configs/nucleo-144/src/Makefile
+++ b/configs/nucleo-144/src/Makefile
@@ -68,4 +68,8 @@ ifeq ($(CONFIG_STM32F7_OTGFS),y)
 CSRCS += stm32_usb.c
 endif
 
+ifeq ($(CONFIG_STM32F7_BBSRAM),y)
+CSRCS += stm32_bbsram.c
+endif
+
 include $(TOPDIR)/configs/Board.mk
diff --git a/configs/nucleo-144/src/nucleo-144.h b/configs/nucleo-144/src/nucleo-144.h
index 5aa52e4073..064f789cde 100644
--- a/configs/nucleo-144/src/nucleo-144.h
+++ b/configs/nucleo-144/src/nucleo-144.h
@@ -282,5 +282,11 @@ int stm32_sdio_initialize(void);
 void stm32_usbinitialize(void);
 #endif
 
+/************************************************************************************
+ * Name: stm32_bbsram_int
+ ************************************************************************************/
+#ifdef CONFIG_STM32F7_BBSRAM
+int stm32_bbsram_int(void);
+#endif
 #endif /* __ASSEMBLY__ */
 #endif /* __CONFIGS_NUCLEO_144_SRC_NUCLEO_144_H */
diff --git a/configs/nucleo-144/src/stm32_appinitialize.c b/configs/nucleo-144/src/stm32_appinitialize.c
index 17b26a1b05..0a0c58a871 100644
--- a/configs/nucleo-144/src/stm32_appinitialize.c
+++ b/configs/nucleo-144/src/stm32_appinitialize.c
@@ -101,6 +101,9 @@ int board_app_initialize(uintptr_t arg)
       syslog(LOG_ERR, "ERROR: userled_lower_initialize() failed: %d\n", ret);
     }
 #endif
+#ifdef CONFIG_STM32F7_BBSRAM
+  (void)stm32_bbsram_int();
+#endif
 
 #if defined(CONFIG_FAT_DMAMEMORY)
   if (stm32_dma_alloc_init() < 0)
diff --git a/configs/nucleo-144/src/stm32_bbsram.c b/configs/nucleo-144/src/stm32_bbsram.c
new file mode 100644
index 0000000000..247df97933
--- /dev/null
+++ b/configs/nucleo-144/src/stm32_bbsram.c
@@ -0,0 +1,448 @@
+/************************************************************************************
+ * configs/nucleo-144/src/stm32_bbsram.c
+ *
+ *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+ *   Author: 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.
+ *
+ ************************************************************************************/
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include 
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+#include "nucleo-144.h"
+
+#ifdef CONFIG_STM32F7_BBSRAM
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+/* Configuration ********************************************************************/
+/* The path to the Battery Backed up SRAM */
+#define BBSRAM_PATH "/bbr"
+#define HARDFAULT_FILENO 3
+#define HARDFAULT_PATH "/bbr3"
+/* The sizes of the files to create (-1) use rest of BBSRAM memory */
+#define BSRAM_FILE_SIZES { \
+        256, \
+        256, \
+        1024, \
+        -1, \
+        0     \
+    }
+
+#define MAX_FILE_PATH_LENGTH 40
+#define CONFIG_ISTACK_SIZE 800
+#define CONFIG_USTACK_SIZE 800
+
+#define arraySize(a) (sizeof((a))/sizeof(a[0]))
+/************************************************************************************
+ * Private Data
+ ************************************************************************************/
+typedef uint32_t stack_word_t;
+/* Used for stack frame storage */
+typedef uint32_t stack_word_t;
+
+/* Stack related data */
+
+typedef struct {
+    uint32_t sp;
+    uint32_t top;
+    uint32_t size;
+
+} _stack_s;
+
+typedef struct {
+    _stack_s user;
+#if CONFIG_ARCH_INTERRUPTSTACK > 3
+    _stack_s interrupt;
+#endif
+
+} stack_t;
+
+/* Not Used for reference only */
+
+typedef struct {
+    uint32_t r0;
+    uint32_t r1;
+    uint32_t r2;
+    uint32_t r3;
+    uint32_t r4;
+    uint32_t r5;
+    uint32_t r6;
+    uint32_t r7;
+    uint32_t r8;
+    uint32_t r9;
+    uint32_t r10;
+    uint32_t r11;
+    uint32_t r12;
+    uint32_t sp;
+    uint32_t lr;
+    uint32_t pc;
+    uint32_t xpsr;
+    uint32_t d0;
+    uint32_t d1;
+    uint32_t d2;
+    uint32_t d3;
+    uint32_t d4;
+    uint32_t d5;
+    uint32_t d6;
+    uint32_t d7;
+    uint32_t d8;
+    uint32_t d9;
+    uint32_t d10;
+    uint32_t d11;
+    uint32_t d12;
+    uint32_t d13;
+    uint32_t d14;
+    uint32_t d15;
+    uint32_t fpscr;
+    uint32_t sp_main;
+    uint32_t sp_process;
+    uint32_t apsr;
+    uint32_t ipsr;
+    uint32_t epsr;
+    uint32_t primask;
+    uint32_t basepri;
+    uint32_t faultmask;
+    uint32_t control;
+    uint32_t s0;
+    uint32_t s1;
+    uint32_t s2;
+    uint32_t s3;
+    uint32_t s4;
+    uint32_t s5;
+    uint32_t s6;
+    uint32_t s7;
+    uint32_t s8;
+    uint32_t s9;
+    uint32_t s10;
+    uint32_t s11;
+    uint32_t s12;
+    uint32_t s13;
+    uint32_t s14;
+    uint32_t s15;
+    uint32_t s16;
+    uint32_t s17;
+    uint32_t s18;
+    uint32_t s19;
+    uint32_t s20;
+    uint32_t s21;
+    uint32_t s22;
+    uint32_t s23;
+    uint32_t s24;
+    uint32_t s25;
+    uint32_t s26;
+    uint32_t s27;
+    uint32_t s28;
+    uint32_t s29;
+    uint32_t s30;
+    uint32_t s31;
+} proc_regs_s;
+
+
+/* Flags to identify what is in the dump */
+typedef enum {
+    eRegsPresent          = 0x01,
+    eUserStackPresent     = 0x02,
+    eIntStackPresent      = 0x04,
+    eInvalidUserStackPtr  = 0x20,
+    eInvalidIntStackPrt   = 0x40,
+} fault_flags_t;
+
+typedef struct {
+    fault_flags_t         flags;                  /* What is in the dump */
+    uintptr_t             current_regs;           /* Used to validate the dump */
+    int                   lineno;                 /* __LINE__ to up_assert */
+    int                   pid;                    /* Process ID */
+    uint32_t              regs[XCPTCONTEXT_REGS]; /* Interrupt register save
+                                             * area */
+    stack_t               stacks;                 /* Stack info */
+#if CONFIG_TASK_NAME_SIZE > 0
+    char                  name[CONFIG_TASK_NAME_SIZE + 1]; /* Task name (with NULL
+                                                    * terminator) */
+#endif
+    char                  filename[MAX_FILE_PATH_LENGTH]; /* the Last of chars in
+                                                  * __FILE__ to up_assert */
+} info_s;
+
+typedef struct {
+    info_s    info;                       /* The info */
+#if CONFIG_ARCH_INTERRUPTSTACK > 3      /* The amount of stack data is compile time
+                                     * sized backed on what is left after the
+                                     * other BBSRAM files are defined
+                                     * The order is such that only the
+                                     * ustack should be truncated
+                                     */
+    stack_word_t istack[CONFIG_USTACK_SIZE];
+#endif
+    stack_word_t ustack[CONFIG_ISTACK_SIZE];
+} fullcontext_s;
+
+/************************************************************************************
+ * Private Functions
+ ************************************************************************************/
+/****************************************************************************
+ * hardfault_get_desc
+ ****************************************************************************/
+static int hardfault_get_desc(struct bbsramd_s *desc)
+{
+  int ret = -ENOENT;
+  int fd = open(HARDFAULT_PATH, O_RDONLY);
+
+  if (fd < 0)
+    {
+      syslog(LOG_INFO, "stm32 bbsram: Failed to open Fault Log file [%s] (%d)\n", HARDFAULT_PATH, fd);
+
+    }
+  else
+    {
+      ret = -EIO;
+      int rv = ioctl(fd, STM32F7_BBSRAM_GETDESC_IOCTL, (unsigned long)((uintptr_t)desc));
+
+      if (rv >= 0)
+        {
+          ret = fd;
+        }
+      else
+        {
+            syslog(LOG_INFO, "stm32 bbsram: Failed to get Fault Log descriptor (%d)\n", rv);
+        }
+  }
+  return ret;
+}
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+int stm32_bbsram_int(void)
+{
+
+
+  /* Using Battery Backed Up SRAM */
+
+  int filesizes[CONFIG_STM32F7_BBSRAM_FILES + 1] = BSRAM_FILE_SIZES;
+  int rv;
+  struct bbsramd_s desc;
+  stm32_bbsraminitialize(BBSRAM_PATH, filesizes);
+
+#if defined(CONFIG_STM32F7_SAVE_CRASHDUMP)
+
+  /* Panic Logging in Battery Backed Up Files */
+
+  /* Do we have an hard fault in BBSRAM?
+   */
+  rv = hardfault_get_desc(&desc);
+
+  if (rv >= OK)
+    {
+      printf("There is a hard fault logged.\n");
+
+      rv = unlink(HARDFAULT_PATH);
+      if (rv < 0)
+        {
+          syslog(LOG_INFO, "stm32 bbsram: Failed to unlink Fault Log file [%s] (%d)\n", HARDFAULT_PATH, rv);
+
+        }
+
+    }
+#endif // CONFIG_STM32_SAVE_CRASHDUMP
+  return rv;
+}
+
+#if defined(CONFIG_STM32F7_SAVE_CRASHDUMP)
+static void copy_reverse(stack_word_t *dest, stack_word_t *src, int size)
+{
+  while (size--)
+    {
+      *dest++ = *src--;
+    }
+}
+uint8_t sdata[STM32F7_BBSRAM_SIZE];
+void board_crashdump(uintptr_t currentsp, FAR void *tcb, FAR const uint8_t *filename, int lineno)
+{
+    fullcontext_s *pdump = (fullcontext_s *)&sdata;
+
+    (void)enter_critical_section();
+
+    struct tcb_s *rtcb = (struct tcb_s *)tcb;
+
+    /* Zero out everything */
+
+    memset(pdump, 0, sizeof(fullcontext_s));
+
+    /* Save Info */
+
+    pdump->info.lineno = lineno;
+
+    if (filename) {
+
+        int offset = 0;
+        unsigned int len = strlen((char *)filename) + 1;
+
+        if (len > sizeof(pdump->info.filename)) {
+            offset = len - sizeof(pdump->info.filename) ;
+        }
+
+        strncpy(pdump->info.filename, (char *)&filename[offset], sizeof(pdump->info.filename));
+    }
+
+    /* Save the value of the pointer for current_regs as debugging info.
+     * It should be NULL in case of an ASSERT and will aid in cross
+     * checking the validity of system memory at the time of the
+     * fault.
+     */
+
+    pdump->info.current_regs = (uintptr_t) CURRENT_REGS;
+
+    /* Save Context */
+
+
+#if CONFIG_TASK_NAME_SIZE > 0
+    strncpy(pdump->info.name, rtcb->name, CONFIG_TASK_NAME_SIZE);
+#endif
+
+    pdump->info.pid = rtcb->pid;
+
+
+    /* If  current_regs is not NULL then we are in an interrupt context
+     * and the user context is in current_regs else we are running in
+     * the users context
+     */
+
+    if (CURRENT_REGS) {
+        pdump->info.stacks.interrupt.sp = currentsp;
+
+        pdump->info.flags |= (eRegsPresent | eUserStackPresent | eIntStackPresent);
+        memcpy(pdump->info.regs, (void *)CURRENT_REGS, sizeof(pdump->info.regs));
+        pdump->info.stacks.user.sp = pdump->info.regs[REG_R13];
+
+    } else {
+
+        /* users context */
+        pdump->info.flags |= eUserStackPresent;
+
+        pdump->info.stacks.user.sp = currentsp;
+    }
+
+    if (pdump->info.pid == 0) {
+
+        pdump->info.stacks.user.top = g_idle_topstack - 4;
+        pdump->info.stacks.user.size = CONFIG_IDLETHREAD_STACKSIZE;
+
+    } else {
+        pdump->info.stacks.user.top = (uint32_t) rtcb->adj_stack_ptr;
+        pdump->info.stacks.user.size = (uint32_t) rtcb->adj_stack_size;;
+    }
+
+#if CONFIG_ARCH_INTERRUPTSTACK > 3
+
+    /* Get the limits on the interrupt stack memory */
+
+    pdump->info.stacks.interrupt.top = (uint32_t)&g_intstackbase;
+    pdump->info.stacks.interrupt.size  = (CONFIG_ARCH_INTERRUPTSTACK & ~3);
+
+    /* If In interrupt Context save the interrupt stack data centered
+     * about the interrupt stack pointer
+     */
+
+    if ((pdump->info.flags & eIntStackPresent) != 0) {
+        stack_word_t *ps = (stack_word_t *) pdump->info.stacks.interrupt.sp;
+        copy_reverse(pdump->istack, &ps[arraySize(pdump->istack) / 2], arraySize(pdump->istack));
+    }
+
+    /* Is it Invalid? */
+
+    if (!(pdump->info.stacks.interrupt.sp <= pdump->info.stacks.interrupt.top &&
+          pdump->info.stacks.interrupt.sp > pdump->info.stacks.interrupt.top - pdump->info.stacks.interrupt.size)) {
+        pdump->info.flags |= eInvalidIntStackPrt;
+    }
+
+#endif
+
+    /* If In interrupt context or User save the user stack data centered
+     * about the user stack pointer
+     */
+    if ((pdump->info.flags & eUserStackPresent) != 0) {
+        stack_word_t *ps = (stack_word_t *) pdump->info.stacks.user.sp;
+        copy_reverse(pdump->ustack, &ps[arraySize(pdump->ustack) / 2], arraySize(pdump->ustack));
+    }
+
+    /* Is it Invalid? */
+
+    if (!(pdump->info.stacks.user.sp <= pdump->info.stacks.user.top &&
+          pdump->info.stacks.user.sp > pdump->info.stacks.user.top - pdump->info.stacks.user.size)) {
+        pdump->info.flags |= eInvalidUserStackPtr;
+    }
+
+    int rv = stm32_bbsram_savepanic(HARDFAULT_FILENO, (uint8_t *)pdump, sizeof(fullcontext_s));
+
+    /* Test if memory got wiped because of using _sdata */
+
+    if (rv == -ENXIO) {
+        char *dead = "Memory wiped - dump not saved!";
+
+        while (*dead) {
+            up_lowputc(*dead++);
+        }
+
+    } else if (rv == -ENOSPC) {
+
+        /* hard fault again */
+
+        up_lowputc('!');
+    }
+
+
+#if defined(CONFIG_BOARD_RESET_ON_CRASH)
+    up_systemreset();
+#endif
+}
+#endif // CONFIG_STM32_SAVE_CRASHDUMP
+
+#endif /* CONFIG_STM32_BBSRAM */
-- 
GitLab


From a4040759b024cd3593f1db94be0b204e6c5ae5c7 Mon Sep 17 00:00:00 2001
From: David Sidrane 
Date: Mon, 27 Jun 2016 16:42:01 -1000
Subject: [PATCH 073/229] Adding PWR, RTC, BBSRAM for stm32f7

---
 arch/arm/src/stm32f7/Kconfig               |   61 +
 arch/arm/src/stm32f7/Make.defs             |   18 +-
 arch/arm/src/stm32f7/chip/stm32_rtcc.h     |  405 ++++++
 arch/arm/src/stm32f7/stm32_alarm.h         |  112 ++
 arch/arm/src/stm32f7/stm32_bbsram.c        |  884 ++++++++++++
 arch/arm/src/stm32f7/stm32_bbsram.h        |  166 +++
 arch/arm/src/stm32f7/stm32_exti_pwr.h      |   72 +
 arch/arm/src/stm32f7/stm32_pwr.c           |  264 ++++
 arch/arm/src/stm32f7/stm32_pwr.h           |    5 +-
 arch/arm/src/stm32f7/stm32_rtc.c           | 1487 ++++++++++++++++++++
 arch/arm/src/stm32f7/stm32_rtc.h           |  178 +++
 arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c |  530 +++++++
 arch/arm/src/stm32f7/stm32f74xx75xx_rcc.c  |    6 +-
 arch/arm/src/stm32f7/stm32f76xx77xx_rcc.c  |    6 +-
 14 files changed, 4184 insertions(+), 10 deletions(-)
 create mode 100644 arch/arm/src/stm32f7/chip/stm32_rtcc.h
 create mode 100644 arch/arm/src/stm32f7/stm32_alarm.h
 create mode 100644 arch/arm/src/stm32f7/stm32_bbsram.c
 create mode 100644 arch/arm/src/stm32f7/stm32_bbsram.h
 create mode 100644 arch/arm/src/stm32f7/stm32_exti_pwr.h
 create mode 100644 arch/arm/src/stm32f7/stm32_pwr.c
 create mode 100644 arch/arm/src/stm32f7/stm32_rtc.c
 create mode 100644 arch/arm/src/stm32f7/stm32_rtc.h
 create mode 100644 arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c

diff --git a/arch/arm/src/stm32f7/Kconfig b/arch/arm/src/stm32f7/Kconfig
index a93aaa598b..5bfa99ea07 100644
--- a/arch/arm/src/stm32f7/Kconfig
+++ b/arch/arm/src/stm32f7/Kconfig
@@ -1195,6 +1195,10 @@ config STM32F7_QUADSPI
 	bool "QuadSPI"
 	default n
 
+config STM32F7_PWR
+    bool "PWR"
+    default n
+
 config STM32F7_RNG
 	bool "RNG"
 	default n
@@ -1794,6 +1798,63 @@ config SDMMC2_WIDTH_D1_ONLY
 
 endmenu # "SDMMC2 Configuration"
 
+if STM32F7_BKPSRAM
+
+config STM32F7_BBSRAM
+    bool "BBSRAM File Support"
+    default n
+
+config STM32F7_BBSRAM_FILES
+    int "Max Files to support in BBSRAM"
+    default 4
+
+config STM32F7_SAVE_CRASHDUMP
+    bool "Enable Saving Panic to BBSRAM"
+    default n
+
+endif # STM32F7_BKPSRAM
+
+config STM32F7_HAVE_RTC_COUNTER
+    bool
+    default n
+
+config STM32F7_HAVE_RTC_SUBSECONDS
+    bool
+    default n
+
+config RTC_MAGIC_REG
+    int "The BKP register used to store/check the Magic value to determine if RTC is set already"
+    default 0
+    range  0 31
+    depends on RTC && !STM32F7_HAVE_RTC_COUNTER
+
+config RTC_MAGIC
+    hex "Value used as Magic to determine if RTC is set already"
+    default 0xfacefeee
+    depends on RTC && !STM32F7_HAVE_RTC_COUNTER
+
+choice
+    prompt "RTC clock source"
+    default STM32F7_RTC_LSECLOCK
+    depends on RTC
+
+config STM32F7_RTC_HSECLOCK
+    bool "HSE clock"
+    ---help---
+        Drive the RTC with the HSE clock, divided down to 1MHz.
+
+config STM32F7_RTC_LSECLOCK
+    bool "LSE clock"
+    ---help---
+        Drive the RTC with the LSE clock
+
+config STM32F7_RTC_LSICLOCK
+    bool "LSI clock"
+    ---help---
+        Drive the RTC with the LSI clock
+
+endchoice #"RTC clock source"
+
 config STM32F7_CUSTOM_CLOCKCONFIG
 		bool "Custom clock configuration"
 	default n
diff --git a/arch/arm/src/stm32f7/Make.defs b/arch/arm/src/stm32f7/Make.defs
index 4534212b63..7e857b6e5d 100644
--- a/arch/arm/src/stm32f7/Make.defs
+++ b/arch/arm/src/stm32f7/Make.defs
@@ -135,8 +135,18 @@ ifeq ($(CONFIG_STM32F7_DMA),y)
 CHIP_CSRCS += stm32_dma.c
 endif
 
-ifeq ($(CONFIG_STM32_PWR),y)
-CHIP_CSRCS += stm32_exti_pwr.c
+ifeq ($(CONFIG_STM32F7_PWR),y)
+CHIP_CSRCS += stm32_pwr.c stm32_exti_pwr.c
+endif
+
+ifeq ($(CONFIG_RTC),y)
+CHIP_CSRCS += stm32_rtc.c
+ifeq ($(CONFIG_RTC_ALARM),y)
+CHIP_CSRCS += stm32_exti_alarm.c
+endif
+ifeq ($(CONFIG_RTC_DRIVER),y)
+CHIP_CSRCS += stm32_rtc_lowerhalf.c
+endif
 endif
 
 ifeq ($(CONFIG_STM32F7_I2C),y)
@@ -180,3 +190,7 @@ endif
 ifeq ($(CONFIG_DEBUG_FEATURES),y)
 CHIP_CSRCS += stm32_dumpgpio.c
 endif
+
+ifeq ($(CONFIG_STM32F7_BBSRAM),y)
+CHIP_CSRCS += stm32_bbsram.c
+endif
diff --git a/arch/arm/src/stm32f7/chip/stm32_rtcc.h b/arch/arm/src/stm32f7/chip/stm32_rtcc.h
new file mode 100644
index 0000000000..65d569ec05
--- /dev/null
+++ b/arch/arm/src/stm32f7/chip/stm32_rtcc.h
@@ -0,0 +1,405 @@
+/************************************************************************************
+ * arch/arm/src/stm32f7/chip/stm32_rtcc.h.h
+ *
+ *   Copyright (C) 2011-2016 Gregory Nutt. All rights reserved.
+ *   Author: 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_SRC_STM32F7_CHIP_STM32_RTCC_H
+#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_RTCC_H
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+/* Register Offsets *****************************************************************/
+
+#define STM32_RTC_TR_OFFSET       0x0000 /* RTC time register */
+#define STM32_RTC_DR_OFFSET       0x0004 /* RTC date register */
+#define STM32_RTC_CR_OFFSET       0x0008 /* RTC control register */
+#define STM32_RTC_ISR_OFFSET      0x000c /* RTC initialization and status register */
+#define STM32_RTC_PRER_OFFSET     0x0010 /* RTC prescaler register */
+#define STM32_RTC_WUTR_OFFSET     0x0014 /* RTC wakeup timer register */
+#define STM32_RTC_ALRMAR_OFFSET   0x001c /* RTC alarm A register */
+#define STM32_RTC_ALRMBR_OFFSET   0x0020 /* RTC alarm B register */
+#define STM32_RTC_WPR_OFFSET      0x0024 /* RTC write protection register */
+#define STM32_RTC_SSR_OFFSET      0x0028 /* RTC sub second register */
+#define STM32_RTC_SHIFTR_OFFSET   0x002c /* RTC shift control register */
+#define STM32_RTC_TSTR_OFFSET     0x0030 /* RTC time stamp time register */
+#define STM32_RTC_TSDR_OFFSET     0x0034 /* RTC time stamp date register */
+#define STM32_RTC_TSSSR_OFFSET    0x0038 /* RTC timestamp sub second register */
+#define STM32_RTC_CALR_OFFSET     0x003c /* RTC calibration register */
+#define STM32_RTC_TAMPCR_OFFSET   0x0040 /* RTC tamper configuration register */
+#define STM32_RTC_ALRMASSR_OFFSET 0x0044 /* RTC alarm A sub second register */
+#define STM32_RTC_ALRMBSSR_OFFSET 0x0048 /* RTC alarm B sub second register */
+#define STM32_RTC_OR_OFFSET       0x004c /* RTC option register */
+
+#define STM32_RTC_BKR_OFFSET(n)   (0x0050+((n)<<2))
+#define STM32_RTC_BK0R_OFFSET     0x0050 /* RTC backup register 0 */
+#define STM32_RTC_BK1R_OFFSET     0x0054 /* RTC backup register 1 */
+#define STM32_RTC_BK2R_OFFSET     0x0058 /* RTC backup register 2 */
+#define STM32_RTC_BK3R_OFFSET     0x005c /* RTC backup register 3 */
+#define STM32_RTC_BK4R_OFFSET     0x0060 /* RTC backup register 4 */
+#define STM32_RTC_BK5R_OFFSET     0x0064 /* RTC backup register 5 */
+#define STM32_RTC_BK6R_OFFSET     0x0068 /* RTC backup register 6 */
+#define STM32_RTC_BK7R_OFFSET     0x006c /* RTC backup register 7 */
+#define STM32_RTC_BK8R_OFFSET     0x0070 /* RTC backup register 8 */
+#define STM32_RTC_BK9R_OFFSET     0x0074 /* RTC backup register 9 */
+#define STM32_RTC_BK10R_OFFSET    0x0078 /* RTC backup register 10 */
+#define STM32_RTC_BK11R_OFFSET    0x007c /* RTC backup register 11 */
+#define STM32_RTC_BK12R_OFFSET    0x0080 /* RTC backup register 12 */
+#define STM32_RTC_BK13R_OFFSET    0x0084 /* RTC backup register 13 */
+#define STM32_RTC_BK14R_OFFSET    0x0088 /* RTC backup register 14 */
+#define STM32_RTC_BK15R_OFFSET    0x008c /* RTC backup register 15 */
+#define STM32_RTC_BK16R_OFFSET    0x0090 /* RTC backup register 16 */
+#define STM32_RTC_BK17R_OFFSET    0x0094 /* RTC backup register 17 */
+#define STM32_RTC_BK18R_OFFSET    0x0098 /* RTC backup register 18 */
+#define STM32_RTC_BK19R_OFFSET    0x009c /* RTC backup register 19 */
+#define STM32_RTC_BK20R_OFFSET    0x00a0 /* RTC backup register 20 */
+#define STM32_RTC_BK21R_OFFSET    0x00a4 /* RTC backup register 21 */
+#define STM32_RTC_BK22R_OFFSET    0x00a8 /* RTC backup register 22 */
+#define STM32_RTC_BK23R_OFFSET    0x00ac /* RTC backup register 23 */
+#define STM32_RTC_BK24R_OFFSET    0x00b0 /* RTC backup register 24 */
+#define STM32_RTC_BK25R_OFFSET    0x00b4 /* RTC backup register 25 */
+#define STM32_RTC_BK26R_OFFSET    0x00b8 /* RTC backup register 26 */
+#define STM32_RTC_BK27R_OFFSET    0x00bc /* RTC backup register 27 */
+#define STM32_RTC_BK28R_OFFSET    0x00c0 /* RTC backup register 28 */
+#define STM32_RTC_BK29R_OFFSET    0x00c4 /* RTC backup register 29 */
+#define STM32_RTC_BK30R_OFFSET    0x00c8 /* RTC backup register 30 */
+#define STM32_RTC_BK31R_OFFSET    0x00cc /* RTC backup register 31 */
+
+/* Register Addresses ***************************************************************/
+
+#define STM32_RTC_TR              (STM32_RTC_BASE+STM32_RTC_TR_OFFSET)
+#define STM32_RTC_DR              (STM32_RTC_BASE+STM32_RTC_DR_OFFSET)
+#define STM32_RTC_CR              (STM32_RTC_BASE+STM32_RTC_CR_OFFSET)
+#define STM32_RTC_ISR             (STM32_RTC_BASE+STM32_RTC_ISR_OFFSET)
+#define STM32_RTC_PRER            (STM32_RTC_BASE+STM32_RTC_PRER_OFFSET)
+#define STM32_RTC_WUTR            (STM32_RTC_BASE+STM32_RTC_WUTR_OFFSET)
+#define STM32_RTC_ALRMAR          (STM32_RTC_BASE+STM32_RTC_ALRMAR_OFFSET)
+#define STM32_RTC_ALRMBR          (STM32_RTC_BASE+STM32_RTC_ALRMBR_OFFSET)
+#define STM32_RTC_WPR             (STM32_RTC_BASE+STM32_RTC_WPR_OFFSET)
+#define STM32_RTC_SSR             (STM32_RTC_BASE+STM32_RTC_SSR_OFFSET)
+#define STM32_RTC_SHIFTR          (STM32_RTC_BASE+STM32_RTC_SHIFTR_OFFSET)
+#define STM32_RTC_TSTR            (STM32_RTC_BASE+STM32_RTC_TSTR_OFFSET)
+#define STM32_RTC_TSDR            (STM32_RTC_BASE+STM32_RTC_TSDR_OFFSET)
+#define STM32_RTC_TSSSR           (STM32_RTC_BASE+STM32_RTC_TSSSR_OFFSET)
+#define STM32_RTC_CALR            (STM32_RTC_BASE+STM32_RTC_CALR_OFFSET)
+#define STM32_RTC_TAMPCR          (STM32_RTC_BASE+STM32_RTC_TAMPCR_OFFSET)
+#define STM32_RTC_ALRMASSR        (STM32_RTC_BASE+STM32_RTC_ALRMASSR_OFFSET)
+#define STM32_RTC_ALRMBSSR        (STM32_RTC_BASE+STM32_RTC_ALRMBSSR_OFFSET)
+
+#define STM32_RTC_BKR(n)          (STM32_RTC_BASE+STM32_RTC_BKR_OFFSET(n))
+#define STM32_RTC_BK0R            (STM32_RTC_BASE+STM32_RTC_BK0R_OFFSET)
+#define STM32_RTC_BK1R            (STM32_RTC_BASE+STM32_RTC_BK1R_OFFSET)
+#define STM32_RTC_BK2R            (STM32_RTC_BASE+STM32_RTC_BK2R_OFFSET)
+#define STM32_RTC_BK3R            (STM32_RTC_BASE+STM32_RTC_BK3R_OFFSET)
+#define STM32_RTC_BK4R            (STM32_RTC_BASE+STM32_RTC_BK4R_OFFSET)
+#define STM32_RTC_BK5R            (STM32_RTC_BASE+STM32_RTC_BK5R_OFFSET)
+#define STM32_RTC_BK6R            (STM32_RTC_BASE+STM32_RTC_BK6R_OFFSET)
+#define STM32_RTC_BK7R            (STM32_RTC_BASE+STM32_RTC_BK7R_OFFSET)
+#define STM32_RTC_BK8R            (STM32_RTC_BASE+STM32_RTC_BK8R_OFFSET)
+#define STM32_RTC_BK9R            (STM32_RTC_BASE+STM32_RTC_BK9R_OFFSET)
+#define STM32_RTC_BK10R           (STM32_RTC_BASE+STM32_RTC_BK10R_OFFSET)
+#define STM32_RTC_BK11R           (STM32_RTC_BASE+STM32_RTC_BK11R_OFFSET)
+#define STM32_RTC_BK12R           (STM32_RTC_BASE+STM32_RTC_BK12R_OFFSET)
+#define STM32_RTC_BK13R           (STM32_RTC_BASE+STM32_RTC_BK13R_OFFSET)
+#define STM32_RTC_BK14R           (STM32_RTC_BASE+STM32_RTC_BK14R_OFFSET)
+#define STM32_RTC_BK15R           (STM32_RTC_BASE+STM32_RTC_BK15R_OFFSET)
+#define STM32_RTC_BK16R           (STM32_RTC_BASE+STM32_RTC_BK16R_OFFSET)
+#define STM32_RTC_BK17R           (STM32_RTC_BASE+STM32_RTC_BK17R_OFFSET)
+#define STM32_RTC_BK18R           (STM32_RTC_BASE+STM32_RTC_BK18R_OFFSET)
+#define STM32_RTC_BK19R           (STM32_RTC_BASE+STM32_RTC_BK19R_OFFSET)
+#define STM32_RTC_BK20R           (STM32_RTC_BASE+STM32_RTC_BK20R_OFFSET)
+#define STM32_RTC_BK21R           (STM32_RTC_BASE+STM32_RTC_BK21R_OFFSET)
+#define STM32_RTC_BK22R           (STM32_RTC_BASE+STM32_RTC_BK22R_OFFSET)
+#define STM32_RTC_BK23R           (STM32_RTC_BASE+STM32_RTC_BK23R_OFFSET)
+#define STM32_RTC_BK24R           (STM32_RTC_BASE+STM32_RTC_BK24R_OFFSET)
+#define STM32_RTC_BK25R           (STM32_RTC_BASE+STM32_RTC_BK25R_OFFSET)
+#define STM32_RTC_BK26R           (STM32_RTC_BASE+STM32_RTC_BK26R_OFFSET)
+#define STM32_RTC_BK27R           (STM32_RTC_BASE+STM32_RTC_BK27R_OFFSET)
+#define STM32_RTC_BK28R           (STM32_RTC_BASE+STM32_RTC_BK28R_OFFSET)
+#define STM32_RTC_BK29R           (STM32_RTC_BASE+STM32_RTC_BK29R_OFFSET)
+#define STM32_RTC_BK30R           (STM32_RTC_BASE+STM32_RTC_BK30R_OFFSET)
+#define STM32_RTC_BK31R           (STM32_RTC_BASE+STM32_RTC_BK31R_OFFSET)
+
+#define STM32_RTC_BKCOUNT         32
+
+/* Register Bitfield Definitions ****************************************************/
+
+/* RTC time register */
+
+#define RTC_TR_SU_SHIFT           (0)       /* Bits 0-3: Second units in BCD format */
+#define RTC_TR_SU_MASK            (15 << RTC_TR_SU_SHIFT)
+#define RTC_TR_ST_SHIFT           (4)       /* Bits 4-6: Second tens in BCD format */
+#define RTC_TR_ST_MASK            (7 << RTC_TR_ST_SHIFT)
+#define RTC_TR_MNU_SHIFT          (8)       /* Bit 8-11: Minute units in BCD format */
+#define RTC_TR_MNU_MASK           (15 << RTC_TR_MNU_SHIFT)
+#define RTC_TR_MNT_SHIFT          (12)      /* Bits 12-14: Minute tens in BCD format */
+#define RTC_TR_MNT_MASK           (7 << RTC_TR_MNT_SHIFT)
+#define RTC_TR_HU_SHIFT           (16)      /* Bit 16-19: Hour units in BCD format */
+#define RTC_TR_HU_MASK            (15 << RTC_TR_HU_SHIFT)
+#define RTC_TR_HT_SHIFT           (20)      /* Bits 20-21: Hour tens in BCD format */
+#define RTC_TR_HT_MASK            (3 << RTC_TR_HT_SHIFT)
+#define RTC_TR_PM                 (1 << 22) /* Bit 22: AM/PM notation */
+#define RTC_TR_RESERVED_BITS      (0xff808080)
+
+/* RTC date register */
+
+#define RTC_DR_DU_SHIFT           (0)       /* Bits 0-3: Date units in BCD format */
+#define RTC_DR_DU_MASK            (15 << RTC_DR_DU_SHIFT)
+#define RTC_DR_DT_SHIFT           (4)       /* Bits 4-5: Date tens in BCD format */
+#define RTC_DR_DT_MASK            (3 << RTC_DR_DT_SHIFT)
+#define RTC_DR_MU_SHIFT           (8)      /* Bits 8-11: Month units in BCD format */
+#define RTC_DR_MU_MASK            (15 << RTC_DR_MU_SHIFT)
+#define RTC_DR_MT                 (1 << 12) /* Bit 12: Month tens in BCD format */
+#define RTC_DR_WDU_SHIFT          (13)      /* Bits 13-15: Week day units */
+#define RTC_DR_WDU_MASK           (7 << RTC_DR_WDU_SHIFT)
+#  define RTC_DR_WDU_MONDAY       (1 << RTC_DR_WDU_SHIFT)
+#  define RTC_DR_WDU_TUESDAY      (2 << RTC_DR_WDU_SHIFT)
+#  define RTC_DR_WDU_WEDNESDAY    (3 << RTC_DR_WDU_SHIFT)
+#  define RTC_DR_WDU_THURSDAY     (4 << RTC_DR_WDU_SHIFT)
+#  define RTC_DR_WDU_FRIDAY       (5 << RTC_DR_WDU_SHIFT)
+#  define RTC_DR_WDU_SATURDAY     (6 << RTC_DR_WDU_SHIFT)
+#  define RTC_DR_WDU_SUNDAY       (7 << RTC_DR_WDU_SHIFT)
+#define RTC_DR_YU_SHIFT           (16)     /* Bits 16-19: Year units in BCD format */
+#define RTC_DR_YU_MASK            (15 << RTC_DR_YU_SHIFT)
+#define RTC_DR_YT_SHIFT           (20)     /* Bits 20-23: Year tens in BCD format */
+#define RTC_DR_YT_MASK            (15 << RTC_DR_YT_SHIFT)
+#define RTC_DR_RESERVED_BITS      (0xff0000c0)
+
+/* RTC control register */
+
+#define RTC_CR_WUCKSEL_SHIFT      (0)      /* Bits 0-2: Wakeup clock selection */
+#define RTC_CR_WUCKSEL_MASK       (7 << RTC_CR_WUCKSEL_SHIFT)
+#  define RTC_CR_WUCKSEL_RTCDIV16  (0 << RTC_CR_WUCKSEL_SHIFT) /* 000: RTC/16 clock is selected */
+#  define RTC_CR_WUCKSEL_RTCDIV8   (1 << RTC_CR_WUCKSEL_SHIFT) /* 001: RTC/8 clock is selected */
+#  define RTC_CR_WUCKSEL_RTCDIV4   (2 << RTC_CR_WUCKSEL_SHIFT) /* 010: RTC/4 clock is selected */
+#  define RTC_CR_WUCKSEL_RTCDIV2   (3 << RTC_CR_WUCKSEL_SHIFT) /* 011: RTC/2 clock is selected */
+#  define RTC_CR_WUCKSEL_CKSPRE    (4 << RTC_CR_WUCKSEL_SHIFT) /* 10x: ck_spre clock is selected */
+#  define RTC_CR_WUCKSEL_CKSPREADD (6 << RTC_CR_WUCKSEL_SHIFT) /* 11x: ck_spr clock and 216 added WUT counter */
+#define RTC_CR_TSEDGE             (1 << 3)  /* Bit 3:  Timestamp event active edge */
+#define RTC_CR_REFCKON            (1 << 4)  /* Bit 4:  Reference clock detection enable (50 or 60 Hz) */
+#define RTC_CR_BYPSHAD            (1 << 5)  /* Bit 5:  Bypass the shadow registers */
+#define RTC_CR_FMT                (1 << 6)  /* Bit 6:  Hour format */
+#define RTC_CR_ALRAE              (1 << 8)  /* Bit 8:  Alarm A enable */
+#define RTC_CR_ALRBE              (1 << 9)  /* Bit 9:  Alarm B enable */
+#define RTC_CR_WUTE               (1 << 10) /* Bit 10: Wakeup timer enable */
+#define RTC_CR_TSE                (1 << 11) /* Bit 11: Time stamp enable */
+#define RTC_CR_ALRAIE             (1 << 12) /* Bit 12: Alarm A interrupt enable */
+#define RTC_CR_ALRBIE             (1 << 13) /* Bit 13: Alarm B interrupt enable */
+#define RTC_CR_WUTIE              (1 << 14) /* Bit 14: Wakeup timer interrupt enable */
+#define RTC_CR_TSIE               (1 << 15) /* Bit 15: Timestamp interrupt enable */
+#define RTC_CR_ADD1H              (1 << 16) /* Bit 16: Add 1 hour (summer time change) */
+#define RTC_CR_SUB1H              (1 << 17) /* Bit 17: Subtract 1 hour (winter time change) */
+#define RTC_CR_BKP                (1 << 18) /* Bit 18: Backup */
+#define RTC_CR_COSEL              (1 << 19) /* Bit 19 : Calibration output selection */
+#define RTC_CR_POL                (1 << 20) /* Bit 20: Output polarity */
+#define RTC_CR_OSEL_SHIFT         (21)      /* Bits 21-22: Output selection */
+#define RTC_CR_OSEL_MASK          (3 << RTC_CR_OSEL_SHIFT)
+#  define RTC_CR_OSEL_DISABLED    (0 << RTC_CR_OSEL_SHIFT) /* 00: Output disabled */
+#  define RTC_CR_OSEL_ALRMA       (1 << RTC_CR_OSEL_SHIFT) /* 01: Alarm A output enabled */
+#  define RTC_CR_OSEL_ALRMB       (2 << RTC_CR_OSEL_SHIFT) /* 10: Alarm B output enabled */
+#  define RTC_CR_OSEL_WUT         (3 << RTC_CR_OSEL_SHIFT) /* 11: Wakeup output enabled */
+#define RTC_CR_COE                (1 << 23) /* Bit 23: Calibration output enable */
+#define RTC_CR_ITSE               (1 << 24) /* Bit 24: Timestamp on internal event enable */
+
+/* RTC initialization and status register */
+
+#define RTC_ISR_ALRAWF            (1 << 0)  /* Bit 0:  Alarm A write flag */
+#define RTC_ISR_ALRBWF            (1 << 1)  /* Bit 1:  Alarm B write flag */
+#define RTC_ISR_WUTWF             (1 << 2)  /* Bit 2:  Wakeup timer write flag */
+#define RTC_ISR_SHPF              (1 << 3)  /* Bit 3:  Shift operation pending */
+#define RTC_ISR_INITS             (1 << 4)  /* Bit 4:  Initialization status flag */
+#define RTC_ISR_RSF               (1 << 5)  /* Bit 5:  Registers synchronization flag */
+#define RTC_ISR_INITF             (1 << 6)  /* Bit 6:  Initialization flag */
+#define RTC_ISR_INIT              (1 << 7)  /* Bit 7:  Initialization mode */
+#define RTC_ISR_ALRAF             (1 << 8)  /* Bit 8:  Alarm A flag */
+#define RTC_ISR_ALRBF             (1 << 9)  /* Bit 9:  Alarm B flag */
+#define RTC_ISR_WUTF              (1 << 10) /* Bit 10: Wakeup timer flag */
+#define RTC_ISR_TSF               (1 << 11) /* Bit 11: Timestamp flag */
+#define RTC_ISR_TSOVF             (1 << 12) /* Bit 12: Timestamp overflow flag */
+#define RTC_ISR_TAMP1F            (1 << 13) /* Bit 13: Tamper detection flag */
+#define RTC_ISR_TAMP2F            (1 << 14) /* Bit 14: TAMPER2 detection flag */
+#define RTC_ISR_TAMP3F            (1 << 15) /* Bit 15: TAMPER3 detection flag */
+#define RTC_ISR_RECALPF           (1 << 16) /* Bit 16: Recalibration pending Flag */
+#define RTC_ISR_ITSF              (1 << 17) /* Bit 17:Internal tTime-stamp flagg */
+#define RTC_ISR_ALLFLAGS          (0x0003ffff)
+
+/* RTC prescaler register */
+
+#define RTC_PRER_PREDIV_S_SHIFT   (0)       /* Bits 0-14: Synchronous prescaler factor */
+#define RTC_PRER_PREDIV_S_MASK    (0x7fff << RTC_PRER_PREDIV_S_SHIFT)
+#define RTC_PRER_PREDIV_A_SHIFT   (16)      /* Bits 16-22: Asynchronous prescaler factor */
+#define RTC_PRER_PREDIV_A_MASK    (0x7f << RTC_PRER_PREDIV_A_SHIFT)
+
+/* RTC wakeup timer register */
+
+#define RTC_WUTR_MASK             (0xffff)  /* Bits 15:0  Wakeup auto-reload value bits */
+
+/* RTC alarm A/B registers */
+
+#define RTC_ALRMR_SU_SHIFT        (0)       /* Bits 0-3: Second units in BCD format. */
+#define RTC_ALRMR_SU_MASK         (15 << RTC_ALRMR_SU_SHIFT)
+#define RTC_ALRMR_ST_SHIFT        (4)       /* Bits 4-6: Second tens in BCD format. */
+#define RTC_ALRMR_ST_MASK         (7 << RTC_ALRMR_ST_SHIFT)
+#define RTC_ALRMR_MSK1            (1 << 7)  /* Bit 7 : Alarm A seconds mask */
+#define RTC_ALRMR_MNU_SHIFT       (8)       /* Bits 8-11: Minute units in BCD format. */
+#define RTC_ALRMR_MNU_MASK        (15 << RTC_ALRMR_MNU_SHIFT)
+#define RTC_ALRMR_MNT_SHIFT       (12)      /* Bits 12-14: Minute tens in BCD format. */
+#define RTC_ALRMR_MNT_MASK        (7 << RTC_ALRMR_MNT_SHIFT)
+#define RTC_ALRMR_MSK2            (1 << 15) /* Bit 15 : Alarm A minutes mask */
+#define RTC_ALRMR_HU_SHIFT        (16)      /* Bits 16-19: Hour units in BCD format. */
+#define RTC_ALRMR_HU_MASK         (15 << RTC_ALRMR_HU_SHIFT)
+#define RTC_ALRMR_HT_SHIFT        (20)      /* Bits 20-21: Hour tens in BCD format. */
+#define RTC_ALRMR_HT_MASK         (3 << RTC_ALRMR_HT_SHIFT)
+#define RTC_ALRMR_PM              (1 << 22) /* Bit 22 : AM/PM notation */
+#define RTC_ALRMR_MSK3            (1 << 23) /* Bit 23 : Alarm A hours mask */
+#define RTC_ALRMR_DU_SHIFT        (24)      /* Bits 24-27: Date units or day in BCD format. */
+#define RTC_ALRMR_DU_MASK         (15 << RTC_ALRMR_DU_SHIFT)
+#define RTC_ALRMR_DT_SHIFT        (28)      /* Bits 28-29: Date tens in BCD format. */
+#define RTC_ALRMR_DT_MASK         (3 << RTC_ALRMR_DT_SHIFT)
+#define RTC_ALRMR_WDSEL           (1 << 30) /* Bit 30: Week day selection */
+#define RTC_ALRMR_MSK4            (1 << 31) /* Bit 31: Alarm A date mask */
+
+/* RTC write protection register */
+
+#define RTC_WPR_MASK              (0xff)    /* Bits 0-7: Write protection key */
+
+/* RTC sub second register */
+
+#define RTC_SSR_MASK              (0xffff)  /* Bits 0-15: Sub second value */
+
+/* RTC shift control register */
+
+#define RTC_SHIFTR_SUBFS_SHIFT    (0)       /* Bits 0-14: Subtract a fraction of a second */
+#define RTC_SHIFTR_SUBFS_MASK     (0x7ffff << RTC_SHIFTR_SUBFS_SHIFT)
+#define RTC_SHIFTR_ADD1S          (1 << 31) /* Bit 31: Add one second */
+
+/* RTC time stamp time register */
+
+#define RTC_TSTR_SU_SHIFT         (0)       /* Bits 0-3: Second units in BCD format. */
+#define RTC_TSTR_SU_MASK          (15 << RTC_TSTR_SU_SHIFT)
+#define RTC_TSTR_ST_SHIFT         (4)       /* Bits 4-6: Second tens in BCD format. */
+#define RTC_TSTR_ST_MASK          (7 << RTC_TSTR_ST_SHIFT)
+#define RTC_TSTR_MNU_SHIFT        (8)       /* Bits 8-11: Minute units in BCD format. */
+#define RTC_TSTR_MNU_MASK         (15 << RTC_TSTR_MNU_SHIFT)
+#define RTC_TSTR_MNT_SHIFT        (12)      /* Bits 12-14: Minute tens in BCD format. */
+#define RTC_TSTR_MNT_MASK         (7 << RTC_TSTR_MNT_SHIFT)
+#define RTC_TSTR_HU_SHIFT         (16)      /* Bits 16-19: Hour units in BCD format. */
+#define RTC_TSTR_HU_MASK          (15 << RTC_TSTR_HU_SHIFT)
+#define RTC_TSTR_HT_SHIFT         (20)      /* Bits 20-21: Hour tens in BCD format. */
+#define RTC_TSTR_HT_MASK          (3 << RTC_TSTR_HT_SHIFT)
+#define RTC_TSTR_PM               (1 << 22) /* Bit 22: AM/PM notation */
+
+/* RTC time stamp date register */
+
+#define RTC_TSDR_DU_SHIFT         (0)       /* Bit 0-3: Date units in BCD format */
+#define RTC_TSDR_DU_MASK          (15 << RTC_TSDR_DU_SHIFT) */
+#define RTC_TSDR_DT_SHIFT         (4)       /* Bits 4-5: Date tens in BCD format */
+#define RTC_TSDR_DT_MASK          (3 << RTC_TSDR_DT_SHIFT)
+#define RTC_TSDR_MU_SHIFT         (8)       /* Bits 8-11: Month units in BCD format */
+#define RTC_TSDR_MU_MASK          (xx << RTC_TSDR_MU_SHIFT)
+#define RTC_TSDR_MT               (1 << 12) /* Bit 12: Month tens in BCD format */
+#define RTC_TSDR_WDU_SHIFT        (13)      /* Bits 13-15: Week day units */
+#define RTC_TSDR_WDU_MASK         (7 << RTC_TSDR_WDU_SHIFT)
+
+/* RTC timestamp sub second register */
+
+#define RTC_TSSSR_MASK            (0xffff)  /* Bits 0-15: Sub second value */
+
+/* RTC calibration register */
+
+#define RTC_CALR_CALM_SHIFT       (0)       /* Bits 0-8: Calibration minus */
+#define RTC_CALR_CALM_MASK        (0x1ff << RTC_CALR_CALM_SHIFT)
+#define RTC_CALR_CALW16           (1 << 13) /* Bit 13: Use a 16-second calibration cycle period */
+#define RTC_CALR_CALW8            (1 << 14) /* Bit 14: Use an 8-second calibration cycle period */
+#define RTC_CALR_CALP             (1 << 15) /* Bit 15: Increase frequency of RTC by 488.5 ppm */
+
+/* RTC tamper configuration register */
+
+#define RTC_TAMPCR_TAMP1E         (1 << 0)  /* Bit 0:  RTC_TAMP1 input detection enable */
+#define RTC_TAMPCR_TAMP1TRG       (1 << 1)  /* Bit 1:  Active level for RTC_TAMP1 input */
+#define RTC_TAMPCR_TAMPIE         (1 << 2)  /* Bit 2:  Tamper interrupt enable */
+#define RTC_TAMPCR_TAMP2E         (1 << 3)  /* Bit 3:  RTC_TAMP2 input detection enable */
+#define RTC_TAMPCR_TAMP2TRG       (1 << 4)  /* Bit 4:  Active level for RTC_TAMP2 input */
+#define RTC_TAMPCR_TAMP3E         (1 << 5)  /* Bit 5:  RTC_TAMP3 detection enable */
+#define RTC_TAMPCR_TAMP3TRG       (1 << 6)  /* Bit 6:  Active level for RTC_TAMP3 input */
+#define RTC_TAMPCR_TAMPTS         (1 << 7)  /* Bit 7:  Activate timestamp on tamper detection event */
+#define RTC_TAMPCR_TAMPFREQ_SHIFT (8)        /* Bits 8-10: Tamper sampling frequency */
+#define RTC_TAMPCR_TAMPFREQ_MASK  (7 << RTC_TAMPCR_TAMPFREQ_SHIFT)
+#  define RTC_TAMPCR_TAMPFREQ_DIV32768 (0 << RTC_TAMPCR_TAMPFREQ_SHIFT) /* RTCCLK / 32768 (1 Hz) */
+#  define RTC_TAMPCR_TAMPFREQ_DIV16384 (1 << RTC_TAMPCR_TAMPFREQ_SHIFT) /* RTCCLK / 16384 (2 Hz) */
+#  define RTC_TAMPCR_TAMPFREQ_DIV8192  (2 << RTC_TAMPCR_TAMPFREQ_SHIFT) /* RTCCLK / 8192 (4 Hz) */
+#  define RTC_TAMPCR_TAMPFREQ_DIV4096  (3 << RTC_TAMPCR_TAMPFREQ_SHIFT) /* RTCCLK / 4096 (8 Hz) */
+#  define RTC_TAMPCR_TAMPFREQ_DIV2048  (4 << RTC_TAMPCR_TAMPFREQ_SHIFT) /* RTCCLK / 2048 (16 Hz) */
+#  define RTC_TAMPCR_TAMPFREQ_DIV1024  (5 << RTC_TAMPCR_TAMPFREQ_SHIFT) /* RTCCLK / 1024 (32 Hz) */
+#  define RTC_TAMPCR_TAMPFREQ_DIV512   (6 << RTC_TAMPCR_TAMPFREQ_SHIFT) /* RTCCLK / 512 (64 Hz) */
+#  define RTC_TAMPCR_TAMPFREQ_DIV256   (7 << RTC_TAMPCR_TAMPFREQ_SHIFT) /* RTCCLK / 256 (128 Hz) */
+#define RTC_TAMPCR_TAMPFLT_SHIFT  (11)        /* Bits 11-12: RTC_TAMPx filter count */
+#define RTC_TAMPCR_TAMPFLT_MASK   (3 << RTC_TAMPCR_TAMPFLT_SHIFT)
+#define RTC_TAMPCR_TAMPPRCH_SHIFT (13)        /* Bits 13-14: RTC_TAMPx precharge duration */
+#define RTC_TAMPCR_TAMPPRCH_MASK  (3 << RTC_TAMPCR_TAMPPRCH_SHIFT)
+#  define RTC_TAMPCR_TAMPPRCH_1CYCLE  (0 << RTC_TAMPCR_TAMPPRCH_SHIFT) /* 1 RTCCLK cycle */
+#  define RTC_TAMPCR_TAMPPRCH_2CYCLES (1 << RTC_TAMPCR_TAMPPRCH_SHIFT) /* 2 RTCCLK cycles */
+#  define RTC_TAMPCR_TAMPPRCH_4CYCLES (2 << RTC_TAMPCR_TAMPPRCH_SHIFT) /* 4 RTCCLK cycles */
+#  define RTC_TAMPCR_TAMPPRCH_5CYCLES (3 << RTC_TAMPCR_TAMPPRCH_SHIFT) /* 8 RTCCLK cycles */
+#define RTC_TAMPCR_TAMPPUDIS      (1 << 15) /* Bit 15: RTC_TAMPx pull-up disable */
+#define RTC_TAMPCR_TAMP1IE        (1 << 16) /* Bit 16: Tamper 1 interrupt enable */
+#define RTC_TAMPCR_TAMP1NOERASE   (1 << 17) /* Bit 17: Tamper 1 no erase */
+#define RTC_TAMPCR_TAMP1MF        (1 << 18) /* Bit 18: Tamper 1 mask flag */
+#define RTC_TAMPCR_TAMP2IE        (1 << 19) /* Bit 19: Tamper 2 interrupt enable */
+#define RTC_TAMPCR_TAMP2NOERASE   (1 << 20) /* Bit 20: Tamper 2 no erase */
+#define RTC_TAMPCR_TAMP2MF        (1 << 21) /* Bit 21: Tamper 2 mask flag */
+#define RTC_TAMPCR_TAMP3IE        (1 << 22) /* Bit 22: Tamper 3 interrupt enable */
+#define RTC_TAMPCR_TAMP3NOERASE   (1 << 23) /* Bit 23: Tamper 3 no erase */
+#define RTC_TAMPCR_TAMP3MF        (1 << 24) /* Bit 24: Tamper 3 mask flag */
+
+/* RTC alarm A/B sub second register */
+
+#define RTC_ALRMSSR_SS_SHIFT      (0)   /* Bits 0-14: Sub second value */
+#define RTC_ALRMSSR_SS_MASK       (0x7fff << RTC_ALRMSSR_SS_SHIFT)
+#define RTC_ALRMSSR_MASKSS_SHIFT  (24)  /* Bits 24-27:  Mask the most-significant bits starting at this bit */
+#define RTC_ALRMSSR_MASKSS_MASK   (0xf << RTC_ALRMSSR_MASKSS_SHIFT)
+
+/* RTC option register */
+
+#define RTC_OR_TSINSEL_SHIFT      (1)   /* Bits 1-2: TIMESTAMP mapping */
+#define RTC_OR_TSINSEL_MASK       (3 << RTC_OR_TSINSEL_SHIFT)
+#  define RTC_OR_PC13             (0 << RTC_OR_TSINSEL_SHIFT) /* TIMESTAMP is mapped on PC13*/
+#  define RTC_OR_PI8              (1 << RTC_OR_TSINSEL_SHIFT) /* TIMESTAMP is mapped on PI8 */
+#  define RTC_OR_PC1              (2 << RTC_OR_TSINSEL_SHIFT) /* TIMESTAMP is mapped on PC1 */
+#  define RTC_OR_PC1_1            (3 << RTC_OR_TSINSEL_SHIFT) /* TIMESTAMP is mapped on PC1 */
+#define RTC_OR_RTC_ALARM_TYPE     (1 << 3) /* RTC_ALARM on PC13 output type */
+
+
+#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_RTCC_H */
diff --git a/arch/arm/src/stm32f7/stm32_alarm.h b/arch/arm/src/stm32f7/stm32_alarm.h
new file mode 100644
index 0000000000..ee0b8b8916
--- /dev/null
+++ b/arch/arm/src/stm32f7/stm32_alarm.h
@@ -0,0 +1,112 @@
+/****************************************************************************
+ * arch/arm/src/include/stm32f7/stm32_alarm.h
+ *
+ *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+ *   Authors: Neil hancock - delegated to Gregory Nutt Mar 30, 2016
+ *            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_SRC_STM32F7_STM32_ALARM_H
+#define __ARCH_ARM_SRC_STM32F7_STM32_ALARM_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include 
+#include 
+
+#ifdef CONFIG_RTC_ALARM
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+typedef CODE void (*alm_callback_t)(FAR void *arg, unsigned int alarmid);
+
+/* These features map to STM32 RTC from stm32F7xx
+ */
+
+enum alm_id_e
+{
+  RTC_ALARMA = 0,              /* RTC ALARM A */
+  RTC_ALARMB,                  /* RTC ALARM B */
+  RTC_ALARM_LAST
+};
+
+/* Structure used to pass parameters to set an alarm */
+
+struct alm_setalarm_s
+{
+  int as_id;                   /* enum alm_id_e */
+  struct tm as_time;           /* Alarm expiration time */
+  alm_callback_t as_cb;        /* Callback (if non-NULL) */
+  FAR void *as_arg;            /* Argument for callback */
+};
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stm32_rtc_setalarm
+ *
+ * Description:
+ *   Set an alarm to an absolute time using associated hardware.
+ *
+ * Input Parameters:
+ *  alminfo - Information about the alarm configuration.
+ *
+ * Returned Value:
+ *   Zero (OK) on success; a negated errno on failure
+ *
+ ****************************************************************************/
+
+int stm32_rtc_setalarm(FAR struct alm_setalarm_s *alminfo);
+
+/****************************************************************************
+ * Name: stm32_rtc_cancelalarm
+ *
+ * Description:
+ *   Cancel an alarm.
+ *
+ * Input Parameters:
+ *  alarmid - Identifies the alarm to be cancelled
+ *
+ * Returned Value:
+ *   Zero (OK) on success; a negated errno on failure
+ *
+ ****************************************************************************/
+
+int stm32_rtc_cancelalarm(enum alm_id_e alarmid);
+
+#endif /* CONFIG_RTC_ALARM */
+#endif /* __ARCH_ARM_SRC_STM32F7_STM32_ALARM_H */
diff --git a/arch/arm/src/stm32f7/stm32_bbsram.c b/arch/arm/src/stm32f7/stm32_bbsram.c
new file mode 100644
index 0000000000..2d7c57c079
--- /dev/null
+++ b/arch/arm/src/stm32f7/stm32_bbsram.c
@@ -0,0 +1,884 @@
+/****************************************************************************
+ * arch/arm/src/stm32f7/stm32_bbsram.c
+ *
+ *   Copyright (C) 2015-2016 Gregory Nutt. All rights reserved.
+ *   Author: 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.
+ *
+ ****************************************************************************/
+
+/* This will driver create a set of files in the STM32's Battery backed up
+ * SRAM. That can be used to store data retained across power cycles.
+ *
+ */
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include 
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+#include "stm32_bbsram.h"
+#include "chip.h"
+#include "stm32_pwr.h"
+#include "stm32_rtc.h"
+
+#ifdef CONFIG_STM32F7_BBSRAM
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#if !defined(CONFIG_STM32F7_BKPSRAM)
+#error Driver Requires CONFIG_STM32F7_BKPSRAM to be enabled
+#endif
+
+#define MAX_OPENCNT           (255) /* Limit of uint8_t */
+
+#ifndef CONFIG_DEBUG_INFO
+#  undef CONFIG_BBSRAM_DEBUG
+#endif
+
+#if defined(CONFIG_BBSRAM_DEBUG)
+#  define BBSRAM_DEBUG_READ() stm32_bbsram_rd()
+#  define BBSRAM_DUMP(p,s)    stm32_bbsram_dump(p,s)
+#else
+#  define BBSRAM_DEBUG_READ()
+#  define BBSRAM_DUMP(p,s)
+#endif
+
+#define BBSRAM_HEADER_SIZE    (sizeof(struct bbsramfh_s))
+#define BBSRAM_CRCED_OFFSET   (sizeof(((struct bbsramfh_s *)0)->crc))
+#define BBSRAM_CRCED_SIZE(l)  (BBSRAM_HEADER_SIZE-(BBSRAM_CRCED_OFFSET)+(l))
+#define BBSRAM_ALIGNMENT      (sizeof(((struct bbsramfh_s *)0)->crc))
+#define BBSRAM_ALIGNMENT_MASK (BBSRAM_ALIGNMENT-1)
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/* File Header */
+
+struct bbsramfh_s
+{
+  uint32_t crc;                /* CRC calculated over data and this struct
+                                * starting at fileno */
+  uint8_t fileno;              /* The minor number */
+  uint8_t dirty;               /* Data has been written to the file */
+  uint16_t len;                /* Total Bytes in this file */
+  struct timespec lastwrite;   /* Last write time */
+  uint8_t  data[];             /* Data in the file */
+};
+
+struct stm32_bbsram_s
+{
+  sem_t    exclsem;            /* For atomic accesses to this structure */
+  uint8_t  refs;               /* Number of references */
+  FAR struct bbsramfh_s *bbf;  /* File in bbram */
+};
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static int     stm32_bbsram_open(FAR struct file *filep);
+static int     stm32_bbsram_close(FAR struct file *filep);
+static off_t   stm32_bbsram_seek(FAR struct file *filep, off_t offset,
+                 int whence);
+static ssize_t stm32_bbsram_read(FAR struct file *filep, FAR char *buffer,
+                 size_t len);
+static ssize_t stm32_bbsram_write(FAR struct file *filep,
+                 FAR const char *buffer, size_t len);
+static int stm32_bbsram_ioctl(FAR struct file *filep, int cmd,
+                 unsigned long arg);
+#ifndef CONFIG_DISABLE_POLL
+static int     stm32_bbsram_poll(FAR struct file *filep, FAR struct pollfd *fds,
+                 bool setup);
+#endif
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+static int     stm32_bbsram_unlink(FAR struct inode *inode);
+#endif
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+#if defined(CONFIG_BBSRAM_DEBUG)
+static uint8_t debug[STM32F7_BBSRAM_SIZE];
+#endif
+
+static const struct file_operations stm32_bbsram_fops =
+{
+  .open   = stm32_bbsram_open,
+  .close  = stm32_bbsram_close,
+  .read   = stm32_bbsram_read,
+  .write  = stm32_bbsram_write,
+  .seek   = stm32_bbsram_seek,
+  .ioctl  = stm32_bbsram_ioctl,
+#ifndef CONFIG_DISABLE_POLL
+  .poll   = stm32_bbsram_poll,
+#endif
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  .unlink = stm32_bbsram_unlink,
+#endif
+};
+
+static struct stm32_bbsram_s g_bbsram[CONFIG_STM32F7_BBSRAM_FILES];
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+/****************************************************************************
+ * Name: stm32_bbsram_rd
+ ****************************************************************************/
+
+#if defined(CONFIG_BBSRAM_DEBUG)
+static void stm32_bbsram_rd(void)
+{
+  memcpy(&debug, (uint8_t *)STM32_BKPSRAM_BASE, sizeof debug);
+}
+#endif
+
+/****************************************************************************
+ * Name: stm32_bbsram_rd
+ ****************************************************************************/
+
+#if defined(CONFIG_BBSRAM_DEBUG)
+static void stm32_bbsram_dump(FAR struct bbsramfh_s *bbf, char *op)
+{
+  BBSRAM_DEBUG_READ();
+  _info("%s:\n", op);
+  _info(" File Address:0x%8x\n", bbf);
+  _info("  crc:0x%8x\n", bbf->crc);
+  _info("  fileno:%d\n", (int) bbf->fileno);
+  _info("  dirty:%d\n", (int) bbf->dirty);
+  _info("  length:%d\n", (int) bbf->len);
+  _info("  time:%ld:%ld\n", bbf->lastwrite.tv_sec, bbf->lastwrite.tv_nsec);
+  _info("  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
+
+/************************************************************************************
+ * Name: stm32_bbsram_semgive
+ ************************************************************************************/
+
+static void stm32_bbsram_semgive(FAR struct stm32_bbsram_s *priv)
+{
+  sem_post(&priv->exclsem);
+}
+
+/************************************************************************************
+ * Name: stm32_bbsram_semtake
+ *
+ * Description:
+ *   Take a semaphore handling any exceptional conditions
+ *
+ * Input Parameters:
+ *   priv - A reference to the CAN peripheral state
+ *
+ * Returned Value:
+ *  None
+ *
+****************************************************************************/
+
+static void stm32_bbsram_semtake(FAR struct stm32_bbsram_s *priv)
+{
+  int ret;
+
+  /* Wait until we successfully get the semaphore.  EINTR is the only
+   * expected 'failure' (meaning that the wait for the semaphore was
+   * interrupted by a signal.
+   */
+
+  do
+    {
+      ret = sem_wait(&priv->exclsem);
+      DEBUGASSERT(ret == 0 || errno == EINTR);
+    }
+  while (ret < 0);
+}
+
+/****************************************************************************
+ * Name: stm32_bbsram_ulock
+ *
+ * Description:
+ *   Unprotects RTC registers, RTC backup data registers and backup SRAM
+ *   against parasitic write access
+ *
+ * Input Parameters:
+ *   None
+ *
+ * Returned Value:
+ *   None
+ *
+ ****************************************************************************/
+
+static inline void stm32_bbsram_unlock(void)
+{
+  (void)stm32_pwr_enablebkp(true);
+}
+
+/****************************************************************************
+ * Name: stm32_bbsram_lock
+ *
+ * Description:
+ *   Protects RTC registers, RTC backup data registers and backup SRAM
+ *   against parasitic write access
+ *
+ * Input Parameters:
+ *   None
+ *
+ * Returned Value:
+ *   None
+ *
+ ****************************************************************************/
+
+static inline void stm32_bbsram_lock(void)
+{
+  (void)stm32_pwr_enablebkp(false);
+}
+
+/****************************************************************************
+ * Name: stm32_bbsram_crc
+ *
+ * Description:
+ *   Calculates the CRC of the block
+ *
+ * Input Parameters:
+ *   None
+ *
+ * Returned Value:
+ *   None
+ *
+ ****************************************************************************/
+
+static uint32_t stm32_bbsram_crc(FAR struct bbsramfh_s *pf)
+{
+  return crc32((uint8_t *)pf + BBSRAM_CRCED_OFFSET, BBSRAM_CRCED_SIZE(pf->len));
+}
+
+/****************************************************************************
+ * Name: stm32_bbsram_open
+ *
+ * Description: Open the device
+ *
+ ****************************************************************************/
+
+static int stm32_bbsram_open(FAR struct file *filep)
+{
+  FAR struct inode *inode = filep->f_inode;
+  FAR struct stm32_bbsram_s *bbr;
+
+  DEBUGASSERT(inode && inode->i_private);
+  bbr = (FAR struct stm32_bbsram_s *)inode->i_private;
+
+  /* Increment the reference count */
+
+  stm32_bbsram_semtake(bbr);
+  if (bbr->refs == MAX_OPENCNT)
+    {
+      return -EMFILE;
+    }
+  else
+    {
+      bbr->refs++;
+    }
+
+  stm32_bbsram_semgive(bbr);
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stm32_bbsram_internal_close
+ *
+ * Description:
+ *    Close BBSRAM entry; Recalculate the time and crc
+ *
+ ****************************************************************************/
+
+static int stm32_bbsram_internal_close(FAR struct bbsramfh_s *bbf)
+{
+  bbf->dirty = 0;
+  (void)clock_gettime(CLOCK_REALTIME, &bbf->lastwrite);
+  bbf->crc = stm32_bbsram_crc(bbf);
+
+  BBSRAM_DUMP(bbf, "close done");
+  return bbf->len;
+}
+
+/****************************************************************************
+ * Name: stm32_bbsram_close
+ *
+ * Description: close the device
+ *
+ ****************************************************************************/
+
+static int stm32_bbsram_close(FAR struct file *filep)
+{
+  FAR struct inode *inode = filep->f_inode;
+  FAR struct stm32_bbsram_s *bbr;
+  int ret = OK;
+
+  DEBUGASSERT(inode && inode->i_private);
+  bbr = (FAR struct stm32_bbsram_s *)inode->i_private;
+
+  stm32_bbsram_semtake(bbr);
+
+  BBSRAM_DUMP(bbr->bbf, "close");
+
+  if (bbr->refs == 0)
+    {
+      ret = -EIO;
+    }
+  else
+    {
+      bbr->refs--;
+
+      if (bbr->refs == 0)
+        {
+          if (bbr->bbf->dirty)
+            {
+              /* Recalculate the time and crc */
+
+              stm32_bbsram_unlock();
+              stm32_bbsram_internal_close(bbr->bbf);
+              stm32_bbsram_lock();
+            }
+        }
+    }
+
+  stm32_bbsram_semgive(bbr);
+  return ret;
+}
+
+/****************************************************************************
+ * Name: stm32_bbsram_seek
+ ****************************************************************************/
+
+static off_t stm32_bbsram_seek(FAR struct file *filep, off_t offset,
+                               int whence)
+{
+  FAR struct inode *inode = filep->f_inode;
+  FAR struct stm32_bbsram_s *bbr;
+  off_t newpos;
+  int ret;
+
+  DEBUGASSERT(inode && inode->i_private);
+  bbr = (FAR struct stm32_bbsram_s *)inode->i_private;
+
+  stm32_bbsram_semtake(bbr);
+
+  /* Determine the new, requested file position */
+
+  switch (whence)
+    {
+    case SEEK_CUR:
+      newpos = filep->f_pos + offset;
+      break;
+
+    case SEEK_SET:
+      newpos = offset;
+      break;
+
+    case SEEK_END:
+      newpos = bbr->bbf->len + offset;
+      break;
+
+    default:
+      /* Return EINVAL if the whence argument is invalid */
+
+      stm32_bbsram_semgive(bbr);
+      return -EINVAL;
+    }
+
+  /* Opengroup.org:
+   *
+   *  "The lseek() function shall allow the file offset to be set beyond the end
+   *   of the existing data in the file. If data is later written at this point,
+   *   subsequent reads of data in the gap shall return bytes with the value 0
+   *   until data is actually written into the gap."
+   *
+   * We can conform to the first part, but not the second.  But return EINVAL if
+   *
+   *  "...the resulting file offset would be negative for a regular file, block
+   *   special file, or directory."
+   */
+
+  if (newpos >= 0)
+    {
+      filep->f_pos = newpos;
+      ret = newpos;
+    }
+  else
+    {
+      ret = -EINVAL;
+    }
+
+  stm32_bbsram_semgive(bbr);
+  return ret;
+}
+
+/****************************************************************************
+ * Name: stm32_bbsram_read
+ ****************************************************************************/
+
+static ssize_t stm32_bbsram_read(FAR struct file *filep, FAR char *buffer,
+                                 size_t len)
+{
+  FAR struct inode *inode = filep->f_inode;
+  FAR struct stm32_bbsram_s *bbr;
+
+  DEBUGASSERT(inode && inode->i_private);
+  bbr = (FAR struct stm32_bbsram_s *)inode->i_private;
+
+  stm32_bbsram_semtake(bbr);
+
+  /* Trim len if read would go beyond end of device */
+
+  if ((filep->f_pos + len) > bbr->bbf->len)
+    {
+      len = bbr->bbf->len - filep->f_pos;
+    }
+
+  memcpy(buffer, &bbr->bbf->data[filep->f_pos], len);
+  filep->f_pos += len;
+  stm32_bbsram_semgive(bbr);
+  return len;
+}
+
+/****************************************************************************
+ * Name: stm32_bbsram_internal_write
+ ****************************************************************************/
+
+static ssize_t stm32_bbsram_internal_write(FAR struct bbsramfh_s *bbf,
+                                           FAR const char *buffer,
+                                           off_t offset, size_t len)
+{
+  bbf->dirty = 1;
+  memcpy(&bbf->data[offset], buffer, len);
+  return len;
+}
+
+/****************************************************************************
+ * Name: stm32_bbsram_write
+ ****************************************************************************/
+
+static ssize_t stm32_bbsram_write(FAR struct file *filep, FAR const char *buffer,
+                                  size_t len)
+{
+  FAR struct inode *inode = filep->f_inode;
+  FAR struct stm32_bbsram_s *bbr;
+  int ret = -EFBIG;
+
+  DEBUGASSERT(inode && inode->i_private);
+  bbr = (FAR struct stm32_bbsram_s *)inode->i_private;
+
+  /* Forbid writes past the end of the device */
+
+  if (filep->f_pos <  bbr->bbf->len)
+    {
+      /* Clamp len to avoid crossing the end of the memory */
+
+      if ((filep->f_pos + len) > bbr->bbf->len)
+        {
+          len = bbr->bbf->len - filep->f_pos;
+        }
+
+      ret = len; /* save number of bytes written */
+
+      stm32_bbsram_semtake(bbr);
+      BBSRAM_DUMP(bbr->bbf, "write");
+      stm32_bbsram_unlock();
+      stm32_bbsram_internal_write(bbr->bbf, buffer, filep->f_pos, len);
+      stm32_bbsram_lock();
+      filep->f_pos += len;
+      BBSRAM_DUMP(bbr->bbf, "write done");
+      stm32_bbsram_semgive(bbr);
+    }
+
+  BBSRAM_DEBUG_READ();
+  return ret;
+}
+
+/****************************************************************************
+ * Name: stm32_bbsram_poll
+ ****************************************************************************/
+
+#ifndef CONFIG_DISABLE_POLL
+static int stm32_bbsram_poll(FAR struct file *filep, FAR struct pollfd *fds,
+                             bool setup)
+{
+  if (setup)
+    {
+      fds->revents |= (fds->events & (POLLIN | POLLOUT));
+      if (fds->revents != 0)
+        {
+          sem_post(fds->sem);
+        }
+    }
+
+  return OK;
+}
+#endif
+
+/****************************************************************************
+ * Name: stm32_bbsram_ioctl
+ *
+ * Description: Return device geometry
+ *
+ ****************************************************************************/
+
+static int stm32_bbsram_ioctl(FAR struct file *filep, int cmd,
+                              unsigned long arg)
+{
+  FAR struct inode *inode = filep->f_inode;
+  FAR struct stm32_bbsram_s *bbr;
+  int ret = -ENOTTY;
+
+  DEBUGASSERT(inode && inode->i_private);
+  bbr = (FAR struct stm32_bbsram_s *)inode->i_private;
+
+  if (cmd == STM32F7_BBSRAM_GETDESC_IOCTL)
+    {
+      FAR struct bbsramd_s *bbrr = (FAR struct bbsramd_s *)((uintptr_t)arg);
+
+      stm32_bbsram_semtake(bbr);
+      if (!bbrr)
+        {
+          ret = -EINVAL;
+        }
+      else
+        {
+          bbrr->fileno = bbr->bbf->fileno;
+          bbrr->lastwrite = bbr->bbf->lastwrite;
+          bbrr->len = bbr->bbf->len;
+          bbrr->flags = (bbr->bbf->crc == stm32_bbsram_crc(bbr->bbf)) ? eCRCValid : 0;
+          bbrr->flags = (bbr->bbf->dirty) ? eDirty : 0;
+          ret = OK;
+        }
+
+      stm32_bbsram_semgive(bbr);
+    }
+
+  return ret;
+}
+
+/****************************************************************************
+ * Name: stm32_bbsram_unlink
+ *
+ * Description:
+ *  This function will remove the remove the file from the file system
+ *  it will zero the contents and time stamp. It will leave the fileno
+ *  and pointer to the BBSRAM intact.
+ *  It should be called called on the the file used for the crash dump
+ *  to remove it from visibility in the file system after it is created or
+ *  read thus arming it.
+ *
+ ****************************************************************************/
+
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+static int stm32_bbsram_unlink(FAR struct inode *inode)
+{
+  FAR struct stm32_bbsram_s *bbr;
+
+  DEBUGASSERT(inode && inode->i_private);
+  bbr = (FAR struct stm32_bbsram_s *)inode->i_private;
+
+  stm32_bbsram_semtake(bbr);
+  stm32_bbsram_unlock();
+  memset(bbr->bbf->data, 0, bbr->bbf->len);
+  bbr->bbf->lastwrite.tv_nsec = 0;
+  bbr->bbf->lastwrite.tv_sec = 0;
+  bbr->bbf->crc = stm32_bbsram_crc(bbr->bbf);
+  stm32_bbsram_lock();
+  bbr->refs  = 0;
+  stm32_bbsram_semgive(bbr);
+  sem_destroy(&bbr->exclsem);
+  return 0;
+}
+#endif
+
+/****************************************************************************
+ * Name: stm32_bbsram_probe
+ *
+ * Description: Based on the number of files defined and their sizes
+ * Initializes the base pointers to the file entries.
+ *
+ ****************************************************************************/
+
+static int stm32_bbsram_probe(int *ent, struct stm32_bbsram_s pdev[])
+{
+  int i;
+  int avail = STM32F7_BBSRAM_SIZE;
+  int alloc;
+  int size;
+  int ret = -EFBIG;
+  struct bbsramfh_s *pf = (struct bbsramfh_s *) STM32_BKPSRAM_BASE;
+
+  for (i = 0; (i < CONFIG_STM32F7_BBSRAM_FILES) && ent[i] && (avail > 0); i++)
+    {
+      /* Validate the actual allocations against what is in the BBSRAM */
+
+      size = ent[i];
+
+      /* Use all that is left */
+
+      if (size == -1)
+        {
+          size = avail - (BBSRAM_HEADER_SIZE + BBSRAM_ALIGNMENT_MASK);
+        }
+
+      /* Add in header size and keep aligned */
+
+      alloc = size + BBSRAM_HEADER_SIZE + BBSRAM_ALIGNMENT_MASK;
+      alloc &= ~(BBSRAM_ALIGNMENT_MASK);
+
+      /* Does it fit? */
+
+      if (alloc <= avail)
+        {
+          ret = i + 1;
+          BBSRAM_DUMP(pf, "probe");
+
+          if (pf->len != size ||
+              pf->fileno != i ||
+              pf->crc != stm32_bbsram_crc(pf))
+            {
+
+              /* Not Valid so wipe the file in BBSRAM */
+
+              memset((uint8_t *)pf, 0, alloc);
+              pf->fileno = i;
+              pf->len = size;
+              pf->crc = stm32_bbsram_crc(pf);
+              BBSRAM_DUMP(pf, "probe reset");
+            }
+
+          pdev[i].bbf = pf;
+          pf = (struct bbsramfh_s *)((uint8_t *)pf + alloc);
+          sem_init(&g_bbsram[i].exclsem, 0, 1);
+        }
+
+      avail -= alloc;
+    }
+
+  BBSRAM_DEBUG_READ();
+  return ret;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Function: stm32_bbsraminitialize
+ *
+ * Description:
+ *   Initialize the Battery Backed up SRAM driver.
+ *
+ * Parameters:
+ *   devpath - the path to instantiate the files.
+ *   sizes   - Pointer to a any array of file sizes to create
+ *             the last entry should be 0
+ *             A size of -1 will use all the remaining spaces
+ *
+ * If the length of sizes is greater then CONFIG_STM32_BBSRAM_FILES
+ * CONFIG_STM32_BBSRAM_FILES will be returned.
+ *
+ * Returned Value:
+ *   Number of files created on success; Negated errno on failure.
+ *
+ * Assumptions:
+ *
+ ****************************************************************************/
+
+int stm32_bbsraminitialize(char *devpath, int *sizes)
+{
+  int i;
+  int fcnt;
+  char path[32];
+  char devname[32];
+
+  int ret = OK;
+
+  if (devpath == NULL)
+    {
+      return -EINVAL;
+    }
+
+  i = strlen(devpath);
+  if (i == 0 || i > sizeof(path) + 3)
+    {
+      return -EINVAL;
+    }
+
+  memset(g_bbsram, 0, sizeof(g_bbsram));
+
+  /* Clocking for the PWR block must be provided.  However, this is done
+   * unconditionally in stm32f40xxx_rcc.c on power up.  This done
+   * unconditionally because the PWR block is also needed to set the
+   * internal voltage regulator for maximum performance.
+   */
+
+  /* Enable backup SRAM clock is done in rcc_enableahb1() when
+   * CONFIG_STM32_BKPSRAM is defined.
+   */
+
+  /* Allow Access */
+
+  stm32_bbsram_unlock();
+
+  /* Enable backup regulator so that the data is retained in Standby and
+   * VBAT modes
+   */
+
+  stm32_pwr_enablebreg(true);
+
+  fcnt = stm32_bbsram_probe(sizes, g_bbsram);
+
+  strncpy(path, devpath, sizeof(path));
+  strcat(path, "%d");
+
+  for (i = 0; i < fcnt && ret >= OK; i++)
+    {
+      snprintf(devname, sizeof(devname), path, i);
+      ret = register_driver(devname, &stm32_bbsram_fops, 0666, &g_bbsram[i]);
+    }
+
+  /* Disallow Access */
+
+  stm32_bbsram_lock();
+  return ret < OK ? ret : fcnt;
+}
+
+/****************************************************************************
+ * Function: stm32_bbsram_savepanic
+ *
+ * Description:
+ *   Saves the panic context in a previously allocated BBSRAM file
+ *
+ * Parameters:
+ *   fileno  - the value returned by the ioctl STM32_BBSRAM_GETDESC_IOCTL
+ *   context - Pointer to a any array of bytes to save
+ *   length  - The length of the data pointed to byt context
+ *
+ * Returned Value:
+ *   Length saved or negated errno.
+ *
+ * Assumptions:
+ *
+ ****************************************************************************/
+
+#if defined(CONFIG_STM32F7_SAVE_CRASHDUMP)
+int stm32_bbsram_savepanic(int fileno, uint8_t *context, int length)
+{
+  FAR struct bbsramfh_s *bbf;
+  int fill;
+  int ret = -ENOSPC;
+
+  /* On a bad day we could panic while panicking, (and we debug assert)
+   * this is a potential feeble attempt at only writing the first
+   * panic's context to the file
+   */
+
+  static bool once = false;
+
+  if (!once)
+    {
+      once = true;
+
+      DEBUGASSERT(fileno > 0 && fileno < CONFIG_STM32F7_BBSRAM_FILES);
+
+      bbf = g_bbsram[fileno].bbf;
+
+      DEBUGASSERT(bbf);
+
+      /* If the g_bbsram has been nulled out we return ENXIO.
+       *
+       * As once ensures we will keep the first dump. Checking the time for
+       * 0 protects from over writing a previous crash dump that has not
+       * been saved to long term storage and erased.  The dreaded reboot
+       * loop.
+       */
+
+      if (!bbf)
+        {
+          ret = -ENXIO;
+        }
+      else if ((bbf->lastwrite.tv_sec == 0 && bbf->lastwrite.tv_nsec == 0))
+        {
+          /* Clamp length if too big  */
+
+          if (length > bbf->len)
+            {
+              length = bbf->len;
+            }
+
+          stm32_bbsram_unlock();
+
+          stm32_bbsram_internal_write(bbf, (char *) context, 0, length);
+
+          /* Fill with 0 if data is less then file size */
+
+          fill = (int) bbf->len - length;
+
+          if (fill > 0)
+            {
+              memset(&bbf->data[length], 0, fill);
+            }
+
+          /* Seal the file */
+
+          stm32_bbsram_internal_close(bbf);
+
+          stm32_bbsram_lock();
+          ret = length;
+        }
+    }
+
+  return ret;
+}
+#endif
+
+#endif /* CONFIG_BBSRAM_DRIVER */
diff --git a/arch/arm/src/stm32f7/stm32_bbsram.h b/arch/arm/src/stm32f7/stm32_bbsram.h
new file mode 100644
index 0000000000..7012a9a9a4
--- /dev/null
+++ b/arch/arm/src/stm32f7/stm32_bbsram.h
@@ -0,0 +1,166 @@
+/****************************************************************************
+ * arch/arm/src/stm32f7/stm32_bbsram.h
+ *
+ *   Copyright (C) 2015-2016 Gregory Nutt. All rights reserved.
+ *   Author: 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_SRC_STM32F7_STM32_BBSRAM_H
+#define __ARCH_ARM_SRC_STM32F7_STM32_BBSRAM_H
+
+/****************************************************************************
+ * The purpose of this driver is to add battery backup file to the file
+ * system. There can be CONFIG_STM32F7_BBRSRAM_COUNT files defined.
+ * These files are of fixed size up to the maximum of the backing 4K SRAM.
+ *
+ * If CONFIG_SAVE_CRASHDUMP is defined The driver also supports a feature
+ * to save the context of a PANIC in one of these files.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include 
+#include 
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#if defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX) || \
+    defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
+#  define STM32F7_BBSRAM_SIZE 4096
+#else
+#  error "No backup SRAM on this STM32 Device"
+#endif
+
+#if !defined(CONFIG_STM32F7_BBSRAM_FILES)
+#  define CONFIG_STM32F7_BBSRAM_FILES 4
+#endif
+
+/* REVISIT: What guarantees that STM32F7_BBSRAM_GETDESC_IOCTL has a unique
+ * value among all over _DIOC() values?
+ */
+
+#define STM32F7_BBSRAM_GETDESC_IOCTL _DIOC(0x0010) /* Returns a bbsramd_s */
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+#ifndef __ASSEMBLY__
+
+enum bbsramdf_e
+{
+  eCRCValid = 1,  /* The crc is valid */
+  eDirty    = 2,  /* The file was closed */
+
+};
+
+struct bbsramd_s
+{
+  uint8_t flags;               /* The crc is valid and the file was closed */
+  uint8_t fileno;              /* The minor number */
+  uint16_t len;                /* Total Bytes in this file*/
+  struct timespec lastwrite;   /* Last write time */
+};
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+#undef EXTERN
+#if defined(__cplusplus)
+#  define EXTERN extern "C"
+extern "C"
+{
+#else
+#  define EXTERN extern
+#endif
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+/****************************************************************************
+ * Function: stm32_bbsraminitialize
+ *
+ * Description:
+ *   Initialize the Battery Backed up SRAM driver.
+ *
+ * Parameters:
+ *   devpath - the path to instantiate the files.
+ *   sizes   - Pointer to a any array of file sizes to create
+ *             the last entry should be 0
+ *             A size of -1 will use all the remaining spaces
+ *
+ * If the length of sizes is greater then CONFIG_STM32F7_BBSRAM_FILES
+ * CONFIG_STM32F7_BBSRAM_FILES will be returned.
+ *
+ * Returned Value:
+ *   Number of files created on success; Negated errno on failure.
+ *
+ * Assumptions:
+ *
+ ****************************************************************************/
+
+int stm32_bbsraminitialize(char *devpath, int *sizes);
+
+/****************************************************************************
+* Function: stm32_bbsram_savepanic
+*
+* Description:
+*   Saves the panic context in a previously allocated BBSRAM file
+*
+* Parameters:
+*   fileno  - the value returned by the ioctl STM32F7_BBSRAM_GETDESC_IOCTL
+*   context - Pointer to a any array of bytes to save
+*   length  - The length of the data pointed to byt context
+*
+* Returned Value:
+*   Length saved or negated errno.
+*
+* Assumptions:
+*
+****************************************************************************/
+
+#if defined(CONFIG_STM32F7_SAVE_CRASHDUMP)
+int stm32_bbsram_savepanic(int fileno, uint8_t *context, int length);
+#endif
+
+#undef EXTERN
+#ifdef __cplusplus
+}
+#endif
+#endif /* __ASSEMBLY__ */
+#endif /* __ARCH_ARM_SRC_STM32F7_STM32_BBSRAM_H */
diff --git a/arch/arm/src/stm32f7/stm32_exti_pwr.h b/arch/arm/src/stm32f7/stm32_exti_pwr.h
new file mode 100644
index 0000000000..b72acd5cc9
--- /dev/null
+++ b/arch/arm/src/stm32f7/stm32_exti_pwr.h
@@ -0,0 +1,72 @@
+/****************************************************************************
+ * arch/arm/src/stm32f7/stm32_exti_pwr.h
+ *
+ *   Copyright (C) 2015 Haltian Ltd. All rights reserved.
+ *   Authors: Dmitry Nikolaev 
+ *            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_SRC_STM32F7_STM32_EXTI_PWR_H
+#define __ARCH_ARM_SRC_STM32F7_STM32_EXTI_PWR_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include 
+#include 
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stm32_exti_pvd
+ *
+ * Description:
+ *   Sets/clears EXTI PVD interrupt.
+ *
+ * Parameters:
+ *  - rising/falling edge: enables interrupt on rising/falling edge
+ *  - event:  generate event when set
+ *  - func:   when non-NULL, generate interrupt
+ *
+ * Returns:
+ *   The previous value of the interrupt handler function pointer.  This
+ *   value may, for example, be used to restore the previous handler when
+ *   multiple handlers are used.
+ *
+ ****************************************************************************/
+
+xcpt_t stm32_exti_pvd(bool risingedge, bool fallingedge, bool event,
+                      xcpt_t func);
+
+#endif /* __ARCH_ARM_SRC_STM32F7_STM32_EXTI_PWR_H */
diff --git a/arch/arm/src/stm32f7/stm32_pwr.c b/arch/arm/src/stm32f7/stm32_pwr.c
new file mode 100644
index 0000000000..5acbf3d48f
--- /dev/null
+++ b/arch/arm/src/stm32f7/stm32_pwr.c
@@ -0,0 +1,264 @@
+/************************************************************************************
+ * arch/arm/src/stm32f7/stm32_pwr.c
+ *
+ *   Copyright (C) 2011 Uros Platise. All rights reserved.
+ *   Copyright (C) 2013, 2015 Gregory Nutt. All rights reserved.
+ *   Authors: Uros Platise 
+ *            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.
+ *
+ ************************************************************************************/
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include 
+#include 
+
+#include 
+#include 
+#include 
+
+#include "up_arch.h"
+#include "stm32_pwr.h"
+
+#if defined(CONFIG_STM32F7_PWR)
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Private Functions
+ ************************************************************************************/
+
+static inline uint16_t stm32_pwr_getreg(uint8_t offset)
+{
+  return (uint16_t)getreg32(STM32_PWR_BASE + (uint32_t)offset);
+}
+
+static inline void stm32_pwr_putreg(uint8_t offset, uint16_t value)
+{
+  putreg32((uint32_t)value, STM32_PWR_BASE + (uint32_t)offset);
+}
+
+static inline void stm32_pwr_modifyreg(uint8_t offset, uint16_t clearbits, uint16_t setbits)
+{
+  modifyreg32(STM32_PWR_BASE + (uint32_t)offset, (uint32_t)clearbits, (uint32_t)setbits);
+}
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Name: stm32_pwr_enablebkp
+ *
+ * Description:
+ *   Enables access to the backup domain (RTC registers, RTC backup data registers
+ *   and backup SRAM).
+ *
+ * Input Parameters:
+ *   writable - True: enable ability to write to backup domain registers
+ *
+ * Returned Value:
+ *   True: The backup domain was previously writable.
+ *
+ ************************************************************************************/
+
+bool stm32_pwr_enablebkp(bool writable)
+{
+  uint16_t regval;
+  bool waswritable;
+
+  /* Get the current state of the STM32 PWR control register */
+
+  regval      = stm32_pwr_getreg(STM32_PWR_CR1_OFFSET);
+  waswritable = ((regval & PWR_CR1_DBP) != 0);
+
+  /* Enable or disable the ability to write */
+
+  if (waswritable && !writable)
+    {
+      /* Disable backup domain access */
+
+      regval &= ~PWR_CR1_DBP;
+      stm32_pwr_putreg(STM32_PWR_CR1_OFFSET, regval);
+    }
+  else if (!waswritable && writable)
+    {
+      /* Enable backup domain access */
+
+      regval |= PWR_CR1_DBP;
+      stm32_pwr_putreg(STM32_PWR_CR1_OFFSET, regval);
+
+      /* Enable does not happen right away */
+
+      up_udelay(4);
+    }
+
+  return waswritable;
+}
+
+/************************************************************************************
+ * Name: stm32_pwr_enablebreg
+ *
+ * Description:
+ *   Enables the Backup regulator, the Backup regulator (used to maintain backup
+ *   SRAM content in Standby and VBAT modes) is enabled. If BRE is reset, the backup
+ *   regulator is switched off. The backup SRAM can still be used but its content will
+ *   be lost in the Standby and VBAT modes. Once set, the application must wait that
+ *   the Backup Regulator Ready flag (BRR) is set to indicate that the data written
+ *   into the RAM will be maintained in the Standby and VBAT modes.
+ *
+ * Input Parameters:
+ *   regon - state to set it to
+ *
+ * Returned Values:
+ *   None
+ *
+ ************************************************************************************/
+
+void stm32_pwr_enablebreg(bool regon)
+{
+  uint16_t regval;
+
+  regval  = stm32_pwr_getreg(STM32_PWR_CSR1_OFFSET);
+  regval &= ~PWR_CSR1_BRE;
+  regval |= regon ? PWR_CSR1_BRE : 0;
+  stm32_pwr_putreg(STM32_PWR_CSR1_OFFSET, regval);
+
+  if (regon)
+    {
+      while ((stm32_pwr_getreg(STM32_PWR_CSR1_OFFSET) & PWR_CSR1_BRR) == 0);
+    }
+}
+
+/************************************************************************************
+ * Name: stm32_pwr_setvos
+ *
+ * Description:
+ *   Set voltage scaling.
+ *
+ * Input Parameters:
+ *   vos - Properly aligned voltage scaling select bits for the PWR_CR register.
+ *
+ * Returned Values:
+ *   None
+ *
+ * Assumptions:
+ *   At present, this function is called only from initialization logic.  If used
+ *   for any other purpose that protection to assure that its operation is atomic
+ *   will be required.
+ *
+ ************************************************************************************/
+
+void stm32_pwr_setvos(uint16_t vos)
+{
+  uint16_t regval;
+
+  /* The following sequence is required to program the voltage regulator ranges:
+   * 1. Check VDD to identify which ranges are allowed...
+   * 2. Configure the voltage scaling range by setting the VOS bits in the PWR_CR1
+   *    register.
+   */
+
+  regval  = stm32_pwr_getreg(STM32_PWR_CR1_OFFSET);
+  regval &= ~PWR_CR1_VOS_MASK;
+  regval |= (vos & PWR_CR1_VOS_MASK);
+  stm32_pwr_putreg(STM32_PWR_CR1_OFFSET, regval);
+}
+
+/************************************************************************************
+ * Name: stm32_pwr_setpvd
+ *
+ * Description:
+ *   Sets power voltage detector
+ *
+ * Input Parameters:
+ *   pls - PVD level
+ *
+ * Returned Values:
+ *   None
+ *
+ * Assumptions:
+ *   At present, this function is called only from initialization logic.  If used
+ *   for any other purpose that protection to assure that its operation is atomic
+ *   will be required.
+ *
+ ************************************************************************************/
+
+void stm32_pwr_setpvd(uint16_t pls)
+{
+  uint16_t regval;
+
+  /* Set PLS */
+
+  regval = stm32_pwr_getreg(STM32_PWR_CR1_OFFSET);
+  regval &= ~PWR_CR1_PLS_MASK;
+  regval |= (pls & PWR_CR1_PLS_MASK);
+
+  /* Write value to register */
+
+  stm32_pwr_putreg(STM32_PWR_CR1_OFFSET, regval);
+}
+
+/************************************************************************************
+ * Name: stm32_pwr_enablepvd
+ *
+ * Description:
+ *   Enable the Programmable Voltage Detector
+ *
+ ************************************************************************************/
+
+void stm32_pwr_enablepvd(void)
+{
+  /* Enable PVD by setting the PVDE bit in PWR_CR register. */
+
+  stm32_pwr_modifyreg(STM32_PWR_CR1_OFFSET, 0, PWR_CR1_PVDE);
+}
+
+/************************************************************************************
+ * Name: stm32_pwr_disablepvd
+ *
+ * Description:
+ *   Disable the Programmable Voltage Detector
+ *
+ ************************************************************************************/
+
+void stm32_pwr_disablepvd(void)
+{
+  /* Disable PVD by clearing the PVDE bit in PWR_CR register. */
+
+  stm32_pwr_modifyreg(STM32_PWR_CR1_OFFSET, PWR_CR1_PVDE, 0);
+}
+
+#endif /* CONFIG_STM32_PWR */
diff --git a/arch/arm/src/stm32f7/stm32_pwr.h b/arch/arm/src/stm32f7/stm32_pwr.h
index 3c5a30f967..772851d524 100644
--- a/arch/arm/src/stm32f7/stm32_pwr.h
+++ b/arch/arm/src/stm32f7/stm32_pwr.h
@@ -1,8 +1,9 @@
 /************************************************************************************
  * arch/arm/src/stm32f7/stm32_pwr.h
  *
- *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt 
+ *   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
diff --git a/arch/arm/src/stm32f7/stm32_rtc.c b/arch/arm/src/stm32f7/stm32_rtc.c
new file mode 100644
index 0000000000..5b29d410f0
--- /dev/null
+++ b/arch/arm/src/stm32f7/stm32_rtc.c
@@ -0,0 +1,1487 @@
+/****************************************************************************
+ * arch/arm/src/stm32f7/stm32_rtc.c
+ *
+ *   Copyright (C) 2011, 2015-2016 Gregory Nutt. All rights reserved.
+ *   Author: 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.
+ *
+ ****************************************************************************/
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+#include "up_arch.h"
+
+#include "stm32_rcc.h"
+#include "stm32_pwr.h"
+#include "stm32_exti.h"
+#include "stm32_rtc.h"
+
+#include 
+
+#ifdef CONFIG_RTC
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+/* Configuration ********************************************************************/
+/* This RTC implementation supports
+ *  - date/time RTC hardware
+ *  - extended functions Alarm A and B for STM32F4xx and onwards
+ * */
+
+#ifndef CONFIG_RTC_DATETIME
+#  error "CONFIG_RTC_DATETIME must be set to use this driver"
+#endif
+
+#ifdef CONFIG_RTC_HIRES
+#  error "CONFIG_RTC_HIRES must NOT be set with this driver"
+#endif
+
+#ifndef CONFIG_STM32F7_PWR
+#  error "CONFIG_STM32F7_PWR must selected to use this driver"
+#endif
+
+/* Constants ************************************************************************/
+
+#define SYNCHRO_TIMEOUT      (0x00020000)
+#define INITMODE_TIMEOUT     (0x00010000)
+
+/* Proxy definitions to make the same code work for all the STM32 series ************/
+
+# define STM32_RCC_XXX       STM32_RCC_BDCR
+# define RCC_XXX_YYYRST      RCC_BDCR_BDRST
+# define RCC_XXX_RTCEN       RCC_BDCR_RTCEN
+# define RCC_XXX_RTCSEL_MASK RCC_BDCR_RTCSEL_MASK
+# define RCC_XXX_RTCSEL_LSE  RCC_BDCR_RTCSEL_LSE
+# define RCC_XXX_RTCSEL_LSI  RCC_BDCR_RTCSEL_LSI
+# define RCC_XXX_RTCSEL_HSE  RCC_BDCR_RTCSEL_HSE
+
+/* Time conversions */
+
+#define MINUTES_IN_HOUR 60
+#define HOURS_IN_DAY 24
+
+/* Can't exceed 24hours-2min without providing extra logic for carry over for day. */
+
+#define MAX_RTC_ALARM_REL_MINUTES (24*MINUTES_IN_HOUR)-2
+
+#define hours_add(parm_hrs) \
+  time->tm_hour += parm_hrs;\
+  if ((HOURS_IN_DAY-1) < (time->tm_hour))\
+    {\
+      time->tm_hour = (parm_hrs - HOURS_IN_DAY);\
+    }
+
+#define RTC_ALRMR_DIS_MASK            (RTC_ALRMR_MSK4 | RTC_ALRMR_MSK3 | \
+                                       RTC_ALRMR_MSK2 | RTC_ALRMR_MSK1)
+#define RTC_ALRMR_DIS_DATE_MASK       (RTC_ALRMR_MSK4)
+#define RTC_ALRMR_ENABLE              (0)
+
+/************************************************************************************
+ * Private Types
+ ************************************************************************************/
+
+#ifdef CONFIG_RTC_ALARM
+typedef unsigned int rtc_alarmreg_t;
+
+struct alm_cbinfo_s
+{
+  volatile alm_callback_t ac_cb; /* Client callback function */
+  volatile FAR void *ac_arg;     /* Argument to pass with the callback function */
+};
+#endif
+
+/************************************************************************************
+ * Private Data
+ ************************************************************************************/
+
+#ifdef CONFIG_RTC_ALARM
+/* Callback to use when an EXTI is activated  */
+
+static struct alm_cbinfo_s g_alarmcb[RTC_ALARM_LAST];
+#endif
+
+/************************************************************************************
+ * Public Data
+ ************************************************************************************/
+
+/* g_rtc_enabled is set true after the RTC has successfully initialized */
+
+volatile bool g_rtc_enabled = false;
+
+/************************************************************************************
+ * Private Function Prototypes
+ ************************************************************************************/
+
+#ifdef CONFIG_RTC_ALARM
+static int rtchw_check_alrawf(void);
+static int rtchw_set_alrmar(rtc_alarmreg_t alarmreg);
+#if CONFIG_RTC_NALARMS > 1
+static int rtchw_check_alrbwf(void);
+static int rtchw_set_alrmbr(rtc_alarmreg_t alarmreg);
+#endif
+#endif
+
+/************************************************************************************
+ * Private Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Name: rtc_dumpregs
+ *
+ * Description:
+ *    Disable RTC write protection
+ *
+ * Input Parameters:
+ *   None
+ *
+ * Returned Value:
+ *   None
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_DEBUG_RTC_INFO
+static void rtc_dumpregs(FAR const char *msg)
+{
+  int rtc_state;
+
+  rtcinfo("%s:\n", msg);
+  rtcinfo("      TR: %08x\n", getreg32(STM32_RTC_TR));
+  rtcinfo("      DR: %08x\n", getreg32(STM32_RTC_DR));
+  rtcinfo("      CR: %08x\n", getreg32(STM32_RTC_CR));
+  rtcinfo("     ISR: %08x\n", getreg32(STM32_RTC_ISR));
+  rtcinfo("    PRER: %08x\n", getreg32(STM32_RTC_PRER));
+  rtcinfo("    WUTR: %08x\n", getreg32(STM32_RTC_WUTR));
+  rtcinfo("  ALRMAR: %08x\n", getreg32(STM32_RTC_ALRMAR));
+  rtcinfo("  ALRMBR: %08x\n", getreg32(STM32_RTC_ALRMBR));
+  rtcinfo("  SHIFTR: %08x\n", getreg32(STM32_RTC_SHIFTR));
+  rtcinfo("    TSTR: %08x\n", getreg32(STM32_RTC_TSTR));
+  rtcinfo("    TSDR: %08x\n", getreg32(STM32_RTC_TSDR));
+  rtcinfo("   TSSSR: %08x\n", getreg32(STM32_RTC_TSSSR));
+  rtcinfo("    CALR: %08x\n", getreg32(STM32_RTC_CALR));
+  rtcinfo("   TAFCR: %08x\n", getreg32(STM32_RTC_TAFCR));
+  rtcinfo("ALRMASSR: %08x\n", getreg32(STM32_RTC_ALRMASSR));
+  rtcinfo("ALRMBSSR: %08x\n", getreg32(STM32_RTC_ALRMBSSR));
+  rtcinfo("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);
+  rtcinfo("EXTI (RTSR FTSR ISR EVT): %01x\n",rtc_state);
+}
+#else
+#  define rtc_dumpregs(msg)
+#endif
+
+/************************************************************************************
+ * Name: rtc_dumptime
+ *
+ * Description:
+ *    Disable RTC write protection
+ *
+ * Input Parameters:
+ *   None
+ *
+ * Returned Value:
+ *   None
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_DEBUG_RTC_INFO
+static void rtc_dumptime(FAR const struct tm *tp, FAR const char *msg)
+{
+  rtcinfo("%s:\n", msg);
+  rtcinfo("  tm_sec: %08x\n", tp->tm_sec);
+  rtcinfo("  tm_min: %08x\n", tp->tm_min);
+  rtcinfo(" tm_hour: %08x\n", tp->tm_hour);
+  rtcinfo(" tm_mday: %08x\n", tp->tm_mday);
+  rtcinfo("  tm_mon: %08x\n", tp->tm_mon);
+  rtcinfo(" tm_year: %08x\n", tp->tm_year);
+}
+#else
+#  define rtc_dumptime(tp, msg)
+#endif
+
+/************************************************************************************
+ * Name: rtc_wprunlock
+ *
+ * Description:
+ *    Disable RTC write protection
+ *
+ * Input Parameters:
+ *   None
+ *
+ * Returned Value:
+ *   None
+ *
+ ************************************************************************************/
+
+static void rtc_wprunlock(void)
+{
+  /* Enable write access to the backup domain (RTC registers, RTC backup data
+   * registers and backup SRAM).
+   */
+
+  (void)stm32_pwr_enablebkp(true);
+
+  /* The following steps are required to unlock the write protection on all the
+   * RTC registers (except for RTC_ISR[13:8], RTC_TAFCR, and RTC_BKPxR).
+   *
+   * 1. Write 0xCA into the RTC_WPR register.
+   * 2. Write 0x53 into the RTC_WPR register.
+   *
+   * Writing a wrong key re-activates the write protection.
+   */
+
+  putreg32(0xca, STM32_RTC_WPR);
+  putreg32(0x53, STM32_RTC_WPR);
+}
+
+/************************************************************************************
+ * Name: rtc_wprlock
+ *
+ * Description:
+ *    Enable RTC write protection
+ *
+ * Input Parameters:
+ *   None
+ *
+ * Returned Value:
+ *   None
+ *
+ ************************************************************************************/
+
+static inline void rtc_wprlock(void)
+{
+  /* Writing any wrong key re-activates the write protection. */
+
+  putreg32(0xff, STM32_RTC_WPR);
+
+  /* Disable write access to the backup domain (RTC registers, RTC backup data
+   * registers and backup SRAM).
+   */
+
+  (void)stm32_pwr_enablebkp(false);
+}
+
+/************************************************************************************
+ * Name: rtc_synchwait
+ *
+ * Description:
+ *   Waits until the RTC Time and Date registers (RTC_TR and RTC_DR) are
+ *   synchronized with RTC APB clock.
+ *
+ * Input Parameters:
+ *   None
+ *
+ * Returned Value:
+ *   Zero (OK) on success; a negated errno on failure
+ *
+ ************************************************************************************/
+
+static int rtc_synchwait(void)
+{
+  volatile uint32_t timeout;
+  uint32_t regval;
+  int ret;
+
+  /* Disable the write protection for RTC registers */
+
+  rtc_wprunlock();
+
+  /* Clear Registers synchronization flag (RSF) */
+
+  regval  = getreg32(STM32_RTC_ISR);
+  regval &= ~RTC_ISR_RSF;
+  putreg32(regval, STM32_RTC_ISR);
+
+  /* Now wait the registers to become synchronised */
+
+  ret = -ETIMEDOUT;
+  for (timeout = 0; timeout < SYNCHRO_TIMEOUT; timeout++)
+    {
+      regval = getreg32(STM32_RTC_ISR);
+      if ((regval & RTC_ISR_RSF) != 0)
+        {
+          /* Synchronized */
+
+          ret = OK;
+          break;
+        }
+    }
+
+  /* Re-enable the write protection for RTC registers */
+
+  rtc_wprlock();
+  return ret;
+}
+
+/************************************************************************************
+ * Name: rtc_enterinit
+ *
+ * Description:
+ *   Enter RTC initialization mode.
+ *
+ * Input Parameters:
+ *   None
+ *
+ * Returned Value:
+ *   Zero (OK) on success; a negated errno on failure
+ *
+ ************************************************************************************/
+
+static int rtc_enterinit(void)
+{
+  volatile uint32_t timeout;
+  uint32_t regval;
+  int ret;
+
+  /* Check if the Initialization mode is already set */
+
+  regval = getreg32(STM32_RTC_ISR);
+
+  ret = OK;
+  if ((regval & RTC_ISR_INITF) == 0)
+    {
+      /* Set the Initialization mode */
+
+      putreg32(RTC_ISR_INIT, STM32_RTC_ISR);
+
+      /* Wait until the RTC is in the INIT state (or a timeout occurs) */
+
+      ret = -ETIMEDOUT;
+      for (timeout = 0; timeout < INITMODE_TIMEOUT; timeout++)
+        {
+          regval = getreg32(STM32_RTC_ISR);
+          if ((regval & RTC_ISR_INITF) != 0)
+            {
+              ret = OK;
+              break;
+            }
+        }
+    }
+
+  return ret;
+}
+
+/************************************************************************************
+ * Name: rtc_exitinit
+ *
+ * Description:
+ *   Exit RTC initialization mode.
+ *
+ * Input Parameters:
+ *   None
+ *
+ * Returned Value:
+ *   Zero (OK) on success; a negated errno on failure
+ *
+ ************************************************************************************/
+
+static void rtc_exitinit(void)
+{
+  uint32_t regval;
+
+  regval = getreg32(STM32_RTC_ISR);
+  regval &= ~(RTC_ISR_INIT);
+  putreg32(regval, STM32_RTC_ISR);
+}
+
+/************************************************************************************
+ * Name: rtc_bin2bcd
+ *
+ * Description:
+ *   Converts a 2 digit binary to BCD format
+ *
+ * Input Parameters:
+ *   value - The byte to be converted.
+ *
+ * Returned Value:
+ *   The value in BCD representation
+ *
+ ************************************************************************************/
+
+static uint32_t rtc_bin2bcd(int value)
+{
+  uint32_t msbcd = 0;
+
+  while (value >= 10)
+    {
+      msbcd++;
+      value -= 10;
+    }
+
+  return (msbcd << 4) | value;
+}
+
+/************************************************************************************
+ * Name: rtc_bin2bcd
+ *
+ * Description:
+ *   Convert from 2 digit BCD to binary.
+ *
+ * Input Parameters:
+ *   value - The BCD value to be converted.
+ *
+ * Returned Value:
+ *   The value in binary representation
+ *
+ ************************************************************************************/
+
+static int rtc_bcd2bin(uint32_t value)
+{
+  uint32_t tens = (value >> 4) * 10;
+  return (int)(tens + (value & 0x0f));
+}
+
+/************************************************************************************
+ * Name: rtc_setup
+ *
+ * Description:
+ *   Performs first time configuration of the RTC.  A special value written into
+ *   back-up register 0 will prevent this function from being called on sub-sequent
+ *   resets or power up.
+ *
+ * Input Parameters:
+ *   None
+ *
+ * Returned Value:
+ *   Zero (OK) on success; a negated errno on failure
+ *
+ ************************************************************************************/
+
+static int rtc_setup(void)
+{
+  uint32_t regval;
+  int ret;
+
+  /* Disable the write protection for RTC registers */
+
+  rtc_wprunlock();
+
+  /* Set Initialization mode */
+
+  ret = rtc_enterinit();
+  if (ret == OK)
+    {
+      /* Set the 24 hour format by clearing the FMT bit in the RTC
+       * control register
+       */
+
+      regval = getreg32(STM32_RTC_CR);
+      regval &= ~RTC_CR_FMT;
+      putreg32(regval, STM32_RTC_CR);
+
+      /* Configure RTC pre-scaler with the required values */
+
+#ifdef CONFIG_STM32F7_RTC_HSECLOCK
+      /* For a 1 MHz clock this yields 0.9999360041 Hz on the second
+       * timer - which is pretty close.
+       */
+
+      putreg32(((uint32_t)7182 << RTC_PRER_PREDIV_S_SHIFT) |
+              ((uint32_t)0x7f << RTC_PRER_PREDIV_A_SHIFT),
+              STM32_RTC_PRER);
+#else
+      /* Correct values for 32.768 KHz LSE clock and inaccurate LSI clock */
+
+      putreg32(((uint32_t)0xff << RTC_PRER_PREDIV_S_SHIFT) |
+              ((uint32_t)0x7f << RTC_PRER_PREDIV_A_SHIFT),
+              STM32_RTC_PRER);
+#endif
+
+      /* Exit RTC initialization mode */
+
+      rtc_exitinit();
+    }
+
+  /* Re-enable the write protection for RTC registers */
+
+  rtc_wprlock();
+
+  return ret;
+}
+
+/************************************************************************************
+ * Name: rtc_resume
+ *
+ * Description:
+ *   Called when the RTC was already initialized on a previous power cycle.  This
+ *   just brings the RTC back into full operation.
+ *
+ * Input Parameters:
+ *   None
+ *
+ * Returned Value:
+ *   Zero (OK) on success; a negated errno on failure
+ *
+ ************************************************************************************/
+
+static void rtc_resume(void)
+{
+#ifdef CONFIG_RTC_ALARM
+  uint32_t regval;
+
+  /* Clear the RTC alarm flags */
+
+  regval  = getreg32(STM32_RTC_ISR);
+  regval &= ~(RTC_ISR_ALRAF | RTC_ISR_ALRBF);
+  putreg32(regval, STM32_RTC_ISR);
+
+  /* Clear the RTC Alarm Pending bit */
+
+  putreg32(EXTI_RTC_ALARM, STM32_EXTI_PR);
+#endif
+}
+
+/************************************************************************************
+ * Name: stm32_rtc_alarm_handler
+ *
+ * Description:
+ *   RTC ALARM interrupt service routine through the EXTI line
+ *
+ * Input Parameters:
+ *   irq - The IRQ number that generated the interrupt
+ *   context - Architecture specific register save information.
+ *
+ * Returned Value:
+ *   Zero (OK) on success; A negated errno value on failure.
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_RTC_ALARM
+static int stm32_rtc_alarm_handler(int irq, void *context)
+{
+  FAR struct alm_cbinfo_s *cbinfo;
+  alm_callback_t cb;
+  FAR void *arg;
+  uint32_t isr;
+  uint32_t cr;
+  int ret = OK;
+
+  isr  = getreg32(STM32_RTC_ISR);
+
+  /* Check for EXTI from Alarm A or B and handle according */
+
+  if ((isr & RTC_ISR_ALRAF) != 0)
+    {
+      cr  = getreg32(STM32_RTC_CR);
+      if ((cr & RTC_CR_ALRAIE) != 0)
+        {
+          cbinfo = &g_alarmcb[RTC_ALARMA];
+          if (cbinfo->ac_cb != NULL)
+            {
+              /* Alarm A callback */
+
+              cb  = cbinfo->ac_cb;
+              arg = (FAR void *)cbinfo->ac_arg;
+
+              cbinfo->ac_cb  = NULL;
+              cbinfo->ac_arg = NULL;
+
+              cb(arg, RTC_ALARMA);
+            }
+
+          isr  = getreg32(STM32_RTC_ISR) & ~RTC_ISR_ALRAF;
+          putreg32(isr, STM32_RTC_CR);
+        }
+    }
+
+#if CONFIG_RTC_NALARMS > 1
+  if ((isr & RTC_ISR_ALRBF) != 0)
+    {
+      cr  = getreg32(STM32_RTC_CR);
+      if ((cr & RTC_CR_ALRBIE) != 0)
+        {
+          cbinfo = &g_alarmcb[RTC_ALARMB];
+          if (cbinfo->ac_cb != NULL)
+            {
+              /* Alarm B callback */
+
+              cb  = cbinfo->ac_cb;
+              arg = (FAR void *)cbinfo->ac_arg;
+
+              cbinfo->ac_cb  = NULL;
+              cbinfo->ac_arg = NULL;
+
+              cb(arg, RTC_ALARMB);
+            }
+
+          isr  = getreg32(STM32_RTC_ISR) & ~RTC_ISR_ALRBF;
+          putreg32(isr, STM32_RTC_CR);
+        }
+    }
+#endif
+
+  return ret;
+}
+#endif
+
+/************************************************************************************
+ * Name: rtchw_check_alrXwf X= a or B
+ *
+ * Description:
+ *   Check registers
+ *
+ * Input Parameters:
+ * None
+ *
+ * Returned Value:
+ *   Zero (OK) on success; a negated errno on failure
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_RTC_ALARM
+static int rtchw_check_alrawf(void)
+{
+  volatile uint32_t timeout;
+  uint32_t regval;
+  int ret = -ETIMEDOUT;
+
+  /* Check RTC_ISR ALRAWF for access to alarm register,
+   * Can take 2 RTCCLK cycles or timeout
+   * CubeMX use GetTick.
+   */
+
+  for (timeout = 0; timeout < INITMODE_TIMEOUT; timeout++)
+    {
+      regval = getreg32(STM32_RTC_ISR);
+      if ((regval & RTC_ISR_ALRAWF) != 0)
+        {
+          ret = OK;
+          break;
+        }
+    }
+
+  return ret;
+}
+#endif
+
+#if defined(CONFIG_RTC_ALARM) && CONFIG_RTC_NALARMS > 1
+static int rtchw_check_alrbwf(void)
+{
+  volatile uint32_t timeout;
+  uint32_t regval;
+  int ret = -ETIMEDOUT;
+
+  /* Check RTC_ISR ALRAWF for access to alarm register,
+   * can take 2 RTCCLK cycles or timeout
+   * CubeMX use GetTick.
+   */
+
+  for (timeout = 0; timeout < INITMODE_TIMEOUT; timeout++)
+    {
+      regval = getreg32(STM32_RTC_ISR);
+      if ((regval & RTC_ISR_ALRBWF) != 0)
+        {
+          ret = OK;
+          break;
+        }
+    }
+
+  return ret;
+}
+#endif
+
+/************************************************************************************
+ * Name: stm32_rtchw_set_alrmXr X is a or b
+ *
+ * Description:
+ *   Set the alarm (A or B) hardware registers, using the required hardware access
+ *   protocol
+ *
+ * Input Parameters:
+ *   alarmreg - the register
+ *
+ * Returned Value:
+ *   Zero (OK) on success; a negated errno on failure
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_RTC_ALARM
+static int rtchw_set_alrmar(rtc_alarmreg_t alarmreg)
+{
+  int ret = -EBUSY;
+
+  /* Need to follow RTC register wrote protection
+   * Disable the write protection for RTC registers
+   */
+
+  rtc_wprunlock();
+
+  /* Disable RTC alarm & Interrupt */
+
+  modifyreg32(STM32_RTC_CR, (RTC_CR_ALRAE | RTC_CR_ALRAIE), 0);
+
+  ret = rtchw_check_alrawf();
+  if (ret != OK)
+    {
+      goto errout_with_wprunlock;
+    }
+
+  /* Set the RTC Alarm register */
+
+  putreg32(alarmreg, STM32_RTC_ALRMAR);
+  rtcinfo("  TR: %08x ALRMAR: %08x\n",
+          getreg32(STM32_RTC_TR), getreg32(STM32_RTC_ALRMAR));
+
+  /* Enable RTC alarm */
+
+  modifyreg32(STM32_RTC_CR, 0, (RTC_CR_ALRAE | RTC_CR_ALRAIE));
+
+errout_with_wprunlock:
+  rtc_wprlock();
+  return ret;
+}
+#endif
+
+#if defined(CONFIG_RTC_ALARM) && CONFIG_RTC_NALARMS > 1
+static int rtchw_set_alrmbr(rtc_alarmreg_t alarmreg)
+{
+  int ret = -EBUSY;
+
+  /* Need to follow RTC register wrote protection
+   * Disable the write protection for RTC registers
+   */
+
+  rtc_wprunlock();
+
+  /* Disable RTC alarm B & Interrupt B */
+
+  modifyreg32(STM32_RTC_CR, (RTC_CR_ALRBE | RTC_CR_ALRBIE), 0);
+
+  ret = rtchw_check_alrbwf();
+  if (ret != OK)
+    {
+      goto rtchw_set_alrmbr_exit;
+    }
+
+  /* Set the RTC Alarm register */
+
+  putreg32(alarmreg, STM32_RTC_ALRMBR);
+  rtcinfo("  TR: %08x ALRMBR: %08x\n",
+          getreg32(STM32_RTC_TR), getreg32(STM32_RTC_ALRMBR));
+
+  /* Enable RTC alarm B */
+
+  modifyreg32(STM32_RTC_CR, 0, (RTC_CR_ALRBE | RTC_CR_ALRBIE));
+
+rtchw_set_alrmbr_exit:
+  rtc_wprlock();
+  return ret;
+}
+#endif
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Name: up_rtc_initialize
+ *
+ * Description:
+ *   Initialize the hardware RTC per the selected configuration.  This function is
+ *   called once during the OS initialization sequence
+ *
+ * Input Parameters:
+ *   None
+ *
+ * Returned Value:
+ *   Zero (OK) on success; a negated errno on failure
+ *
+ ************************************************************************************/
+
+int up_rtc_initialize(void)
+{
+  uint32_t regval;
+  uint32_t tr_bkp;
+  uint32_t dr_bkp;
+  int ret;
+  int maxretry = 10;
+  int nretry = 0;
+
+  /* Clocking for the PWR block must be provided.  However, this is done
+   * unconditionally in stm32f40xxx_rcc.c on power up.  This done unconditionally
+   * because the PWR block is also needed to set the internal voltage regulator for
+   * maximum performance.
+   */
+
+  /* Select the clock source */
+  /* Save the token before losing it when resetting */
+
+  regval = getreg32(RTC_MAGIC_REG);
+
+  (void)stm32_pwr_enablebkp(true);
+
+  if (regval != RTC_MAGIC)
+    {
+      /* Some boards do not have the external 32khz oscillator installed, for those
+       * boards we must fallback to the crummy internal RC clock or the external high
+       * rate clock
+       */
+
+#ifdef CONFIG_STM32F7_RTC_HSECLOCK
+      /* Use the HSE clock as the input to the RTC block */
+
+      rtc_dumpregs("On reset HSE");
+      modifyreg32(STM32_RCC_XXX, RCC_XXX_RTCSEL_MASK, RCC_XXX_RTCSEL_HSE);
+
+#elif defined(CONFIG_STM32F7_RTC_LSICLOCK)
+      /* Use the LSI clock as the input to the RTC block */
+
+      rtc_dumpregs("On reset LSI");
+      modifyreg32(STM32_RCC_XXX, RCC_XXX_RTCSEL_MASK, RCC_XXX_RTCSEL_LSI);
+
+#elif defined(CONFIG_STM32F7_RTC_LSECLOCK)
+      /* Use the LSE clock as the input to the RTC block */
+
+      rtc_dumpregs("On reset LSE");
+      modifyreg32(STM32_RCC_XXX, RCC_XXX_RTCSEL_MASK, RCC_XXX_RTCSEL_LSE);
+
+#endif
+      /* Enable the RTC Clock by setting the RTCEN bit in the RCC register */
+
+      modifyreg32(STM32_RCC_XXX, 0, RCC_XXX_RTCEN);
+    }
+  else /* The RTC is already in use: check if the clock source is changed */
+    {
+#if defined(CONFIG_STM32F7_RTC_HSECLOCK) || defined(CONFIG_RTC_LSICLOCK) || \
+    defined(CONFIG_STM32F7_RTC_LSECLOCK)
+
+      uint32_t clksrc = getreg32(STM32_RCC_XXX);
+
+      rtc_dumpregs("On reset warm");
+
+#if defined(CONFIG_STM32F7_RTC_HSECLOCK)
+      if ((clksrc & RCC_XXX_RTCSEL_MASK) != RCC_XXX_RTCSEL_HSE)
+#elif defined(CONFIG_STM32F7_RTC_LSICLOCK)
+      if ((clksrc & RCC_XXX_RTCSEL_MASK) != RCC_XXX_RTCSEL_LSI)
+#elif defined(CONFIG_STM32F7_RTC_LSECLOCK)
+      if ((clksrc & RCC_XXX_RTCSEL_MASK) != RCC_XXX_RTCSEL_LSE)
+#endif
+#endif
+        {
+          tr_bkp = getreg32(STM32_RTC_TR);
+          dr_bkp = getreg32(STM32_RTC_DR);
+          modifyreg32(STM32_RCC_XXX, 0, RCC_XXX_YYYRST);
+          modifyreg32(STM32_RCC_XXX, RCC_XXX_YYYRST, 0);
+
+#if defined(CONFIG_STM32F7_RTC_HSECLOCK)
+          /* Change to the new clock as the input to the RTC block */
+
+          modifyreg32(STM32_RCC_XXX, RCC_XXX_RTCSEL_MASK, RCC_XXX_RTCSEL_HSE);
+
+#elif defined(CONFIG_STM32F7_RTC_LSICLOCK)
+          modifyreg32(STM32_RCC_XXX, RCC_XXX_RTCSEL_MASK, RCC_XXX_RTCSEL_LSI);
+
+#elif defined(CONFIG_STM32F7_RTC_LSECLOCK)
+          modifyreg32(STM32_RCC_XXX, RCC_XXX_RTCSEL_MASK, RCC_XXX_RTCSEL_LSE);
+#endif
+
+          putreg32(tr_bkp, STM32_RTC_TR);
+          putreg32(dr_bkp, STM32_RTC_DR);
+
+          /* Remember that the RTC is initialized */
+
+          putreg32(RTC_MAGIC, RTC_MAGIC_REG);
+
+          /* Enable the RTC Clock by setting the RTCEN bit in the RCC register */
+
+          modifyreg32(STM32_RCC_XXX, 0, RCC_XXX_RTCEN);
+        }
+    }
+
+  (void)stm32_pwr_enablebkp(false);
+
+  /* Loop, attempting to initialize/resume the RTC.  This loop is necessary
+   * because it seems that occasionally it takes longer to initialize the RTC
+   * (the actual failure is in rtc_synchwait()).
+   */
+
+  do
+    {
+      /* Wait for the RTC Time and Date registers to be synchronized with RTC APB
+       * clock.
+       */
+
+      ret = rtc_synchwait();
+
+      /* Check that rtc_syncwait() returned successfully */
+
+      switch (ret)
+        {
+          case OK:
+            {
+              rtcinfo("rtc_syncwait() okay\n");
+              break;
+            }
+
+          default:
+            {
+              rtcerr("ERROR: rtc_syncwait() failed (%d)\n", ret);
+              break;
+            }
+        }
+    }
+  while (ret != OK && ++nretry < maxretry);
+
+  /* Check if the one-time initialization of the RTC has already been
+   * performed. We can determine this by checking if the magic number
+   * has been writing to to back-up date register DR0.
+   */
+
+  if (regval != RTC_MAGIC)
+    {
+      rtcinfo("Do setup\n");
+
+      /* Perform the one-time setup of the LSE clocking to the RTC */
+
+      ret = rtc_setup();
+
+      /* Enable write access to the backup domain (RTC registers, RTC
+       * backup data registers and backup SRAM).
+       */
+
+      (void)stm32_pwr_enablebkp(true);
+
+      /* Remember that the RTC is initialized */
+
+      putreg32(RTC_MAGIC, RTC_MAGIC_REG);
+    }
+  else
+    {
+      rtcinfo("Do resume\n");
+
+      /* RTC already set-up, just resume normal operation */
+
+      rtc_resume();
+      rtc_dumpregs("Did resume");
+    }
+
+  /* Disable write access to the backup domain (RTC registers, RTC backup
+   * data registers and backup SRAM).
+   */
+
+  (void)stm32_pwr_enablebkp(false);
+
+  if (ret != OK && nretry > 0)
+    {
+      rtcinfo("setup/resume ran %d times and failed with %d\n",
+              nretry, ret);
+      return -ETIMEDOUT;
+    }
+
+#ifdef CONFIG_RTC_ALARM
+  /* Configure RTC interrupt to catch alarm interrupts. All RTC interrupts are
+   * connected to the EXTI controller.  To enable the RTC Alarm interrupt, the
+   * following sequence is required:
+   *
+   * 1. Configure and enable the EXTI Line 17 RTC ALARM in interrupt mode and select the
+   *    rising edge sensitivity.
+   *    For STM32F4xx
+   *    EXTI line 21 RTC Tamper & Timestamp
+   *    EXTI line 22 RTC Wakeup
+   * 2. Configure and enable the RTC_Alarm IRQ channel in the NVIC.
+   * 3. Configure the RTC to generate RTC alarms (Alarm A or Alarm B).
+   */
+
+  stm32_exti_alarm(true, false, true, stm32_rtc_alarm_handler);
+  rtc_dumpregs("After InitExtiAlarm");
+#else
+  rtc_dumpregs("After Initialization");
+#endif
+
+  g_rtc_enabled = true;
+  return OK;
+}
+
+/************************************************************************************
+ * Name: stm32_rtc_getdatetime_with_subseconds
+ *
+ * Description:
+ *   Get the current date and time from the date/time RTC.  This interface
+ *   is only supported by the date/time RTC hardware implementation.
+ *   It is used to replace the system timer.  It is only used by the RTOS during
+ *   initialization to set up the system time when CONFIG_RTC and CONFIG_RTC_DATETIME
+ *   are selected (and CONFIG_RTC_HIRES is not).
+ *
+ *   NOTE: Some date/time RTC hardware is capability of sub-second accuracy.  That
+ *   sub-second accuracy is returned through 'nsec'.
+ *
+ * Input Parameters:
+ *   tp - The location to return the high resolution time value.
+ *   nsec - The location to return the subsecond time value.
+ *
+ * Returned Value:
+ *   Zero (OK) on success; a negated errno on failure
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_STM32_HAVE_RTC_SUBSECONDS
+int stm32_rtc_getdatetime_with_subseconds(FAR struct tm *tp, FAR long *nsec)
+#else
+int up_rtc_getdatetime(FAR struct tm *tp)
+#endif
+{
+#ifdef CONFIG_STM32_HAVE_RTC_SUBSECONDS
+  uint32_t ssr;
+#endif
+  uint32_t dr;
+  uint32_t tr;
+  uint32_t tmp;
+
+  /* Sample the data time registers.  There is a race condition here... If we sample
+   * the time just before midnight on December 31, the date could be wrong because
+   * the day rolled over while were sampling.
+   */
+
+  do
+    {
+      dr  = getreg32(STM32_RTC_DR);
+      tr  = getreg32(STM32_RTC_TR);
+#ifdef CONFIG_STM32_HAVE_RTC_SUBSECONDS
+      ssr = getreg32(STM32_RTC_SSR);
+#endif
+      tmp = getreg32(STM32_RTC_DR);
+    }
+  while (tmp != dr);
+
+  rtc_dumpregs("Reading Time");
+
+  /* Convert the RTC time to fields in struct tm format.  All of the STM32
+   * All of the ranges of values correspond between struct tm and the time
+   * register.
+   */
+
+  tmp = (tr & (RTC_TR_SU_MASK | RTC_TR_ST_MASK)) >> RTC_TR_SU_SHIFT;
+  tp->tm_sec = rtc_bcd2bin(tmp);
+
+  tmp = (tr & (RTC_TR_MNU_MASK | RTC_TR_MNT_MASK)) >> RTC_TR_MNU_SHIFT;
+  tp->tm_min = rtc_bcd2bin(tmp);
+
+  tmp = (tr & (RTC_TR_HU_MASK | RTC_TR_HT_MASK)) >> RTC_TR_HU_SHIFT;
+  tp->tm_hour = rtc_bcd2bin(tmp);
+
+  /* Now convert the RTC date to fields in struct tm format:
+   * Days: 1-31 match in both cases.
+   * Month: STM32 is 1-12, struct tm is 0-11.
+   * Years: STM32 is 00-99, struct tm is years since 1900.
+   * WeekDay: STM32 is 1 = Mon - 7 = Sun
+   *
+   * Issue:  I am not sure what the STM32 years mean.  Are these the
+   * years 2000-2099?  I'll assume so.
+   */
+
+  tmp = (dr & (RTC_DR_DU_MASK | RTC_DR_DT_MASK)) >> RTC_DR_DU_SHIFT;
+  tp->tm_mday = rtc_bcd2bin(tmp);
+
+  tmp = (dr & (RTC_DR_MU_MASK | RTC_DR_MT)) >> RTC_DR_MU_SHIFT;
+  tp->tm_mon = rtc_bcd2bin(tmp) - 1;
+
+  tmp = (dr & (RTC_DR_YU_MASK | RTC_DR_YT_MASK)) >> RTC_DR_YU_SHIFT;
+  tp->tm_year = rtc_bcd2bin(tmp) + 100;
+
+#if defined(CONFIG_LIBC_LOCALTIME) || defined(CONFIG_TIME_EXTENDED)
+  tmp = (dr & RTC_DR_WDU_MASK) >> RTC_DR_WDU_SHIFT;
+  tp->tm_wday = tmp % 7;
+  tp->tm_yday = tp->tm_mday + clock_daysbeforemonth(tp->tm_mon, clock_isleapyear(tp->tm_year + 1900));
+  tp->tm_isdst = 0
+#endif
+
+#ifdef CONFIG_STM32_HAVE_RTC_SUBSECONDS
+  /* Return RTC sub-seconds if no configured and if a non-NULL value
+   * of nsec has been provided to receive the sub-second value.
+   */
+
+  if (nsec)
+    {
+      uint32_t prediv_s;
+      uint32_t usecs;
+
+      prediv_s   = getreg32(STM32_RTC_PRER) & RTC_PRER_PREDIV_S_MASK;
+      prediv_s >>= RTC_PRER_PREDIV_S_SHIFT;
+
+      ssr &= RTC_SSR_MASK;
+
+      /* Maximum prediv_s is 0x7fff, thus we can multiply by 100000 and
+       * still fit 32-bit unsigned integer.
+       */
+
+      usecs = (((prediv_s - ssr) * 100000) / (prediv_s + 1)) * 10;
+      *nsec = usecs * 1000;
+    }
+#endif /* CONFIG_STM32_HAVE_RTC_SUBSECONDS */
+
+  rtc_dumptime((FAR const struct tm *)tp, "Returning");
+  return OK;
+}
+
+/************************************************************************************
+ * Name: up_rtc_getdatetime
+ *
+ * Description:
+ *   Get the current date and time from the date/time RTC.  This interface
+ *   is only supported by the date/time RTC hardware implementation.
+ *   It is used to replace the system timer.  It is only used by the RTOS during
+ *   initialization to set up the system time when CONFIG_RTC and CONFIG_RTC_DATETIME
+ *   are selected (and CONFIG_RTC_HIRES is not).
+ *
+ *   NOTE: Some date/time RTC hardware is capability of sub-second accuracy.  That
+ *   sub-second accuracy is lost in this interface.  However, since the system time
+ *   is reinitialized on each power-up/reset, there will be no timing inaccuracy in
+ *   the long run.
+ *
+ * Input Parameters:
+ *   tp - The location to return the high resolution time value.
+ *
+ * Returned Value:
+ *   Zero (OK) on success; a negated errno on failure
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_STM32_HAVE_RTC_SUBSECONDS
+int up_rtc_getdatetime(FAR struct tm *tp)
+{
+  return stm32_rtc_getdatetime_with_subseconds(tp, NULL);
+}
+#endif
+
+/************************************************************************************
+ * Name: stm32_rtc_setdatetime
+ *
+ * Description:
+ *   Set the RTC to the provided time. RTC implementations which provide
+ *   up_rtc_getdatetime() (CONFIG_RTC_DATETIME is selected) should provide this
+ *   function.
+ *
+ * Input Parameters:
+ *   tp - the time to use
+ *
+ * Returned Value:
+ *   Zero (OK) on success; a negated errno on failure
+ *
+ ************************************************************************************/
+
+int stm32_rtc_setdatetime(FAR const struct tm *tp)
+{
+  uint32_t tr;
+  uint32_t dr;
+  int ret;
+
+  rtc_dumptime(tp, "Setting time");
+
+  /* Then write the broken out values to the RTC */
+
+  /* Convert the struct tm format to RTC time register fields.  All of the STM32
+   * All of the ranges of values correspond between struct tm and the time
+   * register.
+   */
+
+  tr = (rtc_bin2bcd(tp->tm_sec)  << RTC_TR_SU_SHIFT) |
+       (rtc_bin2bcd(tp->tm_min)  << RTC_TR_MNU_SHIFT) |
+       (rtc_bin2bcd(tp->tm_hour) << RTC_TR_HU_SHIFT);
+
+  /* Now convert the fields in struct tm format to the RTC date register fields:
+   * Days: 1-31 match in both cases.
+   * Month: STM32 is 1-12, struct tm is 0-11.
+   * Years: STM32 is 00-99, struct tm is years since 1900.
+   * WeekDay: STM32 is 1 = Mon - 7 = Sun
+   * Issue:  I am not sure what the STM32 years mean.  Are these the
+   * years 2000-2099?  I'll assume so.
+   */
+
+  dr = (rtc_bin2bcd(tp->tm_mday) << RTC_DR_DU_SHIFT) |
+       ((rtc_bin2bcd(tp->tm_mon + 1))  << RTC_DR_MU_SHIFT) |
+#if defined(CONFIG_LIBC_LOCALTIME) || defined(CONFIG_TIME_EXTENDED)
+       ((tp->tm_wday == 0 ? 7 : (tp->tm_wday & 7))  << RTC_DR_WDU_SHIFT) |
+#endif
+       ((rtc_bin2bcd(tp->tm_year - 100)) << RTC_DR_YU_SHIFT);
+
+  dr &= ~RTC_DR_RESERVED_BITS;
+
+  /* Disable the write protection for RTC registers */
+
+  rtc_wprunlock();
+
+  /* Set Initialization mode */
+
+  ret = rtc_enterinit();
+  if (ret == OK)
+    {
+      /* Set the RTC TR and DR registers */
+
+      putreg32(tr, STM32_RTC_TR);
+      putreg32(dr, STM32_RTC_DR);
+
+      /* Exit Initialization mode and wait for the RTC Time and Date
+       * registers to be synchronized with RTC APB clock.
+       */
+
+      rtc_exitinit();
+      ret = rtc_synchwait();
+    }
+
+  /* Re-enable the write protection for RTC registers */
+
+  rtc_wprlock();
+  rtc_dumpregs("New time setting");
+  return ret;
+}
+
+/************************************************************************************
+ * Name: up_rtc_settime
+ *
+ * Description:
+ *   Set the RTC to the provided time.  All RTC implementations must be able to
+ *   set their time based on a standard timespec.
+ *
+ * Input Parameters:
+ *   tp - the time to use
+ *
+ * Returned Value:
+ *   Zero (OK) on success; a negated errno on failure
+ *
+ ************************************************************************************/
+
+int up_rtc_settime(FAR const struct timespec *tp)
+{
+  FAR struct tm newtime;
+
+  /* Break out the time values (not that the time is set only to units of seconds) */
+
+  (void)gmtime_r(&tp->tv_sec, &newtime);
+  return stm32_rtc_setdatetime(&newtime);
+}
+
+/****************************************************************************
+ * Name: stm32_rtc_setalarm
+ *
+ * Description:
+ *   Set an alarm to an asbolute time using associated hardware.
+ *
+ * Input Parameters:
+ *  alminfo - Information about the alarm configuration.
+ *
+ * Returned Value:
+ *   Zero (OK) on success; a negated errno on failure
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_RTC_ALARM
+int stm32_rtc_setalarm(FAR struct alm_setalarm_s *alminfo)
+{
+  FAR struct alm_cbinfo_s *cbinfo;
+  rtc_alarmreg_t alarmreg;
+  int ret = -EINVAL;
+
+  ASSERT(alminfo != NULL);
+  DEBUGASSERT(RTC_ALARM_LAST > alminfo->as_id);
+
+  /* REVISIT:  Should test that the time is in the future */
+
+  rtc_dumptime(&alminfo->as_time, "New alarm time");
+
+  /* Break out the values to the HW alarm register format.  The values in
+   * all STM32 fields match the fields of struct tm in this case.  Notice
+   * that the alarm is limited to one month.
+   */
+
+  alarmreg = (rtc_bin2bcd(alminfo->as_time.tm_sec)  << RTC_ALRMR_SU_SHIFT) |
+             (rtc_bin2bcd(alminfo->as_time.tm_min)  << RTC_ALRMR_MNU_SHIFT) |
+             (rtc_bin2bcd(alminfo->as_time.tm_hour) << RTC_ALRMR_HU_SHIFT) |
+             (rtc_bin2bcd(alminfo->as_time.tm_mday) << RTC_ALRMR_DU_SHIFT);
+
+  /* Set the alarm in hardware and enable interrupts */
+
+  switch (alminfo->as_id)
+    {
+      case RTC_ALARMA:
+        {
+          cbinfo         = &g_alarmcb[RTC_ALARMA];
+          cbinfo->ac_cb  = alminfo->as_cb;
+          cbinfo->ac_arg = alminfo->as_arg;
+
+          ret = rtchw_set_alrmar(alarmreg | RTC_ALRMR_ENABLE);
+          if (ret < 0)
+            {
+              cbinfo->ac_cb  = NULL;
+              cbinfo->ac_arg = NULL;
+            }
+
+          rtc_dumpregs("Set AlarmA");
+        }
+        break;
+
+#if CONFIG_RTC_NALARMS > 1
+      case RTC_ALARMB:
+        {
+          cbinfo         = &g_alarmcb[RTC_ALARMB];
+          cbinfo->ac_cb  = alminfo->as_cb;
+          cbinfo->ac_arg = alminfo->as_arg;
+
+          ret = rtchw_set_alrmbr(alarmreg | RTC_ALRMR_ENABLE);
+          if (ret < 0)
+            {
+              cbinfo->ac_cb  = NULL;
+              cbinfo->ac_arg = NULL;
+            }
+
+          rtc_dumpregs("Set AlarmB");
+        }
+        break;
+#endif
+
+      default:
+        rtcerr("ERROR: Invalid ALARM%d\n", alminfo->as_id);
+        break;
+    }
+
+  return ret;
+}
+#endif
+
+/****************************************************************************
+ * Name: stm32_rtc_cancelalarm
+ *
+ * Description:
+ *   Cancel an alaram.
+ *
+ * Input Parameters:
+ *  alarmid - Identifies the alarm to be cancelled
+ *
+ * Returned Value:
+ *   Zero (OK) on success; a negated errno on failure
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_RTC_ALARM
+int stm32_rtc_cancelalarm(enum alm_id_e alarmid)
+{
+  int ret = -EINVAL;
+
+  DEBUGASSERT(RTC_ALARM_LAST > alarmid);
+
+  /* Cancel the alarm in hardware and disable interrupts */
+
+  switch (alarmid)
+    {
+      case RTC_ALARMA:
+        {
+          /* Cancel the global callback function */
+
+           g_alarmcb[alarmid].ac_cb  = NULL;
+           g_alarmcb[alarmid].ac_arg = NULL;
+
+          /* Need to follow RTC register wrote protection.
+           * Disable the write protection for RTC registers
+           */
+
+          rtc_wprunlock();
+
+          /* Disable RTC alarm and interrupt */
+
+          modifyreg32(STM32_RTC_CR, (RTC_CR_ALRAE | RTC_CR_ALRAIE), 0);
+
+          ret = rtchw_check_alrawf();
+          if (ret < 0)
+            {
+              goto errout_with_wprunlock;
+            }
+
+          /* Unset the alarm */
+
+          putreg32(-1, STM32_RTC_ALRMAR);
+          rtc_wprlock();
+          ret = OK;
+        }
+        break;
+
+#if CONFIG_RTC_NALARMS > 1
+      case RTC_ALARMB:
+        {
+          /* Cancel the global callback function */
+
+           g_alarmcb[alarmid].ac_cb  = NULL;
+           g_alarmcb[alarmid].ac_arg = NULL;
+
+          /* Need to follow RTC register wrote protection.
+           * Disable the write protection for RTC registers
+           */
+
+          rtc_wprunlock();
+
+          /* Disable RTC alarm and interrupt */
+
+          modifyreg32(STM32_RTC_CR, (RTC_CR_ALRBE | RTC_CR_ALRBIE), 0);
+
+          ret = rtchw_check_alrbwf();
+          if (ret < 0)
+            {
+              goto errout_with_wprunlock;
+            }
+
+          /* Unset the alarm */
+
+          putreg32(-1, STM32_RTC_ALRMBR);
+          rtc_wprlock();
+          ret = OK;
+        }
+        break;
+#endif
+
+      default:
+        rtcerr("ERROR: Invalid ALARM%d\n", alarmid);
+        break;
+    }
+
+  return ret;
+
+errout_with_wprunlock:
+  rtc_wprlock();
+  return ret;
+}
+#endif
+
+#endif /* CONFIG_RTC */
diff --git a/arch/arm/src/stm32f7/stm32_rtc.h b/arch/arm/src/stm32f7/stm32_rtc.h
new file mode 100644
index 0000000000..f784f8acd3
--- /dev/null
+++ b/arch/arm/src/stm32f7/stm32_rtc.h
@@ -0,0 +1,178 @@
+/****************************************************************************
+ * arch/arm/src/stm32f7/stm32_rtc.h
+ *
+ *   Copyright (C) 2011 Uros Platise. All rights reserved.
+ *   Copyright (C) 2011-2013, 2015-2016 Gregory Nutt. All rights reserved.
+ *   Authors: Uros Platise  (Original for the F1)
+ *            Gregory Nutt  (On-going support and development)
+ *            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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#ifndef __ARCH_ARM_SRC_STM32F7_STM32_RTC_H
+#define __ARCH_ARM_SRC_STM32F7_STM32_RTC_H
+
+#include 
+
+#include "chip.h"
+
+/* The STMF7 family use a more traditional Realtime Clock/Calendar (RTCC) with
+ * broken-out data/time in BCD format.  The backup registers are integrated into
+ * the RTCC in these families.
+ */
+
+#include "chip/stm32_rtcc.h"
+#include "stm32_alarm.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define STM32_RTC_PRESCALER_SECOND  32767  /* Default prescaler to get a second base */
+#define STM32_RTC_PRESCALER_MIN         1  /* Maximum speed of 16384 Hz */
+
+#if !defined(CONFIG_RTC_MAGIC)
+# define CONFIG_RTC_MAGIC           (0xfacefeee)
+#endif
+
+#if !defined(CONFIG_RTC_MAGIC_REG)
+# define CONFIG_RTC_MAGIC_REG       (0)
+#endif
+
+#define RTC_MAGIC                   CONFIG_RTC_MAGIC
+#define RTC_MAGIC_REG               STM32_RTC_BKR(CONFIG_RTC_MAGIC_REG)
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+#ifndef __ASSEMBLY__
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+#undef EXTERN
+#if defined(__cplusplus)
+#define EXTERN extern "C"
+extern "C"
+{
+#else
+#define EXTERN extern
+#endif
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stm32_rtc_getdatetime_with_subseconds
+ *
+ * Description:
+ *   Get the current date and time from the date/time RTC.  This interface
+ *   is only supported by the date/time RTC hardware implementation.
+ *   It is used to replace the system timer.  It is only used by the RTOS
+ *   during initialization to set up the system time when CONFIG_RTC and
+ *   CONFIG_RTC_DATETIME are selected (and CONFIG_RTC_HIRES is not).
+ *
+ *   NOTE: Some date/time RTC hardware is capability of sub-second accuracy.
+ *   Thatsub-second accuracy is returned through 'nsec'.
+ *
+ * Input Parameters:
+ *   tp - The location to return the high resolution time value.
+ *   nsec - The location to return the subsecond time value.
+ *
+ * Returned Value:
+ *   Zero (OK) on success; a negated errno on failure
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_STM32F7_HAVE_RTC_SUBSECONDS
+int stm32_rtc_getdatetime_with_subseconds(FAR struct tm *tp, FAR long *nsec);
+#endif
+
+/****************************************************************************
+ * Name: stm32_rtc_setdatetime
+ *
+ * Description:
+ *   Set the RTC to the provided time. RTC implementations which provide
+ *   up_rtc_getdatetime() (CONFIG_RTC_DATETIME is selected) should provide
+ *   this function.
+ *
+ * Input Parameters:
+ *   tp - the time to use
+ *
+ * Returned Value:
+ *   Zero (OK) on success; a negated errno on failure
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_RTC_DATETIME
+struct tm;
+int stm32_rtc_setdatetime(FAR const struct tm *tp);
+#endif
+
+/****************************************************************************
+ * Name: stm32_rtc_lowerhalf
+ *
+ * Description:
+ *   Instantiate the RTC lower half driver for the STM32.  General usage:
+ *
+ *     #include 
+ *     #include "stm32_rtc.h>
+ *
+ *     struct rtc_lowerhalf_s *lower;
+ *     lower = stm32_rtc_lowerhalf();
+ *     rtc_initialize(0, lower);
+ *
+ * Input Parameters:
+ *   None
+ *
+ * Returned Value:
+ *   On success, a non-NULL RTC lower interface is returned.  NULL is
+ *   returned on any failure.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_RTC_DRIVER
+struct rtc_lowerhalf_s;
+FAR struct rtc_lowerhalf_s *stm32_rtc_lowerhalf(void);
+#endif
+
+#undef EXTERN
+#if defined(__cplusplus)
+}
+#endif
+#endif /* __ASSEMBLY__ */
+#endif /* __ARCH_ARM_SRC_STM32F7_STM32_RTC_H */
diff --git a/arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c b/arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c
new file mode 100644
index 0000000000..47a59b4cbf
--- /dev/null
+++ b/arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c
@@ -0,0 +1,530 @@
+/****************************************************************************
+ * arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c
+ *
+ *   Copyright (C) 2015-2016 Gregory Nutt. All rights reserved.
+ *   Author: 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.
+ *
+ ****************************************************************************/
+
+/* REVISIT:  This driver is *not* thread-safe! */
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+#include "chip.h"
+#include "stm32_rtc.h"
+
+#ifdef CONFIG_RTC_DRIVER
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define STM32_NALARMS 2
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+#ifdef CONFIG_RTC_ALARM
+struct stm32_cbinfo_s
+{
+  volatile rtc_alarm_callback_t cb;  /* Callback when the alarm expires */
+  volatile FAR void *priv;           /* Private argurment to accompany callback */
+  uint8_t id;                        /* Identifies the alarm */
+};
+#endif
+
+/* This is the private type for the RTC state.  It must be cast compatible
+ * with struct rtc_lowerhalf_s.
+ */
+
+struct stm32_lowerhalf_s
+{
+  /* This is the contained reference to the read-only, lower-half
+   * operations vtable (which may lie in FLASH or ROM)
+   */
+
+  FAR const struct rtc_ops_s *ops;
+
+  /* Data following is private to this driver and not visible outside of
+   * this file.
+   */
+
+#ifdef CONFIG_RTC_ALARM
+  /* Alarm callback information */
+
+  struct stm32_cbinfo_s cbinfo[STM32_NALARMS];
+#endif
+};
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+/* Prototypes for static methods in struct rtc_ops_s */
+
+static int stm32_rdtime(FAR struct rtc_lowerhalf_s *lower,
+                        FAR struct rtc_time *rtctime);
+static int stm32_settime(FAR struct rtc_lowerhalf_s *lower,
+                         FAR const struct rtc_time *rtctime);
+
+#ifdef CONFIG_RTC_ALARM
+static int stm32_setalarm(FAR struct rtc_lowerhalf_s *lower,
+                          FAR const struct lower_setalarm_s *alarminfo);
+static int stm32_setrelative(FAR struct rtc_lowerhalf_s *lower,
+                             FAR const struct lower_setrelative_s *alarminfo);
+static int stm32_cancelalarm(FAR struct rtc_lowerhalf_s *lower,
+                             int alarmid);
+#endif
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+/* STM32 RTC driver operations */
+
+static const struct rtc_ops_s g_rtc_ops =
+{
+  .rdtime      = stm32_rdtime,
+  .settime     = stm32_settime,
+#ifdef CONFIG_RTC_ALARM
+  .setalarm    = stm32_setalarm,
+  .setrelative = stm32_setrelative,
+  .cancelalarm = stm32_cancelalarm,
+#endif
+#ifdef CONFIG_RTC_IOCTL
+  .ioctl       = NULL,
+#endif
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  .destroy     = NULL,
+#endif
+};
+
+/* STM32 RTC device state */
+
+static struct stm32_lowerhalf_s g_rtc_lowerhalf =
+{
+  .ops        = &g_rtc_ops,
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stm32_alarm_callback
+ *
+ * Description:
+ *   This is the function that is called from the RTC driver when the alarm
+ *   goes off.  It just invokes the upper half drivers callback.
+ *
+ * Input Parameters:
+ *   None
+ *
+ * Returned Value:
+ *   None
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_RTC_ALARM
+static void stm32_alarm_callback(FAR void *arg, unsigned int alarmid)
+{
+  FAR struct stm32_lowerhalf_s *lower;
+  FAR struct stm32_cbinfo_s *cbinfo;
+  rtc_alarm_callback_t cb;
+  FAR void *priv;
+
+  DEBUGASSERT(alarmid == RTC_ALARMA || alarmid == RTC_ALARMB);
+
+  lower        = (struct stm32_lowerhalf_s *)arg;
+  cbinfo       = &lower->cbinfo[alarmid];
+
+  /* Sample and clear the callback information to minimize the window in
+   * time in which race conditions can occur.
+   */
+
+  cb           = (rtc_alarm_callback_t)cbinfo->cb;
+  priv         = (FAR void *)cbinfo->priv;
+  DEBUGASSERT(priv != NULL);
+
+  cbinfo->cb   = NULL;
+  cbinfo->priv = NULL;
+
+  /* Perform the callback */
+
+  if (cb != NULL)
+    {
+      cb(priv, alarmid);
+    }
+}
+#endif /* CONFIG_RTC_ALARM */
+
+/****************************************************************************
+ * Name: stm32_rdtime
+ *
+ * Description:
+ *   Implements the rdtime() method of the RTC driver interface
+ *
+ * Input Parameters:
+ *   lower   - A reference to RTC lower half driver state structure
+ *   rcttime - The location in which to return the current RTC time.
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned
+ *   on any failure.
+ *
+ ****************************************************************************/
+
+static int stm32_rdtime(FAR struct rtc_lowerhalf_s *lower,
+                        FAR struct rtc_time *rtctime)
+{
+#if defined(CONFIG_RTC_DATETIME)
+  /* This operation depends on the fact that struct rtc_time is cast
+   * compatible with struct tm.
+   */
+
+  return up_rtc_getdatetime((FAR struct tm *)rtctime);
+
+#elif defined(CONFIG_RTC_HIRES)
+  FAR struct timespec ts;
+  int ret;
+
+  /* Get the higher resolution time */
+
+  ret = up_rtc_gettime(&ts);
+  if (ret < 0)
+    {
+      goto errout_with_errno;
+    }
+
+  /* Convert the one second epoch time to a struct tm.  This operation
+   * depends on the fact that struct rtc_time and struct tm are cast
+   * compatible.
+   */
+
+  if (!gmtime_r(&ts.tv_sec, (FAR struct tm *)rtctime))
+    {
+      goto errout_with_errno;
+    }
+
+  return OK;
+
+errout_with_errno:
+  ret = get_errno();
+  DEBUGASSERT(ret > 0);
+  return -ret;
+
+#else
+  time_t timer;
+
+  /* The resolution of time is only 1 second */
+
+  timer = up_rtc_time();
+
+  /* Convert the one second epoch time to a struct tm */
+
+  if (!gmtime_r(&timer, (FAR struct tm *)rtctime))
+    {
+      int errcode = get_errno();
+      DEBUGASSERT(errcode > 0);
+      return -errcode;
+    }
+
+  return OK;
+#endif
+}
+
+/****************************************************************************
+ * Name: stm32_settime
+ *
+ * Description:
+ *   Implements the settime() method of the RTC driver interface
+ *
+ * Input Parameters:
+ *   lower   - A reference to RTC lower half driver state structure
+ *   rcttime - The new time to set
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned
+ *   on any failure.
+ *
+ ****************************************************************************/
+
+static int stm32_settime(FAR struct rtc_lowerhalf_s *lower,
+                         FAR const struct rtc_time *rtctime)
+{
+#ifdef CONFIG_RTC_DATETIME
+  /* This operation depends on the fact that struct rtc_time is cast
+   * compatible with struct tm.
+   */
+
+  return stm32_rtc_setdatetime((FAR const struct tm *)rtctime);
+
+#else
+  struct timespec ts;
+
+  /* Convert the struct rtc_time to a time_t.  Here we assume that struct
+   * rtc_time is cast compatible with struct tm.
+   */
+
+  ts.tv_sec  = mktime((FAR struct tm *)rtctime);
+  ts.tv_nsec = 0;
+
+  /* Now set the time (to one second accuracy) */
+
+  return up_rtc_settime(&ts);
+#endif
+}
+
+/****************************************************************************
+ * Name: stm32_setalarm
+ *
+ * Description:
+ *   Set a new alarm.  This function implements the setalarm() method of the
+ *   RTC driver interface
+ *
+ * Input Parameters:
+ *   lower - A reference to RTC lower half driver state structure
+ *   alarminfo - Provided information needed to set the alarm
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned
+ *   on any failure.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_RTC_ALARM
+static int stm32_setalarm(FAR struct rtc_lowerhalf_s *lower,
+                          FAR const struct lower_setalarm_s *alarminfo)
+{
+  FAR struct stm32_lowerhalf_s *priv;
+  FAR struct stm32_cbinfo_s *cbinfo;
+  struct alm_setalarm_s lowerinfo;
+  int ret = -EINVAL;
+
+  /* ID0-> Alarm A; ID1 -> Alarm B */
+
+  DEBUGASSERT(lower != NULL && alarminfo != NULL);
+  DEBUGASSERT(alarminfo->id == RTC_ALARMA || alarminfo->id == RTC_ALARMB);
+  priv = (FAR struct stm32_lowerhalf_s *)lower;
+
+  if (alarminfo->id == RTC_ALARMA || alarminfo->id == RTC_ALARMB)
+    {
+      /* Remember the callback information */
+
+      cbinfo            = &priv->cbinfo[alarminfo->id];
+      cbinfo->cb        = alarminfo->cb;
+      cbinfo->priv      = alarminfo->priv;
+      cbinfo->id        = alarminfo->id;
+
+      /* Set the alarm */
+
+      lowerinfo.as_id   = alarminfo->id;
+      lowerinfo.as_cb   = stm32_alarm_callback;
+      lowerinfo.as_arg  = priv;
+      memcpy(&lowerinfo.as_time, &alarminfo->time, sizeof(struct tm));
+
+      /* And set the alarm */
+
+      ret = stm32_rtc_setalarm(&lowerinfo);
+      if (ret < 0)
+        {
+          cbinfo->cb   = NULL;
+          cbinfo->priv = NULL;
+        }
+    }
+
+  return ret;
+}
+#endif
+
+/****************************************************************************
+ * Name: stm32_setrelative
+ *
+ * Description:
+ *   Set a new alarm relative to the current time.  This function implements
+ *   the setrelative() method of the RTC driver interface
+ *
+ * Input Parameters:
+ *   lower - A reference to RTC lower half driver state structure
+ *   alarminfo - Provided information needed to set the alarm
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned
+ *   on any failure.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_RTC_ALARM
+static int stm32_setrelative(FAR struct rtc_lowerhalf_s *lower,
+                             FAR const struct lower_setrelative_s *alarminfo)
+{
+  struct lower_setalarm_s setalarm;
+  struct tm time;
+  time_t seconds;
+  int ret = -EINVAL;
+
+  ASSERT(lower != NULL && alarminfo != NULL);
+  DEBUGASSERT(alarminfo->id == RTC_ALARMA || alarminfo->id == RTC_ALARMB);
+
+  if ((alarminfo->id == RTC_ALARMA || alarminfo->id == RTC_ALARMB) &&
+      alarminfo->reltime > 0)
+    {
+      /* Disable pre-emption while we do this so that we don't have to worry
+       * about being suspended and working on an old time.
+       */
+
+      sched_lock();
+
+      /* Get the current time in broken out format */
+
+      ret = up_rtc_getdatetime(&time);
+      if (ret >= 0)
+        {
+          /* Convert to seconds since the epoch */
+
+          seconds = mktime(&time);
+
+          /* Add the seconds offset.  Add one to the number of seconds
+           * because we are unsure of the phase of the timer.
+           */
+
+          seconds += (alarminfo->reltime + 1);
+
+          /* And convert the time back to broken out format */
+
+          (void)gmtime_r(&seconds, (FAR struct tm *)&setalarm.time);
+
+          /* The set the alarm using this absolute time */
+
+          setalarm.id   = alarminfo->id;
+          setalarm.cb   = alarminfo->cb;
+          setalarm.priv = alarminfo->priv;
+
+          ret = stm32_setalarm(lower, &setalarm);
+        }
+
+      sched_unlock();
+    }
+
+  return ret;
+}
+#endif
+
+/****************************************************************************
+ * Name: stm32_cancelalarm
+ *
+ * Description:
+ *   Cancel the current alarm.  This function implements the cancelalarm()
+ *   method of the RTC driver interface
+ *
+ * Input Parameters:
+ *   lower - A reference to RTC lower half driver state structure
+ *   alarminfo - Provided information needed to set the alarm
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned
+ *   on any failure.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_RTC_ALARM
+static int stm32_cancelalarm(FAR struct rtc_lowerhalf_s *lower, int alarmid)
+{
+  FAR struct stm32_lowerhalf_s *priv;
+  FAR struct stm32_cbinfo_s *cbinfo;
+  int ret = -EINVAL;
+
+  DEBUGASSERT(lower != NULL);
+  DEBUGASSERT(alarmid == RTC_ALARMA || alarmid == RTC_ALARMB);
+  priv = (FAR struct stm32_lowerhalf_s *)lower;
+
+  /* ID0-> Alarm A; ID1 -> Alarm B */
+
+  if (alarmid == RTC_ALARMA || alarmid == RTC_ALARMB)
+    {
+      /* Nullify callback information to reduce window for race conditions */
+
+      cbinfo       = &priv->cbinfo[alarmid];
+      cbinfo->cb   = NULL;
+      cbinfo->priv = NULL;
+
+      /* Then cancel the alarm */
+
+      ret = stm32_rtc_cancelalarm((enum alm_id_e)alarmid);
+    }
+
+  return ret;
+}
+#endif
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stm32_rtc_lowerhalf
+ *
+ * Description:
+ *   Instantiate the RTC lower half driver for the STM32.  General usage:
+ *
+ *     #include 
+ *     #include "stm32_rtc.h>
+ *
+ *     struct rtc_lowerhalf_s *lower;
+ *     lower = stm32_rtc_lowerhalf();
+ *     rtc_initialize(0, lower);
+ *
+ * Input Parameters:
+ *   None
+ *
+ * Returned Value:
+ *   On success, a non-NULL RTC lower interface is returned.  NULL is
+ *   returned on any failure.
+ *
+ ****************************************************************************/
+
+FAR struct rtc_lowerhalf_s *stm32_rtc_lowerhalf(void)
+{
+  return (FAR struct rtc_lowerhalf_s *)&g_rtc_lowerhalf;
+}
+
+#endif /* CONFIG_RTC_DRIVER */
diff --git a/arch/arm/src/stm32f7/stm32f74xx75xx_rcc.c b/arch/arm/src/stm32f7/stm32f74xx75xx_rcc.c
index 7ae301548a..aac857b9c3 100644
--- a/arch/arm/src/stm32f7/stm32f74xx75xx_rcc.c
+++ b/arch/arm/src/stm32f7/stm32f74xx75xx_rcc.c
@@ -746,7 +746,7 @@ static void stm32_stdclockconfig(void)
       regval |= STM32_RCC_CFGR_PPRE1;
       putreg32(regval, STM32_RCC_CFGR);
 
-#ifdef CONFIG_RTC_HSECLOCK
+#ifdef CONFIG_STM32F7_RTC_HSECLOCK
       /* Set the RTC clock divisor */
 
       regval = getreg32(STM32_RCC_CFGR);
@@ -936,13 +936,13 @@ static void stm32_stdclockconfig(void)
         }
 #endif
 
-#if defined(CONFIG_STM32F7_IWDG) || defined(CONFIG_RTC_LSICLOCK)
+#if defined(CONFIG_STM32F7_IWDG) || defined(CONFIG_STM32F7_RTC_LSICLOCK)
       /* Low speed internal clock source LSI */
 
       stm32_rcc_enablelsi();
 #endif
 
-#if defined(CONFIG_RTC_LSECLOCK)
+#if defined(CONFIG_STM32F7_RTC_LSECLOCK)
       /* Low speed external clock source LSE
        *
        * TODO: There is another case where the LSE needs to
diff --git a/arch/arm/src/stm32f7/stm32f76xx77xx_rcc.c b/arch/arm/src/stm32f7/stm32f76xx77xx_rcc.c
index d24705d5fd..b390d422b4 100644
--- a/arch/arm/src/stm32f7/stm32f76xx77xx_rcc.c
+++ b/arch/arm/src/stm32f7/stm32f76xx77xx_rcc.c
@@ -742,7 +742,7 @@ static void stm32_stdclockconfig(void)
       regval |= STM32_RCC_CFGR_PPRE1;
       putreg32(regval, STM32_RCC_CFGR);
 
-#ifdef CONFIG_RTC_HSECLOCK
+#ifdef CONFIG_STM32F7_RTC_HSECLOCK
       /* Set the RTC clock divisor */
 
       regval = getreg32(STM32_RCC_CFGR);
@@ -939,13 +939,13 @@ static void stm32_stdclockconfig(void)
         }
 #endif
 
-#if defined(CONFIG_STM32F7_IWDG) || defined(CONFIG_RTC_LSICLOCK)
+#if defined(CONFIG_STM32F7_IWDG) || defined(CONFIG_STM32F7_RTC_LSICLOCK)
       /* Low speed internal clock source LSI */
 
       stm32_rcc_enablelsi();
 #endif
 
-#if defined(CONFIG_RTC_LSECLOCK)
+#if defined(CONFIG_STM32F7_RTC_LSECLOCK)
       /* Low speed external clock source LSE
        *
        * TODO: There is another case where the LSE needs to
-- 
GitLab


From 891113dac93d1fccfb53851e92ee46cc030e9cd3 Mon Sep 17 00:00:00 2001
From: "Paul A. Patience" 
Date: Tue, 28 Jun 2016 10:06:30 -0400
Subject: [PATCH 074/229] sched/semaphore: Fix setting EINVAL in sem_post() and
 sem_wait()

---
 sched/semaphore/sem_post.c | 5 +++++
 sched/semaphore/sem_wait.c | 8 +++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/sched/semaphore/sem_post.c b/sched/semaphore/sem_post.c
index 97235de428..c985ceb9c4 100644
--- a/sched/semaphore/sem_post.c
+++ b/sched/semaphore/sem_post.c
@@ -41,6 +41,7 @@
 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -157,6 +158,10 @@ int sem_post(FAR sem_t *sem)
 
       leave_critical_section(flags);
     }
+  else
+    {
+      set_errno(EINVAL);
+    }
 
   return ret;
 }
diff --git a/sched/semaphore/sem_wait.c b/sched/semaphore/sem_wait.c
index 86fb013696..49371e0ae6 100644
--- a/sched/semaphore/sem_wait.c
+++ b/sched/semaphore/sem_wait.c
@@ -86,9 +86,7 @@ int sem_wait(FAR sem_t *sem)
 
   DEBUGASSERT(up_interrupt_context() == false);
 
-  /* Assume any errors reported are due to invalid arguments. */
-
-  set_errno(EINVAL);
+  /* Make sure we were supplied with a valid semaphore. */
 
   if (sem)
     {
@@ -190,6 +188,10 @@ int sem_wait(FAR sem_t *sem)
 
       leave_critical_section(flags);
     }
+  else
+    {
+      set_errno(EINVAL);
+    }
 
   return ret;
 }
-- 
GitLab


From ed1f3aec618c70375e56dde86775ae2eec0819be Mon Sep 17 00:00:00 2001
From: Michael Spahlinger 
Date: Tue, 28 Jun 2016 08:23:41 -0600
Subject: [PATCH 075/229] Fixed build of SAMV71-XULT/nsh.  With the changes
 from 26f7b8c the build process of the default configuration did not succeed
 anymore.  This is fixed by this commit.

---
 arch/arm/src/samv7/sam_twihs.c    | 10 ++++++++--
 configs/samv71-xult/nsh/defconfig |  5 ++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/arch/arm/src/samv7/sam_twihs.c b/arch/arm/src/samv7/sam_twihs.c
index 032d2eaa4a..0488cdddf6 100644
--- a/arch/arm/src/samv7/sam_twihs.c
+++ b/arch/arm/src/samv7/sam_twihs.c
@@ -283,7 +283,7 @@ static const struct twi_attr_s g_twi2attr =
   .pid     = SAM_PID_TWIHS2,
   .irq     = SAM_IRQ_TWIHS2,
   .glitchfltr = CONFIG_SAMV7_TWIHS2_GLITCH_FILTER,
-#ifdef CONFIG_SAMV7_TWIHS0_SINGLE_MASTER
+#ifdef CONFIG_SAMV7_TWIHS2_SINGLE_MASTER
   .s_master = 1,
 #else
   .s_master = 0,
@@ -515,6 +515,7 @@ static int twi_wait(struct twi_dev_s *priv, unsigned int size)
    * all further interrupts for the TWIHS have been disabled.
    */
 
+#ifdef CONFIG_I2C_RESET
   /* Check if an Arbitration Lost has occured */
 
   if (priv->result == -EUSERS)
@@ -532,6 +533,7 @@ static int twi_wait(struct twi_dev_s *priv, unsigned int size)
           priv->result = -EIO;
        }
     }
+#endif
 
   return priv->result;
 }
@@ -646,6 +648,7 @@ static int twi_interrupt(struct twi_dev_s *priv)
         }
     }
 
+#ifdef CONFIG_I2C_RESET
   /* If Single-Master Mode is enabled and we lost arbitration (someone else or
    * an EMC-Pulse did something on the bus) something went very wrong. So we end
    * the current transfer with an EUSERS. The wait function will then reset
@@ -656,9 +659,10 @@ static int twi_interrupt(struct twi_dev_s *priv)
     {
       /* Wake up the thread with an Arbitration Lost error indication */
 
-      i2cllerr("ERROR: TWIHS%d Arbitration Lost\n");
+      i2cerr("ERROR: TWIHS%d Arbitration Lost\n");
       twi_wakeup(priv, -EUSERS);
     }
+#endif
 
   /* Check for errors.  We must check for errors *before* checking TXRDY or
    * TXCMP because the error can be signaled in combination with TXRDY or
@@ -945,6 +949,7 @@ static int twi_transfer(FAR struct i2c_master_s *dev,
 
   twi_setfrequency(priv, msgs->frequency);
 
+#ifdef CONFIG_I2C_RESET
   /* When we are in Single Master Mode check if the bus is ready (no stuck
    * DATA or CLK line).
    * Otherwise initiate a bus reset.
@@ -960,6 +965,7 @@ static int twi_transfer(FAR struct i2c_master_s *dev,
             goto errout;
         }
     }
+#endif
 
   /* Initiate the transfer.  The rest will be handled from interrupt
    * logic.  Interrupts must be disabled to prevent re-entrance from the
diff --git a/configs/samv71-xult/nsh/defconfig b/configs/samv71-xult/nsh/defconfig
index b7c95d30e7..7377f2fdf1 100644
--- a/configs/samv71-xult/nsh/defconfig
+++ b/configs/samv71-xult/nsh/defconfig
@@ -290,6 +290,8 @@ CONFIG_SAMV7_SDRAMSIZE=2097152
 # TWIHS device driver options
 #
 CONFIG_SAMV7_TWIHS0_FREQUENCY=100000
+CONFIG_SAMV7_TWIHS0_GLITCH_FILTER=0
+CONFIG_SAMV7_TWIHS0_SINGLE_MASTER=y
 
 #
 # HSMCI device driver options
@@ -515,12 +517,13 @@ CONFIG_DEV_NULL=y
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
 # CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
-# CONFIG_ARCH_HAVE_I2CRESET is not set
+CONFIG_ARCH_HAVE_I2CRESET=y
 CONFIG_I2C=y
 # CONFIG_I2C_SLAVE is not set
 # CONFIG_I2C_POLLED is not set
 # CONFIG_I2C_TRACE is not set
 CONFIG_I2C_DRIVER=y
+CONFIG_I2C_RESET=y
 CONFIG_SPI=y
 # CONFIG_SPI_SLAVE is not set
 CONFIG_SPI_EXCHANGE=y
-- 
GitLab


From 725a16d03320d9d01f60d311d1e761726e96f5e8 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 28 Jun 2016 09:10:15 -0600
Subject: [PATCH 076/229] Trivial fix to alignment

---
 arch/arm/src/tiva/tiva_serial.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arm/src/tiva/tiva_serial.c b/arch/arm/src/tiva/tiva_serial.c
index e131fbd5d6..fb80e9f326 100644
--- a/arch/arm/src/tiva/tiva_serial.c
+++ b/arch/arm/src/tiva/tiva_serial.c
@@ -305,13 +305,13 @@
 
 struct up_dev_s
 {
-  uint32_t uartbase; /* Base address of UART registers */
-  uint32_t baud;     /* Configured baud */
-  uint32_t im;       /* Saved IM value */
-  uint8_t  irq;      /* IRQ associated with this UART */
-  uint8_t  parity;   /* 0=none, 1=odd, 2=even */
-  uint8_t  bits;     /* Number of bits (7 or 8) */
-  bool    stopbits2; /* true: Configure with 2 stop bits instead of 1 */
+  uint32_t uartbase;  /* Base address of UART registers */
+  uint32_t baud;      /* Configured baud */
+  uint32_t im;        /* Saved IM value */
+  uint8_t  irq;       /* IRQ associated with this UART */
+  uint8_t  parity;    /* 0=none, 1=odd, 2=even */
+  uint8_t  bits;      /* Number of bits (7 or 8) */
+  bool     stopbits2; /* true: Configure with 2 stop bits instead of 1 */
 };
 
 /****************************************************************************
-- 
GitLab


From c74269ced6b455aabb6d95e93e3ad399b565e440 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 28 Jun 2016 09:37:21 -0600
Subject: [PATCH 077/229] Significantly stylistic changes required after review
 of last PR

---
 arch/arm/src/common/up_checkstack.c          |   5 +-
 arch/arm/src/stm32f7/Kconfig                 |  62 +--
 arch/arm/src/stm32f7/chip/stm32_rtcc.h       |   2 +-
 arch/arm/src/stm32f7/stm32_pwr.c             |   4 -
 configs/nucleo-144/src/nucleo-144.h          |   3 +-
 configs/nucleo-144/src/stm32_appinitialize.c |   3 +
 configs/nucleo-144/src/stm32_bbsram.c        | 523 ++++++++++---------
 7 files changed, 324 insertions(+), 278 deletions(-)

diff --git a/arch/arm/src/common/up_checkstack.c b/arch/arm/src/common/up_checkstack.c
index cce1a9874a..f6b4034cbc 100644
--- a/arch/arm/src/common/up_checkstack.c
+++ b/arch/arm/src/common/up_checkstack.c
@@ -88,7 +88,9 @@ static size_t do_stackcheck(uintptr_t alloc, size_t size)
     {
       return 0;
     }
+
   /* Get aligned addresses of the top and bottom of the stack */
+
 #ifdef CONFIG_TLS
   /* Skip over the TLS data structure at the bottom of the stack */
 
@@ -126,7 +128,8 @@ static size_t do_stackcheck(uintptr_t alloc, size_t size)
 #if 0
   if (mark + 16 > nwords)
     {
-      int i, j;
+      int i;
+      int j;
 
       ptr = (FAR uint32_t *)start;
       for (i = 0; i < size; i += 4*64)
diff --git a/arch/arm/src/stm32f7/Kconfig b/arch/arm/src/stm32f7/Kconfig
index 5bfa99ea07..d2de3faa59 100644
--- a/arch/arm/src/stm32f7/Kconfig
+++ b/arch/arm/src/stm32f7/Kconfig
@@ -1196,8 +1196,8 @@ config STM32F7_QUADSPI
 	default n
 
 config STM32F7_PWR
-    bool "PWR"
-    default n
+	bool "PWR"
+	default n
 
 config STM32F7_RNG
 	bool "RNG"
@@ -1801,57 +1801,57 @@ endmenu # "SDMMC2 Configuration"
 if STM32F7_BKPSRAM
 
 config STM32F7_BBSRAM
-    bool "BBSRAM File Support"
-    default n
+	bool "BBSRAM File Support"
+	default n
 
 config STM32F7_BBSRAM_FILES
-    int "Max Files to support in BBSRAM"
-    default 4
+	int "Max Files to support in BBSRAM"
+	default 4
 
 config STM32F7_SAVE_CRASHDUMP
-    bool "Enable Saving Panic to BBSRAM"
-    default n
+	bool "Enable Saving Panic to BBSRAM"
+	default n
 
 endif # STM32F7_BKPSRAM
 
 config STM32F7_HAVE_RTC_COUNTER
-    bool
-    default n
+	bool
+	default n
 
 config STM32F7_HAVE_RTC_SUBSECONDS
-    bool
-    default n
+	bool
+	default n
 
 config RTC_MAGIC_REG
-    int "The BKP register used to store/check the Magic value to determine if RTC is set already"
-    default 0
-    range  0 31
-    depends on RTC && !STM32F7_HAVE_RTC_COUNTER
+	int "The BKP register used to store/check the Magic value to determine if RTC is set already"
+	default 0
+	range  0 31
+	depends on RTC && !STM32F7_HAVE_RTC_COUNTER
 
 config RTC_MAGIC
-    hex "Value used as Magic to determine if RTC is set already"
-    default 0xfacefeee
-    depends on RTC && !STM32F7_HAVE_RTC_COUNTER
+	hex "Value used as Magic to determine if RTC is set already"
+	default 0xfacefeee
+	depends on RTC && !STM32F7_HAVE_RTC_COUNTER
 
 choice
-    prompt "RTC clock source"
-    default STM32F7_RTC_LSECLOCK
-    depends on RTC
+	prompt "RTC clock source"
+	default STM32F7_RTC_LSECLOCK
+	depends on RTC
 
 config STM32F7_RTC_HSECLOCK
-    bool "HSE clock"
-    ---help---
-        Drive the RTC with the HSE clock, divided down to 1MHz.
+	bool "HSE clock"
+	---help---
+		Drive the RTC with the HSE clock, divided down to 1MHz.
 
 config STM32F7_RTC_LSECLOCK
-    bool "LSE clock"
-    ---help---
-        Drive the RTC with the LSE clock
+	bool "LSE clock"
+	---help---
+		Drive the RTC with the LSE clock
 
 config STM32F7_RTC_LSICLOCK
-    bool "LSI clock"
-    ---help---
-        Drive the RTC with the LSI clock
+	bool "LSI clock"
+	---help---
+		Drive the RTC with the LSI clock
 
 endchoice #"RTC clock source"
 
diff --git a/arch/arm/src/stm32f7/chip/stm32_rtcc.h b/arch/arm/src/stm32f7/chip/stm32_rtcc.h
index 65d569ec05..262a48633c 100644
--- a/arch/arm/src/stm32f7/chip/stm32_rtcc.h
+++ b/arch/arm/src/stm32f7/chip/stm32_rtcc.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32f7/chip/stm32_rtcc.h.h
+ * arch/arm/src/stm32f7/chip/stm32_rtcc.h
  *
  *   Copyright (C) 2011-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
diff --git a/arch/arm/src/stm32f7/stm32_pwr.c b/arch/arm/src/stm32f7/stm32_pwr.c
index 5acbf3d48f..961eaf4380 100644
--- a/arch/arm/src/stm32f7/stm32_pwr.c
+++ b/arch/arm/src/stm32f7/stm32_pwr.c
@@ -52,10 +52,6 @@
 
 #if defined(CONFIG_STM32F7_PWR)
 
-/************************************************************************************
- * Pre-processor Definitions
- ************************************************************************************/
-
 /************************************************************************************
  * Private Functions
  ************************************************************************************/
diff --git a/configs/nucleo-144/src/nucleo-144.h b/configs/nucleo-144/src/nucleo-144.h
index 064f789cde..9b0e25cb4c 100644
--- a/configs/nucleo-144/src/nucleo-144.h
+++ b/configs/nucleo-144/src/nucleo-144.h
@@ -277,7 +277,6 @@ int stm32_sdio_initialize(void);
  *
  ************************************************************************************/
 
-
 #ifdef CONFIG_STM32F7_OTGFS
 void stm32_usbinitialize(void);
 #endif
@@ -285,8 +284,10 @@ void stm32_usbinitialize(void);
 /************************************************************************************
  * Name: stm32_bbsram_int
  ************************************************************************************/
+
 #ifdef CONFIG_STM32F7_BBSRAM
 int stm32_bbsram_int(void);
 #endif
+
 #endif /* __ASSEMBLY__ */
 #endif /* __CONFIGS_NUCLEO_144_SRC_NUCLEO_144_H */
diff --git a/configs/nucleo-144/src/stm32_appinitialize.c b/configs/nucleo-144/src/stm32_appinitialize.c
index 0a0c58a871..837048b5a1 100644
--- a/configs/nucleo-144/src/stm32_appinitialize.c
+++ b/configs/nucleo-144/src/stm32_appinitialize.c
@@ -101,7 +101,10 @@ int board_app_initialize(uintptr_t arg)
       syslog(LOG_ERR, "ERROR: userled_lower_initialize() failed: %d\n", ret);
     }
 #endif
+
 #ifdef CONFIG_STM32F7_BBSRAM
+  /* Initialize battery-backed RAM */
+
   (void)stm32_bbsram_int();
 #endif
 
diff --git a/configs/nucleo-144/src/stm32_bbsram.c b/configs/nucleo-144/src/stm32_bbsram.c
index 247df97933..22758d036e 100644
--- a/configs/nucleo-144/src/stm32_bbsram.c
+++ b/configs/nucleo-144/src/stm32_bbsram.c
@@ -64,186 +64,208 @@
 
 /* Configuration ********************************************************************/
 /* The path to the Battery Backed up SRAM */
+
 #define BBSRAM_PATH "/bbr"
 #define HARDFAULT_FILENO 3
 #define HARDFAULT_PATH "/bbr3"
+
 /* The sizes of the files to create (-1) use rest of BBSRAM memory */
-#define BSRAM_FILE_SIZES { \
-        256, \
-        256, \
-        1024, \
-        -1, \
-        0     \
-    }
+
+#define BSRAM_FILE_SIZES \
+  { \
+    256, \
+    256, \
+    1024, \
+    -1, \
+    0 \
+  }
 
 #define MAX_FILE_PATH_LENGTH 40
 #define CONFIG_ISTACK_SIZE 800
 #define CONFIG_USTACK_SIZE 800
 
 #define arraySize(a) (sizeof((a))/sizeof(a[0]))
+
 /************************************************************************************
  * Private Data
  ************************************************************************************/
+
 typedef uint32_t stack_word_t;
+
 /* Used for stack frame storage */
+
 typedef uint32_t stack_word_t;
 
 /* Stack related data */
 
-typedef struct {
-    uint32_t sp;
-    uint32_t top;
-    uint32_t size;
+typedef struct
+{
+  uint32_t sp;
+  uint32_t top;
+  uint32_t size;
 
-} _stack_s;
+} _stack_t;
 
-typedef struct {
-    _stack_s user;
+typedef struct
+{
+  _stack_t user;
 #if CONFIG_ARCH_INTERRUPTSTACK > 3
-    _stack_s interrupt;
+  _stack_t interrupt;
 #endif
-
 } stack_t;
 
 /* Not Used for reference only */
 
-typedef struct {
-    uint32_t r0;
-    uint32_t r1;
-    uint32_t r2;
-    uint32_t r3;
-    uint32_t r4;
-    uint32_t r5;
-    uint32_t r6;
-    uint32_t r7;
-    uint32_t r8;
-    uint32_t r9;
-    uint32_t r10;
-    uint32_t r11;
-    uint32_t r12;
-    uint32_t sp;
-    uint32_t lr;
-    uint32_t pc;
-    uint32_t xpsr;
-    uint32_t d0;
-    uint32_t d1;
-    uint32_t d2;
-    uint32_t d3;
-    uint32_t d4;
-    uint32_t d5;
-    uint32_t d6;
-    uint32_t d7;
-    uint32_t d8;
-    uint32_t d9;
-    uint32_t d10;
-    uint32_t d11;
-    uint32_t d12;
-    uint32_t d13;
-    uint32_t d14;
-    uint32_t d15;
-    uint32_t fpscr;
-    uint32_t sp_main;
-    uint32_t sp_process;
-    uint32_t apsr;
-    uint32_t ipsr;
-    uint32_t epsr;
-    uint32_t primask;
-    uint32_t basepri;
-    uint32_t faultmask;
-    uint32_t control;
-    uint32_t s0;
-    uint32_t s1;
-    uint32_t s2;
-    uint32_t s3;
-    uint32_t s4;
-    uint32_t s5;
-    uint32_t s6;
-    uint32_t s7;
-    uint32_t s8;
-    uint32_t s9;
-    uint32_t s10;
-    uint32_t s11;
-    uint32_t s12;
-    uint32_t s13;
-    uint32_t s14;
-    uint32_t s15;
-    uint32_t s16;
-    uint32_t s17;
-    uint32_t s18;
-    uint32_t s19;
-    uint32_t s20;
-    uint32_t s21;
-    uint32_t s22;
-    uint32_t s23;
-    uint32_t s24;
-    uint32_t s25;
-    uint32_t s26;
-    uint32_t s27;
-    uint32_t s28;
-    uint32_t s29;
-    uint32_t s30;
-    uint32_t s31;
-} proc_regs_s;
-
+typedef struct
+{
+  uint32_t r0;
+  uint32_t r1;
+  uint32_t r2;
+  uint32_t r3;
+  uint32_t r4;
+  uint32_t r5;
+  uint32_t r6;
+  uint32_t r7;
+  uint32_t r8;
+  uint32_t r9;
+  uint32_t r10;
+  uint32_t r11;
+  uint32_t r12;
+  uint32_t sp;
+  uint32_t lr;
+  uint32_t pc;
+  uint32_t xpsr;
+  uint32_t d0;
+  uint32_t d1;
+  uint32_t d2;
+  uint32_t d3;
+  uint32_t d4;
+  uint32_t d5;
+  uint32_t d6;
+  uint32_t d7;
+  uint32_t d8;
+  uint32_t d9;
+  uint32_t d10;
+  uint32_t d11;
+  uint32_t d12;
+  uint32_t d13;
+  uint32_t d14;
+  uint32_t d15;
+  uint32_t fpscr;
+  uint32_t sp_main;
+  uint32_t sp_process;
+  uint32_t apsr;
+  uint32_t ipsr;
+  uint32_t epsr;
+  uint32_t primask;
+  uint32_t basepri;
+  uint32_t faultmask;
+  uint32_t control;
+  uint32_t s0;
+  uint32_t s1;
+  uint32_t s2;
+  uint32_t s3;
+  uint32_t s4;
+  uint32_t s5;
+  uint32_t s6;
+  uint32_t s7;
+  uint32_t s8;
+  uint32_t s9;
+  uint32_t s10;
+  uint32_t s11;
+  uint32_t s12;
+  uint32_t s13;
+  uint32_t s14;
+  uint32_t s15;
+  uint32_t s16;
+  uint32_t s17;
+  uint32_t s18;
+  uint32_t s19;
+  uint32_t s20;
+  uint32_t s21;
+  uint32_t s22;
+  uint32_t s23;
+  uint32_t s24;
+  uint32_t s25;
+  uint32_t s26;
+  uint32_t s27;
+  uint32_t s28;
+  uint32_t s29;
+  uint32_t s30;
+  uint32_t s31;
+} proc_regs_t;
 
 /* Flags to identify what is in the dump */
-typedef enum {
-    eRegsPresent          = 0x01,
-    eUserStackPresent     = 0x02,
-    eIntStackPresent      = 0x04,
-    eInvalidUserStackPtr  = 0x20,
-    eInvalidIntStackPrt   = 0x40,
+
+typedef enum
+{
+  eRegsPresent          = 0x01,
+  eUserStackPresent     = 0x02,
+  eIntStackPresent      = 0x04,
+  eInvalidUserStackPtr  = 0x20,
+  eInvalidIntStackPrt   = 0x40,
 } fault_flags_t;
 
-typedef struct {
-    fault_flags_t         flags;                  /* What is in the dump */
-    uintptr_t             current_regs;           /* Used to validate the dump */
-    int                   lineno;                 /* __LINE__ to up_assert */
-    int                   pid;                    /* Process ID */
-    uint32_t              regs[XCPTCONTEXT_REGS]; /* Interrupt register save
-                                             * area */
-    stack_t               stacks;                 /* Stack info */
+typedef struct
+{
+  fault_flags_t flags;                  /* What is in the dump */
+  uintptr_t     current_regs;           /* Used to validate the dump */
+  int           lineno;                 /* __LINE__ to up_assert */
+  int           pid;                    /* Process ID */
+  uint32_t      regs[XCPTCONTEXT_REGS]; /* Interrupt register save area */
+  stack_t       stacks;                 /* Stack info */
 #if CONFIG_TASK_NAME_SIZE > 0
-    char                  name[CONFIG_TASK_NAME_SIZE + 1]; /* Task name (with NULL
-                                                    * terminator) */
+  char          name[CONFIG_TASK_NAME_SIZE + 1]; /* Task name (with NULL
+                                                  * terminator) */
 #endif
-    char                  filename[MAX_FILE_PATH_LENGTH]; /* the Last of chars in
+  char          filename[MAX_FILE_PATH_LENGTH];  /* the Last of chars in
                                                   * __FILE__ to up_assert */
-} info_s;
-
-typedef struct {
-    info_s    info;                       /* The info */
-#if CONFIG_ARCH_INTERRUPTSTACK > 3      /* The amount of stack data is compile time
-                                     * sized backed on what is left after the
-                                     * other BBSRAM files are defined
-                                     * The order is such that only the
-                                     * ustack should be truncated
-                                     */
-    stack_word_t istack[CONFIG_USTACK_SIZE];
+} info_t;
+
+typedef struct
+{
+  info_t    info;                  /* The info */
+#if CONFIG_ARCH_INTERRUPTSTACK > 3 /* The amount of stack data is compile time
+                                    * sized backed on what is left after the
+                                    * other BBSRAM files are defined
+                                    * The order is such that only the
+                                    * ustack should be truncated
+                                    */
+  stack_word_t istack[CONFIG_USTACK_SIZE];
 #endif
-    stack_word_t ustack[CONFIG_ISTACK_SIZE];
-} fullcontext_s;
+  stack_word_t ustack[CONFIG_ISTACK_SIZE];
+} fullcontext_t;
+
+/************************************************************************************
+ * Private Data
+ ************************************************************************************/
+
+static uint8_t sdata[STM32F7_BBSRAM_SIZE];
 
 /************************************************************************************
  * Private Functions
  ************************************************************************************/
-/****************************************************************************
- * hardfault_get_desc
- ****************************************************************************/
+
+/************************************************************************************
+ * Name: hardfault_get_desc
+ ************************************************************************************/
+
 static int hardfault_get_desc(struct bbsramd_s *desc)
 {
   int ret = -ENOENT;
   int fd = open(HARDFAULT_PATH, O_RDONLY);
+  int rv;
 
   if (fd < 0)
     {
-      syslog(LOG_INFO, "stm32 bbsram: Failed to open Fault Log file [%s] (%d)\n", HARDFAULT_PATH, fd);
-
+      syslog(LOG_INFO, "stm32 bbsram: Failed to open Fault Log file [%s] (%d)\n",
+             HARDFAULT_PATH, fd);
     }
   else
     {
       ret = -EIO;
-      int rv = ioctl(fd, STM32F7_BBSRAM_GETDESC_IOCTL, (unsigned long)((uintptr_t)desc));
+      rv  = ioctl(fd, STM32F7_BBSRAM_GETDESC_IOCTL,
+                 (unsigned long)((uintptr_t)desc));
 
       if (rv >= 0)
         {
@@ -251,34 +273,50 @@ static int hardfault_get_desc(struct bbsramd_s *desc)
         }
       else
         {
-            syslog(LOG_INFO, "stm32 bbsram: Failed to get Fault Log descriptor (%d)\n", rv);
+          syslog(LOG_INFO, "stm32 bbsram: Failed to get Fault Log descriptor (%d)\n",
+                 rv);
         }
-  }
+    }
+
   return ret;
 }
 
 /************************************************************************************
- * Public Functions
+ * Name: copy_reverse
  ************************************************************************************/
-int stm32_bbsram_int(void)
+
+#if defined(CONFIG_STM32F7_SAVE_CRASHDUMP)
+static void copy_reverse(stack_word_t *dest, stack_word_t *src, int size)
 {
+  while (size--)
+    {
+      *dest++ = *src--;
+    }
+}
 
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
 
-  /* Using Battery Backed Up SRAM */
+/************************************************************************************
+ * Name: stm32_bbsram_int
+ ************************************************************************************/
 
+int stm32_bbsram_int(void)
+{
   int filesizes[CONFIG_STM32F7_BBSRAM_FILES + 1] = BSRAM_FILE_SIZES;
-  int rv;
   struct bbsramd_s desc;
+  int rv;
+
+  /* Using Battery Backed Up SRAM */
+
   stm32_bbsraminitialize(BBSRAM_PATH, filesizes);
 
 #if defined(CONFIG_STM32F7_SAVE_CRASHDUMP)
-
   /* Panic Logging in Battery Backed Up Files */
+  /* Do we have an hard fault in BBSRAM? */
 
-  /* Do we have an hard fault in BBSRAM?
-   */
   rv = hardfault_get_desc(&desc);
-
   if (rv >= OK)
     {
       printf("There is a hard fault logged.\n");
@@ -287,162 +325,167 @@ int stm32_bbsram_int(void)
       if (rv < 0)
         {
           syslog(LOG_INFO, "stm32 bbsram: Failed to unlink Fault Log file [%s] (%d)\n", HARDFAULT_PATH, rv);
-
         }
-
     }
-#endif // CONFIG_STM32_SAVE_CRASHDUMP
+#endif /* CONFIG_STM32_SAVE_CRASHDUMP */
+
   return rv;
 }
 
-#if defined(CONFIG_STM32F7_SAVE_CRASHDUMP)
-static void copy_reverse(stack_word_t *dest, stack_word_t *src, int size)
-{
-  while (size--)
-    {
-      *dest++ = *src--;
-    }
-}
-uint8_t sdata[STM32F7_BBSRAM_SIZE];
-void board_crashdump(uintptr_t currentsp, FAR void *tcb, FAR const uint8_t *filename, int lineno)
-{
-    fullcontext_s *pdump = (fullcontext_s *)&sdata;
+/************************************************************************************
+ * Name: board_crashdump
+ ************************************************************************************/
 
-    (void)enter_critical_section();
+void board_crashdump(uintptr_t currentsp, FAR void *tcb,
+                     FAR const uint8_t *filename, int lineno)
+{
+  fullcontext_t *pdump = (fullcontext_t *)&sdata;
+  FAR struct tcb_s *rtcb;
+  int rv;
 
-    struct tcb_s *rtcb = (struct tcb_s *)tcb;
+  (void)enter_critical_section();
 
-    /* Zero out everything */
+  rtcb = (FAR struct tcb_s *)tcb;
 
-    memset(pdump, 0, sizeof(fullcontext_s));
+  /* Zero out everything */
 
-    /* Save Info */
+  memset(pdump, 0, sizeof(fullcontext_t));
 
-    pdump->info.lineno = lineno;
+  /* Save Info */
 
-    if (filename) {
+  pdump->info.lineno = lineno;
 
-        int offset = 0;
-        unsigned int len = strlen((char *)filename) + 1;
+  if (filename)
+    {
+      int offset = 0;
+      unsigned int len = strlen((char *)filename) + 1;
 
-        if (len > sizeof(pdump->info.filename)) {
-            offset = len - sizeof(pdump->info.filename) ;
+      if (len > sizeof(pdump->info.filename))
+        {
+          offset = len - sizeof(pdump->info.filename);
         }
 
-        strncpy(pdump->info.filename, (char *)&filename[offset], sizeof(pdump->info.filename));
+      strncpy(pdump->info.filename, (char *)&filename[offset],
+              sizeof(pdump->info.filename));
     }
 
-    /* Save the value of the pointer for current_regs as debugging info.
-     * It should be NULL in case of an ASSERT and will aid in cross
-     * checking the validity of system memory at the time of the
-     * fault.
-     */
-
-    pdump->info.current_regs = (uintptr_t) CURRENT_REGS;
+  /* Save the value of the pointer for current_regs as debugging info.
+   * It should be NULL in case of an ASSERT and will aid in cross
+   * checking the validity of system memory at the time of the
+   * fault.
+   */
 
-    /* Save Context */
+  pdump->info.current_regs = (uintptr_t) CURRENT_REGS;
 
+  /* Save Context */
 
 #if CONFIG_TASK_NAME_SIZE > 0
-    strncpy(pdump->info.name, rtcb->name, CONFIG_TASK_NAME_SIZE);
+  strncpy(pdump->info.name, rtcb->name, CONFIG_TASK_NAME_SIZE);
 #endif
 
-    pdump->info.pid = rtcb->pid;
-
-
-    /* If  current_regs is not NULL then we are in an interrupt context
-     * and the user context is in current_regs else we are running in
-     * the users context
-     */
+  pdump->info.pid = rtcb->pid;
 
-    if (CURRENT_REGS) {
-        pdump->info.stacks.interrupt.sp = currentsp;
-
-        pdump->info.flags |= (eRegsPresent | eUserStackPresent | eIntStackPresent);
-        memcpy(pdump->info.regs, (void *)CURRENT_REGS, sizeof(pdump->info.regs));
-        pdump->info.stacks.user.sp = pdump->info.regs[REG_R13];
-
-    } else {
-
-        /* users context */
-        pdump->info.flags |= eUserStackPresent;
+  /* If  current_regs is not NULL then we are in an interrupt context
+   * and the user context is in current_regs else we are running in
+   * the users context
+   */
 
-        pdump->info.stacks.user.sp = currentsp;
+  if (CURRENT_REGS)
+    {
+      pdump->info.stacks.interrupt.sp = currentsp;
+      pdump->info.flags |= (eRegsPresent | eUserStackPresent | eIntStackPresent);
+      memcpy(pdump->info.regs, (void *)CURRENT_REGS, sizeof(pdump->info.regs));
+      pdump->info.stacks.user.sp = pdump->info.regs[REG_R13];
     }
+  else
+    {
+      /* users context */
 
-    if (pdump->info.pid == 0) {
-
-        pdump->info.stacks.user.top = g_idle_topstack - 4;
-        pdump->info.stacks.user.size = CONFIG_IDLETHREAD_STACKSIZE;
+      pdump->info.flags |= eUserStackPresent;
+      pdump->info.stacks.user.sp = currentsp;
+    }
 
-    } else {
-        pdump->info.stacks.user.top = (uint32_t) rtcb->adj_stack_ptr;
-        pdump->info.stacks.user.size = (uint32_t) rtcb->adj_stack_size;;
+  if (pdump->info.pid == 0)
+    {
+      pdump->info.stacks.user.top = g_idle_topstack - 4;
+      pdump->info.stacks.user.size = CONFIG_IDLETHREAD_STACKSIZE;
+    }
+  else
+    {
+      pdump->info.stacks.user.top = (uint32_t) rtcb->adj_stack_ptr;
+      pdump->info.stacks.user.size = (uint32_t) rtcb->adj_stack_size;;
     }
 
 #if CONFIG_ARCH_INTERRUPTSTACK > 3
+  /* Get the limits on the interrupt stack memory */
 
-    /* Get the limits on the interrupt stack memory */
-
-    pdump->info.stacks.interrupt.top = (uint32_t)&g_intstackbase;
-    pdump->info.stacks.interrupt.size  = (CONFIG_ARCH_INTERRUPTSTACK & ~3);
+  pdump->info.stacks.interrupt.top = (uint32_t)&g_intstackbase;
+  pdump->info.stacks.interrupt.size  = (CONFIG_ARCH_INTERRUPTSTACK & ~3);
 
-    /* If In interrupt Context save the interrupt stack data centered
-     * about the interrupt stack pointer
-     */
+  /* If In interrupt Context save the interrupt stack data centered
+   * about the interrupt stack pointer
+   */
 
-    if ((pdump->info.flags & eIntStackPresent) != 0) {
-        stack_word_t *ps = (stack_word_t *) pdump->info.stacks.interrupt.sp;
-        copy_reverse(pdump->istack, &ps[arraySize(pdump->istack) / 2], arraySize(pdump->istack));
+  if ((pdump->info.flags & eIntStackPresent) != 0)
+    {
+      stack_word_t *ps = (stack_word_t *) pdump->info.stacks.interrupt.sp;
+      copy_reverse(pdump->istack, &ps[arraySize(pdump->istack) / 2], arraySize(pdump->istack));
     }
 
-    /* Is it Invalid? */
+  /* Is it Invalid? */
 
-    if (!(pdump->info.stacks.interrupt.sp <= pdump->info.stacks.interrupt.top &&
-          pdump->info.stacks.interrupt.sp > pdump->info.stacks.interrupt.top - pdump->info.stacks.interrupt.size)) {
-        pdump->info.flags |= eInvalidIntStackPrt;
+  if (!(pdump->info.stacks.interrupt.sp <= pdump->info.stacks.interrupt.top &&
+        pdump->info.stacks.interrupt.sp > pdump->info.stacks.interrupt.top -
+          pdump->info.stacks.interrupt.size))
+    {
+      pdump->info.flags |= eInvalidIntStackPrt;
     }
 
 #endif
+  /* If In interrupt context or User save the user stack data centered
+   * about the user stack pointer
+   */
 
-    /* If In interrupt context or User save the user stack data centered
-     * about the user stack pointer
-     */
-    if ((pdump->info.flags & eUserStackPresent) != 0) {
-        stack_word_t *ps = (stack_word_t *) pdump->info.stacks.user.sp;
-        copy_reverse(pdump->ustack, &ps[arraySize(pdump->ustack) / 2], arraySize(pdump->ustack));
+  if ((pdump->info.flags & eUserStackPresent) != 0)
+    {
+      stack_word_t *ps = (stack_word_t *) pdump->info.stacks.user.sp;
+      copy_reverse(pdump->ustack, &ps[arraySize(pdump->ustack) / 2],
+                   arraySize(pdump->ustack));
     }
 
-    /* Is it Invalid? */
+  /* Is it Invalid? */
 
-    if (!(pdump->info.stacks.user.sp <= pdump->info.stacks.user.top &&
-          pdump->info.stacks.user.sp > pdump->info.stacks.user.top - pdump->info.stacks.user.size)) {
-        pdump->info.flags |= eInvalidUserStackPtr;
+  if (!(pdump->info.stacks.user.sp <= pdump->info.stacks.user.top &&
+        pdump->info.stacks.user.sp > pdump->info.stacks.user.top -
+          pdump->info.stacks.user.size))
+    {
+      pdump->info.flags |= eInvalidUserStackPtr;
     }
 
-    int rv = stm32_bbsram_savepanic(HARDFAULT_FILENO, (uint8_t *)pdump, sizeof(fullcontext_s));
+  rv = stm32_bbsram_savepanic(HARDFAULT_FILENO, (uint8_t *)pdump, sizeof(fullcontext_t));
 
-    /* Test if memory got wiped because of using _sdata */
+  /* Test if memory got wiped because of using _sdata */
 
-    if (rv == -ENXIO) {
-        char *dead = "Memory wiped - dump not saved!";
+  if (rv == -ENXIO)
+    {
+      char *dead = "Memory wiped - dump not saved!";
 
-        while (*dead) {
-            up_lowputc(*dead++);
+      while (*dead)
+        {
+          up_lowputc(*dead++);
         }
-
-    } else if (rv == -ENOSPC) {
-
-        /* hard fault again */
-
-        up_lowputc('!');
     }
+  else if (rv == -ENOSPC)
+    {
+      /* hard fault again */
 
+      up_lowputc('!');
+    }
 
 #if defined(CONFIG_BOARD_RESET_ON_CRASH)
-    up_systemreset();
+  up_systemreset();
 #endif
 }
-#endif // CONFIG_STM32_SAVE_CRASHDUMP
+#endif /* CONFIG_STM32_SAVE_CRASHDUMP */
 
 #endif /* CONFIG_STM32_BBSRAM */
-- 
GitLab


From 14a8bbbf22d5460ddc9b6fd484a02467d79e470c Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 28 Jun 2016 09:59:45 -0600
Subject: [PATCH 078/229] Fix some conditional compilation that got hosed in
 last changes for review of PR

---
 configs/nucleo-144/src/stm32_bbsram.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/configs/nucleo-144/src/stm32_bbsram.c b/configs/nucleo-144/src/stm32_bbsram.c
index 22758d036e..ff0d075620 100644
--- a/configs/nucleo-144/src/stm32_bbsram.c
+++ b/configs/nucleo-144/src/stm32_bbsram.c
@@ -293,6 +293,7 @@ static void copy_reverse(stack_word_t *dest, stack_word_t *src, int size)
       *dest++ = *src--;
     }
 }
+#endif /* CONFIG_STM32F7_SAVE_CRASHDUMP */
 
 /************************************************************************************
  * Public Functions
@@ -327,7 +328,7 @@ int stm32_bbsram_int(void)
           syslog(LOG_INFO, "stm32 bbsram: Failed to unlink Fault Log file [%s] (%d)\n", HARDFAULT_PATH, rv);
         }
     }
-#endif /* CONFIG_STM32_SAVE_CRASHDUMP */
+#endif /* CONFIG_STM32F7_SAVE_CRASHDUMP */
 
   return rv;
 }
@@ -336,6 +337,7 @@ int stm32_bbsram_int(void)
  * Name: board_crashdump
  ************************************************************************************/
 
+#if defined(CONFIG_STM32F7_SAVE_CRASHDUMP)
 void board_crashdump(uintptr_t currentsp, FAR void *tcb,
                      FAR const uint8_t *filename, int lineno)
 {
@@ -486,6 +488,6 @@ void board_crashdump(uintptr_t currentsp, FAR void *tcb,
   up_systemreset();
 #endif
 }
-#endif /* CONFIG_STM32_SAVE_CRASHDUMP */
+#endif /* CONFIG_STM32F7_SAVE_CRASHDUMP */
 
 #endif /* CONFIG_STM32_BBSRAM */
-- 
GitLab


From f14ff4c4a1de4597efce7ee76365fc7daf8f3fff Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 28 Jun 2016 10:06:47 -0600
Subject: [PATCH 079/229] A few naming changes to get code from last PR to
 conform to NuttX naming standard

---
 configs/nucleo-144/src/stm32_bbsram.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/configs/nucleo-144/src/stm32_bbsram.c b/configs/nucleo-144/src/stm32_bbsram.c
index ff0d075620..a93a6c9bd3 100644
--- a/configs/nucleo-144/src/stm32_bbsram.c
+++ b/configs/nucleo-144/src/stm32_bbsram.c
@@ -199,11 +199,11 @@ typedef struct
 
 typedef enum
 {
-  eRegsPresent          = 0x01,
-  eUserStackPresent     = 0x02,
-  eIntStackPresent      = 0x04,
-  eInvalidUserStackPtr  = 0x20,
-  eInvalidIntStackPrt   = 0x40,
+  REGS_PRESENT          = 0x01,
+  USERSTACK_PRESENT     = 0x02,
+  INTSTACK_PRESENT      = 0x04,
+  INVALID_USERSTACK_PTR = 0x20,
+  INVALID_INTSTACK_PTR  = 0x40,
 } fault_flags_t;
 
 typedef struct
@@ -240,7 +240,7 @@ typedef struct
  * Private Data
  ************************************************************************************/
 
-static uint8_t sdata[STM32F7_BBSRAM_SIZE];
+static uint8_t g_sdata[STM32F7_BBSRAM_SIZE];
 
 /************************************************************************************
  * Private Functions
@@ -341,7 +341,7 @@ int stm32_bbsram_int(void)
 void board_crashdump(uintptr_t currentsp, FAR void *tcb,
                      FAR const uint8_t *filename, int lineno)
 {
-  fullcontext_t *pdump = (fullcontext_t *)&sdata;
+  fullcontext_t *pdump = (fullcontext_t *)&g_sdata;
   FAR struct tcb_s *rtcb;
   int rv;
 
@@ -395,7 +395,7 @@ void board_crashdump(uintptr_t currentsp, FAR void *tcb,
   if (CURRENT_REGS)
     {
       pdump->info.stacks.interrupt.sp = currentsp;
-      pdump->info.flags |= (eRegsPresent | eUserStackPresent | eIntStackPresent);
+      pdump->info.flags |= (REGS_PRESENT | USERSTACK_PRESENT | INTSTACK_PRESENT);
       memcpy(pdump->info.regs, (void *)CURRENT_REGS, sizeof(pdump->info.regs));
       pdump->info.stacks.user.sp = pdump->info.regs[REG_R13];
     }
@@ -403,7 +403,7 @@ void board_crashdump(uintptr_t currentsp, FAR void *tcb,
     {
       /* users context */
 
-      pdump->info.flags |= eUserStackPresent;
+      pdump->info.flags |= USERSTACK_PRESENT;
       pdump->info.stacks.user.sp = currentsp;
     }
 
@@ -428,7 +428,7 @@ void board_crashdump(uintptr_t currentsp, FAR void *tcb,
    * about the interrupt stack pointer
    */
 
-  if ((pdump->info.flags & eIntStackPresent) != 0)
+  if ((pdump->info.flags & INTSTACK_PRESENT) != 0)
     {
       stack_word_t *ps = (stack_word_t *) pdump->info.stacks.interrupt.sp;
       copy_reverse(pdump->istack, &ps[arraySize(pdump->istack) / 2], arraySize(pdump->istack));
@@ -440,7 +440,7 @@ void board_crashdump(uintptr_t currentsp, FAR void *tcb,
         pdump->info.stacks.interrupt.sp > pdump->info.stacks.interrupt.top -
           pdump->info.stacks.interrupt.size))
     {
-      pdump->info.flags |= eInvalidIntStackPrt;
+      pdump->info.flags |= INVALID_INTSTACK_PTR;
     }
 
 #endif
@@ -448,7 +448,7 @@ void board_crashdump(uintptr_t currentsp, FAR void *tcb,
    * about the user stack pointer
    */
 
-  if ((pdump->info.flags & eUserStackPresent) != 0)
+  if ((pdump->info.flags & USERSTACK_PRESENT) != 0)
     {
       stack_word_t *ps = (stack_word_t *) pdump->info.stacks.user.sp;
       copy_reverse(pdump->ustack, &ps[arraySize(pdump->ustack) / 2],
@@ -461,7 +461,7 @@ void board_crashdump(uintptr_t currentsp, FAR void *tcb,
         pdump->info.stacks.user.sp > pdump->info.stacks.user.top -
           pdump->info.stacks.user.size))
     {
-      pdump->info.flags |= eInvalidUserStackPtr;
+      pdump->info.flags |= INVALID_USERSTACK_PTR;
     }
 
   rv = stm32_bbsram_savepanic(HARDFAULT_FILENO, (uint8_t *)pdump, sizeof(fullcontext_t));
-- 
GitLab


From 3ddecd460dd33b8f055a557d5b40d877d31d7994 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 28 Jun 2016 10:10:26 -0600
Subject: [PATCH 080/229] More name changes to conform with NuttX naming
 standard: No CamelCase names.

---
 configs/nucleo-144/src/stm32_autoleds.c |  4 ++--
 configs/nucleo-144/src/stm32_bbsram.c   |  8 ++++----
 configs/nucleo-144/src/stm32_spi.c      | 10 +++++-----
 configs/nucleo-144/src/stm32_userleds.c |  8 ++++----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/configs/nucleo-144/src/stm32_autoleds.c b/configs/nucleo-144/src/stm32_autoleds.c
index 64c3cccb8c..cf44384630 100644
--- a/configs/nucleo-144/src/stm32_autoleds.c
+++ b/configs/nucleo-144/src/stm32_autoleds.c
@@ -54,7 +54,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-#define ArraySize(x) (sizeof((x)) / sizeof((x)[0]))
+#define ARRAYSIZE(x) (sizeof((x)) / sizeof((x)[0]))
 
 /****************************************************************************
  * Private Data
@@ -96,7 +96,7 @@ void board_autoled_initialize(void)
 
   /* Configure the LD1 GPIO for output. Initial state is OFF */
 
-  for (i = 0; i < ArraySize(g_ledmap); i++)
+  for (i = 0; i < ARRAYSIZE(g_ledmap); i++)
     {
       stm32_configgpio(g_ledmap[i]);
     }
diff --git a/configs/nucleo-144/src/stm32_bbsram.c b/configs/nucleo-144/src/stm32_bbsram.c
index a93a6c9bd3..fd141970ac 100644
--- a/configs/nucleo-144/src/stm32_bbsram.c
+++ b/configs/nucleo-144/src/stm32_bbsram.c
@@ -84,7 +84,7 @@
 #define CONFIG_ISTACK_SIZE 800
 #define CONFIG_USTACK_SIZE 800
 
-#define arraySize(a) (sizeof((a))/sizeof(a[0]))
+#define ARRAYSIZE(a) (sizeof((a))/sizeof(a[0]))
 
 /************************************************************************************
  * Private Data
@@ -431,7 +431,7 @@ void board_crashdump(uintptr_t currentsp, FAR void *tcb,
   if ((pdump->info.flags & INTSTACK_PRESENT) != 0)
     {
       stack_word_t *ps = (stack_word_t *) pdump->info.stacks.interrupt.sp;
-      copy_reverse(pdump->istack, &ps[arraySize(pdump->istack) / 2], arraySize(pdump->istack));
+      copy_reverse(pdump->istack, &ps[ARRAYSIZE(pdump->istack) / 2], ARRAYSIZE(pdump->istack));
     }
 
   /* Is it Invalid? */
@@ -451,8 +451,8 @@ void board_crashdump(uintptr_t currentsp, FAR void *tcb,
   if ((pdump->info.flags & USERSTACK_PRESENT) != 0)
     {
       stack_word_t *ps = (stack_word_t *) pdump->info.stacks.user.sp;
-      copy_reverse(pdump->ustack, &ps[arraySize(pdump->ustack) / 2],
-                   arraySize(pdump->ustack));
+      copy_reverse(pdump->ustack, &ps[ARRAYSIZE(pdump->ustack) / 2],
+                   ARRAYSIZE(pdump->ustack));
     }
 
   /* Is it Invalid? */
diff --git a/configs/nucleo-144/src/stm32_spi.c b/configs/nucleo-144/src/stm32_spi.c
index 9a1f28a94e..61dab7a51e 100644
--- a/configs/nucleo-144/src/stm32_spi.c
+++ b/configs/nucleo-144/src/stm32_spi.c
@@ -61,7 +61,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-#define ArraySize(x) (sizeof((x)) / sizeof((x)[0]))
+#define ARRAYSIZE(x) (sizeof((x)) / sizeof((x)[0]))
 
 #if defined(CONFIG_NUCLEO_SPI1_TEST)
 #  if defined(CONFIG_NUCLEO_SPI1_TEST_MODE0)
@@ -181,7 +181,7 @@ void weak_function stm32_spidev_initialize(void)
 
   /* Configure SPI CS GPIO for output */
 
-  for (i = 0; i < ArraySize(g_spigpio); i++)
+  for (i = 0; i < ARRAYSIZE(g_spigpio); i++)
     {
       stm32_configgpio(g_spigpio[i]);
     }
@@ -390,7 +390,7 @@ int stm32_spidev_bus_test(void)
   SPI_SETFREQUENCY(spi1, CONFIG_NUCLEO_SPI1_TEST_FREQ);
   SPI_SETBITS(spi1, CONFIG_NUCLEO_SPI1_TEST_BITS);
   SPI_SETMODE(spi1, CONFIG_NUCLEO_SPI1_TEST_MODE);
-  SPI_EXCHANGE(spi1, tx, NULL, ArraySize(CONFIG_NUCLEO_SPI_TEST_MESSAGE));
+  SPI_EXCHANGE(spi1, tx, NULL, ARRAYSIZE(CONFIG_NUCLEO_SPI_TEST_MESSAGE));
 #endif
 
 #if defined(CONFIG_NUCLEO_SPI2_TEST)
@@ -407,7 +407,7 @@ int stm32_spidev_bus_test(void)
   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));
+  SPI_EXCHANGE(spi2, tx, NULL, ARRAYSIZE(CONFIG_NUCLEO_SPI_TEST_MESSAGE));
 #endif
 
 #if defined(CONFIG_NUCLEO_SPI3_TEST)
@@ -424,7 +424,7 @@ int stm32_spidev_bus_test(void)
   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));
+  SPI_EXCHANGE(spi3, tx, NULL, ARRAYSIZE(CONFIG_NUCLEO_SPI_TEST_MESSAGE));
 #endif
 
   return OK;
diff --git a/configs/nucleo-144/src/stm32_userleds.c b/configs/nucleo-144/src/stm32_userleds.c
index a5dfaea3e7..53e8f809db 100644
--- a/configs/nucleo-144/src/stm32_userleds.c
+++ b/configs/nucleo-144/src/stm32_userleds.c
@@ -56,7 +56,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-#define ArraySize(x) (sizeof((x)) / sizeof((x)[0]))
+#define ARRAYSIZE(x) (sizeof((x)) / sizeof((x)[0]))
 
 /****************************************************************************
  * Private Data
@@ -94,7 +94,7 @@ void board_userled_initialize(void)
 
   /* Configure LED1-3 GPIOs for output */
 
-  for (i = 0; i < ArraySize(g_ledcfg); i++)
+  for (i = 0; i < ARRAYSIZE(g_ledcfg); i++)
     {
       stm32_configgpio(g_ledcfg[i]);
     }
@@ -112,7 +112,7 @@ void board_userled_initialize(void)
 
 void board_userled(int led, bool ledon)
 {
-  if ((unsigned)led < ArraySize(g_ledcfg))
+  if ((unsigned)led < ARRAYSIZE(g_ledcfg))
     {
       stm32_gpiowrite(g_ledcfg[led], ledon);
     }
@@ -135,7 +135,7 @@ void board_userled_all(uint8_t ledset)
 
   /* Configure LED1-3 GPIOs for output */
 
-  for (i = 0; i < ArraySize(g_ledcfg); i++)
+  for (i = 0; i < ARRAYSIZE(g_ledcfg); i++)
     {
       stm32_gpiowrite(g_ledcfg[i], (ledset & (1 << i)) != 0);
     }
-- 
GitLab


From c1ba51be18285b2ce4451661efe858491c9b4bd7 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 28 Jun 2016 10:54:59 -0600
Subject: [PATCH 081/229] STM32 BBSRAM: Remove duplcate typedef; shorten some
 long lines.

---
 configs/nucleo-144/src/stm32_bbsram.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configs/nucleo-144/src/stm32_bbsram.c b/configs/nucleo-144/src/stm32_bbsram.c
index fd141970ac..9653ddd65a 100644
--- a/configs/nucleo-144/src/stm32_bbsram.c
+++ b/configs/nucleo-144/src/stm32_bbsram.c
@@ -90,8 +90,6 @@
  * Private Data
  ************************************************************************************/
 
-typedef uint32_t stack_word_t;
-
 /* Used for stack frame storage */
 
 typedef uint32_t stack_word_t;
@@ -431,7 +429,8 @@ void board_crashdump(uintptr_t currentsp, FAR void *tcb,
   if ((pdump->info.flags & INTSTACK_PRESENT) != 0)
     {
       stack_word_t *ps = (stack_word_t *) pdump->info.stacks.interrupt.sp;
-      copy_reverse(pdump->istack, &ps[ARRAYSIZE(pdump->istack) / 2], ARRAYSIZE(pdump->istack));
+      copy_reverse(pdump->istack, &ps[ARRAYSIZE(pdump->istack) / 2],
+                   ARRAYSIZE(pdump->istack));
     }
 
   /* Is it Invalid? */
@@ -464,7 +463,8 @@ void board_crashdump(uintptr_t currentsp, FAR void *tcb,
       pdump->info.flags |= INVALID_USERSTACK_PTR;
     }
 
-  rv = stm32_bbsram_savepanic(HARDFAULT_FILENO, (uint8_t *)pdump, sizeof(fullcontext_t));
+  rv = stm32_bbsram_savepanic(HARDFAULT_FILENO, (uint8_t *)pdump,
+                              sizeof(fullcontext_t));
 
   /* Test if memory got wiped because of using _sdata */
 
-- 
GitLab


From e0b7708afbc8911ae279221ce09a15918d9cb74b Mon Sep 17 00:00:00 2001
From: David Sidrane 
Date: Tue, 28 Jun 2016 07:10:11 -1000
Subject: [PATCH 082/229] Fix warning

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

diff --git a/arch/arm/src/stm32f7/stm32_rtc.c b/arch/arm/src/stm32f7/stm32_rtc.c
index 5b29d410f0..835b5a7229 100644
--- a/arch/arm/src/stm32f7/stm32_rtc.c
+++ b/arch/arm/src/stm32f7/stm32_rtc.c
@@ -48,6 +48,7 @@
 
 #include 
 #include 
+#include 
 
 #include "up_arch.h"
 
-- 
GitLab


From 1c93e48a09e2d514828a9d98f80462240709af3b Mon Sep 17 00:00:00 2001
From: David Sidrane 
Date: Tue, 28 Jun 2016 07:13:22 -1000
Subject: [PATCH 083/229] Removed STM32 porting vestiges

---
 arch/arm/src/stm32f7/Kconfig                  | 222 +-----------------
 .../stm32f7/chip/stm32f74xx75xx_memorymap.h   |   2 +-
 .../stm32f7/chip/stm32f76xx77xx_memorymap.h   |   2 +-
 arch/arm/src/stm32f7/stm32_dtcm.h             |  19 +-
 4 files changed, 21 insertions(+), 224 deletions(-)

diff --git a/arch/arm/src/stm32f7/Kconfig b/arch/arm/src/stm32f7/Kconfig
index d2de3faa59..75dd21454b 100644
--- a/arch/arm/src/stm32f7/Kconfig
+++ b/arch/arm/src/stm32f7/Kconfig
@@ -1861,6 +1861,14 @@ config STM32F7_CUSTOM_CLOCKCONFIG
 	---help---
 		Enables special, board-specific STM32 clock configuration.
 
+config STM32F7_DTCMEXCLUDE
+	bool "Exclude DTCM SRAM from the heap"
+	default y if ELF
+	depends on ARMV7M_HAVE_DTCM
+	---help---
+		Exclude DTCM SRAM from the HEAP because it appears to be impossible
+		to execute ELF modules from DTCM RAM (REVISIT!).
+
 config STM32F7_DTCM_PROCFS
 	bool "DTCM SRAM PROCFS support"
 	default n
@@ -3509,222 +3517,10 @@ endif # !STM32F7_PWM_MULTICHAN
 
 endif # STM32F7_TIM14_PWM
 
-config STM32F7_TIM15_PWM
-	bool "TIM15 PWM"
-	default n
-	depends on STM32F7_TIM15
-	---help---
-		Reserve timer 15 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 STM32F7_TIM15
-		is defined then THIS following may also be defined to indicate that
-		the timer is intended to be used for pulsed output modulation.
-
-if STM32F7_TIM15_PWM
-
-if STM32F7_PWM_MULTICHAN
-
-config STM32F7_TIM15_CHANNEL1
-	bool "TIM15 Channel 1"
-	default n
-	---help---
-		Enables channel 1.
-
-if STM32F7_TIM15_CHANNEL1
-
-config STM32F7_TIM15_CH1MODE
-	int "TIM15 Channel 1 Mode"
-	default 0
-	range 0 3 if STM32F7_STM32F30XX
-	range 0 1 if !STM32F7_STM32F30XX
-	---help---
-		Specifies the channel mode.
-
-config STM32F7_TIM15_CH1OUT
-	bool "TIM15 Channel 1 Output"
-	default n
-	---help---
-		Enables channel 1 output.
-
-endif # STM32F7_TIM15_CHANNEL1
-
-config STM32F7_TIM15_CHANNEL2
-	bool "TIM15 Channel 2"
-	default n
-	---help---
-		Enables channel 2.
-
-if STM32F7_TIM15_CHANNEL2
-
-config STM32F7_TIM15_CH2MODE
-	int "TIM15 Channel 2 Mode"
-	default 0
-	range 0 3 if STM32F7_STM32F30XX
-	range 0 1 if !STM32F7_STM32F30XX
-	---help---
-		Specifies the channel mode.
-
-config STM32F7_TIM15_CH2OUT
-	bool "TIM15 Channel 2 Output"
-	default n
-	---help---
-		Enables channel 2 output.
-
-endif # STM32F7_TIM15_CHANNEL2
-
-endif # STM32F7_PWM_MULTICHAN
-
-if !STM32F7_PWM_MULTICHAN
-
-config STM32F7_TIM15_CHANNEL
-	int "TIM15 PWM Output Channel"
-	default 1
-	range 1 2
-	---help---
-		If TIM15 is enabled for PWM usage, you also need specifies the timer output
-		channel {1,2}
-
-config STM32F7_TIM15_CHMODE
-	int "TIM15 Channel Mode"
-	default 0
-	range 0 3 if STM32F7_STM32F30XX
-	range 0 1 if !STM32F7_STM32F30XX
-	---help---
-		Specifies the channel mode.
-
-endif # !STM32F7_PWM_MULTICHAN
-
-endif # STM32F7_TIM15_PWM
-
-config STM32F7_TIM16_PWM
-	bool "TIM16 PWM"
-	default n
-	depends on STM32F7_TIM16
-	---help---
-		Reserve timer 16 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 STM32F7_TIM16
-		is defined then THIS following may also be defined to indicate that
-		the timer is intended to be used for pulsed output modulation.
-
-if STM32F7_TIM16_PWM
-
-if STM32F7_PWM_MULTICHAN
-
-config STM32F7_TIM16_CHANNEL1
-	bool "TIM16 Channel 1"
-	default n
-	---help---
-		Enables channel 1.
-
-if STM32F7_TIM16_CHANNEL1
-
-config STM32F7_TIM16_CH1MODE
-	int "TIM16 Channel 1 Mode"
-	default 0
-	range 0 1
-	---help---
-		Specifies the channel mode.
-
-config STM32F7_TIM16_CH1OUT
-	bool "TIM16 Channel 1 Output"
-	default n
-	---help---
-		Enables channel 1 output.
-
-endif # STM32F7_TIM16_CHANNEL1
-
-endif # STM32F7_PWM_MULTICHAN
-
-if !STM32F7_PWM_MULTICHAN
-
-config STM32F7_TIM16_CHANNEL
-	int "TIM16 PWM Output Channel"
-	default 1
-	range 1 1
-	---help---
-		If TIM16 is enabled for PWM usage, you also need specifies the timer output
-		channel {1}
-
-config STM32F7_TIM16_CHMODE
-	int "TIM16 Channel Mode"
-	default 0
-	range 0 1
-	---help---
-		Specifies the channel mode.
-
-endif # !STM32F7_PWM_MULTICHAN
-
-endif # STM32F7_TIM16_PWM
-
-config STM32F7_TIM17_PWM
-	bool "TIM17 PWM"
-	default n
-	depends on STM32F7_TIM17
-	---help---
-		Reserve timer 17 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 STM32F7_TIM17
-		is defined then THIS following may also be defined to indicate that
-		the timer is intended to be used for pulsed output modulation.
-
-if STM32F7_TIM17_PWM
-
-if STM32F7_PWM_MULTICHAN
-
-config STM32F7_TIM17_CHANNEL1
-	bool "TIM17 Channel 1"
-	default n
-	---help---
-		Enables channel 1.
-
-if STM32F7_TIM17_CHANNEL1
-
-config STM32F7_TIM17_CH1MODE
-	int "TIM17 Channel 1 Mode"
-	default 0
-	range 0 1
-	---help---
-		Specifies the channel mode.
-
-config STM32F7_TIM17_CH1OUT
-	bool "TIM17 Channel 1 Output"
-	default n
-	---help---
-		Enables channel 1 output.
-
-endif # STM32F7_TIM17_CHANNEL1
-
-endif # STM32F7_PWM_MULTICHAN
-
-if !STM32F7_PWM_MULTICHAN
-
-config STM32F7_TIM17_CHANNEL
-	int "TIM17 PWM Output Channel"
-	default 1
-	range 1 1
-	---help---
-		If TIM17 is enabled for PWM usage, you also need specifies the timer output
-		channel {1}
-
-config STM32F7_TIM17_CHMODE
-	int "TIM17 Channel Mode"
-	default 0
-	range 0 1
-	---help---
-		Specifies the channel mode.
-
-endif # !STM32F7_PWM_MULTICHAN
-
-endif # STM32F7_TIM17_PWM
-
 config STM32F7_PWM_MULTICHAN
 	bool "PWM Multiple Output Channels"
 	default n
-	depends on STM32F7_TIM1_PWM || STM32F7_TIM2_PWM || STM32F7_TIM3_PWM || STM32F7_TIM4_PWM || STM32F7_TIM5_PWM || STM32F7_TIM8_PWM || STM32F7_TIM9_PWM || STM32F7_TIM10_PWM || STM32F7_TIM11_PWM || STM32F7_TIM12_PWM || STM32F7_TIM13_PWM || STM32F7_TIM14_PWM || STM32F7_TIM15_PWM || STM32F7_TIM16_PWM || STM32F7_TIM17_PWM
+	depends on STM32F7_TIM1_PWM || STM32F7_TIM2_PWM || STM32F7_TIM3_PWM || STM32F7_TIM4_PWM || STM32F7_TIM5_PWM || STM32F7_TIM8_PWM || STM32F7_TIM9_PWM || STM32F7_TIM10_PWM || STM32F7_TIM11_PWM || STM32F7_TIM12_PWM || STM32F7_TIM13_PWM || STM32F7_TIM14_PWM
 	select ARCH_HAVE_PWM_MULTICHAN
 	---help---
 		Specifies that the PWM driver supports multiple output
diff --git a/arch/arm/src/stm32f7/chip/stm32f74xx75xx_memorymap.h b/arch/arm/src/stm32f7/chip/stm32f74xx75xx_memorymap.h
index b68797d006..889cf23192 100644
--- a/arch/arm/src/stm32f7/chip/stm32f74xx75xx_memorymap.h
+++ b/arch/arm/src/stm32f7/chip/stm32f74xx75xx_memorymap.h
@@ -49,7 +49,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* STM32F40XXX Address Blocks *******************************************************/
+/* STM32F7XXXX STM32F75XXX Address Blocks *******************************************/
 
 #define STM32_CODE_BASE      0x00000000     /* 0x00000000-0x1fffffff: 512Mb code block */
 #define STM32_SRAM_BASE      0x20000000     /* 0x20000000-0x3fffffff: 512Mb sram block */
diff --git a/arch/arm/src/stm32f7/chip/stm32f76xx77xx_memorymap.h b/arch/arm/src/stm32f7/chip/stm32f76xx77xx_memorymap.h
index fd1a41f36d..81f3512fe6 100644
--- a/arch/arm/src/stm32f7/chip/stm32f76xx77xx_memorymap.h
+++ b/arch/arm/src/stm32f7/chip/stm32f76xx77xx_memorymap.h
@@ -49,7 +49,7 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
-/* STM32F40XXX Address Blocks *******************************************************/
+/* STM32F76XXX STM32F77XXX Address Blocks *******************************************/
 
 #define STM32_CODE_BASE      0x00000000     /* 0x00000000-0x1fffffff: 512Mb code block */
 #define STM32_SRAM_BASE      0x20000000     /* 0x20000000-0x3fffffff: 512Mb sram block */
diff --git a/arch/arm/src/stm32f7/stm32_dtcm.h b/arch/arm/src/stm32f7/stm32_dtcm.h
index a3e76330e9..0b52bcf96c 100644
--- a/arch/arm/src/stm32f7/stm32_dtcm.h
+++ b/arch/arm/src/stm32f7/stm32_dtcm.h
@@ -1,8 +1,9 @@
 /****************************************************************************
  * arch/arm/src/stm32f7/stm32_dtcm.h
  *
- *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2015-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
+ *           David Sidrane 
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -52,14 +53,14 @@
 
 #define HAVE_DTCM_HEAP 1
 
-/* Only the STM32 F2, F3, and F4 have DTCM memory */
+/* The STM32 F7 have DTCM memory */
 
-#if defined(CONFIG_STM32_STM32F30XX)
-#  define DTCM_START 0x10000000
-#  define DTCM_END   0x10002000
-#elif defined(CONFIG_STM32_STM32F20XX) || defined(CONFIG_STM32_STM32F40XX)
-#  define DTCM_START 0x10000000
-#  define DTCM_END   0x10010000
+#if defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX)
+#  define DTCM_START 0x20000000
+#  define DTCM_END   0x20010000
+#elif defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
+#  define DTCM_START 0x20000000
+#  define DTCM_END   0x20020000
 #else
 #  undef HAVE_DTCM_HEAP
 #endif
@@ -68,7 +69,7 @@
  * heap.
  */
 
-#ifndef CONFIG_STM32_DTCMEXCLUDE
+#ifndef CONFIG_STM32F7_DTCMEXCLUDE
 #  undef HAVE_DTCM_HEAP
 #endif
 
-- 
GitLab


From 723165d49952024ca3705b7278dd8dea08e7579d Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 28 Jun 2016 11:57:40 -0600
Subject: [PATCH 084/229] configs/spark: Fix warning because STM32_NSPI is not
 defined

---
 configs/spark/src/spark.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configs/spark/src/spark.h b/configs/spark/src/spark.h
index 4eb5ed6a84..0bfd4e3a05 100644
--- a/configs/spark/src/spark.h
+++ b/configs/spark/src/spark.h
@@ -45,6 +45,7 @@
 #include 
 #include 
 #include 
+#include 
 
 /************************************************************************************
  * Pre-processor Definitions
-- 
GitLab


From 0f123d255138c61f53713b75c391a4a8a74e0523 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 28 Jun 2016 12:40:17 -0600
Subject: [PATCH 085/229] This change fixes a build problem that only occurs
 when reconfiguring from Linux to Windows or vice-versa.  It is a problem that
 was present but not usually experienced until two things happened:  (1) The
 pre_config target was added to run before the menconfig operation and (2) the
 context target was added before the pre_config target in order to set up the
 correct symbolic links (in the apps/platform directory) needed by the
 pre_config target.

But then now if you start with a Linux system and run 'make menuconfig' to switch to Linux, the context target will execute first and set up POSIX style symbolic links before doing the menuconfig.  Then after the menuconfig, the make will fail on Windows if you are using a Windows native toolchain because that native toolchain cannot follow the Cygwin-style symbolic links.

The first here is to also execute the clean_context AFTER executing menuconfig.  A lot more happens now:  It used to be that doing 'make menuconfig' only did the menuconfig operation.  No it does context, pre_config, menuconfig, clean_context.  Not nearly as snappy as it used to be.
---
 Makefile.unix | 22 +++++++++++++++++-----
 Makefile.win  | 16 ++++++++++++----
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/Makefile.unix b/Makefile.unix
index a6913ad672..a411eda177 100644
--- a/Makefile.unix
+++ b/Makefile.unix
@@ -480,24 +480,36 @@ pass2dep: context tools/mkdeps$(HOSTEXEEXT) tools/cnvwindeps$(HOSTEXEEXT)
 # location: http://ymorin.is-a-geek.org/projects/kconfig-frontends.  See
 # README.txt file in the NuttX tools GIT repository for additional information.
 
-config: context apps_preconfig
+do_config: context apps_preconfig
 	$(Q) APPSDIR=${CONFIG_APPS_DIR} kconfig-conf Kconfig
 
-oldconfig: context apps_preconfig
+config: do_config clean_context
+
+do_oldconfig: context apps_preconfig
 	$(Q) APPSDIR=${CONFIG_APPS_DIR} kconfig-conf --oldconfig Kconfig
 
-olddefconfig: context apps_preconfig
+oldconfig: do_oldconfig clean_context
+
+do_olddefconfig: context apps_preconfig
 	$(Q) APPSDIR=${CONFIG_APPS_DIR} kconfig-conf --olddefconfig Kconfig
 
-menuconfig: context apps_preconfig
+olddefconfig: do_olddefconfig clean_context
+
+do_menuconfig: context apps_preconfig
 	$(Q) APPSDIR=${CONFIG_APPS_DIR} kconfig-mconf Kconfig
 
-qconfig: context apps_preconfig
+menuconfig: do_menuconfig clean_context
+
+do_qconfig: context apps_preconfig
 	$(Q) APPSDIR=${CONFIG_APPS_DIR} kconfig-qconf Kconfig
 
+qconfig: do_qconfig clean_context
+
 gconfig: context apps_preconfig
 	$(Q) APPSDIR=${CONFIG_APPS_DIR} kconfig-gconf Kconfig
 
+gconfig: do_gconfig clean_context
+
 # export
 #
 # The export target will package the NuttX libraries and header files into
diff --git a/Makefile.win b/Makefile.win
index c1ab6a7cef..484e6a938d 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -480,18 +480,26 @@ pass2dep: context tools\mkdeps$(HOSTEXEEXT)
 # location: http://ymorin.is-a-geek.org/projects/kconfig-frontends.  See
 # misc\tools\README.txt for additional information.
 
-config: context apps_preconfig
+do_config: context apps_preconfig
 	$(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-conf Kconfig
 
-oldconfig: context apps_preconfig
+config: do_config clean_context
+
+do_oldconfig: context apps_preconfig
 	$(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-conf --oldconfig Kconfig
 
-olddefconfig: context apps_preconfig
+oldconfig: do_oldconfig clean_context
+
+do_olddefconfig: context apps_preconfig
 	$(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-conf --olddefconfig Kconfig
 
-menuconfig: context configenv apps_preconfig
+olddefconfig: do_olddefconfig clean_context
+
+do_menuconfig: context configenv apps_preconfig
 	$(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-mconf Kconfig
 
+menuconfig: do_menuconfig clean_context
+
 # export
 #
 # The export target will package the NuttX libraries and header files into
-- 
GitLab


From a4d5845887594182e68a1a21bb8943d5e286d8dc Mon Sep 17 00:00:00 2001
From: "Paul A. Patience" 
Date: Tue, 28 Jun 2016 14:46:04 -0400
Subject: [PATCH 086/229] efm32, lcp43, stm32, stm32l4: disable interrupts with
 NVIC_IRQ_CLEAR

---
 arch/arm/src/efm32/efm32_irq.c     | 64 ++++++------------------------
 arch/arm/src/lpc43xx/lpc43_irq.c   | 56 ++++++--------------------
 arch/arm/src/stm32/stm32_irq.c     | 33 +++++++--------
 arch/arm/src/stm32l4/stm32l4_irq.c | 33 +++++++--------
 4 files changed, 53 insertions(+), 133 deletions(-)

diff --git a/arch/arm/src/efm32/efm32_irq.c b/arch/arm/src/efm32/efm32_irq.c
index 63fa4b18ec..63a82b194c 100644
--- a/arch/arm/src/efm32/efm32_irq.c
+++ b/arch/arm/src/efm32/efm32_irq.c
@@ -251,61 +251,25 @@ static inline void efm32_prioritize_syscall(int priority)
 static int efm32_irqinfo(int irq, uintptr_t *regaddr, uint32_t *bit,
                          uintptr_t offset)
 {
+  int n;
+
   DEBUGASSERT(irq >= EFM32_IRQ_NMI && irq < NR_IRQS);
 
-  /* Check for external interrupt or (a second level GPIO interrupt) */
+  /* Check for external interrupt or a second level GPIO interrupt */
 
   if (irq >= EFM32_IRQ_INTERRUPTS)
     {
-      /* Is this an external interrupt? */
-
       if (irq < NR_VECTORS)
         {
-          /* Yes.. We have support implemented for vectors 0-95 */
-
-          DEBUGASSERT(irq < (EFM32_IRQ_INTERRUPTS + 96));
-
-#if NR_VECTORS >= (EFM32_IRQ_INTERRUPTS + 32)
-          /* Check for vectors 0-31 */
-
-          if (irq < EFM32_IRQ_INTERRUPTS + 32)
-#endif
-            {
-              *regaddr = (NVIC_IRQ0_31_ENABLE + offset);
-              *bit     = 1 << (irq - EFM32_IRQ_INTERRUPTS);
-            }
-#if NR_VECTORS >= (EFM32_IRQ_INTERRUPTS + 32)
-          /* Yes..  Check for vectors 32-63 */
+          n = irq - EFM32_IRQ_INTERRUPTS;
+          *regaddr = NVIC_IRQ_ENABLE(n) + offset;
 
-          else
-#if NR_VECTORS >= (EFM32_IRQ_INTERRUPTS + 64)
-          if (irq < EFM32_IRQ_INTERRUPTS + 64)
-#endif
+          while (n >= 32)
             {
-              *regaddr = (NVIC_IRQ32_63_ENABLE + offset);
-              *bit     = 1 << (irq - EFM32_IRQ_INTERRUPTS - 32);
+              n -= 32;
             }
-#if NR_VECTORS >= (EFM32_IRQ_INTERRUPTS + 64)
-          /* Yes..  Check for vectors 64-95 */
-
-          else
-#if NR_VECTORS >= (EFM32_IRQ_INTERRUPTS + 96)
-          /* Yes..  Check for vectors 64-95 */
 
-          if (irq < NR_VECTORS)
-#endif
-            {
-              *regaddr = (NVIC_IRQ64_95_ENABLE + offset);
-              *bit     = 1 << (irq - EFM32_IRQ_INTERRUPTS - 64);
-            }
-#if NR_VECTORS >= (EFM32_IRQ_INTERRUPTS + 96)
-          else
-            {
-              return -EINVAL; /* We should never get here */
-            }
-#endif
-#endif
-#endif
+          *bit     = 1 << n;
         }
       else
         {
@@ -356,16 +320,14 @@ void up_irqinitialize(void)
 {
   uint32_t regaddr;
   int num_priority_registers;
+  int i;
 
   /* Disable all interrupts */
 
-  putreg32(0, NVIC_IRQ0_31_ENABLE);
-#if NR_VECTORS >= (EFM32_IRQ_INTERRUPTS + 32)
-  putreg32(0, NVIC_IRQ32_63_ENABLE);
-#if NR_VECTORS >= (EFM32_IRQ_INTERRUPTS + 64)
-  putreg32(0, NVIC_IRQ64_95_ENABLE);
-#endif
-#endif
+  for (i = 0; i < NR_VECTORS - EFM32_IRQ_INTERRUPTS; i += 32)
+    {
+      putreg32(0xffffffff, NVIC_IRQ_CLEAR(i));
+    }
 
 #if defined(CONFIG_STACK_COLORATION) && CONFIG_ARCH_INTERRUPTSTACK > 3
   /* Colorize the interrupt stack for debug purposes */
diff --git a/arch/arm/src/lpc43xx/lpc43_irq.c b/arch/arm/src/lpc43xx/lpc43_irq.c
index 345f63b5c2..26881472c8 100644
--- a/arch/arm/src/lpc43xx/lpc43_irq.c
+++ b/arch/arm/src/lpc43xx/lpc43_irq.c
@@ -242,53 +242,23 @@ static inline void lpc43_prioritize_syscall(int priority)
 static int lpc43_irqinfo(int irq, uintptr_t *regaddr, uint32_t *bit,
                          uintptr_t offset)
 {
+  int n;
+
   DEBUGASSERT(irq >= LPC43_IRQ_NMI && irq < NR_IRQS);
 
   /* Check for external interrupt */
 
   if (irq >= LPC43_IRQ_EXTINT)
     {
-      /* NOTE: We assume that there are at least 32 interrupts */
-
-      if (irq < (LPC43_IRQ_EXTINT + 32))
-        {
-           /* Interrupt in range {0-31} */
-
-           *regaddr = (NVIC_IRQ0_31_ENABLE + offset);
-           *bit     = 1 << (irq - LPC43_IRQ_EXTINT);
-        }
-#if LPC43M4_IRQ_NEXTINT > 95
-#  error Extension to interrupt logic needed
-#elif LPC43M4_IRQ_NEXTINT > 63
-      else if (irq < (LPC43_IRQ_EXTINT + 64))
-        {
-           /* Interrupt in range {32-63} */
+      n = irq - LPC43_IRQ_EXTINT;
+      *regaddr = NVIC_IRQ_ENABLE(n) + offset;
 
-           *regaddr = (NVIC_IRQ32_63_ENABLE + offset);
-           *bit     = 1 << (irq - LPC43_IRQ_EXTINT - 32);
-        }
-      else if (irq < LPC43M4_IRQ_NIRQS)
+      while (n >= 32)
         {
-           /* Interrupt in range {64-LPC43M4_IRQ_NIRQS}, LPC43M4_IRQ_NIRQS <= 95 */
-
-           *regaddr = (NVIC_IRQ64_95_ENABLE + offset);
-           *bit     = 1 << (irq - LPC43_IRQ_EXTINT - 64);
+          n -= 32;
         }
-#else /* if LPC43M4_IRQ_NEXTINT > 31 */
-      else if (irq < LPC43M4_IRQ_NIRQS)
-        {
-           /* Interrupt in range {32-LPC43M4_IRQ_NIRQS}, LPC43M4_IRQ_NIRQS <= 63 */
 
-           *regaddr = (NVIC_IRQ32_63_ENABLE + offset);
-           *bit     = 1 << (irq - LPC43_IRQ_EXTINT - 32);
-        }
-#endif
-      else
-        {
-           /* Interrupt >= LPC43M4_IRQ_NIRQS */
-
-          return ERROR; /* Invalid interrupt */
-        }
+      *bit     = 1 << n;
     }
 
   /* Handle processor exceptions.  Only a few can be disabled */
@@ -342,16 +312,14 @@ void up_irqinitialize(void)
   uint32_t regval;
 #endif
   int num_priority_registers;
+  int i;
 
   /* Disable all interrupts */
 
-  putreg32(0, NVIC_IRQ0_31_ENABLE);
-#if LPC43M4_IRQ_NEXTINT > 31
-  putreg32(0, NVIC_IRQ32_63_ENABLE);
-#if LPC43M4_IRQ_NEXTINT > 63
-  putreg32(0, NVIC_IRQ64_95_ENABLE);
-#endif
-#endif
+  for (i = 0; i < LPC43M4_IRQ_NEXTINT; i += 32)
+    {
+      putreg32(0xffffffff, NVIC_IRQ_CLEAR(i));
+    }
 
   /* Make sure that we are using the correct vector table.  The default
    * vector address is 0x0000:0000 but if we are executing code that is
diff --git a/arch/arm/src/stm32/stm32_irq.c b/arch/arm/src/stm32/stm32_irq.c
index 062d63fb74..ea7c4ddfcb 100644
--- a/arch/arm/src/stm32/stm32_irq.c
+++ b/arch/arm/src/stm32/stm32_irq.c
@@ -245,31 +245,23 @@ static inline void stm32_prioritize_syscall(int priority)
 static int stm32_irqinfo(int irq, uintptr_t *regaddr, uint32_t *bit,
                          uintptr_t offset)
 {
+  int n;
+
   DEBUGASSERT(irq >= STM32_IRQ_NMI && irq < NR_IRQS);
 
   /* Check for external interrupt */
 
   if (irq >= STM32_IRQ_FIRST)
     {
-      if (irq < STM32_IRQ_FIRST + 32)
-        {
-           *regaddr = (NVIC_IRQ0_31_ENABLE + offset);
-           *bit     = 1 << (irq - STM32_IRQ_FIRST);
-        }
-      else if (irq < STM32_IRQ_FIRST + 64)
-        {
-           *regaddr = (NVIC_IRQ32_63_ENABLE + offset);
-           *bit     = 1 << (irq - STM32_IRQ_FIRST - 32);
-        }
-      else if (irq < NR_IRQS)
-        {
-           *regaddr = (NVIC_IRQ64_95_ENABLE + offset);
-           *bit     = 1 << (irq - STM32_IRQ_FIRST - 64);
-        }
-      else
+      n = irq - STM32_IRQ_FIRST;
+      *regaddr = NVIC_IRQ_ENABLE(n) + offset;
+
+      while (n >= 32)
         {
-          return ERROR; /* Invalid interrupt */
+          n -= 32;
         }
+
+      *bit     = 1 << n;
     }
 
   /* Handle processor exceptions.  Only a few can be disabled */
@@ -315,11 +307,14 @@ void up_irqinitialize(void)
 {
   uint32_t regaddr;
   int num_priority_registers;
+  int i;
 
   /* Disable all interrupts */
 
-  putreg32(0, NVIC_IRQ0_31_ENABLE);
-  putreg32(0, NVIC_IRQ32_63_ENABLE);
+  for (i = 0; i < NR_IRQS - STM32_IRQ_FIRST; i += 32)
+    {
+      putreg32(0xffffffff, NVIC_IRQ_CLEAR(i));
+    }
 
   /* Colorize the interrupt stack for debug purposes */
 
diff --git a/arch/arm/src/stm32l4/stm32l4_irq.c b/arch/arm/src/stm32l4/stm32l4_irq.c
index 4742d5c95b..8e90bf0fa8 100644
--- a/arch/arm/src/stm32l4/stm32l4_irq.c
+++ b/arch/arm/src/stm32l4/stm32l4_irq.c
@@ -244,31 +244,23 @@ static inline void stm32l4_prioritize_syscall(int priority)
 static int stm32l4_irqinfo(int irq, uintptr_t *regaddr, uint32_t *bit,
                          uintptr_t offset)
 {
+  int n;
+
   DEBUGASSERT(irq >= STM32L4_IRQ_NMI && irq < NR_IRQS);
 
   /* Check for external interrupt */
 
   if (irq >= STM32L4_IRQ_FIRST)
     {
-      if (irq < STM32L4_IRQ_FIRST + 32)
-        {
-           *regaddr = (NVIC_IRQ0_31_ENABLE + offset);
-           *bit     = 1 << (irq - STM32L4_IRQ_FIRST);
-        }
-      else if (irq < STM32L4_IRQ_FIRST + 64)
-        {
-           *regaddr = (NVIC_IRQ32_63_ENABLE + offset);
-           *bit     = 1 << (irq - STM32L4_IRQ_FIRST - 32);
-        }
-      else if (irq < NR_IRQS)
-        {
-           *regaddr = (NVIC_IRQ64_95_ENABLE + offset);
-           *bit     = 1 << (irq - STM32L4_IRQ_FIRST - 64);
-        }
-      else
+      n = irq - STM32L4_IRQ_FIRST;
+      *regaddr = NVIC_IRQ_ENABLE(n) + offset;
+
+      while (n >= 32)
         {
-          return ERROR; /* Invalid interrupt */
+          n -= 32;
         }
+
+      *bit     = 1 << n;
     }
 
   /* Handle processor exceptions.  Only a few can be disabled */
@@ -314,11 +306,14 @@ void up_irqinitialize(void)
 {
   uint32_t regaddr;
   int num_priority_registers;
+  int i;
 
   /* Disable all interrupts */
 
-  putreg32(0, NVIC_IRQ0_31_ENABLE);
-  putreg32(0, NVIC_IRQ32_63_ENABLE);
+  for (i = 0; i < NR_IRQS - STM32L4_IRQ_FIRST; i += 32)
+    {
+      putreg32(0xffffffff, NVIC_IRQ_CLEAR(i));
+    }
 
   /* Colorize the interrupt stack for debug purposes */
 
-- 
GitLab


From 93f49290a3222af38217a34f28b1a40fcac8b474 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 28 Jun 2016 13:47:22 -0600
Subject: [PATCH 087/229] Eliminate a warning

---
 arch/arm/src/samv7/sam_twihs.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/src/samv7/sam_twihs.c b/arch/arm/src/samv7/sam_twihs.c
index 0488cdddf6..a50b8641d9 100644
--- a/arch/arm/src/samv7/sam_twihs.c
+++ b/arch/arm/src/samv7/sam_twihs.c
@@ -913,7 +913,9 @@ static int twi_transfer(FAR struct i2c_master_s *dev,
   struct twi_dev_s *priv = (struct twi_dev_s *)dev;
   irqstate_t flags;
   unsigned int size;
+#ifdef CONFIG_I2C_RESET
   uint32_t sr;
+#endif
   int i;
   int ret;
 
-- 
GitLab


From 71569b8d710891b04d5cbc0727bc9e8fc9d2fd34 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 28 Jun 2016 13:40:06 -0600
Subject: [PATCH 088/229] Eliminate some warnings

---
 configs/zkit-arm-1769/src/lpc17_spi.c | 2 +-
 configs/zkit-arm-1769/src/lpc17_ssp.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configs/zkit-arm-1769/src/lpc17_spi.c b/configs/zkit-arm-1769/src/lpc17_spi.c
index ca01150dee..4418cb5bdf 100644
--- a/configs/zkit-arm-1769/src/lpc17_spi.c
+++ b/configs/zkit-arm-1769/src/lpc17_spi.c
@@ -65,7 +65,7 @@
 
 /* Dump GPIO registers */
 
-#if CONFIG_DEBUG_SPI_INFO
+#ifdef CONFIG_DEBUG_SPI_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 2302f15bd8..09cf3833c8 100644
--- a/configs/zkit-arm-1769/src/lpc17_ssp.c
+++ b/configs/zkit-arm-1769/src/lpc17_ssp.c
@@ -65,7 +65,7 @@
 
 /* Dump GPIO registers */
 
-#if CONFIG_DEBUG_SPI_INFO
+#ifdef CONFIG_DEBUG_SPI_INFO
 #  define ssp_dumpgpio(m) lpc17_dumpgpio(SDCCS_GPIO, m)
 #else
 #  define ssp_dumpgpio(m)
-- 
GitLab


From a43da4d10791dff1754fb11b328dd38039590198 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 28 Jun 2016 14:35:49 -0600
Subject: [PATCH 089/229] STM32 CAN: Clone missing stm32_enterinitmode() and
 _exitinitmode() from STM32L4.  Don't know if this is write but is needed to
 compile.

---
 arch/arm/src/stm32/stm32_can.c     | 114 ++++++++++++++++++++++++++++-
 arch/arm/src/stm32l4/stm32l4_can.c |  11 ++-
 2 files changed, 118 insertions(+), 7 deletions(-)

diff --git a/arch/arm/src/stm32/stm32_can.c b/arch/arm/src/stm32/stm32_can.c
index 48f184a678..6a661c1f94 100644
--- a/arch/arm/src/stm32/stm32_can.c
+++ b/arch/arm/src/stm32/stm32_can.c
@@ -162,6 +162,8 @@ static int  stm32can_txinterrupt(int irq, FAR void *context);
 
 /* Initialization */
 
+static int  stm32can_enterinitmode(FAR struct stm32_can_s *priv);
+static int  stm32can_exitinitmode(FAR struct stm32_can_s *priv);
 static int  stm32can_bittiming(FAR struct stm32_can_s *priv);
 static int  stm32can_cellinit(FAR struct stm32_can_s *priv);
 static int  stm32can_filterinit(FAR struct stm32_can_s *priv);
@@ -894,6 +896,7 @@ static int stm32can_ioctl(FAR struct can_dev_s *dev, int cmd,
               /* This timing is not possible */
 
               ret = -EINVAL;
+              break;
             }
 
           /* Otherwise, nquanta is can_bit_quanta, ts1 and ts2 are
@@ -907,11 +910,13 @@ static int stm32can_ioctl(FAR struct can_dev_s *dev, int cmd,
               DEBUGASSERT(brp >= 1 && brp <= CAN_BTR_BRP_MAX);
             }
 
-          caninfo("TS1: %d TS2: %d BRP: %d\n", bt->bt_tseg1, bt->bt_tseg2, brp);
+          caninfo("TS1: %d TS2: %d BRP: %d\n",
+                  bt->bt_tseg1, bt->bt_tseg2, brp);
 
           /* Configure bit timing. */
 
-          regval &= ~(CAN_BTR_BRP_MASK | CAN_BTR_TS1_MASK | CAN_BTR_TS2_MASK | CAN_BTR_SJW_MASK);
+          regval &= ~(CAN_BTR_BRP_MASK | CAN_BTR_TS1_MASK |
+                      CAN_BTR_TS2_MASK | CAN_BTR_SJW_MASK);
           regval |= ((brp          - 1) << CAN_BTR_BRP_SHIFT) |
                     ((bt->bt_tseg1 - 1) << CAN_BTR_TS1_SHIFT) |
                     ((bt->bt_tseg2 - 1) << CAN_BTR_TS2_SHIFT) |
@@ -931,7 +936,8 @@ static int stm32can_ioctl(FAR struct can_dev_s *dev, int cmd,
 
           if (ret == 0)
             {
-              priv->baud  = STM32_PCLK1_FREQUENCY / (brp * (bt->bt_tseg1 + bt->bt_tseg2 + 1));
+              priv->baud  = STM32_PCLK1_FREQUENCY /
+                (brp * (bt->bt_tseg1 + bt->bt_tseg2 + 1));
             }
         }
         break;
@@ -1758,6 +1764,108 @@ static int stm32can_bittiming(FAR struct stm32_can_s *priv)
   return OK;
 }
 
+/****************************************************************************
+ * Name: stm32can_enterinitmode
+ *
+ * Description:
+ *   Put the CAN cell in Initialization mode. This only disconnects the CAN
+ *   peripheral, no registers are changed. The initialization mode is
+ *   required to change the baud rate.
+ *
+ * Input Parameter:
+ *   priv - A pointer to the private data structure for this CAN block
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int stm32can_enterinitmode(FAR struct stm32_can_s *priv)
+{
+  uint32_t regval;
+  volatile uint32_t timeout;
+
+  caninfo("CAN%d\n", priv->port);
+
+  /* Enter initialization mode */
+
+  regval  = stm32can_getreg(priv, STM32_CAN_MCR_OFFSET);
+  regval |= CAN_MCR_INRQ;
+  stm32can_putreg(priv, STM32_CAN_MCR_OFFSET, regval);
+
+  /* Wait until initialization mode is acknowledged */
+
+  for (timeout = INAK_TIMEOUT; timeout > 0; timeout--)
+    {
+      regval = stm32can_getreg(priv, STM32_CAN_MSR_OFFSET);
+      if ((regval & CAN_MSR_INAK) != 0)
+        {
+          /* We are in initialization mode */
+
+          break;
+        }
+    }
+
+  /* Check for a timeout */
+
+  if (timeout < 1)
+    {
+      canerr("ERROR: Timed out waiting to enter initialization mode\n");
+      return -ETIMEDOUT;
+    }
+
+  return 0;
+}
+
+/****************************************************************************
+ * Name: stm32can_exitinitmode
+ *
+ * Description:
+ *   Put the CAN cell out of the Initialization mode (to Normal mode)
+ *
+ * Input Parameter:
+ *   priv - A pointer to the private data structure for this CAN block
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int stm32can_exitinitmode(FAR struct stm32_can_s *priv)
+{
+  uint32_t regval;
+  volatile uint32_t timeout;
+
+  /* Exit Initialization mode, enter Normal mode */
+
+  regval  = stm32can_getreg(priv, STM32_CAN_MCR_OFFSET);
+  regval &= ~CAN_MCR_INRQ;
+  stm32can_putreg(priv, STM32_CAN_MCR_OFFSET, regval);
+
+  /* Wait until the initialization mode exit is acknowledged */
+
+  for (timeout = INAK_TIMEOUT; timeout > 0; timeout--)
+    {
+      regval = stm32can_getreg(priv, STM32_CAN_MSR_OFFSET);
+      if ((regval & CAN_MSR_INAK) == 0)
+        {
+          /* We are out of initialization mode */
+
+          break;
+        }
+    }
+
+  /* Check for a timeout */
+
+  if (timeout < 1)
+    {
+      canerr("ERROR: Timed out waiting to exit initialization mode: %08x\n", regval);
+      return -ETIMEDOUT;
+    }
+
+  return 0;
+}
+
 /****************************************************************************
  * Name: stm32can_cellinit
  *
diff --git a/arch/arm/src/stm32l4/stm32l4_can.c b/arch/arm/src/stm32l4/stm32l4_can.c
index a6c40af4e0..f2ba2e761e 100644
--- a/arch/arm/src/stm32l4/stm32l4_can.c
+++ b/arch/arm/src/stm32l4/stm32l4_can.c
@@ -855,6 +855,7 @@ static int stm32l4can_ioctl(FAR struct can_dev_s *dev, int cmd,
               /* This timing is not possible */
 
               ret = -EINVAL;
+              break;
             }
 
           /* Otherwise, nquanta is can_bit_quanta, ts1 and ts2 are
@@ -868,11 +869,13 @@ static int stm32l4can_ioctl(FAR struct can_dev_s *dev, int cmd,
               DEBUGASSERT(brp >= 1 && brp <= CAN_BTR_BRP_MAX);
             }
 
-          caninfo("TS1: %d TS2: %d BRP: %d\n", bt->bt_tseg1, bt->bt_tseg2, brp);
+          caninfo("TS1: %d TS2: %d BRP: %d\n",
+                  bt->bt_tseg1, bt->bt_tseg2, brp);
 
           /* Configure bit timing. */
 
-          regval &= ~(CAN_BTR_BRP_MASK | CAN_BTR_TS1_MASK | CAN_BTR_TS2_MASK | CAN_BTR_SJW_MASK);
+          regval &= ~(CAN_BTR_BRP_MASK | CAN_BTR_TS1_MASK |
+                      CAN_BTR_TS2_MASK | CAN_BTR_SJW_MASK);
           regval |= ((brp          - 1) << CAN_BTR_BRP_SHIFT) |
                     ((bt->bt_tseg1 - 1) << CAN_BTR_TS1_SHIFT) |
                     ((bt->bt_tseg2 - 1) << CAN_BTR_TS2_SHIFT) |
@@ -889,10 +892,10 @@ static int stm32l4can_ioctl(FAR struct can_dev_s *dev, int cmd,
           stm32l4can_putreg(priv, STM32L4_CAN_BTR_OFFSET, regval);
 
           ret = stm32l4can_exitinitmode(priv);
-
           if (ret == 0)
             {
-              priv->baud  = STM32L4_PCLK1_FREQUENCY / (brp * (bt->bt_tseg1 + bt->bt_tseg2 + 1));
+              priv->baud  = STM32L4_PCLK1_FREQUENCY /
+                (brp * (bt->bt_tseg1 + bt->bt_tseg2 + 1));
             }
         }
         break;
-- 
GitLab


From ac81ecf65be9a9936ce62facbfbf8a09ac676481 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 28 Jun 2016 14:43:58 -0600
Subject: [PATCH 090/229] Remove configs/stm32f746g-disco/netnsh.  It does not
 build.  Probably a corrupted, hand-editted defconfig file.

---
 configs/stm32f746g-disco/README.txt       |   51 -
 configs/stm32f746g-disco/netnsh/Make.defs |  113 --
 configs/stm32f746g-disco/netnsh/defconfig | 1305 ---------------------
 configs/stm32f746g-disco/netnsh/setenv.sh |   77 --
 4 files changed, 1546 deletions(-)
 delete mode 100644 configs/stm32f746g-disco/netnsh/Make.defs
 delete mode 100644 configs/stm32f746g-disco/netnsh/defconfig
 delete mode 100755 configs/stm32f746g-disco/netnsh/setenv.sh

diff --git a/configs/stm32f746g-disco/README.txt b/configs/stm32f746g-disco/README.txt
index 48ba63ec41..320b8a83f2 100644
--- a/configs/stm32f746g-disco/README.txt
+++ b/configs/stm32f746g-disco/README.txt
@@ -606,57 +606,6 @@ Configuration Directories
        If you do this a lot, you will probably want to invest a little time
        to develop a tool to automate these steps.
 
-  netnsh:
-  ------
-    This is a NetShell (NSH) very similar to the nsh configuration described
-    below.  It differs in that it has networking enabled.
-
-    NOTES:
-
-    1. Both IPv4 and IPv6 protocoals are enabled.  Fixed IP addresses are
-       used.  The default configurationi target has these IP address:
-
-       IPv4: 10.0.0.2
-       IPv6: fc00::2
-
-       These are, of course, easily changes by reconfiguring via 'make
-       menuconfig'
-
-    2. UDP, TCIP/IP, ARP, ICMP, and ICMPv6 are also enabled.
-
-    3. NSH offers several network oriented commands such as:  ipconfig,
-       ifup, ifdown, ping, and ping6.
-
-    4. Telnet sessions are supported.  You can start a Telnet session from
-       any host on the network using a command like:
-
-         $ telnet 10.0.0.2
-         Trying 10.0.0.2...
-         Connected to 10.0.0.2.
-         Escape character is '^]'.
-
-         NuttShell (NSH) NuttX-7.10
-         nsh> help
-         help usage:  help [-v] []
-
-           [           dd          hexdump     mb          ping6       sleep
-           ?           echo        ifconfig    mkdir       ps          test
-           break       exec        ifdown      mkfifo      pwd         true
-           cat         exit        ifup        mh          rm          uname
-           cd          false       kill        mv          rmdir       unset
-           cp          free        losetup     mw          set         usleep
-           cmp         help        ls          ping        sh          xd
-
-         Builtin Apps:
-         nsh>
-
-       Under either Linux or Cygwin
-
-    5. The PHY address is either 0 or 1, depending on the state of the
-       LAN8720 RXER/PHYAD0 when the hardware is reset.  That connects to the
-       STM32 F7 via PG2. PG2 is not controlled but appears to result in a
-       PHY address of 0.
-
   nsh:
   ---
     Configures the NuttShell (NSH) located at apps/examples/nsh.  The
diff --git a/configs/stm32f746g-disco/netnsh/Make.defs b/configs/stm32f746g-disco/netnsh/Make.defs
deleted file mode 100644
index 7a2cc395ab..0000000000
--- a/configs/stm32f746g-disco/netnsh/Make.defs
+++ /dev/null
@@ -1,113 +0,0 @@
-############################################################################
-# configs/stm32f746g-disco/netnsh/Make.defs
-#
-#   Copyright (C) 2015 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.
-#
-############################################################################
-
-include ${TOPDIR}/.config
-include ${TOPDIR}/tools/Config.mk
-include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
-
-LDSCRIPT = flash.ld
-
-ifeq ($(WINTOOL),y)
-  # Windows-native toolchains
-  DIRLINK = $(TOPDIR)/tools/copydir.sh
-  DIRUNLINK = $(TOPDIR)/tools/unlink.sh
-  MKDEP = $(TOPDIR)/tools/mkwindeps.sh
-  ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
-  ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
-else
-  # Linux/Cygwin-native toolchain
-  MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
-  ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
-  ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
-endif
-
-CC = $(CROSSDEV)gcc
-CXX = $(CROSSDEV)g++
-CPP = $(CROSSDEV)gcc -E
-LD = $(CROSSDEV)ld
-AR = $(ARCROSSDEV)ar rcs
-NM = $(ARCROSSDEV)nm
-OBJCOPY = $(CROSSDEV)objcopy
-OBJDUMP = $(CROSSDEV)objdump
-
-ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
-ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
-
-ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  ARCHOPTIMIZATION = -g
-endif
-
-ifneq ($(CONFIG_DEBUG_NOOPT),y)
-  ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
-endif
-
-ARCHCFLAGS = -fno-builtin
-ARCHCXXFLAGS = -fno-builtin -fno-exceptions -fno-rtti
-ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
-ARCHWARNINGSXX = -Wall -Wshadow -Wundef
-ARCHDEFINES =
-ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
-
-CFLAGS = $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
-AFLAGS = $(CFLAGS) -D__ASSEMBLY__
-
-NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
-LDNXFLATFLAGS = -e main -s 2048
-
-ASMEXT = .S
-OBJEXT = .o
-LIBEXT = .a
-EXEEXT =
-
-ifneq ($(CROSSDEV),arm-nuttx-elf-)
-  LDFLAGS += -nostartfiles -nodefaultlibs
-endif
-ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  LDFLAGS += -g
-endif
-
-
-HOSTCC = gcc
-HOSTINCLUDES = -I.
-HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe
-HOSTLDFLAGS =
-
diff --git a/configs/stm32f746g-disco/netnsh/defconfig b/configs/stm32f746g-disco/netnsh/defconfig
deleted file mode 100644
index 4ecc44075f..0000000000
--- a/configs/stm32f746g-disco/netnsh/defconfig
+++ /dev/null
@@ -1,1305 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Nuttx/ Configuration
-#
-
-#
-# Build Setup
-#
-# CONFIG_EXPERIMENTAL is not set
-# CONFIG_DEFAULT_SMALL is not set
-# CONFIG_HOST_LINUX is not set
-# CONFIG_HOST_OSX is not set
-CONFIG_HOST_WINDOWS=y
-# CONFIG_HOST_OTHER is not set
-# CONFIG_WINDOWS_NATIVE is not set
-CONFIG_WINDOWS_CYGWIN=y
-# CONFIG_WINDOWS_MSYS is not set
-# CONFIG_WINDOWS_OTHER is not set
-
-#
-# Build Configuration
-#
-# CONFIG_APPS_DIR="../apps"
-CONFIG_BUILD_FLAT=y
-# CONFIG_BUILD_2PASS is not set
-
-#
-# Binary Output Formats
-#
-# CONFIG_RRLOAD_BINARY is not set
-CONFIG_INTELHEX_BINARY=y
-# CONFIG_MOTOROLA_SREC is not set
-CONFIG_RAW_BINARY=y
-# CONFIG_UBOOT_UIMAGE is not set
-
-#
-# Customize Header Files
-#
-# CONFIG_ARCH_STDINT_H is not set
-# CONFIG_ARCH_STDBOOL_H is not set
-# CONFIG_ARCH_MATH_H is not set
-# CONFIG_ARCH_FLOAT_H is not set
-# CONFIG_ARCH_STDARG_H is not set
-# CONFIG_ARCH_DEBUG_H is not set
-
-#
-# Debug Options
-#
-CONFIG_DEBUG_ALERT=y
-# CONFIG_DEBUG_FEATURES is not set
-CONFIG_ARCH_HAVE_STACKCHECK=y
-# CONFIG_STACK_COLORATION is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
-# CONFIG_HEAP_COLORATION is not set
-# CONFIG_DEBUG_SYMBOLS is not set
-CONFIG_ARCH_HAVE_CUSTOMOPT=y
-CONFIG_DEBUG_NOOPT=y
-# CONFIG_DEBUG_CUSTOMOPT is not set
-# CONFIG_DEBUG_FULLOPT is not set
-
-#
-# System Type
-#
-CONFIG_ARCH_ARM=y
-# CONFIG_ARCH_AVR is not set
-# CONFIG_ARCH_HC is not set
-# CONFIG_ARCH_MIPS is not set
-# CONFIG_ARCH_RGMP is not set
-# CONFIG_ARCH_SH is not set
-# CONFIG_ARCH_SIM is not set
-# CONFIG_ARCH_X86 is not set
-# CONFIG_ARCH_Z16 is not set
-# CONFIG_ARCH_Z80 is not set
-CONFIG_ARCH="arm"
-
-#
-# ARM Options
-#
-# CONFIG_ARCH_CHIP_A1X is not set
-# CONFIG_ARCH_CHIP_C5471 is not set
-# CONFIG_ARCH_CHIP_CALYPSO is not set
-# CONFIG_ARCH_CHIP_DM320 is not set
-# CONFIG_ARCH_CHIP_EFM32 is not set
-# CONFIG_ARCH_CHIP_IMX1 is not set
-# CONFIG_ARCH_CHIP_IMX6 is not set
-# CONFIG_ARCH_CHIP_KINETIS is not set
-# CONFIG_ARCH_CHIP_KL is not set
-# CONFIG_ARCH_CHIP_LM is not set
-# CONFIG_ARCH_CHIP_TIVA is not set
-# CONFIG_ARCH_CHIP_LPC11XX is not set
-# CONFIG_ARCH_CHIP_LPC17XX is not set
-# CONFIG_ARCH_CHIP_LPC214X is not set
-# CONFIG_ARCH_CHIP_LPC2378 is not set
-# CONFIG_ARCH_CHIP_LPC31XX is not set
-# CONFIG_ARCH_CHIP_LPC43XX is not set
-# CONFIG_ARCH_CHIP_NUC1XX is not set
-# CONFIG_ARCH_CHIP_SAMA5 is not set
-# CONFIG_ARCH_CHIP_SAMD is not set
-# CONFIG_ARCH_CHIP_SAML is not set
-# CONFIG_ARCH_CHIP_SAM34 is not set
-# CONFIG_ARCH_CHIP_SAMV7 is not set
-# CONFIG_ARCH_CHIP_STM32 is not set
-CONFIG_ARCH_CHIP_STM32F7=y
-# CONFIG_ARCH_CHIP_STM32L4 is not set
-# CONFIG_ARCH_CHIP_STR71X is not set
-# CONFIG_ARCH_CHIP_TMS570 is not set
-# CONFIG_ARCH_CHIP_MOXART is not set
-# CONFIG_ARCH_ARM7TDMI is not set
-# CONFIG_ARCH_ARM926EJS is not set
-# CONFIG_ARCH_ARM920T is not set
-# CONFIG_ARCH_CORTEXM0 is not set
-# CONFIG_ARCH_CORTEXM3 is not set
-# CONFIG_ARCH_CORTEXM4 is not set
-CONFIG_ARCH_CORTEXM7=y
-# CONFIG_ARCH_CORTEXA5 is not set
-# CONFIG_ARCH_CORTEXA8 is not set
-# CONFIG_ARCH_CORTEXA9 is not set
-# CONFIG_ARCH_CORTEXR4 is not set
-# CONFIG_ARCH_CORTEXR4F is not set
-# CONFIG_ARCH_CORTEXR5 is not set
-# CONFIG_ARCH_CORTEX5F is not set
-# CONFIG_ARCH_CORTEXR7 is not set
-# CONFIG_ARCH_CORTEXR7F is not set
-CONFIG_ARCH_FAMILY="armv7-m"
-CONFIG_ARCH_CHIP="stm32f7"
-# CONFIG_ARM_TOOLCHAIN_IAR is not set
-CONFIG_ARM_TOOLCHAIN_GNU=y
-# CONFIG_ARMV7M_USEBASEPRI is not set
-CONFIG_ARCH_HAVE_CMNVECTOR=y
-CONFIG_ARMV7M_CMNVECTOR=y
-# CONFIG_ARMV7M_LAZYFPU is not set
-CONFIG_ARCH_HAVE_FPU=y
-# CONFIG_ARCH_HAVE_DPFPU is not set
-# CONFIG_ARCH_FPU is not set
-# CONFIG_ARCH_HAVE_TRUSTZONE is not set
-CONFIG_ARM_HAVE_MPU_UNIFIED=y
-# CONFIG_ARM_MPU is not set
-
-#
-# ARMV7M Configuration Options
-#
-CONFIG_ARMV7M_HAVE_ICACHE=y
-CONFIG_ARMV7M_HAVE_DCACHE=y
-CONFIG_ARMV7M_ICACHE=y
-CONFIG_ARMV7M_DCACHE=y
-CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y
-CONFIG_ARMV7M_HAVE_ITCM=y
-CONFIG_ARMV7M_HAVE_DTCM=y
-# CONFIG_ARMV7M_ITCM is not set
-CONFIG_ARMV7M_DTCM=y
-# CONFIG_ARMV7M_TOOLCHAIN_IARW is not set
-# CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
-# CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
-# CONFIG_ARMV7M_TOOLCHAIN_CODEREDW is not set
-# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW is not set
-# CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM is not set
-# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
-CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y
-# CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE is not set
-CONFIG_ARMV7M_HAVE_STACKCHECK=y
-# CONFIG_ARMV7M_STACKCHECK is not set
-# CONFIG_ARMV7M_ITMSYSLOG is not set
-# CONFIG_SERIAL_TERMIOS is not set
-# CONFIG_USART6_RS485 is not set
-# CONFIG_SERIAL_DISABLE_REORDERING is not set
-
-#
-# STM32 F7 Configuration Options
-#
-CONFIG_ARCH_CHIP_STM32F745VG=y
-# CONFIG_ARCH_CHIP_STM32F745VE is not set
-# CONFIG_ARCH_CHIP_STM32F745IG is not set
-# CONFIG_ARCH_CHIP_STM32F745IE is not set
-# CONFIG_ARCH_CHIP_STM32F745ZE is not set
-# CONFIG_ARCH_CHIP_STM32F745ZG is not set
-# CONFIG_ARCH_CHIP_STM32F746BG is not set
-# CONFIG_ARCH_CHIP_STM32F746VG is not set
-# CONFIG_ARCH_CHIP_STM32F746VE is not set
-# CONFIG_ARCH_CHIP_STM32F746BE is not set
-# CONFIG_ARCH_CHIP_STM32F746ZG is not set
-# CONFIG_ARCH_CHIP_STM32F746IE is not set
-# CONFIG_ARCH_CHIP_STM32F746NG is not set
-# CONFIG_ARCH_CHIP_STM32F746NE is not set
-# CONFIG_ARCH_CHIP_STM32F746ZE is not set
-# CONFIG_ARCH_CHIP_STM32F746IG is not set
-# CONFIG_ARCH_CHIP_STM32F756NG is not set
-# CONFIG_ARCH_CHIP_STM32F756BG is not set
-# CONFIG_ARCH_CHIP_STM32F756IG is not set
-# CONFIG_ARCH_CHIP_STM32F756VG is not set
-# CONFIG_ARCH_CHIP_STM32F756ZG is not set
-# CONFIG_ARCH_CHIP_STM32F765NI is not set
-# CONFIG_ARCH_CHIP_STM32F765VI is not set
-# CONFIG_ARCH_CHIP_STM32F765VG is not set
-# CONFIG_ARCH_CHIP_STM32F765BI is not set
-# CONFIG_ARCH_CHIP_STM32F765NG is not set
-# CONFIG_ARCH_CHIP_STM32F765ZG is not set
-# CONFIG_ARCH_CHIP_STM32F765ZI is not set
-# CONFIG_ARCH_CHIP_STM32F765IG is not set
-# CONFIG_ARCH_CHIP_STM32F765BG is not set
-# CONFIG_ARCH_CHIP_STM32F765II is not set
-# CONFIG_ARCH_CHIP_STM32F767NG is not set
-# CONFIG_ARCH_CHIP_STM32F767IG is not set
-# CONFIG_ARCH_CHIP_STM32F767VG is not set
-# CONFIG_ARCH_CHIP_STM32F767ZG is not set
-# CONFIG_ARCH_CHIP_STM32F767NI is not set
-# CONFIG_ARCH_CHIP_STM32F767VI is not set
-# CONFIG_ARCH_CHIP_STM32F767BG is not set
-# CONFIG_ARCH_CHIP_STM32F767ZI is not set
-# CONFIG_ARCH_CHIP_STM32F767II is not set
-# CONFIG_ARCH_CHIP_STM32F769BI is not set
-# CONFIG_ARCH_CHIP_STM32F769II is not set
-# CONFIG_ARCH_CHIP_STM32F769BG is not set
-# CONFIG_ARCH_CHIP_STM32F769NI is not set
-# CONFIG_ARCH_CHIP_STM32F769AI is not set
-# CONFIG_ARCH_CHIP_STM32F769NG is not set
-# CONFIG_ARCH_CHIP_STM32F769IG is not set
-# CONFIG_ARCH_CHIP_STM32F777ZI is not set
-# CONFIG_ARCH_CHIP_STM32F777VI is not set
-# CONFIG_ARCH_CHIP_STM32F777NI is not set
-# CONFIG_ARCH_CHIP_STM32F777BI is not set
-# CONFIG_ARCH_CHIP_STM32F777II is not set
-# CONFIG_ARCH_CHIP_STM32F778AI is not set
-# CONFIG_ARCH_CHIP_STM32F779II is not set
-# CONFIG_ARCH_CHIP_STM32F779NI is not set
-# CONFIG_ARCH_CHIP_STM32F779BI is not set
-# CONFIG_ARCH_CHIP_STM32F779AI is not set
-CONFIG_STM32F7_STM32F74XX=y
-# CONFIG_STM32F7_STM32F75XX is not set
-# CONFIG_STM32F7_STM32F76XX is not set
-# CONFIG_STM32F7_STM32F77XX is not set
-CONFIG_STM32F7_IO_CONFIG_V=y
-# CONFIG_STM32F7_IO_CONFIG_I is not set
-# CONFIG_STM32F7_IO_CONFIG_Z is not set
-# CONFIG_STM32F7_IO_CONFIG_N is not set
-# CONFIG_STM32F7_IO_CONFIG_B is not set
-# CONFIG_STM32F7_IO_CONFIG_A is not set
-CONFIG_STM32F7_STM32F745XX=y
-# CONFIG_STM32F7_STM32F746XX is not set
-# CONFIG_STM32F7_STM32F756XX is not set
-# CONFIG_STM32F7_STM32F765XX is not set
-# CONFIG_STM32F7_STM32F767XX is not set
-# CONFIG_STM32F7_STM32F768XX is not set
-# CONFIG_STM32F7_STM32F768AX is not set
-# CONFIG_STM32F7_STM32F769XX is not set
-# CONFIG_STM32F7_STM32F769AX is not set
-# CONFIG_STM32F7_STM32F777XX is not set
-# CONFIG_STM32F7_STM32F778XX is not set
-# CONFIG_STM32F7_STM32F778AX is not set
-# CONFIG_STM32F7_STM32F779XX is not set
-# CONFIG_STM32F7_STM32F779AX is not set
-# CONFIG_STM32F7_FLASH_CONFIG_E is not set
-# CONFIG_STM32F7_FLASH_CONFIG_I is not set
-CONFIG_STM32F7_FLASH_OVERRIDE_DEFAULT=y
-# CONFIG_STM32F7_FLASH_OVERRIDE_E is not set
-# CONFIG_STM32F7_FLASH_OVERRIDE_G is not set
-# CONFIG_STM32F7_FLASH_OVERRIDE_I is not set
-
-#
-# STM32 Peripheral Support
-#
-# CONFIG_STM32F7_HAVE_LTDC is not set
-CONFIG_STM32F7_HAVE_FSMC=y
-CONFIG_STM32F7_HAVE_ETHRNET=y
-CONFIG_STM32F7_HAVE_RNG=y
-# CONFIG_STM32F7_HAVE_SPI5 is not set
-# CONFIG_STM32F7_HAVE_SPI6 is not set
-# CONFIG_STM32F7_HAVE_SDMMC2 is not set
-# CONFIG_STM32F7_HAVE_ADC1_DMA is not set
-# CONFIG_STM32F7_HAVE_ADC2_DMA is not set
-# CONFIG_STM32F7_HAVE_ADC3_DMA is not set
-# CONFIG_STM32F7_HAVE_CAN3 is not set
-CONFIG_STM32F7_HAVE_DCMI=y
-# CONFIG_STM32F7_HAVE_DSIHOST is not set
-CONFIG_STM32F7_HAVE_DMA2D=y
-# CONFIG_STM32F7_HAVE_JPEG is not set
-# CONFIG_STM32F7_HAVE_CRYP is not set
-# CONFIG_STM32F7_HAVE_HASH is not set
-# CONFIG_STM32F7_HAVE_DFSDM1 is not set
-# CONFIG_STM32F7_ADC is not set
-# CONFIG_STM32F7_CAN is not set
-# CONFIG_STM32F7_DAC is not set
-# CONFIG_STM32F7_DMA is not set
-# CONFIG_STM32F7_I2C is not set
-# CONFIG_STM32F7_SAI is not set
-# CONFIG_STM32F7_SPI is not set
-# CONFIG_STM32F7_TIM is not set
-CONFIG_STM32F7_USART=y
-# CONFIG_STM32F7_ADC1 is not set
-# CONFIG_STM32F7_ADC2 is not set
-# CONFIG_STM32F7_ADC3 is not set
-# CONFIG_STM32F7_BKPSRAM is not set
-# CONFIG_STM32F7_CAN1 is not set
-# CONFIG_STM32F7_CAN2 is not set
-# CONFIG_STM32F7_CEC is not set
-# CONFIG_STM32F7_CRC is not set
-# CONFIG_STM32F7_DMA1 is not set
-# CONFIG_STM32F7_DMA2 is not set
-# CONFIG_STM32F7_DAC1 is not set
-# CONFIG_STM32F7_DAC2 is not set
-# CONFIG_STM32F7_DCMI is not set
-# CONFIG_STM32F7_DMA2D is not set
-CONFIG_STM32F7_ETHMAC=y
-# CONFIG_STM32F7_FSMC is not set
-# CONFIG_STM32F7_I2C1 is not set
-# CONFIG_STM32F7_I2C2 is not set
-# CONFIG_STM32F7_I2C3 is not set
-# CONFIG_STM32F7_I2C4 is not set
-# CONFIG_STM32F7_LPTIM1 is not set
-# CONFIG_STM32F7_OTGFS is not set
-# CONFIG_STM32F7_OTGHS is not set
-# CONFIG_STM32F7_QUADSPI is not set
-# CONFIG_STM32F7_RNG is not set
-# CONFIG_STM32F7_SAI1 is not set
-# CONFIG_STM32F7_SAI2 is not set
-# CONFIG_STM32F7_SDMMC1 is not set
-# CONFIG_STM32F7_SPDIFRX is not set
-# CONFIG_STM32F7_SPI1 is not set
-# CONFIG_STM32F7_SPI2 is not set
-# CONFIG_STM32F7_SPI3 is not set
-# CONFIG_STM32F7_SPI4 is not set
-# CONFIG_STM32F7_TIM1 is not set
-# CONFIG_STM32F7_TIM2 is not set
-# CONFIG_STM32F7_TIM3 is not set
-# CONFIG_STM32F7_TIM4 is not set
-# CONFIG_STM32F7_TIM5 is not set
-# CONFIG_STM32F7_TIM6 is not set
-# CONFIG_STM32F7_TIM7 is not set
-# CONFIG_STM32F7_TIM8 is not set
-# CONFIG_STM32F7_TIM9 is not set
-# CONFIG_STM32F7_TIM10 is not set
-# CONFIG_STM32F7_TIM11 is not set
-# CONFIG_STM32F7_TIM12 is not set
-# CONFIG_STM32F7_TIM13 is not set
-# CONFIG_STM32F7_TIM14 is not set
-# CONFIG_STM32F7_USART1 is not set
-# CONFIG_STM32F7_USART2 is not set
-# CONFIG_STM32F7_USART3 is not set
-# CONFIG_STM32F7_UART4 is not set
-# CONFIG_STM32F7_UART5 is not set
-CONFIG_STM32F7_USART6=y
-# CONFIG_STM32F7_UART7 is not set
-# CONFIG_STM32F7_UART8 is not set
-# CONFIG_STM32F7_IWDG is not set
-# CONFIG_STM32F7_WWDG is not set
-
-#
-# U[S]ART Configuration
-#
-# CONFIG_STM32F7_FLOWCONTROL_BROKEN is not set
-# CONFIG_STM32F7_USART_BREAKS is not set
-# CONFIG_STM32F7_CUSTOM_CLOCKCONFIG is not set
-
-#
-# Timer Configuration
-#
-
-#
-# Ethernet MAC configuration
-#
-CONFIG_STM32F7_PHYADDR=0
-# CONFIG_STM32F7_PHYINIT is not set
-# CONFIG_STM32F7_MII is not set
-CONFIG_STM32F7_AUTONEG=y
-CONFIG_STM32F7_PHYSR=31
-CONFIG_STM32F7_PHYSR_ALTCONFIG=y
-CONFIG_STM32F7_PHYSR_ALTMODE=0x001c
-CONFIG_STM32F7_PHYSR_10HD=0x0004
-CONFIG_STM32F7_PHYSR_100HD=0x0008
-CONFIG_STM32F7_PHYSR_10FD=0x0014
-CONFIG_STM32F7_PHYSR_100FD=0x0018
-# CONFIG_STM32F7_ETH_PTP is not set
-CONFIG_STM32F7_RMII=y
-# CONFIG_STM32F7_RMII_MCO1 is not set
-# CONFIG_STM32F7_RMII_MCO2 is not set
-CONFIG_STM32F7_RMII_EXTCLK=y
-
-#
-# Architecture Options
-#
-# CONFIG_ARCH_NOINTC is not set
-# CONFIG_ARCH_VECNOTIRQ is not set
-# CONFIG_ARCH_DMA is not set
-CONFIG_ARCH_HAVE_IRQPRIO=y
-# CONFIG_ARCH_L2CACHE is not set
-# CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
-# CONFIG_ARCH_HAVE_ADDRENV is not set
-# CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
-# CONFIG_ARCH_HAVE_MULTICPU is not set
-CONFIG_ARCH_HAVE_VFORK=y
-# CONFIG_ARCH_HAVE_MMU is not set
-CONFIG_ARCH_HAVE_MPU=y
-# CONFIG_ARCH_NAND_HWECC is not set
-# CONFIG_ARCH_HAVE_EXTCLK is not set
-# CONFIG_ARCH_HAVE_POWEROFF is not set
-# CONFIG_ARCH_HAVE_RESET is not set
-# CONFIG_ARCH_USE_MPU is not set
-# CONFIG_ARCH_IRQPRIO is not set
-CONFIG_ARCH_STACKDUMP=y
-# CONFIG_ENDIAN_BIG is not set
-# CONFIG_ARCH_IDLE_CUSTOM is not set
-# CONFIG_ARCH_HAVE_RAMFUNCS is not set
-CONFIG_ARCH_HAVE_RAMVECTORS=y
-# CONFIG_ARCH_RAMVECTORS is not set
-
-#
-# Board Settings
-#
-CONFIG_BOARD_LOOPSPERMSEC=43103
-# CONFIG_ARCH_CALIBRATION is not set
-
-#
-# Interrupt options
-#
-CONFIG_ARCH_HAVE_INTERRUPTSTACK=y
-CONFIG_ARCH_INTERRUPTSTACK=0
-CONFIG_ARCH_HAVE_HIPRI_INTERRUPT=y
-# CONFIG_ARCH_HIPRI_INTERRUPT is not set
-
-#
-# Boot options
-#
-# CONFIG_BOOT_RUNFROMEXTSRAM is not set
-CONFIG_BOOT_RUNFROMFLASH=y
-# CONFIG_BOOT_RUNFROMISRAM is not set
-# CONFIG_BOOT_RUNFROMSDRAM is not set
-# CONFIG_BOOT_COPYTORAM is not set
-
-#
-# Boot Memory Configuration
-#
-CONFIG_RAM_START=0x20010000
-CONFIG_RAM_SIZE=245760
-# CONFIG_ARCH_HAVE_SDRAM is not set
-
-#
-# Board Selection
-#
-CONFIG_ARCH_BOARD_CUSTOM=y
-
-#
-# Custom Board Configuration
-#
-CONFIG_ARCH_BOARD_CUSTOM_NAME=""
-CONFIG_ARCH_BOARD_CUSTOM_DIR=""
-# CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH is not set
-# CONFIG_BOARD_CRASHDUMP is not set
-# CONFIG_BOARD_CUSTOM_LEDS is not set
-# CONFIG_BOARD_CUSTOM_BUTTONS is not set
-# CONFIG_BOARD_CUSTOM_INTERRUPT is not set
-
-#
-# Common Board Options
-#
-CONFIG_NSH_MMCSDMINOR=0
-
-#
-# Board-Specific Options
-#
-# CONFIG_LIB_BOARDCTL is not set
-
-#
-# RTOS Features
-#
-CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_POSIX_TIMERS is not set
-# CONFIG_DISABLE_PTHREAD is not set
-# CONFIG_DISABLE_SIGNALS is not set
-# CONFIG_DISABLE_MQUEUE is not set
-# CONFIG_DISABLE_ENVIRON is not set
-
-#
-# Clocks and Timers
-#
-CONFIG_USEC_PER_TICK=10000
-# CONFIG_SYSTEM_TIME64 is not set
-# CONFIG_CLOCK_MONOTONIC is not set
-# CONFIG_JULIAN_TIME is not set
-CONFIG_START_YEAR=2011
-CONFIG_START_MONTH=12
-CONFIG_START_DAY=6
-CONFIG_MAX_WDOGPARMS=2
-CONFIG_PREALLOC_WDOGS=4
-CONFIG_WDOG_INTRESERVE=0
-CONFIG_PREALLOC_TIMERS=4
-
-#
-# Tasks and Scheduling
-#
-# CONFIG_INIT_NONE is not set
-CONFIG_INIT_ENTRYPOINT=y
-# CONFIG_INIT_FILEPATH is not set
-CONFIG_USER_ENTRYPOINT="nsh_main"
-CONFIG_RR_INTERVAL=200
-# CONFIG_SCHED_SPORADIC is not set
-CONFIG_TASK_NAME_SIZE=0
-CONFIG_MAX_TASKS=16
-# CONFIG_SCHED_HAVE_PARENT is not set
-CONFIG_SCHED_WAITPID=y
-
-#
-# Pthread Options
-#
-# CONFIG_MUTEX_TYPES is not set
-CONFIG_NPTHREAD_KEYS=4
-
-#
-# Performance Monitoring
-#
-# CONFIG_SCHED_CPULOAD is not set
-# CONFIG_SCHED_INSTRUMENTATION is not set
-
-#
-# Files and I/O
-#
-CONFIG_DEV_CONSOLE=y
-# CONFIG_FDCLONE_DISABLE is not set
-# CONFIG_FDCLONE_STDIO is not set
-CONFIG_SDCLONE_DISABLE=y
-CONFIG_NFILE_DESCRIPTORS=8
-CONFIG_NFILE_STREAMS=8
-CONFIG_NAME_MAX=32
-# CONFIG_PRIORITY_INHERITANCE is not set
-
-#
-# RTOS hooks
-#
-# CONFIG_BOARD_INITIALIZE is not set
-# CONFIG_SCHED_STARTHOOK is not set
-# CONFIG_SCHED_ATEXIT is not set
-# CONFIG_SCHED_ONEXIT is not set
-# CONFIG_SIG_EVTHREAD is not set
-
-#
-# Signal Numbers
-#
-CONFIG_SIG_SIGUSR1=1
-CONFIG_SIG_SIGUSR2=2
-CONFIG_SIG_SIGALARM=3
-CONFIG_SIG_SIGCONDTIMEDOUT=16
-CONFIG_SIG_SIGWORK=17
-
-#
-# POSIX Message Queue Options
-#
-CONFIG_PREALLOC_MQ_MSGS=4
-CONFIG_MQ_MAXMSGSIZE=32
-# CONFIG_MODULE is not set
-
-#
-# Work queue support
-#
-CONFIG_SCHED_WORKQUEUE=y
-CONFIG_SCHED_HPWORK=y
-CONFIG_SCHED_HPWORKPRIORITY=224
-CONFIG_SCHED_HPWORKPERIOD=50000
-CONFIG_SCHED_HPWORKSTACKSIZE=2048
-# CONFIG_SCHED_LPWORK is not set
-
-#
-# Stack and heap information
-#
-CONFIG_IDLETHREAD_STACKSIZE=1024
-CONFIG_USERMAIN_STACKSIZE=2048
-CONFIG_PTHREAD_STACK_MIN=256
-CONFIG_PTHREAD_STACK_DEFAULT=2048
-# CONFIG_LIB_SYSCALL is not set
-
-#
-# Device Drivers
-#
-CONFIG_DISABLE_POLL=y
-CONFIG_DEV_NULL=y
-# CONFIG_DEV_ZERO is not set
-# CONFIG_DEV_LOOP is not set
-
-#
-# Buffering
-#
-# CONFIG_DRVR_WRITEBUFFER is not set
-# CONFIG_DRVR_READAHEAD is not set
-# CONFIG_RAMDISK is not set
-# CONFIG_CAN is not set
-# CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
-# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
-# CONFIG_PWM is not set
-CONFIG_ARCH_HAVE_I2CRESET=y
-# CONFIG_I2C is not set
-CONFIG_SPI=y
-# CONFIG_SPI_SLAVE is not set
-CONFIG_SPI_EXCHANGE=y
-# CONFIG_SPI_CMDDATA is not set
-# CONFIG_SPI_CALLBACK is not set
-# CONFIG_SPI_BITBANG is not set
-# CONFIG_SPI_HWFEATURES is not set
-# CONFIG_SPI_CRCGENERATION is not set
-# CONFIG_SPI_CS_CONTROL is not set
-# CONFIG_SPI_CS_DELAY_CONTROL is not set
-# CONFIG_I2S is not set
-
-#
-# Timer Driver Support
-#
-# CONFIG_TIMER is not set
-# CONFIG_RTC is not set
-# CONFIG_WATCHDOG is not set
-# CONFIG_ANALOG is not set
-# CONFIG_AUDIO_DEVICES is not set
-# CONFIG_VIDEO_DEVICES is not set
-# CONFIG_BCH is not set
-# CONFIG_INPUT is not set
-# CONFIG_IOEXPANDER is not set
-
-#
-# LCD Driver Support
-#
-# CONFIG_LCD is not set
-# CONFIG_SLCD is not set
-
-#
-# LED Support
-#
-# CONFIG_RGBLED is not set
-# CONFIG_PCA9635PW is not set
-# CONFIG_NCP5623C is not set
-# CONFIG_MMCSD is not set
-# CONFIG_MODEM is not set
-# CONFIG_MTD is not set
-# CONFIG_EEPROM is not set
-CONFIG_NETDEVICES=y
-
-#
-# General Ethernet MAC Driver Options
-#
-# CONFIG_NETDEV_LOOPBACK is not set
-CONFIG_NETDEV_TELNET=y
-CONFIG_TELNET_RXBUFFER_SIZE=256
-CONFIG_TELNET_TXBUFFER_SIZE=256
-# CONFIG_NETDEV_MULTINIC is not set
-# CONFIG_ARCH_HAVE_NETDEV_STATISTICS is not set
-# CONFIG_NETDEV_LATEINIT is not set
-
-#
-# External Ethernet MAC Device Support
-#
-# CONFIG_NET_DM90x0 is not set
-# CONFIG_ENC28J60 is not set
-# CONFIG_ENCX24J600 is not set
-# CONFIG_NET_E1000 is not set
-# CONFIG_NET_SLIP is not set
-# CONFIG_NET_FTMAC100 is not set
-# CONFIG_NET_VNET is not set
-
-#
-# External Ethernet PHY Device Support
-#
-# CONFIG_ARCH_PHY_INTERRUPT is not set
-# CONFIG_ETH0_PHY_NONE is not set
-# CONFIG_ETH0_PHY_AM79C874 is not set
-# CONFIG_ETH0_PHY_KS8721 is not set
-# CONFIG_ETH0_PHY_KSZ8041 is not set
-# CONFIG_ETH0_PHY_KSZ8051 is not set
-# CONFIG_ETH0_PHY_KSZ8061 is not set
-# CONFIG_ETH0_PHY_KSZ8081 is not set
-# CONFIG_ETH0_PHY_KSZ90x1 is not set
-# CONFIG_ETH0_PHY_DP83848C is not set
-# CONFIG_ETH0_PHY_LAN8720 is not set
-# CONFIG_ETH0_PHY_LAN8740 is not set
-# CONFIG_ETH0_PHY_LAN8740A is not set
-CONFIG_ETH0_PHY_LAN8742A=y
-# CONFIG_ETH0_PHY_DM9161 is not set
-# CONFIG_PIPES is not set
-# CONFIG_PM is not set
-# CONFIG_POWER is not set
-# CONFIG_SENSORS is not set
-# CONFIG_SERCOMM_CONSOLE is not set
-CONFIG_SERIAL=y
-# CONFIG_DEV_LOWCONSOLE is not set
-# CONFIG_SERIAL_REMOVABLE is not set
-CONFIG_SERIAL_CONSOLE=y
-# CONFIG_16550_UART is not set
-# CONFIG_UART_SERIALDRIVER is not set
-# CONFIG_UART0_SERIALDRIVER is not set
-# CONFIG_UART1_SERIALDRIVER is not set
-# CONFIG_UART2_SERIALDRIVER is not set
-# CONFIG_UART3_SERIALDRIVER is not set
-# CONFIG_UART4_SERIALDRIVER is not set
-# CONFIG_UART5_SERIALDRIVER is not set
-# CONFIG_UART6_SERIALDRIVER is not set
-# CONFIG_UART7_SERIALDRIVER is not set
-# CONFIG_UART8_SERIALDRIVER is not set
-# CONFIG_SCI0_SERIALDRIVER is not set
-# CONFIG_SCI1_SERIALDRIVER is not set
-# CONFIG_USART0_SERIALDRIVER is not set
-# CONFIG_USART1_SERIALDRIVER is not set
-# CONFIG_USART2_SERIALDRIVER is not set
-# CONFIG_USART3_SERIALDRIVER is not set
-# CONFIG_USART4_SERIALDRIVER is not set
-# CONFIG_USART5_SERIALDRIVER is not set
-CONFIG_USART6_SERIALDRIVER=y
-# CONFIG_USART7_SERIALDRIVER is not set
-# CONFIG_USART8_SERIALDRIVER is not set
-# CONFIG_OTHER_UART_SERIALDRIVER is not set
-CONFIG_MCU_SERIAL=y
-CONFIG_STANDARD_SERIAL=y
-# CONFIG_SERIAL_IFLOWCONTROL is not set
-# CONFIG_SERIAL_OFLOWCONTROL is not set
-# CONFIG_SERIAL_DMA is not set
-CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
-CONFIG_USART6_SERIAL_CONSOLE=y
-# CONFIG_OTHER_SERIAL_CONSOLE is not set
-# CONFIG_NO_SERIAL_CONSOLE is not set
-
-#
-# USART6 Configuration
-#
-CONFIG_USART6_RXBUFSIZE=256
-CONFIG_USART6_TXBUFSIZE=256
-CONFIG_USART6_BAUD=115200
-CONFIG_USART6_BITS=8
-CONFIG_USART6_PARITY=0
-CONFIG_USART6_2STOP=0
-# CONFIG_USART6_IFLOWCONTROL is not set
-# CONFIG_USART6_OFLOWCONTROL is not set
-# CONFIG_USART6_DMA is not set
-# CONFIG_USBDEV is not set
-# CONFIG_USBHOST is not set
-# CONFIG_DRIVERS_WIRELESS is not set
-
-#
-# System Logging
-#
-# CONFIG_ARCH_SYSLOG is not set
-# CONFIG_RAMLOG is not set
-# CONFIG_SYSLOG_INTBUFFER is not set
-# CONFIG_SYSLOG_TIMESTAMP is not set
-CONFIG_SYSLOG_SERIAL_CONSOLE=y
-# CONFIG_SYSLOG_CHAR is not set
-CONFIG_SYSLOG_CONSOLE=y
-# CONFIG_SYSLOG_NONE is not set
-# CONFIG_SYSLOG_FILE is not set
-
-#
-# Networking Support
-#
-CONFIG_ARCH_HAVE_NET=y
-CONFIG_ARCH_HAVE_PHY=y
-CONFIG_NET=y
-CONFIG_NET_NOINTS=y
-# CONFIG_NET_PROMISCUOUS is not set
-
-#
-# Driver buffer configuration
-#
-CONFIG_NET_MULTIBUFFER=y
-CONFIG_NET_ETH_MTU=1294
-CONFIG_NET_ETH_TCP_RECVWNDO=1220
-CONFIG_NET_GUARDSIZE=2
-
-#
-# Data link support
-#
-# CONFIG_NET_MULTILINK is not set
-CONFIG_NET_ETHERNET=y
-# CONFIG_NET_LOOPBACK is not set
-# CONFIG_NET_TUN is not set
-
-#
-# Network Device Operations
-#
-# CONFIG_NETDEV_PHY_IOCTL is not set
-
-#
-# Internet Protocol Selection
-#
-CONFIG_NET_IPv4=y
-CONFIG_NET_IPv6=y
-CONFIG_NET_IPv6_NCONF_ENTRIES=8
-
-#
-# Socket Support
-#
-CONFIG_NSOCKET_DESCRIPTORS=8
-CONFIG_NET_NACTIVESOCKETS=16
-CONFIG_NET_SOCKOPTS=y
-# CONFIG_NET_SOLINGER is not set
-
-#
-# Raw Socket Support
-#
-# CONFIG_NET_PKT is not set
-
-#
-# Unix Domain Socket Support
-#
-# CONFIG_NET_LOCAL is not set
-
-#
-# TCP/IP Networking
-#
-CONFIG_NET_TCP=y
-# CONFIG_NET_TCPURGDATA is not set
-CONFIG_NET_TCP_CONNS=8
-CONFIG_NET_MAX_LISTENPORTS=20
-# CONFIG_NET_TCP_READAHEAD is not set
-CONFIG_NET_TCP_WRITE_BUFFERS=y
-CONFIG_NET_TCP_NWRBCHAINS=8
-CONFIG_NET_TCP_RECVDELAY=0
-CONFIG_NET_TCPBACKLOG=y
-# CONFIG_NET_SENDFILE is not set
-
-#
-# UDP Networking
-#
-CONFIG_NET_UDP=y
-CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NET_UDP_CONNS=8
-CONFIG_NET_BROADCAST=y
-# CONFIG_NET_RXAVAIL is not set
-CONFIG_NET_UDP_READAHEAD=y
-
-#
-# ICMP Networking Support
-#
-CONFIG_NET_ICMP=y
-CONFIG_NET_ICMP_PING=y
-
-#
-# ICMPv6 Networking Support
-#
-CONFIG_NET_ICMPv6=y
-CONFIG_NET_ICMPv6_PING=y
-CONFIG_NET_ICMPv6_NEIGHBOR=y
-CONFIG_ICMPv6_NEIGHBOR_MAXTRIES=5
-CONFIG_ICMPv6_NEIGHBOR_DELAYMSEC=20
-# CONFIG_NET_ICMPv6_AUTOCONF is not set
-# CONFIG_NET_ICMPv6_ROUTER is not set
-
-#
-# IGMPv2 Client Support
-#
-# CONFIG_NET_IGMP is not set
-
-#
-# ARP Configuration
-#
-CONFIG_NET_ARP=y
-CONFIG_NET_ARPTAB_SIZE=16
-CONFIG_NET_ARP_MAXAGE=120
-CONFIG_NET_ARP_IPIN=y
-CONFIG_NET_ARP_SEND=y
-CONFIG_ARP_SEND_MAXTRIES=5
-CONFIG_ARP_SEND_DELAYMSEC=20
-
-#
-# Network I/O Buffer Support
-#
-CONFIG_NET_IOB=y
-CONFIG_IOB_NBUFFERS=24
-CONFIG_IOB_BUFSIZE=196
-CONFIG_IOB_NCHAINS=8
-# CONFIG_NET_ARCH_INCR32 is not set
-# CONFIG_NET_ARCH_CHKSUM is not set
-# CONFIG_NET_STATISTICS is not set
-
-#
-# Routing Table Configuration
-#
-# CONFIG_NET_ROUTE is not set
-CONFIG_NET_HOSTNAME="STM32F746G-DISCO"
-
-#
-# Crypto API
-#
-# CONFIG_CRYPTO is not set
-
-#
-# File Systems
-#
-
-#
-# File system configuration
-#
-# CONFIG_DISABLE_MOUNTPOINT is not set
-# CONFIG_FS_AUTOMOUNTER is not set
-# CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
-# CONFIG_FS_READABLE is not set
-# CONFIG_FS_WRITABLE is not set
-# CONFIG_FS_NAMED_SEMAPHORES is not set
-CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
-# CONFIG_FS_RAMMAP is not set
-# CONFIG_FS_FAT is not set
-# CONFIG_NFS is not set
-# CONFIG_FS_NXFFS is not set
-# CONFIG_FS_ROMFS is not set
-# CONFIG_FS_TMPFS is not set
-# CONFIG_FS_SMARTFS is not set
-# CONFIG_FS_BINFS is not set
-# CONFIG_FS_PROCFS is not set
-# CONFIG_FS_UNIONFS is not set
-
-#
-# Graphics Support
-#
-# CONFIG_NX is not set
-
-#
-# Memory Management
-#
-# CONFIG_MM_SMALL is not set
-CONFIG_MM_REGIONS=2
-# CONFIG_ARCH_HAVE_HEAP2 is not set
-# CONFIG_GRAN is not set
-
-#
-# Audio Support
-#
-# CONFIG_AUDIO is not set
-
-#
-# Wireless Support
-#
-
-#
-# Binary Loader
-#
-# CONFIG_BINFMT_DISABLE is not set
-# CONFIG_BINFMT_EXEPATH is not set
-# CONFIG_NXFLAT is not set
-# CONFIG_ELF is not set
-CONFIG_BUILTIN=y
-# CONFIG_PIC is not set
-# CONFIG_SYMTAB_ORDEREDBYNAME is not set
-
-#
-# Library Routines
-#
-
-#
-# Standard C Library Options
-#
-CONFIG_STDIO_BUFFER_SIZE=64
-CONFIG_STDIO_LINEBUFFER=y
-CONFIG_NUNGET_CHARS=2
-CONFIG_LIB_HOMEDIR="/"
-# CONFIG_LIBM is not set
-# CONFIG_NOPRINTF_FIELDWIDTH is not set
-# CONFIG_LIBC_FLOATINGPOINT is not set
-CONFIG_LIBC_LONG_LONG=y
-# CONFIG_LIBC_IOCTL_VARIADIC is not set
-CONFIG_LIB_RAND_ORDER=1
-# CONFIG_EOL_IS_CR is not set
-# CONFIG_EOL_IS_LF is not set
-# CONFIG_EOL_IS_BOTH_CRLF is not set
-CONFIG_EOL_IS_EITHER_CRLF=y
-# CONFIG_LIBC_EXECFUNCS is not set
-CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
-CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
-# CONFIG_LIBC_STRERROR is not set
-# CONFIG_LIBC_PERROR_STDOUT is not set
-CONFIG_ARCH_LOWPUTC=y
-# CONFIG_LIBC_LOCALTIME is not set
-# CONFIG_TIME_EXTENDED is not set
-CONFIG_LIB_SENDFILE_BUFSIZE=512
-# CONFIG_ARCH_ROMGETC is not set
-# CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
-CONFIG_ARCH_HAVE_TLS=y
-# CONFIG_TLS is not set
-CONFIG_LIBC_NETDB=y
-# CONFIG_NETDB_DNSCLIENT is not set
-
-#
-# Non-standard Library Support
-#
-# CONFIG_LIB_CRC64_FAST is not set
-# CONFIG_LIB_KBDCODEC is not set
-# CONFIG_LIB_SLCDCODEC is not set
-
-#
-# Basic CXX Support
-#
-# CONFIG_C99_BOOL8 is not set
-CONFIG_HAVE_CXX=y
-CONFIG_HAVE_CXXINITIALIZE=y
-# CONFIG_CXX_NEWLONG is not set
-
-#
-# uClibc++ Standard C++ Library
-#
-# CONFIG_UCLIBCXX is not set
-
-#
-# Application Configuration
-#
-
-#
-# Built-In Applications
-#
-CONFIG_BUILTIN_PROXY_STACKSIZE=1024
-
-#
-# CAN Utilities
-#
-
-#
-# Examples
-#
-# CONFIG_EXAMPLES_CHAT is not set
-# CONFIG_EXAMPLES_CONFIGDATA is not set
-# CONFIG_EXAMPLES_CPUHOG is not set
-# CONFIG_EXAMPLES_CXXTEST is not set
-# CONFIG_EXAMPLES_DHCPD is not set
-# CONFIG_EXAMPLES_DISCOVER is not set
-# CONFIG_EXAMPLES_ELF is not set
-# CONFIG_EXAMPLES_FTPC is not set
-# CONFIG_EXAMPLES_FTPD is not set
-# CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_IGMP is not set
-# CONFIG_EXAMPLES_JSON is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
-# CONFIG_EXAMPLES_MEDIA is not set
-# CONFIG_EXAMPLES_MM is not set
-# CONFIG_EXAMPLES_MODBUS is not set
-# CONFIG_EXAMPLES_MOUNT is not set
-# CONFIG_EXAMPLES_NETTEST is not set
-# CONFIG_EXAMPLES_NRF24L01TERM is not set
-CONFIG_EXAMPLES_NSH=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
-# CONFIG_EXAMPLES_NULL is not set
-# CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXHELLO is not set
-# CONFIG_EXAMPLES_NXIMAGE is not set
-# CONFIG_EXAMPLES_NXLINES is not set
-# CONFIG_EXAMPLES_NXTERM is not set
-# CONFIG_EXAMPLES_NXTEXT is not set
-# CONFIG_EXAMPLES_OSTEST is not set
-# CONFIG_EXAMPLES_PCA9635 is not set
-# CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_PPPD is not set
-# CONFIG_EXAMPLES_RGBLED is not set
-# CONFIG_EXAMPLES_RGMP is not set
-# CONFIG_EXAMPLES_SENDMAIL is not set
-# CONFIG_EXAMPLES_SERIALBLASTER is not set
-# CONFIG_EXAMPLES_SERIALRX is not set
-# CONFIG_EXAMPLES_SERLOOP is not set
-# CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
-# CONFIG_EXAMPLES_SMP is not set
-# CONFIG_EXAMPLES_TCPECHO is not set
-# CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_TIFF is not set
-# CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_UDP is not set
-# CONFIG_EXAMPLES_UDPBLASTER is not set
-# CONFIG_EXAMPLES_USBTERM is not set
-# CONFIG_EXAMPLES_WATCHDOG is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-
-#
-# File System Utilities
-#
-# CONFIG_FSUTILS_INIFILE is not set
-
-#
-# GPS Utilities
-#
-# CONFIG_GPSUTILS_MINMEA_LIB is not set
-
-#
-# Graphics Support
-#
-# CONFIG_TIFF is not set
-# CONFIG_GRAPHICS_TRAVELER is not set
-
-#
-# Interpreters
-#
-# CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_MICROPYTHON is not set
-# CONFIG_INTERPRETERS_PCODE is not set
-
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
-#
-# Network Utilities
-#
-# CONFIG_NETUTILS_CODECS is not set
-# CONFIG_NETUTILS_DHCPC is not set
-# CONFIG_NETUTILS_DHCPD is not set
-# CONFIG_NETUTILS_DISCOVER is not set
-# CONFIG_NETUTILS_ESP8266 is not set
-# CONFIG_NETUTILS_FTPC is not set
-# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_NETLIB=y
-# CONFIG_NETUTILS_NTPCLIENT is not set
-# CONFIG_NETUTILS_PPPD is not set
-# CONFIG_NETUTILS_SMTP is not set
-CONFIG_NETUTILS_TELNETD=y
-# CONFIG_NETUTILS_TFTPC is not set
-# CONFIG_NETUTILS_WEBCLIENT is not set
-# CONFIG_NETUTILS_WEBSERVER is not set
-# CONFIG_NETUTILS_XMLRPC is not set
-
-#
-# NSH Library
-#
-CONFIG_NSH_LIBRARY=y
-# CONFIG_NSH_MOTD is not set
-
-#
-# Command Line Configuration
-#
-CONFIG_NSH_READLINE=y
-# CONFIG_NSH_CLE is not set
-CONFIG_NSH_LINELEN=64
-# CONFIG_NSH_DISABLE_SEMICOLON is not set
-CONFIG_NSH_CMDPARMS=y
-CONFIG_NSH_MAXARGUMENTS=6
-CONFIG_NSH_ARGCAT=y
-CONFIG_NSH_NESTDEPTH=3
-# CONFIG_NSH_DISABLEBG is not set
-CONFIG_NSH_BUILTIN_APPS=y
-
-#
-# Disable Individual commands
-#
-# CONFIG_NSH_DISABLE_ADDROUTE is not set
-# CONFIG_NSH_DISABLE_ARP is not set
-# CONFIG_NSH_DISABLE_BASENAME is not set
-# CONFIG_NSH_DISABLE_CAT is not set
-# CONFIG_NSH_DISABLE_CD is not set
-# CONFIG_NSH_DISABLE_CP is not set
-# CONFIG_NSH_DISABLE_CMP is not set
-CONFIG_NSH_DISABLE_DATE=y
-# CONFIG_NSH_DISABLE_DD is not set
-# CONFIG_NSH_DISABLE_DF is not set
-# CONFIG_NSH_DISABLE_DELROUTE is not set
-# CONFIG_NSH_DISABLE_DIRNAME is not set
-# CONFIG_NSH_DISABLE_ECHO is not set
-# CONFIG_NSH_DISABLE_EXEC is not set
-# CONFIG_NSH_DISABLE_EXIT is not set
-# CONFIG_NSH_DISABLE_FREE is not set
-# CONFIG_NSH_DISABLE_GET is not set
-# CONFIG_NSH_DISABLE_HELP is not set
-# CONFIG_NSH_DISABLE_HEXDUMP is not set
-# CONFIG_NSH_DISABLE_IFCONFIG is not set
-CONFIG_NSH_DISABLE_IFUPDOWN=y
-# CONFIG_NSH_DISABLE_KILL is not set
-# CONFIG_NSH_DISABLE_LOSETUP is not set
-CONFIG_NSH_DISABLE_LOSMART=y
-# CONFIG_NSH_DISABLE_LS is not set
-# CONFIG_NSH_DISABLE_MB is not set
-# CONFIG_NSH_DISABLE_MKDIR is not set
-# CONFIG_NSH_DISABLE_MKFIFO is not set
-# CONFIG_NSH_DISABLE_MKRD is not set
-# CONFIG_NSH_DISABLE_MH is not set
-# CONFIG_NSH_DISABLE_MOUNT is not set
-# CONFIG_NSH_DISABLE_MV is not set
-# CONFIG_NSH_DISABLE_MW is not set
-# CONFIG_NSH_DISABLE_PS is not set
-# CONFIG_NSH_DISABLE_PING is not set
-# CONFIG_NSH_DISABLE_PUT is not set
-# CONFIG_NSH_DISABLE_PWD is not set
-# CONFIG_NSH_DISABLE_RM is not set
-# CONFIG_NSH_DISABLE_RMDIR is not set
-# CONFIG_NSH_DISABLE_SET is not set
-# CONFIG_NSH_DISABLE_SH is not set
-# CONFIG_NSH_DISABLE_SLEEP is not set
-# CONFIG_NSH_DISABLE_TIME is not set
-# CONFIG_NSH_DISABLE_TEST is not set
-# CONFIG_NSH_DISABLE_UMOUNT is not set
-# CONFIG_NSH_DISABLE_UNAME is not set
-# CONFIG_NSH_DISABLE_UNSET is not set
-# CONFIG_NSH_DISABLE_USLEEP is not set
-# CONFIG_NSH_DISABLE_WGET is not set
-# CONFIG_NSH_DISABLE_XD is not set
-
-#
-# Configure Command Options
-#
-CONFIG_NSH_CMDOPT_DF_H=y
-CONFIG_NSH_CODECS_BUFSIZE=128
-CONFIG_NSH_CMDOPT_HEXDUMP=y
-CONFIG_NSH_FILEIOSIZE=512
-
-#
-# Scripting Support
-#
-# CONFIG_NSH_DISABLESCRIPT is not set
-# CONFIG_NSH_DISABLE_ITEF is not set
-# CONFIG_NSH_DISABLE_LOOPS is not set
-
-#
-# Console Configuration
-#
-CONFIG_NSH_CONSOLE=y
-# CONFIG_NSH_ARCHINIT is not set
-
-#
-# Networking Configuration
-#
-CONFIG_NSH_NETINIT=y
-# CONFIG_NSH_NETINIT_THREAD is not set
-
-#
-# IP Address Configuration
-#
-
-#
-# IPv4 Addresses
-#
-CONFIG_NSH_IPADDR=0x0a000002
-CONFIG_NSH_DRIPADDR=0x0a000001
-CONFIG_NSH_NETMASK=0xffffff00
-
-#
-# Target IPv6 address
-#
-CONFIG_NSH_IPv6ADDR_1=0xfc00
-CONFIG_NSH_IPv6ADDR_2=0x0000
-CONFIG_NSH_IPv6ADDR_3=0x0000
-CONFIG_NSH_IPv6ADDR_4=0x0000
-CONFIG_NSH_IPv6ADDR_5=0x0000
-CONFIG_NSH_IPv6ADDR_6=0x0000
-CONFIG_NSH_IPv6ADDR_7=0x0000
-CONFIG_NSH_IPv6ADDR_8=0x0002
-
-#
-# Router IPv6 address
-#
-CONFIG_NSH_DRIPv6ADDR_1=0xfc00
-CONFIG_NSH_DRIPv6ADDR_2=0x0000
-CONFIG_NSH_DRIPv6ADDR_3=0x0000
-CONFIG_NSH_DRIPv6ADDR_4=0x0000
-CONFIG_NSH_DRIPv6ADDR_5=0x0000
-CONFIG_NSH_DRIPv6ADDR_6=0x0000
-CONFIG_NSH_DRIPv6ADDR_7=0x0000
-CONFIG_NSH_DRIPv6ADDR_8=0x0001
-
-#
-# IPv6 Network mask
-#
-CONFIG_NSH_IPv6NETMASK_1=0xffff
-CONFIG_NSH_IPv6NETMASK_2=0xffff
-CONFIG_NSH_IPv6NETMASK_3=0xffff
-CONFIG_NSH_IPv6NETMASK_4=0xffff
-CONFIG_NSH_IPv6NETMASK_5=0xffff
-CONFIG_NSH_IPv6NETMASK_6=0xffff
-CONFIG_NSH_IPv6NETMASK_7=0xffff
-CONFIG_NSH_IPv6NETMASK_8=0x0000
-CONFIG_NSH_NOMAC=y
-CONFIG_NSH_SWMAC=y
-CONFIG_NSH_MACADDR=0x00e0deadbeef
-CONFIG_NSH_MAX_ROUNDTRIP=20
-
-#
-# Telnet Configuration
-#
-CONFIG_NSH_TELNET=y
-CONFIG_NSH_TELNETD_PORT=23
-CONFIG_NSH_TELNETD_DAEMONPRIO=100
-CONFIG_NSH_TELNETD_DAEMONSTACKSIZE=2048
-CONFIG_NSH_TELNETD_CLIENTPRIO=100
-CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=2048
-CONFIG_NSH_IOBUFFER_SIZE=512
-# CONFIG_NSH_LOGIN is not set
-# CONFIG_NSH_CONSOLE_LOGIN is not set
-# CONFIG_NSH_TELNET_LOGIN is not set
-
-#
-# NxWidgets/NxWM
-#
-
-#
-# Platform-specific Support
-#
-# CONFIG_PLATFORM_CONFIGDATA is not set
-
-#
-# System Libraries and NSH Add-Ons
-#
-# CONFIG_SYSTEM_CLE is not set
-# CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_FREE is not set
-# CONFIG_LIB_HEX2BIN is not set
-# CONFIG_SYSTEM_HEXED is not set
-# CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_SYSTEM_NETDB is not set
-# CONFIG_SYSTEM_RAMTEST is not set
-CONFIG_READLINE_HAVE_EXTMATCH=y
-CONFIG_SYSTEM_READLINE=y
-CONFIG_READLINE_ECHO=y
-# CONFIG_READLINE_TABCOMPLETION is not set
-# CONFIG_READLINE_CMD_HISTORY is not set
-# CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_UBLOXMODEM is not set
-# CONFIG_SYSTEM_VI is not set
-# CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm32f746g-disco/netnsh/setenv.sh b/configs/stm32f746g-disco/netnsh/setenv.sh
deleted file mode 100755
index 427dcdd32c..0000000000
--- a/configs/stm32f746g-disco/netnsh/setenv.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-# configs/stm32f746g-disco/netnsh/setenv.sh
-#
-#   Copyright (C) 2015 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.
-#
-
-if [ "$_" = "$0" ] ; then
-  echo "You must source this script, not run it!" 1>&2
-  exit 1
-fi
-
-WD=`pwd`
-if [ ! -x "setenv.sh" ]; then
-  echo "This script must be executed from the top-level NuttX build directory"
-  exit 1
-fi
-
-if [ -z "${PATH_ORIG}" ]; then
-  export PATH_ORIG="${PATH}"
-fi
-
-# This is the Cygwin path to the location where I installed the Atmel GCC
-# toolchain under Windows.  You will also have to edit this if you install
-# this toolchain in any other location
-#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Atmel/Atmel Toolchain/ARM GCC/Native/4.7.3.99/arm-gnu-toolchain/bin"
-
-# This is the Cygwin path to the location where I installed the CodeSourcery
-# toolchain under windows.  You will also have to edit this if you install
-# the CodeSourcery toolchain in any other location
-#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin"
-#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin"
-# export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin"
-
-# This is the location where I installed the ARM "GNU Tools for ARM Embedded Processors"
-# You can this free toolchain here https://launchpad.net/gcc-arm-embedded
-export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/GNU Tools ARM Embedded/4.9 2015q2/bin"
-
-# This is the path to the location where I installed the devkitARM toolchain
-# You can get this free toolchain from http://devkitpro.org/ or http://sourceforge.net/projects/devkitpro/
-#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/devkitARM/bin"
-
-# This is the Cygwin path to the location where I build the buildroot
-# toolchain.
-# export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
-
-# Add the path to the toolchain to the PATH varialble
-export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
-
-echo "PATH : ${PATH}"
-- 
GitLab


From 4742999e451627eae716a6ad3b9a81e442c8ddfb Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 28 Jun 2016 14:45:30 -0600
Subject: [PATCH 091/229] Remove references to non-existent kostest from
 README.txt

---
 configs/stm32f746g-disco/README.txt | 79 -----------------------------
 1 file changed, 79 deletions(-)

diff --git a/configs/stm32f746g-disco/README.txt b/configs/stm32f746g-disco/README.txt
index 320b8a83f2..66dfb79ba4 100644
--- a/configs/stm32f746g-disco/README.txt
+++ b/configs/stm32f746g-disco/README.txt
@@ -527,85 +527,6 @@ Configurations
 Configuration Directories
 -------------------------
 
-  kostest:
-  -------
-    This is identical to the nsh configuration below except that NuttX is
-    built as a kernel-mode, monolithic module and the user applications are
-    built separately.  Is is recommended to use a special make command;
-    not just 'make' but make with the following two arguments:
-
-        make pass1 pass2
-
-    In the normal case (just 'make'), make will attempt to build both user-
-    and kernel-mode blobs more or less interleaved.  This actual works!
-    However, for me it is very confusing so I prefer the above make command:
-    Make the user-space binaries first (pass1), then make the kernel-space
-    binaries (pass2)
-
-    NOTES:
-
-    1. At the end of the build, there will be several files in the top-level
-       NuttX build directory:
-
-       PASS1:
-         nuttx_user.elf    - The pass1 user-space ELF file
-         nuttx_user.hex    - The pass1 Intel HEX format file (selected in defconfig)
-         User.map          - Symbols in the user-space ELF file
-
-       PASS2:
-         nuttx             - The pass2 kernel-space ELF file
-         nuttx.hex         - The pass2 Intel HEX file (selected in defconfig)
-         System.map        - Symbols in the kernel-space ELF file
-
-    2. Combining .hex files.  If you plan to use the STM32 ST-Link Utility to
-       load the .hex files into FLASH, then you need to combine the two hex
-       files into a single .hex file.  Here is how you can do that.
-
-       a. The 'tail' of the nuttx.hex file should look something like this
-          (with my comments added):
-
-            $ tail nuttx.hex
-            # 00, data records
-            ...
-            :10 9DC0 00 01000000000800006400020100001F0004
-            :10 9DD0 00 3B005A0078009700B500D400F300110151
-            :08 9DE0 00 30014E016D0100008D
-            # 05, Start Linear Address Record
-            :04 0000 05 0800 0419 D2
-            # 01, End Of File record
-            :00 0000 01 FF
-
-          Use an editor such as vi to remove the 05 and 01 records.
-
-       b. The 'head' of the nuttx_user.hex file should look something like
-          this (again with my comments added):
-
-            $ head nuttx_user.hex
-            # 04, Extended Linear Address Record
-            :02 0000 04 0801 F1
-            # 00, data records
-            :10 8000 00 BD89 01084C800108C8110208D01102087E
-            :10 8010 00 0010 00201C1000201C1000203C16002026
-            :10 8020 00 4D80 01085D80010869800108ED83010829
-            ...
-
-          Nothing needs to be done here.  The nuttx_user.hex file should
-          be fine.
-
-       c. Combine the edited nuttx.hex and un-edited nuttx_user.hex
-          file to produce a single combined hex file:
-
-          $ cat nuttx.hex nuttx_user.hex >combined.hex
-
-       Then use the combined.hex file with the STM32 ST-Link tool.  The
-       mbed interface does not seem to except .hex files, but you can
-       also convert the .hex file to binary with this command:
-
-         arm-none-eabi-objcopy.exe -I ihex -O binary combined.hex combined.bin
-
-       If you do this a lot, you will probably want to invest a little time
-       to develop a tool to automate these steps.
-
   nsh:
   ---
     Configures the NuttShell (NSH) located at apps/examples/nsh.  The
-- 
GitLab


From 435f21225a87203d98e2285861e7d6fe9049a7ab Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 28 Jun 2016 14:55:04 -0600
Subject: [PATCH 092/229] Fix a warning about an unused label, errout:  Use
 bool with true/false, not uint8_t with 1/0

---
 arch/arm/src/samv7/sam_twihs.c | 68 ++++++++++++++++++----------------
 1 file changed, 36 insertions(+), 32 deletions(-)

diff --git a/arch/arm/src/samv7/sam_twihs.c b/arch/arm/src/samv7/sam_twihs.c
index a50b8641d9..6800ecbba8 100644
--- a/arch/arm/src/samv7/sam_twihs.c
+++ b/arch/arm/src/samv7/sam_twihs.c
@@ -133,9 +133,9 @@ struct twi_attr_s
 {
   uint8_t             twi;        /* TWIHS device number (for debug output) */
   uint8_t             pid;        /* TWIHS peripheral ID */
-  uint16_t            irq;        /* IRQ number for this TWIHS bus */
   uint8_t             glitchfltr; /* Pulse width of a glich to be suppressed by the filter */
-  uint8_t             s_master;   /* Single-Master Mode active */
+  bool                s_master;   /* true: Single-Master Mode active */
+  uint16_t            irq;        /* IRQ number for this TWIHS bus */
   gpio_pinset_t       sclcfg;     /* TWIHS CK pin configuration (SCL in I2C-ese) */
   gpio_pinset_t       sdacfg;     /* TWIHS D pin configuration (SDA in I2C-ese) */
   uintptr_t           base;       /* Base address of TWIHS registers */
@@ -237,19 +237,19 @@ static void twi_hw_initialize(struct twi_dev_s *priv, uint32_t frequency);
 #ifdef CONFIG_SAMV7_TWIHS0
 static const struct twi_attr_s g_twi0attr =
 {
-  .twi     = 0,
-  .pid     = SAM_PID_TWIHS0,
-  .irq     = SAM_IRQ_TWIHS0,
+  .twi        = 0,
+  .pid        = SAM_PID_TWIHS0,
+  .irq        = SAM_IRQ_TWIHS0,
   .glitchfltr = CONFIG_SAMV7_TWIHS0_GLITCH_FILTER,
 #ifdef CONFIG_SAMV7_TWIHS0_SINGLE_MASTER
-  .s_master = 1,
+  .s_master   = true,
 #else
-  .s_master = 0,
+  .s_master   = false,
 #endif
-  .sclcfg  = GPIO_TWIHS0_CK,
-  .sdacfg  = GPIO_TWIHS0_D,
-  .base    = SAM_TWIHS0_BASE,
-  .handler = twi0_interrupt,
+  .sclcfg     = GPIO_TWIHS0_CK,
+  .sdacfg     = GPIO_TWIHS0_D,
+  .base       = SAM_TWIHS0_BASE,
+  .handler    = twi0_interrupt,
 };
 
 static struct twi_dev_s g_twi0;
@@ -258,19 +258,19 @@ static struct twi_dev_s g_twi0;
 #ifdef CONFIG_SAMV7_TWIHS1
 static const struct twi_attr_s g_twi1attr =
 {
-  .twi     = 1,
-  .pid     = SAM_PID_TWIHS1,
-  .irq     = SAM_IRQ_TWIHS1,
+  .twi        = 1,
+  .pid        = SAM_PID_TWIHS1,
+  .irq        = SAM_IRQ_TWIHS1,
   .glitchfltr = CONFIG_SAMV7_TWIHS1_GLITCH_FILTER,
 #ifdef CONFIG_SAMV7_TWIHS1_SINGLE_MASTER
-  .s_master = 1,
+  .s_master   = true,
 #else
-  .s_master = 0,
+  .s_master   = false,
 #endif
-  .sclcfg  = GPIO_TWIHS1_CK,
-  .sdacfg  = GPIO_TWIHS1_D,
-  .base    = SAM_TWIHS1_BASE,
-  .handler = twi1_interrupt,
+  .sclcfg     = GPIO_TWIHS1_CK,
+  .sdacfg     = GPIO_TWIHS1_D,
+  .base       = SAM_TWIHS1_BASE,
+  .handler    = twi1_interrupt,
 };
 
 static struct twi_dev_s g_twi1;
@@ -279,19 +279,19 @@ static struct twi_dev_s g_twi1;
 #ifdef CONFIG_SAMV7_TWIHS2
 static const struct twi_attr_s g_twi2attr =
 {
-  .twi     = 2,
-  .pid     = SAM_PID_TWIHS2,
-  .irq     = SAM_IRQ_TWIHS2,
+  .twi        = 2,
+  .pid        = SAM_PID_TWIHS2,
+  .irq        = SAM_IRQ_TWIHS2,
   .glitchfltr = CONFIG_SAMV7_TWIHS2_GLITCH_FILTER,
 #ifdef CONFIG_SAMV7_TWIHS2_SINGLE_MASTER
-  .s_master = 1,
+  .s_master   = true,
 #else
-  .s_master = 0,
+  .s_master   = false,
 #endif
-  .sclcfg  = GPIO_TWIHS2_CK,
-  .sdacfg  = GPIO_TWIHS2_D,
-  .base    = SAM_TWIHS2_BASE,
-  .handler = twi2_interrupt,
+  .sclcfg     = GPIO_TWIHS2_CK,
+  .sdacfg     = GPIO_TWIHS2_D,
+  .base       = SAM_TWIHS2_BASE,
+  .handler    = twi2_interrupt,
 };
 
 static struct twi_dev_s g_twi2;
@@ -299,9 +299,9 @@ static struct twi_dev_s g_twi2;
 
 static const struct i2c_ops_s g_twiops =
 {
-  .transfer = twi_transfer
+  .transfer   = twi_transfer
 #ifdef CONFIG_I2C_RESET
-  , .reset  = twi_reset
+  , .reset    = twi_reset
 #endif
 };
 
@@ -964,7 +964,9 @@ static int twi_transfer(FAR struct i2c_master_s *dev,
         {
           ret = twi_reset_internal(&priv->dev);
           if (ret != OK)
-            goto errout;
+            {
+              goto errout;
+            }
         }
     }
 #endif
@@ -984,7 +986,9 @@ static int twi_transfer(FAR struct i2c_master_s *dev,
   ret = twi_wait(priv, size);
   leave_critical_section(flags);
 
+#ifdef CONFIG_I2C_RESET
 errout:
+#endif
   if (ret < 0)
     {
       i2cerr("ERROR: Transfer failed: %d\n", ret);
-- 
GitLab


From 32c6cd71bbb70b8844799c5e5951486ba955133f Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 28 Jun 2016 15:40:10 -0600
Subject: [PATCH 093/229] Refresh all SAMV71/SAME70 configurations

---
 configs/same70-xplained/netnsh/defconfig | 17 +++++++++++++----
 configs/same70-xplained/nsh/defconfig    | 17 +++++++++++++----
 configs/samv71-xult/knsh/defconfig       | 17 +++++++++++++----
 configs/samv71-xult/module/defconfig     | 13 ++++++++++---
 configs/samv71-xult/mxtxplnd/defconfig   | 17 +++++++++++++----
 configs/samv71-xult/netnsh/defconfig     | 17 +++++++++++++----
 configs/samv71-xult/nsh/defconfig        | 15 +++++++++++----
 configs/samv71-xult/nxwm/defconfig       | 17 +++++++++++++----
 configs/samv71-xult/vnc/defconfig        | 17 +++++++++++++----
 configs/samv71-xult/vnxwm/defconfig      | 17 +++++++++++++----
 10 files changed, 125 insertions(+), 39 deletions(-)

diff --git a/configs/same70-xplained/netnsh/defconfig b/configs/same70-xplained/netnsh/defconfig
index 0161adc368..a60a2a7aff 100644
--- a/configs/same70-xplained/netnsh/defconfig
+++ b/configs/same70-xplained/netnsh/defconfig
@@ -283,6 +283,7 @@ CONFIG_SAMV7_GPIOC_IRQ=y
 # TWIHS device driver options
 #
 CONFIG_SAMV7_TWIHS0_FREQUENCY=100000
+CONFIG_SAMV7_TWIHS0_GLITCH_FILTER=1
 
 #
 # HSMCI device driver options
@@ -387,12 +388,11 @@ CONFIG_ARCH_HAVE_BUTTONS=y
 CONFIG_ARCH_BUTTONS=y
 CONFIG_ARCH_HAVE_IRQBUTTONS=y
 CONFIG_ARCH_IRQBUTTONS=y
-CONFIG_NSH_MMCSDMINOR=0
-CONFIG_NSH_MMCSDSLOTNO=0
 
 #
 # Board-Specific Options
 #
+# CONFIG_BOARD_CRASHDUMP is not set
 CONFIG_LIB_BOARDCTL=y
 # CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
@@ -528,10 +528,11 @@ CONFIG_DEV_NULL=y
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
 # CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
-# CONFIG_ARCH_HAVE_I2CRESET is not set
+CONFIG_ARCH_HAVE_I2CRESET=y
 CONFIG_I2C=y
 # CONFIG_I2C_SLAVE is not set
 # CONFIG_I2C_POLLED is not set
+# CONFIG_I2C_RESET is not set
 # CONFIG_I2C_TRACE is not set
 CONFIG_I2C_DRIVER=y
 CONFIG_SPI=y
@@ -558,7 +559,12 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
 
 #
 # LCD Driver Support
@@ -994,6 +1000,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 # CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -1213,6 +1220,8 @@ CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
+CONFIG_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSLOTNO=0
 
 #
 # Configure Command Options
@@ -1291,7 +1300,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_LIB_HEX2BIN is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=0
diff --git a/configs/same70-xplained/nsh/defconfig b/configs/same70-xplained/nsh/defconfig
index 00beab0a5b..5e3c9e924b 100644
--- a/configs/same70-xplained/nsh/defconfig
+++ b/configs/same70-xplained/nsh/defconfig
@@ -289,6 +289,7 @@ CONFIG_SAMV7_SDRAMSIZE=2097152
 # TWIHS device driver options
 #
 CONFIG_SAMV7_TWIHS0_FREQUENCY=100000
+CONFIG_SAMV7_TWIHS0_GLITCH_FILTER=1
 
 #
 # HSMCI device driver options
@@ -372,12 +373,11 @@ CONFIG_ARCH_HAVE_BUTTONS=y
 CONFIG_ARCH_BUTTONS=y
 CONFIG_ARCH_HAVE_IRQBUTTONS=y
 CONFIG_ARCH_IRQBUTTONS=y
-CONFIG_NSH_MMCSDMINOR=0
-CONFIG_NSH_MMCSDSLOTNO=0
 
 #
 # Board-Specific Options
 #
+# CONFIG_BOARD_CRASHDUMP is not set
 CONFIG_LIB_BOARDCTL=y
 # CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
@@ -513,10 +513,11 @@ CONFIG_DEV_NULL=y
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
 # CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
-# CONFIG_ARCH_HAVE_I2CRESET is not set
+CONFIG_ARCH_HAVE_I2CRESET=y
 CONFIG_I2C=y
 # CONFIG_I2C_SLAVE is not set
 # CONFIG_I2C_POLLED is not set
+# CONFIG_I2C_RESET is not set
 # CONFIG_I2C_TRACE is not set
 CONFIG_I2C_DRIVER=y
 CONFIG_SPI=y
@@ -543,7 +544,12 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
 
 #
 # LCD Driver Support
@@ -815,6 +821,7 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -1014,6 +1021,8 @@ CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
+CONFIG_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSLOTNO=0
 
 #
 # Configure Command Options
@@ -1056,7 +1065,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_LIB_HEX2BIN is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=0
diff --git a/configs/samv71-xult/knsh/defconfig b/configs/samv71-xult/knsh/defconfig
index f405320699..1a95add801 100644
--- a/configs/samv71-xult/knsh/defconfig
+++ b/configs/samv71-xult/knsh/defconfig
@@ -296,6 +296,7 @@ CONFIG_SAMV7_SDRAMSIZE=2097152
 # TWIHS device driver options
 #
 CONFIG_SAMV7_TWIHS0_FREQUENCY=100000
+CONFIG_SAMV7_TWIHS0_GLITCH_FILTER=1
 
 #
 # HSMCI device driver options
@@ -379,13 +380,12 @@ CONFIG_ARCH_HAVE_BUTTONS=y
 CONFIG_ARCH_BUTTONS=y
 CONFIG_ARCH_HAVE_IRQBUTTONS=y
 CONFIG_ARCH_IRQBUTTONS=y
-CONFIG_NSH_MMCSDMINOR=0
-CONFIG_NSH_MMCSDSLOTNO=0
 
 #
 # Board-Specific Options
 #
 # CONFIG_SAMV71XULT_MXTXPLND is not set
+# CONFIG_BOARD_CRASHDUMP is not set
 CONFIG_LIB_BOARDCTL=y
 # CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
@@ -522,10 +522,11 @@ CONFIG_DEV_NULL=y
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
 # CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
-# CONFIG_ARCH_HAVE_I2CRESET is not set
+CONFIG_ARCH_HAVE_I2CRESET=y
 CONFIG_I2C=y
 # CONFIG_I2C_SLAVE is not set
 # CONFIG_I2C_POLLED is not set
+# CONFIG_I2C_RESET is not set
 # CONFIG_I2C_TRACE is not set
 CONFIG_I2C_DRIVER=y
 CONFIG_SPI=y
@@ -552,7 +553,12 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
 
 #
 # LCD Driver Support
@@ -826,6 +832,7 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_LIB_USRWORK is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -1005,6 +1012,8 @@ CONFIG_NSH_DISABLE_MKRD=y
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
+CONFIG_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSLOTNO=0
 
 #
 # Configure Command Options
@@ -1046,7 +1055,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_LIB_HEX2BIN is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=0
diff --git a/configs/samv71-xult/module/defconfig b/configs/samv71-xult/module/defconfig
index 82ec913424..77748a6517 100644
--- a/configs/samv71-xult/module/defconfig
+++ b/configs/samv71-xult/module/defconfig
@@ -353,12 +353,12 @@ CONFIG_ARCH_HAVE_BUTTONS=y
 CONFIG_ARCH_BUTTONS=y
 CONFIG_ARCH_HAVE_IRQBUTTONS=y
 CONFIG_ARCH_IRQBUTTONS=y
-CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Board-Specific Options
 #
 # CONFIG_SAMV71XULT_MXTXPLND is not set
+# CONFIG_BOARD_CRASHDUMP is not set
 CONFIG_LIB_BOARDCTL=y
 # CONFIG_BOARDCTL_UNIQUEID is not set
 CONFIG_BOARDCTL_OS_SYMTAB=y
@@ -499,7 +499,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
 # CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
-# CONFIG_ARCH_HAVE_I2CRESET is not set
+CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_I2C is not set
 # CONFIG_SPI is not set
 # CONFIG_I2S is not set
@@ -515,7 +515,12 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
 
 #
 # LCD Driver Support
@@ -736,6 +741,7 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -931,6 +937,7 @@ CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Configure Command Options
@@ -973,7 +980,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_LIB_HEX2BIN is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/samv71-xult/mxtxplnd/defconfig b/configs/samv71-xult/mxtxplnd/defconfig
index f0313670b6..a7e6d9f2bc 100644
--- a/configs/samv71-xult/mxtxplnd/defconfig
+++ b/configs/samv71-xult/mxtxplnd/defconfig
@@ -284,6 +284,7 @@ CONFIG_SAMV7_GPIOD_IRQ=y
 # TWIHS device driver options
 #
 CONFIG_SAMV7_TWIHS0_FREQUENCY=100000
+CONFIG_SAMV7_TWIHS0_GLITCH_FILTER=1
 
 #
 # HSMCI device driver options
@@ -367,8 +368,6 @@ CONFIG_ARCH_HAVE_BUTTONS=y
 CONFIG_ARCH_BUTTONS=y
 CONFIG_ARCH_HAVE_IRQBUTTONS=y
 CONFIG_ARCH_IRQBUTTONS=y
-CONFIG_NSH_MMCSDMINOR=0
-CONFIG_NSH_MMCSDSLOTNO=0
 
 #
 # Board-Specific Options
@@ -379,6 +378,7 @@ CONFIG_SAMV71XULT_MXTXPLND_LCD=y
 CONFIG_SAMV71XULT_MXT_I2CFREQUENCY=400000
 CONFIG_SAMV71XULT_MXT_DEVMINOR=0
 CONFIG_SAMV71XULT_LCD_BGCOLOR=0x00
+# CONFIG_BOARD_CRASHDUMP is not set
 CONFIG_LIB_BOARDCTL=y
 # CONFIG_BOARDCTL_UNIQUEID is not set
 CONFIG_BOARDCTL_TSCTEST=y
@@ -514,10 +514,11 @@ CONFIG_DEV_NULL=y
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
 # CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
-# CONFIG_ARCH_HAVE_I2CRESET is not set
+CONFIG_ARCH_HAVE_I2CRESET=y
 CONFIG_I2C=y
 # CONFIG_I2C_SLAVE is not set
 # CONFIG_I2C_POLLED is not set
+# CONFIG_I2C_RESET is not set
 # CONFIG_I2C_TRACE is not set
 CONFIG_I2C_DRIVER=y
 CONFIG_SPI=y
@@ -555,7 +556,12 @@ CONFIG_MXT_THRESHY=8
 # CONFIG_BUTTONS is not set
 # CONFIG_DJOYSTICK is not set
 # CONFIG_AJOYSTICK is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
 
 #
 # LCD Driver Support
@@ -944,6 +950,7 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -1155,6 +1162,8 @@ CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
+CONFIG_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSLOTNO=0
 
 #
 # Configure Command Options
@@ -1197,7 +1206,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_LIB_HEX2BIN is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=0
diff --git a/configs/samv71-xult/netnsh/defconfig b/configs/samv71-xult/netnsh/defconfig
index 3f47a88525..72d049526b 100644
--- a/configs/samv71-xult/netnsh/defconfig
+++ b/configs/samv71-xult/netnsh/defconfig
@@ -285,6 +285,7 @@ CONFIG_SAMV7_GPIOD_IRQ=y
 # TWIHS device driver options
 #
 CONFIG_SAMV7_TWIHS0_FREQUENCY=100000
+CONFIG_SAMV7_TWIHS0_GLITCH_FILTER=1
 
 #
 # HSMCI device driver options
@@ -389,13 +390,12 @@ CONFIG_ARCH_HAVE_BUTTONS=y
 CONFIG_ARCH_BUTTONS=y
 CONFIG_ARCH_HAVE_IRQBUTTONS=y
 CONFIG_ARCH_IRQBUTTONS=y
-CONFIG_NSH_MMCSDMINOR=0
-CONFIG_NSH_MMCSDSLOTNO=0
 
 #
 # Board-Specific Options
 #
 # CONFIG_SAMV71XULT_MXTXPLND is not set
+# CONFIG_BOARD_CRASHDUMP is not set
 CONFIG_LIB_BOARDCTL=y
 # CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
@@ -531,10 +531,11 @@ CONFIG_DEV_NULL=y
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
 # CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
-# CONFIG_ARCH_HAVE_I2CRESET is not set
+CONFIG_ARCH_HAVE_I2CRESET=y
 CONFIG_I2C=y
 # CONFIG_I2C_SLAVE is not set
 # CONFIG_I2C_POLLED is not set
+# CONFIG_I2C_RESET is not set
 # CONFIG_I2C_TRACE is not set
 CONFIG_I2C_DRIVER=y
 CONFIG_SPI=y
@@ -561,7 +562,12 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
 
 #
 # LCD Driver Support
@@ -998,6 +1004,7 @@ CONFIG_NETDB_DNSSERVER_IPv4ADDR=0x0a000001
 # CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -1217,6 +1224,8 @@ CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
+CONFIG_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSLOTNO=0
 
 #
 # Configure Command Options
@@ -1295,7 +1304,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_LIB_HEX2BIN is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=0
diff --git a/configs/samv71-xult/nsh/defconfig b/configs/samv71-xult/nsh/defconfig
index 7377f2fdf1..7ad935aa32 100644
--- a/configs/samv71-xult/nsh/defconfig
+++ b/configs/samv71-xult/nsh/defconfig
@@ -375,13 +375,12 @@ CONFIG_ARCH_HAVE_BUTTONS=y
 CONFIG_ARCH_BUTTONS=y
 CONFIG_ARCH_HAVE_IRQBUTTONS=y
 CONFIG_ARCH_IRQBUTTONS=y
-CONFIG_NSH_MMCSDMINOR=0
-CONFIG_NSH_MMCSDSLOTNO=0
 
 #
 # Board-Specific Options
 #
 # CONFIG_SAMV71XULT_MXTXPLND is not set
+# CONFIG_BOARD_CRASHDUMP is not set
 CONFIG_LIB_BOARDCTL=y
 # CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
@@ -521,9 +520,9 @@ CONFIG_ARCH_HAVE_I2CRESET=y
 CONFIG_I2C=y
 # CONFIG_I2C_SLAVE is not set
 # CONFIG_I2C_POLLED is not set
+CONFIG_I2C_RESET=y
 # CONFIG_I2C_TRACE is not set
 CONFIG_I2C_DRIVER=y
-CONFIG_I2C_RESET=y
 CONFIG_SPI=y
 # CONFIG_SPI_SLAVE is not set
 CONFIG_SPI_EXCHANGE=y
@@ -548,7 +547,12 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
 
 #
 # LCD Driver Support
@@ -820,6 +824,7 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -1019,6 +1024,8 @@ CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
+CONFIG_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSLOTNO=0
 
 #
 # Configure Command Options
@@ -1061,7 +1068,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_LIB_HEX2BIN is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=0
diff --git a/configs/samv71-xult/nxwm/defconfig b/configs/samv71-xult/nxwm/defconfig
index c385829eb1..006b3160fa 100644
--- a/configs/samv71-xult/nxwm/defconfig
+++ b/configs/samv71-xult/nxwm/defconfig
@@ -284,6 +284,7 @@ CONFIG_SAMV7_GPIOD_IRQ=y
 # TWIHS device driver options
 #
 CONFIG_SAMV7_TWIHS0_FREQUENCY=100000
+CONFIG_SAMV7_TWIHS0_GLITCH_FILTER=1
 
 #
 # HSMCI device driver options
@@ -367,8 +368,6 @@ CONFIG_ARCH_HAVE_BUTTONS=y
 CONFIG_ARCH_BUTTONS=y
 CONFIG_ARCH_HAVE_IRQBUTTONS=y
 CONFIG_ARCH_IRQBUTTONS=y
-CONFIG_NSH_MMCSDMINOR=0
-CONFIG_NSH_MMCSDSLOTNO=0
 
 #
 # Board-Specific Options
@@ -379,6 +378,7 @@ CONFIG_SAMV71XULT_MXTXPLND_LCD=y
 CONFIG_SAMV71XULT_MXT_I2CFREQUENCY=400000
 CONFIG_SAMV71XULT_MXT_DEVMINOR=0
 CONFIG_SAMV71XULT_LCD_BGCOLOR=0x95fa
+# CONFIG_BOARD_CRASHDUMP is not set
 CONFIG_LIB_BOARDCTL=y
 # CONFIG_BOARDCTL_UNIQUEID is not set
 CONFIG_BOARDCTL_TSCTEST=y
@@ -517,10 +517,11 @@ CONFIG_DEV_NULL=y
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
 # CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
-# CONFIG_ARCH_HAVE_I2CRESET is not set
+CONFIG_ARCH_HAVE_I2CRESET=y
 CONFIG_I2C=y
 # CONFIG_I2C_SLAVE is not set
 # CONFIG_I2C_POLLED is not set
+# CONFIG_I2C_RESET is not set
 # CONFIG_I2C_TRACE is not set
 CONFIG_I2C_DRIVER=y
 CONFIG_SPI=y
@@ -558,7 +559,12 @@ CONFIG_MXT_THRESHY=8
 # CONFIG_BUTTONS is not set
 # CONFIG_DJOYSTICK is not set
 # CONFIG_AJOYSTICK is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
 
 #
 # LCD Driver Support
@@ -959,6 +965,7 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -1156,6 +1163,8 @@ CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
+CONFIG_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSLOTNO=0
 
 #
 # Configure Command Options
@@ -1377,7 +1386,7 @@ CONFIG_NXWM_HEXCALCULATOR_FONTID=5
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_LIB_HEX2BIN is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 CONFIG_SYSTEM_I2CTOOL=y
 CONFIG_I2CTOOL_MINBUS=0
diff --git a/configs/samv71-xult/vnc/defconfig b/configs/samv71-xult/vnc/defconfig
index 46715eda2a..6186988846 100644
--- a/configs/samv71-xult/vnc/defconfig
+++ b/configs/samv71-xult/vnc/defconfig
@@ -284,6 +284,7 @@ CONFIG_SAMV7_GPIOD_IRQ=y
 # TWIHS device driver options
 #
 CONFIG_SAMV7_TWIHS0_FREQUENCY=100000
+CONFIG_SAMV7_TWIHS0_GLITCH_FILTER=1
 
 #
 # HSMCI device driver options
@@ -388,13 +389,12 @@ CONFIG_ARCH_HAVE_BUTTONS=y
 CONFIG_ARCH_BUTTONS=y
 CONFIG_ARCH_HAVE_IRQBUTTONS=y
 CONFIG_ARCH_IRQBUTTONS=y
-CONFIG_NSH_MMCSDMINOR=0
-CONFIG_NSH_MMCSDSLOTNO=0
 
 #
 # Board-Specific Options
 #
 # CONFIG_SAMV71XULT_MXTXPLND is not set
+# CONFIG_BOARD_CRASHDUMP is not set
 CONFIG_LIB_BOARDCTL=y
 # CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
@@ -531,10 +531,11 @@ CONFIG_DEV_NULL=y
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
 # CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
-# CONFIG_ARCH_HAVE_I2CRESET is not set
+CONFIG_ARCH_HAVE_I2CRESET=y
 CONFIG_I2C=y
 # CONFIG_I2C_SLAVE is not set
 # CONFIG_I2C_POLLED is not set
+# CONFIG_I2C_RESET is not set
 # CONFIG_I2C_TRACE is not set
 CONFIG_I2C_DRIVER=y
 CONFIG_SPI=y
@@ -561,7 +562,12 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
 
 #
 # LCD Driver Support
@@ -1090,6 +1096,7 @@ CONFIG_LIBC_NETDB=y
 # CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -1301,6 +1308,8 @@ CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
+CONFIG_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSLOTNO=0
 
 #
 # Configure Command Options
@@ -1375,7 +1384,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_LIB_HEX2BIN is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_I2CTOOL is not set
 # CONFIG_SYSTEM_INSTALL is not set
diff --git a/configs/samv71-xult/vnxwm/defconfig b/configs/samv71-xult/vnxwm/defconfig
index 71d57c33be..9823caf790 100644
--- a/configs/samv71-xult/vnxwm/defconfig
+++ b/configs/samv71-xult/vnxwm/defconfig
@@ -284,6 +284,7 @@ CONFIG_SAMV7_GPIOD_IRQ=y
 # TWIHS device driver options
 #
 CONFIG_SAMV7_TWIHS0_FREQUENCY=100000
+CONFIG_SAMV7_TWIHS0_GLITCH_FILTER=1
 
 #
 # HSMCI device driver options
@@ -388,13 +389,12 @@ CONFIG_ARCH_HAVE_BUTTONS=y
 CONFIG_ARCH_BUTTONS=y
 CONFIG_ARCH_HAVE_IRQBUTTONS=y
 CONFIG_ARCH_IRQBUTTONS=y
-CONFIG_NSH_MMCSDMINOR=0
-CONFIG_NSH_MMCSDSLOTNO=0
 
 #
 # Board-Specific Options
 #
 # CONFIG_SAMV71XULT_MXTXPLND is not set
+# CONFIG_BOARD_CRASHDUMP is not set
 CONFIG_LIB_BOARDCTL=y
 # CONFIG_BOARDCTL_UNIQUEID is not set
 # CONFIG_BOARDCTL_TSCTEST is not set
@@ -534,10 +534,11 @@ CONFIG_DEV_NULL=y
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
 # CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
-# CONFIG_ARCH_HAVE_I2CRESET is not set
+CONFIG_ARCH_HAVE_I2CRESET=y
 CONFIG_I2C=y
 # CONFIG_I2C_SLAVE is not set
 # CONFIG_I2C_POLLED is not set
+# CONFIG_I2C_RESET is not set
 # CONFIG_I2C_TRACE is not set
 CONFIG_I2C_DRIVER=y
 CONFIG_SPI=y
@@ -564,7 +565,12 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
 
 #
 # LCD Driver Support
@@ -1114,6 +1120,7 @@ CONFIG_LIBC_NETDB=y
 # CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -1322,6 +1329,8 @@ CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
+CONFIG_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSLOTNO=0
 
 #
 # Configure Command Options
@@ -1566,7 +1575,7 @@ CONFIG_NXWM_HEXCALCULATOR_FONTID=5
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_LIB_HEX2BIN is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_I2CTOOL is not set
 # CONFIG_SYSTEM_INSTALL is not set
-- 
GitLab


From 0af47a93ae704905b7721459df446a96f3f0cacd Mon Sep 17 00:00:00 2001
From: David Sidrane 
Date: Tue, 28 Jun 2016 12:13:27 -1000
Subject: [PATCH 094/229] STMF7xxx RTC  Remove proxy #defines  Ensure the
 LSE(ON) etal are set and remembered in   a) A cold start (RTC_MAGIC invalid)
 of the RTC   b) A warm start (RTC_MAGIC valid) of the RTC but a clock change.

The change was needed because in bench testing a merge of the latest's STM32  53ec3ca (and friends) it became apparent that the
Sequence of operation is wrong in the reset of the Backup Domain in the RCC code.  PWR is required before the Backup Domain
can be futzed with. !!!This Code should be tested on STM32 and if needed rippled to the STM32 families
---
 arch/arm/src/stm32f7/Make.defs   |   4 ++
 arch/arm/src/stm32f7/stm32_lsi.c | 101 +++++++++++++++++++++++++++++++
 arch/arm/src/stm32f7/stm32_rtc.c | 100 ++++++++++++++++--------------
 3 files changed, 161 insertions(+), 44 deletions(-)
 create mode 100644 arch/arm/src/stm32f7/stm32_lsi.c

diff --git a/arch/arm/src/stm32f7/Make.defs b/arch/arm/src/stm32f7/Make.defs
index 7e857b6e5d..ee6b3e0687 100644
--- a/arch/arm/src/stm32f7/Make.defs
+++ b/arch/arm/src/stm32f7/Make.defs
@@ -149,6 +149,10 @@ CHIP_CSRCS += stm32_rtc_lowerhalf.c
 endif
 endif
 
+ifeq ($(filter y,$(CONFIG_STM32F7_IWDG) $(CONFIG_STM32F7_RTC_LSICLOCK)),y)
+CHIP_CSRCS += stm32_lsi.c
+endif
+
 ifeq ($(CONFIG_STM32F7_I2C),y)
 CHIP_CSRCS += stm32_i2c.c
 endif
diff --git a/arch/arm/src/stm32f7/stm32_lsi.c b/arch/arm/src/stm32f7/stm32_lsi.c
new file mode 100644
index 0000000000..3aea41ba4d
--- /dev/null
+++ b/arch/arm/src/stm32f7/stm32_lsi.c
@@ -0,0 +1,101 @@
+/****************************************************************************
+ * arch/arm/src/stm32f/stm32_lsi.c
+ *
+ *   Copyright (C) 2012, 2015-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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include 
+
+#include "up_arch.h"
+
+#include "stm32_rcc.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stm32_rcc_enablelsi
+ *
+ * Description:
+ *   Enable the Internal Low-Speed (LSI) RC Oscillator.
+ *
+ ****************************************************************************/
+
+void stm32_rcc_enablelsi(void)
+{
+  /* Enable the Internal Low-Speed (LSI) RC Oscillator by setting the LSION bit
+   * the RCC CSR register.
+   */
+
+  modifyreg32(STM32_RCC_CSR, 0, RCC_CSR_LSION);
+
+  /* Wait for the internal RC 40 kHz oscillator to be stable. */
+
+  while ((getreg32(STM32_RCC_CSR) & RCC_CSR_LSIRDY) == 0);
+}
+
+/****************************************************************************
+ * Name: stm32_rcc_disablelsi
+ *
+ * Description:
+ *   Disable the Internal Low-Speed (LSI) RC Oscillator.
+ *
+ ****************************************************************************/
+
+void stm32_rcc_disablelsi(void)
+{
+  /* Enable the Internal Low-Speed (LSI) RC Oscillator by setting the LSION bit
+   * the RCC CSR register.
+   */
+
+  modifyreg32(STM32_RCC_CSR, RCC_CSR_LSION, 0);
+
+  /* LSIRDY should go low after 3 LSI clock cycles */
+}
diff --git a/arch/arm/src/stm32f7/stm32_rtc.c b/arch/arm/src/stm32f7/stm32_rtc.c
index 835b5a7229..b8b469e662 100644
--- a/arch/arm/src/stm32f7/stm32_rtc.c
+++ b/arch/arm/src/stm32f7/stm32_rtc.c
@@ -84,19 +84,19 @@
 
 /* Constants ************************************************************************/
 
+#if defined(CONFIG_STM32F7_RTC_HSECLOCK)
+#  define  RCC_BDCR_RTCSEL RCC_BDCR_RTCSEL_HSE
+#elif defined(CONFIG_STM32F7_RTC_LSICLOCK)
+#  define  RCC_BDCR_RTCSEL RCC_BDCR_RTCSEL_LSI
+#elif defined(CONFIG_STM32F7_RTC_LSECLOCK)
+#  define  RCC_BDCR_RTCSEL RCC_BDCR_RTCSEL_LSE
+#else
+#  warning "RCC_BDCR_RTCSEL_NOCLK has been selected - RTC will not count"
+#endif
+
 #define SYNCHRO_TIMEOUT      (0x00020000)
 #define INITMODE_TIMEOUT     (0x00010000)
 
-/* Proxy definitions to make the same code work for all the STM32 series ************/
-
-# define STM32_RCC_XXX       STM32_RCC_BDCR
-# define RCC_XXX_YYYRST      RCC_BDCR_BDRST
-# define RCC_XXX_RTCEN       RCC_BDCR_RTCEN
-# define RCC_XXX_RTCSEL_MASK RCC_BDCR_RTCSEL_MASK
-# define RCC_XXX_RTCSEL_LSE  RCC_BDCR_RTCSEL_LSE
-# define RCC_XXX_RTCSEL_LSI  RCC_BDCR_RTCSEL_LSI
-# define RCC_XXX_RTCSEL_HSE  RCC_BDCR_RTCSEL_HSE
-
 /* Time conversions */
 
 #define MINUTES_IN_HOUR 60
@@ -844,7 +844,7 @@ int up_rtc_initialize(void)
   int nretry = 0;
 
   /* Clocking for the PWR block must be provided.  However, this is done
-   * unconditionally in stm32f40xxx_rcc.c on power up.  This done unconditionally
+   * unconditionally in stm32f7xxx_rcc.c on power up.  This done unconditionally
    * because the PWR block is also needed to set the internal voltage regulator for
    * maximum performance.
    */
@@ -858,79 +858,91 @@ int up_rtc_initialize(void)
 
   if (regval != RTC_MAGIC)
     {
-      /* Some boards do not have the external 32khz oscillator installed, for those
-       * boards we must fallback to the crummy internal RC clock or the external high
-       * rate clock
+
+      /* Issue the Backup domain Reset Per Section 5.3.20 DocID028270 Rev 2
+       * The LSEON, LSEBYP, RTCSEL and RTCEN bits in the RCC backup domain control
+       * register (RCC_BDCR) are in the Backup domain. As a result, after Reset,
+       * these bits are write-protected and the DBP bit in the PWR power control
+       * register (PWR_CR1) has to be set before these can be modified.
+       * Refer to Section 5.1.1: System reset on page 148 for further information.
+       * These bits are only reset after a Backup domain Reset
+       * (see Section 5.1.3: Backup domain reset).
+       *
+       * This has to be done here so that PWR is already enabled
        */
 
+      modifyreg32(STM32_RCC_BDCR, 0, RCC_BDCR_BDRST);
+      modifyreg32(STM32_RCC_BDCR, RCC_BDCR_BDRST, 0);
+
+#if RCC_BDCR_RTCSEL == RCC_BDCR_RTCSEL_LSE
+          /* Because of the Backup domain Reset - we must re enable the LSE */
+
+           stm32_rcc_enablelse();
+#endif
+
+      /* Some boards do not have the external 32khz oscillator installed, for those
+      * boards we must fallback to the crummy internal RC clock or the external high
+      * rate clock
+      */
+
 #ifdef CONFIG_STM32F7_RTC_HSECLOCK
       /* Use the HSE clock as the input to the RTC block */
 
       rtc_dumpregs("On reset HSE");
-      modifyreg32(STM32_RCC_XXX, RCC_XXX_RTCSEL_MASK, RCC_XXX_RTCSEL_HSE);
 
 #elif defined(CONFIG_STM32F7_RTC_LSICLOCK)
       /* Use the LSI clock as the input to the RTC block */
 
       rtc_dumpregs("On reset LSI");
-      modifyreg32(STM32_RCC_XXX, RCC_XXX_RTCSEL_MASK, RCC_XXX_RTCSEL_LSI);
 
 #elif defined(CONFIG_STM32F7_RTC_LSECLOCK)
       /* Use the LSE clock as the input to the RTC block */
 
       rtc_dumpregs("On reset LSE");
-      modifyreg32(STM32_RCC_XXX, RCC_XXX_RTCSEL_MASK, RCC_XXX_RTCSEL_LSE);
 
 #endif
+      modifyreg32(STM32_RCC_BDCR, RCC_BDCR_RTCSEL_MASK, RCC_BDCR_RTCSEL);
+
       /* Enable the RTC Clock by setting the RTCEN bit in the RCC register */
 
-      modifyreg32(STM32_RCC_XXX, 0, RCC_XXX_RTCEN);
+      modifyreg32(STM32_RCC_BDCR, 0, RCC_BDCR_RTCEN);
     }
-  else /* The RTC is already in use: check if the clock source is changed */
+  else
     {
-#if defined(CONFIG_STM32F7_RTC_HSECLOCK) || defined(CONFIG_RTC_LSICLOCK) || \
-    defined(CONFIG_STM32F7_RTC_LSECLOCK)
-
-      uint32_t clksrc = getreg32(STM32_RCC_XXX);
+      uint32_t clksrc = getreg32(STM32_RCC_BDCR);
 
       rtc_dumpregs("On reset warm");
 
-#if defined(CONFIG_STM32F7_RTC_HSECLOCK)
-      if ((clksrc & RCC_XXX_RTCSEL_MASK) != RCC_XXX_RTCSEL_HSE)
-#elif defined(CONFIG_STM32F7_RTC_LSICLOCK)
-      if ((clksrc & RCC_XXX_RTCSEL_MASK) != RCC_XXX_RTCSEL_LSI)
-#elif defined(CONFIG_STM32F7_RTC_LSECLOCK)
-      if ((clksrc & RCC_XXX_RTCSEL_MASK) != RCC_XXX_RTCSEL_LSE)
-#endif
-#endif
+      /* The RTC is already in use: check if the clock source has changed */
+
+      if ((clksrc & RCC_BDCR_RTCSEL_MASK) != RCC_BDCR_RTCSEL)
         {
           tr_bkp = getreg32(STM32_RTC_TR);
           dr_bkp = getreg32(STM32_RTC_DR);
-          modifyreg32(STM32_RCC_XXX, 0, RCC_XXX_YYYRST);
-          modifyreg32(STM32_RCC_XXX, RCC_XXX_YYYRST, 0);
+          modifyreg32(STM32_RCC_BDCR, 0, RCC_BDCR_BDRST);
+          modifyreg32(STM32_RCC_BDCR, RCC_BDCR_BDRST, 0);
 
-#if defined(CONFIG_STM32F7_RTC_HSECLOCK)
-          /* Change to the new clock as the input to the RTC block */
-
-          modifyreg32(STM32_RCC_XXX, RCC_XXX_RTCSEL_MASK, RCC_XXX_RTCSEL_HSE);
-
-#elif defined(CONFIG_STM32F7_RTC_LSICLOCK)
-          modifyreg32(STM32_RCC_XXX, RCC_XXX_RTCSEL_MASK, RCC_XXX_RTCSEL_LSI);
+# if RCC_BDCR_RTCSEL == RCC_BDCR_RTCSEL_LSE
+          /* Because of the Backup domain Reset - we must re enable the LSE
+           * if it is used
+           */
 
-#elif defined(CONFIG_STM32F7_RTC_LSECLOCK)
-          modifyreg32(STM32_RCC_XXX, RCC_XXX_RTCSEL_MASK, RCC_XXX_RTCSEL_LSE);
+           stm32_rcc_enablelse();
 #endif
+          /* Change to the new clock as the input to the RTC block */
+
+          modifyreg32(STM32_RCC_BDCR, RCC_BDCR_RTCSEL_MASK, RCC_BDCR_RTCSEL);
 
           putreg32(tr_bkp, STM32_RTC_TR);
           putreg32(dr_bkp, STM32_RTC_DR);
 
-          /* Remember that the RTC is initialized */
+          /* Keep the fact that the RTC is initialized */
 
           putreg32(RTC_MAGIC, RTC_MAGIC_REG);
 
           /* Enable the RTC Clock by setting the RTCEN bit in the RCC register */
 
-          modifyreg32(STM32_RCC_XXX, 0, RCC_XXX_RTCEN);
+          modifyreg32(STM32_RCC_BDCR, 0, RCC_BDCR_RTCEN);
         }
     }
 
-- 
GitLab


From 2ed1295528f2fa5be983ed39165e14140b7d245b Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 28 Jun 2016 16:42:21 -0600
Subject: [PATCH 095/229] Cosmetic changes from review of last PR

---
 arch/arm/src/stm32f7/stm32_lsi.c |  20 +--
 arch/arm/src/stm32f7/stm32_rtc.c | 259 ++++++++++++++++---------------
 2 files changed, 135 insertions(+), 144 deletions(-)

diff --git a/arch/arm/src/stm32f7/stm32_lsi.c b/arch/arm/src/stm32f7/stm32_lsi.c
index 3aea41ba4d..46e9616372 100644
--- a/arch/arm/src/stm32f7/stm32_lsi.c
+++ b/arch/arm/src/stm32f7/stm32_lsi.c
@@ -44,18 +44,6 @@
 
 #include "stm32_rcc.h"
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -70,8 +58,8 @@
 
 void stm32_rcc_enablelsi(void)
 {
-  /* Enable the Internal Low-Speed (LSI) RC Oscillator by setting the LSION bit
-   * the RCC CSR register.
+  /* Enable the Internal Low-Speed (LSI) RC Oscillator by setting the LSION
+   * bit the RCC CSR register.
    */
 
   modifyreg32(STM32_RCC_CSR, 0, RCC_CSR_LSION);
@@ -91,8 +79,8 @@ void stm32_rcc_enablelsi(void)
 
 void stm32_rcc_disablelsi(void)
 {
-  /* Enable the Internal Low-Speed (LSI) RC Oscillator by setting the LSION bit
-   * the RCC CSR register.
+  /* Enable the Internal Low-Speed (LSI) RC Oscillator by setting the LSION
+   * bit the RCC CSR register.
    */
 
   modifyreg32(STM32_RCC_CSR, RCC_CSR_LSION, 0);
diff --git a/arch/arm/src/stm32f7/stm32_rtc.c b/arch/arm/src/stm32f7/stm32_rtc.c
index b8b469e662..bd42b8396a 100644
--- a/arch/arm/src/stm32f7/stm32_rtc.c
+++ b/arch/arm/src/stm32f7/stm32_rtc.c
@@ -34,9 +34,9 @@
  *
  ****************************************************************************/
 
-/************************************************************************************
+/****************************************************************************
  * Included Files
- ************************************************************************************/
+ ****************************************************************************/
 
 #include 
 
@@ -61,10 +61,10 @@
 
 #ifdef CONFIG_RTC
 
-/************************************************************************************
+/****************************************************************************
  * Pre-processor Definitions
- ************************************************************************************/
-/* Configuration ********************************************************************/
+ ****************************************************************************/
+/* Configuration ************************************************************/
 /* This RTC implementation supports
  *  - date/time RTC hardware
  *  - extended functions Alarm A and B for STM32F4xx and onwards
@@ -82,7 +82,7 @@
 #  error "CONFIG_STM32F7_PWR must selected to use this driver"
 #endif
 
-/* Constants ************************************************************************/
+/* Constants ****************************************************************/
 
 #if defined(CONFIG_STM32F7_RTC_HSECLOCK)
 #  define  RCC_BDCR_RTCSEL RCC_BDCR_RTCSEL_HSE
@@ -102,10 +102,6 @@
 #define MINUTES_IN_HOUR 60
 #define HOURS_IN_DAY 24
 
-/* Can't exceed 24hours-2min without providing extra logic for carry over for day. */
-
-#define MAX_RTC_ALARM_REL_MINUTES (24*MINUTES_IN_HOUR)-2
-
 #define hours_add(parm_hrs) \
   time->tm_hour += parm_hrs;\
   if ((HOURS_IN_DAY-1) < (time->tm_hour))\
@@ -118,9 +114,9 @@
 #define RTC_ALRMR_DIS_DATE_MASK       (RTC_ALRMR_MSK4)
 #define RTC_ALRMR_ENABLE              (0)
 
-/************************************************************************************
+/****************************************************************************
  * Private Types
- ************************************************************************************/
+ ****************************************************************************/
 
 #ifdef CONFIG_RTC_ALARM
 typedef unsigned int rtc_alarmreg_t;
@@ -132,9 +128,9 @@ struct alm_cbinfo_s
 };
 #endif
 
-/************************************************************************************
+/****************************************************************************
  * Private Data
- ************************************************************************************/
+ ****************************************************************************/
 
 #ifdef CONFIG_RTC_ALARM
 /* Callback to use when an EXTI is activated  */
@@ -142,17 +138,17 @@ struct alm_cbinfo_s
 static struct alm_cbinfo_s g_alarmcb[RTC_ALARM_LAST];
 #endif
 
-/************************************************************************************
+/****************************************************************************
  * Public Data
- ************************************************************************************/
+ ****************************************************************************/
 
 /* g_rtc_enabled is set true after the RTC has successfully initialized */
 
 volatile bool g_rtc_enabled = false;
 
-/************************************************************************************
+/****************************************************************************
  * Private Function Prototypes
- ************************************************************************************/
+ ****************************************************************************/
 
 #ifdef CONFIG_RTC_ALARM
 static int rtchw_check_alrawf(void);
@@ -163,11 +159,11 @@ static int rtchw_set_alrmbr(rtc_alarmreg_t alarmreg);
 #endif
 #endif
 
-/************************************************************************************
+/****************************************************************************
  * Private Functions
- ************************************************************************************/
+ ****************************************************************************/
 
-/************************************************************************************
+/****************************************************************************
  * Name: rtc_dumpregs
  *
  * Description:
@@ -179,7 +175,7 @@ static int rtchw_set_alrmbr(rtc_alarmreg_t alarmreg);
  * Returned Value:
  *   None
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 #ifdef CONFIG_DEBUG_RTC_INFO
 static void rtc_dumpregs(FAR const char *msg)
@@ -216,7 +212,7 @@ static void rtc_dumpregs(FAR const char *msg)
 #  define rtc_dumpregs(msg)
 #endif
 
-/************************************************************************************
+/****************************************************************************
  * Name: rtc_dumptime
  *
  * Description:
@@ -228,7 +224,7 @@ static void rtc_dumpregs(FAR const char *msg)
  * Returned Value:
  *   None
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 #ifdef CONFIG_DEBUG_RTC_INFO
 static void rtc_dumptime(FAR const struct tm *tp, FAR const char *msg)
@@ -245,7 +241,7 @@ static void rtc_dumptime(FAR const struct tm *tp, FAR const char *msg)
 #  define rtc_dumptime(tp, msg)
 #endif
 
-/************************************************************************************
+/****************************************************************************
  * Name: rtc_wprunlock
  *
  * Description:
@@ -257,7 +253,7 @@ static void rtc_dumptime(FAR const struct tm *tp, FAR const char *msg)
  * Returned Value:
  *   None
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 static void rtc_wprunlock(void)
 {
@@ -280,7 +276,7 @@ static void rtc_wprunlock(void)
   putreg32(0x53, STM32_RTC_WPR);
 }
 
-/************************************************************************************
+/****************************************************************************
  * Name: rtc_wprlock
  *
  * Description:
@@ -292,7 +288,7 @@ static void rtc_wprunlock(void)
  * Returned Value:
  *   None
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 static inline void rtc_wprlock(void)
 {
@@ -300,14 +296,14 @@ static inline void rtc_wprlock(void)
 
   putreg32(0xff, STM32_RTC_WPR);
 
-  /* Disable write access to the backup domain (RTC registers, RTC backup data
-   * registers and backup SRAM).
+  /* Disable write access to the backup domain (RTC registers, RTC backup
+   * data registers and backup SRAM).
    */
 
   (void)stm32_pwr_enablebkp(false);
 }
 
-/************************************************************************************
+/****************************************************************************
  * Name: rtc_synchwait
  *
  * Description:
@@ -320,7 +316,7 @@ static inline void rtc_wprlock(void)
  * Returned Value:
  *   Zero (OK) on success; a negated errno on failure
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 static int rtc_synchwait(void)
 {
@@ -359,7 +355,7 @@ static int rtc_synchwait(void)
   return ret;
 }
 
-/************************************************************************************
+/****************************************************************************
  * Name: rtc_enterinit
  *
  * Description:
@@ -371,7 +367,7 @@ static int rtc_synchwait(void)
  * Returned Value:
  *   Zero (OK) on success; a negated errno on failure
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 static int rtc_enterinit(void)
 {
@@ -407,7 +403,7 @@ static int rtc_enterinit(void)
   return ret;
 }
 
-/************************************************************************************
+/****************************************************************************
  * Name: rtc_exitinit
  *
  * Description:
@@ -419,7 +415,7 @@ static int rtc_enterinit(void)
  * Returned Value:
  *   Zero (OK) on success; a negated errno on failure
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 static void rtc_exitinit(void)
 {
@@ -430,7 +426,7 @@ static void rtc_exitinit(void)
   putreg32(regval, STM32_RTC_ISR);
 }
 
-/************************************************************************************
+/****************************************************************************
  * Name: rtc_bin2bcd
  *
  * Description:
@@ -442,7 +438,7 @@ static void rtc_exitinit(void)
  * Returned Value:
  *   The value in BCD representation
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 static uint32_t rtc_bin2bcd(int value)
 {
@@ -457,7 +453,7 @@ static uint32_t rtc_bin2bcd(int value)
   return (msbcd << 4) | value;
 }
 
-/************************************************************************************
+/****************************************************************************
  * Name: rtc_bin2bcd
  *
  * Description:
@@ -469,7 +465,7 @@ static uint32_t rtc_bin2bcd(int value)
  * Returned Value:
  *   The value in binary representation
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 static int rtc_bcd2bin(uint32_t value)
 {
@@ -477,13 +473,13 @@ static int rtc_bcd2bin(uint32_t value)
   return (int)(tens + (value & 0x0f));
 }
 
-/************************************************************************************
+/****************************************************************************
  * Name: rtc_setup
  *
  * Description:
- *   Performs first time configuration of the RTC.  A special value written into
- *   back-up register 0 will prevent this function from being called on sub-sequent
- *   resets or power up.
+ *   Performs first time configuration of the RTC.  A special value written
+ *   into back-up register 0 will prevent this function from being called on
+ *   sub-sequent resets or power up.
  *
  * Input Parameters:
  *   None
@@ -491,7 +487,7 @@ static int rtc_bcd2bin(uint32_t value)
  * Returned Value:
  *   Zero (OK) on success; a negated errno on failure
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 static int rtc_setup(void)
 {
@@ -545,12 +541,12 @@ static int rtc_setup(void)
   return ret;
 }
 
-/************************************************************************************
+/****************************************************************************
  * Name: rtc_resume
  *
  * Description:
- *   Called when the RTC was already initialized on a previous power cycle.  This
- *   just brings the RTC back into full operation.
+ *   Called when the RTC was already initialized on a previous power cycle.
+ *   This just brings the RTC back into full operation.
  *
  * Input Parameters:
  *   None
@@ -558,7 +554,7 @@ static int rtc_setup(void)
  * Returned Value:
  *   Zero (OK) on success; a negated errno on failure
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 static void rtc_resume(void)
 {
@@ -577,7 +573,7 @@ static void rtc_resume(void)
 #endif
 }
 
-/************************************************************************************
+/****************************************************************************
  * Name: stm32_rtc_alarm_handler
  *
  * Description:
@@ -590,7 +586,7 @@ static void rtc_resume(void)
  * Returned Value:
  *   Zero (OK) on success; A negated errno value on failure.
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 #ifdef CONFIG_RTC_ALARM
 static int stm32_rtc_alarm_handler(int irq, void *context)
@@ -660,7 +656,7 @@ static int stm32_rtc_alarm_handler(int irq, void *context)
 }
 #endif
 
-/************************************************************************************
+/****************************************************************************
  * Name: rtchw_check_alrXwf X= a or B
  *
  * Description:
@@ -672,7 +668,7 @@ static int stm32_rtc_alarm_handler(int irq, void *context)
  * Returned Value:
  *   Zero (OK) on success; a negated errno on failure
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 #ifdef CONFIG_RTC_ALARM
 static int rtchw_check_alrawf(void)
@@ -726,12 +722,12 @@ static int rtchw_check_alrbwf(void)
 }
 #endif
 
-/************************************************************************************
+/****************************************************************************
  * Name: stm32_rtchw_set_alrmXr X is a or b
  *
  * Description:
- *   Set the alarm (A or B) hardware registers, using the required hardware access
- *   protocol
+ *   Set the alarm (A or B) hardware registers, using the required hardware
+ *   access protocol
  *
  * Input Parameters:
  *   alarmreg - the register
@@ -739,7 +735,7 @@ static int rtchw_check_alrbwf(void)
  * Returned Value:
  *   Zero (OK) on success; a negated errno on failure
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 #ifdef CONFIG_RTC_ALARM
 static int rtchw_set_alrmar(rtc_alarmreg_t alarmreg)
@@ -815,16 +811,16 @@ rtchw_set_alrmbr_exit:
 }
 #endif
 
-/************************************************************************************
+/****************************************************************************
  * Public Functions
- ************************************************************************************/
+ ****************************************************************************/
 
-/************************************************************************************
+/****************************************************************************
  * Name: up_rtc_initialize
  *
  * Description:
- *   Initialize the hardware RTC per the selected configuration.  This function is
- *   called once during the OS initialization sequence
+ *   Initialize the hardware RTC per the selected configuration.  This
+ *   function is called once during the OS initialization sequence
  *
  * Input Parameters:
  *   None
@@ -832,7 +828,7 @@ rtchw_set_alrmbr_exit:
  * Returned Value:
  *   Zero (OK) on success; a negated errno on failure
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 int up_rtc_initialize(void)
 {
@@ -844,9 +840,9 @@ int up_rtc_initialize(void)
   int nretry = 0;
 
   /* Clocking for the PWR block must be provided.  However, this is done
-   * unconditionally in stm32f7xxx_rcc.c on power up.  This done unconditionally
-   * because the PWR block is also needed to set the internal voltage regulator for
-   * maximum performance.
+   * unconditionally in stm32f7xxx_rcc.c on power up.  This done
+   * unconditionally because the PWR block is also needed to set the
+   * internal voltage regulator for maximum performance.
    */
 
   /* Select the clock source */
@@ -858,15 +854,14 @@ int up_rtc_initialize(void)
 
   if (regval != RTC_MAGIC)
     {
-
       /* Issue the Backup domain Reset Per Section 5.3.20 DocID028270 Rev 2
-       * The LSEON, LSEBYP, RTCSEL and RTCEN bits in the RCC backup domain control
-       * register (RCC_BDCR) are in the Backup domain. As a result, after Reset,
-       * these bits are write-protected and the DBP bit in the PWR power control
-       * register (PWR_CR1) has to be set before these can be modified.
-       * Refer to Section 5.1.1: System reset on page 148 for further information.
-       * These bits are only reset after a Backup domain Reset
-       * (see Section 5.1.3: Backup domain reset).
+       * The LSEON, LSEBYP, RTCSEL and RTCEN bits in the RCC backup domain
+       * control register (RCC_BDCR) are in the Backup domain. As a result,
+       * after Reset, these bits are write-protected and the DBP bit in the
+       * PWR power control register (PWR_CR1) has to be set before these can
+       * be modified.  Refer to Section 5.1.1: System reset on page 148 for
+       * further information.  These bits are only reset after a Backup
+       * domain Reset (see Section 5.1.3: Backup domain reset).
        *
        * This has to be done here so that PWR is already enabled
        */
@@ -875,15 +870,15 @@ int up_rtc_initialize(void)
       modifyreg32(STM32_RCC_BDCR, RCC_BDCR_BDRST, 0);
 
 #if RCC_BDCR_RTCSEL == RCC_BDCR_RTCSEL_LSE
-          /* Because of the Backup domain Reset - we must re enable the LSE */
+      /* Because of the Backup domain Reset - we must re enable the LSE */
 
-           stm32_rcc_enablelse();
+      stm32_rcc_enablelse();
 #endif
 
-      /* Some boards do not have the external 32khz oscillator installed, for those
-      * boards we must fallback to the crummy internal RC clock or the external high
-      * rate clock
-      */
+      /* Some boards do not have the external 32khz oscillator installed, for
+       * those boards we must fallback to the crummy internal RC clock or the
+       * external high rate clock
+       */
 
 #ifdef CONFIG_STM32F7_RTC_HSECLOCK
       /* Use the HSE clock as the input to the RTC block */
@@ -927,7 +922,7 @@ int up_rtc_initialize(void)
            * if it is used
            */
 
-           stm32_rcc_enablelse();
+          stm32_rcc_enablelse();
 #endif
           /* Change to the new clock as the input to the RTC block */
 
@@ -940,7 +935,9 @@ int up_rtc_initialize(void)
 
           putreg32(RTC_MAGIC, RTC_MAGIC_REG);
 
-          /* Enable the RTC Clock by setting the RTCEN bit in the RCC register */
+          /* Enable the RTC Clock by setting the RTCEN bit in the RCC
+           * register.
+           */
 
           modifyreg32(STM32_RCC_BDCR, 0, RCC_BDCR_RTCEN);
         }
@@ -949,14 +946,14 @@ int up_rtc_initialize(void)
   (void)stm32_pwr_enablebkp(false);
 
   /* Loop, attempting to initialize/resume the RTC.  This loop is necessary
-   * because it seems that occasionally it takes longer to initialize the RTC
-   * (the actual failure is in rtc_synchwait()).
+   * because it seems that occasionally it takes longer to initialize the
+   * RTC (the actual failure is in rtc_synchwait()).
    */
 
   do
     {
-      /* Wait for the RTC Time and Date registers to be synchronized with RTC APB
-       * clock.
+      /* Wait for the RTC Time and Date registers to be synchronized with
+       * RTC APB clock.
        */
 
       ret = rtc_synchwait();
@@ -1027,12 +1024,12 @@ int up_rtc_initialize(void)
     }
 
 #ifdef CONFIG_RTC_ALARM
-  /* Configure RTC interrupt to catch alarm interrupts. All RTC interrupts are
-   * connected to the EXTI controller.  To enable the RTC Alarm interrupt, the
-   * following sequence is required:
+  /* Configure RTC interrupt to catch alarm interrupts. All RTC interrupts
+   * are connected to the EXTI controller.  To enable the RTC Alarm
+   * interrupt, the following sequence is required:
    *
-   * 1. Configure and enable the EXTI Line 17 RTC ALARM in interrupt mode and select the
-   *    rising edge sensitivity.
+   * 1. Configure and enable the EXTI Line 17 RTC ALARM in interrupt mode
+   *    and select the rising edge sensitivity.
    *    For STM32F4xx
    *    EXTI line 21 RTC Tamper & Timestamp
    *    EXTI line 22 RTC Wakeup
@@ -1050,18 +1047,18 @@ int up_rtc_initialize(void)
   return OK;
 }
 
-/************************************************************************************
+/****************************************************************************
  * Name: stm32_rtc_getdatetime_with_subseconds
  *
  * Description:
  *   Get the current date and time from the date/time RTC.  This interface
  *   is only supported by the date/time RTC hardware implementation.
- *   It is used to replace the system timer.  It is only used by the RTOS during
- *   initialization to set up the system time when CONFIG_RTC and CONFIG_RTC_DATETIME
- *   are selected (and CONFIG_RTC_HIRES is not).
+ *   It is used to replace the system timer.  It is only used by the RTOS
+ *   during initialization to set up the system time when CONFIG_RTC and
+ *   CONFIG_RTC_DATETIME are selected (and CONFIG_RTC_HIRES is not).
  *
- *   NOTE: Some date/time RTC hardware is capability of sub-second accuracy.  That
- *   sub-second accuracy is returned through 'nsec'.
+ *   NOTE: Some date/time RTC hardware is capability of sub-second accuracy.
+ *   That sub-second accuracy is returned through 'nsec'.
  *
  * Input Parameters:
  *   tp - The location to return the high resolution time value.
@@ -1070,7 +1067,7 @@ int up_rtc_initialize(void)
  * Returned Value:
  *   Zero (OK) on success; a negated errno on failure
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 #ifdef CONFIG_STM32_HAVE_RTC_SUBSECONDS
 int stm32_rtc_getdatetime_with_subseconds(FAR struct tm *tp, FAR long *nsec)
@@ -1085,9 +1082,9 @@ int up_rtc_getdatetime(FAR struct tm *tp)
   uint32_t tr;
   uint32_t tmp;
 
-  /* Sample the data time registers.  There is a race condition here... If we sample
-   * the time just before midnight on December 31, the date could be wrong because
-   * the day rolled over while were sampling.
+  /* Sample the data time registers.  There is a race condition here... If
+   * we sample the time just before midnight on December 31, the date could
+   * be wrong because the day rolled over while were sampling.
    */
 
   do
@@ -1139,7 +1136,8 @@ int up_rtc_getdatetime(FAR struct tm *tp)
 #if defined(CONFIG_LIBC_LOCALTIME) || defined(CONFIG_TIME_EXTENDED)
   tmp = (dr & RTC_DR_WDU_MASK) >> RTC_DR_WDU_SHIFT;
   tp->tm_wday = tmp % 7;
-  tp->tm_yday = tp->tm_mday + clock_daysbeforemonth(tp->tm_mon, clock_isleapyear(tp->tm_year + 1900));
+  tp->tm_yday = tp->tm_mday +
+    clock_daysbeforemonth(tp->tm_mon, clock_isleapyear(tp->tm_year + 1900));
   tp->tm_isdst = 0
 #endif
 
@@ -1171,20 +1169,20 @@ int up_rtc_getdatetime(FAR struct tm *tp)
   return OK;
 }
 
-/************************************************************************************
+/****************************************************************************
  * Name: up_rtc_getdatetime
  *
  * Description:
  *   Get the current date and time from the date/time RTC.  This interface
  *   is only supported by the date/time RTC hardware implementation.
- *   It is used to replace the system timer.  It is only used by the RTOS during
- *   initialization to set up the system time when CONFIG_RTC and CONFIG_RTC_DATETIME
- *   are selected (and CONFIG_RTC_HIRES is not).
+ *   It is used to replace the system timer.  It is only used by the RTOS
+ *   during initialization to set up the system time when CONFIG_RTC and
+ *   CONFIG_RTC_DATETIME are selected (and CONFIG_RTC_HIRES is not).
  *
- *   NOTE: Some date/time RTC hardware is capability of sub-second accuracy.  That
- *   sub-second accuracy is lost in this interface.  However, since the system time
- *   is reinitialized on each power-up/reset, there will be no timing inaccuracy in
- *   the long run.
+ *   NOTE: Some date/time RTC hardware is capability of sub-second accuracy.
+ *   That sub-second accuracy is lost in this interface.  However, since the
+ *   system time is reinitialized on each power-up/reset, there will be no
+ *   timing inaccuracy in the long run.
  *
  * Input Parameters:
  *   tp - The location to return the high resolution time value.
@@ -1192,7 +1190,7 @@ int up_rtc_getdatetime(FAR struct tm *tp)
  * Returned Value:
  *   Zero (OK) on success; a negated errno on failure
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 #ifdef CONFIG_STM32_HAVE_RTC_SUBSECONDS
 int up_rtc_getdatetime(FAR struct tm *tp)
@@ -1201,13 +1199,13 @@ int up_rtc_getdatetime(FAR struct tm *tp)
 }
 #endif
 
-/************************************************************************************
+/****************************************************************************
  * Name: stm32_rtc_setdatetime
  *
  * Description:
  *   Set the RTC to the provided time. RTC implementations which provide
- *   up_rtc_getdatetime() (CONFIG_RTC_DATETIME is selected) should provide this
- *   function.
+ *   up_rtc_getdatetime() (CONFIG_RTC_DATETIME is selected) should provide
+ *   this function.
  *
  * Input Parameters:
  *   tp - the time to use
@@ -1215,7 +1213,7 @@ int up_rtc_getdatetime(FAR struct tm *tp)
  * Returned Value:
  *   Zero (OK) on success; a negated errno on failure
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 int stm32_rtc_setdatetime(FAR const struct tm *tp)
 {
@@ -1227,20 +1225,23 @@ int stm32_rtc_setdatetime(FAR const struct tm *tp)
 
   /* Then write the broken out values to the RTC */
 
-  /* Convert the struct tm format to RTC time register fields.  All of the STM32
-   * All of the ranges of values correspond between struct tm and the time
-   * register.
+  /* Convert the struct tm format to RTC time register fields.  All of the
+   * STM32 All of the ranges of values correspond between struct tm and the
+   * time register.
    */
 
   tr = (rtc_bin2bcd(tp->tm_sec)  << RTC_TR_SU_SHIFT) |
        (rtc_bin2bcd(tp->tm_min)  << RTC_TR_MNU_SHIFT) |
        (rtc_bin2bcd(tp->tm_hour) << RTC_TR_HU_SHIFT);
 
-  /* Now convert the fields in struct tm format to the RTC date register fields:
-   * Days: 1-31 match in both cases.
-   * Month: STM32 is 1-12, struct tm is 0-11.
-   * Years: STM32 is 00-99, struct tm is years since 1900.
-   * WeekDay: STM32 is 1 = Mon - 7 = Sun
+  /* Now convert the fields in struct tm format to the RTC date register
+   * fields:
+   *
+   *   Days: 1-31 match in both cases.
+   *   Month: STM32 is 1-12, struct tm is 0-11.
+   *   Years: STM32 is 00-99, struct tm is years since 1900.
+   *   WeekDay: STM32 is 1 = Mon - 7 = Sun
+   *
    * Issue:  I am not sure what the STM32 years mean.  Are these the
    * years 2000-2099?  I'll assume so.
    */
@@ -1283,12 +1284,12 @@ int stm32_rtc_setdatetime(FAR const struct tm *tp)
   return ret;
 }
 
-/************************************************************************************
+/****************************************************************************
  * Name: up_rtc_settime
  *
  * Description:
- *   Set the RTC to the provided time.  All RTC implementations must be able to
- *   set their time based on a standard timespec.
+ *   Set the RTC to the provided time.  All RTC implementations must be able
+ *   to set their time based on a standard timespec.
  *
  * Input Parameters:
  *   tp - the time to use
@@ -1296,13 +1297,15 @@ int stm32_rtc_setdatetime(FAR const struct tm *tp)
  * Returned Value:
  *   Zero (OK) on success; a negated errno on failure
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 int up_rtc_settime(FAR const struct timespec *tp)
 {
   FAR struct tm newtime;
 
-  /* Break out the time values (not that the time is set only to units of seconds) */
+  /* Break out the time values (not that the time is set only to units of
+   * seconds)
+   */
 
   (void)gmtime_r(&tp->tv_sec, &newtime);
   return stm32_rtc_setdatetime(&newtime);
-- 
GitLab


From 35ca7eaf3ac9b776185810307b71db5c33b28d4a Mon Sep 17 00:00:00 2001
From: David Sidrane 
Date: Tue, 28 Jun 2016 12:43:39 -1000
Subject: [PATCH 096/229] Removed STM32 porting vestiges

---
 arch/arm/src/stm32f7/stm32_bbsram.c |  2 +-
 arch/arm/src/stm32f7/stm32_dma.c    |  4 ++--
 arch/arm/src/stm32f7/stm32_dma.h    | 10 ++++------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/arch/arm/src/stm32f7/stm32_bbsram.c b/arch/arm/src/stm32f7/stm32_bbsram.c
index 2d7c57c079..34086632b2 100644
--- a/arch/arm/src/stm32f7/stm32_bbsram.c
+++ b/arch/arm/src/stm32f7/stm32_bbsram.c
@@ -756,7 +756,7 @@ int stm32_bbsraminitialize(char *devpath, int *sizes)
   memset(g_bbsram, 0, sizeof(g_bbsram));
 
   /* Clocking for the PWR block must be provided.  However, this is done
-   * unconditionally in stm32f40xxx_rcc.c on power up.  This done
+   * unconditionally in stm32f7xxxx_rcc.c on power up.  This done
    * unconditionally because the PWR block is also needed to set the
    * internal voltage regulator for maximum performance.
    */
diff --git a/arch/arm/src/stm32f7/stm32_dma.c b/arch/arm/src/stm32f7/stm32_dma.c
index 7b03377bcc..adfee405cc 100644
--- a/arch/arm/src/stm32f7/stm32_dma.c
+++ b/arch/arm/src/stm32f7/stm32_dma.c
@@ -521,9 +521,9 @@ void weak_function up_dmainitialize(void)
  *   version.  Feel free to do that if that is what you need.
  *
  * Input parameter:
- *   dmamap - Identifies the stream/channel resource. For the STM32 F4, this
+ *   dmamap - Identifies the stream/channel resource. For the STM32 F7, this
  *     is a bit-encoded  value as provided by the DMAMAP_* definitions
- *     in chip/stm32f40xxx_dma.h
+ *     in chip/stm32f7xxxxxxx_dma.h
  *
  * Returned Value:
  *   Provided that 'dmamap' is valid, this function ALWAYS returns a non-NULL,
diff --git a/arch/arm/src/stm32f7/stm32_dma.h b/arch/arm/src/stm32f7/stm32_dma.h
index f78221c949..70b5173467 100644
--- a/arch/arm/src/stm32f7/stm32_dma.h
+++ b/arch/arm/src/stm32f7/stm32_dma.h
@@ -62,8 +62,8 @@
  * Public Types
  ************************************************************************************/
 
-/* DMA_HANDLE provides an opaque are reference that can be used to represent a DMA
- * channel (F1) or a DMA stream (F4).
+/* DMA_HANDLE Provides an opaque are reference that can be used to represent a DMA
+ * a DMA stream.
  */
 
 typedef FAR void *DMA_HANDLE;
@@ -137,10 +137,8 @@ extern "C"
  *
  * Input parameter:
  *   chan - Identifies the stream/channel resource
- *     For the STM32 F1, this is simply the channel number as provided by
- *     the DMACHAN_* definitions in chip/stm32f10xxx_dma.h.
- *     For the STM32 F4, this is a bit encoded value as provided by the
- *     the DMAMAP_* definitions in chip/stm32f40xxx_dma.h
+ *     For the STM32 F7, this is a bit encoded value as provided by the
+ *     the DMAMAP_* definitions  in chip/stm32f7xxxxxxx_dma.h
  *
  * Returned Value:
  *   Provided that 'chan' is valid, this function ALWAYS returns a non-NULL,
-- 
GitLab


From edca32f40cce33926916281166382f9439d303ed Mon Sep 17 00:00:00 2001
From: David Sidrane 
Date: Tue, 28 Jun 2016 12:44:17 -1000
Subject: [PATCH 097/229] missing s

---
 arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c b/arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c
index 47a59b4cbf..1b20b44eda 100644
--- a/arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c
+++ b/arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c
@@ -2,8 +2,8 @@
  * arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c
  *
  *   Copyright (C) 2015-2016 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt 
- *           David Sidrane 
+ *   Authors: Gregory Nutt 
+ *            David Sidrane 
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
-- 
GitLab


From 0aa571d359f8d7834e231efc103512e54b44d135 Mon Sep 17 00:00:00 2001
From: David Sidrane 
Date: Tue, 28 Jun 2016 12:45:08 -1000
Subject: [PATCH 098/229] Fix warnings

---
 configs/nucleo-144/src/stm32_buttons.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/configs/nucleo-144/src/stm32_buttons.c b/configs/nucleo-144/src/stm32_buttons.c
index c2d16e50b1..ff0e64d764 100644
--- a/configs/nucleo-144/src/stm32_buttons.c
+++ b/configs/nucleo-144/src/stm32_buttons.c
@@ -40,9 +40,13 @@
 
 #include 
 
+#include 
+
 #include 
 #include 
 
+#include 
+
 #include "stm32_gpio.h"
 #include "nucleo-144.h"
 
-- 
GitLab


From c40c107e7acc8655827a8650002d683b9eaedc5e Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 28 Jun 2016 16:55:06 -0600
Subject: [PATCH 099/229] STM32 F4 RTC: Fix some long lines

---
 arch/arm/src/stm32/stm32f40xxx_rtcc.c | 226 +++++++++++++-------------
 1 file changed, 114 insertions(+), 112 deletions(-)

diff --git a/arch/arm/src/stm32/stm32f40xxx_rtcc.c b/arch/arm/src/stm32/stm32f40xxx_rtcc.c
index 0e55a4ad7d..c20024d8b1 100644
--- a/arch/arm/src/stm32/stm32f40xxx_rtcc.c
+++ b/arch/arm/src/stm32/stm32f40xxx_rtcc.c
@@ -1,4 +1,4 @@
-/************************************************************************************
+/****************************************************************************
  * arch/arm/src/stm32/stm32f40xxx_rtcc.c
  *
  *   Copyright (C) 2012-2016 Gregory Nutt. All rights reserved.
@@ -32,11 +32,11 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- ************************************************************************************/
+ ****************************************************************************/
 
-/************************************************************************************
+/****************************************************************************
  * Included Files
- ************************************************************************************/
+ ****************************************************************************/
 
 #include 
 
@@ -60,10 +60,11 @@
 
 #ifdef CONFIG_RTC
 
-/************************************************************************************
+/****************************************************************************
  * Pre-processor Definitions
- ************************************************************************************/
-/* Configuration ********************************************************************/
+ ****************************************************************************/
+
+/* Configuration ************************************************************/
 /* This RTC implementation supports
  *  - date/time RTC hardware
  *  - extended functions Alarm A and B for STM32F4xx and onwards
@@ -81,12 +82,12 @@
 #  error "CONFIG_STM32_PWR must selected to use this driver"
 #endif
 
-/* Constants ************************************************************************/
+/* Constants ****************************************************************/
 
 #define SYNCHRO_TIMEOUT      (0x00020000)
 #define INITMODE_TIMEOUT     (0x00010000)
 
-/* Proxy definitions to make the same code work for all the STM32 series ************/
+/* Proxy definitions to make the same code work for all the STM32 series ****/
 
 # define STM32_RCC_XXX       STM32_RCC_BDCR
 # define RCC_XXX_YYYRST      RCC_BDCR_BDRST
@@ -101,10 +102,6 @@
 #define MINUTES_IN_HOUR 60
 #define HOURS_IN_DAY 24
 
-/* Can't exceed 24hours-2min without providing extra logic for carry over for day. */
-
-#define MAX_RTC_ALARM_REL_MINUTES (24*MINUTES_IN_HOUR)-2
-
 #define hours_add(parm_hrs) \
   time->tm_hour += parm_hrs;\
   if ((HOURS_IN_DAY-1) < (time->tm_hour))\
@@ -117,9 +114,9 @@
 #define RTC_ALRMR_DIS_DATE_MASK       (RTC_ALRMR_MSK4)
 #define RTC_ALRMR_ENABLE              (0)
 
-/************************************************************************************
+/****************************************************************************
  * Private Types
- ************************************************************************************/
+ ****************************************************************************/
 
 #ifdef CONFIG_RTC_ALARM
 typedef unsigned int rtc_alarmreg_t;
@@ -131,9 +128,9 @@ struct alm_cbinfo_s
 };
 #endif
 
-/************************************************************************************
+/****************************************************************************
  * Private Data
- ************************************************************************************/
+ ****************************************************************************/
 
 #ifdef CONFIG_RTC_ALARM
 /* Callback to use when an EXTI is activated  */
@@ -141,17 +138,17 @@ struct alm_cbinfo_s
 static struct alm_cbinfo_s g_alarmcb[RTC_ALARM_LAST];
 #endif
 
-/************************************************************************************
+/****************************************************************************
  * Public Data
- ************************************************************************************/
+ ****************************************************************************/
 
 /* g_rtc_enabled is set true after the RTC has successfully initialized */
 
 volatile bool g_rtc_enabled = false;
 
-/************************************************************************************
+/****************************************************************************
  * Private Function Prototypes
- ************************************************************************************/
+ ****************************************************************************/
 
 #ifdef CONFIG_RTC_ALARM
 static int rtchw_check_alrawf(void);
@@ -162,11 +159,11 @@ static int rtchw_set_alrmbr(rtc_alarmreg_t alarmreg);
 #endif
 #endif
 
-/************************************************************************************
+/****************************************************************************
  * Private Functions
- ************************************************************************************/
+ ****************************************************************************/
 
-/************************************************************************************
+/****************************************************************************
  * Name: rtc_dumpregs
  *
  * Description:
@@ -178,7 +175,7 @@ static int rtchw_set_alrmbr(rtc_alarmreg_t alarmreg);
  * Returned Value:
  *   None
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 #ifdef CONFIG_DEBUG_RTC_INFO
 static void rtc_dumpregs(FAR const char *msg)
@@ -215,7 +212,7 @@ static void rtc_dumpregs(FAR const char *msg)
 #  define rtc_dumpregs(msg)
 #endif
 
-/************************************************************************************
+/****************************************************************************
  * Name: rtc_dumptime
  *
  * Description:
@@ -227,7 +224,7 @@ static void rtc_dumpregs(FAR const char *msg)
  * Returned Value:
  *   None
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 #ifdef CONFIG_DEBUG_RTC_INFO
 static void rtc_dumptime(FAR const struct tm *tp, FAR const char *msg)
@@ -244,7 +241,7 @@ static void rtc_dumptime(FAR const struct tm *tp, FAR const char *msg)
 #  define rtc_dumptime(tp, msg)
 #endif
 
-/************************************************************************************
+/****************************************************************************
  * Name: rtc_wprunlock
  *
  * Description:
@@ -256,7 +253,7 @@ static void rtc_dumptime(FAR const struct tm *tp, FAR const char *msg)
  * Returned Value:
  *   None
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 static void rtc_wprunlock(void)
 {
@@ -279,7 +276,7 @@ static void rtc_wprunlock(void)
   putreg32(0x53, STM32_RTC_WPR);
 }
 
-/************************************************************************************
+/****************************************************************************
  * Name: rtc_wprlock
  *
  * Description:
@@ -291,7 +288,7 @@ static void rtc_wprunlock(void)
  * Returned Value:
  *   None
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 static inline void rtc_wprlock(void)
 {
@@ -299,14 +296,14 @@ static inline void rtc_wprlock(void)
 
   putreg32(0xff, STM32_RTC_WPR);
 
-  /* Disable write access to the backup domain (RTC registers, RTC backup data
-   * registers and backup SRAM).
+  /* Disable write access to the backup domain (RTC registers, RTC backup
+   * data registers and backup SRAM).
    */
 
   (void)stm32_pwr_enablebkp(false);
 }
 
-/************************************************************************************
+/****************************************************************************
  * Name: rtc_synchwait
  *
  * Description:
@@ -319,7 +316,7 @@ static inline void rtc_wprlock(void)
  * Returned Value:
  *   Zero (OK) on success; a negated errno on failure
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 static int rtc_synchwait(void)
 {
@@ -358,7 +355,7 @@ static int rtc_synchwait(void)
   return ret;
 }
 
-/************************************************************************************
+/****************************************************************************
  * Name: rtc_enterinit
  *
  * Description:
@@ -370,7 +367,7 @@ static int rtc_synchwait(void)
  * Returned Value:
  *   Zero (OK) on success; a negated errno on failure
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 static int rtc_enterinit(void)
 {
@@ -406,7 +403,7 @@ static int rtc_enterinit(void)
   return ret;
 }
 
-/************************************************************************************
+/****************************************************************************
  * Name: rtc_exitinit
  *
  * Description:
@@ -418,7 +415,7 @@ static int rtc_enterinit(void)
  * Returned Value:
  *   Zero (OK) on success; a negated errno on failure
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 static void rtc_exitinit(void)
 {
@@ -429,7 +426,7 @@ static void rtc_exitinit(void)
   putreg32(regval, STM32_RTC_ISR);
 }
 
-/************************************************************************************
+/****************************************************************************
  * Name: rtc_bin2bcd
  *
  * Description:
@@ -441,7 +438,7 @@ static void rtc_exitinit(void)
  * Returned Value:
  *   The value in BCD representation
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 static uint32_t rtc_bin2bcd(int value)
 {
@@ -456,7 +453,7 @@ static uint32_t rtc_bin2bcd(int value)
   return (msbcd << 4) | value;
 }
 
-/************************************************************************************
+/****************************************************************************
  * Name: rtc_bin2bcd
  *
  * Description:
@@ -468,7 +465,7 @@ static uint32_t rtc_bin2bcd(int value)
  * Returned Value:
  *   The value in binary representation
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 static int rtc_bcd2bin(uint32_t value)
 {
@@ -476,13 +473,13 @@ static int rtc_bcd2bin(uint32_t value)
   return (int)(tens + (value & 0x0f));
 }
 
-/************************************************************************************
+/****************************************************************************
  * Name: rtc_setup
  *
  * Description:
- *   Performs first time configuration of the RTC.  A special value written into
- *   back-up register 0 will prevent this function from being called on sub-sequent
- *   resets or power up.
+ *   Performs first time configuration of the RTC.  A special value written
+ *   into back-up register 0 will prevent this function from being called on
+ *   sub-sequent resets or power up.
  *
  * Input Parameters:
  *   None
@@ -490,7 +487,7 @@ static int rtc_bcd2bin(uint32_t value)
  * Returned Value:
  *   Zero (OK) on success; a negated errno on failure
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 static int rtc_setup(void)
 {
@@ -544,12 +541,12 @@ static int rtc_setup(void)
   return ret;
 }
 
-/************************************************************************************
+/****************************************************************************
  * Name: rtc_resume
  *
  * Description:
- *   Called when the RTC was already initialized on a previous power cycle.  This
- *   just brings the RTC back into full operation.
+ *   Called when the RTC was already initialized on a previous power cycle.
+ *   This just brings the RTC back into full operation.
  *
  * Input Parameters:
  *   None
@@ -557,7 +554,7 @@ static int rtc_setup(void)
  * Returned Value:
  *   Zero (OK) on success; a negated errno on failure
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 static void rtc_resume(void)
 {
@@ -576,7 +573,7 @@ static void rtc_resume(void)
 #endif
 }
 
-/************************************************************************************
+/****************************************************************************
  * Name: stm32_rtc_alarm_handler
  *
  * Description:
@@ -589,7 +586,7 @@ static void rtc_resume(void)
  * Returned Value:
  *   Zero (OK) on success; A negated errno value on failure.
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 #ifdef CONFIG_RTC_ALARM
 static int stm32_rtc_alarm_handler(int irq, void *context)
@@ -659,7 +656,7 @@ static int stm32_rtc_alarm_handler(int irq, void *context)
 }
 #endif
 
-/************************************************************************************
+/****************************************************************************
  * Name: rtchw_check_alrXwf X= a or B
  *
  * Description:
@@ -671,7 +668,7 @@ static int stm32_rtc_alarm_handler(int irq, void *context)
  * Returned Value:
  *   Zero (OK) on success; a negated errno on failure
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 #ifdef CONFIG_RTC_ALARM
 static int rtchw_check_alrawf(void)
@@ -725,12 +722,12 @@ static int rtchw_check_alrbwf(void)
 }
 #endif
 
-/************************************************************************************
+/****************************************************************************
  * Name: stm32_rtchw_set_alrmXr X is a or b
  *
  * Description:
- *   Set the alarm (A or B) hardware registers, using the required hardware access
- *   protocol
+ *   Set the alarm (A or B) hardware registers, using the required hardware
+ *   access protocol
  *
  * Input Parameters:
  *   alarmreg - the register
@@ -738,7 +735,7 @@ static int rtchw_check_alrbwf(void)
  * Returned Value:
  *   Zero (OK) on success; a negated errno on failure
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 #ifdef CONFIG_RTC_ALARM
 static int rtchw_set_alrmar(rtc_alarmreg_t alarmreg)
@@ -814,16 +811,16 @@ rtchw_set_alrmbr_exit:
 }
 #endif
 
-/************************************************************************************
+/****************************************************************************
  * Public Functions
- ************************************************************************************/
+ ****************************************************************************/
 
-/************************************************************************************
+/****************************************************************************
  * Name: up_rtc_initialize
  *
  * Description:
- *   Initialize the hardware RTC per the selected configuration.  This function is
- *   called once during the OS initialization sequence
+ *   Initialize the hardware RTC per the selected configuration.  This
+ *   function is called once during the OS initialization sequence
  *
  * Input Parameters:
  *   None
@@ -831,7 +828,7 @@ rtchw_set_alrmbr_exit:
  * Returned Value:
  *   Zero (OK) on success; a negated errno on failure
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 int up_rtc_initialize(void)
 {
@@ -843,9 +840,9 @@ int up_rtc_initialize(void)
   int nretry = 0;
 
   /* Clocking for the PWR block must be provided.  However, this is done
-   * unconditionally in stm32f40xxx_rcc.c on power up.  This done unconditionally
-   * because the PWR block is also needed to set the internal voltage regulator for
-   * maximum performance.
+   * unconditionally in stm32f40xxx_rcc.c on power up.  This done
+   * unconditionally because the PWR block is also needed to set the
+   * internal voltage regulator for maximum performance.
    */
 
   /* Select the clock source */
@@ -857,9 +854,9 @@ int up_rtc_initialize(void)
 
   if (regval != RTC_MAGIC)
     {
-      /* Some boards do not have the external 32khz oscillator installed, for those
-       * boards we must fallback to the crummy internal RC clock or the external high
-       * rate clock
+      /* Some boards do not have the external 32khz oscillator installed,
+       * for those boards we must fallback to the crummy internal RC clock
+       * or the external high rate clock
        */
 
 #ifdef CONFIG_RTC_HSECLOCK
@@ -942,8 +939,8 @@ int up_rtc_initialize(void)
 
   do
     {
-      /* Wait for the RTC Time and Date registers to be synchronized with RTC APB
-       * clock.
+      /* Wait for the RTC Time and Date registers to be synchronized with RTC
+       * APB clock.
        */
 
       ret = rtc_synchwait();
@@ -1014,12 +1011,12 @@ int up_rtc_initialize(void)
     }
 
 #ifdef CONFIG_RTC_ALARM
-  /* Configure RTC interrupt to catch alarm interrupts. All RTC interrupts are
-   * connected to the EXTI controller.  To enable the RTC Alarm interrupt, the
-   * following sequence is required:
+  /* Configure RTC interrupt to catch alarm interrupts. All RTC interrupts
+   * are connected to the EXTI controller.  To enable the RTC Alarm
+   * interrupt, the following sequence is required:
    *
-   * 1. Configure and enable the EXTI Line 17 RTC ALARM in interrupt mode and select the
-   *    rising edge sensitivity.
+   * 1. Configure and enable the EXTI Line 17 RTC ALARM in interrupt mode
+   *    and select the rising edge sensitivity.
    *    For STM32F4xx
    *    EXTI line 21 RTC Tamper & Timestamp
    *    EXTI line 22 RTC Wakeup
@@ -1037,18 +1034,18 @@ int up_rtc_initialize(void)
   return OK;
 }
 
-/************************************************************************************
+/****************************************************************************
  * Name: stm32_rtc_getdatetime_with_subseconds
  *
  * Description:
  *   Get the current date and time from the date/time RTC.  This interface
  *   is only supported by the date/time RTC hardware implementation.
- *   It is used to replace the system timer.  It is only used by the RTOS during
- *   initialization to set up the system time when CONFIG_RTC and CONFIG_RTC_DATETIME
- *   are selected (and CONFIG_RTC_HIRES is not).
+ *   It is used to replace the system timer.  It is only used by the RTOS
+ *   during initialization to set up the system time when CONFIG_RTC and
+ *   CONFIG_RTC_DATETIME are selected (and CONFIG_RTC_HIRES is not).
  *
- *   NOTE: Some date/time RTC hardware is capability of sub-second accuracy.  That
- *   sub-second accuracy is returned through 'nsec'.
+ *   NOTE: Some date/time RTC hardware is capability of sub-second accuracy.
+ *   That sub-second accuracy is returned through 'nsec'.
  *
  * Input Parameters:
  *   tp - The location to return the high resolution time value.
@@ -1057,7 +1054,7 @@ int up_rtc_initialize(void)
  * Returned Value:
  *   Zero (OK) on success; a negated errno on failure
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 #ifdef CONFIG_STM32_HAVE_RTC_SUBSECONDS
 int stm32_rtc_getdatetime_with_subseconds(FAR struct tm *tp, FAR long *nsec)
@@ -1072,9 +1069,9 @@ int up_rtc_getdatetime(FAR struct tm *tp)
   uint32_t tr;
   uint32_t tmp;
 
-  /* Sample the data time registers.  There is a race condition here... If we sample
-   * the time just before midnight on December 31, the date could be wrong because
-   * the day rolled over while were sampling.
+  /* Sample the data time registers.  There is a race condition here... If
+   * we sample the time just before midnight on December 31, the date could
+   * be wrong because the day rolled over while were sampling.
    */
 
   do
@@ -1158,20 +1155,20 @@ int up_rtc_getdatetime(FAR struct tm *tp)
   return OK;
 }
 
-/************************************************************************************
+/****************************************************************************
  * Name: up_rtc_getdatetime
  *
  * Description:
  *   Get the current date and time from the date/time RTC.  This interface
  *   is only supported by the date/time RTC hardware implementation.
- *   It is used to replace the system timer.  It is only used by the RTOS during
- *   initialization to set up the system time when CONFIG_RTC and CONFIG_RTC_DATETIME
- *   are selected (and CONFIG_RTC_HIRES is not).
+ *   It is used to replace the system timer.  It is only used by the RTOS
+ *   during initialization to set up the system time when CONFIG_RTC and
+ *   CONFIG_RTC_DATETIME are selected (and CONFIG_RTC_HIRES is not).
  *
- *   NOTE: Some date/time RTC hardware is capability of sub-second accuracy.  That
- *   sub-second accuracy is lost in this interface.  However, since the system time
- *   is reinitialized on each power-up/reset, there will be no timing inaccuracy in
- *   the long run.
+ *   NOTE: Some date/time RTC hardware is capability of sub-second accuracy.
+ *   That sub-second accuracy is lost in this interface.  However, since the
+ *   system time is reinitialized on each power-up/reset, there will be no
+ *   timing inaccuracy in the long run.
  *
  * Input Parameters:
  *   tp - The location to return the high resolution time value.
@@ -1179,7 +1176,7 @@ int up_rtc_getdatetime(FAR struct tm *tp)
  * Returned Value:
  *   Zero (OK) on success; a negated errno on failure
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 #ifdef CONFIG_STM32_HAVE_RTC_SUBSECONDS
 int up_rtc_getdatetime(FAR struct tm *tp)
@@ -1188,13 +1185,13 @@ int up_rtc_getdatetime(FAR struct tm *tp)
 }
 #endif
 
-/************************************************************************************
+/****************************************************************************
  * Name: stm32_rtc_setdatetime
  *
  * Description:
  *   Set the RTC to the provided time. RTC implementations which provide
- *   up_rtc_getdatetime() (CONFIG_RTC_DATETIME is selected) should provide this
- *   function.
+ *   up_rtc_getdatetime() (CONFIG_RTC_DATETIME is selected) should provide
+ *   this function.
  *
  * Input Parameters:
  *   tp - the time to use
@@ -1202,7 +1199,7 @@ int up_rtc_getdatetime(FAR struct tm *tp)
  * Returned Value:
  *   Zero (OK) on success; a negated errno on failure
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 int stm32_rtc_setdatetime(FAR const struct tm *tp)
 {
@@ -1223,11 +1220,14 @@ int stm32_rtc_setdatetime(FAR const struct tm *tp)
        (rtc_bin2bcd(tp->tm_min)  << RTC_TR_MNU_SHIFT) |
        (rtc_bin2bcd(tp->tm_hour) << RTC_TR_HU_SHIFT);
 
-  /* Now convert the fields in struct tm format to the RTC date register fields:
-   * Days: 1-31 match in both cases.
-   * Month: STM32 is 1-12, struct tm is 0-11.
-   * Years: STM32 is 00-99, struct tm is years since 1900.
-   * WeekDay: STM32 is 1 = Mon - 7 = Sun
+  /* Now convert the fields in struct tm format to the RTC date register
+   * fields:
+   *
+   *   Days: 1-31 match in both cases.
+   *   Month: STM32 is 1-12, struct tm is 0-11.
+   *   Years: STM32 is 00-99, struct tm is years since 1900.
+   *   WeekDay: STM32 is 1 = Mon - 7 = Sun
+   *
    * Issue:  I am not sure what the STM32 years mean.  Are these the
    * years 2000-2099?  I'll assume so.
    */
@@ -1270,12 +1270,12 @@ int stm32_rtc_setdatetime(FAR const struct tm *tp)
   return ret;
 }
 
-/************************************************************************************
+/****************************************************************************
  * Name: up_rtc_settime
  *
  * Description:
- *   Set the RTC to the provided time.  All RTC implementations must be able to
- *   set their time based on a standard timespec.
+ *   Set the RTC to the provided time.  All RTC implementations must be able
+ *   to set their time based on a standard timespec.
  *
  * Input Parameters:
  *   tp - the time to use
@@ -1283,13 +1283,15 @@ int stm32_rtc_setdatetime(FAR const struct tm *tp)
  * Returned Value:
  *   Zero (OK) on success; a negated errno on failure
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 int up_rtc_settime(FAR const struct timespec *tp)
 {
   FAR struct tm newtime;
 
-  /* Break out the time values (not that the time is set only to units of seconds) */
+  /* Break out the time values (not that the time is set only to units of
+   * seconds)
+   */
 
   (void)gmtime_r(&tp->tv_sec, &newtime);
   return stm32_rtc_setdatetime(&newtime);
-- 
GitLab


From eacd672ab022de14d8ac3d9b6da515d0a0b99543 Mon Sep 17 00:00:00 2001
From: David Sidrane 
Date: Tue, 28 Jun 2016 16:25:04 -1000
Subject: [PATCH 100/229] STM32 BBSRAM fixed (and formated) flags

---
 arch/arm/src/stm32/stm32_bbsram.c | 5 +++--
 arch/arm/src/stm32/stm32_bbsram.h | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/arch/arm/src/stm32/stm32_bbsram.c b/arch/arm/src/stm32/stm32_bbsram.c
index e35f5e05a7..81c49340ae 100644
--- a/arch/arm/src/stm32/stm32_bbsram.c
+++ b/arch/arm/src/stm32/stm32_bbsram.c
@@ -593,8 +593,9 @@ static int stm32_bbsram_ioctl(FAR struct file *filep, int cmd,
           bbrr->fileno = bbr->bbf->fileno;
           bbrr->lastwrite = bbr->bbf->lastwrite;
           bbrr->len = bbr->bbf->len;
-          bbrr->flags = (bbr->bbf->crc == stm32_bbsram_crc(bbr->bbf)) ? eCRCValid : 0;
-          bbrr->flags = (bbr->bbf->dirty) ? eDirty : 0;
+          bbrr->flags = ((bbr->bbf->crc == stm32_bbsram_crc(bbr->bbf))
+                          ? BBSRAM_CRC_VALID : 0);
+          bbrr->flags |= ((bbr->bbf->dirty) ? BBSRAM_DIRTY : 0);
           ret = OK;
         }
 
diff --git a/arch/arm/src/stm32/stm32_bbsram.h b/arch/arm/src/stm32/stm32_bbsram.h
index 69d0046f5c..536273f115 100644
--- a/arch/arm/src/stm32/stm32_bbsram.h
+++ b/arch/arm/src/stm32/stm32_bbsram.h
@@ -83,8 +83,8 @@
 
 enum bbsramdf_e
 {
-  eCRCValid = 1,  /* The crc is valid */
-  eDirty    = 2,  /* The file was closed */
+  BBSRAM_CRC_VALID = 1,  /* The crc is valid */
+  BBSRAM_DIRTY     = 2,  /* The file was closed */
 
 };
 
-- 
GitLab


From efb2850b5f8375fa67ceaf65ad0db803bf950b1d Mon Sep 17 00:00:00 2001
From: David Sidrane 
Date: Tue, 28 Jun 2016 16:25:24 -1000
Subject: [PATCH 101/229] STM32F7 BBSRAM fixed (and formated) flags

---
 arch/arm/src/stm32f7/stm32_bbsram.c | 5 +++--
 arch/arm/src/stm32f7/stm32_bbsram.h | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/arch/arm/src/stm32f7/stm32_bbsram.c b/arch/arm/src/stm32f7/stm32_bbsram.c
index 34086632b2..7f8a8f0783 100644
--- a/arch/arm/src/stm32f7/stm32_bbsram.c
+++ b/arch/arm/src/stm32f7/stm32_bbsram.c
@@ -593,8 +593,9 @@ static int stm32_bbsram_ioctl(FAR struct file *filep, int cmd,
           bbrr->fileno = bbr->bbf->fileno;
           bbrr->lastwrite = bbr->bbf->lastwrite;
           bbrr->len = bbr->bbf->len;
-          bbrr->flags = (bbr->bbf->crc == stm32_bbsram_crc(bbr->bbf)) ? eCRCValid : 0;
-          bbrr->flags = (bbr->bbf->dirty) ? eDirty : 0;
+          bbrr->flags = ((bbr->bbf->crc == stm32_bbsram_crc(bbr->bbf))
+                          ? BBSRAM_CRC_VALID : 0);
+          bbrr->flags |= ((bbr->bbf->dirty) ? BBSRAM_DIRTY : 0);
           ret = OK;
         }
 
diff --git a/arch/arm/src/stm32f7/stm32_bbsram.h b/arch/arm/src/stm32f7/stm32_bbsram.h
index 7012a9a9a4..ce31dc585d 100644
--- a/arch/arm/src/stm32f7/stm32_bbsram.h
+++ b/arch/arm/src/stm32f7/stm32_bbsram.h
@@ -2,8 +2,8 @@
  * arch/arm/src/stm32f7/stm32_bbsram.h
  *
  *   Copyright (C) 2015-2016 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt 
- *           David Sidrane 
+ *   Authors: Gregory Nutt 
+ *            David Sidrane 
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -83,8 +83,8 @@
 
 enum bbsramdf_e
 {
-  eCRCValid = 1,  /* The crc is valid */
-  eDirty    = 2,  /* The file was closed */
+  BBSRAM_CRC_VALID = 1,  /* The crc is valid */
+  BBSRAM_DIRTY     = 2,  /* The file was closed */
 
 };
 
-- 
GitLab


From 1a39783e0f973467faae9bd5d825ff5cbe4ff139 Mon Sep 17 00:00:00 2001
From: David Sidrane 
Date: Tue, 28 Jun 2016 16:43:23 -1000
Subject: [PATCH 102/229] Reformated and using real sizes

---
 configs/nucleo-144/src/stm32_bbsram.c | 150 ++++++++++++++++++--------
 1 file changed, 104 insertions(+), 46 deletions(-)

diff --git a/configs/nucleo-144/src/stm32_bbsram.c b/configs/nucleo-144/src/stm32_bbsram.c
index 9653ddd65a..1810cf3120 100644
--- a/configs/nucleo-144/src/stm32_bbsram.c
+++ b/configs/nucleo-144/src/stm32_bbsram.c
@@ -1,4 +1,4 @@
-/************************************************************************************
+/****************************************************************************
  * configs/nucleo-144/src/stm32_bbsram.c
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
@@ -31,11 +31,11 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- ************************************************************************************/
+ *****************************************************************************/
 
-/************************************************************************************
+/****************************************************************************
  * Included Files
- ************************************************************************************/
+ ****************************************************************************/
 
 #include 
 
@@ -58,37 +58,76 @@
 
 #ifdef CONFIG_STM32F7_BBSRAM
 
-/************************************************************************************
+/****************************************************************************
  * Pre-processor Definitions
- ************************************************************************************/
+ ****************************************************************************/
+
+/* Configuration ************************************************************/
+
+#define FREEZE_STR(s)          #s
+#define STRINGIFY(s)           FREEZE_STR(s)
+#define HARDFAULT_FILENO       3
+#define HARDFAULT_PATH         BBSRAM_PATH""STRINGIFY(HARDFAULT_FILENO)
+#define HARDFAULT_REBOOT_      FILENO 0
+#define HARDFAULT_REBOOT_PATH  BBSRAM_PATH""STRINGIFY(HARDFAULT_REBOOT_FILENO)
+
+#define BBSRAM_SIZE_FN0        (sizeof(int))
+#define BBSRAM_SIZE_FN1        384
+#define BBSRAM_SIZE_FN2        384
+#define BBSRAM_SIZE_FN3 -      1
+
+/* The following guides in the amount of the user and interrupt stack
+ * data we can save. The amount of storage left will dictate the actual
+ * number of entries of the user stack data saved. If it is too big
+ * It will be truncated by the call to stm32_bbsram_savepanic
+ */
+#define BBSRAM_HEADER_SIZE     20 /* This is an assumption */
+#define BBSRAM_USED            ((4*BBSRAM_HEADER_SIZE)+ \
+                                (BBSRAM_SIZE_FN0+BBSRAM_SIZE_FN1+ \
+                                 BBSRAM_SIZE_FN2))
+#define BBSRAM_REAMINING       (STM32F7_BBSRAM_SIZE-BBSRAM_USED)
+#if CONFIG_ARCH_INTERRUPTSTACK <= 3
+#  define BBSRAM_NUMBER_STACKS 1
+#else
+#  define BBSRAM_NUMBER_STACKS 2
+#endif
+#define BBSRAM_FIXED_ELEMENTS_SIZE (sizeof(info_t))
+#define BBSRAM_LEFTOVER            (BBSRAM_REAMINING-\
+                                    BBSRAM_FIXED_ELEMENTS_SIZE)
+
+#define CONFIG_ISTACK_SIZE (BBSRAM_LEFTOVER/BBSRAM_NUMBER_STACKS/ \
+                            sizeof(stack_word_t))
+#define CONFIG_USTACK_SIZE (BBSRAM_LEFTOVER/BBSRAM_NUMBER_STACKS/ \
+                            sizeof(stack_word_t))
 
-/* Configuration ********************************************************************/
 /* The path to the Battery Backed up SRAM */
 
-#define BBSRAM_PATH "/bbr"
-#define HARDFAULT_FILENO 3
-#define HARDFAULT_PATH "/bbr3"
+#define BBSRAM_PATH "/fs/bbr"
 
 /* The sizes of the files to create (-1) use rest of BBSRAM memory */
 
-#define BSRAM_FILE_SIZES \
-  { \
-    256, \
-    256, \
-    1024, \
-    -1, \
-    0 \
-  }
+#define BSRAM_FILE_SIZES { \
+  BBSRAM_SIZE_FN0,   \
+  BBSRAM_SIZE_FN1,   \
+  BBSRAM_SIZE_FN2,   \
+  BBSRAM_SIZE_FN3,   \
+  0                  \
+    }
+
+#define ARRAYSIZE(a) (sizeof((a))/sizeof(a[0]))
+
+/* For Assert keep this much of the file name*/
 
 #define MAX_FILE_PATH_LENGTH 40
-#define CONFIG_ISTACK_SIZE 800
-#define CONFIG_USTACK_SIZE 800
 
-#define ARRAYSIZE(a) (sizeof((a))/sizeof(a[0]))
+#define HEADER_TIME_FMT      "%Y-%m-%d-%H:%M:%S"
+#define HEADER_TIME_FMT_NUM  (2+ 0+ 0+ 0+ 0+ 0)
+#define HEADER_TIME_FMT_LEN  (((ARRAYSIZE(HEADER_TIME_FMT)-1) + \
+                                HEADER_TIME_FMT_NUM))
 
-/************************************************************************************
+/****************************************************************************
  * Private Data
- ************************************************************************************/
+ ****************************************************************************/
 
 /* Used for stack frame storage */
 
@@ -234,19 +273,19 @@ typedef struct
   stack_word_t ustack[CONFIG_ISTACK_SIZE];
 } fullcontext_t;
 
-/************************************************************************************
+/****************************************************************************
  * Private Data
- ************************************************************************************/
+ ****************************************************************************/
 
 static uint8_t g_sdata[STM32F7_BBSRAM_SIZE];
 
-/************************************************************************************
+/****************************************************************************
  * Private Functions
- ************************************************************************************/
+ ****************************************************************************/
 
-/************************************************************************************
+/****************************************************************************
  * Name: hardfault_get_desc
- ************************************************************************************/
+ ****************************************************************************/
 
 static int hardfault_get_desc(struct bbsramd_s *desc)
 {
@@ -256,8 +295,8 @@ static int hardfault_get_desc(struct bbsramd_s *desc)
 
   if (fd < 0)
     {
-      syslog(LOG_INFO, "stm32 bbsram: Failed to open Fault Log file [%s] (%d)\n",
-             HARDFAULT_PATH, fd);
+      syslog(LOG_INFO, "stm32 bbsram: Failed to open Fault Log file [%s] "
+          "(%d)\n", HARDFAULT_PATH, fd);
     }
   else
     {
@@ -271,17 +310,17 @@ static int hardfault_get_desc(struct bbsramd_s *desc)
         }
       else
         {
-          syslog(LOG_INFO, "stm32 bbsram: Failed to get Fault Log descriptor (%d)\n",
-                 rv);
+          syslog(LOG_INFO, "stm32 bbsram: Failed to get Fault Log descriptor "
+              "(%d)\n", rv);
         }
     }
 
   return ret;
 }
 
-/************************************************************************************
+/****************************************************************************
  * Name: copy_reverse
- ************************************************************************************/
+ ****************************************************************************/
 
 #if defined(CONFIG_STM32F7_SAVE_CRASHDUMP)
 static void copy_reverse(stack_word_t *dest, stack_word_t *src, int size)
@@ -293,19 +332,24 @@ static void copy_reverse(stack_word_t *dest, stack_word_t *src, int size)
 }
 #endif /* CONFIG_STM32F7_SAVE_CRASHDUMP */
 
-/************************************************************************************
+/****************************************************************************
  * Public Functions
- ************************************************************************************/
+ ****************************************************************************/
 
-/************************************************************************************
+/****************************************************************************
  * Name: stm32_bbsram_int
- ************************************************************************************/
+ ****************************************************************************/
 
 int stm32_bbsram_int(void)
 {
   int filesizes[CONFIG_STM32F7_BBSRAM_FILES + 1] = BSRAM_FILE_SIZES;
+  char buf[HEADER_TIME_FMT_LEN + 1];
   struct bbsramd_s desc;
   int rv;
+  int state;
+  struct tm tt;
+  time_t time_sec;
+
 
   /* Using Battery Backed Up SRAM */
 
@@ -319,11 +363,23 @@ int stm32_bbsram_int(void)
   if (rv >= OK)
     {
       printf("There is a hard fault logged.\n");
-
+      state = (desc.lastwrite.tv_sec || desc.lastwrite.tv_nsec) ?  OK : 1;
+      syslog(LOG_INFO, "Fault Log info File No %d Length %d flags:0x%02x "
+          "state:%d\n",(unsigned int)desc.fileno, (unsigned int) desc.len,
+          (unsigned int)desc.flags, state);
+      if (state == OK)
+        {
+          time_sec = desc.lastwrite.tv_sec + (desc.lastwrite.tv_nsec / 1e9);
+          gmtime_r(&time_sec, &tt);
+          strftime(buf, HEADER_TIME_FMT_LEN , HEADER_TIME_FMT , &tt);
+          syslog(LOG_INFO, "Fault Logged on %s - Valid\n", buf);
+        }
+      close(rv);
       rv = unlink(HARDFAULT_PATH);
       if (rv < 0)
         {
-          syslog(LOG_INFO, "stm32 bbsram: Failed to unlink Fault Log file [%s] (%d)\n", HARDFAULT_PATH, rv);
+          syslog(LOG_INFO, "stm32 bbsram: Failed to unlink Fault Log file [%s"
+                 "] (%d)\n", HARDFAULT_PATH, rv);
         }
     }
 #endif /* CONFIG_STM32F7_SAVE_CRASHDUMP */
@@ -331,9 +387,9 @@ int stm32_bbsram_int(void)
   return rv;
 }
 
-/************************************************************************************
+/****************************************************************************
  * Name: board_crashdump
- ************************************************************************************/
+ ****************************************************************************/
 
 #if defined(CONFIG_STM32F7_SAVE_CRASHDUMP)
 void board_crashdump(uintptr_t currentsp, FAR void *tcb,
@@ -393,8 +449,10 @@ void board_crashdump(uintptr_t currentsp, FAR void *tcb,
   if (CURRENT_REGS)
     {
       pdump->info.stacks.interrupt.sp = currentsp;
-      pdump->info.flags |= (REGS_PRESENT | USERSTACK_PRESENT | INTSTACK_PRESENT);
-      memcpy(pdump->info.regs, (void *)CURRENT_REGS, sizeof(pdump->info.regs));
+      pdump->info.flags |= (REGS_PRESENT | USERSTACK_PRESENT | \
+                            INTSTACK_PRESENT);
+      memcpy(pdump->info.regs, (void *)CURRENT_REGS,
+             sizeof(pdump->info.regs));
       pdump->info.stacks.user.sp = pdump->info.regs[REG_R13];
     }
   else
@@ -413,7 +471,7 @@ void board_crashdump(uintptr_t currentsp, FAR void *tcb,
   else
     {
       pdump->info.stacks.user.top = (uint32_t) rtcb->adj_stack_ptr;
-      pdump->info.stacks.user.size = (uint32_t) rtcb->adj_stack_size;;
+      pdump->info.stacks.user.size = (uint32_t) rtcb->adj_stack_size;
     }
 
 #if CONFIG_ARCH_INTERRUPTSTACK > 3
-- 
GitLab


From e58b67b9466f1a47f7e43fb6d03a79eceefa0efa Mon Sep 17 00:00:00 2001
From: David Sidrane 
Date: Tue, 28 Jun 2016 17:23:44 -1000
Subject: [PATCH 103/229] Added STM32F7 DBGMCU

---
 arch/arm/src/stm32f7/chip/stm32_dbgmcu.h      |  55 +++++++++
 .../src/stm32f7/chip/stm32f74xx75xx_dbgmcu.h  | 112 +++++++++++++++++
 .../src/stm32f7/chip/stm32f76xx77xx_dbgmcu.h  | 113 ++++++++++++++++++
 arch/arm/src/stm32f7/stm32_dbgmcu.h           |  64 ++++++++++
 4 files changed, 344 insertions(+)
 create mode 100644 arch/arm/src/stm32f7/chip/stm32_dbgmcu.h
 create mode 100644 arch/arm/src/stm32f7/chip/stm32f74xx75xx_dbgmcu.h
 create mode 100644 arch/arm/src/stm32f7/chip/stm32f76xx77xx_dbgmcu.h
 create mode 100644 arch/arm/src/stm32f7/stm32_dbgmcu.h

diff --git a/arch/arm/src/stm32f7/chip/stm32_dbgmcu.h b/arch/arm/src/stm32f7/chip/stm32_dbgmcu.h
new file mode 100644
index 0000000000..73fcd64dcc
--- /dev/null
+++ b/arch/arm/src/stm32f7/chip/stm32_dbgmcu.h
@@ -0,0 +1,55 @@
+/****************************************************************************
+ * arch/arm/src/stm32f7/chip/stm32_dbgmcu.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_SRC_STM32F7_CHIP_STM32_DBGMCU_H
+#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_DBGMCU_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include 
+#include "chip.h"
+
+#if defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX)
+#  include "chip/stm32f74xx75xx_dbgmcu.h"
+#elif defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
+#  include "chip/stm32f76xx77xx_dbgmcu.h"
+#else
+#  error "Unsupported STM32 F7 part"
+#endif
+
+#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_DBGMCU_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f74xx75xx_dbgmcu.h b/arch/arm/src/stm32f7/chip/stm32f74xx75xx_dbgmcu.h
new file mode 100644
index 0000000000..33842b7341
--- /dev/null
+++ b/arch/arm/src/stm32f7/chip/stm32f74xx75xx_dbgmcu.h
@@ -0,0 +1,112 @@
+/****************************************************************************
+ * arch/arm/src/stm32f7/chip/stm32f74xx75xx_dbgmcu.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_SRC_STM32F7_CHIP_STM32F74XX75XXDBGMCU_H
+#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XXDBGMCU_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include 
+
+#include "chip.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Register Addresses *******************************************************/
+
+#define STM32_DBGMCU_IDCODE       0xe0042000  /* MCU identifier */
+#define STM32_DBGMCU_CR           0xe0042004  /* MCU debug */
+#define STM32_DBGMCU_APB1_FZ      0xe0042008  /* Debug MCU APB1 freeze register */
+#define STM32_DBGMCU_APB2_FZ      0xe004200c  /* Debug MCU APB2 freeze register */
+
+/* Register Bitfield Definitions ********************************************/
+
+/* MCU identifier */
+
+#define DBGMCU_IDCODE_DEVID_SHIFT (0)       /* Bits 11-0: Device Identifier */
+#define DBGMCU_IDCODE_DEVID_MASK  (0x0fff << DBGMCU_IDCODE_DEVID_SHIFT)
+#define DBGMCU_IDCODE_REVID_SHIFT (16)      /* Bits 31-16:  Revision Identifier */
+#define DBGMCU_IDCODE_REVID_MASK  (0xffff << DBGMCU_IDCODE_REVID_SHIFT)
+
+/* MCU debug */
+
+#define DBGMCU_CR_SLEEP           (1 << 0)  /* Bit 0: Debug Sleep Mode */
+#define DBGMCU_CR_STOP            (1 << 1)  /* Bit 1: Debug Stop Mode */
+#define DBGMCU_CR_STANDBY         (1 << 2)  /* Bit 2: Debug Standby mode */
+#define DBGMCU_CR_TRACEIOEN       (1 << 5)  /* Bit 5: Trace enabled */
+
+#define DBGMCU_CR_TRACEMODE_SHIFT (6)        /* Bits 7-6: Trace mode pin assignement */
+#define DBGMCU_CR_TRACEMODE_MASK  (3 << DBGMCU_CR_TRACEMODE_SHIFT)
+#define DBGMCU_CR_ASYNCH          (0 << DBGMCU_CR_TRACEMODE_SHIFT) /* Asynchronous Mode */
+#define DBGMCU_CR_SYNCH1          (1 << DBGMCU_CR_TRACEMODE_SHIFT) /* Synchronous Mode, TRACEDATA size=1 */
+#define DBGMCU_CR_SYNCH2          (2 << DBGMCU_CR_TRACEMODE_SHIFT) /* Synchronous Mode, TRACEDATA size=2 */
+#define DBGMCU_CR_SYNCH4          (3 << DBGMCU_CR_TRACEMODE_SHIFT) /* Synchronous Mode, TRACEDATA size=4 */
+
+/* Debug MCU APB1 freeze register */
+
+#define DBGMCU_APB1_TIM2STOP      (1 << 0)   /* Bit 0: TIM2 stopped when core is halted */
+#define DBGMCU_APB1_TIM3STOP      (1 << 1)   /* Bit 1: TIM3 stopped when core is halted */
+#define DBGMCU_APB1_TIM4STOP      (1 << 2)   /* Bit 2: TIM4 stopped when core is halted */
+#define DBGMCU_APB1_TIM5STOP      (1 << 3)   /* Bit 3: TIM5 stopped when core is halted */
+#define DBGMCU_APB1_TIM6STOP      (1 << 4)   /* Bit 4: TIM6 stopped when core is halted */
+#define DBGMCU_APB1_TIM7STOP      (1 << 5)   /* Bit 5: TIM7 stopped when core is halted */
+#define DBGMCU_APB1_TIM12STOP     (1 << 6)   /* Bit 6: TIM12 stopped when core is halted */
+#define DBGMCU_APB1_TIM13STOP     (1 << 7)   /* Bit 7: TIM13 stopped when core is halted */
+#define DBGMCU_APB1_TIM14STOP     (1 << 8)   /* Bit 8: TIM14 stopped when core is halted */
+#define DBGMCU_APB1_LPTIM1STOP    (1 << 9)   /* Bit 9: LPTIM1 stopped when core is halted */
+#define DBGMCU_APB1_RTCSTOP       (1 << 10)  /* Bit 10: RTC stopped when Core is halted */
+#define DBGMCU_APB1_WWDGSTOP      (1 << 11)  /* Bit 11: Window Watchdog stopped when core is halted */
+#define DBGMCU_APB1_IWDGSTOP      (1 << 12)  /* Bit 12: Independent Watchdog stopped when core is halted */
+#define DBGMCU_APB1_I2C1STOP      (1 << 21)  /* Bit 21: I2C1 SMBUS timeout mode stopped when Core is halted */
+#define DBGMCU_APB1_I2C2STOP      (1 << 22)  /* Bit 22: I2C2 SMBUS timeout mode stopped when Core is halted */
+#define DBGMCU_APB1_I2C3STOP      (1 << 23)  /* Bit 23: I2C3 SMBUS timeout mode stopped when Core is halted */
+#define DBGMCU_APB1_I2C4STOP      (1 << 24)  /* Bit 24: I2C4 SMBUS timeout mode stopped when Core is halted */
+#define DBGMCU_APB1_CAN1STOP      (1 << 25)  /* Bit 25: CAN1 stopped when core is halted */
+#define DBGMCU_APB1_CAN2STOP      (1 << 26)  /* Bit 26: CAN2 stopped when core is halted */
+
+/* Debug MCU APB2 freeze register */
+
+#define DBGMCU_APB2_TIM1STOP      (1 << 0)   /* Bit 0:  TIM1 stopped when core is halted */
+#define DBGMCU_APB2_TIM8STOP      (1 << 1)   /* Bit 1:  TIM8 stopped when core is halted */
+#define DBGMCU_APB2_TIM9STOP      (1 << 16)  /* Bit 16: TIM9 stopped when core is halted */
+#define DBGMCU_APB2_TIM10STOP     (1 << 17)  /* Bit 17: TIM10 stopped when core is halted */
+#define DBGMCU_APB2_TIM11STOP     (1 << 18)  /* Bit 18: TIM11 stopped when core is halted */
+
+#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F74XX75XXDBGMCU_H */
diff --git a/arch/arm/src/stm32f7/chip/stm32f76xx77xx_dbgmcu.h b/arch/arm/src/stm32f7/chip/stm32f76xx77xx_dbgmcu.h
new file mode 100644
index 0000000000..6804dc2574
--- /dev/null
+++ b/arch/arm/src/stm32f7/chip/stm32f76xx77xx_dbgmcu.h
@@ -0,0 +1,113 @@
+/****************************************************************************
+ * arch/arm/src/stm32f7/chip/stm32f76xx77xx_dbgmcu.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_SRC_STM32F7_CHIP_STM32F76XX77XXDBGMCU_H
+#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32F76XX77XXDBGMCU_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include 
+
+#include "chip.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Register Addresses *******************************************************/
+
+#define STM32_DBGMCU_IDCODE       0xe0042000  /* MCU identifier */
+#define STM32_DBGMCU_CR           0xe0042004  /* MCU debug */
+#define STM32_DBGMCU_APB1_FZ      0xe0042008  /* Debug MCU APB1 freeze register */
+#define STM32_DBGMCU_APB2_FZ      0xe004200c  /* Debug MCU APB2 freeze register */
+
+/* Register Bitfield Definitions ********************************************/
+
+/* MCU identifier */
+
+#define DBGMCU_IDCODE_DEVID_SHIFT (0)       /* Bits 11-0: Device Identifier */
+#define DBGMCU_IDCODE_DEVID_MASK  (0x0fff << DBGMCU_IDCODE_DEVID_SHIFT)
+#define DBGMCU_IDCODE_REVID_SHIFT (16)      /* Bits 31-16:  Revision Identifier */
+#define DBGMCU_IDCODE_REVID_MASK  (0xffff << DBGMCU_IDCODE_REVID_SHIFT)
+
+/* MCU debug */
+
+#define DBGMCU_CR_SLEEP           (1 << 0)  /* Bit 0: Debug Sleep Mode */
+#define DBGMCU_CR_STOP            (1 << 1)  /* Bit 1: Debug Stop Mode */
+#define DBGMCU_CR_STANDBY         (1 << 2)  /* Bit 2: Debug Standby mode */
+#define DBGMCU_CR_TRACEIOEN       (1 << 5)  /* Bit 5: Trace enabled */
+
+#define DBGMCU_CR_TRACEMODE_SHIFT (6)        /* Bits 7-6: Trace mode pin assignement */
+#define DBGMCU_CR_TRACEMODE_MASK  (3 << DBGMCU_CR_TRACEMODE_SHIFT)
+#define DBGMCU_CR_ASYNCH          (0 << DBGMCU_CR_TRACEMODE_SHIFT) /* Asynchronous Mode */
+#define DBGMCU_CR_SYNCH1          (1 << DBGMCU_CR_TRACEMODE_SHIFT) /* Synchronous Mode, TRACEDATA size=1 */
+#define DBGMCU_CR_SYNCH2          (2 << DBGMCU_CR_TRACEMODE_SHIFT) /* Synchronous Mode, TRACEDATA size=2 */
+#define DBGMCU_CR_SYNCH4          (3 << DBGMCU_CR_TRACEMODE_SHIFT) /* Synchronous Mode, TRACEDATA size=4 */
+
+/* Debug MCU APB1 freeze register */
+
+#define DBGMCU_APB1_TIM2STOP      (1 << 0)   /* Bit 0: TIM2 stopped when core is halted */
+#define DBGMCU_APB1_TIM3STOP      (1 << 1)   /* Bit 1: TIM3 stopped when core is halted */
+#define DBGMCU_APB1_TIM4STOP      (1 << 2)   /* Bit 2: TIM4 stopped when core is halted */
+#define DBGMCU_APB1_TIM5STOP      (1 << 3)   /* Bit 3: TIM5 stopped when core is halted */
+#define DBGMCU_APB1_TIM6STOP      (1 << 4)   /* Bit 4: TIM6 stopped when core is halted */
+#define DBGMCU_APB1_TIM7STOP      (1 << 5)   /* Bit 5: TIM7 stopped when core is halted */
+#define DBGMCU_APB1_TIM12STOP     (1 << 6)   /* Bit 6: TIM12 stopped when core is halted */
+#define DBGMCU_APB1_TIM13STOP     (1 << 7)   /* Bit 7: TIM13 stopped when core is halted */
+#define DBGMCU_APB1_TIM14STOP     (1 << 8)   /* Bit 8: TIM14 stopped when core is halted */
+#define DBGMCU_APB1_LPTIM1STOP    (1 << 9)   /* Bit 9: LPTIM1 stopped when core is halted */
+#define DBGMCU_APB1_RTCSTOP       (1 << 10)  /* Bit 10: RTC stopped when Core is halted */
+#define DBGMCU_APB1_WWDGSTOP      (1 << 11)  /* Bit 11: Window Watchdog stopped when core is halted */
+#define DBGMCU_APB1_IWDGSTOP      (1 << 12)  /* Bit 12: Independent Watchdog stopped when core is halted */
+#define DBGMCU_APB1_CAN3STOP      (1 << 13)  /* Bit 13: CAN3 stopped when Core is halted */
+#define DBGMCU_APB1_I2C1STOP      (1 << 21)  /* Bit 21: I2C1 SMBUS timeout mode stopped when Core is halted */
+#define DBGMCU_APB1_I2C2STOP      (1 << 22)  /* Bit 22: I2C2 SMBUS timeout mode stopped when Core is halted */
+#define DBGMCU_APB1_I2C3STOP      (1 << 23)  /* Bit 23: I2C3 SMBUS timeout mode stopped when Core is halted */
+#define DBGMCU_APB1_I2C4STOP      (1 << 24)  /* Bit 24: I2C4 SMBUS timeout mode stopped when Core is halted */
+#define DBGMCU_APB1_CAN1STOP      (1 << 25)  /* Bit 25: CAN1 stopped when core is halted */
+#define DBGMCU_APB1_CAN2STOP      (1 << 26)  /* Bit 26: CAN2 stopped when core is halted */
+
+/* Debug MCU APB2 freeze register */
+
+#define DBGMCU_APB2_TIM1STOP      (1 << 0)   /* Bit 0:  TIM1 stopped when core is halted */
+#define DBGMCU_APB2_TIM8STOP      (1 << 1)   /* Bit 1:  TIM8 stopped when core is halted */
+#define DBGMCU_APB2_TIM9STOP      (1 << 16)  /* Bit 16: TIM9 stopped when core is halted */
+#define DBGMCU_APB2_TIM10STOP     (1 << 17)  /* Bit 17: TIM10 stopped when core is halted */
+#define DBGMCU_APB2_TIM11STOP     (1 << 18)  /* Bit 18: TIM11 stopped when core is halted */
+
+#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32F76XX77XXDBGMCU_H */
diff --git a/arch/arm/src/stm32f7/stm32_dbgmcu.h b/arch/arm/src/stm32f7/stm32_dbgmcu.h
new file mode 100644
index 0000000000..396288a489
--- /dev/null
+++ b/arch/arm/src/stm32f7/stm32_dbgmcu.h
@@ -0,0 +1,64 @@
+/****************************************************************************
+ * arch/arm/src/stm32f7/stm32_dbgmcu.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_SRC_STM32F7_STM32_DBGMCU_H
+#define __ARCH_ARM_SRC_STM32F7_STM32_DBGMCU_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include 
+
+#include "chip/stm32_dbgmcu.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+#endif /* __ARCH_ARM_SRC_STM32F7_STM32_DBGMCU_H */
-- 
GitLab


From 6aa067e9297661f50183fc7f2bfceabf982d33d6 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Wed, 29 Jun 2016 07:33:30 -0600
Subject: [PATCH 104/229] Mostly costmetic changes from review of last PR

---
 arch/arm/src/stm32/stm32_bbsram.h     |  5 ++---
 arch/arm/src/stm32f7/stm32_bbsram.c   | 11 ++++++-----
 arch/arm/src/stm32f7/stm32_bbsram.h   |  5 ++---
 arch/arm/src/stm32f7/stm32_dbgmcu.h   | 16 ----------------
 configs/nucleo-144/src/stm32_bbsram.c | 19 ++++++++++++-------
 5 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/arch/arm/src/stm32/stm32_bbsram.h b/arch/arm/src/stm32/stm32_bbsram.h
index 536273f115..bcb813d6fa 100644
--- a/arch/arm/src/stm32/stm32_bbsram.h
+++ b/arch/arm/src/stm32/stm32_bbsram.h
@@ -83,9 +83,8 @@
 
 enum bbsramdf_e
 {
-  BBSRAM_CRC_VALID = 1,  /* The crc is valid */
-  BBSRAM_DIRTY     = 2,  /* The file was closed */
-
+  BBSRAM_CRC_VALID = 1,        /* The crc is valid */
+  BBSRAM_DIRTY     = 2,        /* The file was closed */
 };
 
 struct bbsramd_s
diff --git a/arch/arm/src/stm32f7/stm32_bbsram.c b/arch/arm/src/stm32f7/stm32_bbsram.c
index 7f8a8f0783..bd653cfe56 100644
--- a/arch/arm/src/stm32f7/stm32_bbsram.c
+++ b/arch/arm/src/stm32f7/stm32_bbsram.c
@@ -168,6 +168,7 @@ static struct stm32_bbsram_s g_bbsram[CONFIG_STM32F7_BBSRAM_FILES];
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
+
 /****************************************************************************
  * Name: stm32_bbsram_rd
  ****************************************************************************/
@@ -199,16 +200,16 @@ static void stm32_bbsram_dump(FAR struct bbsramfh_s *bbf, char *op)
 }
 #endif
 
-/************************************************************************************
+/****************************************************************************
  * Name: stm32_bbsram_semgive
- ************************************************************************************/
+ ****************************************************************************/
 
 static void stm32_bbsram_semgive(FAR struct stm32_bbsram_s *priv)
 {
   sem_post(&priv->exclsem);
 }
 
-/************************************************************************************
+/****************************************************************************
  * Name: stm32_bbsram_semtake
  *
  * Description:
@@ -504,8 +505,8 @@ static ssize_t stm32_bbsram_internal_write(FAR struct bbsramfh_s *bbf,
  * Name: stm32_bbsram_write
  ****************************************************************************/
 
-static ssize_t stm32_bbsram_write(FAR struct file *filep, FAR const char *buffer,
-                                  size_t len)
+static ssize_t stm32_bbsram_write(FAR struct file *filep,
+                                  FAR const char *buffer, size_t len)
 {
   FAR struct inode *inode = filep->f_inode;
   FAR struct stm32_bbsram_s *bbr;
diff --git a/arch/arm/src/stm32f7/stm32_bbsram.h b/arch/arm/src/stm32f7/stm32_bbsram.h
index ce31dc585d..554a0c60df 100644
--- a/arch/arm/src/stm32f7/stm32_bbsram.h
+++ b/arch/arm/src/stm32f7/stm32_bbsram.h
@@ -83,9 +83,8 @@
 
 enum bbsramdf_e
 {
-  BBSRAM_CRC_VALID = 1,  /* The crc is valid */
-  BBSRAM_DIRTY     = 2,  /* The file was closed */
-
+  BBSRAM_CRC_VALID = 1,        /* The crc is valid */
+  BBSRAM_DIRTY     = 2,        /* The file was closed */
 };
 
 struct bbsramd_s
diff --git a/arch/arm/src/stm32f7/stm32_dbgmcu.h b/arch/arm/src/stm32f7/stm32_dbgmcu.h
index 396288a489..0aef4d5f0a 100644
--- a/arch/arm/src/stm32f7/stm32_dbgmcu.h
+++ b/arch/arm/src/stm32f7/stm32_dbgmcu.h
@@ -45,20 +45,4 @@
 
 #include "chip/stm32_dbgmcu.h"
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Types
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
 #endif /* __ARCH_ARM_SRC_STM32F7_STM32_DBGMCU_H */
diff --git a/configs/nucleo-144/src/stm32_bbsram.c b/configs/nucleo-144/src/stm32_bbsram.c
index 1810cf3120..085ee18249 100644
--- a/configs/nucleo-144/src/stm32_bbsram.c
+++ b/configs/nucleo-144/src/stm32_bbsram.c
@@ -106,13 +106,14 @@
 
 /* The sizes of the files to create (-1) use rest of BBSRAM memory */
 
-#define BSRAM_FILE_SIZES { \
-  BBSRAM_SIZE_FN0,   \
-  BBSRAM_SIZE_FN1,   \
-  BBSRAM_SIZE_FN2,   \
-  BBSRAM_SIZE_FN3,   \
-  0                  \
-    }
+#define BSRAM_FILE_SIZES \
+{ \
+  BBSRAM_SIZE_FN0, \
+  BBSRAM_SIZE_FN1, \
+  BBSRAM_SIZE_FN2, \
+  BBSRAM_SIZE_FN3, \
+  0 \
+}
 
 #define ARRAYSIZE(a) (sizeof((a))/sizeof(a[0]))
 
@@ -364,16 +365,20 @@ int stm32_bbsram_int(void)
     {
       printf("There is a hard fault logged.\n");
       state = (desc.lastwrite.tv_sec || desc.lastwrite.tv_nsec) ?  OK : 1;
+
       syslog(LOG_INFO, "Fault Log info File No %d Length %d flags:0x%02x "
           "state:%d\n",(unsigned int)desc.fileno, (unsigned int) desc.len,
           (unsigned int)desc.flags, state);
+
       if (state == OK)
         {
           time_sec = desc.lastwrite.tv_sec + (desc.lastwrite.tv_nsec / 1e9);
           gmtime_r(&time_sec, &tt);
           strftime(buf, HEADER_TIME_FMT_LEN , HEADER_TIME_FMT , &tt);
+
           syslog(LOG_INFO, "Fault Logged on %s - Valid\n", buf);
         }
+
       close(rv);
       rv = unlink(HARDFAULT_PATH);
       if (rv < 0)
-- 
GitLab


From 329c760f1749853b625125917f60a2bee0073486 Mon Sep 17 00:00:00 2001
From: Michael Spahlinger 
Date: Wed, 29 Jun 2016 08:48:11 -0600
Subject: [PATCH 105/229] SAMV7: CAN Message Filtering fixed

 - Bugfix: stdfilters didn't work because the filter was never enabled (wrong number of bits to shift)
 - Bugfix: Filters were never used because the configuration register cannot be written without using the initialization mode

Both bugs are fixed by this patch. Filtering has been tested with both standard and extended identifiers and is now working properly.
---
 arch/arm/src/samv7/chip/sam_mcan.h |  2 +-
 arch/arm/src/samv7/sam_mcan.c      | 89 ++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+), 1 deletion(-)

diff --git a/arch/arm/src/samv7/chip/sam_mcan.h b/arch/arm/src/samv7/chip/sam_mcan.h
index b3951aef70..4212ca3c29 100644
--- a/arch/arm/src/samv7/chip/sam_mcan.h
+++ b/arch/arm/src/samv7/chip/sam_mcan.h
@@ -747,7 +747,7 @@
 #define STDFILTER_S0_SFID1_SHIFT   (16)      /* Bits 16-26: Standard Filter ID 2 */
 #define STDFILTER_S0_SFID1_MASK    (0x3ff << STDFILTER_S0_SFID1_SHIFT)
 #  define STDFILTER_S0_SFID1(n)    ((uint32_t)(n) << STDFILTER_S0_SFID1_SHIFT)
-#define STDFILTER_S0_SFEC_SHIFT    (17)      /* Bits 27-29: Standard Filter Element Configuration */
+#define STDFILTER_S0_SFEC_SHIFT    (27)      /* Bits 27-29: Standard Filter Element Configuration */
 #define STDFILTER_S0_SFEC_MASK     (7 << STDFILTER_S0_SFEC_SHIFT)
 #  define STDFILTER_S0_SFEC_DISABLE   (0 << STDFILTER_S0_SFEC_SHIFT) /* Disable filter element */
 #  define STDFILTER_S0_SFEC_FIFO0     (1 << STDFILTER_S0_SFEC_SHIFT) /* Store in Rx FIFO 0 on match */
diff --git a/arch/arm/src/samv7/sam_mcan.c b/arch/arm/src/samv7/sam_mcan.c
index 2091390cab..748b01b10b 100644
--- a/arch/arm/src/samv7/sam_mcan.c
+++ b/arch/arm/src/samv7/sam_mcan.c
@@ -802,6 +802,7 @@
 /****************************************************************************
  * Private Types
  ****************************************************************************/
+
 /* CAN mode of operation */
 
 enum sam_canmode_e
@@ -1833,6 +1834,22 @@ static int mcan_add_extfilter(FAR struct sam_mcan_s *priv,
 
           if (priv->nextalloc == 1)
             {
+              /* Enable the Initialization state */
+
+              regval  = mcan_getreg(priv, SAM_MCAN_CCCR_OFFSET);
+              regval |= MCAN_CCCR_INIT;
+              mcan_putreg(priv, SAM_MCAN_CCCR_OFFSET, regval);
+
+              /* Wait for initialization mode to take effect */
+
+              while ((mcan_getreg(priv, SAM_MCAN_CCCR_OFFSET) & MCAN_CCCR_INIT) == 0);
+
+              /* Enable writing to configuration registers */
+
+              regval  = mcan_getreg(priv, SAM_MCAN_CCCR_OFFSET);
+              regval |= (MCAN_CCCR_INIT | MCAN_CCCR_CCE);
+              mcan_putreg(priv, SAM_MCAN_CCCR_OFFSET, regval);
+
              /* Update the Global Filter Configuration so that received
               * messages are rejected if they do not match the acceptance
               * filter.
@@ -1844,6 +1861,12 @@ static int mcan_add_extfilter(FAR struct sam_mcan_s *priv,
               regval &= ~MCAN_GFC_ANFE_MASK;
               regval |= MCAN_GFC_ANFE_REJECTED;
               mcan_putreg(priv, SAM_MCAN_GFC_OFFSET, regval);
+
+              /* Disable writing to configuration registers */
+
+              regval  = mcan_getreg(priv, SAM_MCAN_CCCR_OFFSET);
+              regval &= ~(MCAN_CCCR_INIT | MCAN_CCCR_CCE);
+              mcan_putreg(priv, SAM_MCAN_CCCR_OFFSET, regval);
             }
 
           mcan_dev_unlock(priv);
@@ -1903,6 +1926,22 @@ static int mcan_del_extfilter(FAR struct sam_mcan_s *priv, int ndx)
 
   if (priv->nextalloc == 0)
     {
+      /* Enable the Initialization state */
+
+      regval  = mcan_getreg(priv, SAM_MCAN_CCCR_OFFSET);
+      regval |= MCAN_CCCR_INIT;
+      mcan_putreg(priv, SAM_MCAN_CCCR_OFFSET, regval);
+
+      /* Wait for initialization mode to take effect */
+
+      while ((mcan_getreg(priv, SAM_MCAN_CCCR_OFFSET) & MCAN_CCCR_INIT) == 0);
+
+      /* Enable writing to configuration registers */
+
+      regval  = mcan_getreg(priv, SAM_MCAN_CCCR_OFFSET);
+      regval |= (MCAN_CCCR_INIT | MCAN_CCCR_CCE);
+      mcan_putreg(priv, SAM_MCAN_CCCR_OFFSET, regval);
+
       /* If there are no extended filters, then modify Global Filter
        * Configuration so that all rejected messages are places in RX
        * FIFO0.
@@ -1914,6 +1953,12 @@ static int mcan_del_extfilter(FAR struct sam_mcan_s *priv, int ndx)
       regval &= ~MCAN_GFC_ANFE_MASK;
       regval |= MCAN_GFC_ANFE_RX_FIFO0;
       mcan_putreg(priv, SAM_MCAN_GFC_OFFSET, regval);
+
+      /* Disable writing to configuration registers */
+
+      regval  = mcan_getreg(priv, SAM_MCAN_CCCR_OFFSET);
+      regval &= ~(MCAN_CCCR_INIT | MCAN_CCCR_CCE);
+      mcan_putreg(priv, SAM_MCAN_CCCR_OFFSET, regval);
     }
 
   /* Deactivate the filter last so that no messages are lost. */
@@ -2021,6 +2066,22 @@ static int mcan_add_stdfilter(FAR struct sam_mcan_s *priv,
 
           if (priv->nstdalloc == 1)
             {
+              /* Enable the Initialization state */
+
+              regval  = mcan_getreg(priv, SAM_MCAN_CCCR_OFFSET);
+              regval |= MCAN_CCCR_INIT;
+              mcan_putreg(priv, SAM_MCAN_CCCR_OFFSET, regval);
+
+              /* Wait for initialization mode to take effect */
+
+              while ((mcan_getreg(priv, SAM_MCAN_CCCR_OFFSET) & MCAN_CCCR_INIT) == 0);
+
+              /* Enable writing to configuration registers */
+
+              regval  = mcan_getreg(priv, SAM_MCAN_CCCR_OFFSET);
+              regval |= (MCAN_CCCR_INIT | MCAN_CCCR_CCE);
+              mcan_putreg(priv, SAM_MCAN_CCCR_OFFSET, regval);
+
              /* Update the Global Filter Configuration so that received
               * messages are rejected if they do not match the acceptance
               * filter.
@@ -2032,6 +2093,12 @@ static int mcan_add_stdfilter(FAR struct sam_mcan_s *priv,
               regval &= ~MCAN_GFC_ANFS_MASK;
               regval |= MCAN_GFC_ANFS_REJECTED;
               mcan_putreg(priv, SAM_MCAN_GFC_OFFSET, regval);
+
+              /* Disable writing to configuration registers */
+
+              regval  = mcan_getreg(priv, SAM_MCAN_CCCR_OFFSET);
+              regval &= ~(MCAN_CCCR_INIT | MCAN_CCCR_CCE);
+              mcan_putreg(priv, SAM_MCAN_CCCR_OFFSET, regval);
             }
 
           mcan_dev_unlock(priv);
@@ -2089,6 +2156,22 @@ static int mcan_del_stdfilter(FAR struct sam_mcan_s *priv, int ndx)
 
   if (priv->nstdalloc == 0)
     {
+      /* Enable the Initialization state */
+
+      regval  = mcan_getreg(priv, SAM_MCAN_CCCR_OFFSET);
+      regval |= MCAN_CCCR_INIT;
+      mcan_putreg(priv, SAM_MCAN_CCCR_OFFSET, regval);
+
+      /* Wait for initialization mode to take effect */
+
+      while ((mcan_getreg(priv, SAM_MCAN_CCCR_OFFSET) & MCAN_CCCR_INIT) == 0);
+
+      /* Enable writing to configuration registers */
+
+      regval  = mcan_getreg(priv, SAM_MCAN_CCCR_OFFSET);
+      regval |= (MCAN_CCCR_INIT | MCAN_CCCR_CCE);
+      mcan_putreg(priv, SAM_MCAN_CCCR_OFFSET, regval);
+
       /* If there are no standard filters, then modify Global Filter
        * Configuration so that all rejected messages are places in RX
        * FIFO0.
@@ -2100,6 +2183,12 @@ static int mcan_del_stdfilter(FAR struct sam_mcan_s *priv, int ndx)
       regval &= ~MCAN_GFC_ANFS_MASK;
       regval |= MCAN_GFC_ANFS_RX_FIFO0;
       mcan_putreg(priv, SAM_MCAN_GFC_OFFSET, regval);
+
+      /* Disable writing to configuration registers */
+
+      regval  = mcan_getreg(priv, SAM_MCAN_CCCR_OFFSET);
+      regval &= ~(MCAN_CCCR_INIT | MCAN_CCCR_CCE);
+      mcan_putreg(priv, SAM_MCAN_CCCR_OFFSET, regval);
     }
 
   /* Deactivate the filter last so that no messages are lost. */
-- 
GitLab


From fd9c9a7f4f73dc77c700edf9a70a8bba5704eba4 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Wed, 29 Jun 2016 11:53:00 -0600
Subject: [PATCH 106/229] Add logic to support custom board directories that
 include a Kconfig file.  During the context phase of the build, any Kconfig
 file in the custom board directory is copied into configs/dummy, replacing
 the existing Kconfig file with the target Kconfig file.

---
 Directories.mk              |  2 +-
 Makefile.unix               |  1 +
 configs/Kconfig             |  3 +++
 configs/Makefile            | 35 +++++++++++++++++++++++++++++++++--
 configs/dummy/.gitignore    |  2 ++
 configs/dummy/dummy_kconfig |  5 +++++
 6 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 configs/dummy/.gitignore
 create mode 100644 configs/dummy/dummy_kconfig

diff --git a/Directories.mk b/Directories.mk
index 2e42a8a435..d627c67706 100644
--- a/Directories.mk
+++ b/Directories.mk
@@ -74,7 +74,7 @@ endif
 
 NONFSDIRS = sched drivers configs $(ARCH_SRC) $(NUTTX_ADDONS)
 FSDIRS = fs binfmt
-CONTEXTDIRS = $(APPDIR)
+CONTEXTDIRS = configs $(APPDIR)
 USERDIRS =
 OTHERDIRS = lib
 
diff --git a/Makefile.unix b/Makefile.unix
index a411eda177..6c0c46b38c 100644
--- a/Makefile.unix
+++ b/Makefile.unix
@@ -344,6 +344,7 @@ context: check_context include/nuttx/config.h include/nuttx/version.h include/ma
 # and symbolic links created by the context target.
 
 clean_context:
+	$(Q) $(MAKE) -C configs TOPDIR="$(TOPDIR)" clean_context
 	$(call DELFILE, include/nuttx/config.h)
 	$(call DELFILE, include/nuttx/version.h)
 	$(call DELFILE, include/math.h)
diff --git a/configs/Kconfig b/configs/Kconfig
index 6c0cec2ba7..778fa220d5 100644
--- a/configs/Kconfig
+++ b/configs/Kconfig
@@ -1859,6 +1859,9 @@ endif
 if ARCH_BOARD_SIM
 source "configs/sim/Kconfig"
 endif
+if ARCH_BOARD_CUSTOM
+source "configs/dummy/Kconfig"
+endif
 
 config BOARD_CRASHDUMP
 	bool "Enable Board level logging of crash dumps"
diff --git a/configs/Makefile b/configs/Makefile
index 496601da0b..f2adff3e5e 100644
--- a/configs/Makefile
+++ b/configs/Makefile
@@ -35,6 +35,28 @@
 
 -include $(TOPDIR)/Make.defs
 
+# Determine there is a Kconfig file for the any custom board configuration
+
+ifeq ($(CONFIG_ARCH_BOARD_CUSTOM),y)
+  CUSTOM_DIR = $(patsubst "%",%,$(CONFIG_ARCH_BOARD_CUSTOM_DIR))
+  ifeq ($(CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH),y)
+    CUSTOM_KPATH = $(TOPDIR)$(DELIM)$(CUSTOM_DIR)$(DELIM)Kconfig
+  else
+    CUSTOM_KPATH = $(CUSTOM_DIR)$(DELIM)Kconfig
+  endif
+  CUSTOM_KCONFIG = $(if $(wildcard $(CUSTOM_KPATH)),y,)
+else
+  CUSTOM_KCONFIG =
+endif
+
+ifeq ($(CUSTOM_KCONFIG),y)
+  BOARD_KCONFIG = $(CUSTOM_KPATH)
+else
+  BOARD_KCONFIG = $(TOPDIR)$(DELIM)configs$(DELIM)dummy$(DELIM)dummy_kconfig
+endif
+
+DUMMY_KCONFIG = $(TOPDIR)$(DELIM)configs$(DELIM)dummy$(DELIM)Kconfig
+
 # Basic
 
 CONFIG_ASRCS =
@@ -58,7 +80,7 @@ OBJS = $(AOBJS) $(COBJS)
 BIN = libconfigs$(LIBEXT)
 
 all: $(BIN)
-.PHONY: depend clean distclean
+.PHONY: depend ccontext clean_context clean distclean
 
 $(AOBJS): %$(OBJEXT): %.S
 	$(call ASSEMBLE, $<, $@)
@@ -77,7 +99,16 @@ endif
 
 depend: .depend
 
-clean:
+$(DUMMY_KCONFIG): $(BOARD_KCONFIG)
+	$(call DELFILE, $(DUMMY_KCONFIG))
+	$(Q) cp -f $(BOARD_KCONFIG) $(DUMMY_KCONFIG)
+
+context: $(DUMMY_KCONFIG)
+
+clean_context:
+	$(call DELFILE, $(DUMMY_KCONFIG))
+
+clean: clean_context
 	$(call DELFILE, $(BIN))
 	$(call CLEAN)
 
diff --git a/configs/dummy/.gitignore b/configs/dummy/.gitignore
new file mode 100644
index 0000000000..99f41601fd
--- /dev/null
+++ b/configs/dummy/.gitignore
@@ -0,0 +1,2 @@
+/Kconfig
+
diff --git a/configs/dummy/dummy_kconfig b/configs/dummy/dummy_kconfig
new file mode 100644
index 0000000000..18c7905aed
--- /dev/null
+++ b/configs/dummy/dummy_kconfig
@@ -0,0 +1,5 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
-- 
GitLab


From 52a4a20efb7a321b913f240d8b456e3ab98b07b9 Mon Sep 17 00:00:00 2001
From: "Paul A. Patience" 
Date: Wed, 29 Jun 2016 12:33:34 -0400
Subject: [PATCH 107/229] STM32L4 CAN: Port support for both RX FIFOs from
 STM32 CAN

---
 arch/arm/src/stm32/stm32_can.c     | 150 +++++++----------
 arch/arm/src/stm32l4/stm32l4_can.c | 259 ++++++++++++++++++-----------
 arch/arm/src/stm32l4/stm32l4_can.h |   2 +-
 3 files changed, 219 insertions(+), 192 deletions(-)

diff --git a/arch/arm/src/stm32/stm32_can.c b/arch/arm/src/stm32/stm32_can.c
index 6a661c1f94..334c7337d6 100644
--- a/arch/arm/src/stm32/stm32_can.c
+++ b/arch/arm/src/stm32/stm32_can.c
@@ -58,16 +58,17 @@
 #include "up_internal.h"
 #include "up_arch.h"
 
-
 #include "chip.h"
 #include "stm32.h"
 #include "stm32_can.h"
 
-#if defined(CONFIG_CAN) && (defined(CONFIG_STM32_CAN1) || defined(CONFIG_STM32_CAN2))
+#if defined(CONFIG_CAN) && \
+    (defined(CONFIG_STM32_CAN1) || defined(CONFIG_STM32_CAN2))
 
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
+
 /* Delays *******************************************************************/
 /* Time out for INAK bit */
 
@@ -106,19 +107,21 @@ struct stm32_can_s
 
 /* CAN Register access */
 
-static uint32_t stm32can_getreg(FAR struct stm32_can_s *priv, int offset);
-static uint32_t stm32can_getfreg(FAR struct stm32_can_s *priv, int offset);
+static uint32_t stm32can_getreg(FAR struct stm32_can_s *priv,
+                                int offset);
+static uint32_t stm32can_getfreg(FAR struct stm32_can_s *priv,
+                                 int offset);
 static void stm32can_putreg(FAR struct stm32_can_s *priv, int offset,
-              uint32_t value);
+                            uint32_t value);
 static void stm32can_putfreg(FAR struct stm32_can_s *priv, int offset,
-              uint32_t value);
+                             uint32_t value);
 #ifdef CONFIG_STM32_CAN_REGDEBUG
 static void stm32can_dumpctrlregs(FAR struct stm32_can_s *priv,
-              FAR const char *msg);
+                                  FAR const char *msg);
 static void stm32can_dumpmbregs(FAR struct stm32_can_s *priv,
-              FAR const char *msg);
+                                FAR const char *msg);
 static void stm32can_dumpfiltregs(FAR struct stm32_can_s *priv,
-              FAR const char *msg);
+                                  FAR const char *msg);
 #else
 #  define stm32can_dumpctrlregs(priv,msg)
 #  define stm32can_dumpmbregs(priv,msg)
@@ -129,14 +132,14 @@ static void stm32can_dumpfiltregs(FAR struct stm32_can_s *priv,
 
 #ifdef CONFIG_CAN_EXTID
 static int  stm32can_addextfilter(FAR struct stm32_can_s *priv,
-              FAR struct canioc_extfilter_s *arg);
+                                  FAR struct canioc_extfilter_s *arg);
 static int  stm32can_delextfilter(FAR struct stm32_can_s *priv,
-              int arg);
+                                  int arg);
 #endif
 static int  stm32can_addstdfilter(FAR struct stm32_can_s *priv,
-              FAR struct canioc_stdfilter_s *arg);
+                                  FAR struct canioc_stdfilter_s *arg);
 static int  stm32can_delstdfilter(FAR struct stm32_can_s *priv,
-              int arg);
+                                  int arg);
 
 /* CAN driver methods */
 
@@ -146,10 +149,11 @@ static void stm32can_shutdown(FAR struct can_dev_s *dev);
 static void stm32can_rxint(FAR struct can_dev_s *dev, bool enable);
 static void stm32can_txint(FAR struct can_dev_s *dev, bool enable);
 static int  stm32can_ioctl(FAR struct can_dev_s *dev, int cmd,
-              unsigned long arg);
-static int  stm32can_remoterequest(FAR struct can_dev_s *dev, uint16_t id);
+                           unsigned long arg);
+static int  stm32can_remoterequest(FAR struct can_dev_s *dev,
+                                   uint16_t id);
 static int  stm32can_send(FAR struct can_dev_s *dev,
-              FAR struct can_msg_s *msg);
+                          FAR struct can_msg_s *msg);
 static bool stm32can_txready(FAR struct can_dev_s *dev);
 static bool stm32can_txempty(FAR struct can_dev_s *dev);
 
@@ -348,7 +352,6 @@ static uint32_t stm32can_getfreg(FAR struct stm32_can_s *priv, int offset)
 #ifdef CONFIG_STM32_CAN_REGDEBUG
 static void stm32can_vputreg(uint32_t addr, uint32_t value)
 {
-
   /* Show the register value being written */
 
   caninfo("%08x<-%08x\n", addr, value);
@@ -400,7 +403,7 @@ static void stm32can_putfreg(FAR struct stm32_can_s *priv, int offset,
 
 #ifdef CONFIG_STM32_CAN_REGDEBUG
 static void stm32can_dumpctrlregs(FAR struct stm32_can_s *priv,
-                             FAR const char *msg)
+                                  FAR const char *msg)
 {
   if (msg)
     {
@@ -445,7 +448,7 @@ static void stm32can_dumpctrlregs(FAR struct stm32_can_s *priv,
 
 #ifdef CONFIG_STM32_CAN_REGDEBUG
 static void stm32can_dumpmbregs(FAR struct stm32_can_s *priv,
-                           FAR const char *msg)
+                                FAR const char *msg)
 {
   if (msg)
     {
@@ -506,7 +509,7 @@ static void stm32can_dumpmbregs(FAR struct stm32_can_s *priv,
 
 #ifdef CONFIG_STM32_CAN_REGDEBUG
 static void stm32can_dumpfiltregs(FAR struct stm32_can_s *priv,
-                             FAR const char *msg)
+                                  FAR const char *msg)
 {
   int i;
 
@@ -627,7 +630,8 @@ static int stm32can_setup(FAR struct can_dev_s *dev)
   ret = stm32can_cellinit(priv);
   if (ret < 0)
     {
-      canerr("ERROR: CAN%d cell initialization failed: %d\n", priv->port, ret);
+      canerr("ERROR: CAN%d cell initialization failed: %d\n",
+             priv->port, ret);
       return ret;
     }
 
@@ -639,7 +643,8 @@ static int stm32can_setup(FAR struct can_dev_s *dev)
   ret = stm32can_filterinit(priv);
   if (ret < 0)
     {
-      canerr("ERROR: CAN%d filter initialization failed: %d\n", priv->port, ret);
+      canerr("ERROR: CAN%d filter initialization failed: %d\n",
+             priv->port, ret);
       return ret;
     }
 
@@ -652,7 +657,7 @@ static int stm32can_setup(FAR struct can_dev_s *dev)
   ret = irq_attach(priv->canrx[0], stm32can_rx0interrupt);
   if (ret < 0)
     {
-      canerr(ERROR: "Failed to attach CAN%d RX0 IRQ (%d)",
+      canerr("ERROR: Failed to attach CAN%d RX0 IRQ (%d)",
              priv->port, priv->canrx[0]);
       return ret;
     }
@@ -754,6 +759,7 @@ static void stm32can_rxint(FAR struct can_dev_s *dev, bool enable)
     {
       regval &= ~(CAN_IER_FMPIE0 | CAN_IER_FMPIE1);
     }
+
   stm32can_putreg(priv, STM32_CAN_IER_OFFSET, regval);
 }
 
@@ -925,7 +931,7 @@ static int stm32can_ioctl(FAR struct can_dev_s *dev, int cmd,
           /* Bit timing can only be configured in init mode. */
 
           ret = stm32can_enterinitmode(priv);
-          if (ret != 0)
+          if (ret < 0)
             {
               break;
             }
@@ -933,8 +939,7 @@ static int stm32can_ioctl(FAR struct can_dev_s *dev, int cmd,
           stm32can_putreg(priv, STM32_CAN_BTR_OFFSET, regval);
 
           ret = stm32can_exitinitmode(priv);
-
-          if (ret == 0)
+          if (ret >= 0)
             {
               priv->baud  = STM32_PCLK1_FREQUENCY /
                 (brp * (bt->bt_tseg1 + bt->bt_tseg2 + 1));
@@ -992,26 +997,26 @@ static int stm32can_ioctl(FAR struct can_dev_s *dev, int cmd,
 
           if (bm->bm_loopback)
             {
-            regval |= CAN_BTR_LBKM;
+              regval |= CAN_BTR_LBKM;
             }
           else
             {
-            regval &= ~CAN_BTR_LBKM;
+              regval &= ~CAN_BTR_LBKM;
             }
 
           if (bm->bm_silent)
             {
-            regval |= CAN_BTR_SILM;
+              regval |= CAN_BTR_SILM;
             }
           else
             {
-            regval &= ~CAN_BTR_SILM;
+              regval &= ~CAN_BTR_SILM;
             }
 
           /* This register can only be configured in init mode. */
 
           ret = stm32can_enterinitmode(priv);
-          if (ret != 0)
+          if (ret < 0)
             {
               break;
             }
@@ -1035,7 +1040,8 @@ static int stm32can_ioctl(FAR struct can_dev_s *dev, int cmd,
       case CANIOC_ADD_EXTFILTER:
         {
           DEBUGASSERT(arg != 0);
-          ret = stm32can_addextfilter(priv, (FAR struct canioc_extfilter_s *)arg);
+          ret = stm32can_addextfilter(priv,
+                                      (FAR struct canioc_extfilter_s *)arg);
         }
         break;
 
@@ -1051,7 +1057,9 @@ static int stm32can_ioctl(FAR struct can_dev_s *dev, int cmd,
 
       case CANIOC_DEL_EXTFILTER:
         {
+#if 0 /* Unimplemented */
           DEBUGASSERT(arg <= priv->config->nextfilters);
+#endif
           ret = stm32can_delextfilter(priv, (int)arg);
         }
         break;
@@ -1069,7 +1077,8 @@ static int stm32can_ioctl(FAR struct can_dev_s *dev, int cmd,
       case CANIOC_ADD_STDFILTER:
         {
           DEBUGASSERT(arg != 0);
-          ret = stm32can_addstdfilter(priv, (FAR struct canioc_stdfilter_s *)arg);
+          ret = stm32can_addstdfilter(priv,
+                                      (FAR struct canioc_stdfilter_s *)arg);
         }
         break;
 
@@ -1085,7 +1094,9 @@ static int stm32can_ioctl(FAR struct can_dev_s *dev, int cmd,
 
       case CANIOC_DEL_STDFILTER:
         {
+#if 0 /* Unimplemented */
           DEBUGASSERT(arg <= priv->config->nstdfilters);
+#endif
           ret = stm32can_delstdfilter(priv, (int)arg);
         }
         break;
@@ -1143,7 +1154,8 @@ static int stm32can_remoterequest(FAR struct can_dev_s *dev, uint16_t id)
  *
  ****************************************************************************/
 
-static int stm32can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg)
+static int stm32can_send(FAR struct can_dev_s *dev,
+                         FAR struct can_msg_s *msg)
 {
   FAR struct stm32_can_s *priv = dev->cd_priv;
   FAR uint8_t *ptr;
@@ -1239,6 +1251,7 @@ static int stm32can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg)
             }
         }
     }
+
   stm32can_putreg(priv, STM32_CAN_TDLR_OFFSET(txmb), regval);
 
   regval = 0;
@@ -1265,6 +1278,7 @@ static int stm32can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg)
             }
         }
     }
+
   stm32can_putreg(priv, STM32_CAN_TDHR_OFFSET(txmb), regval);
 
   /* Enable the transmit mailbox empty interrupt (may already be enabled) */
@@ -1669,6 +1683,7 @@ static int stm32can_txinterrupt(int irq, FAR void *context)
  *   Tbs1 = Tq * ts1
  *   Tbs2 = Tq * ts2
  *   Tq = brp * Tpclk1
+ *   baud = Fpclk1 / (brp  * (1 + ts1 + ts2))
  *
  * Where:
  *   Tpclk1 is the period of the APB1 clock (PCLK1).
@@ -1814,7 +1829,7 @@ static int stm32can_enterinitmode(FAR struct stm32_can_s *priv)
       return -ETIMEDOUT;
     }
 
-  return 0;
+  return OK;
 }
 
 /****************************************************************************
@@ -1859,11 +1874,12 @@ static int stm32can_exitinitmode(FAR struct stm32_can_s *priv)
 
   if (timeout < 1)
     {
-      canerr("ERROR: Timed out waiting to exit initialization mode: %08x\n", regval);
+      canerr("ERROR: Timed out waiting to exit initialization mode: %08x\n",
+             regval);
       return -ETIMEDOUT;
     }
 
-  return 0;
+  return OK;
 }
 
 /****************************************************************************
@@ -1882,7 +1898,6 @@ static int stm32can_exitinitmode(FAR struct stm32_can_s *priv)
 
 static int stm32can_cellinit(FAR struct stm32_can_s *priv)
 {
-  volatile uint32_t timeout;
   uint32_t regval;
   int ret;
 
@@ -1894,30 +1909,10 @@ static int stm32can_cellinit(FAR struct stm32_can_s *priv)
   regval &= ~CAN_MCR_SLEEP;
   stm32can_putreg(priv, STM32_CAN_MCR_OFFSET, regval);
 
-  /* Enter initialization mode */
-
-  regval |= CAN_MCR_INRQ;
-  stm32can_putreg(priv, STM32_CAN_MCR_OFFSET, regval);
-
-  /* Wait until initialization mode is acknowledged */
-
-  for (timeout = INAK_TIMEOUT; timeout > 0; timeout--)
+  ret = stm32can_enterinitmode(priv);
+  if(ret != 0)
     {
-      regval = stm32can_getreg(priv, STM32_CAN_MSR_OFFSET);
-      if ((regval & CAN_MSR_INAK) != 0)
-        {
-          /* We are in initialization mode */
-
-          break;
-        }
-    }
-
-  /* Check for a timeout */
-
-  if (timeout < 1)
-    {
-      canerr("ERROR: Timed out waiting to enter initialization mode\n");
-      return -ETIMEDOUT;
+      return ret;
     }
 
   /* Disable the following modes:
@@ -1944,34 +1939,7 @@ static int stm32can_cellinit(FAR struct stm32_can_s *priv)
       return ret;
     }
 
-  /* Exit initialization mode */
-
-  regval  = stm32can_getreg(priv, STM32_CAN_MCR_OFFSET);
-  regval &= ~CAN_MCR_INRQ;
-  stm32can_putreg(priv, STM32_CAN_MCR_OFFSET, regval);
-
-  /* Wait until the initialization mode exit is acknowledged */
-
-  for (timeout = INAK_TIMEOUT; timeout > 0; timeout--)
-    {
-      regval = stm32can_getreg(priv, STM32_CAN_MSR_OFFSET);
-      if ((regval & CAN_MSR_INAK) == 0)
-        {
-          /* We are out of initialization mode */
-
-          break;
-        }
-    }
-
-  /* Check for a timeout */
-
-  if (timeout < 1)
-    {
-      canerr("ERROR: Timed out waiting to exit initialization mode: %08x\n",
-             regval);
-      return -ETIMEDOUT;
-    }
-  return OK;
+  return stm32can_exitinitmode(priv);
 }
 
 /****************************************************************************
@@ -2124,7 +2092,7 @@ static int stm32can_addextfilter(FAR struct stm32_can_s *priv,
  ****************************************************************************/
 
 #ifdef CONFIG_CAN_EXTID
-static int  stm32can_delextfilter(FAR struct stm32_can_s *priv, int arg)
+static int stm32can_delextfilter(FAR struct stm32_can_s *priv, int arg)
 {
   return -ENOTTY;
 }
@@ -2171,7 +2139,7 @@ static int stm32can_addstdfilter(FAR struct stm32_can_s *priv,
  *
  ****************************************************************************/
 
-static int  stm32can_delstdfilter(FAR struct stm32_can_s *priv, int arg)
+static int stm32can_delstdfilter(FAR struct stm32_can_s *priv, int arg)
 {
   return -ENOTTY;
 }
diff --git a/arch/arm/src/stm32l4/stm32l4_can.c b/arch/arm/src/stm32l4/stm32l4_can.c
index f2ba2e761e..7891319e8f 100644
--- a/arch/arm/src/stm32l4/stm32l4_can.c
+++ b/arch/arm/src/stm32l4/stm32l4_can.c
@@ -4,6 +4,9 @@
  *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
+ *   Copyright (C) 2016 Omni Hoverboards Inc. All rights reserved.
+ *   Author: Paul Alexander Patience 
+ *
  *   Adaptations for stm32l4:
  *   Copyright (C) 2016 Sebastien Lorquet. All rights reserved.
  *   Author: Sebastien Lorquet 
@@ -92,13 +95,13 @@
 
 struct stm32l4_can_s
 {
-  uint8_t  port;   /* CAN port number (1 or 2) */
-  uint8_t  canrx0; /* CAN RX FIFO 0 IRQ number */
-  uint8_t  cantx;  /* CAN TX IRQ number */
-  uint8_t  filter; /* Filter number */
-  uint32_t base;   /* Base address of the CAN control registers */
-  uint32_t fbase;  /* Base address of the CAN filter registers */
-  uint32_t baud;   /* Configured baud */
+  uint8_t  port;     /* CAN port number (1 or 2) */
+  uint8_t  canrx[2]; /* CAN RX FIFO 0/1 IRQ number */
+  uint8_t  cantx;    /* CAN TX IRQ number */
+  uint8_t  filter;   /* Filter number */
+  uint32_t base;     /* Base address of the CAN control registers */
+  uint32_t fbase;    /* Base address of the CAN filter registers */
+  uint32_t baud;     /* Configured baud */
 };
 
 /****************************************************************************
@@ -108,20 +111,20 @@ struct stm32l4_can_s
 /* CAN Register access */
 
 static uint32_t stm32l4can_getreg(FAR struct stm32l4_can_s *priv,
-              int offset);
+                                  int offset);
 static uint32_t stm32l4can_getfreg(FAR struct stm32l4_can_s *priv,
-              int offset);
+                                   int offset);
 static void stm32l4can_putreg(FAR struct stm32l4_can_s *priv, int offset,
-              uint32_t value);
+                              uint32_t value);
 static void stm32l4can_putfreg(FAR struct stm32l4_can_s *priv, int offset,
-              uint32_t value);
+                               uint32_t value);
 #ifdef CONFIG_STM32L4_CAN_REGDEBUG
 static void stm32l4can_dumpctrlregs(FAR struct stm32l4_can_s *priv,
-              FAR const char *msg);
+                                    FAR const char *msg);
 static void stm32l4can_dumpmbregs(FAR struct stm32l4_can_s *priv,
-              FAR const char *msg);
+                                  FAR const char *msg);
 static void stm32l4can_dumpfiltregs(FAR struct stm32l4_can_s *priv,
-              FAR const char *msg);
+                                    FAR const char *msg);
 #else
 #  define stm32l4can_dumpctrlregs(priv,msg)
 #  define stm32l4can_dumpmbregs(priv,msg)
@@ -132,14 +135,14 @@ static void stm32l4can_dumpfiltregs(FAR struct stm32l4_can_s *priv,
 
 #ifdef CONFIG_CAN_EXTID
 static int  stm32l4can_addextfilter(FAR struct stm32l4_can_s *priv,
-              FAR struct canioc_extfilter_s *arg);
+                                    FAR struct canioc_extfilter_s *arg);
 static int  stm32l4can_delextfilter(FAR struct stm32l4_can_s *priv,
-              int arg);
+                                    int arg);
 #endif
 static int  stm32l4can_addstdfilter(FAR struct stm32l4_can_s *priv,
-              FAR struct canioc_stdfilter_s *arg);
+                                    FAR struct canioc_stdfilter_s *arg);
 static int  stm32l4can_delstdfilter(FAR struct stm32l4_can_s *priv,
-              int arg);
+                                    int arg);
 
 /* CAN driver methods */
 
@@ -149,17 +152,19 @@ static void stm32l4can_shutdown(FAR struct can_dev_s *dev);
 static void stm32l4can_rxint(FAR struct can_dev_s *dev, bool enable);
 static void stm32l4can_txint(FAR struct can_dev_s *dev, bool enable);
 static int  stm32l4can_ioctl(FAR struct can_dev_s *dev, int cmd,
-              unsigned long arg);
+                             unsigned long arg);
 static int  stm32l4can_remoterequest(FAR struct can_dev_s *dev,
-              uint16_t id);
+                                     uint16_t id);
 static int  stm32l4can_send(FAR struct can_dev_s *dev,
-              FAR struct can_msg_s *msg);
+                            FAR struct can_msg_s *msg);
 static bool stm32l4can_txready(FAR struct can_dev_s *dev);
 static bool stm32l4can_txempty(FAR struct can_dev_s *dev);
 
 /* CAN interrupt handling */
 
+static int  stm32l4can_rxinterrupt(int irq, FAR void *context, int rxmb);
 static int  stm32l4can_rx0interrupt(int irq, FAR void *context);
+static int  stm32l4can_rx1interrupt(int irq, FAR void *context);
 static int  stm32l4can_txinterrupt(int irq, FAR void *context);
 
 /* Initialization */
@@ -192,7 +197,11 @@ static const struct can_ops_s g_canops =
 static struct stm32l4_can_s g_can1priv =
 {
   .port             = 1,
-  .canrx0           = STM32L4_IRQ_CAN1RX0,
+  .canrx            =
+  {
+                      STM32L4_IRQ_CAN1RX0,
+                      STM32L4_IRQ_CAN1RX1,
+  },
   .cantx            = STM32L4_IRQ_CAN1TX,
   .filter           = 0,
   .base             = STM32L4_CAN1_BASE,
@@ -547,7 +556,7 @@ static void stm32l4can_reset(FAR struct can_dev_s *dev)
       return;
     }
 
-  /* Disable interrupts momentary to stop any ongoing CAN event processing
+  /* Disable interrupts momentarily to stop any ongoing CAN event processing
    * and to prevent any concurrent access to the AHB1RSTR1 register.
    */
 
@@ -586,8 +595,8 @@ static int stm32l4can_setup(FAR struct can_dev_s *dev)
   FAR struct stm32l4_can_s *priv = dev->cd_priv;
   int ret;
 
-  caninfo("CAN%d RX0 irq: %d TX irq: %d\n",
-          priv->port, priv->canrx0, priv->cantx);
+  caninfo("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 */
 
@@ -614,15 +623,23 @@ static int stm32l4can_setup(FAR struct can_dev_s *dev)
 
   stm32l4can_dumpfiltregs(priv, "After filter initialization");
 
-  /* Attach the CAN RX FIFO 0 interrupt and TX interrupts.  The others are
-   * not used.
+  /* Attach the CAN RX FIFO 0/1 interrupts and TX interrupts.
+   * The others are not used.
    */
 
-  ret = irq_attach(priv->canrx0, stm32l4can_rx0interrupt);
+  ret = irq_attach(priv->canrx[0], stm32l4can_rx0interrupt);
   if (ret < 0)
     {
       canerr("ERROR: Failed to attach CAN%d RX0 IRQ (%d)",
-             priv->port, priv->canrx0);
+             priv->port, priv->canrx[0]);
+      return ret;
+    }
+
+  ret = irq_attach(priv->canrx[1], stm32l4can_rx1interrupt);
+  if (ret < 0)
+    {
+      canerr("ERROR: Failed to attach CAN%d RX1 IRQ (%d)",
+             priv->port, priv->canrx[1]);
       return ret;
     }
 
@@ -634,12 +651,13 @@ static int stm32l4can_setup(FAR struct can_dev_s *dev)
       return ret;
     }
 
-  /* Enable the interrupts at the NVIC.  Interrupts arestill disabled in
+  /* Enable the interrupts at the NVIC.  Interrupts are still disabled in
    * the CAN module.  Since we coming out of reset here, there should be
    * no pending interrupts.
    */
 
-  up_enable_irq(priv->canrx0);
+  up_enable_irq(priv->canrx[0]);
+  up_enable_irq(priv->canrx[1]);
   up_enable_irq(priv->cantx);
   return OK;
 }
@@ -665,14 +683,16 @@ static void stm32l4can_shutdown(FAR struct can_dev_s *dev)
 
   caninfo("CAN%d\n", priv->port);
 
-  /* Disable the RX FIFO 0 and TX interrupts */
+  /* Disable the RX FIFO 0/1 and TX interrupts */
 
-  up_disable_irq(priv->canrx0);
+  up_disable_irq(priv->canrx[0]);
+  up_disable_irq(priv->canrx[1]);
   up_disable_irq(priv->cantx);
 
-  /* Detach the RX FIFO 0 and TX interrupts */
+  /* Detach the RX FIFO 0/1 and TX interrupts */
 
-  irq_detach(priv->canrx0);
+  irq_detach(priv->canrx[0]);
+  irq_detach(priv->canrx[1]);
   irq_detach(priv->cantx);
 
   /* And reset the hardware */
@@ -701,16 +721,16 @@ static void stm32l4can_rxint(FAR struct can_dev_s *dev, bool enable)
 
   caninfo("CAN%d enable: %d\n", priv->port, enable);
 
-  /* Enable/disable the FIFO 0 message pending interrupt */
+  /* Enable/disable the FIFO 0/1 message pending interrupt */
 
   regval = stm32l4can_getreg(priv, STM32L4_CAN_IER_OFFSET);
   if (enable)
     {
-      regval |= CAN_IER_FMPIE0;
+      regval |= CAN_IER_FMPIE0 | CAN_IER_FMPIE1;
     }
   else
     {
-      regval &= ~CAN_IER_FMPIE0;
+      regval &= ~(CAN_IER_FMPIE0 | CAN_IER_FMPIE1);
     }
 
   stm32l4can_putreg(priv, STM32L4_CAN_IER_OFFSET, regval);
@@ -880,11 +900,11 @@ static int stm32l4can_ioctl(FAR struct can_dev_s *dev, int cmd,
                     ((bt->bt_tseg1 - 1) << CAN_BTR_TS1_SHIFT) |
                     ((bt->bt_tseg2 - 1) << CAN_BTR_TS2_SHIFT) |
                     ((bt->bt_sjw   - 1) << CAN_BTR_SJW_SHIFT);
-  
+
           /* Bit timing can only be configured in init mode. */
 
           ret = stm32l4can_enterinitmode(priv);
-          if (ret != 0)
+          if (ret < 0)
             {
               break;
             }
@@ -892,7 +912,7 @@ static int stm32l4can_ioctl(FAR struct can_dev_s *dev, int cmd,
           stm32l4can_putreg(priv, STM32L4_CAN_BTR_OFFSET, regval);
 
           ret = stm32l4can_exitinitmode(priv);
-          if (ret == 0)
+          if (ret >= 0)
             {
               priv->baud  = STM32L4_PCLK1_FREQUENCY /
                 (brp * (bt->bt_tseg1 + bt->bt_tseg2 + 1));
@@ -936,7 +956,7 @@ static int stm32l4can_ioctl(FAR struct can_dev_s *dev, int cmd,
        *                   (ERROR) is returned with the errno variable set
        *                   to indicate the nature of the error.
        *   Dependencies:   None
-      */
+       */
 
       case CANIOC_SET_CONNMODES:
         {
@@ -950,26 +970,26 @@ static int stm32l4can_ioctl(FAR struct can_dev_s *dev, int cmd,
 
           if (bm->bm_loopback)
             {
-            regval |= CAN_BTR_LBKM;
+              regval |= CAN_BTR_LBKM;
             }
           else
             {
-            regval &= ~CAN_BTR_LBKM;
+              regval &= ~CAN_BTR_LBKM;
             }
 
           if (bm->bm_silent)
             {
-            regval |= CAN_BTR_SILM;
+              regval |= CAN_BTR_SILM;
             }
           else
             {
-            regval &= ~CAN_BTR_SILM;
+              regval &= ~CAN_BTR_SILM;
             }
 
           /* This register can only be configured in init mode. */
 
           ret = stm32l4can_enterinitmode(priv);
-          if (ret != 0)
+          if (ret < 0)
             {
               break;
             }
@@ -993,7 +1013,8 @@ static int stm32l4can_ioctl(FAR struct can_dev_s *dev, int cmd,
       case CANIOC_ADD_EXTFILTER:
         {
           DEBUGASSERT(arg != 0);
-          ret = stm32l4can_addextfilter(priv, (FAR struct canioc_extfilter_s *)arg);
+          ret = stm32l4can_addextfilter(priv,
+                                        (FAR struct canioc_extfilter_s *)arg);
         }
         break;
 
@@ -1009,7 +1030,9 @@ static int stm32l4can_ioctl(FAR struct can_dev_s *dev, int cmd,
 
       case CANIOC_DEL_EXTFILTER:
         {
+#if 0 /* Unimplemented */
           DEBUGASSERT(arg <= priv->config->nextfilters);
+#endif
           ret = stm32l4can_delextfilter(priv, (int)arg);
         }
         break;
@@ -1027,7 +1050,8 @@ static int stm32l4can_ioctl(FAR struct can_dev_s *dev, int cmd,
       case CANIOC_ADD_STDFILTER:
         {
           DEBUGASSERT(arg != 0);
-          ret = stm32l4can_addstdfilter(priv, (FAR struct canioc_stdfilter_s *)arg);
+          ret = stm32l4can_addstdfilter(priv,
+                                        (FAR struct canioc_stdfilter_s *)arg);
         }
         break;
 
@@ -1043,7 +1067,9 @@ static int stm32l4can_ioctl(FAR struct can_dev_s *dev, int cmd,
 
       case CANIOC_DEL_STDFILTER:
         {
+#if 0 /* Unimplemented */
           DEBUGASSERT(arg <= priv->config->nstdfilters);
+#endif
           ret = stm32l4can_delstdfilter(priv, (int)arg);
         }
         break;
@@ -1138,8 +1164,8 @@ static int stm32l4can_send(FAR struct can_dev_s *dev,
   /* Clear TXRQ, RTR, IDE, EXID, and STID fields */
 
   regval  = stm32l4can_getreg(priv, STM32L4_CAN_TIR_OFFSET(txmb));
-  regval &= ~(CAN_TIR_TXRQ | CAN_TIR_RTR | CAN_TIR_IDE | CAN_TIR_EXID_MASK |
-              CAN_TIR_STID_MASK);
+  regval &= ~(CAN_TIR_TXRQ | CAN_TIR_RTR | CAN_TIR_IDE |
+              CAN_TIR_EXID_MASK | CAN_TIR_STID_MASK);
   stm32l4can_putreg(priv, STM32L4_CAN_TIR_OFFSET(txmb), regval);
 
   /* Set up the ID, standard 11-bit or extended 29-bit. */
@@ -1182,17 +1208,17 @@ static int stm32l4can_send(FAR struct can_dev_s *dev,
 
       if (dlc > 1)
         {
-          tmp    = (uint32_t)*ptr++;
+          tmp     = (uint32_t)*ptr++;
           regval |= tmp << CAN_TDLR_DATA1_SHIFT;
 
           if (dlc > 2)
             {
-              tmp    = (uint32_t)*ptr++;
+              tmp     = (uint32_t)*ptr++;
               regval |= tmp << CAN_TDLR_DATA2_SHIFT;
 
               if (dlc > 3)
                 {
-                  tmp    = (uint32_t)*ptr++;
+                  tmp     = (uint32_t)*ptr++;
                   regval |= tmp << CAN_TDLR_DATA3_SHIFT;
                 }
             }
@@ -1209,17 +1235,17 @@ static int stm32l4can_send(FAR struct can_dev_s *dev,
 
       if (dlc > 5)
         {
-          tmp    = (uint32_t)*ptr++;
+          tmp     = (uint32_t)*ptr++;
           regval |= tmp << CAN_TDHR_DATA5_SHIFT;
 
           if (dlc > 6)
             {
-              tmp    = (uint32_t)*ptr++;
+              tmp     = (uint32_t)*ptr++;
               regval |= tmp << CAN_TDHR_DATA6_SHIFT;
 
               if (dlc > 7)
                 {
-                  tmp    = (uint32_t)*ptr++;
+                  tmp     = (uint32_t)*ptr++;
                   regval |= tmp << CAN_TDHR_DATA7_SHIFT;
                 }
             }
@@ -1268,12 +1294,7 @@ static bool stm32l4can_txready(FAR struct can_dev_s *dev)
   regval = stm32l4can_getreg(priv, STM32L4_CAN_TSR_OFFSET);
   caninfo("CAN%d TSR: %08x\n", priv->port, regval);
 
-  if ((regval & CAN_ALL_MAILBOXES) != 0)
-    {
-      return true;
-    }
-
-  return false;
+  return (regval & CAN_ALL_MAILBOXES) != 0;
 }
 
 /****************************************************************************
@@ -1304,30 +1325,26 @@ static bool stm32l4can_txempty(FAR struct can_dev_s *dev)
   regval = stm32l4can_getreg(priv, STM32L4_CAN_TSR_OFFSET);
   caninfo("CAN%d TSR: %08x\n", priv->port, regval);
 
-  if ((regval & CAN_ALL_MAILBOXES) == CAN_ALL_MAILBOXES)
-    {
-      return true;
-    }
-
-  return false;
+  return (regval & CAN_ALL_MAILBOXES) == CAN_ALL_MAILBOXES;
 }
 
 /****************************************************************************
- * Name: stm32l4can_rx0interrupt
+ * Name: stm32l4can_rxinterrupt
  *
  * Description:
- *   CAN RX FIFO 0 interrupt handler
+ *   CAN RX FIFO 0/1 interrupt handler
  *
  * Input Parameters:
  *   irq - The IRQ number of the interrupt.
  *   context - The register state save array at the time of the interrupt.
+ *   rxmb - The RX mailbox number.
  *
  * Returned Value:
  *   Zero on success; a negated errno on failure
  *
  ****************************************************************************/
 
-static int stm32l4can_rx0interrupt(int irq, FAR void *context)
+static int stm32l4can_rxinterrupt(int irq, FAR void *context, int rxmb)
 {
   FAR struct can_dev_s *dev = NULL;
   FAR struct stm32l4_can_s *priv;
@@ -1340,9 +1357,9 @@ static int stm32l4can_rx0interrupt(int irq, FAR void *context)
   dev = &g_can1dev;
   priv = dev->cd_priv;
 
-  /* Verify that a message is pending in FIFO 0 */
+  /* Verify that a message is pending in the FIFO */
 
-  regval   = stm32l4can_getreg(priv, STM32L4_CAN_RF0R_OFFSET);
+  regval   = stm32l4can_getreg(priv, STM32L4_CAN_RFR_OFFSET(rxmb));
   npending = (regval & CAN_RFR_FMP_MASK) >> CAN_RFR_FMP_SHIFT;
   if (npending < 1)
     {
@@ -1350,11 +1367,18 @@ static int stm32l4can_rx0interrupt(int irq, FAR void *context)
       return OK;
     }
 
-  stm32l4can_dumpmbregs(priv, "RX0 interrupt");
+  if (rxmb == 0)
+    {
+      stm32l4can_dumpmbregs(priv, "RX0 interrupt");
+    }
+  else
+    {
+      stm32l4can_dumpmbregs(priv, "RX1 interrupt");
+    }
 
   /* Get the CAN identifier. */
 
-  regval = stm32l4can_getreg(priv, STM32L4_CAN_RI0R_OFFSET);
+  regval = stm32l4can_getreg(priv, STM32L4_CAN_RIR_OFFSET(rxmb));
 
 #ifdef CONFIG_CAN_EXTID
   if ((regval & CAN_RIR_IDE) != 0)
@@ -1387,22 +1411,22 @@ static int stm32l4can_rx0interrupt(int irq, FAR void *context)
 
   /* Extract the RTR bit */
 
-  hdr.ch_rtr = (regval & CAN_RIR_RTR) != 0 ? true : false;
+  hdr.ch_rtr = (regval & CAN_RIR_RTR) != 0;
 
   /* Get the DLC */
 
-  regval     = stm32l4can_getreg(priv, STM32L4_CAN_RDT0R_OFFSET);
+  regval     = stm32l4can_getreg(priv, STM32L4_CAN_RDTR_OFFSET(rxmb));
   hdr.ch_dlc = (regval & CAN_RDTR_DLC_MASK) >> CAN_RDTR_DLC_SHIFT;
 
   /* Save the message data */
 
-  regval  = stm32l4can_getreg(priv, STM32L4_CAN_RDL0R_OFFSET);
+  regval  = stm32l4can_getreg(priv, STM32L4_CAN_RDLR_OFFSET(rxmb));
   data[0] = (regval & CAN_RDLR_DATA0_MASK) >> CAN_RDLR_DATA0_SHIFT;
   data[1] = (regval & CAN_RDLR_DATA1_MASK) >> CAN_RDLR_DATA1_SHIFT;
   data[2] = (regval & CAN_RDLR_DATA2_MASK) >> CAN_RDLR_DATA2_SHIFT;
   data[3] = (regval & CAN_RDLR_DATA3_MASK) >> CAN_RDLR_DATA3_SHIFT;
 
-  regval  = stm32l4can_getreg(priv, STM32L4_CAN_RDH0R_OFFSET);
+  regval  = stm32l4can_getreg(priv, STM32L4_CAN_RDHR_OFFSET(rxmb));
   data[4] = (regval & CAN_RDHR_DATA4_MASK) >> CAN_RDHR_DATA4_SHIFT;
   data[5] = (regval & CAN_RDHR_DATA5_MASK) >> CAN_RDHR_DATA5_SHIFT;
   data[6] = (regval & CAN_RDHR_DATA6_MASK) >> CAN_RDHR_DATA6_SHIFT;
@@ -1412,17 +1436,57 @@ static int stm32l4can_rx0interrupt(int irq, FAR void *context)
 
   ret = can_receive(dev, &hdr, data);
 
-  /* Release the FIFO0 */
+  /* Release the FIFO */
 
 #ifndef CONFIG_CAN_EXTID
 errout:
 #endif
-  regval  = stm32l4can_getreg(priv, STM32L4_CAN_RF0R_OFFSET);
+  regval  = stm32l4can_getreg(priv, STM32L4_CAN_RFR_OFFSET(rxmb));
   regval |= CAN_RFR_RFOM;
-  stm32l4can_putreg(priv, STM32L4_CAN_RF0R_OFFSET, regval);
+  stm32l4can_putreg(priv, STM32L4_CAN_RFR_OFFSET(rxmb), regval);
   return ret;
 }
 
+/****************************************************************************
+ * Name: stm32l4can_rx0interrupt
+ *
+ * Description:
+ *   CAN RX FIFO 0 interrupt handler
+ *
+ * Input Parameters:
+ *   irq - The IRQ number of the interrupt.
+ *   context - The register state save array at the time of the interrupt.
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno on failure
+ *
+ ****************************************************************************/
+
+static int stm32l4can_rx0interrupt(int irq, FAR void *context)
+{
+  return stm32l4can_rxinterrupt(irq, context, 0);
+}
+
+/****************************************************************************
+ * Name: stm32l4can_rx1interrupt
+ *
+ * Description:
+ *   CAN RX FIFO 1 interrupt handler
+ *
+ * Input Parameters:
+ *   irq - The IRQ number of the interrupt.
+ *   context - The register state save array at the time of the interrupt.
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno on failure
+ *
+ ****************************************************************************/
+
+static int stm32l4can_rx1interrupt(int irq, FAR void *context)
+{
+  return stm32l4can_rxinterrupt(irq, context, 1);
+}
+
 /****************************************************************************
  * Name: stm32l4can_txinterrupt
  *
@@ -1558,7 +1622,7 @@ static int stm32l4can_txinterrupt(int irq, FAR void *context)
  *   Tbs1 = Tq * ts1
  *   Tbs2 = Tq * ts2
  *   Tq = brp * Tpclk1
- *   baud = Fpclk1 / (brp  * (1 + ts1 + ts2)))
+ *   baud = Fpclk1 / (brp  * (1 + ts1 + ts2))
  *
  * Where:
  *   Tpclk1 is the period of the APB1 clock (PCLK1).
@@ -1611,7 +1675,6 @@ static int stm32l4can_bittiming(FAR struct stm32l4_can_s *priv)
 
       ts1 = (tmp - 1) >> 1;
       ts2 = tmp - ts1 - 1;
-
       if (ts1 == ts2 && ts1 > 1 && ts2 < CAN_BTR_TSEG2_MAX)
         {
           ts1--;
@@ -1705,7 +1768,7 @@ static int stm32l4can_enterinitmode(FAR struct stm32l4_can_s *priv)
       return -ETIMEDOUT;
     }
 
-  return 0;
+  return OK;
 }
 
 /****************************************************************************
@@ -1750,11 +1813,12 @@ static int stm32l4can_exitinitmode(FAR struct stm32l4_can_s *priv)
 
   if (timeout < 1)
     {
-      canerr("ERROR: Timed out waiting to exit initialization mode: %08x\n", regval);
+      canerr("ERROR: Timed out waiting to exit initialization mode: %08x\n",
+             regval);
       return -ETIMEDOUT;
     }
 
-  return 0;
+  return OK;
 }
 
 /****************************************************************************
@@ -1784,11 +1848,6 @@ static int stm32l4can_cellinit(FAR struct stm32l4_can_s *priv)
   regval &= ~CAN_MCR_SLEEP;
   stm32l4can_putreg(priv, STM32L4_CAN_MCR_OFFSET, regval);
 
-  /* Configure CAN behavior.  Priority driven request order, not message ID. */
-
-  regval |= CAN_MCR_TXFP;
-  stm32l4can_putreg(priv, STM32L4_CAN_MCR_OFFSET, regval);
-
   ret = stm32l4can_enterinitmode(priv);
   if(ret != 0)
     {
@@ -1806,8 +1865,8 @@ static int stm32l4can_cellinit(FAR struct stm32l4_can_s *priv)
    */
 
   regval   = stm32l4can_getreg(priv, STM32L4_CAN_MCR_OFFSET);
-  regval &= ~(CAN_MCR_TXFP | CAN_MCR_RFLM | CAN_MCR_NART | CAN_MCR_AWUM |
-              CAN_MCR_ABOM | CAN_MCR_TTCM);
+  regval &= ~(CAN_MCR_TXFP | CAN_MCR_RFLM | CAN_MCR_NART |
+              CAN_MCR_AWUM | CAN_MCR_ABOM | CAN_MCR_TTCM);
   stm32l4can_putreg(priv, STM32L4_CAN_MCR_OFFSET, regval);
 
   /* Configure bit timing. */
@@ -1863,7 +1922,7 @@ static int stm32l4can_filterinit(FAR struct stm32l4_can_s *priv)
 
   /* Get the bitmask associated with the filter used by this CAN block */
 
-  bitmask = ((uint32_t)1) << priv->filter;
+  bitmask = (uint32_t)1 << priv->filter;
 
   /* Enter filter initialization mode */
 
@@ -1883,12 +1942,12 @@ static int stm32l4can_filterinit(FAR struct stm32l4_can_s *priv)
   regval |= bitmask;
   stm32l4can_putfreg(priv, STM32L4_CAN_FS1R_OFFSET, regval);
 
-  /* There are 14 or 28 filter banks (depending) on the device.  Each filter bank is
-   * composed of two 32-bit registers, CAN_FiR:
+  /* There are 14 or 28 filter banks (depending) on the device.
+   * Each filter bank is composed of two 32-bit registers, CAN_FiR:
    */
 
-  stm32l4can_putfreg(priv,  STM32L4_CAN_FIR_OFFSET(priv->filter, 1), 0);
-  stm32l4can_putfreg(priv,  STM32L4_CAN_FIR_OFFSET(priv->filter, 2), 0);
+  stm32l4can_putfreg(priv, STM32L4_CAN_FIR_OFFSET(priv->filter, 1), 0);
+  stm32l4can_putfreg(priv, STM32L4_CAN_FIR_OFFSET(priv->filter, 2), 0);
 
   /* Set Id/Mask mode for the filter */
 
diff --git a/arch/arm/src/stm32l4/stm32l4_can.h b/arch/arm/src/stm32l4/stm32l4_can.h
index 91b96c7c9b..453b031bda 100644
--- a/arch/arm/src/stm32l4/stm32l4_can.h
+++ b/arch/arm/src/stm32l4/stm32l4_can.h
@@ -117,7 +117,7 @@ extern "C"
  ************************************************************************************/
 
 /****************************************************************************
- * Name: stm32l4_caninitialize
+ * Name: stm32l4can_initialize
  *
  * Description:
  *   Initialize the selected CAN port
-- 
GitLab


From 20c611c12ba06fc81efa95142954264bf7ef316d Mon Sep 17 00:00:00 2001
From: "Paul A. Patience" 
Date: Wed, 29 Jun 2016 13:39:57 -0400
Subject: [PATCH 108/229] STM32 CAN: Bitfield definitions should be unsigned

Shifting 1 by 31 is undefined behaviour because 1 is signed.
We should probably use 1ul instead of 1 everywhere else,
but for now this silences a compiler warning.
---
 arch/arm/src/stm32/chip/stm32_can.h     | 2 +-
 arch/arm/src/stm32l4/chip/stm32l4_can.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/src/stm32/chip/stm32_can.h b/arch/arm/src/stm32/chip/stm32_can.h
index 6b4a12a855..c1e3500d5e 100644
--- a/arch/arm/src/stm32/chip/stm32_can.h
+++ b/arch/arm/src/stm32/chip/stm32_can.h
@@ -360,7 +360,7 @@
 #define CAN_BTR_SJW_SHIFT         (24)      /* Bits 25-24: Resynchronization Jump Width */
 #define CAN_BTR_SJW_MASK          (3 << CAN_BTR_SJW_SHIFT)
 #define CAN_BTR_LBKM              (1 << 30) /* Bit 30: Loop Back Mode (Debug) */
-#define CAN_BTR_SILM              (1 << 31) /* Bit 31: Silent Mode (Debug) */
+#define CAN_BTR_SILM              (1ul << 31) /* Bit 31: Silent Mode (Debug) */
 
 #define CAN_BTR_BRP_MAX           (1024)    /* Maximum BTR value (without decrement) */
 #define CAN_BTR_TSEG1_MAX         (16)      /* Maximum TSEG1 value (without decrement) */
diff --git a/arch/arm/src/stm32l4/chip/stm32l4_can.h b/arch/arm/src/stm32l4/chip/stm32l4_can.h
index 75c48cfeb8..0e4876d339 100644
--- a/arch/arm/src/stm32l4/chip/stm32l4_can.h
+++ b/arch/arm/src/stm32l4/chip/stm32l4_can.h
@@ -302,7 +302,7 @@
 #define CAN_BTR_SJW_SHIFT         (24)      /* Bits 25-24: Resynchronization Jump Width */
 #define CAN_BTR_SJW_MASK          (3 << CAN_BTR_SJW_SHIFT)
 #define CAN_BTR_LBKM              (1 << 30) /* Bit 30: Loop Back Mode (Debug) */
-#define CAN_BTR_SILM              (1 << 31) /* Bit 31: Silent Mode (Debug) */
+#define CAN_BTR_SILM              (1ul << 31) /* Bit 31: Silent Mode (Debug) */
 
 #define CAN_BTR_BRP_MAX           (1024)    /* Maximum BTR value (without decrement) */
 #define CAN_BTR_TSEG1_MAX         (16)      /* Maximum TSEG1 value (without decrement) */
-- 
GitLab


From 8e7db75439ead21991e3a24d71beef48427afd36 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Wed, 29 Jun 2016 16:05:19 -0600
Subject: [PATCH 109/229] Fix typos in a comment

---
 configs/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/Makefile b/configs/Makefile
index f2adff3e5e..4ae15b8777 100644
--- a/configs/Makefile
+++ b/configs/Makefile
@@ -35,7 +35,7 @@
 
 -include $(TOPDIR)/Make.defs
 
-# Determine there is a Kconfig file for the any custom board configuration
+# Determine if there is a Kconfig file for any custom board configuration
 
 ifeq ($(CONFIG_ARCH_BOARD_CUSTOM),y)
   CUSTOM_DIR = $(patsubst "%",%,$(CONFIG_ARCH_BOARD_CUSTOM_DIR))
-- 
GitLab


From d329f117e7c905d2f2fdfd16ccbaa82fc4f080cc Mon Sep 17 00:00:00 2001
From: Sebastien Lorquet 
Date: Thu, 30 Jun 2016 07:11:26 -0600
Subject: [PATCH 110/229] Here is a missing register def for STM32L4 after
 support for dual RX. Thanks to Paul for porting the CAN improvements to both
 STM32 targets.

---
 arch/arm/src/stm32l4/chip/stm32l4_can.h | 56 +++++++++----------------
 1 file changed, 19 insertions(+), 37 deletions(-)

diff --git a/arch/arm/src/stm32l4/chip/stm32l4_can.h b/arch/arm/src/stm32l4/chip/stm32l4_can.h
index 0e4876d339..6319282e48 100644
--- a/arch/arm/src/stm32l4/chip/stm32l4_can.h
+++ b/arch/arm/src/stm32l4/chip/stm32l4_can.h
@@ -74,6 +74,7 @@
 #define STM32L4_CAN_MCR_OFFSET      0x0000  /* CAN master control register */
 #define STM32L4_CAN_MSR_OFFSET      0x0004  /* CAN master status register */
 #define STM32L4_CAN_TSR_OFFSET      0x0008  /* CAN transmit status register */
+#define STM32L4_CAN_RFR_OFFSET(m)   (0x000c + ((m) << 2))
 #define STM32L4_CAN_RF0R_OFFSET     0x000c  /* CAN receive FIFO 0 register */
 #define STM32L4_CAN_RF1R_OFFSET     0x0010  /* CAN receive FIFO 1 register */
 #define STM32L4_CAN_IER_OFFSET      0x0014  /* CAN interrupt enable register */
@@ -82,39 +83,39 @@
 
 /* CAN mailbox registers (3 TX and 2 RX) */
 
-#define STM32L4_CAN_TIR_OFFSET(m)   (0x0180+((m)<<4))
+#define STM32L4_CAN_TIR_OFFSET(m)   (0x0180 + ((m) << 4))
 #define STM32L4_CAN_TI0R_OFFSET     0x0180  /* TX mailbox identifier register 0 */
 #define STM32L4_CAN_TI1R_OFFSET     0x0190  /* TX mailbox identifier register 1 */
 #define STM32L4_CAN_TI2R_OFFSET     0x01a0  /* TX mailbox identifier register 2 */
 
-#define STM32L4_CAN_TDTR_OFFSET(m)  (0x0184+((m)<<4))
+#define STM32L4_CAN_TDTR_OFFSET(m)  (0x0184 + ((m) << 4))
 #define STM32L4_CAN_TDT0R_OFFSET    0x0184  /* Mailbox data length control and time stamp register 0 */
 #define STM32L4_CAN_TDT1R_OFFSET    0x0194  /* Mailbox data length control and time stamp register 1 */
 #define STM32L4_CAN_TDT2R_OFFSET    0x01a4  /* Mailbox data length control and time stamp register 2 */
 
-#define STM32L4_CAN_TDLR_OFFSET(m)  (0x0188+((m)<<4))
+#define STM32L4_CAN_TDLR_OFFSET(m)  (0x0188 + ((m) << 4))
 #define STM32L4_CAN_TDL0R_OFFSET    0x0188  /* Mailbox data low register 0 */
 #define STM32L4_CAN_TDL1R_OFFSET    0x0198  /* Mailbox data low register 1 */
 #define STM32L4_CAN_TDL2R_OFFSET    0x01a8  /* Mailbox data low register 2 */
 
-#define STM32L4_CAN_TDHR_OFFSET(m)  (0x018c+((m)<<4))
+#define STM32L4_CAN_TDHR_OFFSET(m)  (0x018c + ((m) << 4))
 #define STM32L4_CAN_TDH0R_OFFSET    0x018c  /* Mailbox data high register 0 */
 #define STM32L4_CAN_TDH1R_OFFSET    0x019c  /* Mailbox data high register 1 */
 #define STM32L4_CAN_TDH2R_OFFSET    0x01ac  /* Mailbox data high register 2 */
 
-#define STM32L4_CAN_RIR_OFFSET(m)   (0x01b0+((m)<<4))
+#define STM32L4_CAN_RIR_OFFSET(m)   (0x01b0 + ((m) << 4))
 #define STM32L4_CAN_RI0R_OFFSET     0x01b0  /* Rx FIFO mailbox identifier register 0 */
 #define STM32L4_CAN_RI1R_OFFSET     0x01c0  /* Rx FIFO mailbox identifier register 1 */
 
-#define STM32L4_CAN_RDTR_OFFSET(m)  (0x01b4+((m)<<4))
+#define STM32L4_CAN_RDTR_OFFSET(m)  (0x01b4 + ((m) << 4))
 #define STM32L4_CAN_RDT0R_OFFSET    0x01b4  /* Rx FIFO mailbox data length control and time stamp register 0 */
 #define STM32L4_CAN_RDT1R_OFFSET    0x01c4  /* Rx FIFO mailbox data length control and time stamp register 1 */
 
-#define STM32L4_CAN_RDLR_OFFSET(m)  (0x01b8+((m)<<4))
+#define STM32L4_CAN_RDLR_OFFSET(m)  (0x01b8 + ((m) << 4))
 #define STM32L4_CAN_RDL0R_OFFSET    0x01b8  /* Receive FIFO mailbox data low register 0 */
 #define STM32L4_CAN_RDL1R_OFFSET    0x01c8  /* Receive FIFO mailbox data low register 1 */
 
-#define STM32L4_CAN_RDHR_OFFSET(m)  (0x01bc+((m)<<4))
+#define STM32L4_CAN_RDHR_OFFSET(m)  (0x01bc + ((m) << 4))
 #define STM32L4_CAN_RDH0R_OFFSET    0x01bc  /* Receive FIFO mailbox data high register 0 */
 #define STM32L4_CAN_RDH1R_OFFSET    0x01cc  /* Receive FIFO mailbox data high register 1 */
 
@@ -126,7 +127,7 @@
 #define STM32L4_CAN_FFA1R_OFFSET    0x0214  /* CAN filter FIFO assignment register */
 #define STM32L4_CAN_FA1R_OFFSET     0x021c  /* CAN filter activation register */
 
-/* There are 14 or 28 filter banks (depending) on the device.  Each filter bank is
+/* There are 14 filter banks on the device.  Each filter bank is
  * composed of two 32-bit registers, CAN_FiR:
  *  F0R1 Offset 0x240
  *  F0R2 Offset 0x244
@@ -143,6 +144,7 @@
 #  define STM32L4_CAN1_MCR          (STM32L4_CAN1_BASE+STM32L4_CAN_MCR_OFFSET)
 #  define STM32L4_CAN1_MSR          (STM32L4_CAN1_BASE+STM32L4_CAN_MSR_OFFSET)
 #  define STM32L4_CAN1_TSR          (STM32L4_CAN1_BASE+STM32L4_CAN_TSR_OFFSET)
+#  define STM32L4_CAN1_RFR(m)       (STM32L4_CAN1_BASE+STM32L4_CAN_RFR_OFFSET(m))
 #  define STM32L4_CAN1_RF0R         (STM32L4_CAN1_BASE+STM32L4_CAN_RF0R_OFFSET)
 #  define STM32L4_CAN1_RF1R         (STM32L4_CAN1_BASE+STM32L4_CAN_RF1R_OFFSET)
 #  define STM32L4_CAN1_IER          (STM32L4_CAN1_BASE+STM32L4_CAN_IER_OFFSET)
@@ -394,43 +396,23 @@
 
 /* CAN filter mode register */
 
-#if defined(CONFIG_STM32L4_CONNECTIVITYLINE) || defined(CONFIG_STM32L4_STM32F20XX) || defined(CONFIG_STM32L4_STM32F40XX)
-#  define CAN_FM1R_FBM_SHIFT      (0)      /* Bits 13:0: Filter Mode */
-#  define CAN_FM1R_FBM_MASK       (0x3fff << CAN_FM1R_FBM_SHIFT)
-#else
-#  define CAN_FM1R_FBM_SHIFT      (0)      /* Bits 27:0: Filter Mode */
-#  define CAN_FM1R_FBM_MASK       (0x0fffffff << CAN_FM1R_FBM_SHIFT)
-#endif
+#define CAN_FM1R_FBM_SHIFT        (0)      /* Bits 13:0: Filter Mode */
+#define CAN_FM1R_FBM_MASK         (0x3fff << CAN_FM1R_FBM_SHIFT)
 
 /* CAN filter scale register */
 
-#if defined(CONFIG_STM32L4_CONNECTIVITYLINE) || defined(CONFIG_STM32L4_STM32F20XX) || defined(CONFIG_STM32L4_STM32F40XX)
-#  define CAN_FS1R_FSC_SHIFT      (0)      /* Bits 13:0: Filter Scale Configuration */
-#  define CAN_FS1R_FSC_MASK       (0x3fff << CAN_FS1R_FSC_SHIFT)
-#else
-#  define CAN_FS1R_FSC_SHIFT      (0)      /* Bits 27:0: Filter Scale Configuration */
-#  define CAN_FS1R_FSC_MASK       (0x0fffffff << CAN_FS1R_FSC_SHIFT)
-#endif
+#define CAN_FS1R_FSC_SHIFT        (0)      /* Bits 13:0: Filter Scale Configuration */
+#define CAN_FS1R_FSC_MASK         (0x3fff << CAN_FS1R_FSC_SHIFT)
 
 /* CAN filter FIFO assignment register */
 
-#if defined(CONFIG_STM32L4_CONNECTIVITYLINE) || defined(CONFIG_STM32L4_STM32F20XX) || defined(CONFIG_STM32L4_STM32F40XX)
-#  define CAN_FFA1R_FFA_SHIFT     (0)      /* Bits 13:0: Filter FIFO Assignment */
-#  define CAN_FFA1R_FFA_MASK      (0x3fff << CAN_FFA1R_FFA_SHIFT)
-#else
-#  define CAN_FFA1R_FFA_SHIFT     (0)      /* Bits 27:0: Filter FIFO Assignment */
-#  define CAN_FFA1R_FFA_MASK      (0x0fffffff << CAN_FFA1R_FFA_SHIFT)
-#endif
+#define CAN_FFA1R_FFA_SHIFT       (0)      /* Bits 13:0: Filter FIFO Assignment */
+#define CAN_FFA1R_FFA_MASK        (0x3fff << CAN_FFA1R_FFA_SHIFT)
 
 /* CAN filter activation register */
 
-#if defined(CONFIG_STM32L4_CONNECTIVITYLINE) || defined(CONFIG_STM32L4_STM32F20XX) || defined(CONFIG_STM32L4_STM32F40XX)
-#  define CAN_FA1R_FACT_SHIFT     (0)      /* Bits 13:0: Filter Active */
-#  define CAN_FA1R_FACT_MASK      (0x3fff << CAN_FA1R_FACT_SHIFT)
-#else
-#  define CAN_FA1R_FACT_SHIFT     (0)      /* Bits 27:0: Filter Active */
-#  define CAN_FA1R_FACT_MASK      (0x0fffffff << CAN_FA1R_FACT_SHIFT)
-#endif
+#define CAN_FA1R_FACT_SHIFT       (0)      /* Bits 13:0: Filter Active */
+#define CAN_FA1R_FACT_MASK        (0x3fff << CAN_FA1R_FACT_SHIFT)
 
 /************************************************************************************
  * Public Types
-- 
GitLab


From 7f296f9226d69448df2bb23be474107c9cf8a7b8 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Thu, 30 Jun 2016 08:02:32 -0600
Subject: [PATCH 111/229] Update ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index 80f20422bf..fb716d517e 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -12182,3 +12182,70 @@
 	* libc/hex2bin:  Move the portable library portion of apps/system/hex2bin
 	  to nuttx/libc/hex2bin where it can be shared with the OS internals
 	  (2016-06-27).
+	* configs/nucleo-144: Added USB OTG device to Nucleo-144.  From David
+	  Sidrane (2016-06-27).
+	* arch/arm/src/stm32l4:  STM32 CAN fixes need to be backported to
+	  STM32L4 as well (2016-06-27).
+	* ARM stack check: Fix double fault on IDLE task with stack size = 0.
+	  From David Sidrane (2016-06-27).
+	* configs/nucleo-144: Added bbsram test to Nucleo-144.  From David
+	  Sidrane (2016-06-27).
+	* arch/arm/src/stm32f7: Added PWR, RTC, and BBSRAM support for stm32f7.
+	  From David Sidrane (2016-06-27).
+	* Build system: Fixed build of SAMV71-XULT/nsh.  With the changes from
+	  26f7b8c the build process of the default configuration did not succeed
+	  anymore.  From Michael Spahlinger (2016-06-28).
+	* sched/semaphore: Need to set errno to EINVAL on errors in sem_post()
+	  and sem_wait(). From Paul Alexander Patience (2016-06-28).
+	* Build system: This change fixes a build problem that only occurs when
+	  reconfiguring from Linux to Windows or vice-versa.  It is a problem
+	  that was present but not usually experienced until two things happened:
+	  (1) The pre_config target was added to run before the menconfig
+	  operation and (2) the context target was added before the pre_config
+	  target in order to set up the correct symbolic links (in the apps/platform
+	  directory) needed by the pre_config target.
+	  But then now if you start with a Linux system and run 'make menuconfig'
+	  to switch to Linux, the context target will execute first and set up
+	  POSIX style symbolic links before doing the menuconfig.  Then after the
+	  menuconfig, the make will fail on Windows if you are using a Windows
+	  native toolchain because that native toolchain cannot follow the Cygwin-
+	  style symbolic links.
+	  The fix here is to also execute the clean_context AFTER executing
+	  menuconfig.  A lot more happens now:  It used to be that doing 'make
+	  menuconfig' only did the menuconfig operation.  No it does context,
+	  pre_config, menuconfig, clean_context.  Not nearly as snappy as it used
+	  to be (2016-06-28).
+	* arch/arm/src/efm32, lcp43, stm32, stm32l4: disable interrupts with
+	  NVIC_IRQ_CLEAR.  From Paul Alexander Patience (2016-06-28).
+	* arch/arm/src/stm32f7: STMF7xxx RTC: (1) Remove proxy #defines, (2)
+	  Ensure the LSE(ON) etal are set and remembered in a) A cold start
+	  (RTC_MAGIC invalid) of the RTC, and b) A warm start (RTC_MAGIC valid)
+	  of the RTC but a clock change.  The change was needed because in bench
+	  testing a merge of the latest's STM32  53ec3ca (and friends) it became
+	  apparent that the sequence of operation is wrong in the reset of the
+	  Backup Domain in the RCC code.  PWR is required before the Backup
+	  Domain can be futzed with. !!!This Code should be tested on STM32 and
+	  if needed rippled to the STM32 families.  From David Sidrane
+	  (2016-06-28).
+	* arch/arm/src/stm32f7: Added STMF7xxx RTC.  From David Sidrane
+	  (2016-06-28).
+	* arch/arm/src/stm32: STM32 BBSRAM fixed (and formatted) flags.  From
+	  David Sidrane (2016-06-28).
+	* arch/arm/src/stm32f7: STM32F7 BBSRAM fixed (and formatted) flags.
+	  From David Sidrane (2016-06-28).
+	* arch/arm/src/stm32f7: Added STM32F7 DBGMCU.  From David Sidrane
+	  (2016-06-28).
+	* arch/arm/src/samv7: SAMV7: CAN Message Filtering fixed: (1) stdfilters
+	  didn't work because the filter was never enabled (wrong number of bits
+	  to shift), and (2) Filters were never used because the configuration
+	  register cannot be written without using the initialization mode.
+	  Both bugs are fixed by this change. Filtering has been tested with
+	  both standard and extended identifiers and is now working properly.
+	  From Michael Spahlinger (2016-06-29).
+	* configs/Kconfig and dummy/: Add logic to support custom board
+	  directories that include a Kconfig file.  During the context phase
+	  of the build, any Kconfig file in the custom board directory is copied
+	  into configs/dummy, replacing the existing Kconfig file with the
+	  target Kconfig file (2016-06-29).
+	* arch/arm/src/stm32l4: Port support for both RX FIFOs from STM32 CAN.
+	  From Paul Alexander Patience (2016-06-29).
-- 
GitLab


From 378b22ec07cade90a150c948b40a402c578bacbb Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Thu, 30 Jun 2016 11:25:59 -0600
Subject: [PATCH 112/229] binfmt: Remove PCODE dependency on apps/pcode.h

---
 binfmt/Kconfig             |  14 ++--
 binfmt/libpcode/Kconfig    |  39 +++++-----
 binfmt/libpcode/Make.defs  |  14 +++-
 binfmt/libpcode/README.txt |  35 ++++-----
 binfmt/pcode.c             | 150 ++++++++++++++++++++++++++++---------
 5 files changed, 170 insertions(+), 82 deletions(-)

diff --git a/binfmt/Kconfig b/binfmt/Kconfig
index fc2b457f89..bd563bc0c8 100644
--- a/binfmt/Kconfig
+++ b/binfmt/Kconfig
@@ -69,10 +69,10 @@ if BUILTIN
 source binfmt/libbuiltin/Kconfig
 endif
 
-config PCODE
+config BINFMT_PCODE
 	bool "Support P-Code Applications"
 	default n
-	depends on INTERPRETERS_PCODE && SYSTEM_PRUN && ((!BUILD_PROTECTED && !BUILD_KERNEL) || EXPERIMENTAL)
+	depends on INTERPRETERS_PCODE && ((!BUILD_PROTECTED && !BUILD_KERNEL) || EXPERIMENTAL)
 	---help---
 		Enable support for interpreted P-Code binaries.  P-Code binaries are
 		generated by the NuttX Pascal compiler.
@@ -84,12 +84,12 @@ config PCODE
 		Pascal package directory for more details.  The correct installation
 		directory is: apps/interpreters.
 
-		ISSUES:  This feature is highly coupled with logic in the apps/subdirectory
-		and, as a consequence, cannot be used in environments that do not
-		include the standard NuttX apps/ nor in build configurations using
-		UILD_PROTECTED or BUILD_KERNEL..
+		ISSUES:  This feature is highly coupled with logic in the apps/
+		directory and, as a consequence, cannot be used in environments that
+		do not include the standard NuttX apps/ directory nor in build
+		configurations using BUILD_PROTECTED or BUILD_KERNEL.
 
-if PCODE
+if BINFMT_PCODE
 source binfmt/libpcode/Kconfig
 endif
 
diff --git a/binfmt/libpcode/Kconfig b/binfmt/libpcode/Kconfig
index 046dc71c55..12bc6665c0 100644
--- a/binfmt/libpcode/Kconfig
+++ b/binfmt/libpcode/Kconfig
@@ -3,65 +3,68 @@
 # see the file kconfig-language.txt in the NuttX tools repository.
 #
 
-config PCODE_STACKSIZE
+config BINFMT_PCODE_STACKSIZE
 	int "P-code interpreter stack size"
 	default 2048
 	---help---
 		This is the stack size that will be used when starting P-code interpreter.
 
-config PCODE_PRIORITY
+config BINFMT_PCODE_PRIORITY
 	int "P-code interpreter priority"
 	default 100
 	---help---
 		This is the task_priority that will be used when starting P-code interpreter.
 
-config PCODE_VARSTACKSIZE
+config BINFMT_PCODE_VARSTACKSIZE
 	int "P-code variable stack size"
 	default 1024
 	---help---
 		This size of the P-Code variable storage area to be allocated by the
 		P-Code runtime.
 
-config PCODE_STRSTACKSIZE
+config BINFMT_PCODE_STRSTACKSIZE
 	int "P-code string stack size"
 	default 128
 	---help---
 		This size of the P-Code string stack area to be allocated by the
 		P-Code runtime.
 
-config PCODE_TEST_FS
+config BINFMT_PCODE_TEST_FS
 	bool "Mount a test file system"
 	depends on FS_ROMFS && !DISABLE_MOUNTPOINT
 	---help---
-		Mount a test file system.  This test file system was used to verify the P-Code binary format.
+		Mount a test file system.  This test file system was used to verify
+		the P-Code binary format.
 
-if PCODE_TEST_FS
+if BINFMT_PCODE_TEST_FS
 
-config PCODE_TEST_DEVMINOR
+config BINFMT_PCODE_TEST_DEVMINOR
 	int "Test file system minor device number"
 	default 0
 	---help---
-		The minor device number of the ROMFS block. For example, the N in /dev/ramN.
-		Used for registering the RAM block driver that will hold the ROMFS file system
-		containing the P-code files to be tested.  Default: 0
+		The minor device number of the ROMFS block. For example, the N in
+		/dev/ramN.  Used for registering the RAM block driver that will hold
+		the ROMFS file system containing the P-code files to be tested.
+		Default: 0
 
-config PCODE_TEST_DEVPATH
+config BINFMT_PCODE_TEST_DEVPATH
 	string "Test file system device Path"
 	default "/dev/ram0"
 	---help---
-		The path to the ROMFS block driver device.  This must match PCODE_TEST_DEVMINOR.
-		Used for registering the RAM block driver that will hold the ROMFS file system
-		containing the P-code files to be tested.  Default: "/dev/ram0"
+		The path to the ROMFS block driver device.  This must match
+		BINFMT_PCODE_TEST_DEVMINOR.  Used for registering the RAM block
+		driver that will hold the ROMFS file system containing the P-code
+		files to be tested.  Default: "/dev/ram0"
 
-config PCODE_TEST_MOUNTPOINT
+config BINFMT_PCODE_TEST_MOUNTPOINT
 	string "Test file system mount point"
 	default "/bin"
 	---help---
 		Location where the test file system will be mounted
 
-endif # PCODE_TEST_FS
+endif # BINFMT_PCODE_TEST_FS
 
-config PCODE_DUMPBUFFER
+config BINFMT_PCODE_DUMPBUFFER
 	bool "Dump P-code buffers"
 	default n
 	depends on DEBUG_INFO
diff --git a/binfmt/libpcode/Make.defs b/binfmt/libpcode/Make.defs
index e84d0d3257..5b0107c39a 100644
--- a/binfmt/libpcode/Make.defs
+++ b/binfmt/libpcode/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # binfmt/libpcode/Make.defs
 #
-#   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2014, 2016 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt 
 #
 # Redistribution and use in source and binary forms, with or without
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
-ifeq ($(CONFIG_PCODE),y)
+ifeq ($(CONFIG_BINFMT_PCODE),y)
 
 # P-code application interfaces
 
@@ -46,7 +46,15 @@ BINFMT_CSRCS += pcode.c
 # Add an include path so that P-Code related header files may reside in
 # the libpcode sub-directory
 
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(TOPDIR)$(DELIM)binfmt$(DELIM)libpcode"}
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \
+	"$(TOPDIR)$(DELIM)binfmt$(DELIM)libpcode"}
+
+# FIXME: This also depends upon header files installed at
+# apps/interpreters/pcode
+
+PCODE_DIR = $(TOPDIR)$(DELIM)$(CONFIG_APPS_DIR)$(DELIM)interpreters$(DELIM)pcode
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \
+	"$(PCODE_DIR)$(DELIM)include" "$(PCODE_DIR)$(DELIM)insn$(DELIM)include"}
 
 # Hook the libpcode subdirectory into the build
 
diff --git a/binfmt/libpcode/README.txt b/binfmt/libpcode/README.txt
index d6cb606af7..4e0724ee07 100644
--- a/binfmt/libpcode/README.txt
+++ b/binfmt/libpcode/README.txt
@@ -14,7 +14,7 @@ Other required configuration settings:
 
   CONFIG_NFILE_DESCRIPTORS > 3
   CONFIG_BINFMT_DISABLE=n
-  CONFIG_PCODE=y
+  CONFIG_BINFMT_PCODE=y
 
 Directory Contents
 ------------------
@@ -83,16 +83,16 @@ Here is a simple test configuration using the NuttX simulator:
 
    This enables building the PCODE binary format
 
-     CONFIG_PCODE=y
-     CONFIG_PCODE_PRIORITY=100
-     CONFIG_PCODE_STACKSIZE=2048
+     CONFIG_BINFMT_PCODE=y
+     CONFIG_BINFMT_PCODE_PRIORITY=100
+     CONFIG_BINFMT_PCODE_STACKSIZE=2048
 
    This enables building and mount a test filesystem:
 
-     CONFIG_PCODE_TEST_FS=y
-     CONFIG_PCODE_TEST_DEVMINOR=3
-     CONFIG_PCODE_TEST_DEVPATH="/dev/ram3"
-     CONFIG_PCODE_TEST_MOUNTPOINT="/bin"
+     CONFIG_BINFMT_PCODE_TEST_FS=y
+     CONFIG_BINFMT_PCODE_TEST_DEVMINOR=3
+     CONFIG_BINFMT_PCODE_TEST_DEVPATH="/dev/ram3"
+     CONFIG_BINFMT_PCODE_TEST_MOUNTPOINT="/bin"
 
    Debug options can also be enabled with:
 
@@ -127,23 +127,24 @@ Here is a simple test configuration using the NuttX simulator:
 Issues
 ------
 
-1. As implemented now, there is a tight coupling between the nuttx/directory
-   and the apps/ directory.  That should not be the case; the nuttx/ logic
-   should be completely independent of apps/ logic (but not vice versa).
+1. As implemented now, there is a tight coupling between the nuttx/binfmt
+   directory and the apps/interpreters/pcode directory.  That should not
+   be the case; the nuttx/ logic should be completely independent of apps/
+   logic (but not vice versa).
 
 2. The current implementation will not work in the CONFIG_BUILD_PROTECTED or
    CONFIG_BUILD_KERNEL configurations.  That is because of the little proxy
-   logic (function pcode_proxy() in the file pcode.c).  (a) That logic would
-   attempt to link with P-code logic that resides in user space.  That will
-   not work.  And (2) that proxy would be started in user mode but in the
-   kernel address space which will certainly crash immediately.
+   logic (function pcode_proxy() and prun() in the file pcode.c).  (a) That
+   logic would attempt to link with P-code logic that resides in user space.
+   That will not work.  And (2) that proxy would be started in user mode but
+   in the kernel address space which will certainly crash immediately.
 
 The general idea to fix both of these problems is as follows:
 
 1. Eliminate the pcode_proxy.  Instead start a P-Code execution program that
    resides in the file system.  That P-Code execution program already
-   exists.  It is in apps/system/prun.  This program should be built as,
-   say, an ELF binary and installed in a file system.
+   exists.  This program should be built as, say, an ELF binary and
+   installed in a file system.
 
 2. Add a configuration setting that gives the full path to where the pexec
    program is stored in the filesystem.
diff --git a/binfmt/pcode.c b/binfmt/pcode.c
index 8e52b75aab..f295e1291c 100644
--- a/binfmt/pcode.c
+++ b/binfmt/pcode.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * binfmt/pcode.c
  *
- *   Copyright (C) 2014-2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2014-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,15 +47,16 @@
 #include 
 #include 
 
-#include 
-
 #include 
 #include 
 #include 
 #include 
 #include 
 
-#ifdef CONFIG_PCODE
+#include "pexec.h"
+#include "pedefs.h"
+
+#ifdef CONFIG_BINFMT_PCODE
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -72,23 +73,19 @@
 #  error The binary loader is disabled (CONFIG_BINFMT_DISABLE)!
 #endif
 
-#ifndef CONFIG_PCODE
-#  error You must select CONFIG_PCODE in your configuration file
-#endif
-
 #ifndef CONFIG_SCHED_ONEXIT
 #  error CONFIG_SCHED_ONEXIT is required
 #endif
 
-#ifndef CONFIG_PCODE_VARSTACKSIZE
-# define CONFIG_PCODE_VARSTACKSIZE 1024
+#ifndef CONFIG_BINFMT_PCODE_VARSTACKSIZE
+# define CONFIG_BINFMT_PCODE_VARSTACKSIZE 1024
 #endif
 
-#ifndef CONFIG_PCODE_STRSTACKSIZE
-# define CONFIG_PCODE_STRSTACKSIZE 128
+#ifndef CONFIG_BINFMT_PCODE_STRSTACKSIZE
+# define CONFIG_BINFMT_PCODE_STRSTACKSIZE 128
 #endif
 
-#ifdef CONFIG_PCODE_TEST_FS
+#ifdef CONFIG_BINFMT_PCODE_TEST_FS
 #  ifndef CONFIG_FS_ROMFS
 #    error You must select CONFIG_FS_ROMFS in your configuration file
 #  endif
@@ -97,16 +94,16 @@
 #    error You must not disable mountpoints via CONFIG_DISABLE_MOUNTPOINT in your configuration file
 #  endif
 
-#  ifndef CONFIG_PCODE_TEST_DEVMINOR
-#    define CONFIG_PCODE_TEST_DEVMINOR 0
+#  ifndef CONFIG_BINFMT_PCODE_TEST_DEVMINOR
+#    define CONFIG_BINFMT_PCODE_TEST_DEVMINOR 0
 #  endif
 
-#  ifndef CONFIG_PCODE_TEST_DEVPATH
-#    define CONFIG_PCODE_TEST_DEVPATH "/dev/ram0"
+#  ifndef CONFIG_BINFMT_PCODE_TEST_DEVPATH
+#    define CONFIG_BINFMT_PCODE_TEST_DEVPATH "/dev/ram0"
 #  endif
 
-#  ifndef CONFIG_PCODE_TEST_MOUNTPOINT
-#    define CONFIG_PCODE_TEST_MOUNTPOINT "/bin"
+#  ifndef CONFIG_BINFMT_PCODE_TEST_MOUNTPOINT
+#    define CONFIG_BINFMT_PCODE_TEST_MOUNTPOINT "/bin"
 #  endif
 #endif
 
@@ -130,6 +127,16 @@ struct binfmt_handoff_s
  * Private Function Prototypes
  ****************************************************************************/
 
+static int pcode_run(FAR char *exepath, size_t varsize, size_t strsize);
+#ifdef CONFIG_BINFMT_PCODE_TEST_FS
+static int pcode_mount_testfs(void);
+#endif
+#if !defined(CONFIG_BUILD_PROTECTED) && !defined(CONFIG_BUILD_KERNEL)
+static void pcode_onexit(int exitcode, FAR void *arg);
+#endif
+#if !defined(CONFIG_BUILD_PROTECTED) && !defined(CONFIG_BUILD_KERNEL)
+static int pcode_proxy(int argc, char **argv);
+#endif
 static int pcode_load(FAR struct binary_s *binp);
 static int pcode_unload(FAR struct binary_s *binp);
 
@@ -146,7 +153,7 @@ static struct binfmt_s g_pcode_binfmt =
 
 struct binfmt_handoff_s g_pcode_handoff;
 
-#ifdef CONFIG_PCODE_TEST_FS
+#ifdef CONFIG_BINFMT_PCODE_TEST_FS
 #  include "romfs.h"
 #endif
 
@@ -154,6 +161,69 @@ struct binfmt_handoff_s g_pcode_handoff;
  * Private Functions
  ****************************************************************************/
 
+/****************************************************************************
+ * Name: pcode_run
+ *
+ * Description:
+ *   Execute/interpret a P-Code file.  This function does not return until
+ *   the P-code program terminates or until a fatal error occurs.
+ *
+ * Input Parameters:
+ *   exepath - The full path to the P-Code binary.
+ *   varsize - Size of the P-Code variable stack
+ *   strsize - the size of the P-Code string stack.
+ *
+ * Returned Value:
+ *   OK if the P-Code program successfully terminated; A negated errno value
+ *   is returned on the event of any failure.
+ *
+ ****************************************************************************/
+
+static int pcode_run(FAR char *exepath, size_t varsize, size_t strsize)
+{
+  FAR struct pexec_s *st;
+  int errcode;
+  int ret = OK;
+
+  /* Load the POFF file into memory */
+
+  st = pload(exepath, varsize, varsize);
+  if (!st)
+    {
+      berr("ERROR: Could not load %s\n", exepath);
+      return -ENOEXEC;
+    }
+
+  binfo("Loaded %s\n", exepath);
+
+  /* Execute the P-Code program until a stopping condition occurs */
+
+  for (;;)
+    {
+      /* Execute the instruction; Check for exceptional conditions */
+
+      errcode = pexec(st);
+      if (errcode != eNOERROR)
+        {
+          break;
+        }
+    }
+
+  if (errcode != eEXIT)
+    {
+      /* REVISIT: Select a more appropriated return errocode */
+
+      berr("ERROR: Runtime error 0x%02x -- Execution Stopped\n", errcode);
+      ret = -ENOEXEC;
+    }
+
+  /* Clean up resources used by the interpreter */
+
+  binfo("Execution terminated\n");
+  pexec_release(st);
+  return ret;
+}
+
 /****************************************************************************
  * Name: pcode_mount_testfs
  *
@@ -162,15 +232,15 @@ struct binfmt_handoff_s g_pcode_handoff;
  *
  ****************************************************************************/
 
-#ifdef CONFIG_PCODE_TEST_FS
+#ifdef CONFIG_BINFMT_PCODE_TEST_FS
 static int pcode_mount_testfs(void)
 {
   int ret;
 
   /* Create a ROM disk for the ROMFS filesystem */
 
-  binfo("Registering romdisk at /dev/ram%d\n", CONFIG_PCODE_TEST_DEVMINOR);
-  ret = romdisk_register(CONFIG_PCODE_TEST_DEVMINOR, (FAR uint8_t *)romfs_img,
+  binfo("Registering romdisk at /dev/ram%d\n", CONFIG_BINFMT_PCODE_TEST_DEVMINOR);
+  ret = romdisk_register(CONFIG_BINFMT_PCODE_TEST_DEVMINOR, (FAR uint8_t *)romfs_img,
                          NSECTORS(ROMFS_IMG_LEN), SECTORSIZE);
   if (ret < 0)
     {
@@ -181,9 +251,11 @@ static int pcode_mount_testfs(void)
   /* Mount the test file system */
 
   binfo("Mounting ROMFS filesystem at target=%s with source=%s\n",
-         CONFIG_PCODE_TEST_MOUNTPOINT, CONFIG_PCODE_TEST_DEVPATH);
+         CONFIG_BINFMT_PCODE_TEST_MOUNTPOINT,
+         CONFIG_BINFMT_PCODE_TEST_DEVPATH);
 
-  ret = mount(CONFIG_PCODE_TEST_DEVPATH, CONFIG_PCODE_TEST_MOUNTPOINT,
+  ret = mount(CONFIG_BINFMT_PCODE_TEST_DEVPATH,
+              CONFIG_BINFMT_PCODE_TEST_MOUNTPOINT,
               "romfs", MS_RDONLY, NULL);
   if (ret < 0)
     {
@@ -191,7 +263,9 @@ static int pcode_mount_testfs(void)
       DEBUGASSERT(errval > 0);
 
       berr("ERROR: mount(%s,%s,romfs) failed: %d\n",
-           CONFIG_PCODE_TEST_DEVPATH, CONFIG_PCODE_TEST_MOUNTPOINT, errval);
+           CONFIG_BINFMT_PCODE_TEST_DEVPATH,
+           CONFIG_BINFMT_PCODE_TEST_MOUNTPOINT, errval);
+
       return -errval;
     }
 
@@ -201,7 +275,7 @@ static int pcode_mount_testfs(void)
    */
 
 #if defined(CONFIG_BINFMT_EXEPATH) && !defined(CONFIG_PATH_INITIAL)
-  (void)setenv("PATH", CONFIG_PCODE_TEST_MOUNTPOINT, 1);
+  (void)setenv("PATH", CONFIG_BINFMT_PCODE_TEST_MOUNTPOINT, 1);
 #endif
 
   return OK;
@@ -273,7 +347,8 @@ static int pcode_proxy(int argc, char **argv)
 
   /* Load the P-code file and execute it */
 
-  ret = prun(fullpath, CONFIG_PCODE_VARSTACKSIZE, CONFIG_PCODE_STRSTACKSIZE);
+  ret = pcode_run(fullpath, CONFIG_BINFMT_PCODE_VARSTACKSIZE,
+                  CONFIG_BINFMT_PCODE_STRSTACKSIZE);
 
   /* We no longer need the fullpath */
 
@@ -324,8 +399,8 @@ static int pcode_load(struct binary_s *binp)
 
   /* Read the POFF file header */
 
-  for (remaining = sizeof(struct poff_fileheader_s), ptr = (FAR uint8_t *)&hdr;
-       remaining > 0; )
+  for (remaining = sizeof(struct poff_fileheader_s),
+       ptr = (FAR uint8_t *)&hdr; remaining > 0; )
     {
       /* Read the next GULP */
 
@@ -358,7 +433,7 @@ static int pcode_load(struct binary_s *binp)
         }
     }
 
-#ifdef CONFIG_PCODE_DUMPBUFFER
+#ifdef CONFIG_BINFMT_PCODE_DUMPBUFFER
   lib_dumpbuffer("POFF File Header", &hdr, sizeof(poff_fileheader_s));
 #endif
 
@@ -377,8 +452,8 @@ static int pcode_load(struct binary_s *binp)
    */
 
   binp->entrypt   = pcode_proxy;
-  binp->stacksize = CONFIG_PCODE_STACKSIZE;
-  binp->priority  = CONFIG_PCODE_PRIORITY;
+  binp->stacksize = CONFIG_BINFMT_PCODE_STACKSIZE;
+  binp->priority  = CONFIG_BINFMT_PCODE_PRIORITY;
 
   /* Get exclusive access to the p-code handoff structure */
 
@@ -517,14 +592,15 @@ void pcode_uninitialize(void)
       UNUSED(errval);
     }
 
-#ifdef CONFIG_PCODE_TEST_FS
-  ret = umount(CONFIG_PCODE_TEST_MOUNTPOINT);
+#ifdef CONFIG_BINFMT_PCODE_TEST_FS
+  ret = umount(CONFIG_BINFMT_PCODE_TEST_MOUNTPOINT);
   if (ret < 0)
     {
       int errval = get_errno();
       DEBUGASSERT(errval > 0);
 
-      berr("ERROR: umount(%s) failed: %d\n", CONFIG_PCODE_TEST_MOUNTPOINT, errval);
+      berr("ERROR: umount(%s) failed: %d\n",
+           CONFIG_BINFMT_PCODE_TEST_MOUNTPOINT, errval);
       UNUSED(errval);
     }
 #endif
@@ -534,4 +610,4 @@ void pcode_uninitialize(void)
   sem_destroy(&g_pcode_handoff.exclsem);
 }
 
-#endif /* CONFIG_PCODE */
+#endif /* CONFIG_BINFMT_PCODE */
-- 
GitLab


From 7c34a77b5411dfcc696e9db48816025d4ef19c4e Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Thu, 30 Jun 2016 12:24:33 -0600
Subject: [PATCH 113/229] Move apps/system/usbmonitor to
 nuttx/drivers/usbmonitor

---
 Documentation/UsbTrace.html                   |  18 +-
 configs/ea3131/usbserial/defconfig            |   2 +-
 configs/hymini-stm32v/README.txt              |  20 +-
 configs/hymini-stm32v/nsh2/defconfig          |   2 +-
 configs/maple/nsh/defconfig                   |   2 +-
 configs/maple/nx/defconfig                    |   2 +-
 configs/maple/usbnsh/defconfig                |   2 +-
 configs/mcu123-lpc214x/composite/defconfig    |   2 +-
 configs/mcu123-lpc214x/usbmsc/defconfig       |   2 +-
 configs/mikroe-stm32f4/README.txt             |  20 +-
 configs/mikroe-stm32f4/src/stm32_appinit.c    |   4 +-
 configs/olimex-lpc-h3131/README.txt           |   4 +-
 configs/olimex-lpc-h3131/src/lpc31_appinit.c  |   2 +-
 configs/olimex-lpc-h3131/src/lpc_h3131.h      |   2 +-
 .../olimex-stm32-e407/src/olimex-stm32-e407.h |   2 +-
 configs/olimex-stm32-e407/src/stm32_appinit.c |   4 +-
 configs/olimex-stm32-h405/src/stm32_appinit.c |   2 +-
 .../olimex-stm32-h407/src/olimex-stm32-h407.h |   2 +-
 configs/olimex-stm32-h407/src/stm32_appinit.c |   2 +-
 configs/olimex-stm32-h407/src/stm32_bringup.c |   2 +-
 configs/olimex-stm32-p207/src/stm32_appinit.c |   4 +-
 configs/olimexino-stm32/src/stm32_appinit.c   |   2 +-
 configs/sam4e-ek/README.txt                   |  18 +-
 configs/sam4e-ek/src/sam4e-ek.h               |   2 +-
 configs/sam4e-ek/src/sam_appinit.c            |   2 +-
 .../src/sam4s-xplained-pro.h                  |   2 +-
 configs/sam4s-xplained-pro/src/sam_appinit.c  |   2 +-
 configs/sama5d3-xplained/README.txt           |  26 +-
 configs/sama5d3-xplained/src/sam_appinit.c    |   2 +-
 .../sama5d3-xplained/src/sama5d3-xplained.h   |   2 +-
 configs/sama5d3x-ek/README.txt                |  26 +-
 configs/sama5d3x-ek/src/sam_appinit.c         |   2 +-
 configs/sama5d3x-ek/src/sama5d3x-ek.h         |   2 +-
 configs/sama5d4-ek/README.txt                 |  26 +-
 configs/sama5d4-ek/src/sam_bringup.c          |   2 +-
 configs/sama5d4-ek/src/sama5d4-ek.h           |   2 +-
 configs/same70-xplained/src/sam_bringup.c     |   2 +-
 configs/same70-xplained/src/same70-xplained.h |   2 +-
 configs/samv71-xult/src/sam_bringup.c         |   2 +-
 configs/samv71-xult/src/samv71-xult.h         |   2 +-
 configs/spark/composite/defconfig             |   2 +-
 configs/spark/nsh/defconfig                   |   2 +-
 configs/spark/src/stm32_appinit.c             |   4 +-
 configs/spark/src/stm32_composite.c           |   4 +-
 configs/spark/usbmsc/defconfig                |   2 +-
 configs/spark/usbnsh/defconfig                |   2 +-
 configs/spark/usbserial/defconfig             |   2 +-
 configs/stm32_tiny/README.txt                 |  22 +-
 configs/stm32_tiny/usbnsh/defconfig           |   2 +-
 configs/stm32f103-minimum/README.txt          |  20 +-
 configs/stm32f103-minimum/usbnsh/defconfig    |   2 +-
 configs/stm32f3discovery/README.txt           |  18 +-
 configs/stm32f3discovery/src/stm32_appinit.c  |   4 +-
 configs/stm32f429i-disco/README.txt           |   2 +-
 configs/stm32f429i-disco/src/stm32_appinit.c  |   4 +-
 configs/stm32f4discovery/README.txt           |  22 +-
 configs/stm32f4discovery/src/stm32_bringup.c  |   2 +-
 .../stm32f4discovery/src/stm32f4discovery.h   |   2 +-
 configs/sure-pic32mx/README.txt               |  18 +-
 configs/sure-pic32mx/src/pic32mx_appinit.c    |   4 +-
 configs/teensy-3.x/usbnsh/defconfig           |  18 +-
 drivers/Kconfig                               |  14 +
 drivers/spi/Make.defs                         |   1 -
 drivers/usbmonitor/Kconfig                    |  58 ++++
 drivers/usbmonitor/Make.defs                  |  51 ++++
 drivers/usbmonitor/usbmonitor.c               | 264 ++++++++++++++++++
 66 files changed, 580 insertions(+), 194 deletions(-)
 create mode 100644 drivers/usbmonitor/Kconfig
 create mode 100644 drivers/usbmonitor/Make.defs
 create mode 100644 drivers/usbmonitor/usbmonitor.c

diff --git a/Documentation/UsbTrace.html b/Documentation/UsbTrace.html
index a6800983d5..25c8736b7b 100644
--- a/Documentation/UsbTrace.html
+++ b/Documentation/UsbTrace.html
@@ -396,7 +396,7 @@ static int pl2303_setup(FAR struct uart_dev_s *dev)
   
   
     
-      CONFIG_SYSTEM_USBMONITOR=y
+      CONFIG_USBMONITOR=y
     
     
       Enable the USB monitor daemon
@@ -404,7 +404,7 @@ static int pl2303_setup(FAR struct uart_dev_s *dev)
   
   
     
-      CONFIG_SYSTEM_USBMONITOR_STACKSIZE=nnnn
+      CONFIG_USBMONITOR_STACKSIZE=nnnn
     
     
       Sets the USB monitor daemon stack size to nnnn.
@@ -413,7 +413,7 @@ static int pl2303_setup(FAR struct uart_dev_s *dev)
   
   
     
-      CONFIG_SYSTEM_USBMONITOR_PRIORITY=50
+      CONFIG_USBMONITOR_PRIORITY=50
     
     
       Sets the USB monitor daemon priority to nnnn.
@@ -423,7 +423,7 @@ static int pl2303_setup(FAR struct uart_dev_s *dev)
   
   
     
-      CONFIG_SYSTEM_USBMONITOR_INTERVAL=nnnn
+      CONFIG_USBMONITOR_INTERVAL=nnnn
     
     
       Dump the buffered USB data every nnnn seconds.
@@ -432,11 +432,11 @@ static int pl2303_setup(FAR struct uart_dev_s *dev)
   
   
     
-      CONFIG_SYSTEM_USBMONITOR_TRACEINIT=y
              
-      CONFIG_SYSTEM_USBMONITOR_TRACECLASS=y
              
-      CONFIG_SYSTEM_USBMONITOR_TRACETRANSFERS=y
              
-      CONFIG_SYSTEM_USBMONITOR_TRACECONTROLLER=y
              
-      CONFIG_SYSTEM_USBMONITOR_TRACEINTERRUPTS=y
              
+      CONFIG_USBMONITOR_TRACEINIT=y
              
+      CONFIG_USBMONITOR_TRACECLASS=y
              
+      CONFIG_USBMONITOR_TRACETRANSFERS=y
              
+      CONFIG_USBMONITOR_TRACECONTROLLER=y
              
+      CONFIG_USBMONITOR_TRACEINTERRUPTS=y
              
     
     
       Selects which USB event(s) that you want to be traced.
diff --git a/configs/ea3131/usbserial/defconfig b/configs/ea3131/usbserial/defconfig
index 9b050fb1c4..3c15c8bb07 100644
--- a/configs/ea3131/usbserial/defconfig
+++ b/configs/ea3131/usbserial/defconfig
@@ -785,6 +785,6 @@ CONFIG_EXAMPLES_USBSERIAL_BUFSIZE=512
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
-# CONFIG_SYSTEM_USBMONITOR is not set
+# CONFIG_USBMONITOR is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/hymini-stm32v/README.txt b/configs/hymini-stm32v/README.txt
index 2ec1c04353..e6643aaed3 100644
--- a/configs/hymini-stm32v/README.txt
+++ b/configs/hymini-stm32v/README.txt
@@ -667,16 +667,16 @@ Where  is one of the following:
        CONFIG_USBDEV_TRACE_NRECORDS=128        : Buffer 128 records in memory
        CONFIG_NSH_USBDEV_TRACE=n               : No builtin tracing from NSH
        CONFIG_NSH_ARCHINIT=y                   : Automatically start the USB monitor
-       CONFIG_SYSTEM_USBMONITOR=y              : Enable the USB monitor daemon
-       CONFIG_SYSTEM_USBMONITOR_STACKSIZE=2048 : USB monitor daemon stack size
-       CONFIG_SYSTEM_USBMONITOR_PRIORITY=50    : USB monitor daemon priority
-       CONFIG_SYSTEM_USBMONITOR_INTERVAL=2     : Dump trace data every 2 seconds
-
-       CONFIG_SYSTEM_USBMONITOR_TRACEINIT=y    : Enable TRACE output
-       CONFIG_SYSTEM_USBMONITOR_TRACECLASS=y
-       CONFIG_SYSTEM_USBMONITOR_TRACETRANSFERS=y
-       CONFIG_SYSTEM_USBMONITOR_TRACECONTROLLER=y
-       CONFIG_SYSTEM_USBMONITOR_TRACEINTERRUPTS=y
+       CONFIG_USBMONITOR=y              : Enable the USB monitor daemon
+       CONFIG_USBMONITOR_STACKSIZE=2048 : USB monitor daemon stack size
+       CONFIG_USBMONITOR_PRIORITY=50    : USB monitor daemon priority
+       CONFIG_USBMONITOR_INTERVAL=2     : Dump trace data every 2 seconds
+
+       CONFIG_USBMONITOR_TRACEINIT=y    : Enable TRACE output
+       CONFIG_USBMONITOR_TRACECLASS=y
+       CONFIG_USBMONITOR_TRACETRANSFERS=y
+       CONFIG_USBMONITOR_TRACECONTROLLER=y
+       CONFIG_USBMONITOR_TRACEINTERRUPTS=y
 
 
     Using the Prolifics PL2303 Emulation
diff --git a/configs/hymini-stm32v/nsh2/defconfig b/configs/hymini-stm32v/nsh2/defconfig
index 3e00b1e478..826bd059a2 100644
--- a/configs/hymini-stm32v/nsh2/defconfig
+++ b/configs/hymini-stm32v/nsh2/defconfig
@@ -1426,7 +1426,7 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
-# CONFIG_SYSTEM_USBMONITOR is not set
+# CONFIG_USBMONITOR is not set
 CONFIG_SYSTEM_USBMSC=y
 CONFIG_SYSTEM_USBMSC_NLUNS=1
 CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
diff --git a/configs/maple/nsh/defconfig b/configs/maple/nsh/defconfig
index 63cc78c6e0..643f6bd638 100644
--- a/configs/maple/nsh/defconfig
+++ b/configs/maple/nsh/defconfig
@@ -1129,6 +1129,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
-# CONFIG_SYSTEM_USBMONITOR is not set
+# CONFIG_USBMONITOR is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/maple/nx/defconfig b/configs/maple/nx/defconfig
index 558ed3d218..1ba42c9fc0 100644
--- a/configs/maple/nx/defconfig
+++ b/configs/maple/nx/defconfig
@@ -1345,6 +1345,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
-# CONFIG_SYSTEM_USBMONITOR is not set
+# CONFIG_USBMONITOR is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/maple/usbnsh/defconfig b/configs/maple/usbnsh/defconfig
index 4729d5ca13..17283af76e 100644
--- a/configs/maple/usbnsh/defconfig
+++ b/configs/maple/usbnsh/defconfig
@@ -1166,6 +1166,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
-# CONFIG_SYSTEM_USBMONITOR is not set
+# CONFIG_USBMONITOR is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/mcu123-lpc214x/composite/defconfig b/configs/mcu123-lpc214x/composite/defconfig
index 6d83b3045b..1a279cc8bf 100644
--- a/configs/mcu123-lpc214x/composite/defconfig
+++ b/configs/mcu123-lpc214x/composite/defconfig
@@ -853,7 +853,7 @@ CONFIG_SYSTEM_COMPOSITE_BUFSIZE=256
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
-# CONFIG_SYSTEM_USBMONITOR is not set
+# CONFIG_USBMONITOR is not set
 # CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/mcu123-lpc214x/usbmsc/defconfig b/configs/mcu123-lpc214x/usbmsc/defconfig
index 6815a2fab6..1b5e5bd05d 100644
--- a/configs/mcu123-lpc214x/usbmsc/defconfig
+++ b/configs/mcu123-lpc214x/usbmsc/defconfig
@@ -800,7 +800,7 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
-# CONFIG_SYSTEM_USBMONITOR is not set
+# CONFIG_USBMONITOR is not set
 CONFIG_SYSTEM_USBMSC=y
 CONFIG_SYSTEM_USBMSC_NLUNS=1
 CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
diff --git a/configs/mikroe-stm32f4/README.txt b/configs/mikroe-stm32f4/README.txt
index ace80f20fb..ad0da7986f 100644
--- a/configs/mikroe-stm32f4/README.txt
+++ b/configs/mikroe-stm32f4/README.txt
@@ -925,16 +925,16 @@ Where  is one of the following:
        CONFIG_USBDEV_TRACE_NRECORDS=128        : Buffer 128 records in memory
        CONFIG_NSH_USBDEV_TRACE=n               : No builtin tracing from NSH
        CONFIG_NSH_ARCHINIT=y                   : Automatically start the USB monitor
-       CONFIG_SYSTEM_USBMONITOR=y              : Enable the USB monitor daemon
-       CONFIG_SYSTEM_USBMONITOR_STACKSIZE=2048 : USB monitor daemon stack size
-       CONFIG_SYSTEM_USBMONITOR_PRIORITY=50    : USB monitor daemon priority
-       CONFIG_SYSTEM_USBMONITOR_INTERVAL=2     : Dump trace data every 2 seconds
-
-       CONFIG_SYSTEM_USBMONITOR_TRACEINIT=y    : Enable TRACE output
-       CONFIG_SYSTEM_USBMONITOR_TRACECLASS=y
-       CONFIG_SYSTEM_USBMONITOR_TRACETRANSFERS=y
-       CONFIG_SYSTEM_USBMONITOR_TRACECONTROLLER=y
-       CONFIG_SYSTEM_USBMONITOR_TRACEINTERRUPTS=y
+       CONFIG_USBMONITOR=y              : Enable the USB monitor daemon
+       CONFIG_USBMONITOR_STACKSIZE=2048 : USB monitor daemon stack size
+       CONFIG_USBMONITOR_PRIORITY=50    : USB monitor daemon priority
+       CONFIG_USBMONITOR_INTERVAL=2     : Dump trace data every 2 seconds
+
+       CONFIG_USBMONITOR_TRACEINIT=y    : Enable TRACE output
+       CONFIG_USBMONITOR_TRACECLASS=y
+       CONFIG_USBMONITOR_TRACETRANSFERS=y
+       CONFIG_USBMONITOR_TRACECONTROLLER=y
+       CONFIG_USBMONITOR_TRACEINTERRUPTS=y
 
     5. By default, this project assumes that you are *NOT* using the DFU
        bootloader.
diff --git a/configs/mikroe-stm32f4/src/stm32_appinit.c b/configs/mikroe-stm32f4/src/stm32_appinit.c
index 9970d6927b..9555caa482 100644
--- a/configs/mikroe-stm32f4/src/stm32_appinit.c
+++ b/configs/mikroe-stm32f4/src/stm32_appinit.c
@@ -55,7 +55,7 @@
 #  include 
 #endif
 
-#ifdef CONFIG_SYSTEM_USBMONITOR
+#ifdef CONFIG_USBMONITOR
 #  include 
 #endif
 
@@ -110,7 +110,7 @@
 
 /* Check if we should enable the USB monitor before starting NSH */
 
-#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_SYSTEM_USBMONITOR)
+#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_USBMONITOR)
 #  undef HAVE_USBMONITOR
 #endif
 
diff --git a/configs/olimex-lpc-h3131/README.txt b/configs/olimex-lpc-h3131/README.txt
index 61d5b0416b..f262ff93c7 100644
--- a/configs/olimex-lpc-h3131/README.txt
+++ b/configs/olimex-lpc-h3131/README.txt
@@ -827,8 +827,8 @@ Configurations
            CONFIG_USBHOST_TRACE_VERBOSE=y
 
          Application Configuration -> System Add-Ons
-           CONFIG_SYSTEM_USBMONITOR=y
-           CONFIG_SYSTEM_USBMONITOR_INTERVAL=1
+           CONFIG_USBMONITOR=y
+           CONFIG_USBMONITOR_INTERVAL=1
 
        NOTE:  I have found that if you enable USB DEBUG and/or USB tracing,
        the resulting image requires to much memory to execute out of
diff --git a/configs/olimex-lpc-h3131/src/lpc31_appinit.c b/configs/olimex-lpc-h3131/src/lpc31_appinit.c
index 551a2d9bb6..0f5d825da5 100644
--- a/configs/olimex-lpc-h3131/src/lpc31_appinit.c
+++ b/configs/olimex-lpc-h3131/src/lpc31_appinit.c
@@ -46,7 +46,7 @@
 
 #include 
 
-#ifdef CONFIG_SYSTEM_USBMONITOR
+#ifdef CONFIG_USBMONITOR
 #  include 
 #endif
 
diff --git a/configs/olimex-lpc-h3131/src/lpc_h3131.h b/configs/olimex-lpc-h3131/src/lpc_h3131.h
index 895b5ca596..8285b7e051 100644
--- a/configs/olimex-lpc-h3131/src/lpc_h3131.h
+++ b/configs/olimex-lpc-h3131/src/lpc_h3131.h
@@ -82,7 +82,7 @@
 #  undef CONFIG_USBHOST_TRACE
 #endif
 
-#if !defined(CONFIG_SYSTEM_USBMONITOR) || !defined(CONFIG_USBHOST_TRACE)
+#if !defined(CONFIG_USBMONITOR) || !defined(CONFIG_USBHOST_TRACE)
 #  undef HAVE_USBMONITOR
 #endif
 
diff --git a/configs/olimex-stm32-e407/src/olimex-stm32-e407.h b/configs/olimex-stm32-e407/src/olimex-stm32-e407.h
index 2c4a751abd..3294e189e4 100644
--- a/configs/olimex-stm32-e407/src/olimex-stm32-e407.h
+++ b/configs/olimex-stm32-e407/src/olimex-stm32-e407.h
@@ -84,7 +84,7 @@
 
 /* Check if we should enable the USB monitor before starting NSH */
 
-#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_SYSTEM_USBMONITOR)
+#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_USBMONITOR)
 #  undef HAVE_USBMONITOR
 #endif
 
diff --git a/configs/olimex-stm32-e407/src/stm32_appinit.c b/configs/olimex-stm32-e407/src/stm32_appinit.c
index 40a0cbf7ed..c4a53bb817 100644
--- a/configs/olimex-stm32-e407/src/stm32_appinit.c
+++ b/configs/olimex-stm32-e407/src/stm32_appinit.c
@@ -46,7 +46,7 @@
 
 #include 
 
-#ifdef CONFIG_SYSTEM_USBMONITOR
+#ifdef CONFIG_USBMONITOR
 #  include 
 #endif
 
@@ -91,7 +91,7 @@
 
 /* Check if we should enable the USB monitor before starting NSH */
 
-#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_SYSTEM_USBMONITOR)
+#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_USBMONITOR)
 #  undef HAVE_USBMONITOR
 #endif
 
diff --git a/configs/olimex-stm32-h405/src/stm32_appinit.c b/configs/olimex-stm32-h405/src/stm32_appinit.c
index 776b5ffa5c..57a5902a97 100644
--- a/configs/olimex-stm32-h405/src/stm32_appinit.c
+++ b/configs/olimex-stm32-h405/src/stm32_appinit.c
@@ -46,7 +46,7 @@
 
 #include 
 
-#ifdef CONFIG_SYSTEM_USBMONITOR
+#ifdef CONFIG_USBMONITOR
 #  include 
 #endif
 
diff --git a/configs/olimex-stm32-h407/src/olimex-stm32-h407.h b/configs/olimex-stm32-h407/src/olimex-stm32-h407.h
index 766ddb9c7b..6687ef897a 100644
--- a/configs/olimex-stm32-h407/src/olimex-stm32-h407.h
+++ b/configs/olimex-stm32-h407/src/olimex-stm32-h407.h
@@ -78,7 +78,7 @@
 
 /* Check if we should enable the USB monitor before starting NSH */
 
-#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_SYSTEM_USBMONITOR)
+#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_USBMONITOR)
 #  undef HAVE_USBMONITOR
 #endif
 
diff --git a/configs/olimex-stm32-h407/src/stm32_appinit.c b/configs/olimex-stm32-h407/src/stm32_appinit.c
index 6f0cd2dd64..ffbf9cecc9 100644
--- a/configs/olimex-stm32-h407/src/stm32_appinit.c
+++ b/configs/olimex-stm32-h407/src/stm32_appinit.c
@@ -46,7 +46,7 @@
 
 #include 
 
-#ifdef CONFIG_SYSTEM_USBMONITOR
+#ifdef CONFIG_USBMONITOR
 #  include 
 #endif
 
diff --git a/configs/olimex-stm32-h407/src/stm32_bringup.c b/configs/olimex-stm32-h407/src/stm32_bringup.c
index 9c683a1158..687d7e1872 100644
--- a/configs/olimex-stm32-h407/src/stm32_bringup.c
+++ b/configs/olimex-stm32-h407/src/stm32_bringup.c
@@ -46,7 +46,7 @@
 
 #include 
 
-#ifdef CONFIG_SYSTEM_USBMONITOR
+#ifdef CONFIG_USBMONITOR
 #  include 
 #endif
 
diff --git a/configs/olimex-stm32-p207/src/stm32_appinit.c b/configs/olimex-stm32-p207/src/stm32_appinit.c
index 695cc0607b..f59f6454b6 100644
--- a/configs/olimex-stm32-p207/src/stm32_appinit.c
+++ b/configs/olimex-stm32-p207/src/stm32_appinit.c
@@ -46,7 +46,7 @@
 
 #include 
 
-#ifdef CONFIG_SYSTEM_USBMONITOR
+#ifdef CONFIG_USBMONITOR
 #  include 
 #endif
 
@@ -90,7 +90,7 @@
 
 /* Check if we should enable the USB monitor before starting NSH */
 
-#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_SYSTEM_USBMONITOR)
+#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_USBMONITOR)
 #  undef HAVE_USBMONITOR
 #endif
 
diff --git a/configs/olimexino-stm32/src/stm32_appinit.c b/configs/olimexino-stm32/src/stm32_appinit.c
index e9cd7fe0b4..9b01c2f2b0 100644
--- a/configs/olimexino-stm32/src/stm32_appinit.c
+++ b/configs/olimexino-stm32/src/stm32_appinit.c
@@ -49,7 +49,7 @@
 #include 
 #include 
 
-#ifdef CONFIG_SYSTEM_USBMONITOR
+#ifdef CONFIG_USBMONITOR
 #  include 
 #endif
 
diff --git a/configs/sam4e-ek/README.txt b/configs/sam4e-ek/README.txt
index 6de1817b01..5f04cb5db4 100644
--- a/configs/sam4e-ek/README.txt
+++ b/configs/sam4e-ek/README.txt
@@ -837,15 +837,15 @@ USB Full-Speed Device
       CONFIG_NSH_ARCHINIT=y                   : Automatically start the USB monitor
 
     Application Configuration -> System NSH Add-Ons:
-      CONFIG_SYSTEM_USBMONITOR=y              : Enable the USB monitor daemon
-      CONFIG_SYSTEM_USBMONITOR_STACKSIZE=2048 : USB monitor daemon stack size
-      CONFIG_SYSTEM_USBMONITOR_PRIORITY=50    : USB monitor daemon priority
-      CONFIG_SYSTEM_USBMONITOR_INTERVAL=1     : Dump trace data every second
-      CONFIG_SYSTEM_USBMONITOR_TRACEINIT=y    : Enable TRACE output
-      CONFIG_SYSTEM_USBMONITOR_TRACECLASS=y
-      CONFIG_SYSTEM_USBMONITOR_TRACETRANSFERS=y
-      CONFIG_SYSTEM_USBMONITOR_TRACECONTROLLER=y
-      CONFIG_SYSTEM_USBMONITOR_TRACEINTERRUPTS=y
+      CONFIG_USBMONITOR=y              : Enable the USB monitor daemon
+      CONFIG_USBMONITOR_STACKSIZE=2048 : USB monitor daemon stack size
+      CONFIG_USBMONITOR_PRIORITY=50    : USB monitor daemon priority
+      CONFIG_USBMONITOR_INTERVAL=1     : Dump trace data every second
+      CONFIG_USBMONITOR_TRACEINIT=y    : Enable TRACE output
+      CONFIG_USBMONITOR_TRACECLASS=y
+      CONFIG_USBMONITOR_TRACETRANSFERS=y
+      CONFIG_USBMONITOR_TRACECONTROLLER=y
+      CONFIG_USBMONITOR_TRACEINTERRUPTS=y
 
   NOTE: If USB debug output is also enabled, both outputs will appear on the
   serial console.  However, the debug output will be asynchronous with the
diff --git a/configs/sam4e-ek/src/sam4e-ek.h b/configs/sam4e-ek/src/sam4e-ek.h
index 1b11b47c6f..591b90be1f 100644
--- a/configs/sam4e-ek/src/sam4e-ek.h
+++ b/configs/sam4e-ek/src/sam4e-ek.h
@@ -130,7 +130,7 @@
 #  undef CONFIG_USBDEV_TRACE
 #endif
 
-#if !defined(CONFIG_SYSTEM_USBMONITOR) || !defined(CONFIG_USBDEV_TRACE)
+#if !defined(CONFIG_USBMONITOR) || !defined(CONFIG_USBDEV_TRACE)
 #  undef HAVE_USBMONITOR
 #endif
 
diff --git a/configs/sam4e-ek/src/sam_appinit.c b/configs/sam4e-ek/src/sam_appinit.c
index 6eef612187..bc8b2b1a8f 100644
--- a/configs/sam4e-ek/src/sam_appinit.c
+++ b/configs/sam4e-ek/src/sam_appinit.c
@@ -48,7 +48,7 @@
 
 #include 
 
-#ifdef CONFIG_SYSTEM_USBMONITOR
+#ifdef CONFIG_USBMONITOR
 #  include 
 #endif
 
diff --git a/configs/sam4s-xplained-pro/src/sam4s-xplained-pro.h b/configs/sam4s-xplained-pro/src/sam4s-xplained-pro.h
index 791be9c596..081e8f73f2 100644
--- a/configs/sam4s-xplained-pro/src/sam4s-xplained-pro.h
+++ b/configs/sam4s-xplained-pro/src/sam4s-xplained-pro.h
@@ -106,7 +106,7 @@
 #  undef CONFIG_USBDEV_TRACE
 #endif
 
-#if !defined(CONFIG_SYSTEM_USBMONITOR) && !defined(CONFIG_USBDEV_TRACE)
+#if !defined(CONFIG_USBMONITOR) && !defined(CONFIG_USBDEV_TRACE)
 #  undef HAVE_USBMONITOR
 #endif
 
diff --git a/configs/sam4s-xplained-pro/src/sam_appinit.c b/configs/sam4s-xplained-pro/src/sam_appinit.c
index 7e0d3c3d08..8996207425 100644
--- a/configs/sam4s-xplained-pro/src/sam_appinit.c
+++ b/configs/sam4s-xplained-pro/src/sam_appinit.c
@@ -63,7 +63,7 @@
 #  include 
 #endif
 
-#ifdef CONFIG_SYSTEM_USBMONITOR
+#ifdef CONFIG_USBMONITOR
 #  include 
 #endif
 
diff --git a/configs/sama5d3-xplained/README.txt b/configs/sama5d3-xplained/README.txt
index 336008da1e..89610babed 100644
--- a/configs/sama5d3-xplained/README.txt
+++ b/configs/sama5d3-xplained/README.txt
@@ -1374,15 +1374,15 @@ USB High-Speed Device
       CONFIG_NSH_ARCHINIT=y                   : Automatically start the USB monitor
 
     Application Configuration -> System NSH Add-Ons:
-      CONFIG_SYSTEM_USBMONITOR=y              : Enable the USB monitor daemon
-      CONFIG_SYSTEM_USBMONITOR_STACKSIZE=2048 : USB monitor daemon stack size
-      CONFIG_SYSTEM_USBMONITOR_PRIORITY=50    : USB monitor daemon priority
-      CONFIG_SYSTEM_USBMONITOR_INTERVAL=1     : Dump trace data every second
-      CONFIG_SYSTEM_USBMONITOR_TRACEINIT=y    : Enable TRACE output
-      CONFIG_SYSTEM_USBMONITOR_TRACECLASS=y
-      CONFIG_SYSTEM_USBMONITOR_TRACETRANSFERS=y
-      CONFIG_SYSTEM_USBMONITOR_TRACECONTROLLER=y
-      CONFIG_SYSTEM_USBMONITOR_TRACEINTERRUPTS=y
+      CONFIG_USBMONITOR=y              : Enable the USB monitor daemon
+      CONFIG_USBMONITOR_STACKSIZE=2048 : USB monitor daemon stack size
+      CONFIG_USBMONITOR_PRIORITY=50    : USB monitor daemon priority
+      CONFIG_USBMONITOR_INTERVAL=1     : Dump trace data every second
+      CONFIG_USBMONITOR_TRACEINIT=y    : Enable TRACE output
+      CONFIG_USBMONITOR_TRACECLASS=y
+      CONFIG_USBMONITOR_TRACETRANSFERS=y
+      CONFIG_USBMONITOR_TRACECONTROLLER=y
+      CONFIG_USBMONITOR_TRACEINTERRUPTS=y
 
   NOTE: If USB debug output is also enabled, both outputs will appear on the
   serial console.  However, the debug output will be asynchronous with the
@@ -1568,10 +1568,10 @@ file1: CONFIG_USBHOST_ISOC_DISABLE=y
       CONFIG_NSH_ARCHINIT=y                   : Automatically start the USB monitor
 
     Application Configuration -> System NSH Add-Ons:
-      CONFIG_SYSTEM_USBMONITOR=y              : Enable the USB monitor daemon
-      CONFIG_SYSTEM_USBMONITOR_STACKSIZE=2048 : USB monitor daemon stack size
-      CONFIG_SYSTEM_USBMONITOR_PRIORITY=50    : USB monitor daemon priority
-      CONFIG_SYSTEM_USBMONITOR_INTERVAL=1     : Dump trace data every second
+      CONFIG_USBMONITOR=y              : Enable the USB monitor daemon
+      CONFIG_USBMONITOR_STACKSIZE=2048 : USB monitor daemon stack size
+      CONFIG_USBMONITOR_PRIORITY=50    : USB monitor daemon priority
+      CONFIG_USBMONITOR_INTERVAL=1     : Dump trace data every second
 
   NOTE: If USB debug output is also enabled, both outpus will appear on the
   serial console.  However, the debug output will be asynchronous with the
diff --git a/configs/sama5d3-xplained/src/sam_appinit.c b/configs/sama5d3-xplained/src/sam_appinit.c
index cfee95be1f..71ee50f95f 100644
--- a/configs/sama5d3-xplained/src/sam_appinit.c
+++ b/configs/sama5d3-xplained/src/sam_appinit.c
@@ -48,7 +48,7 @@
 
 #include 
 
-#ifdef CONFIG_SYSTEM_USBMONITOR
+#ifdef CONFIG_USBMONITOR
 #  include 
 #endif
 
diff --git a/configs/sama5d3-xplained/src/sama5d3-xplained.h b/configs/sama5d3-xplained/src/sama5d3-xplained.h
index 9b4c56b93d..66e1231a4c 100644
--- a/configs/sama5d3-xplained/src/sama5d3-xplained.h
+++ b/configs/sama5d3-xplained/src/sama5d3-xplained.h
@@ -237,7 +237,7 @@
 
 /* Check if we should enable the USB monitor before starting NSH */
 
-#ifndef CONFIG_SYSTEM_USBMONITOR
+#ifndef CONFIG_USBMONITOR
 #  undef HAVE_USBMONITOR
 #endif
 
diff --git a/configs/sama5d3x-ek/README.txt b/configs/sama5d3x-ek/README.txt
index f6601d2653..73d3ef0b94 100644
--- a/configs/sama5d3x-ek/README.txt
+++ b/configs/sama5d3x-ek/README.txt
@@ -1552,15 +1552,15 @@ USB High-Speed Device
       CONFIG_NSH_ARCHINIT=y                   : Automatically start the USB monitor
 
     Application Configuration -> System NSH Add-Ons:
-      CONFIG_SYSTEM_USBMONITOR=y              : Enable the USB monitor daemon
-      CONFIG_SYSTEM_USBMONITOR_STACKSIZE=2048 : USB monitor daemon stack size
-      CONFIG_SYSTEM_USBMONITOR_PRIORITY=50    : USB monitor daemon priority
-      CONFIG_SYSTEM_USBMONITOR_INTERVAL=1     : Dump trace data every second
-      CONFIG_SYSTEM_USBMONITOR_TRACEINIT=y    : Enable TRACE output
-      CONFIG_SYSTEM_USBMONITOR_TRACECLASS=y
-      CONFIG_SYSTEM_USBMONITOR_TRACETRANSFERS=y
-      CONFIG_SYSTEM_USBMONITOR_TRACECONTROLLER=y
-      CONFIG_SYSTEM_USBMONITOR_TRACEINTERRUPTS=y
+      CONFIG_USBMONITOR=y              : Enable the USB monitor daemon
+      CONFIG_USBMONITOR_STACKSIZE=2048 : USB monitor daemon stack size
+      CONFIG_USBMONITOR_PRIORITY=50    : USB monitor daemon priority
+      CONFIG_USBMONITOR_INTERVAL=1     : Dump trace data every second
+      CONFIG_USBMONITOR_TRACEINIT=y    : Enable TRACE output
+      CONFIG_USBMONITOR_TRACECLASS=y
+      CONFIG_USBMONITOR_TRACETRANSFERS=y
+      CONFIG_USBMONITOR_TRACECONTROLLER=y
+      CONFIG_USBMONITOR_TRACEINTERRUPTS=y
 
   NOTE: If USB debug output is also enabled, both outputs will appear on the
   serial console.  However, the debug output will be asynchronous with the
@@ -1736,10 +1736,10 @@ USB High-Speed Host
       CONFIG_NSH_ARCHINIT=y                   : Automatically start the USB monitor
 
     Application Configuration -> System NSH Add-Ons:
-      CONFIG_SYSTEM_USBMONITOR=y              : Enable the USB monitor daemon
-      CONFIG_SYSTEM_USBMONITOR_STACKSIZE=2048 : USB monitor daemon stack size
-      CONFIG_SYSTEM_USBMONITOR_PRIORITY=50    : USB monitor daemon priority
-      CONFIG_SYSTEM_USBMONITOR_INTERVAL=1     : Dump trace data every second
+      CONFIG_USBMONITOR=y              : Enable the USB monitor daemon
+      CONFIG_USBMONITOR_STACKSIZE=2048 : USB monitor daemon stack size
+      CONFIG_USBMONITOR_PRIORITY=50    : USB monitor daemon priority
+      CONFIG_USBMONITOR_INTERVAL=1     : Dump trace data every second
 
   NOTE: If USB debug output is also enabled, both outpus will appear on the
   serial console.  However, the debug output will be asynchronous with the
diff --git a/configs/sama5d3x-ek/src/sam_appinit.c b/configs/sama5d3x-ek/src/sam_appinit.c
index 9f4fff0f73..18344746a8 100644
--- a/configs/sama5d3x-ek/src/sam_appinit.c
+++ b/configs/sama5d3x-ek/src/sam_appinit.c
@@ -48,7 +48,7 @@
 
 #include 
 
-#ifdef CONFIG_SYSTEM_USBMONITOR
+#ifdef CONFIG_USBMONITOR
 #  include 
 #endif
 
diff --git a/configs/sama5d3x-ek/src/sama5d3x-ek.h b/configs/sama5d3x-ek/src/sama5d3x-ek.h
index 403412a71c..6521211395 100644
--- a/configs/sama5d3x-ek/src/sama5d3x-ek.h
+++ b/configs/sama5d3x-ek/src/sama5d3x-ek.h
@@ -297,7 +297,7 @@
 
 /* Check if we should enable the USB monitor before starting NSH */
 
-#ifndef CONFIG_SYSTEM_USBMONITOR
+#ifndef CONFIG_USBMONITOR
 #  undef HAVE_USBMONITOR
 #endif
 
diff --git a/configs/sama5d4-ek/README.txt b/configs/sama5d4-ek/README.txt
index ee5408b0d0..eec9b59510 100644
--- a/configs/sama5d4-ek/README.txt
+++ b/configs/sama5d4-ek/README.txt
@@ -1928,15 +1928,15 @@ USB High-Speed Device
       CONFIG_NSH_ARCHINIT=y                   : Automatically start the USB monitor
 
     Application Configuration -> System NSH Add-Ons:
-      CONFIG_SYSTEM_USBMONITOR=y              : Enable the USB monitor daemon
-      CONFIG_SYSTEM_USBMONITOR_STACKSIZE=2048 : USB monitor daemon stack size
-      CONFIG_SYSTEM_USBMONITOR_PRIORITY=50    : USB monitor daemon priority
-      CONFIG_SYSTEM_USBMONITOR_INTERVAL=1     : Dump trace data every second
-      CONFIG_SYSTEM_USBMONITOR_TRACEINIT=y    : Enable TRACE output
-      CONFIG_SYSTEM_USBMONITOR_TRACECLASS=y
-      CONFIG_SYSTEM_USBMONITOR_TRACETRANSFERS=y
-      CONFIG_SYSTEM_USBMONITOR_TRACECONTROLLER=y
-      CONFIG_SYSTEM_USBMONITOR_TRACEINTERRUPTS=y
+      CONFIG_USBMONITOR=y              : Enable the USB monitor daemon
+      CONFIG_USBMONITOR_STACKSIZE=2048 : USB monitor daemon stack size
+      CONFIG_USBMONITOR_PRIORITY=50    : USB monitor daemon priority
+      CONFIG_USBMONITOR_INTERVAL=1     : Dump trace data every second
+      CONFIG_USBMONITOR_TRACEINIT=y    : Enable TRACE output
+      CONFIG_USBMONITOR_TRACECLASS=y
+      CONFIG_USBMONITOR_TRACETRANSFERS=y
+      CONFIG_USBMONITOR_TRACECONTROLLER=y
+      CONFIG_USBMONITOR_TRACEINTERRUPTS=y
 
   NOTE: If USB debug output is also enabled, both outputs will appear on the
   serial console.  However, the debug output will be asynchronous with the
@@ -2120,10 +2120,10 @@ USB High-Speed Host
       CONFIG_NSH_ARCHINIT=y                   : Automatically start the USB monitor
 
     Application Configuration -> System NSH Add-Ons:
-      CONFIG_SYSTEM_USBMONITOR=y              : Enable the USB monitor daemon
-      CONFIG_SYSTEM_USBMONITOR_STACKSIZE=2048 : USB monitor daemon stack size
-      CONFIG_SYSTEM_USBMONITOR_PRIORITY=50    : USB monitor daemon priority
-      CONFIG_SYSTEM_USBMONITOR_INTERVAL=1     : Dump trace data every second
+      CONFIG_USBMONITOR=y              : Enable the USB monitor daemon
+      CONFIG_USBMONITOR_STACKSIZE=2048 : USB monitor daemon stack size
+      CONFIG_USBMONITOR_PRIORITY=50    : USB monitor daemon priority
+      CONFIG_USBMONITOR_INTERVAL=1     : Dump trace data every second
 
   NOTE: If USB debug output is also enabled, both outpus will appear on the
   serial console.  However, the debug output will be asynchronous with the
diff --git a/configs/sama5d4-ek/src/sam_bringup.c b/configs/sama5d4-ek/src/sam_bringup.c
index bc32caa210..d5b78e608c 100644
--- a/configs/sama5d4-ek/src/sam_bringup.c
+++ b/configs/sama5d4-ek/src/sam_bringup.c
@@ -46,7 +46,7 @@
 #include 
 #include 
 
-#ifdef CONFIG_SYSTEM_USBMONITOR
+#ifdef CONFIG_USBMONITOR
 #  include 
 #endif
 
diff --git a/configs/sama5d4-ek/src/sama5d4-ek.h b/configs/sama5d4-ek/src/sama5d4-ek.h
index de3dac7cb9..ed7ff6bd2b 100644
--- a/configs/sama5d4-ek/src/sama5d4-ek.h
+++ b/configs/sama5d4-ek/src/sama5d4-ek.h
@@ -352,7 +352,7 @@
 
 /* Check if we should enable the USB monitor before starting NSH */
 
-#ifndef CONFIG_SYSTEM_USBMONITOR
+#ifndef CONFIG_USBMONITOR
 #  undef HAVE_USBMONITOR
 #endif
 
diff --git a/configs/same70-xplained/src/sam_bringup.c b/configs/same70-xplained/src/sam_bringup.c
index 759811328e..8c89b0989e 100644
--- a/configs/same70-xplained/src/sam_bringup.c
+++ b/configs/same70-xplained/src/sam_bringup.c
@@ -46,7 +46,7 @@
 #include 
 #include 
 
-#ifdef CONFIG_SYSTEM_USBMONITOR
+#ifdef CONFIG_USBMONITOR
 #  include 
 #endif
 
diff --git a/configs/same70-xplained/src/same70-xplained.h b/configs/same70-xplained/src/same70-xplained.h
index db003b48ce..838e0668c1 100644
--- a/configs/same70-xplained/src/same70-xplained.h
+++ b/configs/same70-xplained/src/same70-xplained.h
@@ -157,7 +157,7 @@
 #  undef CONFIG_USBDEV_TRACE
 #endif
 
-#if !defined(CONFIG_SYSTEM_USBMONITOR) || !defined(CONFIG_USBDEV_TRACE)
+#if !defined(CONFIG_USBMONITOR) || !defined(CONFIG_USBDEV_TRACE)
 #  undef HAVE_USBMONITOR
 #endif
 
diff --git a/configs/samv71-xult/src/sam_bringup.c b/configs/samv71-xult/src/sam_bringup.c
index b6a3337972..c984b46763 100644
--- a/configs/samv71-xult/src/sam_bringup.c
+++ b/configs/samv71-xult/src/sam_bringup.c
@@ -46,7 +46,7 @@
 #include 
 #include 
 
-#ifdef CONFIG_SYSTEM_USBMONITOR
+#ifdef CONFIG_USBMONITOR
 #  include 
 #endif
 
diff --git a/configs/samv71-xult/src/samv71-xult.h b/configs/samv71-xult/src/samv71-xult.h
index 08394c5c81..3ce8ed2673 100644
--- a/configs/samv71-xult/src/samv71-xult.h
+++ b/configs/samv71-xult/src/samv71-xult.h
@@ -166,7 +166,7 @@
 #  undef CONFIG_USBDEV_TRACE
 #endif
 
-#if !defined(CONFIG_SYSTEM_USBMONITOR) || !defined(CONFIG_USBDEV_TRACE)
+#if !defined(CONFIG_USBMONITOR) || !defined(CONFIG_USBDEV_TRACE)
 #  undef HAVE_USBMONITOR
 #endif
 
diff --git a/configs/spark/composite/defconfig b/configs/spark/composite/defconfig
index 41d30670c1..ebae43436a 100644
--- a/configs/spark/composite/defconfig
+++ b/configs/spark/composite/defconfig
@@ -1305,7 +1305,7 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
-# CONFIG_SYSTEM_USBMONITOR is not set
+# CONFIG_USBMONITOR is not set
 # CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/spark/nsh/defconfig b/configs/spark/nsh/defconfig
index 7f11b68191..d9a47e30fe 100644
--- a/configs/spark/nsh/defconfig
+++ b/configs/spark/nsh/defconfig
@@ -1291,7 +1291,7 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
-# CONFIG_SYSTEM_USBMONITOR is not set
+# CONFIG_USBMONITOR is not set
 # CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/spark/src/stm32_appinit.c b/configs/spark/src/stm32_appinit.c
index ebb3518af7..213d15726f 100644
--- a/configs/spark/src/stm32_appinit.c
+++ b/configs/spark/src/stm32_appinit.c
@@ -54,7 +54,7 @@
 #  include 
 #endif
 
-#ifdef CONFIG_SYSTEM_USBMONITOR
+#ifdef CONFIG_USBMONITOR
 #  include 
 #endif
 
@@ -112,7 +112,7 @@
 
 /* Check if we should enable the USB monitor before starting NSH */
 
-#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_SYSTEM_USBMONITOR)
+#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_USBMONITOR)
 #  undef HAVE_USBMONITOR
 #endif
 
diff --git a/configs/spark/src/stm32_composite.c b/configs/spark/src/stm32_composite.c
index e38c769e64..0e36df9a6a 100644
--- a/configs/spark/src/stm32_composite.c
+++ b/configs/spark/src/stm32_composite.c
@@ -54,7 +54,7 @@
 #  include 
 #endif
 
-#ifdef CONFIG_SYSTEM_USBMONITOR
+#ifdef CONFIG_USBMONITOR
 #  include 
 #endif
 
@@ -112,7 +112,7 @@
 
 /* Check if we should enable the USB monitor before starting NSH */
 
-#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_SYSTEM_USBMONITOR)
+#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_USBMONITOR)
 #  undef HAVE_USBMONITOR
 #endif
 
diff --git a/configs/spark/usbmsc/defconfig b/configs/spark/usbmsc/defconfig
index 62739204b3..4f991586f5 100644
--- a/configs/spark/usbmsc/defconfig
+++ b/configs/spark/usbmsc/defconfig
@@ -1253,7 +1253,7 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
-# CONFIG_SYSTEM_USBMONITOR is not set
+# CONFIG_USBMONITOR is not set
 CONFIG_SYSTEM_USBMSC=y
 CONFIG_SYSTEM_USBMSC_NLUNS=1
 CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
diff --git a/configs/spark/usbnsh/defconfig b/configs/spark/usbnsh/defconfig
index f4f917398e..5a07b8ca54 100644
--- a/configs/spark/usbnsh/defconfig
+++ b/configs/spark/usbnsh/defconfig
@@ -1236,6 +1236,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
-# CONFIG_SYSTEM_USBMONITOR is not set
+# CONFIG_USBMONITOR is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/spark/usbserial/defconfig b/configs/spark/usbserial/defconfig
index ef18937031..4f8ad4de4b 100644
--- a/configs/spark/usbserial/defconfig
+++ b/configs/spark/usbserial/defconfig
@@ -1169,6 +1169,6 @@ CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=y
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
-# CONFIG_SYSTEM_USBMONITOR is not set
+# CONFIG_USBMONITOR is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm32_tiny/README.txt b/configs/stm32_tiny/README.txt
index 29a8cbb43f..7abbc4ccb0 100644
--- a/configs/stm32_tiny/README.txt
+++ b/configs/stm32_tiny/README.txt
@@ -624,7 +624,7 @@ Where  is one of the following:
           infinite loops and deadlocks:  Debug output generates USB debug
           output which generatates USB debug output, etc.  If you want USB
           debug output, you should consider enabling USB trace
-          (CONFIG_USBDEV_TRACE) and perhaps the USB monitor (CONFIG_SYSTEM_USBMONITOR).
+          (CONFIG_USBDEV_TRACE) and perhaps the USB monitor (CONFIG_USBMONITOR).
 
           See the usbnsh configuration below for more information on configuring
           USB trace output and the USB monitor.
@@ -674,16 +674,16 @@ Where  is one of the following:
        CONFIG_USBDEV_TRACE_NRECORDS=128        : Buffer 128 records in memory
        CONFIG_NSH_USBDEV_TRACE=n               : No builtin tracing from NSH
        CONFIG_NSH_ARCHINIT=y                   : Automatically start the USB monitor
-       CONFIG_SYSTEM_USBMONITOR=y              : Enable the USB monitor daemon
-       CONFIG_SYSTEM_USBMONITOR_STACKSIZE=2048 : USB monitor daemon stack size
-       CONFIG_SYSTEM_USBMONITOR_PRIORITY=50    : USB monitor daemon priority
-       CONFIG_SYSTEM_USBMONITOR_INTERVAL=2     : Dump trace data every 2 seconds
-
-       CONFIG_SYSTEM_USBMONITOR_TRACEINIT=y    : Enable TRACE output
-       CONFIG_SYSTEM_USBMONITOR_TRACECLASS=y
-       CONFIG_SYSTEM_USBMONITOR_TRACETRANSFERS=y
-       CONFIG_SYSTEM_USBMONITOR_TRACECONTROLLER=y
-       CONFIG_SYSTEM_USBMONITOR_TRACEINTERRUPTS=y
+       CONFIG_USBMONITOR=y              : Enable the USB monitor daemon
+       CONFIG_USBMONITOR_STACKSIZE=2048 : USB monitor daemon stack size
+       CONFIG_USBMONITOR_PRIORITY=50    : USB monitor daemon priority
+       CONFIG_USBMONITOR_INTERVAL=2     : Dump trace data every 2 seconds
+
+       CONFIG_USBMONITOR_TRACEINIT=y    : Enable TRACE output
+       CONFIG_USBMONITOR_TRACECLASS=y
+       CONFIG_USBMONITOR_TRACETRANSFERS=y
+       CONFIG_USBMONITOR_TRACECONTROLLER=y
+       CONFIG_USBMONITOR_TRACEINTERRUPTS=y
 
     5. By default, this project assumes that you are *NOT* using the DFU
        bootloader.
diff --git a/configs/stm32_tiny/usbnsh/defconfig b/configs/stm32_tiny/usbnsh/defconfig
index 66e45a74a9..d5d2102a02 100644
--- a/configs/stm32_tiny/usbnsh/defconfig
+++ b/configs/stm32_tiny/usbnsh/defconfig
@@ -1154,6 +1154,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
-# CONFIG_SYSTEM_USBMONITOR is not set
+# CONFIG_USBMONITOR is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm32f103-minimum/README.txt b/configs/stm32f103-minimum/README.txt
index edd0fc92e1..942f0458d6 100644
--- a/configs/stm32f103-minimum/README.txt
+++ b/configs/stm32f103-minimum/README.txt
@@ -607,16 +607,16 @@ Where  is one of the following:
        CONFIG_USBDEV_TRACE_NRECORDS=128        : Buffer 128 records in memory
        CONFIG_NSH_USBDEV_TRACE=n               : No builtin tracing from NSH
        CONFIG_NSH_ARCHINIT=y                   : Automatically start the USB monitor
-       CONFIG_SYSTEM_USBMONITOR=y              : Enable the USB monitor daemon
-       CONFIG_SYSTEM_USBMONITOR_STACKSIZE=2048 : USB monitor daemon stack size
-       CONFIG_SYSTEM_USBMONITOR_PRIORITY=50    : USB monitor daemon priority
-       CONFIG_SYSTEM_USBMONITOR_INTERVAL=2     : Dump trace data every 2 seconds
-
-       CONFIG_SYSTEM_USBMONITOR_TRACEINIT=y    : Enable TRACE output
-       CONFIG_SYSTEM_USBMONITOR_TRACECLASS=y
-       CONFIG_SYSTEM_USBMONITOR_TRACETRANSFERS=y
-       CONFIG_SYSTEM_USBMONITOR_TRACECONTROLLER=y
-       CONFIG_SYSTEM_USBMONITOR_TRACEINTERRUPTS=y
+       CONFIG_USBMONITOR=y              : Enable the USB monitor daemon
+       CONFIG_USBMONITOR_STACKSIZE=2048 : USB monitor daemon stack size
+       CONFIG_USBMONITOR_PRIORITY=50    : USB monitor daemon priority
+       CONFIG_USBMONITOR_INTERVAL=2     : Dump trace data every 2 seconds
+
+       CONFIG_USBMONITOR_TRACEINIT=y    : Enable TRACE output
+       CONFIG_USBMONITOR_TRACECLASS=y
+       CONFIG_USBMONITOR_TRACETRANSFERS=y
+       CONFIG_USBMONITOR_TRACECONTROLLER=y
+       CONFIG_USBMONITOR_TRACEINTERRUPTS=y
 
     5. By default, this project assumes that you are *NOT* using the DFU
        bootloader.
diff --git a/configs/stm32f103-minimum/usbnsh/defconfig b/configs/stm32f103-minimum/usbnsh/defconfig
index 701dab067e..b60882cbdb 100644
--- a/configs/stm32f103-minimum/usbnsh/defconfig
+++ b/configs/stm32f103-minimum/usbnsh/defconfig
@@ -1154,6 +1154,6 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_SUDOKU is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
-# CONFIG_SYSTEM_USBMONITOR is not set
+# CONFIG_USBMONITOR is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm32f3discovery/README.txt b/configs/stm32f3discovery/README.txt
index 64eb13ba18..8cb94aa2f7 100644
--- a/configs/stm32f3discovery/README.txt
+++ b/configs/stm32f3discovery/README.txt
@@ -806,15 +806,15 @@ Where  is one of the following:
           CONFIG_NSH_ARCHINIT=y                   : Automatically start the USB monitor
 
         Application Configuration -> System NSH Add-Ons:
-          CONFIG_SYSTEM_USBMONITOR=y              : Enable the USB monitor daemon
-          CONFIG_SYSTEM_USBMONITOR_STACKSIZE=2048 : USB monitor daemon stack size
-          CONFIG_SYSTEM_USBMONITOR_PRIORITY=50    : USB monitor daemon priority
-          CONFIG_SYSTEM_USBMONITOR_INTERVAL=1     : Dump trace data every second
-          CONFIG_SYSTEM_USBMONITOR_TRACEINIT=y    : Enable TRACE output
-          CONFIG_SYSTEM_USBMONITOR_TRACECLASS=y
-          CONFIG_SYSTEM_USBMONITOR_TRACETRANSFERS=y
-          CONFIG_SYSTEM_USBMONITOR_TRACECONTROLLER=y
-          CONFIG_SYSTEM_USBMONITOR_TRACEINTERRUPTS=y
+          CONFIG_USBMONITOR=y              : Enable the USB monitor daemon
+          CONFIG_USBMONITOR_STACKSIZE=2048 : USB monitor daemon stack size
+          CONFIG_USBMONITOR_PRIORITY=50    : USB monitor daemon priority
+          CONFIG_USBMONITOR_INTERVAL=1     : Dump trace data every second
+          CONFIG_USBMONITOR_TRACEINIT=y    : Enable TRACE output
+          CONFIG_USBMONITOR_TRACECLASS=y
+          CONFIG_USBMONITOR_TRACETRANSFERS=y
+          CONFIG_USBMONITOR_TRACECONTROLLER=y
+          CONFIG_USBMONITOR_TRACEINTERRUPTS=y
 
        NOTE: USB debug output also be enabled in this case.  Both will appear
        on the serial SYSLOG output.  However, the debug output will be
diff --git a/configs/stm32f3discovery/src/stm32_appinit.c b/configs/stm32f3discovery/src/stm32_appinit.c
index 3d23db6296..a865d6fd9c 100644
--- a/configs/stm32f3discovery/src/stm32_appinit.c
+++ b/configs/stm32f3discovery/src/stm32_appinit.c
@@ -46,7 +46,7 @@
 
 #include 
 
-#ifdef CONFIG_SYSTEM_USBMONITOR
+#ifdef CONFIG_USBMONITOR
 #  include 
 #endif
 
@@ -80,7 +80,7 @@
 
 /* Check if we should enable the USB monitor before starting NSH */
 
-#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_SYSTEM_USBMONITOR)
+#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_USBMONITOR)
 #  undef HAVE_USBMONITOR
 #endif
 
diff --git a/configs/stm32f429i-disco/README.txt b/configs/stm32f429i-disco/README.txt
index d14134e068..5cbb0acfca 100644
--- a/configs/stm32f429i-disco/README.txt
+++ b/configs/stm32f429i-disco/README.txt
@@ -733,7 +733,7 @@ Where  is one of the following:
           infinite loops and deadlocks:  Debug output generates USB debug
           output which generatates USB debug output, etc.  If you want USB
           debug output, you should consider enabling USB trace
-          (CONFIG_USBDEV_TRACE) and perhaps the USB monitor (CONFIG_SYSTEM_USBMONITOR).
+          (CONFIG_USBDEV_TRACE) and perhaps the USB monitor (CONFIG_USBMONITOR).
 
           See the usbnsh configuration below for more information on configuring
           USB trace output and the USB monitor.
diff --git a/configs/stm32f429i-disco/src/stm32_appinit.c b/configs/stm32f429i-disco/src/stm32_appinit.c
index c7f1d4fb76..ad2f7826fe 100644
--- a/configs/stm32f429i-disco/src/stm32_appinit.c
+++ b/configs/stm32f429i-disco/src/stm32_appinit.c
@@ -55,7 +55,7 @@
 #  include 
 #endif
 
-#ifdef CONFIG_SYSTEM_USBMONITOR
+#ifdef CONFIG_USBMONITOR
 #  include 
 #endif
 
@@ -109,7 +109,7 @@
 
 /* Check if we should enable the USB monitor before starting NSH */
 
-#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_SYSTEM_USBMONITOR)
+#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_USBMONITOR)
 #  undef HAVE_USBMONITOR
 #endif
 
diff --git a/configs/stm32f4discovery/README.txt b/configs/stm32f4discovery/README.txt
index e0c912d164..430f78c913 100644
--- a/configs/stm32f4discovery/README.txt
+++ b/configs/stm32f4discovery/README.txt
@@ -1659,7 +1659,7 @@ Where  is one of the following:
           infinite loops and deadlocks:  Debug output generates USB debug
           output which generatates USB debug output, etc.  If you want USB
           debug output, you should consider enabling USB trace
-          (CONFIG_USBDEV_TRACE) and perhaps the USB monitor (CONFIG_SYSTEM_USBMONITOR).
+          (CONFIG_USBDEV_TRACE) and perhaps the USB monitor (CONFIG_USBMONITOR).
 
           See the usbnsh configuration below for more information on configuring
           USB trace output and the USB monitor.
@@ -2002,16 +2002,16 @@ Where  is one of the following:
        CONFIG_USBDEV_TRACE_NRECORDS=128        : Buffer 128 records in memory
        CONFIG_NSH_USBDEV_TRACE=n               : No builtin tracing from NSH
        CONFIG_NSH_ARCHINIT=y                   : Automatically start the USB monitor
-       CONFIG_SYSTEM_USBMONITOR=y              : Enable the USB monitor daemon
-       CONFIG_SYSTEM_USBMONITOR_STACKSIZE=2048 : USB monitor daemon stack size
-       CONFIG_SYSTEM_USBMONITOR_PRIORITY=50    : USB monitor daemon priority
-       CONFIG_SYSTEM_USBMONITOR_INTERVAL=2     : Dump trace data every 2 seconds
-
-       CONFIG_SYSTEM_USBMONITOR_TRACEINIT=y    : Enable TRACE output
-       CONFIG_SYSTEM_USBMONITOR_TRACECLASS=y
-       CONFIG_SYSTEM_USBMONITOR_TRACETRANSFERS=y
-       CONFIG_SYSTEM_USBMONITOR_TRACECONTROLLER=y
-       CONFIG_SYSTEM_USBMONITOR_TRACEINTERRUPTS=y
+       CONFIG_USBMONITOR=y              : Enable the USB monitor daemon
+       CONFIG_USBMONITOR_STACKSIZE=2048 : USB monitor daemon stack size
+       CONFIG_USBMONITOR_PRIORITY=50    : USB monitor daemon priority
+       CONFIG_USBMONITOR_INTERVAL=2     : Dump trace data every 2 seconds
+
+       CONFIG_USBMONITOR_TRACEINIT=y    : Enable TRACE output
+       CONFIG_USBMONITOR_TRACECLASS=y
+       CONFIG_USBMONITOR_TRACETRANSFERS=y
+       CONFIG_USBMONITOR_TRACECONTROLLER=y
+       CONFIG_USBMONITOR_TRACEINTERRUPTS=y
 
     5. By default, this project assumes that you are *NOT* using the DFU
        bootloader.
diff --git a/configs/stm32f4discovery/src/stm32_bringup.c b/configs/stm32f4discovery/src/stm32_bringup.c
index d958042ebd..d924dc8e1e 100644
--- a/configs/stm32f4discovery/src/stm32_bringup.c
+++ b/configs/stm32f4discovery/src/stm32_bringup.c
@@ -45,7 +45,7 @@
 #include 
 #include 
 
-#ifdef CONFIG_SYSTEM_USBMONITOR
+#ifdef CONFIG_USBMONITOR
 #  include 
 #endif
 
diff --git a/configs/stm32f4discovery/src/stm32f4discovery.h b/configs/stm32f4discovery/src/stm32f4discovery.h
index 3d3400920b..bc2f7f98bd 100644
--- a/configs/stm32f4discovery/src/stm32f4discovery.h
+++ b/configs/stm32f4discovery/src/stm32f4discovery.h
@@ -98,7 +98,7 @@
 
 /* Check if we should enable the USB monitor before starting NSH */
 
-#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_SYSTEM_USBMONITOR)
+#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_USBMONITOR)
 #  undef HAVE_USBMONITOR
 #endif
 
diff --git a/configs/sure-pic32mx/README.txt b/configs/sure-pic32mx/README.txt
index da415a9805..07c89ad9d3 100644
--- a/configs/sure-pic32mx/README.txt
+++ b/configs/sure-pic32mx/README.txt
@@ -882,15 +882,15 @@ Where  is one of the following:
           CONFIG_NSH_ARCHINIT=y                   : Automatically start the USB monitor
 
         Application Configuration -> System NSH Add-Ons:
-          CONFIG_SYSTEM_USBMONITOR=y              : Enable the USB monitor daemon
-          CONFIG_SYSTEM_USBMONITOR_STACKSIZE=2048 : USB monitor daemon stack size
-          CONFIG_SYSTEM_USBMONITOR_PRIORITY=50    : USB monitor daemon priority
-          CONFIG_SYSTEM_USBMONITOR_INTERVAL=1     : Dump trace data every second
-          CONFIG_SYSTEM_USBMONITOR_TRACEINIT=y    : Enable TRACE output
-          CONFIG_SYSTEM_USBMONITOR_TRACECLASS=y
-          CONFIG_SYSTEM_USBMONITOR_TRACETRANSFERS=y
-          CONFIG_SYSTEM_USBMONITOR_TRACECONTROLLER=y
-          CONFIG_SYSTEM_USBMONITOR_TRACEINTERRUPTS=y
+          CONFIG_USBMONITOR=y              : Enable the USB monitor daemon
+          CONFIG_USBMONITOR_STACKSIZE=2048 : USB monitor daemon stack size
+          CONFIG_USBMONITOR_PRIORITY=50    : USB monitor daemon priority
+          CONFIG_USBMONITOR_INTERVAL=1     : Dump trace data every second
+          CONFIG_USBMONITOR_TRACEINIT=y    : Enable TRACE output
+          CONFIG_USBMONITOR_TRACECLASS=y
+          CONFIG_USBMONITOR_TRACETRANSFERS=y
+          CONFIG_USBMONITOR_TRACECONTROLLER=y
+          CONFIG_USBMONITOR_TRACEINTERRUPTS=y
 
        NOTE: USB debug output also be enabled in this case.  Both will appear
        on the serial SYSLOG output.  However, the debug output will be
diff --git a/configs/sure-pic32mx/src/pic32mx_appinit.c b/configs/sure-pic32mx/src/pic32mx_appinit.c
index ef09c7641c..22425adac4 100644
--- a/configs/sure-pic32mx/src/pic32mx_appinit.c
+++ b/configs/sure-pic32mx/src/pic32mx_appinit.c
@@ -51,7 +51,7 @@
 #include 
 #include 
 
-#ifdef CONFIG_SYSTEM_USBMONITOR
+#ifdef CONFIG_USBMONITOR
 #  include 
 #endif
 
@@ -152,7 +152,7 @@
 
 /* Check if we should enable the USB monitor before starting NSH */
 
-#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_SYSTEM_USBMONITOR)
+#if !defined(CONFIG_USBDEV_TRACE) || !defined(CONFIG_USBMONITOR)
 #  undef NSH_HAVE_USBMONITOR
 #endif
 
diff --git a/configs/teensy-3.x/usbnsh/defconfig b/configs/teensy-3.x/usbnsh/defconfig
index ed6662a776..d214df33c5 100644
--- a/configs/teensy-3.x/usbnsh/defconfig
+++ b/configs/teensy-3.x/usbnsh/defconfig
@@ -956,14 +956,14 @@ CONFIG_READLINE_CMD_HISTORY_LINELEN=80
 CONFIG_READLINE_CMD_HISTORY_LEN=16
 # CONFIG_SYSTEM_SUDOKU is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
-CONFIG_SYSTEM_USBMONITOR=y
-CONFIG_SYSTEM_USBMONITOR_STACKSIZE=2048
-CONFIG_SYSTEM_USBMONITOR_PRIORITY=50
-CONFIG_SYSTEM_USBMONITOR_INTERVAL=2
-CONFIG_SYSTEM_USBMONITOR_TRACEINIT=y
-CONFIG_SYSTEM_USBMONITOR_TRACECLASS=y
-CONFIG_SYSTEM_USBMONITOR_TRACETRANSFERS=y
-CONFIG_SYSTEM_USBMONITOR_TRACECONTROLLER=y
-CONFIG_SYSTEM_USBMONITOR_TRACEINTERRUPTS=y
+CONFIG_USBMONITOR=y
+CONFIG_USBMONITOR_STACKSIZE=2048
+CONFIG_USBMONITOR_PRIORITY=50
+CONFIG_USBMONITOR_INTERVAL=2
+CONFIG_USBMONITOR_TRACEINIT=y
+CONFIG_USBMONITOR_TRACECLASS=y
+CONFIG_USBMONITOR_TRACETRANSFERS=y
+CONFIG_USBMONITOR_TRACECONTROLLER=y
+CONFIG_USBMONITOR_TRACEINTERRUPTS=y
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 011850d6c9..26f9f36a6f 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -515,6 +515,20 @@ if USBHOST
 source drivers/usbhost/Kconfig
 endif # USBHOST
 
+menuconfig USBMONITOR
+	bool "USB Monitor"
+	default n
+	depends on (USBDEV && USBDEV_TRACE) || (USBHOST && USBHOST_TRACE)
+	---help---
+		If USB device tracing (USBDEV_TRACE) AND/OR USB host tracing
+		(USBHOST_TRACE) are enabled then this option will select the USB
+		monitor.  The USB monitor is a daemon that will periodically collect
+		the buffered USB trace data and dump it to the SYSLOG device.
+
+if USBMONITOR
+source drivers/usbmonitor/Kconfig
+endif
+
 menuconfig DRIVERS_WIRELESS
 	bool "Wireless Device Support"
 	default n
diff --git a/drivers/spi/Make.defs b/drivers/spi/Make.defs
index 9581a2736f..43e5654faa 100644
--- a/drivers/spi/Make.defs
+++ b/drivers/spi/Make.defs
@@ -49,4 +49,3 @@ DEPPATH += --dep-path spi
 VPATH += :spi
 CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)spi}
 endif
-
diff --git a/drivers/usbmonitor/Kconfig b/drivers/usbmonitor/Kconfig
new file mode 100644
index 0000000000..e35c47e490
--- /dev/null
+++ b/drivers/usbmonitor/Kconfig
@@ -0,0 +1,58 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+
+config USBMONITOR_STACKSIZE
+	int "USB Monitor daemon stack size"
+	default 2048
+	---help---
+		The stack size to use the the USB monitor daemon.  Default: 2048
+
+config USBMONITOR_PRIORITY
+	int "USB Monitor daemon priority"
+	default 50
+	---help---
+		The priority to use the the USB monitor daemon.  Default: 50
+
+config USBMONITOR_INTERVAL
+	int "USB Monitor dump frequency"
+	default 2
+	---help---
+		The rate in seconds that the USB monitor will wait before dumping
+		the next set of buffered USB trace data.  Default:  2 seconds.
+
+if USBDEV && USBDEV_TRACE
+
+config USBMONITOR_TRACEINIT
+	bool "Show USB device initialization events"
+	default n
+	---help---
+		Show initialization events
+
+config USBMONITOR_TRACECLASS
+	bool "Show USB device class driver events"
+	default n
+	---help---
+		Show class driver events
+
+config USBMONITOR_TRACETRANSFERS
+	bool "Show USB device data transfer events"
+	default n
+	---help---
+		Show data transfer events
+
+config USBMONITOR_TRACECONTROLLER
+	bool "Show USB device controller events"
+	default n
+	---help---
+		Show controller events
+
+config USBMONITOR_TRACEINTERRUPTS
+	bool "Show USB device interrupt-related events"
+	default n
+	---help---
+		Show interrupt-related events
+
+endif # USBDEV && USBDEV_TRACE
diff --git a/drivers/usbmonitor/Make.defs b/drivers/usbmonitor/Make.defs
new file mode 100644
index 0000000000..3c80ad6c4b
--- /dev/null
+++ b/drivers/usbmonitor/Make.defs
@@ -0,0 +1,51 @@
+############################################################################
+# drivers/usbmonitor/Make.defs
+#
+#   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.
+#
+############################################################################
+
+# Don't build anything if there is no USB monitor support
+
+ifeq ($(CONFIG_USBMONITOR),y)
+
+# Include the USB monitor
+
+CSRCS += usbmonitor.c
+
+# Include USB monitor build support
+
+DEPPATH += --dep-path usbmonitor
+VPATH += :usbmonitor
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)usbmonitor}
+
+endif
+
diff --git a/drivers/usbmonitor/usbmonitor.c b/drivers/usbmonitor/usbmonitor.c
new file mode 100644
index 0000000000..d0339f4e3e
--- /dev/null
+++ b/drivers/usbmonitor/usbmonitor.c
@@ -0,0 +1,264 @@
+/****************************************************************************
+ * drivers/usbmonitor/usbmonitor.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 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+
+#ifdef CONFIG_USBMONITOR
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Configuration ************************************************************/
+
+#ifndef CONFIG_USBMONITOR_STACKSIZE
+#  define CONFIG_USBMONITOR_STACKSIZE 2048
+#endif
+
+#ifndef CONFIG_USBMONITOR_PRIORITY
+#  define CONFIG_USBMONITOR_PRIORITY 50
+#endif
+
+#ifndef CONFIG_USBMONITOR_INTERVAL
+#  define CONFIG_USBMONITOR_INTERVAL 2
+#endif
+
+/* USB device trace selection */
+
+#ifdef CONFIG_USBDEV_TRACE
+#  ifdef CONFIG_USBMONITOR_TRACEINIT
+#    define TRACE_INIT_BITS       (TRACE_INIT_BIT)
+#  else
+#    define TRACE_INIT_BITS       (0)
+#  endif
+
+#  define TRACE_ERROR_BITS        (TRACE_DEVERROR_BIT|TRACE_CLSERROR_BIT)
+
+#  ifdef CONFIG_USBMONITOR_TRACECLASS
+#    define TRACE_CLASS_BITS      (TRACE_CLASS_BIT|TRACE_CLASSAPI_BIT|\
+                                   TRACE_CLASSSTATE_BIT)
+#  else
+#    define TRACE_CLASS_BITS      (0)
+#  endif
+
+#  ifdef CONFIG_USBMONITOR_TRACETRANSFERS
+#    define TRACE_TRANSFER_BITS   (TRACE_OUTREQQUEUED_BIT|TRACE_INREQQUEUED_BIT|\
+                                   TRACE_READ_BIT|TRACE_WRITE_BIT|\
+                                   TRACE_COMPLETE_BIT)
+#  else
+#    define TRACE_TRANSFER_BITS   (0)
+#  endif
+
+#  ifdef CONFIG_USBMONITOR_TRACECONTROLLER
+#    define TRACE_CONTROLLER_BITS (TRACE_EP_BIT|TRACE_DEV_BIT)
+#  else
+#    define TRACE_CONTROLLER_BITS (0)
+#  endif
+
+#  ifdef CONFIG_USBMONITOR_TRACEINTERRUPTS
+#    define TRACE_INTERRUPT_BITS  (TRACE_INTENTRY_BIT|TRACE_INTDECODE_BIT|\
+                                   TRACE_INTEXIT_BIT)
+#  else
+#    define TRACE_INTERRUPT_BITS  (0)
+#  endif
+
+#  define TRACE_BITSET            (TRACE_INIT_BITS|TRACE_ERROR_BITS|\
+                                   TRACE_CLASS_BITS|TRACE_TRANSFER_BITS|\
+                                   TRACE_CONTROLLER_BITS|TRACE_INTERRUPT_BITS)
+#endif
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct usbmon_state_s
+{
+  volatile bool started;
+  volatile bool stop;
+  pid_t pid;
+};
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static struct usbmon_state_s g_usbmonitor;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+#ifdef CONFIG_USBDEV_TRACE
+static int usbtrace_syslog(FAR const char *fmt, ...)
+{
+  va_list ap;
+  int ret;
+
+  /* Let vsyslog do the real work */
+
+  va_start(ap, fmt);
+  ret = vsyslog(LOG_INFO, fmt, ap);
+  va_end(ap);
+  return ret;
+}
+
+static int usbmonitor_tracecallback(struct usbtrace_s *trace, void *arg)
+{
+  usbtrace_trprintf(usbtrace_syslog, trace->event, trace->value);
+  return 0;
+}
+#endif
+
+static int usbmonitor_daemon(int argc, char **argv)
+{
+  uinfo("Running: %d\n", g_usbmonitor.pid);
+
+  /* Loop until we detect that there is a request to stop. */
+
+  while (!g_usbmonitor.stop)
+    {
+      sleep(CONFIG_USBMONITOR_INTERVAL);
+#ifdef CONFIG_USBDEV_TRACE
+      (void)usbtrace_enumerate(usbmonitor_tracecallback, NULL);
+#endif
+#ifdef CONFIG_USBHOST_TRACE
+      (void)usbhost_trdump();
+#endif
+    }
+
+  /* Stopped */
+
+  g_usbmonitor.stop    = false;
+  g_usbmonitor.started = false;
+  uinfo("Stopped: %d\n", g_usbmonitor.pid);
+
+  return 0;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int usbmonitor_start(int argc, char **argv)
+{
+  /* Has the monitor already started? */
+
+  sched_lock();
+  if (!g_usbmonitor.started)
+    {
+      int ret;
+
+      /* No.. start it now */
+
+#ifdef CONFIG_USBDEV_TRACE
+      /* First, initialize any USB tracing options that were requested */
+
+      usbtrace_enable(TRACE_BITSET);
+#endif
+
+      /* Then start the USB monitoring daemon */
+
+      g_usbmonitor.started = true;
+      g_usbmonitor.stop    = false;
+
+      ret = kernel_thread("USB Monitor", CONFIG_USBMONITOR_PRIORITY,
+                          CONFIG_USBMONITOR_STACKSIZE,
+                          (main_t)usbmonitor_daemon,
+                          (FAR char * const *)NULL);
+      if (ret < 0)
+        {
+          int errcode = errno;
+          uerr("ERROR: Failed to start the USB monitor: %d\n",
+               errcode);
+          UNUSED(errcode);
+        }
+      else
+        {
+          g_usbmonitor.pid = ret;
+          uinfo("Started: %d\n", g_usbmonitor.pid);
+        }
+
+      sched_unlock();
+      return 0;
+    }
+
+  sched_unlock();
+  uinfo("%s: %d\n",
+        g_usbmonitor.stop ? "Stopping" : "Running", g_usbmonitor.pid);
+  return 0;
+}
+
+int usbmonitor_stop(int argc, char **argv)
+{
+  /* Has the monitor already started? */
+
+  if (g_usbmonitor.started)
+    {
+      /* Stop the USB monitor.  The next time the monitor wakes up,
+       * it will see the the stop indication and will exist.
+       */
+
+      uinfo("Stopping: %d\n", g_usbmonitor.pid);
+      g_usbmonitor.stop = true;
+
+#ifdef CONFIG_USBDEV_TRACE
+      /* We may as well disable tracing since there is no listener */
+
+      usbtrace_enable(0);
+#endif
+    }
+
+  uinfo("Stopped: %d\n", g_usbmonitor.pid);
+  return 0;
+}
+
+#endif /* CONFIG_USBMONITOR */
-- 
GitLab


From a897fd4ccf21a5d97df9922f94f3928f1d565fc6 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Thu, 30 Jun 2016 13:09:22 -0600
Subject: [PATCH 114/229] Eliminate use of apps/system/usbmonitor.  Use
 drivers/usbmonitor instead.

---
 configs/mikroe-stm32f4/src/stm32_appinit.c    |  4 +-
 configs/olimex-lpc-h3131/src/lpc31_appinit.c  |  4 +-
 configs/olimex-stm32-e407/src/stm32_appinit.c |  4 +-
 configs/olimex-stm32-h405/src/stm32_appinit.c |  2 +-
 configs/olimex-stm32-h407/src/stm32_appinit.c |  2 +-
 configs/olimex-stm32-h407/src/stm32_bringup.c |  4 +-
 configs/olimex-stm32-p207/src/stm32_appinit.c |  4 +-
 configs/olimexino-stm32/src/stm32_appinit.c   |  2 +-
 configs/sam4e-ek/src/sam_appinit.c            |  4 +-
 configs/sam4s-xplained-pro/src/sam_appinit.c  |  4 +-
 configs/sama5d3-xplained/src/sam_appinit.c    |  4 +-
 configs/sama5d3x-ek/src/sam_appinit.c         |  4 +-
 configs/sama5d4-ek/src/sam_bringup.c          |  4 +-
 configs/same70-xplained/src/sam_bringup.c     |  4 +-
 configs/samv71-xult/src/sam_bringup.c         |  4 +-
 configs/spark/src/stm32_appinit.c             |  4 +-
 configs/spark/src/stm32_composite.c           |  4 +-
 configs/stm32f3discovery/src/stm32_appinit.c  |  4 +-
 configs/stm32f429i-disco/src/stm32_appinit.c  |  4 +-
 configs/stm32f4discovery/src/stm32_bringup.c  |  4 +-
 configs/sure-pic32mx/src/pic32mx_appinit.c    |  4 +-
 drivers/Kconfig                               |  8 +-
 drivers/Makefile                              |  1 +
 drivers/usbdev/Kconfig                        |  1 +
 drivers/usbhost/Kconfig                       |  1 +
 drivers/usbmonitor/usbmonitor.c               | 32 ++++++-
 include/nuttx/usb/usbmonitor.h                | 90 +++++++++++++++++++
 27 files changed, 168 insertions(+), 43 deletions(-)
 create mode 100644 include/nuttx/usb/usbmonitor.h

diff --git a/configs/mikroe-stm32f4/src/stm32_appinit.c b/configs/mikroe-stm32f4/src/stm32_appinit.c
index 9555caa482..7d43cf72ed 100644
--- a/configs/mikroe-stm32f4/src/stm32_appinit.c
+++ b/configs/mikroe-stm32f4/src/stm32_appinit.c
@@ -56,7 +56,7 @@
 #endif
 
 #ifdef CONFIG_USBMONITOR
-#  include 
+#  include 
 #endif
 
 #ifdef CONFIG_MIKROE_FLASH_CONFIG_PART
@@ -347,7 +347,7 @@ int board_app_initialize(uintptr_t arg)
 #ifdef HAVE_USBMONITOR
   /* Start the USB Monitor */
 
-  ret = usbmonitor_start(0, NULL);
+  ret = usbmonitor_start();
   if (ret != OK)
     {
       syslog(LOG_ERR, "ERROR: Failed to start USB monitor: %d\n", ret);
diff --git a/configs/olimex-lpc-h3131/src/lpc31_appinit.c b/configs/olimex-lpc-h3131/src/lpc31_appinit.c
index 0f5d825da5..0a40bb902c 100644
--- a/configs/olimex-lpc-h3131/src/lpc31_appinit.c
+++ b/configs/olimex-lpc-h3131/src/lpc31_appinit.c
@@ -47,7 +47,7 @@
 #include 
 
 #ifdef CONFIG_USBMONITOR
-#  include 
+#  include 
 #endif
 
 #include "lpc31.h"
@@ -137,7 +137,7 @@ int board_app_initialize(uintptr_t arg)
   /* Start the USB Monitor */
 
   syslog(LOG_ERR, "ERROR: Failed to start the USB monitor\n");
-  ret = usbmonitor_start(0, NULL);
+  ret = usbmonitor_start();
   if (ret != OK)
     {
       syslog(LOG_ERR, "ERROR: Failed to start USB monitor: %d\n", ret);
diff --git a/configs/olimex-stm32-e407/src/stm32_appinit.c b/configs/olimex-stm32-e407/src/stm32_appinit.c
index c4a53bb817..c7715a95b2 100644
--- a/configs/olimex-stm32-e407/src/stm32_appinit.c
+++ b/configs/olimex-stm32-e407/src/stm32_appinit.c
@@ -47,7 +47,7 @@
 #include 
 
 #ifdef CONFIG_USBMONITOR
-#  include 
+#  include 
 #endif
 
 #ifdef CONFIG_STM32_OTGFS
@@ -225,7 +225,7 @@ int board_app_initialize(uintptr_t arg)
 #ifdef HAVE_USBMONITOR
   /* Start the USB Monitor */
 
-  ret = usbmonitor_start(0, NULL);
+  ret = usbmonitor_start();
   if (ret != OK)
     {
       syslog(LOG_ERR, "ERROR: Failed to start USB monitor: %d\n", ret);
diff --git a/configs/olimex-stm32-h405/src/stm32_appinit.c b/configs/olimex-stm32-h405/src/stm32_appinit.c
index 57a5902a97..ed8b8fe846 100644
--- a/configs/olimex-stm32-h405/src/stm32_appinit.c
+++ b/configs/olimex-stm32-h405/src/stm32_appinit.c
@@ -47,7 +47,7 @@
 #include 
 
 #ifdef CONFIG_USBMONITOR
-#  include 
+#  include 
 #endif
 
 #ifdef CONFIG_STM32_OTGFS
diff --git a/configs/olimex-stm32-h407/src/stm32_appinit.c b/configs/olimex-stm32-h407/src/stm32_appinit.c
index ffbf9cecc9..d87ae0670a 100644
--- a/configs/olimex-stm32-h407/src/stm32_appinit.c
+++ b/configs/olimex-stm32-h407/src/stm32_appinit.c
@@ -47,7 +47,7 @@
 #include 
 
 #ifdef CONFIG_USBMONITOR
-#  include 
+#  include 
 #endif
 
 #ifdef CONFIG_STM32_OTGFS
diff --git a/configs/olimex-stm32-h407/src/stm32_bringup.c b/configs/olimex-stm32-h407/src/stm32_bringup.c
index 687d7e1872..73e29d5037 100644
--- a/configs/olimex-stm32-h407/src/stm32_bringup.c
+++ b/configs/olimex-stm32-h407/src/stm32_bringup.c
@@ -47,7 +47,7 @@
 #include 
 
 #ifdef CONFIG_USBMONITOR
-#  include 
+#  include 
 #endif
 
 #ifdef CONFIG_STM32_OTGFS
@@ -152,7 +152,7 @@ int stm32_bringup(void)
 #ifdef HAVE_USBMONITOR
   /* Start the USB Monitor */
 
-  ret = usbmonitor_start(0, NULL);
+  ret = usbmonitor_start();
   if (ret != OK)
     {
       syslog(LOG_ERR,
diff --git a/configs/olimex-stm32-p207/src/stm32_appinit.c b/configs/olimex-stm32-p207/src/stm32_appinit.c
index f59f6454b6..fa3fce23f2 100644
--- a/configs/olimex-stm32-p207/src/stm32_appinit.c
+++ b/configs/olimex-stm32-p207/src/stm32_appinit.c
@@ -47,7 +47,7 @@
 #include 
 
 #ifdef CONFIG_USBMONITOR
-#  include 
+#  include 
 #endif
 
 #ifdef CONFIG_STM32_OTGFS
@@ -172,7 +172,7 @@ int board_app_initialize(uintptr_t arg)
 #ifdef HAVE_USBMONITOR
   /* Start the USB Monitor */
 
-  ret = usbmonitor_start(0, NULL);
+  ret = usbmonitor_start();
   if (ret != OK)
     {
       syslog(LOG_ERR, "ERROR: Failed to start USB monitor: %d\n", ret);
diff --git a/configs/olimexino-stm32/src/stm32_appinit.c b/configs/olimexino-stm32/src/stm32_appinit.c
index 9b01c2f2b0..c0e50597f7 100644
--- a/configs/olimexino-stm32/src/stm32_appinit.c
+++ b/configs/olimexino-stm32/src/stm32_appinit.c
@@ -50,7 +50,7 @@
 #include 
 
 #ifdef CONFIG_USBMONITOR
-#  include 
+#  include 
 #endif
 
 #ifdef CONFIG_USBDEV
diff --git a/configs/sam4e-ek/src/sam_appinit.c b/configs/sam4e-ek/src/sam_appinit.c
index bc8b2b1a8f..aed2a31361 100644
--- a/configs/sam4e-ek/src/sam_appinit.c
+++ b/configs/sam4e-ek/src/sam_appinit.c
@@ -49,7 +49,7 @@
 #include 
 
 #ifdef CONFIG_USBMONITOR
-#  include 
+#  include 
 #endif
 
 #include "sam4e-ek.h"
@@ -118,7 +118,7 @@ int board_app_initialize(uintptr_t arg)
 #ifdef HAVE_USBMONITOR
   /* Start the USB Monitor */
 
-  ret = usbmonitor_start(0, NULL);
+  ret = usbmonitor_start();
   if (ret != OK)
     {
       syslog(LOG_ERR, "ERROR: Failed to start USB monitor: %d\n", ret);
diff --git a/configs/sam4s-xplained-pro/src/sam_appinit.c b/configs/sam4s-xplained-pro/src/sam_appinit.c
index 8996207425..7ac7f1587c 100644
--- a/configs/sam4s-xplained-pro/src/sam_appinit.c
+++ b/configs/sam4s-xplained-pro/src/sam_appinit.c
@@ -64,7 +64,7 @@
 #endif
 
 #ifdef CONFIG_USBMONITOR
-#  include 
+#  include 
 #endif
 
 #include "sam4s-xplained-pro.h"
@@ -169,7 +169,7 @@ int board_app_initialize(uintptr_t arg)
   /* Start the USB Monitor */
 
   syslog(LOG_INFO, "Starting USB Monitor\n");
-  ret = usbmonitor_start(0, NULL);
+  ret = usbmonitor_start();
   if (ret != OK)
     {
       syslog(LOG_ERR, "ERROR: Failed to start USB monitor: %d (%d)\n", ret, errno);
diff --git a/configs/sama5d3-xplained/src/sam_appinit.c b/configs/sama5d3-xplained/src/sam_appinit.c
index 71ee50f95f..34073c9f17 100644
--- a/configs/sama5d3-xplained/src/sam_appinit.c
+++ b/configs/sama5d3-xplained/src/sam_appinit.c
@@ -49,7 +49,7 @@
 #include 
 
 #ifdef CONFIG_USBMONITOR
-#  include 
+#  include 
 #endif
 
 #include "sama5d3-xplained.h"
@@ -155,7 +155,7 @@ int board_app_initialize(uintptr_t arg)
 #ifdef HAVE_USBMONITOR
   /* Start the USB Monitor */
 
-  ret = usbmonitor_start(0, NULL);
+  ret = usbmonitor_start();
   if (ret != OK)
     {
       syslog(LOG_ERR, "ERROR: Failed to start USB monitor: %d\n", ret);
diff --git a/configs/sama5d3x-ek/src/sam_appinit.c b/configs/sama5d3x-ek/src/sam_appinit.c
index 18344746a8..b3fb39f676 100644
--- a/configs/sama5d3x-ek/src/sam_appinit.c
+++ b/configs/sama5d3x-ek/src/sam_appinit.c
@@ -49,7 +49,7 @@
 #include 
 
 #ifdef CONFIG_USBMONITOR
-#  include 
+#  include 
 #endif
 
 #include "sama5d3x-ek.h"
@@ -170,7 +170,7 @@ int board_app_initialize(uintptr_t arg)
 #ifdef HAVE_USBMONITOR
   /* Start the USB Monitor */
 
-  ret = usbmonitor_start(0, NULL);
+  ret = usbmonitor_start();
   if (ret != OK)
     {
       syslog(LOG_ERR, "ERROR: Start USB monitor: %d\n", ret);
diff --git a/configs/sama5d4-ek/src/sam_bringup.c b/configs/sama5d4-ek/src/sam_bringup.c
index d5b78e608c..831dc06da7 100644
--- a/configs/sama5d4-ek/src/sam_bringup.c
+++ b/configs/sama5d4-ek/src/sam_bringup.c
@@ -47,7 +47,7 @@
 #include 
 
 #ifdef CONFIG_USBMONITOR
-#  include 
+#  include 
 #endif
 
 #include 
@@ -286,7 +286,7 @@ int sam_bringup(void)
 #ifdef HAVE_USBMONITOR
   /* Start the USB Monitor */
 
-  ret = usbmonitor_start(0, NULL);
+  ret = usbmonitor_start();
   if (ret != OK)
     {
       _err("ERROR: Failed to start the USB monitor: %d\n", ret);
diff --git a/configs/same70-xplained/src/sam_bringup.c b/configs/same70-xplained/src/sam_bringup.c
index 8c89b0989e..3ac5d20585 100644
--- a/configs/same70-xplained/src/sam_bringup.c
+++ b/configs/same70-xplained/src/sam_bringup.c
@@ -47,7 +47,7 @@
 #include 
 
 #ifdef CONFIG_USBMONITOR
-#  include 
+#  include 
 #endif
 
 #include 
@@ -311,7 +311,7 @@ int sam_bringup(void)
 #ifdef HAVE_USBMONITOR
   /* Start the USB Monitor */
 
-  ret = usbmonitor_start(0, NULL);
+  ret = usbmonitor_start();
   if (ret != OK)
     {
       _err("ERROR: Failed to start the USB monitor: %d\n", ret);
diff --git a/configs/samv71-xult/src/sam_bringup.c b/configs/samv71-xult/src/sam_bringup.c
index c984b46763..845e00df9a 100644
--- a/configs/samv71-xult/src/sam_bringup.c
+++ b/configs/samv71-xult/src/sam_bringup.c
@@ -47,7 +47,7 @@
 #include 
 
 #ifdef CONFIG_USBMONITOR
-#  include 
+#  include 
 #endif
 
 #include 
@@ -477,7 +477,7 @@ int sam_bringup(void)
 #ifdef HAVE_USBMONITOR
   /* Start the USB Monitor */
 
-  ret = usbmonitor_start(0, NULL);
+  ret = usbmonitor_start();
   if (ret != OK)
     {
       _err("ERROR: Failed to start the USB monitor: %d\n", ret);
diff --git a/configs/spark/src/stm32_appinit.c b/configs/spark/src/stm32_appinit.c
index 213d15726f..1b484caa48 100644
--- a/configs/spark/src/stm32_appinit.c
+++ b/configs/spark/src/stm32_appinit.c
@@ -55,7 +55,7 @@
 #endif
 
 #ifdef CONFIG_USBMONITOR
-#  include 
+#  include 
 #endif
 
 #ifdef CONFIG_USBDEV
@@ -305,7 +305,7 @@ int board_app_initialize(uintptr_t arg)
 
     /* Start the USB Monitor */
 
-    ret = usbmonitor_start(0, NULL);
+    ret = usbmonitor_start();
     if (ret != OK)
       {
         syslog(LOG_ERR, "ERROR: Failed to start USB monitor: %d\n", ret);
diff --git a/configs/spark/src/stm32_composite.c b/configs/spark/src/stm32_composite.c
index 0e36df9a6a..2c50a59a1f 100644
--- a/configs/spark/src/stm32_composite.c
+++ b/configs/spark/src/stm32_composite.c
@@ -55,7 +55,7 @@
 #endif
 
 #ifdef CONFIG_USBMONITOR
-#  include 
+#  include 
 #endif
 
 #ifdef CONFIG_USBDEV
@@ -269,7 +269,7 @@ static int stm32_composite_initialize(void)
 #ifdef HAVE_USBMONITOR
   /* Start the USB Monitor */
 
-  ret = usbmonitor_start(0, NULL);
+  ret = usbmonitor_start();
   if (ret != OK)
     {
       ferr("ERROR: Failed to start USB monitor: %d\n", ret);
diff --git a/configs/stm32f3discovery/src/stm32_appinit.c b/configs/stm32f3discovery/src/stm32_appinit.c
index a865d6fd9c..c95837c9c5 100644
--- a/configs/stm32f3discovery/src/stm32_appinit.c
+++ b/configs/stm32f3discovery/src/stm32_appinit.c
@@ -47,7 +47,7 @@
 #include 
 
 #ifdef CONFIG_USBMONITOR
-#  include 
+#  include 
 #endif
 
 #include "stm32.h"
@@ -120,7 +120,7 @@ int board_app_initialize(uintptr_t arg)
 
   /* Start the USB Monitor */
 
-  ret = usbmonitor_start(0, NULL);
+  ret = usbmonitor_start();
   if (ret != OK)
     {
       syslog(LOG_ERR, "ERROR: Failed to start USB monitor: %d\n", ret);
diff --git a/configs/stm32f429i-disco/src/stm32_appinit.c b/configs/stm32f429i-disco/src/stm32_appinit.c
index ad2f7826fe..415884fa5b 100644
--- a/configs/stm32f429i-disco/src/stm32_appinit.c
+++ b/configs/stm32f429i-disco/src/stm32_appinit.c
@@ -56,7 +56,7 @@
 #endif
 
 #ifdef CONFIG_USBMONITOR
-#  include 
+#  include 
 #endif
 
 #ifndef CONFIG_STM32F429I_DISCO_FLASH_MINOR
@@ -371,7 +371,7 @@ int board_app_initialize(uintptr_t arg)
 #ifdef HAVE_USBMONITOR
   /* Start the USB Monitor */
 
-  ret = usbmonitor_start(0, NULL);
+  ret = usbmonitor_start();
   if (ret != OK)
     {
       syslog(LOG_ERR, "ERROR: Failed to start USB monitor: %d\n", ret);
diff --git a/configs/stm32f4discovery/src/stm32_bringup.c b/configs/stm32f4discovery/src/stm32_bringup.c
index d924dc8e1e..a6aec33f85 100644
--- a/configs/stm32f4discovery/src/stm32_bringup.c
+++ b/configs/stm32f4discovery/src/stm32_bringup.c
@@ -46,7 +46,7 @@
 #include 
 
 #ifdef CONFIG_USBMONITOR
-#  include 
+#  include 
 #endif
 
 #include 
@@ -151,7 +151,7 @@ int stm32_bringup(void)
 #ifdef HAVE_USBMONITOR
   /* Start the USB Monitor */
 
-  ret = usbmonitor_start(0, NULL);
+  ret = usbmonitor_start();
   if (ret != OK)
     {
       uerr("ERROR: Failed to start USB monitor: %d\n", ret);
diff --git a/configs/sure-pic32mx/src/pic32mx_appinit.c b/configs/sure-pic32mx/src/pic32mx_appinit.c
index 22425adac4..ae36428317 100644
--- a/configs/sure-pic32mx/src/pic32mx_appinit.c
+++ b/configs/sure-pic32mx/src/pic32mx_appinit.c
@@ -52,7 +52,7 @@
 #include 
 
 #ifdef CONFIG_USBMONITOR
-#  include 
+#  include 
 #endif
 
 #include "pic32mx.h"
@@ -415,7 +415,7 @@ int board_app_initialize(uintptr_t arg)
     {
       /* Start the USB Monitor */
 
-      ret = usbmonitor_start(0, NULL);
+      ret = usbmonitor_start();
     }
 #endif
 
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 26f9f36a6f..bc506ee1e0 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -515,10 +515,14 @@ if USBHOST
 source drivers/usbhost/Kconfig
 endif # USBHOST
 
+config HAVE_USBTRACE
+	bool
+	default n
+
 menuconfig USBMONITOR
 	bool "USB Monitor"
 	default n
-	depends on (USBDEV && USBDEV_TRACE) || (USBHOST && USBHOST_TRACE)
+	depends on HAVE_USBTRACE
 	---help---
 		If USB device tracing (USBDEV_TRACE) AND/OR USB host tracing
 		(USBHOST_TRACE) are enabled then this option will select the USB
@@ -527,7 +531,7 @@ menuconfig USBMONITOR
 
 if USBMONITOR
 source drivers/usbmonitor/Kconfig
-endif
+endif # USBMONITOR
 
 menuconfig DRIVERS_WIRELESS
 	bool "Wireless Device Support"
diff --git a/drivers/Makefile b/drivers/Makefile
index 224cd78f6e..ff0a00b5b5 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -73,6 +73,7 @@ include syslog$(DELIM)Make.defs
 include timers$(DELIM)Make.defs
 include usbdev$(DELIM)Make.defs
 include usbhost$(DELIM)Make.defs
+include usbmonitor$(DELIM)Make.defs
 include video$(DELIM)Make.defs
 include wireless$(DELIM)Make.defs
 
diff --git a/drivers/usbdev/Kconfig b/drivers/usbdev/Kconfig
index efcf0def0b..f68b2be67f 100644
--- a/drivers/usbdev/Kconfig
+++ b/drivers/usbdev/Kconfig
@@ -91,6 +91,7 @@ config ARCH_USBDEV_STALLQUEUE
 menuconfig USBDEV_TRACE
 	bool "Enable USB tracing for debug"
 	default n
+	select HAVE_USBTRACE
 	---help---
 		Enables USB tracing for debug
 
diff --git a/drivers/usbhost/Kconfig b/drivers/usbhost/Kconfig
index 4e9c024c61..e876889690 100644
--- a/drivers/usbhost/Kconfig
+++ b/drivers/usbhost/Kconfig
@@ -508,6 +508,7 @@ endif # USBHOST_RTL8187
 config USBHOST_TRACE
 	bool "Enable USB HCD tracing for debug"
 	default n
+	select HAVE_USBTRACE
 	---help---
 		Enables USB tracing for debug.  Only supported for the HCD and,
 		further, no supported by all HCD implementations.
diff --git a/drivers/usbmonitor/usbmonitor.c b/drivers/usbmonitor/usbmonitor.c
index d0339f4e3e..22e34ed5e4 100644
--- a/drivers/usbmonitor/usbmonitor.c
+++ b/drivers/usbmonitor/usbmonitor.c
@@ -188,7 +188,21 @@ static int usbmonitor_daemon(int argc, char **argv)
  * Public Functions
  ****************************************************************************/
 
-int usbmonitor_start(int argc, char **argv)
+/****************************************************************************
+ * Name: usbmonitor_start
+ *
+ *   Start the USB monitor kernal daemon.
+ *
+ * Input Parameters:
+ *   None
+ *
+ * Returned values:
+ *   Zero (OK) is returned on success; a negated errno value is return on
+ *   any failure.
+ *
+ ****************************************************************************/
+
+int usbmonitor_start(void)
 {
   /* Has the monitor already started? */
 
@@ -237,7 +251,21 @@ int usbmonitor_start(int argc, char **argv)
   return 0;
 }
 
-int usbmonitor_stop(int argc, char **argv)
+/****************************************************************************
+ * Name: usbmonitor_stop
+ *
+ *   Stop the USB monitor kernel daemon.
+ *
+ * Input Parameters:
+ *   None
+ *
+ * Returned values:
+ *   Zero (OK) is returned on success; a negated errno value is return on
+ *   any failure.
+ *
+ ****************************************************************************/
+
+int usbmonitor_stop(void)
 {
   /* Has the monitor already started? */
 
diff --git a/include/nuttx/usb/usbmonitor.h b/include/nuttx/usb/usbmonitor.h
new file mode 100644
index 0000000000..d5be243e05
--- /dev/null
+++ b/include/nuttx/usb/usbmonitor.h
@@ -0,0 +1,90 @@
+/****************************************************************************
+ * include/nuttx/usb/usbmonitor.h
+ *
+ *   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.
+ *
+ ****************************************************************************/
+
+#ifndef __INCLUDE_NUTTX_USB_USBMONITOR_H
+#define __INCLUDE_NUTTX_USB_USBMONITOR_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include 
+
+#ifdef CONFIG_USBMONITOR
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+#ifdef __cplusplus
+#define EXTERN extern "C"
+extern "C"
+{
+#else
+#define EXTERN extern
+#endif
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: usbmonitor_start and usbmonitor_stop
+ *
+ *   Start and stop the USB monitor kernel deamon.
+ *
+ * Input Parameters:
+ *   None
+ *
+ * Returned values:
+ *   Zero (OK) is returned on success; a negated errno value is return on
+ *   any failure.
+ *
+ ****************************************************************************/
+
+int usbmonitor_start(void);
+int usbmonitor_stop(void);
+
+#undef EXTERN
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CONFIG_USBMONITOR */
+#endif /* __INCLUDE_NUTTX_USB_USBMONITOR_H */
-- 
GitLab


From 599c7963e83e67b03c5b02012d980a7e8f4a2716 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Thu, 30 Jun 2016 13:31:40 -0600
Subject: [PATCH 115/229] Took too much out of tools/mkconfig.c recently.

---
 tools/mkconfig.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tools/mkconfig.c b/tools/mkconfig.c
index 307e7381d5..579e29df00 100644
--- a/tools/mkconfig.c
+++ b/tools/mkconfig.c
@@ -132,7 +132,7 @@ int main(int argc, char **argv, char **envp)
   printf("#  define CONFIG_RR_INTERVAL 0\n");
   printf("#endif\n\n");
 
-  printf("/* The correct way to disable filesystem supuport is to set the number of\n");
+  printf("/* The correct way to disable filesystem support is to set the number of\n");
   printf(" * file descriptors to zero.\n");
   printf(" */\n\n");
   printf("#ifndef CONFIG_NFILE_DESCRIPTORS\n");
@@ -220,10 +220,18 @@ int main(int argc, char **argv, char **envp)
   printf("#  define CONFIG_DISABLE_MQUEUE 1\n");
   printf("#endif\n\n");
 
+  printf("/* The correct way to disable socket support is to set the number of\n");
+  printf(" * socket descriptors to zero.\n");
+  printf(" */\n\n");
+  printf("#ifndef CONFIG_NSOCKET_DESCRIPTORS\n");
+  printf("#  define CONFIG_NSOCKET_DESCRIPTORS 0\n");
+  printf("#endif\n\n");
+
   printf("/* There can be no network support with no socket descriptors */\n\n");
   printf("#if CONFIG_NSOCKET_DESCRIPTORS <= 0\n");
   printf("#  undef CONFIG_NET\n");
   printf("#endif\n\n");
+
   printf("/* Conversely, if there is no network support, there is no need for\n");
   printf(" * socket descriptors\n");
   printf(" */\n\n");
-- 
GitLab


From aa96a1d2ec0b91fef6f0c80b7f17297100a4adab Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Thu, 30 Jun 2016 15:40:37 -0600
Subject: [PATCH 116/229] Move the TZ/Olson zoneinfo data set from
 apps/system/zoneinfo to libc/zoneinfo

---
 Documentation/README.html      |   4 +-
 README.txt                     |   6 +-
 ReleaseNotes                   |   2 +-
 configs/sim/src/Makefile       |   4 +-
 configs/sim/src/sim.h          |   4 +-
 configs/sim/src/sim_bringup.c  |   2 +-
 configs/sim/src/sim_zoneinfo.c |  10 +-
 include/nuttx/zoneinfo.h       |  83 +++++++++++++++
 libc/Kconfig                   |  20 +++-
 libc/zoneinfo/.gitignore       |   2 +
 libc/zoneinfo/Make.defs        |  47 +++++++++
 libc/zoneinfo/README.txt       | 180 +++++++++++++++++++++++++++++++++
 libc/zoneinfo/tzromfs.c        |  51 ++++++++++
 13 files changed, 398 insertions(+), 17 deletions(-)
 create mode 100644 include/nuttx/zoneinfo.h
 create mode 100644 libc/zoneinfo/.gitignore
 create mode 100644 libc/zoneinfo/Make.defs
 create mode 100644 libc/zoneinfo/README.txt
 create mode 100644 libc/zoneinfo/tzromfs.c

diff --git a/Documentation/README.html b/Documentation/README.html
index 1c13c8abdd..fd9400b6b6 100644
--- a/Documentation/README.html
+++ b/Documentation/README.html
@@ -345,6 +345,7 @@ nuttx/
  |- lib/
  |   `- README.txt
  |- libc/
+ |   |- zoneinfo/README.txt
  |   `- README.txt
  |- libnx/
  |   `- README.txt
@@ -402,8 +403,7 @@ apps/
      |- nxplayer/README.txt
      |- symtab/README.txt
      |- usbmsc/README.txt
-     |- zmodem/README.txt
-     `- zoneinfo/README.txt
+     `- zmodem/README.txt
 
            
 
 
            
diff --git a/README.txt b/README.txt
index b3cb19a407..d04a5e4e7c 100644
--- a/README.txt
+++ b/README.txt
@@ -1524,6 +1524,8 @@ nuttx/
  |- lib/
  |   `- README.txt
  |- libc/
+ |   |- zoneinfo
+ |   |   `- README.txt
  |   `- README.txt
  |- libnx/
  |   `- README.txt
@@ -1590,9 +1592,7 @@ apps/
  |   |   `- README.txt
  |   |- usbmsc
  |   |  `- README.txt
- |   |- zmodem
- |   |  `- README.txt
- |   `- zoneinfo
+ |   `- zmodem
  |      `- README.txt
  `- README.txt
 
diff --git a/ReleaseNotes b/ReleaseNotes
index c760fca737..b5c3fbe321 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -8991,7 +8991,7 @@ Additional new features and extended functionality:
 
     * Applications: apps/system:
 
-      - apps/system/zoneinfo:  Add logic to build a ROMFS file system
+      - nuttx/zoneinfo:  Add logic to build a ROMFS file system
         containing the timezone data.
 
     * Applications: apps/nshlib:
diff --git a/configs/sim/src/Makefile b/configs/sim/src/Makefile
index 9f45e7e93b..1ab3f04975 100644
--- a/configs/sim/src/Makefile
+++ b/configs/sim/src/Makefile
@@ -48,12 +48,12 @@ endif
 
 ifeq ($(CONFIG_BOARD_INITIALIZE),y)
   CSRCS += sim_bringup.c
-ifeq ($(CONFIG_SYSTEM_ZONEINFO_ROMFS),y)
+ifeq ($(CONFIG_LIB_ZONEINFO_ROMFS),y)
   CSRCS += sim_zoneinfo.c
 endif
 else ifeq ($(CONFIG_LIB_BOARDCTL),y)
   CSRCS += sim_bringup.c
-ifeq ($(CONFIG_SYSTEM_ZONEINFO_ROMFS),y)
+ifeq ($(CONFIG_LIB_ZONEINFO_ROMFS),y)
   CSRCS += sim_zoneinfo.c
 endif
 endif
diff --git a/configs/sim/src/sim.h b/configs/sim/src/sim.h
index 355d085022..0e1f27937d 100644
--- a/configs/sim/src/sim.h
+++ b/configs/sim/src/sim.h
@@ -73,7 +73,7 @@ int sim_bringup(void);
  * Name: sim_zoneinfo
  *
  * Description:
- *   Mount the TZ database.  The apps/system/zoneinfo directory contains
+ *   Mount the TZ database.  The nuttx/zoneinfo directory contains
  *   logic to create a version of the TZ/Olson database.
  *   This database is required if localtime() support is selected via
  *   CONFIG_LIBC_LOCALTIME.  This logic in that directory does the following:
@@ -107,7 +107,7 @@ int sim_bringup(void);
  *
  ****************************************************************************/
 
-#ifdef CONFIG_SYSTEM_ZONEINFO_ROMFS
+#ifdef CONFIG_LIB_ZONEINFO_ROMFS
 int sim_zoneinfo(int minor);
 #endif
 
diff --git a/configs/sim/src/sim_bringup.c b/configs/sim/src/sim_bringup.c
index d65d99edb3..86790206dd 100644
--- a/configs/sim/src/sim_bringup.c
+++ b/configs/sim/src/sim_bringup.c
@@ -71,7 +71,7 @@ int sim_bringup(void)
   int ret;
 #endif
 
-#ifdef CONFIG_SYSTEM_ZONEINFO_ROMFS
+#ifdef CONFIG_LIB_ZONEINFO_ROMFS
   /* Mount the TZ database */
 
   (void)sim_zoneinfo(3);
diff --git a/configs/sim/src/sim_zoneinfo.c b/configs/sim/src/sim_zoneinfo.c
index 1e3840917c..dbb85025e7 100644
--- a/configs/sim/src/sim_zoneinfo.c
+++ b/configs/sim/src/sim_zoneinfo.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * config/sim/src/sim_zoneinfo.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
@@ -45,9 +45,9 @@
 #include 
 
 #include 
-#include 
+#include 
 
-#ifdef CONFIG_SYSTEM_ZONEINFO_ROMFS
+#ifdef CONFIG_LIB_ZONEINFO_ROMFS
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -80,7 +80,7 @@
  * Name: sim_zoneinfo
  *
  * Description:
- *   Mount the TZ database.  The apps/system/zoneinfo directory contains
+ *   Mount the TZ database.  The nuttx/zoneinfo directory contains
  *   logic to create a version of the TZ/Olson database.
  *   This database is required if localtime() support is selected via
  *   CONFIG_LIBC_LOCALTIME.  This logic in that directory does the following:
@@ -149,5 +149,5 @@ int sim_zoneinfo(int minor)
   return OK;
 }
 
-#endif /* CONFIG_SYSTEM_ZONEINFO_ROMFS */
+#endif /* CONFIG_LIB_ZONEINFO_ROMFS */
 
diff --git a/include/nuttx/zoneinfo.h b/include/nuttx/zoneinfo.h
new file mode 100644
index 0000000000..67f4214e0b
--- /dev/null
+++ b/include/nuttx/zoneinfo.h
@@ -0,0 +1,83 @@
+/****************************************************************************
+ * include/nuttx/zoneinfo.h
+ *
+ *   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.
+ *
+ ****************************************************************************/
+
+#ifndef __INCLUDE_NUTTX_ZONEINFO_H
+#define __INCLUDE_NUTTX_ZONEINFO_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include 
+
+#ifdef CONFIG_LIB_ZONEINFO_ROMFS
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+#ifdef __cplusplus
+#define EXTERN extern "C"
+extern "C"
+{
+#else
+#define EXTERN extern
+#endif
+
+/* If the TZ database is built as a ROMFS file system, then these variables
+ * provide (1) the address of the array in FLASH/ROM that contains the 
+ * ROMFS file system image, and (2) the size of the ROMFS file system image
+ * in bytes.  This is sufficient information to permit external logic to
+ * mount the ROMF file system.
+ */
+
+EXTERN unsigned char romfs_zoneinfo_img[];
+EXTERN unsigned int  romfs_zoneinfo_img_len;
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+#undef EXTERN
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CONFIG_LIB_ZONEINFO_ROMFS */
+#endif /* __INCLUDE_NUTTX_ZONEINFO_H */
diff --git a/libc/Kconfig b/libc/Kconfig
index cd72a0e7cd..b78dcdd35e 100644
--- a/libc/Kconfig
+++ b/libc/Kconfig
@@ -288,7 +288,7 @@ config LIBC_LOCALTIME
 		environment variable TZ must be set to the name of that timezone file
 		when tzset() is called.
 
-		See https://www.iana.org/time-zones .  See also apps/system/zoneinfo
+		See https://www.iana.org/time-zones .  See also nuttx/zoneinfo
 		which provides a framework for incorporating the TZ database into a
 		NuttX build.
 
@@ -884,3 +884,21 @@ config LIB_HEX2BIN
 	---help---
 		Build in support for conversions from Intel Hex format to binary.
 		This selection enables the interfaces of include/hex2bin.h.
+
+config LIB_ZONEINFO
+	bool "TZ database"
+	default n
+	depends on LIBC_LOCALTIME
+	---help---
+		Build the TZ/Olson database.
+
+if LIB_ZONEINFO
+
+config LIB_ZONEINFO_ROMFS
+	bool "Build ROMFS filesystem"
+	default n
+	depends on FS_ROMFS
+	---help---
+		Build a mountable ROMFS filesystem containing the TZ database
+
+endif # LIB_ZONEINFO
diff --git a/libc/zoneinfo/.gitignore b/libc/zoneinfo/.gitignore
new file mode 100644
index 0000000000..40e6770972
--- /dev/null
+++ b/libc/zoneinfo/.gitignore
@@ -0,0 +1,2 @@
+/romfs_zoneinfo.h
+
diff --git a/libc/zoneinfo/Make.defs b/libc/zoneinfo/Make.defs
new file mode 100644
index 0000000000..5e0e32b29b
--- /dev/null
+++ b/libc/zoneinfo/Make.defs
@@ -0,0 +1,47 @@
+############################################################################
+# nuttx/zoneinfo/Make.defs
+#
+#   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.
+#
+############################################################################
+
+ifeq ($(CONFIG_LIB_ZONEINFO_ROMFS),y)
+
+# Add the zoneinifo sources to the build
+
+CSRCS += tzromfs.c
+
+# Add the zoneinfo directory to the build
+
+DEPPATH += --dep-path zoneinfo
+VPATH += :zoneinfo
+
+endif
diff --git a/libc/zoneinfo/README.txt b/libc/zoneinfo/README.txt
new file mode 100644
index 0000000000..7aea826ea8
--- /dev/null
+++ b/libc/zoneinfo/README.txt
@@ -0,0 +1,180 @@
+apps/system/zoninfo/README.txt
+Author: Gregory Nutt 
+
+Directory Contents
+==================
+
+This directory contains logic to create a version of the TZ/Olson database.
+This database is required if localtime() support is selected via
+CONFIG_LIBC_LOCALTIME.  This logic in this directory does the following:
+
+  - It downloads the current TZ database from the IANA website
+  - It downloads the current timezone tools from the same location
+  - It builds the tools and constructs the binary TZ database
+  - It will then, optionally, build a ROMFS filesystem image containing
+    the data base.
+
+Creating and Mounting a ROMFS TZ Database
+=========================================
+
+The ROMFS filesystem image can that be mounted during the boot-up sequence
+so that it is available for the localtime() logic.  There are two steps to
+doing this:
+
+  - First, a ROM disk device must be created.  This is done by calling
+    the function romdisk_register() as described in
+    nuttx/include/nuttx/fs/ramdisk.h.  This is an OS level operation
+    and must be done in the board-level logic before your application
+    starts.
+
+    romdisk_register() will create a block driver at /dev/ramN where N
+    is the device minor number that was provided to romdisk_regsiter.
+
+  - The second step is to mount the file system.  This step can be
+    performed either in your board configuration logic or by your
+    application using the mount() interface described in
+    nuttx/include/sys/mount.h.
+
+    These steps, however, must be done very early in initialization,
+    before there is any need for time-related services.
+
+Both of these steps are shown together in the following code sample at the
+end of this README file.
+
+Example Configuration
+=====================
+
+I have tested this using the sim/nsh configuration.  Here are the
+modifications to the configuration that I used for testing:
+
+  CONFIG_BOARD_INITIALIZE=y
+
+  CONFIG_LIBC_LOCALTIME=y
+  CONFIG_LIBC_TZDIR="/share/zoneinfo"
+  CONFIG_LIBC_TZ_MAX_TIMES=370
+  CONFIG_LIBC_TZ_MAX_TYPES=20
+
+  CONFIG_LIB_ZONEINFO=y
+  CONFIG_LIB_ZONEINFO_ROMFS=y
+
+NOTE:  The full TZ database is quite large.  To create a reasonable sized
+ROMFS image, I had to trim some of the files like this:
+
+  cd nuttx
+  cd tools
+  ./configure.sh sim/nsh
+  cd ..
+  make menuconfig
+
+Select the above localtime() and nuttx/zoneinfo configuration settings.
+Then:
+
+  make context
+  cd ../nuttx/zoneinfo/tzbin/etc/zoneinfo
+
+Remove as many timezone files as you can.  Do not remove the GMT, localtime,
+or posixrules files.  Those might be needed in any event.  Then you can
+force rebuilding of the ROMFS filesystem be removing some files:
+
+  cd ../../..
+  rm romfs_zoneinfo.*
+  rm *.o
+  cd ../../nuttx
+  make
+
+If you have problems building the simulator on your platform, check out
+nuttx/configs/sim/README.txt.  You might find some help there.
+
+Here is a sample run.  I have not seen any errors in single stepping through
+the logic but neither am I certain that everything is working properly:
+
+  NuttShell (NSH)
+  nsh> date
+  Jul 01 00:00:02 2008
+  nsh> set TZ US/Mountain
+  nsh> date -s "Apr 11 11:53:00 2015"
+  nsh> date
+  Apr 11 17:53:00 2015
+
+NOTE: Because of daylight savings time, US/Mountain is GMT-6 on Apr 11.  The
+above suggests that perhaps the NSH data command may be setting local time,
+but printing GMT time?
+
+Sample Code to Mount the ROMFS Filesystem
+=========================================
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include 
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#ifndef CONFIG_LIBC_TZDIR
+#  errror CONFIG_LIBC_TZDIR is not defined
+#endif
+
+#ifdef CONFIG_DISABLE_MOUNTPOINT
+#  error "Mountpoint support is disabled"
+#endif
+
+#if CONFIG_NFILE_DESCRIPTORS < 4
+#  error "Not enough file descriptors"
+#endif
+
+#ifndef CONFIG_FS_ROMFS
+#  error "ROMFS support not enabled"
+#endif
+
+#define SECTORSIZE  64
+#define NSECTORS(b) (((b)+SECTORSIZE-1)/SECTORSIZE)
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int mount_zoneinfo(int minor)
+{
+   char devname[32];
+   int  ret;
+
+  /* Create a RAM disk for the test */
+
+  ret = romdisk_register(minor, romfs_zoneinfo_img,
+                         NSECTORS(romfs_zoneinfo_img_len), SECTORSIZE);
+  if (ret < 0)
+    {
+      printf("ERROR: Failed to create RAM disk\n");
+      return ret;
+    }
+
+  /* Use the minor number to create a name for the ROM disk block device */
+
+  snprintf(devname, 32, "/dev/ram%d", minor);
+
+  /* Mount the ROMFS file system */
+
+  printf("Mounting ROMFS filesystem at target=%s with source=%s\n",
+         CONFIG_LIBC_TZDIR, devname);
+
+  ret = mount(devname, CONFIG_LIBC_TZDIR, "romfs", MS_RDONLY, NULL);
+  if (ret < 0)
+    {
+      printf("ERROR: Mount failed: %d\n", errno);
+      return ret;
+    }
+
+  printf("TZ database mounted at %s\n", CONFIG_LIBC_TZDIR);
+  return OK;
+}
diff --git a/libc/zoneinfo/tzromfs.c b/libc/zoneinfo/tzromfs.c
new file mode 100644
index 0000000000..7ce1d9d4a3
--- /dev/null
+++ b/libc/zoneinfo/tzromfs.c
@@ -0,0 +1,51 @@
+/****************************************************************************
+ * nuttx/zoneinfo/tzromfs.c
+ *
+ *   Copyright (C) 2015 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 
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+#include "romfs_zoneinfo.h"
-- 
GitLab


From bde90de12f213c85ef7da5f86ecc8f4376404383 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Thu, 30 Jun 2016 16:20:43 -0600
Subject: [PATCH 117/229] Fix libc/zoneinfo build

---
 Directories.mk           |   4 +
 libc/Kconfig             |  36 +++++----
 libc/Makefile            |  17 ++++-
 libc/zoneinfo/.gitignore |   8 ++
 libc/zoneinfo/Make.defs  |  47 ------------
 libc/zoneinfo/Makefile   | 157 +++++++++++++++++++++++++++++++++++++++
 libc/zoneinfo/tzromfs.c  |   4 +-
 7 files changed, 204 insertions(+), 69 deletions(-)
 delete mode 100644 libc/zoneinfo/Make.defs
 create mode 100644 libc/zoneinfo/Makefile

diff --git a/Directories.mk b/Directories.mk
index d627c67706..2e55b91a94 100644
--- a/Directories.mk
+++ b/Directories.mk
@@ -114,6 +114,10 @@ else
 OTHERDIRS += syscall
 endif
 
+ifeq ($(CONFIG_LIB_ZONEINFO_ROMFS),y)
+CONTEXTDIRS += libc
+endif
+
 ifeq ($(CONFIG_NX),y)
 NONFSDIRS += graphics libnx
 CONTEXTDIRS += graphics libnx
diff --git a/libc/Kconfig b/libc/Kconfig
index b78dcdd35e..4a2fa5ed49 100644
--- a/libc/Kconfig
+++ b/libc/Kconfig
@@ -321,7 +321,23 @@ config LIBC_TZDIR
 		This is the full path to the location where the TZ database is expected
 		to be found.
 
-endif
+config LIB_ZONEINFO
+	bool "TZ database"
+	default n
+	---help---
+		Download and build the TZ/Olson database.
+
+if LIB_ZONEINFO
+
+config LIB_ZONEINFO_ROMFS
+	bool "Build ROMFS filesystem"
+	default n
+	depends on FS_ROMFS
+	---help---
+		Build a mountable ROMFS filesystem containing the TZ/Olson database
+
+endif # LIB_ZONEINFO
+endif # LIBC_LOCALTIME
 
 config TIME_EXTENDED
 	bool "Add day of week, year support"
@@ -884,21 +900,3 @@ config LIB_HEX2BIN
 	---help---
 		Build in support for conversions from Intel Hex format to binary.
 		This selection enables the interfaces of include/hex2bin.h.
-
-config LIB_ZONEINFO
-	bool "TZ database"
-	default n
-	depends on LIBC_LOCALTIME
-	---help---
-		Build the TZ/Olson database.
-
-if LIB_ZONEINFO
-
-config LIB_ZONEINFO_ROMFS
-	bool "Build ROMFS filesystem"
-	default n
-	depends on FS_ROMFS
-	---help---
-		Build a mountable ROMFS filesystem containing the TZ database
-
-endif # LIB_ZONEINFO
diff --git a/libc/Makefile b/libc/Makefile
index ff0a89a3be..1399de558a 100644
--- a/libc/Makefile
+++ b/libc/Makefile
@@ -1,7 +1,7 @@
 ############################################################################
 # libc/Makefile
 #
-#   Copyright (C) 2007-2014 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2007-2014, 2016 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt 
 #
 # Redistribution and use in source and binary forms, with or without
@@ -117,6 +117,9 @@ $(COBJS): $(BINDIR)$(DELIM)%$(OBJEXT): %.c
 
 $(BIN): $(OBJS)
 	$(call ARCHIVE, $@, $(OBJS))
+ifeq ($(CONFIG_LIB_ZONEINFO_ROMFS),y)
+	$(Q) $(MAKE) -C zoneinfo all TOPDIR=$(TOPDIR) BIN=$(BIN)
+endif
 
 # C library for the user phase of the two-pass kernel build
 
@@ -132,6 +135,13 @@ $(KBIN):
 	$(Q) $(MAKE) $(KBIN) BIN=$(KBIN) BINDIR=kbin TOPDIR=$(TOPDIR) EXTRADEFINES=$(EXTRADEFINES)
 endif
 
+# Context
+
+context:
+ifeq ($(CONFIG_LIB_ZONEINFO_ROMFS),y)
+	$(Q) $(MAKE) -C zoneinfo context TOPDIR=$(TOPDIR) BIN=$(BIN)
+endif
+
 # Dependencies
 
 .depend: Makefile $(SRCS)
@@ -140,6 +150,9 @@ ifeq ($(CONFIG_BUILD_PROTECTED),y)
 	$(Q) $(MKDEP) --obj-path kbin --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(CFLAGS) $(KDEFINE) -- $(SRCS) >Make_kbin.dep
 else
 	$(Q) $(MKDEP) --obj-path bin --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make_bin.dep
+endif
+ifeq ($(CONFIG_LIB_ZONEINFO_ROMFS),y)
+	$(Q) $(MAKE) -C zoneinfo depend TOPDIR=$(TOPDIR) BIN=$(BIN)
 endif
 	$(Q) touch $@
 
@@ -151,6 +164,7 @@ clean:
 	$(Q) $(MAKE) -C bin  clean TOPDIR=$(TOPDIR)
 	$(Q) $(MAKE) -C ubin clean TOPDIR=$(TOPDIR)
 	$(Q) $(MAKE) -C kbin clean TOPDIR=$(TOPDIR)
+	$(Q) $(MAKE) -C zoneinfo clean TOPDIR=$(TOPDIR) BIN=$(BIN)
 	$(call DELFILE, $(BIN))
 	$(call DELFILE, $(UBIN))
 	$(call DELFILE, $(KBIN))
@@ -162,6 +176,7 @@ distclean: clean
 	$(Q) $(MAKE) -C bin  distclean TOPDIR=$(TOPDIR)
 	$(Q) $(MAKE) -C ubin distclean TOPDIR=$(TOPDIR)
 	$(Q) $(MAKE) -C kbin distclean TOPDIR=$(TOPDIR)
+	$(Q) $(MAKE) -C zoneinfo distclean TOPDIR=$(TOPDIR) BIN=$(BIN)
 	$(call DELFILE, Make_bin.dep)
 	$(call DELFILE, Make_ubin.dep)
 	$(call DELFILE, Make_kbin.dep)
diff --git a/libc/zoneinfo/.gitignore b/libc/zoneinfo/.gitignore
index 40e6770972..91d1ddb7d0 100644
--- a/libc/zoneinfo/.gitignore
+++ b/libc/zoneinfo/.gitignore
@@ -1,2 +1,10 @@
+/.built
+/.tzbuilt
+/.tzunpack
+/romfs_zoneinfo.img
 /romfs_zoneinfo.h
+/tzbin
+/tzcode-latest.tar.gz
+/tzcode
+/tzdata-latest.tar.gz
 
diff --git a/libc/zoneinfo/Make.defs b/libc/zoneinfo/Make.defs
deleted file mode 100644
index 5e0e32b29b..0000000000
--- a/libc/zoneinfo/Make.defs
+++ /dev/null
@@ -1,47 +0,0 @@
-############################################################################
-# nuttx/zoneinfo/Make.defs
-#
-#   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.
-#
-############################################################################
-
-ifeq ($(CONFIG_LIB_ZONEINFO_ROMFS),y)
-
-# Add the zoneinifo sources to the build
-
-CSRCS += tzromfs.c
-
-# Add the zoneinfo directory to the build
-
-DEPPATH += --dep-path zoneinfo
-VPATH += :zoneinfo
-
-endif
diff --git a/libc/zoneinfo/Makefile b/libc/zoneinfo/Makefile
new file mode 100644
index 0000000000..2be9c649a1
--- /dev/null
+++ b/libc/zoneinfo/Makefile
@@ -0,0 +1,157 @@
+############################################################################
+# libc/zoneinfo/Makefile
+#
+#   Copyright (C) 2015-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.
+#
+############################################################################
+
+-include $(TOPDIR)/.config
+-include $(TOPDIR)/Make.defs
+
+ifeq ($(WINTOOL),y)
+INCDIROPT = -w
+endif
+
+# Zoneinfo database
+
+ASRCS =
+CSRCS =
+
+ifeq ($(CONFIG_LIB_ZONEINFO_ROMFS),y)
+CSRCS += tzromfs.c
+endif
+
+AOBJS = $(ASRCS:.S=$(OBJEXT))
+COBJS = $(CSRCS:.c=$(OBJEXT))
+
+SRCS = $(ASRCS) $(CSRCS)
+OBJS = $(AOBJS) $(COBJS)
+
+ZONEINFO_PATH = $(TOPDIR)/libc/zoneinfo
+TZBIN_PATH = $(ZONEINFO_PATH)/tzbin
+TZCODE_PATH = $(ZONEINFO_PATH)/tzcode
+
+ROOTDEPPATH = --dep-path .
+
+# Common build
+
+VPATH =
+
+all: .built
+.PHONY: romfs register context depend clean distclean
+
+$(AOBJS): %$(OBJEXT): %.S
+	$(call ASSEMBLE, $<, $@)
+
+$(COBJS): %$(OBJEXT): %.c
+	$(call COMPILE, $<, $@)
+
+.built: .tzbuilt romfs $(OBJS)
+	$(call ARCHIVE, ..$(DELIM)$(BIN), $(OBJS))
+	$(Q) touch .built
+
+# ROMFS file system containing the TZ database
+
+ifeq ($(CONFIG_LIB_ZONEINFO_ROMFS),y)
+
+checkgenromfs:
+	@genromfs -h 1>/dev/null 2>&1 || { \
+ echo "Host executable genromfs not available in PATH"; \
+ echo "You may need to download in from http://romfs.sourceforge.net/"; \
+ exit 1; \
+	}
+
+romfs_zoneinfo.img : checkgenromfs .tzbuilt
+	@genromfs -f $@ -d $(TZBIN_PATH)/etc/zoneinfo -V "TZDatbase" || { echo "genromfs failed" ; exit 1 ; }
+
+romfs_zoneinfo.h : romfs_zoneinfo.img
+	@xxd -i $< >$@ || { echo "xxd of $< failed" ; exit 1 ; }
+
+romfs: romfs_zoneinfo.h
+
+else
+
+romfs:
+
+endif # CONFIG_LIB_ZONEINFO_ROMFS
+
+# Build TZ database
+
+tzcode:
+	mkdir tzcode
+
+tzbin:
+	mkdir tzbin
+
+tzcode-latest.tar.gz:
+	$(Q) wget --retr-symlinks ftp://ftp.iana.org/tz/tzcode-latest.tar.gz
+
+tzdata-latest.tar.gz:
+	$(Q) wget --retr-symlinks ftp://ftp.iana.org/tz/tzdata-latest.tar.gz
+
+.tzunpack: tzcode tzcode-latest.tar.gz tzdata-latest.tar.gz
+	$(Q) tar zx -C tzcode -f tzcode-latest.tar.gz
+	$(Q) tar zx -C tzcode -f tzdata-latest.tar.gz
+	$(Q) touch .tzunpack
+
+.tzbuilt: tzcode tzbin .tzunpack
+	$(Q) $(MAKE) -C tzcode TOPDIR=$(TZBIN_PATH) install
+	$(Q) touch .tzbuilt
+
+# Create initial context
+
+context: .tzbuilt romfs
+
+# Create dependencies
+
+.depend: Makefile $(SRCS)
+	$(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
+	$(Q) touch $@
+
+depend: .depend
+
+clean:
+	$(call DELFILE, .built)
+	$(call CLEAN)
+
+distclean: clean
+	$(call DELFILE, Make.dep)
+	$(call DELFILE, .depend)
+	$(call DELFILE, .tzunpack)
+	$(call DELFILE, .tzbuilt)
+	$(call DELFILE, romfs_zoneinfo.img)
+	$(call DELFILE, romfs_zoneinfo.h)
+	$(call DELFILE, tzdata-latest.tar.gz)
+	$(call DELFILE, tzcode-latest.tar.gz)
+	$(call DELDIR, tzbin)
+	$(call DELDIR, tzcode)
+
+-include Make.dep
diff --git a/libc/zoneinfo/tzromfs.c b/libc/zoneinfo/tzromfs.c
index 7ce1d9d4a3..64d71ebe51 100644
--- a/libc/zoneinfo/tzromfs.c
+++ b/libc/zoneinfo/tzromfs.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * nuttx/zoneinfo/tzromfs.c
+ * libc/zoneinfo/tzromfs.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
-- 
GitLab


From 5b6fafb3f51abd8cbce5d74e3edf364734d72379 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Thu, 30 Jun 2016 17:49:53 -0600
Subject: [PATCH 118/229] Several MTD FLASH drivers nullify the freed 'priv'
 structure and failed to return NULL as stated in the comments.  Result, will
 operate on a NULL pointer later.  Noted by David Sidrane.

---
 drivers/mtd/at25.c    | 2 +-
 drivers/mtd/is25xp.c  | 3 +--
 drivers/mtd/m25px.c   | 2 +-
 drivers/mtd/ramtron.c | 2 +-
 drivers/mtd/sst25.c   | 2 +-
 drivers/mtd/sst25xx.c | 2 +-
 drivers/mtd/sst26.c   | 2 +-
 drivers/mtd/w25.c     | 2 +-
 8 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/drivers/mtd/at25.c b/drivers/mtd/at25.c
index efc2e355a7..777ff3877f 100644
--- a/drivers/mtd/at25.c
+++ b/drivers/mtd/at25.c
@@ -673,7 +673,7 @@ FAR struct mtd_dev_s *at25_initialize(FAR struct spi_dev_s *dev)
 
           ferr("ERROR: Unrecognized\n");
           kmm_free(priv);
-          priv = NULL;
+          return NULL;
         }
       else
         {
diff --git a/drivers/mtd/is25xp.c b/drivers/mtd/is25xp.c
index 2228f760b0..55b677b38a 100644
--- a/drivers/mtd/is25xp.c
+++ b/drivers/mtd/is25xp.c
@@ -978,7 +978,7 @@ FAR struct mtd_dev_s *is25xp_initialize(FAR struct spi_dev_s *dev)
 
           ferr("ERROR: Unrecognized\n");
           kmm_free(priv);
-          priv = NULL;
+          return NULL;
         }
       else
         {
@@ -999,4 +999,3 @@ FAR struct mtd_dev_s *is25xp_initialize(FAR struct spi_dev_s *dev)
   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 eb2cade8ee..4402995afb 100644
--- a/drivers/mtd/m25px.c
+++ b/drivers/mtd/m25px.c
@@ -1033,7 +1033,7 @@ FAR struct mtd_dev_s *m25p_initialize(FAR struct spi_dev_s *dev)
 
           ferr("ERROR: Unrecognized\n");
           kmm_free(priv);
-          priv = NULL;
+          return NULL;
         }
     }
 
diff --git a/drivers/mtd/ramtron.c b/drivers/mtd/ramtron.c
index a81469f92e..0152475b98 100644
--- a/drivers/mtd/ramtron.c
+++ b/drivers/mtd/ramtron.c
@@ -826,7 +826,7 @@ FAR struct mtd_dev_s *ramtron_initialize(FAR struct spi_dev_s *dev)
           /* Unrecognized! Discard all of that work we just did and return NULL */
 
           kmm_free(priv);
-          priv = NULL;
+          return NULL;
         }
     }
 
diff --git a/drivers/mtd/sst25.c b/drivers/mtd/sst25.c
index 89d21324aa..8da5778d84 100644
--- a/drivers/mtd/sst25.c
+++ b/drivers/mtd/sst25.c
@@ -1208,7 +1208,7 @@ FAR struct mtd_dev_s *sst25_initialize(FAR struct spi_dev_s *dev)
 
           ferr("ERROR: Unrecognized\n");
           kmm_free(priv);
-          priv = NULL;
+          return NULL;
         }
       else
         {
diff --git a/drivers/mtd/sst25xx.c b/drivers/mtd/sst25xx.c
index 4d30be50bb..9f883483af 100644
--- a/drivers/mtd/sst25xx.c
+++ b/drivers/mtd/sst25xx.c
@@ -956,7 +956,7 @@ FAR struct mtd_dev_s *sst25xx_initialize(FAR struct spi_dev_s *dev)
 
           ferr("ERROR: Unrecognized\n");
           kmm_free(priv);
-          priv = NULL;
+          return NULL;
         }
       else
         {
diff --git a/drivers/mtd/sst26.c b/drivers/mtd/sst26.c
index 91eb045fcf..51888da063 100644
--- a/drivers/mtd/sst26.c
+++ b/drivers/mtd/sst26.c
@@ -934,7 +934,7 @@ FAR struct mtd_dev_s *sst26_initialize_spi(FAR struct spi_dev_s *dev)
 
           ssterr("ERROR: Unrecognized\n");
           kmm_free(priv);
-          priv = NULL;
+          return NULL;
         }
       else
         {
diff --git a/drivers/mtd/w25.c b/drivers/mtd/w25.c
index 3559f8d6a5..da015a8c42 100644
--- a/drivers/mtd/w25.c
+++ b/drivers/mtd/w25.c
@@ -1258,7 +1258,7 @@ FAR struct mtd_dev_s *w25_initialize(FAR struct spi_dev_s *spi)
 
           ferr("ERROR: Unrecognized\n");
           kmm_free(priv);
-          priv = NULL;
+          return NULL;
         }
       else
         {
-- 
GitLab


From 0f0258c922eae720ad79b6449e448b66664b0ed0 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Thu, 30 Jun 2016 17:42:20 -0600
Subject: [PATCH 119/229] STM3210e-eval: No such macro as warn(), change to
 swarn()

---
 configs/stm3210e-eval/src/stm32_pmbuttons.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configs/stm3210e-eval/src/stm32_pmbuttons.c b/configs/stm3210e-eval/src/stm32_pmbuttons.c
index 3e723af37f..50a06cc95d 100644
--- a/configs/stm3210e-eval/src/stm32_pmbuttons.c
+++ b/configs/stm3210e-eval/src/stm32_pmbuttons.c
@@ -318,9 +318,9 @@ void stm32_pmbuttons(void)
 
       if (oldhandler != NULL)
         {
-          warn("WARNING: oldhandler:%p is not NULL!  "
-               "Button events may be lost or aliased!\n",
-               oldhandler);
+          swarn("WARNING: oldhandler:%p is not NULL!  "
+                "Button events may be lost or aliased!\n",
+                oldhandler);
         }
     }
 #endif
-- 
GitLab


From 71ff84b96a2f65fd5e31f103c496ba3d8c4b2d98 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Fri, 1 Jul 2016 08:48:57 -0600
Subject: [PATCH 120/229] arch/arm/src/kinetis:  Create a chip sub-directory as
 with other architectures.  Start moving some headers... a lot more still be
 be moved.

---
 arch/arm/src/kinetis/{ => chip}/kinetis_k20pinmux.h | 10 +++++-----
 arch/arm/src/kinetis/{ => chip}/kinetis_k40pinmux.h | 10 +++++-----
 arch/arm/src/kinetis/{ => chip}/kinetis_k60pinmux.h | 10 +++++-----
 arch/arm/src/kinetis/{ => chip}/kinetis_pinmux.h    | 10 +++++-----
 arch/arm/src/kinetis/kinetis_clockconfig.c          |  2 +-
 arch/arm/src/kinetis/kinetis_enet.c                 |  2 +-
 arch/arm/src/kinetis/kinetis_lowputc.c              |  2 +-
 arch/arm/src/kinetis/kinetis_pwm.h                  |  2 +-
 arch/arm/src/kinetis/kinetis_sdhc.c                 |  2 +-
 9 files changed, 25 insertions(+), 25 deletions(-)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_k20pinmux.h (98%)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_k40pinmux.h (99%)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_k60pinmux.h (99%)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_pinmux.h (91%)

diff --git a/arch/arm/src/kinetis/kinetis_k20pinmux.h b/arch/arm/src/kinetis/chip/kinetis_k20pinmux.h
similarity index 98%
rename from arch/arm/src/kinetis/kinetis_k20pinmux.h
rename to arch/arm/src/kinetis/chip/kinetis_k20pinmux.h
index a4ca3eda29..ca708acfdf 100644
--- a/arch/arm/src/kinetis/kinetis_k20pinmux.h
+++ b/arch/arm/src/kinetis/chip/kinetis_k20pinmux.h
@@ -1,7 +1,7 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/kinetis_k40pinmux.h
+ * arch/arm/src/kinetis/chip/kinetis_k20pinmux.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
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_K20PINMUX_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_K20PINMUX_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K20PINMUX_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K20PINMUX_H
 
 /********************************************************************************************
  * Included Files
@@ -349,4 +349,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_K20PINMUX_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K20PINMUX_H */
diff --git a/arch/arm/src/kinetis/kinetis_k40pinmux.h b/arch/arm/src/kinetis/chip/kinetis_k40pinmux.h
similarity index 99%
rename from arch/arm/src/kinetis/kinetis_k40pinmux.h
rename to arch/arm/src/kinetis/chip/kinetis_k40pinmux.h
index 9798eda6be..7083b0caf7 100644
--- a/arch/arm/src/kinetis/kinetis_k40pinmux.h
+++ b/arch/arm/src/kinetis/chip/kinetis_k40pinmux.h
@@ -1,7 +1,7 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/kinetis_k40pinmux.h
+ * arch/arm/src/kinetis/chip/kinetis_k40pinmux.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_K40PINMUX_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_K40PINMUX_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K40PINMUX_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K40PINMUX_H
 
 /********************************************************************************************
  * Included Files
@@ -515,4 +515,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_K40PINMUX_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K40PINMUX_H */
diff --git a/arch/arm/src/kinetis/kinetis_k60pinmux.h b/arch/arm/src/kinetis/chip/kinetis_k60pinmux.h
similarity index 99%
rename from arch/arm/src/kinetis/kinetis_k60pinmux.h
rename to arch/arm/src/kinetis/chip/kinetis_k60pinmux.h
index 7fd69a0813..5cfb3a1aa0 100644
--- a/arch/arm/src/kinetis/kinetis_k60pinmux.h
+++ b/arch/arm/src/kinetis/chip/kinetis_k60pinmux.h
@@ -1,7 +1,7 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/kinetis_k60pinset.h
+ * arch/arm/src/kinetis/chip/kinetis_k60pinset.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_K60PINMUX_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_K60PINMUX_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K60PINMUX_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K60PINMUX_H
 
 /********************************************************************************************
  * Included Files
@@ -479,4 +479,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_K60PINMUX_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K60PINMUX_H */
diff --git a/arch/arm/src/kinetis/kinetis_pinmux.h b/arch/arm/src/kinetis/chip/kinetis_pinmux.h
similarity index 91%
rename from arch/arm/src/kinetis/kinetis_pinmux.h
rename to arch/arm/src/kinetis/chip/kinetis_pinmux.h
index 589184ffdd..bc59e58c9d 100644
--- a/arch/arm/src/kinetis/kinetis_pinmux.h
+++ b/arch/arm/src/kinetis/chip/kinetis_pinmux.h
@@ -1,7 +1,7 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/kinetis_pinmux.h
+ * arch/arm/src/kinetis/chip/kinetis_pinmux.h
  *
- *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2015-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_PINMUX_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_PINMUX_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PINMUX_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PINMUX_H
 
 /********************************************************************************************
  * Included Files
@@ -74,4 +74,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_PINMUX_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PINMUX_H */
diff --git a/arch/arm/src/kinetis/kinetis_clockconfig.c b/arch/arm/src/kinetis/kinetis_clockconfig.c
index 7221b9dc6e..5abe874271 100644
--- a/arch/arm/src/kinetis/kinetis_clockconfig.c
+++ b/arch/arm/src/kinetis/kinetis_clockconfig.c
@@ -48,7 +48,7 @@
 #include "kinetis_sim.h"
 #include "kinetis_fmc.h"
 #include "kinetis_llwu.h"
-#include "kinetis_pinmux.h"
+#include "chip/kinetis_pinmux.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/kinetis/kinetis_enet.c b/arch/arm/src/kinetis/kinetis_enet.c
index aa4b3cf101..1413156e0c 100644
--- a/arch/arm/src/kinetis/kinetis_enet.c
+++ b/arch/arm/src/kinetis/kinetis_enet.c
@@ -65,7 +65,7 @@
 #include "chip.h"
 #include "kinetis.h"
 #include "kinetis_config.h"
-#include "kinetis_pinmux.h"
+#include "chip/kinetis_pinmux.h"
 #include "kinetis_sim.h"
 #include "kinetis_mpu.h"
 #include "kinetis_enet.h"
diff --git a/arch/arm/src/kinetis/kinetis_lowputc.c b/arch/arm/src/kinetis/kinetis_lowputc.c
index bd3b27a876..4e8389d20d 100644
--- a/arch/arm/src/kinetis/kinetis_lowputc.c
+++ b/arch/arm/src/kinetis/kinetis_lowputc.c
@@ -51,7 +51,7 @@
 #include "kinetis.h"
 #include "kinetis_uart.h"
 #include "kinetis_sim.h"
-#include "kinetis_pinmux.h"
+#include "chip/kinetis_pinmux.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/kinetis/kinetis_pwm.h b/arch/arm/src/kinetis/kinetis_pwm.h
index 09508d4bfe..8e60702796 100644
--- a/arch/arm/src/kinetis/kinetis_pwm.h
+++ b/arch/arm/src/kinetis/kinetis_pwm.h
@@ -73,7 +73,7 @@
     defined(CONFIG_KINETIS_FTM2_PWM)
 
 #include 
-#include "kinetis_pinmux.h"
+#include "chip/kinetis_pinmux.h"
 
 /* For each timer that is enabled for PWM usage, we need the following additional
  * configuration settings:
diff --git a/arch/arm/src/kinetis/kinetis_sdhc.c b/arch/arm/src/kinetis/kinetis_sdhc.c
index aff35be9b4..5b4b4b6432 100644
--- a/arch/arm/src/kinetis/kinetis_sdhc.c
+++ b/arch/arm/src/kinetis/kinetis_sdhc.c
@@ -61,7 +61,7 @@
 #include "up_arch.h"
 
 #include "kinetis.h"
-#include "kinetis_pinmux.h"
+#include "chip/kinetis_pinmux.h"
 #include "kinetis_sim.h"
 #include "kinetis_sdhc.h"
 
-- 
GitLab


From 91dd3306c83587216a013ba167a05e4996286573 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Fri, 1 Jul 2016 11:24:41 -0600
Subject: [PATCH 121/229] arch/arm/src/kinetis:  Add basic support for the K64
 family.  Still moving register definition files to the kinetis/chip
 subdirectory.

---
 arch/arm/include/kinetis/chip.h               | 294 +++++++++++++++++-
 arch/arm/include/kinetis/irq.h                | 110 ++++++-
 arch/arm/src/kinetis/Kconfig                  |  32 ++
 arch/arm/src/kinetis/{ => chip}/kinetis_adc.h |  54 ++--
 .../arm/src/kinetis/{ => chip}/kinetis_aips.h |  55 ++--
 .../arm/src/kinetis/{ => chip}/kinetis_axbs.h |  10 +-
 arch/arm/src/kinetis/kinetis_clockconfig.c    |   3 -
 arch/arm/src/kinetis/kinetis_config.h         |   6 +-
 8 files changed, 499 insertions(+), 65 deletions(-)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_adc.h (93%)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_aips.h (87%)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_axbs.h (98%)

diff --git a/arch/arm/include/kinetis/chip.h b/arch/arm/include/kinetis/chip.h
index dd8582e564..7f609e1c77 100644
--- a/arch/arm/include/kinetis/chip.h
+++ b/arch/arm/include/kinetis/chip.h
@@ -1,7 +1,7 @@
 /************************************************************************************
  * arch/arm/include/kinetis/chip.h
  *
- *   Copyright (C) 2011, 2013, 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2013, 2015-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -72,6 +72,7 @@
 #  define KINETIS_K20             1          /* Kinetics K20 family */
 #  undef  KINETIS_K40                        /* Not Kinetics K40 family */
 #  undef  KINETIS_K60                        /* Not Kinetis K60 family */
+#  undef  KINETIS_K64                        /* Not Kinetis K64 family */
 
 #if defined(CONFIG_ARCH_CHIP_MK20DN32VLH5)
 #  define KINETIS_FLASH_SIZE      (64*1024)  /* 32Kb */
@@ -153,6 +154,7 @@
 #  define KINETIS_K20             1          /* Kinetics K20 family */
 #  undef  KINETIS_K40                        /* Not Kinetics K40 family */
 #  undef  KINETIS_K60                        /* Not Kinetis K60 family */
+#  undef  KINETIS_K64                        /* Not Kinetis K64 family */
 
 #if defined(CONFIG_ARCH_CHIP_MK20DX64VLH7)
 #  define KINETIS_FLASH_SIZE      (64*1024)  /* 64Kb */
@@ -207,6 +209,7 @@
 #  undef  KINETIS_K20                        /* Not Kinetis K20 family */
 #  define KINETIS_K40             1          /* Kinetics K40 family */
 #  undef  KINETIS_K60                        /* Not Kinetis K60 family */
+#  undef  KINETIS_K64                        /* Not Kinetis K64 family */
 #  define KINETIS_FLASH_SIZE      (64*1024)  /* 64Kb */
 #  define KINETIS_FLEXMEM_SIZE    (32*1024)  /* 32Kb */
 #  define KINETIS_SRAM_SIZE       (16*1024)  /* 16Kb */
@@ -257,6 +260,7 @@
 #  undef  KINETIS_K20                        /* Not Kinetis K20 family */
 #  define KINETIS_K40             1          /* Kinetics K40 family */
 #  undef  KINETIS_K60                        /* Not Kinetis K60 family */
+#  undef  KINETIS_K64                        /* Not Kinetis K64 family */
 #  define KINETIS_FLASH_SIZE      (128*1024) /* 128Kb */
 #  define KINETIS_FLEXMEM_SIZE    (32*1024)  /* 32Kb */
 #  define KINETIS_SRAM_SIZE       (32*1024)  /* 32Kb */
@@ -299,6 +303,7 @@
 #  undef  KINETIS_K20                        /* Not Kinetis K20 family */
 #  define KINETIS_K40             1          /* Kinetics K40 family */
 #  undef  KINETIS_K60                        /* Not Kinetis K60 family */
+#  undef  KINETIS_K64                        /* Not Kinetis K64 family */
 #  define KINETIS_FLASH_SIZE      (256*1024) /* 256Kb */
 #  define KINETIS_FLEXMEM_SIZE    (32*1024)  /* 32Kb */
 #  define KINETIS_SRAM_SIZE       (32*1024)  /* 64Kb */
@@ -340,6 +345,7 @@
 #  undef  KINETIS_K20                        /* Not Kinetis K20 family */
 #  define KINETIS_K40             1          /* Kinetics K40 family */
 #  undef  KINETIS_K60                        /* Not Kinetis K60 family */
+#  undef  KINETIS_K64                        /* Not Kinetis K64 family */
 #  define KINETIS_FLASH_SIZE      (128*1024) /* 128Kb */
 #  define KINETIS_FLEXMEM_SIZE    (128*1024) /* 128Kb */
 #  define KINETIS_SRAM_SIZE       (32*1024)  /* 32Kb */
@@ -381,6 +387,7 @@
 #  undef  KINETIS_K20                        /* Not Kinetis K20 family */
 #  define KINETIS_K40             1          /* Kinetics K40 family */
 #  undef  KINETIS_K60                        /* Not Kinetis K60 family */
+#  undef  KINETIS_K64                        /* Not Kinetis K64 family */
 #  define KINETIS_FLASH_SIZE      (256*1024) /* 256Kb */
 #  define KINETIS_FLEXMEM_SIZE    (256*1024) /* 256Kb */
 #  define KINETIS_SRAM_SIZE       (64*1024)  /* 32Kb */
@@ -424,6 +431,7 @@
 #  undef  KINETIS_K20                        /* Not Kinetis K20 family */
 #  define KINETIS_K40             1          /* Kinetics K40 family */
 #  undef  KINETIS_K60                        /* Not Kinetis K60 family */
+#  undef  KINETIS_K64                        /* Not Kinetis K64 family */
 #  define KINETIS_FLASH_SIZE      (512*1024) /* 512Kb */
 #  undef  KINETIS_FLEXMEM_SIZE               /* No FlexMemory */
 #  define KINETIS_SRAM_SIZE       (128*1024) /* 128Kb */
@@ -465,6 +473,7 @@
 #  undef  KINETIS_K20                        /* Not Kinetis K20 family */
 #  undef  KINETIS_K40                        /* Not Kinetics K40 family */
 #  define KINETIS_K60             1          /* Kinetis K60 family */
+#  undef  KINETIS_K64                        /* Not Kinetis K64 family */
 #  define KINETIS_FLASH_SIZE      (256*1024) /* 256Kb */
 #  undef  KINETIS_FLEXNVM_SIZE               /* No FlexNVM */
 #  undef  KINETIS_FLEXRAM_SIZE               /* No FlexRAM */
@@ -509,6 +518,7 @@
 #  undef  KINETIS_K20                        /* Not Kinetis K20 family */
 #  undef  KINETIS_K40                        /* Not Kinetics K40 family */
 #  define KINETIS_K60             1          /* Kinetis K60 family */
+#  undef  KINETIS_K64                        /* Not Kinetis K64 family */
 #  define KINETIS_FLASH_SIZE      (256*1024) /* 256Kb */
 #  define KINETIS_FLEXNVM_SIZE    (256*1024) /* 256Kb  */
 #  define KINETIS_FLEXRAM_SIZE    (4*1024)   /* 32Kb */
@@ -553,6 +563,7 @@
 #  undef  KINETIS_K20                        /* Not Kinetis K20 family */
 #  undef  KINETIS_K40                        /* Not Kinetics K40 family */
 #  define KINETIS_K60             1          /* Kinetis K60 family */
+#  undef  KINETIS_K64                        /* Not Kinetis K64 family */
 #  define KINETIS_FLASH_SIZE      (512*1024) /* 256Kb */
 #  undef  KINETIS_FLEXNVM_SIZE               /* No FlexNVM */
 #  undef  KINETIS_FLEXRAM_SIZE               /* No FlexRAM */
@@ -598,6 +609,7 @@
 #  undef  KINETIS_K20                        /* Not Kinetis K20 family */
 #  undef  KINETIS_K40                        /* Not Kinetics K40 family */
 #  define KINETIS_K60             1          /* Kinetis K60 family */
+#  undef  KINETIS_K64                        /* Not Kinetis K64 family */
 #  define KINETIS_FLASH_SIZE      (256*1024) /* 256Kb */
 #  undef  KINETIS_FLEXNVM_SIZE               /* No FlexNVM */
 #  undef  KINETIS_FLEXRAM_SIZE               /* No FlexRAM */
@@ -642,6 +654,7 @@
 #  undef  KINETIS_K20                        /* Not Kinetis K20 family */
 #  undef  KINETIS_K40                        /* Not Kinetics K40 family */
 #  define KINETIS_K60             1          /* Kinetis K60 family */
+#  undef  KINETIS_K64                        /* Not Kinetis K64 family */
 #  define KINETIS_FLASH_SIZE      (256*1024) /* 256Kb */
 #  define KINETIS_FLEXNVM_SIZE    (256*1024) /* 256Kb */
 #  define KINETIS_FLEXRAM_SIZE    (4*1024)   /* 4Kb */
@@ -686,6 +699,7 @@
 #  undef  KINETIS_K20                        /* Not Kinetis K20 family */
 #  undef  KINETIS_K40                        /* Not Kinetics K40 family */
 #  define KINETIS_K60             1          /* Kinetis K60 family */
+#  undef  KINETIS_K64                        /* Not Kinetis K64 family */
 #  define KINETIS_FLASH_SIZE      (512*1024) /* 256Kb */
 #  undef  KINETIS_FLEXNVM_SIZE               /* No FlexNVM */
 #  undef  KINETIS_FLEXRAM_SIZE               /* No FlexRAM */
@@ -730,6 +744,7 @@
 #  undef  KINETIS_K20                        /* Not Kinetis K20 family */
 #  undef  KINETIS_K40                        /* Not Kinetics K40 family */
 #  define KINETIS_K60             1          /* Kinetis K60 family */
+#  undef  KINETIS_K64                        /* Not Kinetis K64 family */
 #  define KINETIS_FLASH_SIZE      (256*1024) /* 256Kb */
 #  undef  KINETIS_FLEXNVM_SIZE               /* No FlexNVM */
 #  undef  KINETIS_FLEXRAM_SIZE               /* No FlexRAM */
@@ -774,6 +789,7 @@
 #  undef  KINETIS_K20                        /* Not Kinetis K20 family */
 #  undef  KINETIS_K40                        /* Not Kinetics K40 family */
 #  define KINETIS_K60             1          /* Kinetis K60 family */
+#  undef  KINETIS_K64                        /* Not Kinetis K64 family */
 #  define KINETIS_FLASH_SIZE      (256*1024) /* 256Kb */
 #  define KINETIS_FLEXNVM_SIZE    (256*1024) /* 256Kb */
 #  define KINETIS_FLEXRAM_SIZE    (4*1024)   /* 4Kb */
@@ -818,6 +834,7 @@
 #  undef  KINETIS_K20                        /* Not Kinetis K20 family */
 #  undef  KINETIS_K40                        /* Not Kinetics K40 family */
 #  define KINETIS_K60             1          /* Kinetis K60 family */
+#  undef  KINETIS_K64                        /* Not Kinetis K64 family */
 #  define KINETIS_FLASH_SIZE      (512*1024) /* 512Kb */
 #  undef  KINETIS_FLEXNVM_SIZE               /* No FlexNVM */
 #  undef  KINETIS_FLEXRAM_SIZE               /* No FlexRAM */
@@ -862,6 +879,7 @@
 #  undef  KINETIS_K20                        /* Not Kinetis K20 family */
 #  undef  KINETIS_K40                        /* Not Kinetics K40 family */
 #  define KINETIS_K60             1          /* Kinetis K60 family */
+#  undef  KINETIS_K64                        /* Not Kinetis K64 family */
 #  define KINETIS_FLASH_SIZE      (256*1024) /* 256Kb */
 #  undef  KINETIS_FLEXNVM_SIZE               /* No FlexNVM */
 #  undef  KINETIS_FLEXRAM_SIZE               /* No FlexRAM */
@@ -906,6 +924,7 @@
 #  undef  KINETIS_K20                        /* Not Kinetis K20 family */
 #  undef  KINETIS_K40                        /* Not Kinetics K40 family */
 #  define KINETIS_K60             1          /* Kinetis K60 family */
+#  undef  KINETIS_K64                        /* Not Kinetis K64 family */
 #  define KINETIS_FLASH_SIZE      (256*1024) /* 256Kb */
 #  define KINETIS_FLEXNVM_SIZE    (256*1024) /* 256Kb */
 #  define KINETIS_FLEXRAM_SIZE    (4*1024)   /* 4Kb */
@@ -950,6 +969,7 @@
 #  undef  KINETIS_K20                        /* Not Kinetis K20 family */
 #  undef  KINETIS_K40                        /* Not Kinetics K40 family */
 #  define KINETIS_K60             1          /* Kinetis K60 family */
+#  undef  KINETIS_K64                        /* Not Kinetis K64 family */
 #  define KINETIS_FLASH_SIZE      (512*1024) /* 512Kb */
 #  undef  KINETIS_FLEXNVM_SIZE               /* No FlexNVM */
 #  undef  KINETIS_FLEXRAM_SIZE               /* No FlexRAM */
@@ -990,6 +1010,278 @@
 #  undef  KINETIS_NTAMPER                    /* No tamper detect */
 #  define KINETIS_NCRC            1          /* CRC */
 
+#elif defined(CONFIG_ARCH_CHIP_MK64FN1M0VLL12)
+#  undef  KINETIS_K20                          /* Not Kinetics K20 family */
+#  undef  KINETIS_K40                          /* Not Kinetics K40 family */
+#  undef  KINETIS_K60                          /* Not Kinetis K60 family */
+#  define KINETIS_K64             1            /* Kinetis K64 family */
+#  define KINETIS_FLASH_SIZE      (1024*1024)  /* 1Mb */
+#  define KINETIS_FLEXNVM_SIZE    (0*1024)     /* 0Kb  */
+#  define KINETIS_FLEXRAM_SIZE    (4*1024)     /* 4Kb */
+#  define KINETIS_SRAM_SIZE       (256*1024)   /* 256Kb */
+#  define KINETIS_MPU             1            /* Memory protection unit */
+#  define KINETIS_EXTBUS          1            /* External bus interface */
+#  define KINETIS_NDMACH          16           /* Up to 16 DMA channels */
+#  define KINETIS_NENET           1            /* One IEEE 1588 Ethernet controller */
+#  define KINETIS_NUSBOTG         1            /* With USB OTG controller */
+#  define KINETIS_NUSBDEV         1            /* One USB device controller */
+#  define KINETIS_NSDHC           1            /* SD host controller */
+#  define KINETIS_NI2C            3            /* Three I2C modules */
+#  define KINETIS_NUART           6            /* Six UART modues */
+#  define KINETIS_NSPI            3            /* Three SPI modules */
+#  define KINETIS_NCAN            1            /* One CAN controllers */
+#  define KINETIS_NI2S            1            /* One I2S modules */
+#  define KINETIS_NSLCD           1            /* One segment LCD interface (up to 36x8/40x4) */
+#  define KINETIS_NADC16          2            /* Four 16-bit ADC */
+#  define KINETIS_NCMP            3            /* Three analog comparators */
+#  define KINETIS_NDAC6           3            /* Three 6-bit DAC */
+#  define KINETIS_NDAC12          2            /* Two 12-bit DAC */
+#  define KINETIS_NVREF           1            /* Voltage reference */
+#  define KINETIS_NTIMERS8        2            /* Two 8 channel timers */
+#  define KINETIS_NTIMERS2        2            /* Two 2 channel timers */
+#  define KINETIS_NRTC            1            /* Real time clock */
+#  define KINETIS_NRNG            1            /* Random number generator */
+#  define KINETIS_NMMCAU          1            /* Hardware encryption */
+#  define KINETIS_NCRC            1            /* CRC */
+
+#if defined(CONFIG_ARCH_CHIP_MK64FX512VLL12)
+#  undef  KINETIS_K20                          /* Not Kinetics K20 family */
+#  undef  KINETIS_K40                          /* Not Kinetics K40 family */
+#  undef  KINETIS_K60                          /* Not Kinetis K60 family */
+#  define KINETIS_K64             1            /* Kinetis K64 family */
+#  define KINETIS_FLASH_SIZE      (1024*1024)  /* 1Mb */
+#  define KINETIS_FLEXNVM_SIZE    (0*1024)     /* 0Kb  */
+#  define KINETIS_FLEXRAM_SIZE    (4*1024)     /* 4Kb */
+#  define KINETIS_SRAM_SIZE       (256*1024)   /* 256Kb */
+#  define KINETIS_MPU             1            /* Memory protection unit */
+#  define KINETIS_EXTBUS          1            /* External bus interface */
+#  define KINETIS_NDMACH          16           /* Up to 16 DMA channels */
+#  define KINETIS_NENET           1            /* One IEEE 1588 Ethernet controller */
+#  define KINETIS_NUSBOTG         1            /* With USB OTG controller */
+#  define KINETIS_NUSBDEV         1            /* One USB device controller */
+#  define KINETIS_NSDHC           1            /* SD host controller */
+#  define KINETIS_NI2C            3            /* Three I2C modules */
+#  define KINETIS_NUART           6            /* Six UART modues */
+#  define KINETIS_NSPI            3             Three SPI modules
+#  define KINETIS_NCAN            1            /* One CAN controllers */
+#  define KINETIS_NI2S            1            /* One I2S modules */
+#  define KINETIS_NSLCD           1            /* One segment LCD interface (up to 36x8/40x4) */
+#  define KINETIS_NADC16          2            /* Four 16-bit ADC */
+#  define KINETIS_NCMP            3            /* Three analog comparators */
+#  define KINETIS_NDAC6           3            /* Three 6-bit DAC */
+#  define KINETIS_NDAC12          2            /* Two 12-bit DAC */
+#  define KINETIS_NVREF           1            /* Voltage reference */
+#  define KINETIS_NTIMERS8        2            /* Two 8 channel timers */
+#  define KINETIS_NTIMERS2        2            /* Two 2 channel timers */
+#  define KINETIS_NRTC            1            /* Real time clock */
+#  define KINETIS_NRNG            1            /* Random number generator */
+#  define KINETIS_NMMCAU          1            /* Hardware encryption */
+#  define KINETIS_NCRC            1            /* CRC */
+
+#elif defined(CONFIG_ARCH_CHIP_MK64FX512VDC12)
+#  undef  KINETIS_K20                          /* Not Kinetics K20 family */
+#  undef  KINETIS_K40                          /* Not Kinetics K40 family */
+#  undef  KINETIS_K60                          /* Not Kinetis K60 family */
+#  define KINETIS_K64             1            /* Kinetis K64 family */
+#  define KINETIS_FLASH_SIZE      (1024*1024)  /* 1Mb */
+#  define KINETIS_FLEXNVM_SIZE    (0*1024)     /* 0Kb  */
+#  define KINETIS_FLEXRAM_SIZE    (4*1024)     /* 4Kb */
+#  define KINETIS_SRAM_SIZE       (256*1024)   /* 256Kb */
+#  define KINETIS_MPU             1            /* Memory protection unit */
+#  define KINETIS_EXTBUS          1            /* External bus interface */
+#  define KINETIS_NDMACH          16           /* Up to 16 DMA channels */
+#  define KINETIS_NENET           1            /* One IEEE 1588 Ethernet controller */
+#  define KINETIS_NUSBOTG         1            /* With USB OTG controller */
+#  define KINETIS_NUSBDEV         1            /* One USB device controller */
+#  define KINETIS_NSDHC           1            /* SD host controller */
+#  define KINETIS_NI2C            3            /* Three I2C modules */
+#  define KINETIS_NUART           6            /* Six UART modues */
+#  define KINETIS_NSPI            3             Three SPI modules
+#  define KINETIS_NCAN            1            /* One CAN controllers */
+#  define KINETIS_NI2S            1            /* One I2S modules */
+#  define KINETIS_NSLCD           1            /* One segment LCD interface (up to 36x8/40x4) */
+#  define KINETIS_NADC16          2            /* Four 16-bit ADC */
+#  define KINETIS_NCMP            3            /* Three analog comparators */
+#  define KINETIS_NDAC6           3            /* Three 6-bit DAC */
+#  define KINETIS_NDAC12          2            /* Two 12-bit DAC */
+#  define KINETIS_NVREF           1            /* Voltage reference */
+#  define KINETIS_NTIMERS8        2            /* Two 8 channel timers */
+#  define KINETIS_NTIMERS2        2            /* Two 2 channel timers */
+#  define KINETIS_NRTC            1            /* Real time clock */
+#  define KINETIS_NRNG            1            /* Random number generator */
+#  define KINETIS_NMMCAU          1            /* Hardware encryption */
+#  define KINETIS_NCRC            1            /* CRC */
+//
+#elif defined(CONFIG_ARCH_CHIP_MK64FN1M0VDC12)
+#  undef  KINETIS_K20                          /* Not Kinetics K20 family */
+#  undef  KINETIS_K40                          /* Not Kinetics K40 family */
+#  undef  KINETIS_K60                          /* Not Kinetis K60 family */
+#  define KINETIS_K64             1            /* Kinetis K64 family */
+#  define KINETIS_FLASH_SIZE      (1024*1024)  /* 1Mb */
+#  define KINETIS_FLEXNVM_SIZE    (0*1024)     /* 0Kb  */
+#  define KINETIS_FLEXRAM_SIZE    (4*1024)     /* 4Kb */
+#  define KINETIS_SRAM_SIZE       (256*1024)   /* 256Kb */
+#  define KINETIS_MPU             1            /* Memory protection unit */
+#  define KINETIS_EXTBUS          1            /* External bus interface */
+#  define KINETIS_NDMACH          16           /* Up to 16 DMA channels */
+#  define KINETIS_NENET           1            /* One IEEE 1588 Ethernet controller */
+#  define KINETIS_NUSBOTG         1            /* With USB OTG controller */
+#  define KINETIS_NUSBDEV         1            /* One USB device controller */
+#  define KINETIS_NSDHC           1            /* SD host controller */
+#  define KINETIS_NI2C            3            /* Three I2C modules */
+#  define KINETIS_NUART           6            /* Six UART modues */
+#  define KINETIS_NSPI            3             Three SPI modules
+#  define KINETIS_NCAN            1            /* One CAN controllers */
+#  define KINETIS_NI2S            1            /* One I2S modules */
+#  define KINETIS_NSLCD           1            /* One segment LCD interface (up to 36x8/40x4) */
+#  define KINETIS_NADC16          2            /* Four 16-bit ADC */
+#  define KINETIS_NCMP            3            /* Three analog comparators */
+#  define KINETIS_NDAC6           3            /* Three 6-bit DAC */
+#  define KINETIS_NDAC12          2            /* Two 12-bit DAC */
+#  define KINETIS_NVREF           1            /* Voltage reference */
+#  define KINETIS_NTIMERS8        2            /* Two 8 channel timers */
+#  define KINETIS_NTIMERS2        2            /* Two 2 channel timers */
+#  define KINETIS_NRTC            1            /* Real time clock */
+#  define KINETIS_NRNG            1            /* Random number generator */
+#  define KINETIS_NMMCAU          1            /* Hardware encryption */
+#  define KINETIS_NCRC            1            /* CRC */
+
+#elif defined(CONFIG_ARCH_CHIP_MK64FX512VLQ12)
+#  undef  KINETIS_K20                          /* Not Kinetics K20 family */
+#  undef  KINETIS_K40                          /* Not Kinetics K40 family */
+#  undef  KINETIS_K60                          /* Not Kinetis K60 family */
+#  define KINETIS_K64             1            /* Kinetis K64 family */
+#  define KINETIS_FLASH_SIZE      (1024*1024)  /* 1Mb */
+#  define KINETIS_FLEXNVM_SIZE    (0*1024)     /* 0Kb  */
+#  define KINETIS_FLEXRAM_SIZE    (4*1024)     /* 4Kb */
+#  define KINETIS_SRAM_SIZE       (256*1024)   /* 256Kb */
+#  define KINETIS_MPU             1            /* Memory protection unit */
+#  define KINETIS_EXTBUS          1            /* External bus interface */
+#  define KINETIS_NDMACH          16           /* Up to 16 DMA channels */
+#  define KINETIS_NENET           1            /* One IEEE 1588 Ethernet controller */
+#  define KINETIS_NUSBOTG         1            /* With USB OTG controller */
+#  define KINETIS_NUSBDEV         1            /* One USB device controller */
+#  define KINETIS_NSDHC           1            /* SD host controller */
+#  define KINETIS_NI2C            3            /* Three I2C modules */
+#  define KINETIS_NUART           6            /* Six UART modues */
+#  define KINETIS_NSPI            3             Three SPI modules
+#  define KINETIS_NCAN            1            /* One CAN controllers */
+#  define KINETIS_NI2S            1            /* One I2S modules */
+#  define KINETIS_NSLCD           1            /* One segment LCD interface (up to 36x8/40x4) */
+#  define KINETIS_NADC16          2            /* Four 16-bit ADC */
+#  define KINETIS_NCMP            3            /* Three analog comparators */
+#  define KINETIS_NDAC6           3            /* Three 6-bit DAC */
+#  define KINETIS_NDAC12          2            /* Two 12-bit DAC */
+#  define KINETIS_NVREF           1            /* Voltage reference */
+#  define KINETIS_NTIMERS8        2            /* Two 8 channel timers */
+#  define KINETIS_NTIMERS2        2            /* Two 2 channel timers */
+#  define KINETIS_NRTC            1            /* Real time clock */
+#  define KINETIS_NRNG            1            /* Random number generator */
+#  define KINETIS_NMMCAU          1            /* Hardware encryption */
+#  define KINETIS_NCRC            1            /* CRC */
+
+#elif defined(CONFIG_ARCH_CHIP_MK64FN1M0VLQ12)
+#  undef  KINETIS_K20                          /* Not Kinetics K20 family */
+#  undef  KINETIS_K40                          /* Not Kinetics K40 family */
+#  undef  KINETIS_K60                          /* Not Kinetis K60 family */
+#  define KINETIS_K64             1            /* Kinetis K64 family */
+#  define KINETIS_FLASH_SIZE      (1024*1024)  /* 1Mb */
+#  define KINETIS_FLEXNVM_SIZE    (0*1024)     /* 0Kb  */
+#  define KINETIS_FLEXRAM_SIZE    (4*1024)     /* 4Kb */
+#  define KINETIS_SRAM_SIZE       (256*1024)   /* 256Kb */
+#  define KINETIS_MPU             1            /* Memory protection unit */
+#  define KINETIS_EXTBUS          1            /* External bus interface */
+#  define KINETIS_NDMACH          16           /* Up to 16 DMA channels */
+#  define KINETIS_NENET           1            /* One IEEE 1588 Ethernet controller */
+#  define KINETIS_NUSBOTG         1            /* With USB OTG controller */
+#  define KINETIS_NUSBDEV         1            /* One USB device controller */
+#  define KINETIS_NSDHC           1            /* SD host controller */
+#  define KINETIS_NI2C            3            /* Three I2C modules */
+#  define KINETIS_NUART           6            /* Six UART modues */
+#  define KINETIS_NSPI            3             Three SPI modules
+#  define KINETIS_NCAN            1            /* One CAN controllers */
+#  define KINETIS_NI2S            1            /* One I2S modules */
+#  define KINETIS_NSLCD           1            /* One segment LCD interface (up to 36x8/40x4) */
+#  define KINETIS_NADC16          2            /* Four 16-bit ADC */
+#  define KINETIS_NCMP            3            /* Three analog comparators */
+#  define KINETIS_NDAC6           3            /* Three 6-bit DAC */
+#  define KINETIS_NDAC12          2            /* Two 12-bit DAC */
+#  define KINETIS_NVREF           1            /* Voltage reference */
+#  define KINETIS_NTIMERS8        2            /* Two 8 channel timers */
+#  define KINETIS_NTIMERS2        2            /* Two 2 channel timers */
+#  define KINETIS_NRTC            1            /* Real time clock */
+#  define KINETIS_NRNG            1            /* Random number generator */
+#  define KINETIS_NMMCAU          1            /* Hardware encryption */
+#  define KINETIS_NCRC            1            /* CRC */
+
+#elif defined(CONFIG_ARCH_CHIP_MK64FX512VMD12)
+#  undef  KINETIS_K20                          /* Not Kinetics K20 family */
+#  undef  KINETIS_K40                          /* Not Kinetics K40 family */
+#  undef  KINETIS_K60                          /* Not Kinetis K60 family */
+#  define KINETIS_K64             1            /* Kinetis K64 family */
+#  define KINETIS_FLASH_SIZE      (1024*1024)  /* 1Mb */
+#  define KINETIS_FLEXNVM_SIZE    (0*1024)     /* 0Kb  */
+#  define KINETIS_FLEXRAM_SIZE    (4*1024)     /* 4Kb */
+#  define KINETIS_SRAM_SIZE       (256*1024)   /* 256Kb */
+#  define KINETIS_MPU             1            /* Memory protection unit */
+#  define KINETIS_EXTBUS          1            /* External bus interface */
+#  define KINETIS_NDMACH          16           /* Up to 16 DMA channels */
+#  define KINETIS_NENET           1            /* One IEEE 1588 Ethernet controller */
+#  define KINETIS_NUSBOTG         1            /* With USB OTG controller */
+#  define KINETIS_NUSBDEV         1            /* One USB device controller */
+#  define KINETIS_NSDHC           1            /* SD host controller */
+#  define KINETIS_NI2C            3            /* Three I2C modules */
+#  define KINETIS_NUART           6            /* Six UART modues */
+#  define KINETIS_NSPI            3             Three SPI modules
+#  define KINETIS_NCAN            1            /* One CAN controllers */
+#  define KINETIS_NI2S            1            /* One I2S modules */
+#  define KINETIS_NSLCD           1            /* One segment LCD interface (up to 36x8/40x4) */
+#  define KINETIS_NADC16          2            /* Four 16-bit ADC */
+#  define KINETIS_NCMP            3            /* Three analog comparators */
+#  define KINETIS_NDAC6           3            /* Three 6-bit DAC */
+#  define KINETIS_NDAC12          2            /* Two 12-bit DAC */
+#  define KINETIS_NVREF           1            /* Voltage reference */
+#  define KINETIS_NTIMERS8        2            /* Two 8 channel timers */
+#  define KINETIS_NTIMERS2        2            /* Two 2 channel timers */
+#  define KINETIS_NRTC            1            /* Real time clock */
+#  define KINETIS_NRNG            1            /* Random number generator */
+#  define KINETIS_NMMCAU          1            /* Hardware encryption */
+#  define KINETIS_NCRC            1            /* CRC */
+//
+#elif defined(CONFIG_ARCH_CHIP_MK64FN1M0VMD12)
+#  undef  KINETIS_K20                          /* Not Kinetics K20 family */
+#  undef  KINETIS_K40                          /* Not Kinetics K40 family */
+#  undef  KINETIS_K60                          /* Not Kinetis K60 family */
+#  define KINETIS_K64             1            /* Kinetis K64 family */
+#  define KINETIS_FLASH_SIZE      (1024*1024)  /* 1Mb */
+#  define KINETIS_FLEXNVM_SIZE    (0*1024)     /* 0Kb  */
+#  define KINETIS_FLEXRAM_SIZE    (4*1024)     /* 4Kb */
+#  define KINETIS_SRAM_SIZE       (256*1024)   /* 256Kb */
+#  define KINETIS_MPU             1            /* Memory protection unit */
+#  define KINETIS_EXTBUS          1            /* External bus interface */
+#  define KINETIS_NDMACH          16           /* Up to 16 DMA channels */
+#  define KINETIS_NENET           1            /* One IEEE 1588 Ethernet controller */
+#  define KINETIS_NUSBOTG         1            /* With USB OTG controller */
+#  define KINETIS_NUSBDEV         1            /* One USB device controller */
+#  define KINETIS_NSDHC           1            /* SD host controller */
+#  define KINETIS_NI2C            3            /* Three I2C modules */
+#  define KINETIS_NUART           6            /* Six UART modues */
+#  define KINETIS_NSPI            3             Three SPI modules
+#  define KINETIS_NCAN            1            /* One CAN controllers */
+#  define KINETIS_NI2S            1            /* One I2S modules */
+#  define KINETIS_NSLCD           1            /* One segment LCD interface (up to 36x8/40x4) */
+#  define KINETIS_NADC16          2            /* Four 16-bit ADC */
+#  define KINETIS_NCMP            3            /* Three analog comparators */
+#  define KINETIS_NDAC6           3            /* Three 6-bit DAC */
+#  define KINETIS_NDAC12          2            /* Two 12-bit DAC */
+#  define KINETIS_NVREF           1            /* Voltage reference */
+#  define KINETIS_NTIMERS8        2            /* Two 8 channel timers */
+#  define KINETIS_NTIMERS2        2            /* Two 2 channel timers */
+#  define KINETIS_NRTC            1            /* Real time clock */
+#  define KINETIS_NRNG            1            /* Random number generator */
+#  define KINETIS_NMMCAU          1            /* Hardware encryption */
+#  define KINETIS_NCRC            1            /* CRC */
+
 #else
 #  error "Unsupported Kinetis chip"
 #endif
diff --git a/arch/arm/include/kinetis/irq.h b/arch/arm/include/kinetis/irq.h
index 16b59ab8ae..1e45a5b4c6 100644
--- a/arch/arm/include/kinetis/irq.h
+++ b/arch/arm/include/kinetis/irq.h
@@ -83,7 +83,7 @@
  * K20P64M72SF1RM
  */
 
-#if defined(CONFIG_ARCH_CHIP_MK20DX256VLH7)
+#if defined(CONFIG_ARCH_FAMILY_K20)
 #  define KINETIS_IRQ_DMACH0      (16)  /* Vector 16: DMA channel 0 transfer complete */
 #  define KINETIS_IRQ_DMACH1      (17)  /* Vector 17: DMA channel 1 transfer complete */
 #  define KINETIS_IRQ_DMACH2      (18)  /* Vector 18: DMA channel 2 transfer complete */
@@ -162,9 +162,7 @@
  * K40P144M100SF2RM
  */
 
-#elif defined(CONFIG_ARCH_CHIP_MK40X128VLQ100) || defined(CONFIG_ARCH_CHIP_MK40X128VMD100) || \
-    defined(CONFIG_ARCH_CHIP_MK40X256VLQ100) || defined(CONFIG_ARCH_CHIP_MK40X256VMD100) || \
-    defined(CONFIG_ARCH_CHIP_MK40N512VLQ100) || defined(CONFIG_ARCH_CHIP_MK40N512VMD100)
+#elif defined(CONFIG_ARCH_FAMILY_K40)
 
 #  define KINETIS_IRQ_DMACH0      (16)  /* Vector 16: DMA channel 0 transfer complete */
 #  define KINETIS_IRQ_DMACH1      (17)  /* Vector 17: DMA channel 1 transfer complete */
@@ -274,10 +272,7 @@
  * K60P144M100SF2RM
  */
 
-#elif defined(CONFIG_ARCH_CHIP_MK60N256VLQ100) || defined(CONFIG_ARCH_CHIP_MK60X256VLQ100) || \
-      defined(CONFIG_ARCH_CHIP_MK60N512VLQ100) || defined(CONFIG_ARCH_CHIP_MK60N256VMD100) || \
-      defined(CONFIG_ARCH_CHIP_MK60X256VMD100) || defined(CONFIG_ARCH_CHIP_MK60N512VMD100) || \
-      defined(CONFIG_ARCH_CHIP_MK60N512VLL100)
+#elif defined(CONFIG_ARCH_FAMILY_K60)
 
 #  define KINETIS_IRQ_DMACH0      (16)  /* Vector 16: DMA channel 0 transfer complete */
 #  define KINETIS_IRQ_DMACH1      (17)  /* Vector 17: DMA channel 1 transfer complete */
@@ -383,6 +378,105 @@
 #  define NR_VECTORS              (120) /* 120 vectors */
 #  define NR_IRQS                 (108) /* 120 interrupts but 108 IRQ numbers */
 
+/* K64 Family ***********************************************************************
+ *
+ * The memory map for the following parts is defined in NXP document
+ * K64P144M120SF5RM.pdf
+ */
+
+#elif defined(CONFIG_ARCH_FAMILY_K64)
+
+#  define KINETIS_IRQ_DMACH0      (16)  /* Vector 16: DMA channel 0 transfer complete */
+#  define KINETIS_IRQ_DMACH1      (17)  /* Vector 17: DMA channel 1 transfer complete */
+#  define KINETIS_IRQ_DMACH2      (18)  /* Vector 18: DMA channel 2 transfer complete */
+#  define KINETIS_IRQ_DMACH3      (19)  /* Vector 19: DMA channel 3 transfer complete */
+#  define KINETIS_IRQ_DMACH4      (20)  /* Vector 20: DMA channel 4 transfer complete */
+#  define KINETIS_IRQ_DMACH5      (21)  /* Vector 21: DMA channel 5 transfer complete */
+#  define KINETIS_IRQ_DMACH6      (22)  /* Vector 22: DMA channel 6 transfer complete */
+#  define KINETIS_IRQ_DMACH7      (23)  /* Vector 23: DMA channel 7 transfer complete */
+#  define KINETIS_IRQ_DMACH8      (24)  /* Vector 24: DMA channel 8 transfer complete */
+#  define KINETIS_IRQ_DMACH9      (25)  /* Vector 25: DMA channel 9 transfer complete */
+#  define KINETIS_IRQ_DMACH10     (26)  /* Vector 26: DMA channel 10 transfer complete */
+#  define KINETIS_IRQ_DMACH11     (27)  /* Vector 27: DMA channel 11 transfer complete */
+#  define KINETIS_IRQ_DMACH12     (28)  /* Vector 28: DMA channel 12 transfer complete */
+#  define KINETIS_IRQ_DMACH13     (29)  /* Vector 29: DMA channel 13 transfer complete */
+#  define KINETIS_IRQ_DMACH14     (30)  /* Vector 30: DMA channel 14 transfer complete */
+#  define KINETIS_IRQ_DMACH15     (31)  /* Vector 31: DMA channel 15 transfer complete */
+#  define KINETIS_IRQ_DMAERR      (32)  /* Vector 32: DMA error interrupt channels 0-15 */
+#  define KINETIS_IRQ_MCM         (33)  /* Vector 33: MCM Normal interrupt */
+#  define KINETIS_IRQ_FLASHCC     (34)  /* Vector 34: Flash memory command complete */
+#  define KINETIS_IRQ_FLASHRC     (35)  /* Vector 35: Flash memory read collision */
+#  define KINETIS_IRQ_SMCLVD      (36)  /* Vector 36: Mode Controller low-voltage
+                                         *            detect, low-voltage warning */
+#  define KINETIS_IRQ_LLWU        (37)  /* Vector 37: LLWU Normal Low Leakage Wakeup */
+#  define KINETIS_IRQ_WDOG        (38)  /* Vector 38: Watchdog */
+#  define KINETIS_IRQ_RNGB        (39)  /* Vector 39: Random number generator */
+#  define KINETIS_IRQ_I2C0        (40)  /* Vector 40: I2C0 */
+#  define KINETIS_IRQ_I2C1        (41)  /* Vector 41: I2C1 */
+#  define KINETIS_IRQ_SPI0        (42)  /* Vector 42: SPI0 all sources */
+#  define KINETIS_IRQ_SPI1        (43)  /* Vector 43: SPI1 all sources */
+#  define KINETIS_IRQ_I2S0        (44)  /* Vector 44: Transmit */
+#  define KINETIS_IRQ_I2S1        (45)  /* Vector 45: Transmit */
+                                        /* Vector 46: Reserved */
+#  define KINETIS_IRQ_UART0S      (47)  /* Vector 47: UART0 status */
+#  define KINETIS_IRQ_UART0E      (48)  /* Vector 48: UART0 error */
+#  define KINETIS_IRQ_UART1S      (49)  /* Vector 49: UART1 status */
+#  define KINETIS_IRQ_UART1E      (50)  /* Vector 50: UART1 error */
+#  define KINETIS_IRQ_UART2S      (51)  /* Vector 51: UART2 status */
+#  define KINETIS_IRQ_UART2E      (52)  /* Vector 52: UART2 error */
+#  define KINETIS_IRQ_UART3S      (53)  /* Vector 53: UART3 status */
+#  define KINETIS_IRQ_UART3E      (54)  /* Vector 54: UART3 error */
+#  define KINETIS_IRQ_ADC0        (55)  /* Vector 55: ADC0 */
+#  define KINETIS_IRQ_CMP0        (56)  /* Vector 56: CMP0 */
+#  define KINETIS_IRQ_CMP1        (57)  /* Vector 57: CMP1 */
+#  define KINETIS_IRQ_FTM0        (58)  /* Vector 58: FTM0 all sources */
+#  define KINETIS_IRQ_FTM1        (59)  /* Vector 59: FTM1 all sources */
+#  define KINETIS_IRQ_FTM2        (60)  /* Vector 60: FTM2 all sources */
+#  define KINETIS_IRQ_CMT         (61)  /* Vector 61: CMT */
+#  define KINETIS_IRQ_RTC0        (62)  /* Vector 62: RTC alarm interrupt */
+#  define KINETIS_IRQ_RTC1        (63)  /* Vector 63: RTC seconds interrupt */
+#  define KINETIS_IRQ_PITCH0      (64)  /* Vector 64: PIT channel 0 */
+#  define KINETIS_IRQ_PITCH1      (65)  /* Vector 65: PIT channel 1 */
+#  define KINETIS_IRQ_PITCH2      (66)  /* Vector 66: PIT channel 2 */
+#  define KINETIS_IRQ_PITCH3      (67)  /* Vector 67: PIT channel 3 */
+#  define KINETIS_IRQ_PDB         (68)  /* Vector 68: PDB */
+#  define KINETIS_IRQ_USBOTG      (69)  /* Vector 68: USB OTG */
+#  define KINETIS_IRQ_USBCD       (70)  /* Vector 70: USB charger detect */
+                                        /* Vector 71: Reserved */
+#  define KINETIS_IRQ_DAC0        (72)  /* Vector 72: DAC0 */
+#  define KINETIS_IRQ_MCG         (73)  /* Vector 73: MCG */
+#  define KINETIS_IRQ_LPT         (74)  /* Vector 74: Low power timer */
+#  define KINETIS_IRQ_PORTA       (75)  /* Vector 75: Pin detect port A */
+#  define KINETIS_IRQ_PORTB       (76)  /* Vector 76: Pin detect port B */
+#  define KINETIS_IRQ_PORTC       (77)  /* Vector 77: Pin detect port C */
+#  define KINETIS_IRQ_PORTD       (78)  /* Vector 78: Pin detect port D */
+#  define KINETIS_IRQ_PORTE       (79)  /* Vector 79: Pin detect port E */
+#  define KINETIS_IRQ_SOFTWARE    (80)  /* Vector 80: Software interrupt */
+#  define KINETIS_IRQ_SPI2        (81)  /* Vector 81: SPI2 all sources */
+#  define KINETIS_IRQ_UART4S      (82)  /* Vector 82: UART4 status */
+#  define KINETIS_IRQ_UART4E      (83)  /* Vector 83: UART4 error */
+#  define KINETIS_IRQ_UART5S      (84)  /* Vector 84: UART5 status */
+#  define KINETIS_IRQ_UART5E      (85)  /* Vector 85: UART5 error */
+#  define KINETIS_IRQ_CMP2        (86)  /* Vector 86: CMP2 */
+#  define KINETIS_IRQ_FTM3        (87)  /* Vector 87: FTM3 all sources */
+#  define KINETIS_IRQ_DAC1        (88)  /* Vector 88: DAC1 */
+#  define KINETIS_IRQ_ADC1        (89)  /* Vector 89: ADC1 */
+#  define KINETIS_IRQ_I2C2        (90)  /* Vector 90: I2C2 */
+#  define KINETIS_IRQ_CAN0MB      (91)  /* Vector 91: CAN0 OR'ed Message buffer (0-15) */
+#  define KINETIS_IRQ_CAN0BO      (92)  /* Vector 92: CAN0 Bus Off */
+#  define KINETIS_IRQ_CAN0ERR     (93)  /* Vector 93: CAN0 Error */
+#  define KINETIS_IRQ_CAN0TW      (94)  /* Vector 94: CAN0 Transmit Warning */
+#  define KINETIS_IRQ_CAN0RW      (95)  /* Vector 95: CAN0 Receive Warning */
+#  define KINETIS_IRQ_CAN0WU      (96)  /* Vector 96: CAN0 Wake UP */
+#  define KINETIS_IRQ_SDHC        (97)  /* Vector 97: SDHC */
+#  define KINETIS_IRQ_EMACTMR     (98)  /* Vector 91: Ethernet MAC IEEE 1588 timer interrupt */
+#  define KINETIS_IRQ_EMACTX      (99)  /* Vector 92: Ethernet MAC transmit interrupt */
+#  define KINETIS_IRQ_EMACRX      (100) /* Vector 93: Ethernet MAC receive interrupt */
+#  define KINETIS_IRQ_EMACMISC    (101) /* Vector 94: Ethernet MAC error and misc interrupt */
+
+#  define NR_VECTORS              (102) /* 102 vectors */
+#  define NR_IRQS                 (102) /* 85 interrupts but 102 IRQ numbers */
+
 #else
   /* The interrupt vectors for other parts are defined in other documents and may or
    * may not be the same as above (the family members are all very similar)  This
diff --git a/arch/arm/src/kinetis/Kconfig b/arch/arm/src/kinetis/Kconfig
index 5710c2d32c..55a6930211 100644
--- a/arch/arm/src/kinetis/Kconfig
+++ b/arch/arm/src/kinetis/Kconfig
@@ -98,6 +98,34 @@ config ARCH_CHIP_MK60X256VMD100
 	bool "MK60X256VMD100"
 	select ARCH_FAMILY_K60
 
+config ARCH_CHIP_MK64FN1M0VLL12
+	bool "MK64FN1M0VLL12"
+	select ARCH_FAMILY_K64
+
+config ARCH_CHIP_MK64FX512VLL12
+	bool "MK64FX512VLL12"
+	select ARCH_FAMILY_K64
+
+config ARCH_CHIP_MK64FX512VDC12
+	bool "MK64FX512VDC12"
+	select ARCH_FAMILY_K64
+
+config ARCH_CHIP_MK64FN1M0VDC12
+	bool "MK64FN1M0VDC12"
+	select ARCH_FAMILY_K64
+
+config ARCH_CHIP_MK64FX512VLQ12
+	bool "MK64FX512VLQ12"
+	select ARCH_FAMILY_K64
+
+config ARCH_CHIP_MK64FX512VMD12
+	bool "MK64FX512VMD12"
+	select ARCH_FAMILY_K64
+
+config ARCH_CHIP_MK64FN1M0VMD12
+	bool "MK64FN1M0VMD12"
+	select ARCH_FAMILY_K64
+
 endchoice
 
 # Chip families
@@ -114,6 +142,10 @@ config ARCH_FAMILY_K60
 	bool
 	default n
 
+config ARCH_FAMILY_K64
+	bool
+	default n
+
 menu "Kinetis Peripheral Support"
 
 config KINETIS_TRACE
diff --git a/arch/arm/src/kinetis/kinetis_adc.h b/arch/arm/src/kinetis/chip/kinetis_adc.h
similarity index 93%
rename from arch/arm/src/kinetis/kinetis_adc.h
rename to arch/arm/src/kinetis/chip/kinetis_adc.h
index a17aa06c7f..6b3b74fa9c 100644
--- a/arch/arm/src/kinetis/kinetis_adc.h
+++ b/arch/arm/src/kinetis/chip/kinetis_adc.h
@@ -1,7 +1,7 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/kinetis_adc.h
+ * arch/arm/src/kinetis/chip/kinetis_adc.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_ADC_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_ADC_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_ADC_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_ADC_H
 
 /********************************************************************************************
  * Included Files
@@ -70,7 +70,9 @@
 #define KINETIS_ADC_CLP2_OFFSET  0x0044 /* ADC plus-side general calibration value register */
 #define KINETIS_ADC_CLP1_OFFSET  0x0048 /* ADC plus-side general calibration value register */
 #define KINETIS_ADC_CLP0_OFFSET  0x004c /* ADC plus-side general calibration value register */
-#define KINETIS_ADC_PGA_OFFSET   0x0050 /* ADC PGA register */
+#ifndef KINETIS_K64
+#  define KINETIS_ADC_PGA_OFFSET 0x0050 /* ADC PGA register */
+#endif
 #define KINETIS_ADC_CLMD_OFFSET  0x0054 /* ADC minus-side general calibration value register */
 #define KINETIS_ADC_CLMS_OFFSET  0x0058 /* ADC minus-side general calibration value register */
 #define KINETIS_ADC_CLM4_OFFSET  0x005c /* ADC minus-side general calibration value register */
@@ -80,7 +82,7 @@
 #define KINETIS_ADC_CLM0_OFFSET  0x006c /* ADC minus-side general calibration value register */
 
 /* Register Addresses ***********************************************************************/
-# define KINETIS_ADC1_BASE      0x400bb000 /* Analog-to-digital converter (ADC) 1 */
+# define KINETIS_ADC1_BASE       0x400bb000 /* Analog-to-digital converter (ADC) 1 */
 
 #define KINETIS_ADC0_SC1A        (KINETIS_ADC0_BASE+KINETIS_ADC_SC1A_OFFSET)
 #define KINETIS_ADC0_SC1B        (KINETIS_ADC0_BASE+KINETIS_ADC_SC1B_OFFSET)
@@ -102,7 +104,9 @@
 #define KINETIS_ADC0_CLP2        (KINETIS_ADC0_BASE+KINETIS_ADC_CLP2_OFFSET)
 #define KINETIS_ADC0_CLP1        (KINETIS_ADC0_BASE+KINETIS_ADC_CLP1_OFFSET)
 #define KINETIS_ADC0_CLP0        (KINETIS_ADC0_BASE+KINETIS_ADC_CLP0_OFFSET)
-#define KINETIS_ADC0_PGA         (KINETIS_ADC0_BASE+KINETIS_ADC_PGA_OFFSET)
+#ifndef KINETIS_K64
+#  define KINETIS_ADC0_PGA       (KINETIS_ADC0_BASE+KINETIS_ADC_PGA_OFFSET)
+#endif
 #define KINETIS_ADC0_CLMD        (KINETIS_ADC0_BASE+KINETIS_ADC_CLMD_OFFSET)
 #define KINETIS_ADC0_CLMS        (KINETIS_ADC0_BASE+KINETIS_ADC_CLMS_OFFSET)
 #define KINETIS_ADC0_CLM4        (KINETIS_ADC0_BASE+KINETIS_ADC_CLM4_OFFSET)
@@ -131,7 +135,9 @@
 #define KINETIS_ADC1_CLP2        (KINETIS_ADC1_BASE+KINETIS_ADC_CLP2_OFFSET)
 #define KINETIS_ADC1_CLP1        (KINETIS_ADC1_BASE+KINETIS_ADC_CLP1_OFFSET)
 #define KINETIS_ADC1_CLP0        (KINETIS_ADC1_BASE+KINETIS_ADC_CLP0_OFFSET)
-#define KINETIS_ADC1_PGA         (KINETIS_ADC1_BASE+KINETIS_ADC_PGA_OFFSET)
+#ifndef KINETIS_K64
+#  define KINETIS_ADC1_PGA       (KINETIS_ADC1_BASE+KINETIS_ADC_PGA_OFFSET)
+#endif
 #define KINETIS_ADC1_CLMD        (KINETIS_ADC1_BASE+KINETIS_ADC_CLMD_OFFSET)
 #define KINETIS_ADC1_CLMS        (KINETIS_ADC1_BASE+KINETIS_ADC_CLMS_OFFSET)
 #define KINETIS_ADC1_CLM4        (KINETIS_ADC1_BASE+KINETIS_ADC_CLM4_OFFSET)
@@ -272,22 +278,26 @@
 #define ADC_CLP0_MASK             (0x3f)    /* Bits 0-5: Calibration value */
 
 /* ADC PGA register */
+
+#ifndef KINETIS_K64
                                             /* Bits 0-15: Reserved */
-#define ADC_PGA_PGAG_SHIFT        (16)      /* Bits 16-19: PGA gain setting*/
-#define ADC_PGA_PGAG_MASK         (15 << ADC_PGA_PGAG_SHIFT)
-#  define ADC_PGA_PGAG_1          (0 << ADC_PGA_PGAG_SHIFT)
-#  define ADC_PGA_PGAG_2          (1 << ADC_PGA_PGAG_SHIFT)
-#  define ADC_PGA_PGAG_4          (2 << ADC_PGA_PGAG_SHIFT)
-#  define ADC_PGA_PGAG_8          (3 << ADC_PGA_PGAG_SHIFT)
-#  define ADC_PGA_PGAG_16         (4 << ADC_PGA_PGAG_SHIFT)
-#  define ADC_PGA_PGAG_32         (5 << ADC_PGA_PGAG_SHIFT)
-#  define ADC_PGA_PGAG_64         (6 << ADC_PGA_PGAG_SHIFT)
-#ifdef KINETIS_K40
-#  define ADC_PGA_PGALP           (1 << 20) /* Bit 20:  PGA low-power mode control */
-#endif
+#  define ADC_PGA_PGAG_SHIFT      (16)      /* Bits 16-19: PGA gain setting*/
+#  define ADC_PGA_PGAG_MASK       (15 << ADC_PGA_PGAG_SHIFT)
+#    define ADC_PGA_PGAG_1        (0 << ADC_PGA_PGAG_SHIFT)
+#    define ADC_PGA_PGAG_2        (1 << ADC_PGA_PGAG_SHIFT)
+#    define ADC_PGA_PGAG_4        (2 << ADC_PGA_PGAG_SHIFT)
+#    define ADC_PGA_PGAG_8        (3 << ADC_PGA_PGAG_SHIFT)
+#    define ADC_PGA_PGAG_16       (4 << ADC_PGA_PGAG_SHIFT)
+#    define ADC_PGA_PGAG_32       (5 << ADC_PGA_PGAG_SHIFT)
+#    define ADC_PGA_PGAG_64       (6 << ADC_PGA_PGAG_SHIFT)
+#  ifdef KINETIS_K40
+#    define ADC_PGA_PGALP         (1 << 20) /* Bit 20:  PGA low-power mode control */
+#  endif
                                             /* Bits 21-22: Reserved */
-#define ADC_PGA_PGAEN             (1 << 23) /* Bit 23:  PGA enable*/
+#  define ADC_PGA_PGAEN           (1 << 23) /* Bit 23:  PGA enable*/
                                             /* Bits 24-31: Reserved */
+#endif
+
 /* ADC minus-side general calibration value registers */
 
 #define ADC_CLMD_MASK             (0x3f)    /* Bits 0-5: Calibration value */
@@ -310,4 +320,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_ADC_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_ADC_H */
diff --git a/arch/arm/src/kinetis/kinetis_aips.h b/arch/arm/src/kinetis/chip/kinetis_aips.h
similarity index 87%
rename from arch/arm/src/kinetis/kinetis_aips.h
rename to arch/arm/src/kinetis/chip/kinetis_aips.h
index 8f460567f7..a8050fb613 100644
--- a/arch/arm/src/kinetis/kinetis_aips.h
+++ b/arch/arm/src/kinetis/chip/kinetis_aips.h
@@ -1,7 +1,7 @@
 /************************************************************************************
- * arch/arm/src/kinetis/kinetis_aips.h
+ * arch/arm/src/kinetis/chip/kinetis_aips.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_AIPS_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_AIPS_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_AIPS_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_AIPS_H
 
 /************************************************************************************
  * Included Files
@@ -68,6 +68,9 @@
 #define KINETIS_AIPS_PACRN_OFFSET   0x0064 /* Peripheral Access Control Register */
 #define KINETIS_AIPS_PACRO_OFFSET   0x0068 /* Peripheral Access Control Register */
 #define KINETIS_AIPS_PACRP_OFFSET   0x006c /* Peripheral Access Control Register */
+#ifdef KINETIS_K64
+#  define KINETIS_AIPS_PACRU_OFFSET 0x0080 /* Peripheral Access Control Register */
+#endif
 
 /* Register Addresses ***************************************************************/
 
@@ -88,24 +91,30 @@
 #define KINETIS_AIPS0_PACRN         (KINETIS_AIPS0_BASE+KINETIS_AIPS_PACRN_OFFSET)
 #define KINETIS_AIPS0_PACRO         (KINETIS_AIPS0_BASE+KINETIS_AIPS_PACRO_OFFSET)
 #define KINETIS_AIPS0_PACRP         (KINETIS_AIPS0_BASE+KINETIS_AIPS_PACRP_OFFSET)
-
-#define KINETIS_AIPS1_MPRA          (KINETIS_AIPS0_BASE+KINETIS_AIPS_MPRA_OFFSET)
-#define KINETIS_AIPS1_PACRA         (KINETIS_AIPS0_BASE+KINETIS_AIPS_PACRA_OFFSET)
-#define KINETIS_AIPS1_PACRB         (KINETIS_AIPS0_BASE+KINETIS_AIPS_PACRB_OFFSET)
-#define KINETIS_AIPS1_PACRC         (KINETIS_AIPS0_BASE+KINETIS_AIPS_PACRC_OFFSET)
-#define KINETIS_AIPS1_PACRD         (KINETIS_AIPS0_BASE+KINETIS_AIPS_PACRD_OFFSET)
-#define KINETIS_AIPS1_PACRE         (KINETIS_AIPS0_BASE+KINETIS_AIPS_PACRE_OFFSET)
-#define KINETIS_AIPS1_PACRF         (KINETIS_AIPS0_BASE+KINETIS_AIPS_PACRF_OFFSET)
-#define KINETIS_AIPS1_PACRG         (KINETIS_AIPS0_BASE+KINETIS_AIPS_PACRG_OFFSET)
-#define KINETIS_AIPS1_PACRH         (KINETIS_AIPS0_BASE+KINETIS_AIPS_PACRH_OFFSET)
-#define KINETIS_AIPS1_PACRI         (KINETIS_AIPS0_BASE+KINETIS_AIPS_PACRI_OFFSET)
-#define KINETIS_AIPS1_PACRJ         (KINETIS_AIPS0_BASE+KINETIS_AIPS_PACRJ_OFFSET)
-#define KINETIS_AIPS1_PACRK         (KINETIS_AIPS0_BASE+KINETIS_AIPS_PACRK_OFFSET)
-#define KINETIS_AIPS1_PACRL         (KINETIS_AIPS0_BASE+KINETIS_AIPS_PACRL_OFFSET)
-#define KINETIS_AIPS1_PACRM         (KINETIS_AIPS0_BASE+KINETIS_AIPS_PACRM_OFFSET)
-#define KINETIS_AIPS1_PACRN         (KINETIS_AIPS0_BASE+KINETIS_AIPS_PACRN_OFFSET)
-#define KINETIS_AIPS1_PACRO         (KINETIS_AIPS0_BASE+KINETIS_AIPS_PACRO_OFFSET)
-#define KINETIS_AIPS1_PACRP         (KINETIS_AIPS0_BASE+KINETIS_AIPS_PACRP_OFFSET)
+#ifdef KINETIS_K64
+#  define KINETIS_AIPS0_PACRU       (KINETIS_AIPS0_BASE+KINETIS_AIPS_PACRU_OFFSET)
+#endif
+
+#define KINETIS_AIPS1_MPRA          (KINETIS_AIPS1_BASE+KINETIS_AIPS_MPRA_OFFSET)
+#define KINETIS_AIPS1_PACRA         (KINETIS_AIPS1_BASE+KINETIS_AIPS_PACRA_OFFSET)
+#define KINETIS_AIPS1_PACRB         (KINETIS_AIPS1_BASE+KINETIS_AIPS_PACRB_OFFSET)
+#define KINETIS_AIPS1_PACRC         (KINETIS_AIPS1_BASE+KINETIS_AIPS_PACRC_OFFSET)
+#define KINETIS_AIPS1_PACRD         (KINETIS_AIPS1_BASE+KINETIS_AIPS_PACRD_OFFSET)
+#define KINETIS_AIPS1_PACRE         (KINETIS_AIPS1_BASE+KINETIS_AIPS_PACRE_OFFSET)
+#define KINETIS_AIPS1_PACRF         (KINETIS_AIPS1_BASE+KINETIS_AIPS_PACRF_OFFSET)
+#define KINETIS_AIPS1_PACRG         (KINETIS_AIPS1_BASE+KINETIS_AIPS_PACRG_OFFSET)
+#define KINETIS_AIPS1_PACRH         (KINETIS_AIPS1_BASE+KINETIS_AIPS_PACRH_OFFSET)
+#define KINETIS_AIPS1_PACRI         (KINETIS_AIPS1_BASE+KINETIS_AIPS_PACRI_OFFSET)
+#define KINETIS_AIPS1_PACRJ         (KINETIS_AIPS1_BASE+KINETIS_AIPS_PACRJ_OFFSET)
+#define KINETIS_AIPS1_PACRK         (KINETIS_AIPS1_BASE+KINETIS_AIPS_PACRK_OFFSET)
+#define KINETIS_AIPS1_PACRL         (KINETIS_AIPS1_BASE+KINETIS_AIPS_PACRL_OFFSET)
+#define KINETIS_AIPS1_PACRM         (KINETIS_AIPS1_BASE+KINETIS_AIPS_PACRM_OFFSET)
+#define KINETIS_AIPS1_PACRN         (KINETIS_AIPS1_BASE+KINETIS_AIPS_PACRN_OFFSET)
+#define KINETIS_AIPS1_PACRO         (KINETIS_AIPS1_BASE+KINETIS_AIPS_PACRO_OFFSET)
+#define KINETIS_AIPS1_PACRP         (KINETIS_AIPS1_BASE+KINETIS_AIPS_PACRP_OFFSET)
+#ifdef KINETIS_K64
+#  define KINETIS_AIPS1_PACRU       (KINETIS_AIPS1_BASE+KINETIS_AIPS_PACRU_OFFSET)
+#endif
 
 /* Register Bit Definitions *********************************************************/
 
@@ -205,4 +214,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_AIPS_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_AIPS_H */
diff --git a/arch/arm/src/kinetis/kinetis_axbs.h b/arch/arm/src/kinetis/chip/kinetis_axbs.h
similarity index 98%
rename from arch/arm/src/kinetis/kinetis_axbs.h
rename to arch/arm/src/kinetis/chip/kinetis_axbs.h
index bf8543d4da..7aab308593 100644
--- a/arch/arm/src/kinetis/kinetis_axbs.h
+++ b/arch/arm/src/kinetis/chip/kinetis_axbs.h
@@ -1,7 +1,7 @@
 /************************************************************************************
- * arch/arm/src/kinetis/kinetis_axbs.h
+ * arch/arm/src/kinetis/chip/kinetis_axbs.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_AXBS_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_AXBS_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_AXBS_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_AXBS_H
 
 /************************************************************************************
  * Included Files
@@ -248,4 +248,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_AXBS_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_AXBS_H */
diff --git a/arch/arm/src/kinetis/kinetis_clockconfig.c b/arch/arm/src/kinetis/kinetis_clockconfig.c
index 5abe874271..22f840a4dd 100644
--- a/arch/arm/src/kinetis/kinetis_clockconfig.c
+++ b/arch/arm/src/kinetis/kinetis_clockconfig.c
@@ -373,6 +373,3 @@ kinesis_setdividers(uint32_t div1, uint32_t div2, uint32_t div3, uint32_t div4)
 
   putreg32(regval, KINETIS_FMC_PFAPR);
 }
-
-
-
diff --git a/arch/arm/src/kinetis/kinetis_config.h b/arch/arm/src/kinetis/kinetis_config.h
index ce1c6efedf..1ce2e7ee5e 100644
--- a/arch/arm/src/kinetis/kinetis_config.h
+++ b/arch/arm/src/kinetis/kinetis_config.h
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETISXX_KINETIS_CONFIG_H
-#define __ARCH_ARM_SRC_KINETISXX_KINETIS_CONFIG_H
+#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_CONFIG_H
+#define __ARCH_ARM_SRC_KINETIS_KINETIS_CONFIG_H
 
 /************************************************************************************
  * Included Files
@@ -232,4 +232,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETISXX_KINETIS_CONFIG_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_CONFIG_H */
-- 
GitLab


From 62a9b10b3d2e6ad7c65b51835a9b3e9669328879 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Fri, 1 Jul 2016 11:55:15 -0600
Subject: [PATCH 122/229] arch/arm/kinetis:  Still moving register header files
 to kinetis/chip directory; still incorporating K64 differences.

---
 arch/arm/src/kinetis/{ => chip}/kinetis_cmp.h | 14 ++--
 arch/arm/src/kinetis/{ => chip}/kinetis_cmt.h | 10 +--
 arch/arm/src/kinetis/{ => chip}/kinetis_crc.h | 30 ++++-----
 arch/arm/src/kinetis/{ => chip}/kinetis_dac.h | 10 +--
 arch/arm/src/kinetis/{ => chip}/kinetis_dma.h | 64 ++++++++++---------
 .../src/kinetis/{ => chip}/kinetis_dmamux.h   | 10 +--
 .../arm/src/kinetis/{ => chip}/kinetis_dspi.h | 10 +--
 .../arm/src/kinetis/{ => chip}/kinetis_enet.h | 10 +--
 arch/arm/src/kinetis/{ => chip}/kinetis_ewm.h | 10 +--
 .../src/kinetis/{ => chip}/kinetis_flexbus.h  | 10 +--
 .../src/kinetis/{ => chip}/kinetis_flexcan.h  | 10 +--
 arch/arm/src/kinetis/kinetis_enet.c           |  4 +-
 12 files changed, 99 insertions(+), 93 deletions(-)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_cmp.h (96%)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_cmt.h (96%)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_crc.h (85%)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_dac.h (98%)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_dma.h (96%)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_dmamux.h (95%)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_dspi.h (98%)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_enet.h (99%)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_ewm.h (93%)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_flexbus.h (97%)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_flexcan.h (98%)

diff --git a/arch/arm/src/kinetis/kinetis_cmp.h b/arch/arm/src/kinetis/chip/kinetis_cmp.h
similarity index 96%
rename from arch/arm/src/kinetis/kinetis_cmp.h
rename to arch/arm/src/kinetis/chip/kinetis_cmp.h
index 822b7a339f..09e9eb19f6 100644
--- a/arch/arm/src/kinetis/kinetis_cmp.h
+++ b/arch/arm/src/kinetis/chip/kinetis_cmp.h
@@ -1,7 +1,7 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/kinetis_cmp.h
+ * arch/arm/src/kinetis/chip/kinetis_cmp.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_CMP_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_CMP_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CMP_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CMP_H
 
 /********************************************************************************************
  * Included Files
@@ -172,7 +172,9 @@
 #  define CMP_MUXCR_PSEL_IN5      (5 << CMP_MUXCR_PSEL_SHIFT)
 #  define CMP_MUXCR_PSEL_IN6      (6 << CMP_MUXCR_PSEL_SHIFT)
 #  define CMP_MUXCR_PSEL_IN7      (7 << CMP_MUXCR_PSEL_SHIFT)
-#define CMP_MUXCR_MEN             (1 << 6)  /* Bit 6:  MMUX Enable */
+#ifndef KINETIS_K64
+#  define CMP_MUXCR_MEN           (1 << 6)  /* Bit 6:  MMUX Enable */
+#endif
 #define CMP_MUXCR_PEN             (1 << 7)  /* Bit 7:  PMUX Enable */
 
 /********************************************************************************************
@@ -187,4 +189,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_CMP_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CMP_H */
diff --git a/arch/arm/src/kinetis/kinetis_cmt.h b/arch/arm/src/kinetis/chip/kinetis_cmt.h
similarity index 96%
rename from arch/arm/src/kinetis/kinetis_cmt.h
rename to arch/arm/src/kinetis/chip/kinetis_cmt.h
index c3c47bb676..e86720db91 100644
--- a/arch/arm/src/kinetis/kinetis_cmt.h
+++ b/arch/arm/src/kinetis/chip/kinetis_cmt.h
@@ -1,7 +1,7 @@
 /************************************************************************************
- * arch/arm/src/kinetis/kinetis_cmt.h
+ * arch/arm/src/kinetis/chip/kinetis_cmt.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_CMT_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_CMT_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CMT_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CMT_H
 
 /************************************************************************************
  * Included Files
@@ -135,4 +135,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_CMT_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CMT_H */
diff --git a/arch/arm/src/kinetis/kinetis_crc.h b/arch/arm/src/kinetis/chip/kinetis_crc.h
similarity index 85%
rename from arch/arm/src/kinetis/kinetis_crc.h
rename to arch/arm/src/kinetis/chip/kinetis_crc.h
index 7b590cf3a9..d2f0fc7fdd 100644
--- a/arch/arm/src/kinetis/kinetis_crc.h
+++ b/arch/arm/src/kinetis/chip/kinetis_crc.h
@@ -1,7 +1,7 @@
 /************************************************************************************
- * arch/arm/src/kinetis/kinetis_crc.h
+ * arch/arm/src/kinetis/chip/kinetis_crc.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_CRC_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_CRC_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CRC_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CRC_H
 
 /************************************************************************************
  * Included Files
@@ -52,13 +52,13 @@
 
 /* Register Offsets *****************************************************************/
 
-#define KINETIS_CRC_CRC_OFFSET    0x0000 /* CRC Data Register */
+#define KINETIS_CRC_DATA_OFFSET   0x0000 /* CRC Data Register */
 #define KINETIS_CRC_GPOLY_OFFSET  0x0004 /* CRC Polynomial Register */
 #define KINETIS_CRC_CTRL_OFFSET   0x0008 /* CRC Control Register */
 
 /* Register Addresses ***************************************************************/
 
-#define KINETIS_CRC_CRC           (KINETIS_CRC_BASE+KINETIS_CRC_CRC_OFFSET)
+#define KINETIS_CRC_DATA          (KINETIS_CRC_BASE+KINETIS_CRC_DATA_OFFSET)
 #define KINETIS_CRC_GPOLY         (KINETIS_CRC_BASE+KINETIS_CRC_GPOLY_OFFSET)
 #define KINETIS_CRC_CTRL          (KINETIS_CRC_BASE+KINETIS_CRC_CTRL_OFFSET)
 
@@ -66,14 +66,14 @@
 
 /* CRC Data Register (32-bit) */
 
-#define CRC_CRC_LL_SHIFT          (0)       /* Bits 0-7: CRC Low Lower Byte */
-#define CRC_CRC_LL_MASK           (0xff << CRC_CRC_LL_SHIFT)
-#define CRC_CRC_LU_SHIFT          (8)       /* Bits 8-15: CRC Low Upper Byte */
-#define CRC_CRC_LU_MASK           (0xff << CRC_CRC_LU_SHIFT)
-#define CRC_CRC_HL_SHIFT          (16)      /* Bits 16-23: CRC High Lower Byte */
-#define CRC_CRC_HL_MASK           (0xff << CRC_CRC_HL_SHIFT)
-#define CRC_CRC_HU_SHIFT          (24)      /* Bits 24-31: CRC High Upper Byte */
-#define CRC_CRC_HU_MASK           (0xff << CRC_CRC_HU_SHIFT)
+#define CRC_DATA_LL_SHIFT         (0)       /* Bits 0-7: CRC Low Lower Byte */
+#define CRC_DATA_LL_MASK          (0xff << CRC_DATA_LL_SHIFT)
+#define CRC_DATA_LU_SHIFT         (8)       /* Bits 8-15: CRC Low Upper Byte */
+#define CRC_DATA_LU_MASK          (0xff << CRC_DATA_LU_SHIFT)
+#define CRC_DATA_HL_SHIFT         (16)      /* Bits 16-23: CRC High Lower Byte */
+#define CRC_DATA_HL_MASK          (0xff << CRC_DATA_HL_SHIFT)
+#define CRC_DATA_HU_SHIFT         (24)      /* Bits 24-31: CRC High Upper Byte */
+#define CRC_DATA_HU_MASK          (0xff << CRC_DATA_HU_SHIFT)
 
 /* CRC Polynomial Register */
 
@@ -114,4 +114,4 @@
  ************************************************************************************/
 
 #endif /* KINETIS_NCRC && KINETIS_NCRC > 0 */
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_CRC_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_CRC_H */
diff --git a/arch/arm/src/kinetis/kinetis_dac.h b/arch/arm/src/kinetis/chip/kinetis_dac.h
similarity index 98%
rename from arch/arm/src/kinetis/kinetis_dac.h
rename to arch/arm/src/kinetis/chip/kinetis_dac.h
index 5c3b5c0c03..bf21843826 100644
--- a/arch/arm/src/kinetis/kinetis_dac.h
+++ b/arch/arm/src/kinetis/chip/kinetis_dac.h
@@ -1,7 +1,7 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/kinetis_dac.h
+ * arch/arm/src/kinetis/chip/kinetis_dac.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_DACE_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_DACE_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DAC_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DAC_H
 
 /********************************************************************************************
  * Included Files
@@ -232,4 +232,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_DACE_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DAC_H */
diff --git a/arch/arm/src/kinetis/kinetis_dma.h b/arch/arm/src/kinetis/chip/kinetis_dma.h
similarity index 96%
rename from arch/arm/src/kinetis/kinetis_dma.h
rename to arch/arm/src/kinetis/chip/kinetis_dma.h
index 9876a46a0f..aec14d32f4 100644
--- a/arch/arm/src/kinetis/kinetis_dma.h
+++ b/arch/arm/src/kinetis/chip/kinetis_dma.h
@@ -1,7 +1,7 @@
 /****************************************************************************************************
- * arch/arm/src/kinetis/kinetis_dma.h
+ * arch/arm/src/kinetis/chip/kinetis_dma.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_DMA_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_DMA_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DMA_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DMA_H
 
 /****************************************************************************************************
  * Included Files
@@ -83,18 +83,20 @@
 #define KINETIS_DMA_DCHPRI13_OFFSET       0x010e /* Channel 13 Priority Register */
 #define KINETIS_DMA_DCHPRI12_OFFSET       0x010f /* Channel 12 Priority Register */
 
-#define KINETIS_DMA_TCD_OFFSET(n)         (0x0000+((n) << 5))
-#define KINETIS_DMA_TCD_SADDR_OFFSET      0x0000 /* TCD Source Address */
-#define KINETIS_DMA_TCD_SOFF_OFFSET       0x0004 /* TCD Signed Source Address Offset */
-#define KINETIS_DMA_TCD_ATTR_OFFSET       0x0006 /* TCD Transfer Attributes */
-#define KINETIS_DMA_TCD_NBYTES_OFFSET     0x0008 /* TCD Minor Byte Count */
-#define KINETIS_DMA_TCD_SLAST_OFFSET      0x000c /* TCD Last Source Address Adjustment */
-#define KINETIS_DMA_TCD_DADDR_OFFSET      0x0010 /* TCD Destination Address */
-#define KINETIS_DMA_TCD_DOFF_OFFSET       0x0014 /* TCD Signed Destination Address Offset */
-#define KINETIS_DMA_TCD_CITER_OFFSET      0x0016 /* TCD Current Minor Loop Link, Major Loop Count */
-#define KINETIS_DMA_TCD_DLASTSGA_OFFSET   0x0018 /* TCD Last Destination Address Adjustment/Scatter Gather Address */
-#define KINETIS_DMA_TCD_CSR_OFFSET        0x001c /* TCD Control and Status */
-#define KINETIS_DMA_TCD_BITER_OFFSET      0x001e /* TCD Beginning Minor Loop Link, Major Loop Count */
+#ifndef KINETIS_K64
+#  define KINETIS_DMA_TCD_OFFSET(n)       (0x0000+((n) << 5))
+#  define KINETIS_DMA_TCD_SADDR_OFFSET    0x0000 /* TCD Source Address */
+#  define KINETIS_DMA_TCD_SOFF_OFFSET     0x0004 /* TCD Signed Source Address Offset */
+#  define KINETIS_DMA_TCD_ATTR_OFFSET     0x0006 /* TCD Transfer Attributes */
+#  define KINETIS_DMA_TCD_NBYTES_OFFSET   0x0008 /* TCD Minor Byte Count */
+#  define KINETIS_DMA_TCD_SLAST_OFFSET    0x000c /* TCD Last Source Address Adjustment */
+#  define KINETIS_DMA_TCD_DADDR_OFFSET    0x0010 /* TCD Destination Address */
+#  define KINETIS_DMA_TCD_DOFF_OFFSET     0x0014 /* TCD Signed Destination Address Offset */
+#  define KINETIS_DMA_TCD_CITER_OFFSET    0x0016 /* TCD Current Minor Loop Link, Major Loop Count */
+#  define KINETIS_DMA_TCD_DLASTSGA_OFFSET 0x0018 /* TCD Last Destination Address Adjustment/Scatter Gather Address */
+#  define KINETIS_DMA_TCD_CSR_OFFSET      0x001c /* TCD Control and Status */
+#  define KINETIS_DMA_TCD_BITER_OFFSET    0x001e /* TCD Beginning Minor Loop Link, Major Loop Count */
+#endif
 
 #define KINETIS_DMA_TCD0_SADDR_OFFSET     0x0000 /* TCD Source Address */
 #define KINETIS_DMA_TCD0_SOFF_OFFSET      0x0004 /* TCD Signed Source Address Offset */
@@ -323,19 +325,21 @@
 #define KINETIS_DMA_DCHPRI13              (KINETIS_DMAC_BASE+KINETIS_DMA_DCHPRI13_OFFSET)
 #define KINETIS_DMA_DCHPRI12              (KINETIS_DMAC_BASE+KINETIS_DMA_DCHPRI12_OFFSET)
 
-#define KINETIS_DMA_TCD_BASE(n)           (KINETIS_DMADESC_BASE+KINETIS_DMA_TCD_OFFSET(n))
-
-#define KINETIS_DMA_TCD_SADDR(n)          (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_SADDR_OFFSET)
-#define KINETIS_DMA_TCD_SOFF(n)           (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_SOFF_OFFSET)
-#define KINETIS_DMA_TCD_ATTR(n)           (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_ATTR_OFFSET)
-#define KINETIS_DMA_TCD_NBYTES(n)         (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_NBYTES_OFFSET)
-#define KINETIS_DMA_TCD_SLAST(n)          (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_SLAST_OFFSET)
-#define KINETIS_DMA_TCD_DADDR(n)          (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_DADDR_OFFSET)
-#define KINETIS_DMA_TCD_DOFF(n)           (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_DOFF_OFFSET)
-#define KINETIS_DMA_TCD_CITER(n)          (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_CITER_OFFSET)
-#define KINETIS_DMA_TCD_DLASTSGA(n)       (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_DLASTSGA_OFFSET)
-#define KINETIS_DMA_TCD_CSR(n)            (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_CSR_OFFSET)
-#define KINETIS_DMA_TCD_BITER(n)          (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_BITER_OFFSET)
+#ifndef KINETIS_K64
+#  define KINETIS_DMA_TCD_BASE(n)         (KINETIS_DMADESC_BASE+KINETIS_DMA_TCD_OFFSET(n))
+
+#  define KINETIS_DMA_TCD_SADDR(n)        (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_SADDR_OFFSET)
+#  define KINETIS_DMA_TCD_SOFF(n)         (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_SOFF_OFFSET)
+#  define KINETIS_DMA_TCD_ATTR(n)         (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_ATTR_OFFSET)
+#  define KINETIS_DMA_TCD_NBYTES(n)       (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_NBYTES_OFFSET)
+#  define KINETIS_DMA_TCD_SLAST(n)        (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_SLAST_OFFSET)
+#  define KINETIS_DMA_TCD_DADDR(n)        (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_DADDR_OFFSET)
+#  define KINETIS_DMA_TCD_DOFF(n)         (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_DOFF_OFFSET)
+#  define KINETIS_DMA_TCD_CITER(n)        (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_CITER_OFFSET)
+#  define KINETIS_DMA_TCD_DLASTSGA(n)     (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_DLASTSGA_OFFSET)
+#  define KINETIS_DMA_TCD_CSR(n)          (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_CSR_OFFSET)
+#  define KINETIS_DMA_TCD_BITER(n)        (KINETIS_DMA_TCD_BASE(n)+KINETIS_DMA_TCD_BITER_OFFSET)
+#endif
 
 #define KINETIS_DMA_TCD0_SADDR            (KINETIS_DMADESC_BASE+KINETIS_DMA_TCD0_SADDR_OFFSET)
 #define KINETIS_DMA_TCD0_SOFF             (KINETIS_DMADESC_BASE+KINETIS_DMA_TCD0_SOFF_OFFSET)
@@ -772,4 +776,4 @@
  * Public Functions
  ****************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_DMA_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DMA_H */
diff --git a/arch/arm/src/kinetis/kinetis_dmamux.h b/arch/arm/src/kinetis/chip/kinetis_dmamux.h
similarity index 95%
rename from arch/arm/src/kinetis/kinetis_dmamux.h
rename to arch/arm/src/kinetis/chip/kinetis_dmamux.h
index b83579180e..d63feb8da3 100644
--- a/arch/arm/src/kinetis/kinetis_dmamux.h
+++ b/arch/arm/src/kinetis/chip/kinetis_dmamux.h
@@ -1,7 +1,7 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/kinetis_dmamux.h
+ * arch/arm/src/kinetis/chip/kinetis_dmamux.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_DMAMUX_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_DMAMUX_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DMAMUX_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DMAMUX_H
 
 /********************************************************************************************
  * Included Files
@@ -108,4 +108,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_DMAMUX_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DMAMUX_H */
diff --git a/arch/arm/src/kinetis/kinetis_dspi.h b/arch/arm/src/kinetis/chip/kinetis_dspi.h
similarity index 98%
rename from arch/arm/src/kinetis/kinetis_dspi.h
rename to arch/arm/src/kinetis/chip/kinetis_dspi.h
index e682ef23e8..99507cb9e8 100644
--- a/arch/arm/src/kinetis/kinetis_dspi.h
+++ b/arch/arm/src/kinetis/chip/kinetis_dspi.h
@@ -1,7 +1,7 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/kinetis_dspi.h
+ * arch/arm/src/kinetis/chip/kinetis_dspi.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_DSPI_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_DSPI_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DSPI_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DSPI_H
 
 /********************************************************************************************
  * Included Files
@@ -318,4 +318,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_DSPI_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_DSPI_H */
diff --git a/arch/arm/src/kinetis/kinetis_enet.h b/arch/arm/src/kinetis/chip/kinetis_enet.h
similarity index 99%
rename from arch/arm/src/kinetis/kinetis_enet.h
rename to arch/arm/src/kinetis/chip/kinetis_enet.h
index cadd006d8c..8f34d0c7f6 100644
--- a/arch/arm/src/kinetis/kinetis_enet.h
+++ b/arch/arm/src/kinetis/chip/kinetis_enet.h
@@ -1,7 +1,7 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/kinetis_enet.h
+ * arch/arm/src/kinetis/chip/kinetis_enet.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_ENET_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_ENET_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_ENET_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_ENET_H
 
 /********************************************************************************************
  * Included Files
@@ -649,4 +649,4 @@ struct enet_desc_s
  ********************************************************************************************/
 
 #endif /* KINETIS_NENET &&  KINETIS_NENET > 0 */
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_ENET_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_ENET_H */
diff --git a/arch/arm/src/kinetis/kinetis_ewm.h b/arch/arm/src/kinetis/chip/kinetis_ewm.h
similarity index 93%
rename from arch/arm/src/kinetis/kinetis_ewm.h
rename to arch/arm/src/kinetis/chip/kinetis_ewm.h
index e259a3cf29..e91bc28c2c 100644
--- a/arch/arm/src/kinetis/kinetis_ewm.h
+++ b/arch/arm/src/kinetis/chip/kinetis_ewm.h
@@ -1,7 +1,7 @@
 /************************************************************************************
- * arch/arm/src/kinetis/kinetis_ewm.h
+ * arch/arm/src/kinetis/chip/kinetis_ewm.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_EWM_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_EWM_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_EWM_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_EWM_H
 
 /************************************************************************************
  * Included Files
@@ -87,4 +87,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_EWM_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_EWM_H */
diff --git a/arch/arm/src/kinetis/kinetis_flexbus.h b/arch/arm/src/kinetis/chip/kinetis_flexbus.h
similarity index 97%
rename from arch/arm/src/kinetis/kinetis_flexbus.h
rename to arch/arm/src/kinetis/chip/kinetis_flexbus.h
index 37992320fb..7c063d0869 100644
--- a/arch/arm/src/kinetis/kinetis_flexbus.h
+++ b/arch/arm/src/kinetis/chip/kinetis_flexbus.h
@@ -1,7 +1,7 @@
 /************************************************************************************
- * arch/arm/src/kinetis/kinetis_flexbus.h
+ * arch/arm/src/kinetis/chip/kinetis_flexbus.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_FLEXBUS_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_FLEXBUS_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FLEXBUS_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FLEXBUS_H
 
 /************************************************************************************
  * Included Files
@@ -210,4 +210,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_FLEXBUS_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FLEXBUS_H */
diff --git a/arch/arm/src/kinetis/kinetis_flexcan.h b/arch/arm/src/kinetis/chip/kinetis_flexcan.h
similarity index 98%
rename from arch/arm/src/kinetis/kinetis_flexcan.h
rename to arch/arm/src/kinetis/chip/kinetis_flexcan.h
index db151d5403..9d3ec74a38 100644
--- a/arch/arm/src/kinetis/kinetis_flexcan.h
+++ b/arch/arm/src/kinetis/chip/kinetis_flexcan.h
@@ -1,7 +1,7 @@
 /****************************************************************************************************
- * arch/arm/src/kinetis/kinetis_flexcan.h
+ * arch/arm/src/kinetis/chip/kinetis_flexcan.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_FLEXCAN_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_FLEXCAN_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FLEXCAN_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FLEXCAN_H
 
 /****************************************************************************************************
  * Included Files
@@ -315,4 +315,4 @@
  * Public Functions
  ****************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_FLEXCAN_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FLEXCAN_H */
diff --git a/arch/arm/src/kinetis/kinetis_enet.c b/arch/arm/src/kinetis/kinetis_enet.c
index 1413156e0c..00fdce77bd 100644
--- a/arch/arm/src/kinetis/kinetis_enet.c
+++ b/arch/arm/src/kinetis/kinetis_enet.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * drivers/net/kinetis_enet.c
+ * arch/arm/src/kinetis/kinetis_enet.c
  *
  *   Copyright (C) 2011-2012, 2014-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
@@ -68,7 +68,7 @@
 #include "chip/kinetis_pinmux.h"
 #include "kinetis_sim.h"
 #include "kinetis_mpu.h"
-#include "kinetis_enet.h"
+#include "chip/kinetis_enet.h"
 
 #if defined(KINETIS_NENET) && KINETIS_NENET > 0
 
-- 
GitLab


From 4f64634694c03fc5c6786a51837f697ccfe60529 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Fri, 1 Jul 2016 12:36:09 -0600
Subject: [PATCH 123/229] arch/arm/kinetis:  Still moving register header files
 to kinetis/chip directory; still incorporating K64 differences.

---
 arch/arm/src/kinetis/chip/kinetis_fmc.h       |  75 +++++
 arch/arm/src/kinetis/chip/kinetis_ftfe.h      | 159 ++++++++++
 arch/arm/src/kinetis/{ => chip}/kinetis_ftm.h |  54 +++-
 .../arm/src/kinetis/{ => chip}/kinetis_gpio.h |   0
 arch/arm/src/kinetis/{ => chip}/kinetis_i2c.h |  23 +-
 arch/arm/src/kinetis/{ => chip}/kinetis_i2s.h |  10 +-
 .../kinetis_k20k40k60fmc.h}                   |  22 +-
 arch/arm/src/kinetis/chip/kinetis_k64fmc.h    | 293 ++++++++++++++++++
 .../arm/src/kinetis/{ => chip}/kinetis_llwu.h |  10 +-
 .../src/kinetis/{ => chip}/kinetis_lptmr.h    |  10 +-
 arch/arm/src/kinetis/{ => chip}/kinetis_mcg.h |  22 +-
 arch/arm/src/kinetis/kinetis_clockconfig.c    |   6 +-
 arch/arm/src/kinetis/kinetis_ftfl.h           | 159 ----------
 arch/arm/src/kinetis/kinetis_pin.c            |  14 +-
 arch/arm/src/kinetis/kinetis_pindump.c        |   2 +-
 arch/arm/src/kinetis/kinetis_pingpio.c        |  14 +-
 arch/arm/src/kinetis/kinetis_pwm.c            |   6 +-
 arch/arm/src/kinetis/kinetis_usbdev.c         |   2 +-
 18 files changed, 647 insertions(+), 234 deletions(-)
 create mode 100644 arch/arm/src/kinetis/chip/kinetis_fmc.h
 create mode 100644 arch/arm/src/kinetis/chip/kinetis_ftfe.h
 rename arch/arm/src/kinetis/{ => chip}/kinetis_ftm.h (90%)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_gpio.h (100%)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_i2c.h (89%)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_i2s.h (98%)
 rename arch/arm/src/kinetis/{kinetis_fmc.h => chip/kinetis_k20k40k60fmc.h} (97%)
 create mode 100644 arch/arm/src/kinetis/chip/kinetis_k64fmc.h
 rename arch/arm/src/kinetis/{ => chip}/kinetis_llwu.h (98%)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_lptmr.h (96%)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_mcg.h (94%)
 delete mode 100644 arch/arm/src/kinetis/kinetis_ftfl.h

diff --git a/arch/arm/src/kinetis/chip/kinetis_fmc.h b/arch/arm/src/kinetis/chip/kinetis_fmc.h
new file mode 100644
index 0000000000..37e6dfda8d
--- /dev/null
+++ b/arch/arm/src/kinetis/chip/kinetis_fmc.h
@@ -0,0 +1,75 @@
+/********************************************************************************************
+ * arch/arm/src/kinetis/chip/kinetis_fmc.h
+ *
+ *   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.
+ *
+ ********************************************************************************************/
+
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FMC_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FMC_H
+
+/********************************************************************************************
+ * Included Files
+ ********************************************************************************************/
+
+#include 
+
+#include "chip.h"
+
+/* This file is just a wrapper around pin muxing header files for the Kinetis family selected
+ * by the logic in chip.h.
+ */
+
+#if defined(KINETIS_K20) || defined(KINETIS_K40) || defined(KINETIS_K60)
+#  include "kinetis_k20k40k60fmc.h"
+#elif defined(KINETIS_K64)
+#  include "kinetis_k64fmc.h"
+#else
+#  error "No pin multiplexing for this Kinetis part"
+#endif
+
+/********************************************************************************************
+ * Pre-processor Definitions
+ ********************************************************************************************/
+
+/********************************************************************************************
+ * Public Types
+ ********************************************************************************************/
+
+/********************************************************************************************
+ * Public Data
+ ********************************************************************************************/
+
+/********************************************************************************************
+ * Public Functions
+ ********************************************************************************************/
+
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FMC_H */
diff --git a/arch/arm/src/kinetis/chip/kinetis_ftfe.h b/arch/arm/src/kinetis/chip/kinetis_ftfe.h
new file mode 100644
index 0000000000..13794d97db
--- /dev/null
+++ b/arch/arm/src/kinetis/chip/kinetis_ftfe.h
@@ -0,0 +1,159 @@
+/************************************************************************************
+ * arch/arm/src/kinetis/chip/kinetis_ftfe.h
+ *
+ *   Copyright (C) 2011, 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.
+ *
+ ************************************************************************************/
+
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FTFE_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FTFE_H
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include 
+
+#include "chip.h"
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+/* Register Offsets *****************************************************************/
+
+#define KINETIS_FTFE_FSTAT_OFFSET   0x0000 /* Flash Status Register */
+#define KINETIS_FTFE_FCNFG_OFFSET   0x0001 /* Flash Configuration Register */
+#define KINETIS_FTFE_FSEC_OFFSET    0x0002 /* Flash Security Register */
+#define KINETIS_FTFE_FOPT_OFFSET    0x0003 /* Flash Option Register */
+
+#define KINETIS_FTFE_FCCOB3_OFFSET  0x0004 /* Flash Common Command Object Registers */
+#define KINETIS_FTFE_FCCOB2_OFFSET  0x0005 /* Flash Common Command Object Registers */
+#define KINETIS_FTFE_FCCOB1_OFFSET  0x0006 /* Flash Common Command Object Registers */
+#define KINETIS_FTFE_FCCOB0_OFFSET  0x0007 /* Flash Common Command Object Registers */
+#define KINETIS_FTFE_FCCOB7_OFFSET  0x0008 /* Flash Common Command Object Registers */
+#define KINETIS_FTFE_FCCOB6_OFFSET  0x0009 /* Flash Common Command Object Registers */
+#define KINETIS_FTFE_FCCOB5_OFFSET  0x000a /* Flash Common Command Object Registers */
+#define KINETIS_FTFE_FCCOB4_OFFSET  0x000b /* Flash Common Command Object Registers */
+#define KINETIS_FTFE_FCCOBB_OFFSET  0x000c /* Flash Common Command Object Registers */
+#define KINETIS_FTFE_FCCOBA_OFFSET  0x000d /* Flash Common Command Object Registers */
+#define KINETIS_FTFE_FCCOB9_OFFSET  0x000e /* Flash Common Command Object Registers */
+#define KINETIS_FTFE_FCCOB8_OFFSET  0x000f /* Flash Common Command Object Registers */
+#define KINETIS_FTFE_FPROT3_OFFSET  0x0010 /* Program Flash Protection Registers */
+#define KINETIS_FTFE_FPROT2_OFFSET  0x0011 /* Program Flash Protection Registers */
+#define KINETIS_FTFE_FPROT1_OFFSET  0x0012 /* Program Flash Protection Registers */
+#define KINETIS_FTFE_FPROT0_OFFSET  0x0013 /* Program Flash Protection Registers */
+#define KINETIS_FTFE_FEPROT_OFFSET  0x0016 /* EEPROM Protection Register */
+#define KINETIS_FTFE_FDPROT_OFFSET  0x0017 /* Data Flash Protection Register */
+
+/* Register Addresses ***************************************************************/
+
+#define KINETIS_FTFE_FSTAT          (KINETIS_FTFE_BASE+KINETIS_FTFE_FSTAT_OFFSET)
+#define KINETIS_FTFE_FCNFG          (KINETIS_FTFE_BASE+KINETIS_FTFE_FCNFG_OFFSET)
+#define KINETIS_FTFE_FSEC           (KINETIS_FTFE_BASE+KINETIS_FTFE_FSEC_OFFSET)
+#define KINETIS_FTFE_FOPT           (KINETIS_FTFE_BASE+KINETIS_FTFE_FOPT_OFFSET)
+#define KINETIS_FTFE_FCCOB3         (KINETIS_FTFE_BASE+KINETIS_FTFE_FCCOB3_OFFSET)
+#define KINETIS_FTFE_FCCOB2         (KINETIS_FTFE_BASE+KINETIS_FTFE_FCCOB2_OFFSET)
+#define KINETIS_FTFE_FCCOB1         (KINETIS_FTFE_BASE+KINETIS_FTFE_FCCOB1_OFFSET)
+#define KINETIS_FTFE_FCCOB0         (KINETIS_FTFE_BASE+KINETIS_FTFE_FCCOB0_OFFSET)
+#define KINETIS_FTFE_FCCOB7         (KINETIS_FTFE_BASE+KINETIS_FTFE_FCCOB7_OFFSET)
+#define KINETIS_FTFE_FCCOB6         (KINETIS_FTFE_BASE+KINETIS_FTFE_FCCOB6_OFFSET)
+#define KINETIS_FTFE_FCCOB5         (KINETIS_FTFE_BASE+KINETIS_FTFE_FCCOB5_OFFSET)
+#define KINETIS_FTFE_FCCOB4         (KINETIS_FTFE_BASE+KINETIS_FTFE_FCCOB4_OFFSET)
+#define KINETIS_FTFE_FCCOBB         (KINETIS_FTFE_BASE+KINETIS_FTFE_FCCOBB_OFFSET)
+#define KINETIS_FTFE_FCCOBA         (KINETIS_FTFE_BASE+KINETIS_FTFE_FCCOBA_OFFSET)
+#define KINETIS_FTFE_FCCOB9         (KINETIS_FTFE_BASE+KINETIS_FTFE_FCCOB9_OFFSET)
+#define KINETIS_FTFE_FCCOB8         (KINETIS_FTFE_BASE+KINETIS_FTFE_FCCOB8_OFFSET)
+#define KINETIS_FTFE_FPROT3         (KINETIS_FTFE_BASE+KINETIS_FTFE_FPROT3_OFFSET)
+#define KINETIS_FTFE_FPROT2         (KINETIS_FTFE_BASE+KINETIS_FTFE_FPROT2_OFFSET)
+#define KINETIS_FTFE_FPROT1         (KINETIS_FTFE_BASE+KINETIS_FTFE_FPROT1_OFFSET)
+#define KINETIS_FTFE_FPROT0         (KINETIS_FTFE_BASE+KINETIS_FTFE_FPROT0_OFFSET)
+#define KINETIS_FTFE_FEPROT         (KINETIS_FTFE_BASE+KINETIS_FTFE_FEPROT_OFFSET)
+#define KINETIS_FTFE_FDPROT         (KINETIS_FTFE_BASE+KINETIS_FTFE_FDPROT_OFFSET)
+
+/* Register Bit Definitions *********************************************************/
+
+/* Flash Status Register */
+
+#define FTFE_FSTAT_MGSTAT0          (1 << 0)  /* Bit 0:  Memory Controller Command Completion Status Flag */
+                                              /* Bits 1-3: Reserved */
+#define FTFE_FSTAT_FPVIOL           (1 << 4)  /* Bit 4:  Flash Protection Violation Flag */
+#define FTFE_FSTAT_ACCERR           (1 << 5)  /* Bit 5:  Flash Access Error Flag */
+#define FTFE_FSTAT_RDCOLERR         (1 << 6)  /* Bit 6:  FTFE Read Collision Error Flag */
+#define FTFE_FSTAT_CCIF             (1 << 7)  /* Bit 7:  Command Complete Interrupt Flag */
+
+/* Flash Configuration Register */
+
+#define FTFE_FCNFG_EEERDY           (1 << 0)  /* Bit 0:  FEEPROM backup data copied to FlexRAM */
+#define FTFE_FCNFG_RAMRDY           (1 << 1)  /* Bit 1:  RAM Ready */
+#define FTFE_FCNFG_PFLSH            (1 << 2)  /* Bit 2:  FTFE configuration */
+#define FTFE_FCNFG_SWAP             (1 << 3)  /* Bit 3:  Swap */
+#define FTFE_FCNFG_ERSSUSP          (1 << 4)  /* Bit 4:  Erase Suspend */
+#define FTFE_FCNFG_ERSAREQ          (1 << 5)  /* Bit 5:  Erase All Request */
+#define FTFE_FCNFG_RDCOLLIE         (1 << 6)  /* Bit 6:  Read Collision Error Interrupt Enable */
+#define FTFE_FCNFG_CCIE             (1 << 7)  /* Bit 7:  Command Complete Interrupt Enable */
+
+/* Flash Security Register */
+
+#define FTFE_FSEC_SEC_SHIFT         (0)       /* Bits 0-1: Flash Security */
+#define FTFE_FSEC_SEC_MASK          (3 << FTFE_FSEC_SEC_SHIFT)
+#  define FTFE_FSEC_SEC_SECURE      (0 << FTFE_FSEC_SEC_SHIFT) /* 00,01,11: status is secure */
+#  define FTFE_FSEC_SEC_UNSECURE    (2 << FTFE_FSEC_SEC_SHIFT) /* 10: status is insecure */
+#define FTFE_FSEC_FSLACC_SHIFT      (2)       /* Bits 2-3: Freescale Failure Analysis Access Code */
+#define FTFE_FSEC_FSLACC_MASK       (3 << FTFE_FSEC_FSLACC_SHIFT)
+#  define FTFE_FSEC_FSLACC_GRANTED  (0 << FTFE_FSEC_FSLACC_SHIFT) /* 00 or 11: Access granted */
+#  define FTFE_FSEC_FSLACC_DENIED   (1 << FTFE_FSEC_FSLACC_SHIFT) /* 01 or 10: Access denied */
+#define FTFE_FSEC_MEEN_SHIFT        (4)       /* Bits 4-5: Mass Erase Enable Bits */
+#define FTFE_FSEC_MEEN_MASK         (3 << FTFE_FSEC_MEEN_SHIFT)
+#  define FTFE_FSEC_MEEN_ENABLED    (0 << FTFE_FSEC_MEEN_SHIFT) /* All values are enabled */
+#define FTFE_FSEC_KEYEN_SHIFT       (6)       /* Bits 6-7: Backdoor Key Security Enable */
+#define FTFE_FSEC_KEYEN_MASK        (3 << FTFE_FSEC_KEYEN_SHIFT)
+#  define FTFE_FSEC_KEYEN_DISABLED  (1 << FTFE_FSEC_KEYEN_SHIFT) /* All values are disabled */
+
+/* Flash Option Register (32-bits, see Chip Configuration details) */
+/* Flash Common Command Object Registers (8-bit flash command data) */
+/* Program Flash Protection Registers (8-bit flash protection data) */
+/* EEPROM Protection Register (8-bit eeprom protection data) */
+/* Data Flash Protection Register (8-bit data flash protection data) */
+
+/************************************************************************************
+ * Public Types
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Data
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FTFE_H */
diff --git a/arch/arm/src/kinetis/kinetis_ftm.h b/arch/arm/src/kinetis/chip/kinetis_ftm.h
similarity index 90%
rename from arch/arm/src/kinetis/kinetis_ftm.h
rename to arch/arm/src/kinetis/chip/kinetis_ftm.h
index 2f031b5dd9..1402f5e8d8 100644
--- a/arch/arm/src/kinetis/kinetis_ftm.h
+++ b/arch/arm/src/kinetis/chip/kinetis_ftm.h
@@ -1,7 +1,7 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/kinetis_ftm.h
+ * arch/arm/src/kinetis/chip/kinetis_ftm.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_FTM_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_FTM_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FTM_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FTM_H
 
 /********************************************************************************************
  * Included Files
@@ -228,6 +228,50 @@
 #define KINETIS_FTM2_SWOCTRL         (KINETIS_FTM2_BASE+KINETIS_FTM_SWOCTRL_OFFSET)
 #define KINETIS_FTM2_PWMLOAD         (KINETIS_FTM2_BASE+KINETIS_FTM_PWMLOAD_OFFSET)
 
+#define KINETIS_FTM3_SC              (KINETIS_FTM3_BASE+KINETIS_FTM_SC_OFFSET)
+#define KINETIS_FTM3_CNT             (KINETIS_FTM3_BASE+KINETIS_FTM_CNT_OFFSET)
+#define KINETIS_FTM3_MOD             (KINETIS_FTM3_BASE+KINETIS_FTM_MOD_OFFSET)
+
+#define KINETIS_FTM3_CSC(n)          (KINETIS_FTM3_BASE+KINETIS_FTM_CSC_OFFSET(n))
+#define KINETIS_FTM3_CV(n)           (KINETIS_FTM3_BASE+KINETIS_FTM_CV_OFFSET(n))
+#define KINETIS_FTM3_C0SC            (KINETIS_FTM3_BASE+KINETIS_FTM_C0SC_OFFSET)
+#define KINETIS_FTM3_C0V             (KINETIS_FTM3_BASE+KINETIS_FTM_C0V_OFFSET)
+#define KINETIS_FTM3_C1SC            (KINETIS_FTM3_BASE+KINETIS_FTM_C1SC_OFFSET)
+#define KINETIS_FTM3_C1V             (KINETIS_FTM3_BASE+KINETIS_FTM_C1V_OFFSET)
+#define KINETIS_FTM3_C2SC            (KINETIS_FTM3_BASE+KINETIS_FTM_C2SC_OFFSET)
+#define KINETIS_FTM3_C2V             (KINETIS_FTM3_BASE+KINETIS_FTM_C2V_OFFSET)
+#define KINETIS_FTM3_C3SC            (KINETIS_FTM3_BASE+KINETIS_FTM_C3SC_OFFSET)
+#define KINETIS_FTM3_C3V             (KINETIS_FTM3_BASE+KINETIS_FTM_C3V_OFFSET)
+#define KINETIS_FTM3_C4SC            (KINETIS_FTM3_BASE+KINETIS_FTM_C4SC_OFFSET)
+#define KINETIS_FTM3_C4V             (KINETIS_FTM3_BASE+KINETIS_FTM_C4V_OFFSET)
+#define KINETIS_FTM3_C5SC            (KINETIS_FTM3_BASE+KINETIS_FTM_C5SC_OFFSET)
+#define KINETIS_FTM3_C5V             (KINETIS_FTM3_BASE+KINETIS_FTM_C5V_OFFSET)
+#define KINETIS_FTM3_C6SC            (KINETIS_FTM3_BASE+KINETIS_FTM_C6SC_OFFSET)
+#define KINETIS_FTM3_C6V             (KINETIS_FTM3_BASE+KINETIS_FTM_C6V_OFFSET)
+#define KINETIS_FTM3_C7SC            (KINETIS_FTM3_BASE+KINETIS_FTM_C7SC_OFFSET)
+#define KINETIS_FTM3_C7V             (KINETIS_FTM3_BASE+KINETIS_FTM_C7V_OFFSET)
+
+#define KINETIS_FTM3_CNTIN           (KINETIS_FTM3_BASE+KINETIS_FTM_CNTIN_OFFSET)
+#define KINETIS_FTM3_STATUS          (KINETIS_FTM3_BASE+KINETIS_FTM_STATUS_OFFSET)
+#define KINETIS_FTM3_MODE            (KINETIS_FTM3_BASE+KINETIS_FTM_MODE_OFFSET)
+#define KINETIS_FTM3_SYNC            (KINETIS_FTM3_BASE+KINETIS_FTM_SYNC_OFFSET)
+#define KINETIS_FTM3_OUTINIT         (KINETIS_FTM3_BASE+KINETIS_FTM_OUTINIT_OFFSET)
+#define KINETIS_FTM3_OUTMASK         (KINETIS_FTM3_BASE+KINETIS_FTM_OUTMASK_OFFSET)
+#define KINETIS_FTM3_COMBINE         (KINETIS_FTM3_BASE+KINETIS_FTM_COMBINE_OFFSET)
+#define KINETIS_FTM3_DEADTIME        (KINETIS_FTM3_BASE+KINETIS_FTM_DEADTIME_OFFSET)
+#define KINETIS_FTM3_EXTTRIG         (KINETIS_FTM3_BASE+KINETIS_FTM_EXTTRIG_OFFSET)
+#define KINETIS_FTM3_POL             (KINETIS_FTM3_BASE+KINETIS_FTM_POL_OFFSET)
+#define KINETIS_FTM3_FMS             (KINETIS_FTM3_BASE+KINETIS_FTM_FMS_OFFSET)
+#define KINETIS_FTM3_FILTER          (KINETIS_FTM3_BASE+KINETIS_FTM_FILTER_OFFSET)
+#define KINETIS_FTM3_FLTCTRL         (KINETIS_FTM3_BASE+KINETIS_FTM_FLTCTRL_OFFSET)
+#define KINETIS_FTM3_QDCTRL          (KINETIS_FTM3_BASE+KINETIS_FTM_QDCTRL_OFFSET)
+#define KINETIS_FTM3_CONF            (KINETIS_FTM3_BASE+KINETIS_FTM_CONF_OFFSET)
+#define KINETIS_FTM3_FLTPOL          (KINETIS_FTM3_BASE+KINETIS_FTM_FLTPOL_OFFSET)
+#define KINETIS_FTM3_SYNCONF         (KINETIS_FTM3_BASE+KINETIS_FTM_SYNCONF_OFFSET)
+#define KINETIS_FTM3_INVCTRL         (KINETIS_FTM3_BASE+KINETIS_FTM_INVCTRL_OFFSET)
+#define KINETIS_FTM3_SWOCTRL         (KINETIS_FTM3_BASE+KINETIS_FTM_SWOCTRL_OFFSET)
+#define KINETIS_FTM3_PWMLOAD         (KINETIS_FTM3_BASE+KINETIS_FTM_PWMLOAD_OFFSET)
+
 /* Register Bit Definitions *****************************************************************/
 
 /* Status and Control */
@@ -525,4 +569,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_FTM_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_FTM_H */
diff --git a/arch/arm/src/kinetis/kinetis_gpio.h b/arch/arm/src/kinetis/chip/kinetis_gpio.h
similarity index 100%
rename from arch/arm/src/kinetis/kinetis_gpio.h
rename to arch/arm/src/kinetis/chip/kinetis_gpio.h
diff --git a/arch/arm/src/kinetis/kinetis_i2c.h b/arch/arm/src/kinetis/chip/kinetis_i2c.h
similarity index 89%
rename from arch/arm/src/kinetis/kinetis_i2c.h
rename to arch/arm/src/kinetis/chip/kinetis_i2c.h
index bee9ef92db..94d071727b 100644
--- a/arch/arm/src/kinetis/kinetis_i2c.h
+++ b/arch/arm/src/kinetis/chip/kinetis_i2c.h
@@ -1,7 +1,7 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/kinetis_i2c.h
+ * arch/arm/src/kinetis/chip/kinetis_i2c.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_I2CE_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_I2CE_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_I2CE_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_I2CE_H
 
 /********************************************************************************************
  * Included Files
@@ -91,6 +91,19 @@
 #define KINETIS_I2C1_SLTH        (KINETIS_I2C1_BASE+KINETIS_I2C_SLTH_OFFSET)
 #define KINETIS_I2C1_SLTL        (KINETIS_I2C1_BASE+KINETIS_I2C_SLTL_OFFSET)
 
+#define KINETIS_I2C2_A1          (KINETIS_I2C2_BASE+KINETIS_I2C_A1_OFFSET)
+#define KINETIS_I2C2_F           (KINETIS_I2C2_BASE+KINETIS_I2C_F_OFFSET)
+#define KINETIS_I2C2_C1          (KINETIS_I2C2_BASE+KINETIS_I2C_C1_OFFSET)
+#define KINETIS_I2C2_S           (KINETIS_I2C2_BASE+KINETIS_I2C_S_OFFSET)
+#define KINETIS_I2C2_D           (KINETIS_I2C2_BASE+KINETIS_I2C_D_OFFSET)
+#define KINETIS_I2C2_C2          (KINETIS_I2C2_BASE+KINETIS_I2C_C2_OFFSET)
+#define KINETIS_I2C2_FLT         (KINETIS_I2C2_BASE+KINETIS_I2C_FLT_OFFSET)
+#define KINETIS_I2C2_RA          (KINETIS_I2C2_BASE+KINETIS_I2C_RA_OFFSET)
+#define KINETIS_I2C2_SMB         (KINETIS_I2C2_BASE+KINETIS_I2C_SMB_OFFSET)
+#define KINETIS_I2C2_A2          (KINETIS_I2C2_BASE+KINETIS_I2C_A2_OFFSET)
+#define KINETIS_I2C2_SLTH        (KINETIS_I2C2_BASE+KINETIS_I2C_SLTH_OFFSET)
+#define KINETIS_I2C2_SLTL        (KINETIS_I2C2_BASE+KINETIS_I2C_SLTL_OFFSET)
+
 /* Register Bit Definitions *****************************************************************/
 
 /* I2C Address Register 1 (8-bit) */
@@ -182,4 +195,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_I2CE_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_I2CE_H */
diff --git a/arch/arm/src/kinetis/kinetis_i2s.h b/arch/arm/src/kinetis/chip/kinetis_i2s.h
similarity index 98%
rename from arch/arm/src/kinetis/kinetis_i2s.h
rename to arch/arm/src/kinetis/chip/kinetis_i2s.h
index 11bcc09955..5de08843bb 100644
--- a/arch/arm/src/kinetis/kinetis_i2s.h
+++ b/arch/arm/src/kinetis/chip/kinetis_i2s.h
@@ -1,7 +1,7 @@
 /****************************************************************************************************
- * arch/arm/src/kinetis/kinetis_i2s.h
+ * arch/arm/src/kinetis/chip/kinetis_i2s.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_I2S_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_I2S_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_I2S_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_I2S_H
 
 /****************************************************************************************************
  * Included Files
@@ -294,4 +294,4 @@
  * Public Functions
  ****************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_I2S_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_I2S_H */
diff --git a/arch/arm/src/kinetis/kinetis_fmc.h b/arch/arm/src/kinetis/chip/kinetis_k20k40k60fmc.h
similarity index 97%
rename from arch/arm/src/kinetis/kinetis_fmc.h
rename to arch/arm/src/kinetis/chip/kinetis_k20k40k60fmc.h
index 66f3a39092..8dce4d682e 100644
--- a/arch/arm/src/kinetis/kinetis_fmc.h
+++ b/arch/arm/src/kinetis/chip/kinetis_k20k40k60fmc.h
@@ -1,7 +1,7 @@
 /************************************************************************************
- * arch/arm/src/kinetis/kinetis_fmc.h
+ * arch/arm/src/kinetis/kinetis_k20k40k60fmc.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_FMC_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_FMC_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K20K40K60FMC_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K20K40K60FMC_H
 
 /************************************************************************************
  * Included Files
@@ -50,13 +50,13 @@
 
 /* Register Offsets *****************************************************************/
 
-#define KINETIS_FMC_PFAPR_OFFSET    0x0000 /* Flash Access Protection Register */
-#define KINETIS_FMC_PFB0CR_OFFSET   0x0004 /* Flash Bank 0 Control Register */
-#define KINETIS_FMC_PFB1CR_OFFSET   0x0008 /* Flash Bank 1 Control Register */
+#define KINETIS_FMC_PFAPR_OFFSET        0x0000 /* Flash Access Protection Register */
+#define KINETIS_FMC_PFB0CR_OFFSET       0x0004 /* Flash Bank 0 Control Register */
+#define KINETIS_FMC_PFB1CR_OFFSET       0x0008 /* Flash Bank 1 Control Register */
 
 /* Cache Directory Storage for way=w and set=s, w=0..3, s=0..7 */
 
-#define KINETIS_FMC_TAGVD_OFFSET(w,s) (0x100+((w)<<5)+((s)<<2))
+#define KINETIS_FMC_TAGVD_OFFSET(w,s)   (0x100 + ((w) << 5) + ((s) << 2))
 
 #define KINETIS_FMC_TAGVDW0S0_OFFSET    0x0100 /* Cache Directory Storage */
 #define KINETIS_FMC_TAGVDW0S1_OFFSET    0x0104 /* Cache Directory Storage */
@@ -96,8 +96,8 @@
 
 /* Cache Data Storage (upper and lower) for way=w and set=s, w=0..3, s=0..7 */
 
-#define KINETIS_FMC_DATAU_OFFSET(w,s) (0x200+((w)<<6)+((s)<<2))
-#define KINETIS_FMC_DATAL_OFFSET(w,s) (0x204+((w)<<6)+((s)<<2))
+#define KINETIS_FMC_DATAU_OFFSET(w,s)   (0x200 + ((w) << 6) + ((s) << 2))
+#define KINETIS_FMC_DATAL_OFFSET(w,s)   (0x204 + ((w) << 6) + ((s) << 2))
 
 #define KINETIS_FMC_DATAW0S0U_OFFSET    0x0200 /* Cache Data Storage (upper word) */
 #define KINETIS_FMC_DATAW0S0L_OFFSET    0x0204 /* Cache Data Storage (lower word) */
@@ -386,4 +386,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_FMC_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K20K40K60FMC_H */
diff --git a/arch/arm/src/kinetis/chip/kinetis_k64fmc.h b/arch/arm/src/kinetis/chip/kinetis_k64fmc.h
new file mode 100644
index 0000000000..036e38f129
--- /dev/null
+++ b/arch/arm/src/kinetis/chip/kinetis_k64fmc.h
@@ -0,0 +1,293 @@
+/************************************************************************************
+ * arch/arm/src/kinetis/kinetis_k64fmc.h
+ *
+ *   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.
+ *
+ ************************************************************************************/
+
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K64FMC_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K64FMC_H
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include 
+
+#include "chip.h"
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+/* Register Offsets *****************************************************************/
+
+#define KINETIS_FMC_PFAPR_OFFSET        0x0000 /* Flash Access Protection Register */
+#define KINETIS_FMC_PFB0CR_OFFSET       0x0004 /* Flash Bank 0 Control Register */
+#define KINETIS_FMC_PFB1CR_OFFSET       0x0008 /* Flash Bank 1 Control Register */
+
+/* Cache Directory Storage for way=w and set=s, w=0..3, s=0..7 */
+
+#define KINETIS_FMC_TAGVD_OFFSET(w,s)   (0x100 + ((w) << 5) + ((s) << 2))
+
+#define KINETIS_FMC_TAGVDW0S0_OFFSET    0x0100 /* Cache Directory Storage */
+#define KINETIS_FMC_TAGVDW0S1_OFFSET    0x0104 /* Cache Directory Storage */
+#define KINETIS_FMC_TAGVDW0S2_OFFSET    0x0108 /* Cache Directory Storage */
+#define KINETIS_FMC_TAGVDW0S3_OFFSET    0x010c /* Cache Directory Storage */
+
+#define KINETIS_FMC_TAGVDW1S0_OFFSET    0x0110 /* Cache Directory Storage */
+#define KINETIS_FMC_TAGVDW1S1_OFFSET    0x0114 /* Cache Directory Storage */
+#define KINETIS_FMC_TAGVDW1S2_OFFSET    0x0118 /* Cache Directory Storage */
+#define KINETIS_FMC_TAGVDW1S3_OFFSET    0x011c /* Cache Directory Storage */
+
+#define KINETIS_FMC_TAGVDW2S0_OFFSET    0x0120 /* Cache Directory Storage */
+#define KINETIS_FMC_TAGVDW2S1_OFFSET    0x0124 /* Cache Directory Storage */
+#define KINETIS_FMC_TAGVDW2S2_OFFSET    0x0128 /* Cache Directory Storage */
+#define KINETIS_FMC_TAGVDW2S3_OFFSET    0x012c /* Cache Directory Storage */
+
+#define KINETIS_FMC_TAGVDW3S0_OFFSET    0x0130 /* Cache Directory Storage */
+#define KINETIS_FMC_TAGVDW3S1_OFFSET    0x0134 /* Cache Directory Storage */
+#define KINETIS_FMC_TAGVDW3S2_OFFSET    0x0138 /* Cache Directory Storage */
+#define KINETIS_FMC_TAGVDW3S3_OFFSET    0x013c /* Cache Directory Storage */
+
+/* Cache Data Storage (upper and lower) for way=w and set=s, w=0..3, s=0..7 */
+
+#define KINETIS_FMC_DATAU_OFFSET(w,s)   (0x200 + ((w) << 6) + ((s) << 2))
+#define KINETIS_FMC_DATAL_OFFSET(w,s)   (0x204 + ((w) << 6) + ((s) << 2))
+
+#define KINETIS_FMC_DATAW0S0U_OFFSET    0x0200 /* Cache Data Storage (upper word) */
+#define KINETIS_FMC_DATAW0S0L_OFFSET    0x0204 /* Cache Data Storage (lower word) */
+#define KINETIS_FMC_DATAW0S1U_OFFSET    0x0208 /* Cache Data Storage (upper word) */
+#define KINETIS_FMC_DATAW0S1L_OFFSET    0x020c /* Cache Data Storage (lower word) */
+#define KINETIS_FMC_DATAW0S2U_OFFSET    0x0210 /* Cache Data Storage (upper word) */
+#define KINETIS_FMC_DATAW0S2L_OFFSET    0x0214 /* Cache Data Storage (lower word) */
+#define KINETIS_FMC_DATAW0S3U_OFFSET    0x0218 /* Cache Data Storage (upper word) */
+#define KINETIS_FMC_DATAW0S3L_OFFSET    0x021c /* Cache Data Storage (lower word) */
+
+#define KINETIS_FMC_DATAW1S0U_OFFSET    0x0220 /* Cache Data Storage (upper word) */
+#define KINETIS_FMC_DATAW1S0L_OFFSET    0x0224 /* Cache Data Storage (lower word) */
+#define KINETIS_FMC_DATAW1S1U_OFFSET    0x0228 /* Cache Data Storage (upper word) */
+#define KINETIS_FMC_DATAW1S1L_OFFSET    0x022c /* Cache Data Storage (lower word) */
+#define KINETIS_FMC_DATAW1S2U_OFFSET    0x0230 /* Cache Data Storage (upper word) */
+#define KINETIS_FMC_DATAW1S2L_OFFSET    0x0234 /* Cache Data Storage (lower word) */
+#define KINETIS_FMC_DATAW1S3U_OFFSET    0x0238 /* Cache Data Storage (upper word) */
+#define KINETIS_FMC_DATAW1S3L_OFFSET    0x023c /* Cache Data Storage (lower word) */
+
+#define KINETIS_FMC_DATAW2S0U_OFFSET    0x0240 /* Cache Data Storage (upper word) */
+#define KINETIS_FMC_DATAW2S0L_OFFSET    0x0244 /* Cache Data Storage (lower word) */
+#define KINETIS_FMC_DATAW2S1U_OFFSET    0x0248 /* Cache Data Storage (upper word) */
+#define KINETIS_FMC_DATAW2S1L_OFFSET    0x024c /* Cache Data Storage (lower word) */
+#define KINETIS_FMC_DATAW2S2U_OFFSET    0x0250 /* Cache Data Storage (upper word) */
+#define KINETIS_FMC_DATAW2S2L_OFFSET    0x0254 /* Cache Data Storage (lower word) */
+#define KINETIS_FMC_DATAW2S3U_OFFSET    0x0258 /* Cache Data Storage (upper word) */
+#define KINETIS_FMC_DATAW2S3L_OFFSET    0x025c /* Cache Data Storage (lower word) */
+
+#define KINETIS_FMC_DATAW3S0U_OFFSET    0x0260 /* Cache Data Storage (upper word) */
+#define KINETIS_FMC_DATAW3S0L_OFFSET    0x0264 /* Cache Data Storage (lower word) */
+#define KINETIS_FMC_DATAW3S1U_OFFSET    0x0268 /* Cache Data Storage (upper word) */
+#define KINETIS_FMC_DATAW3S1L_OFFSET    0x026c /* Cache Data Storage (lower word) */
+#define KINETIS_FMC_DATAW3S2U_OFFSET    0x0270 /* Cache Data Storage (upper word) */
+#define KINETIS_FMC_DATAW3S2L_OFFSET    0x0274 /* Cache Data Storage (lower word) */
+#define KINETIS_FMC_DATAW3S3U_OFFSET    0x0278 /* Cache Data Storage (upper word) */
+#define KINETIS_FMC_DATAW3S3L_OFFSET    0x027c /* Cache Data Storage (lower word) */
+
+/* Register Addresses ***************************************************************/
+
+#define KINETIS_FMC_PFAPR               (KINETIS_FMC_BASE+KINETIS_FMC_PFAPR_OFFSET)
+#define KINETIS_FMC_PFB0CR              (KINETIS_FMC_BASE+KINETIS_FMC_PFB0CR_OFFSET)
+#define KINETIS_FMC_PFB1CR              (KINETIS_FMC_BASE+KINETIS_FMC_PFB1CR_OFFSET)
+
+/*  Cache Directory Storage for way=w and set=s, w=0..3, s=0..7 */
+
+#define KINETIS_FMC_TAGVD(w,s)          (KINETIS_FMC_BASE+KINETIS_FMC_TAGVD_OFFSET(w,s))
+
+#define KINETIS_FMC_TAGVDW0S0           (KINETIS_FMC_BASE+KINETIS_FMC_TAGVDW0S0_OFFSET)
+#define KINETIS_FMC_TAGVDW0S1           (KINETIS_FMC_BASE+KINETIS_FMC_TAGVDW0S1_OFFSET)
+#define KINETIS_FMC_TAGVDW0S2           (KINETIS_FMC_BASE+KINETIS_FMC_TAGVDW0S2_OFFSET)
+#define KINETIS_FMC_TAGVDW0S3           (KINETIS_FMC_BASE+KINETIS_FMC_TAGVDW0S3_OFFSET)
+
+#define KINETIS_FMC_TAGVDW1S0           (KINETIS_FMC_BASE+KINETIS_FMC_TAGVDW1S0_OFFSET)
+#define KINETIS_FMC_TAGVDW1S1           (KINETIS_FMC_BASE+KINETIS_FMC_TAGVDW1S1_OFFSET)
+#define KINETIS_FMC_TAGVDW1S2           (KINETIS_FMC_BASE+KINETIS_FMC_TAGVDW1S2_OFFSET)
+#define KINETIS_FMC_TAGVDW1S3           (KINETIS_FMC_BASE+KINETIS_FMC_TAGVDW1S3_OFFSET)
+
+#define KINETIS_FMC_TAGVDW2S0           (KINETIS_FMC_BASE+KINETIS_FMC_TAGVDW2S0_OFFSET)
+#define KINETIS_FMC_TAGVDW2S1           (KINETIS_FMC_BASE+KINETIS_FMC_TAGVDW2S1_OFFSET)
+#define KINETIS_FMC_TAGVDW2S2           (KINETIS_FMC_BASE+KINETIS_FMC_TAGVDW2S2_OFFSET)
+#define KINETIS_FMC_TAGVDW2S3           (KINETIS_FMC_BASE+KINETIS_FMC_TAGVDW2S3_OFFSET)
+
+#define KINETIS_FMC_TAGVDW3S0           (KINETIS_FMC_BASE+KINETIS_FMC_TAGVDW3S0_OFFSET)
+#define KINETIS_FMC_TAGVDW3S1           (KINETIS_FMC_BASE+KINETIS_FMC_TAGVDW3S1_OFFSET)
+#define KINETIS_FMC_TAGVDW3S2           (KINETIS_FMC_BASE+KINETIS_FMC_TAGVDW3S2_OFFSET)
+#define KINETIS_FMC_TAGVDW3S3           (KINETIS_FMC_BASE+KINETIS_FMC_TAGVDW3S3_OFFSET)
+
+/* Cache Data Storage (upper and lower) for way=w and set=s, w=0..3, s=0..7 */
+
+#define KINETIS_FMC_DATAU(w,s)          (KINETIS_FMC_BASE+KINETIS_FMC_DATAU_OFFSET(w,s))
+#define KINETIS_FMC_DATAL(w,s)          (KINETIS_FMC_BASE+KINETIS_FMC_DATAL_OFFSET(w,s))
+
+#define KINETIS_FMC_DATAW0S0U           (KINETIS_FMC_BASE+KINETIS_FMC_DATAW0S0U_OFFSET)
+#define KINETIS_FMC_DATAW0S0L           (KINETIS_FMC_BASE+KINETIS_FMC_DATAW0S0L_OFFSET)
+#define KINETIS_FMC_DATAW0S1U           (KINETIS_FMC_BASE+KINETIS_FMC_DATAW0S1U_OFFSET)
+#define KINETIS_FMC_DATAW0S1L           (KINETIS_FMC_BASE+KINETIS_FMC_DATAW0S1L_OFFSET)
+#define KINETIS_FMC_DATAW0S2U           (KINETIS_FMC_BASE+KINETIS_FMC_DATAW0S2U_OFFSET)
+#define KINETIS_FMC_DATAW0S2L           (KINETIS_FMC_BASE+KINETIS_FMC_DATAW0S2L_OFFSET)
+#define KINETIS_FMC_DATAW0S3U           (KINETIS_FMC_BASE+KINETIS_FMC_DATAW0S3U_OFFSET)
+#define KINETIS_FMC_DATAW0S3L           (KINETIS_FMC_BASE+KINETIS_FMC_DATAW0S3L_OFFSET)
+
+#define KINETIS_FMC_DATAW1S0U           (KINETIS_FMC_BASE+KINETIS_FMC_DATAW1S0U_OFFSET)
+#define KINETIS_FMC_DATAW1S0L           (KINETIS_FMC_BASE+KINETIS_FMC_DATAW1S0L_OFFSET)
+#define KINETIS_FMC_DATAW1S1U           (KINETIS_FMC_BASE+KINETIS_FMC_DATAW1S1U_OFFSET)
+#define KINETIS_FMC_DATAW1S1L           (KINETIS_FMC_BASE+KINETIS_FMC_DATAW1S1L_OFFSET)
+#define KINETIS_FMC_DATAW1S2U           (KINETIS_FMC_BASE+KINETIS_FMC_DATAW1S2U_OFFSET)
+#define KINETIS_FMC_DATAW1S2L           (KINETIS_FMC_BASE+KINETIS_FMC_DATAW1S2L_OFFSET)
+#define KINETIS_FMC_DATAW1S3U           (KINETIS_FMC_BASE+KINETIS_FMC_DATAW1S3U_OFFSET)
+#define KINETIS_FMC_DATAW1S3L           (KINETIS_FMC_BASE+KINETIS_FMC_DATAW1S3L_OFFSET)
+
+#define KINETIS_FMC_DATAW2S0U           (KINETIS_FMC_BASE+KINETIS_FMC_DATAW2S0U_OFFSET)
+#define KINETIS_FMC_DATAW2S0L           (KINETIS_FMC_BASE+KINETIS_FMC_DATAW2S0L_OFFSET)
+#define KINETIS_FMC_DATAW2S1U           (KINETIS_FMC_BASE+KINETIS_FMC_DATAW2S1U_OFFSET)
+#define KINETIS_FMC_DATAW2S1L           (KINETIS_FMC_BASE+KINETIS_FMC_DATAW2S1L_OFFSET)
+#define KINETIS_FMC_DATAW2S2U           (KINETIS_FMC_BASE+KINETIS_FMC_DATAW2S2U_OFFSET)
+#define KINETIS_FMC_DATAW2S2L           (KINETIS_FMC_BASE+KINETIS_FMC_DATAW2S2L_OFFSET)
+#define KINETIS_FMC_DATAW2S3U           (KINETIS_FMC_BASE+KINETIS_FMC_DATAW2S3U_OFFSET)
+#define KINETIS_FMC_DATAW2S3L           (KINETIS_FMC_BASE+KINETIS_FMC_DATAW2S3L_OFFSET)
+
+#define KINETIS_FMC_DATAW3S0U           (KINETIS_FMC_BASE+KINETIS_FMC_DATAW3S0U_OFFSET)
+#define KINETIS_FMC_DATAW3S0L           (KINETIS_FMC_BASE+KINETIS_FMC_DATAW3S0L_OFFSET)
+#define KINETIS_FMC_DATAW3S1U           (KINETIS_FMC_BASE+KINETIS_FMC_DATAW3S1U_OFFSET)
+#define KINETIS_FMC_DATAW3S1L           (KINETIS_FMC_BASE+KINETIS_FMC_DATAW3S1L_OFFSET)
+#define KINETIS_FMC_DATAW3S2U           (KINETIS_FMC_BASE+KINETIS_FMC_DATAW3S2U_OFFSET)
+#define KINETIS_FMC_DATAW3S2L           (KINETIS_FMC_BASE+KINETIS_FMC_DATAW3S2L_OFFSET)
+#define KINETIS_FMC_DATAW3S3U           (KINETIS_FMC_BASE+KINETIS_FMC_DATAW3S3U_OFFSET)
+#define KINETIS_FMC_DATAW3S3L           (KINETIS_FMC_BASE+KINETIS_FMC_DATAW3S3L_OFFSET)
+
+/* Register Bit Definitions *********************************************************/
+
+/* Flash Access Protection Register */
+/* Access protection bits (all masters) */
+
+#define FMC_PFAPR_NONE                  0 /* No access may be performed by this master */
+#define FMC_PFAPR_RDONLY                1 /* Only read accesses may be performed by this master */
+#define FMC_PFAPR_WRONLY                2 /* Only write accesses may be performed by this master */
+#define FMC_PFAPR_RDWR                  3 /* Both read and write accesses may be performed by this master */
+
+#define FMC_PFAPR_M0AP_SHIFT            (0)       /* Bits 0-1: Master 0 Access Protection */
+#define FMC_PFAPR_M0AP_MASK             (3 << FMC_PFAPR_M0AP_SHIFT)
+#define FMC_PFAPR_M1AP_SHIFT            (2)       /* Bits 2-3: Master 1 Access Protection */
+#define FMC_PFAPR_M1AP_MASK             (3 << FMC_PFAPR_M1AP_SHIFT)
+#define FMC_PFAPR_M2AP_SHIFT            (4)       /* Bits 4-5: Master 2 Access Protection */
+#define FMC_PFAPR_M2AP_MASK             (3 << FMC_PFAPR_M2AP_SHIFT)
+#define FMC_PFAPR_M3AP_SHIFT            (6)       /* Bits 6-7: Master 3 Access Protection */
+#define FMC_PFAPR_M3AP_MASK             (3 << FMC_PFAPR_M3AP_SHIFT)
+#define FMC_PFAPR_M4AP_SHIFT            (8)       /* Bits 8-9: Master 4 Access Protection */
+#define FMC_PFAPR_M4AP_MASK             (3 << FMC_PFAPR_M4AP_SHIFT)
+#define FMC_PFAPR_M5AP_SHIFT            (10)      /* Bits 10-11: Master 5 Access Protection */
+#define FMC_PFAPR_M5AP_MASK             (3 << FMC_PFAPR_M5AP_SHIFT)
+#define FMC_PFAPR_M6AP_SHIFT            (12)      /* Bits 12-13: Master 6 Access Protection */
+#define FMC_PFAPR_M6AP_MASK             (3 << FMC_PFAPR_M6AP_SHIFT)
+#define FMC_PFAPR_M7AP_SHIFT            (14)      /* Bits 14-15: Master 7 Access Protection */
+#define FMC_PFAPR_M7AP_MASK             (3 << FMC_PFAPR_M7AP_SHIFT)
+#define FMC_PFAPR_M0PFD                 (1 << 16) /* Bit 16: Master 0 Prefetch Disable */
+#define FMC_PFAPR_M1PFD                 (1 << 17) /* Bit 17: Master 1 Prefetch Disable */
+#define FMC_PFAPR_M2PFD                 (1 << 18) /* Bit 18: Master 2 Prefetch Disable */
+#define FMC_PFAPR_M3PFD                 (1 << 19) /* Bit 19: Master 3 Prefetch Disable */
+#define FMC_PFAPR_M4PFD                 (1 << 20) /* Bit 20: Master 4 Prefetch Disable */
+#define FMC_PFAPR_M5PFD                 (1 << 21) /* Bit 21: Master 5 Prefetch Disable */
+#define FMC_PFAPR_M6PFD                 (1 << 22) /* Bit 22: Master 6 Prefetch Disable */
+#define FMC_PFAPR_M7PFD                 (1 << 23) /* Bit 23: Master 7 Prefetch Disable */
+                                                  /* Bits 24-31: Reserved */
+/* Flash Bank 0 Control Register */
+
+#define FMC_PFB0CR_B0SEBE               (1 << 0)  /* Bit 0:  Bank 0 Single Entry Buffer Enable */
+#define FMC_PFB0CR_B0IPE                (1 << 1)  /* Bit 1:  Bank 0 Instruction Prefetch Enable */
+#define FMC_PFB0CR_B0DPE                (1 << 2)  /* Bit 2:  Bank 0 Data Prefetch Enable */
+#define FMC_PFB0CR_B0ICE                (1 << 3)  /* Bit 3:  Bank 0 Instruction Cache Enable */
+#define FMC_PFB0CR_B0DCE                (1 << 4)  /* Bit 4:  Bank 0 Data Cache Enable */
+#define FMC_PFB0CR_CRC_SHIFT            (5)       /* Bits 5-7: Cache Replacement Control */
+#define FMC_PFB0CR_CRC_MASK             (7 << FMC_PFB0CR_CRC_SHIFT)
+#  define FMC_PFB0CR_CRC_ALL            (0 << FMC_PFB0CR_CRC_SHIFT) /* LRU all four ways */
+#  define FMC_PFB0CR_CRC_I01D23         (2 << FMC_PFB0CR_CRC_SHIFT) /* LRU ifetches 0-1 data 2-3 */
+#  define FMC_PFB0CR_CRC_I012D3         (3 << FMC_PFB0CR_CRC_SHIFT) /* LRU ifetches 0-3 data 3 */
+                                                  /* Bits 8-16: Reserved */
+#define FMC_PFB0CR_B0MW_SHIFT           (17)      /* Bits 17-18: Bank 0 Memory Width */
+#define FMC_PFB0CR_B0MW_MASK            (3 << FMC_PFB0CR_B0MW_SHIFT)
+#  define FMC_PFB0CR_B0MW_32BITS        (0 << FMC_PFB0CR_B0MW_SHIFT) /* 32 bits */
+#  define FMC_PFB0CR_B0MW_64BITS        (1 << FMC_PFB0CR_B0MW_SHIFT) /* 64 bits */
+#define FMC_PFB0CR_S_B_INV              (1 << 19) /* Bit 19:  Invalidate Prefetch Speculation Buffer */
+#define FMC_PFB0CR_CINV_WAY_SHIFT       (20)      /* Bits 20-23: Cache Invalidate Way x */
+#define FMC_PFB0CR_CINV_WAY_MASK        (15 << FMC_PFB0CR_CINV_WAY_SHIFT)
+#define FMC_PFB0CR_CLCK_WAY_SHIFT       (24)      /* Bits 24-27: Cache Lock Way x */
+#define FMC_PFB0CR_CLCK_WAY_MASK        (15 << FMC_PFB0CR_CLCK_WAY_SHIFT)
+#define FMC_PFB0CR_B0RWSC_SHIFT         (28)      /* Bits 28-31: Bank 0 Read Wait State Control */
+#define FMC_PFB0CR_B0RWSC_MASK          (15 << FMC_PFB0CR_B0RWSC_SHIFT)
+
+/* Flash Bank 1 Control Register */
+
+#define FMC_PFB1CR_B1SEBE               (1 << 0)  /* Bit 0:  Bank 1 Single Entry Buffer Enable */
+#define FMC_PFB1CR_B1IPE                (1 << 1)  /* Bit 1:  Bank 1 Instruction Prefetch Enable */
+#define FMC_PFB1CR_B1DPE                (1 << 2)  /* Bit 2:  Bank 1 Data Prefetch Enable */
+#define FMC_PFB1CR_B1ICE                (1 << 3)  /* Bit 3:  Bank 1 Instruction Cache Enable */
+#define FMC_PFB1CR_B1DCE                (1 << 4)  /* Bit 4:  Bank 1 Data Cache Enable */
+                                                  /* Bits 5-16: Reserved */
+#define FMC_PFB1CR_B1MW_SHIFT           (17)      /* Bits 17-18: Bank 1 Memory Width */
+#define FMC_PFB1CR_B1MW_MASK            (3 << FMC_PFB1CR_B1MW_SHIFT)
+#  define FMC_PFB1CR_B1MW_32BITS        (0 << FMC_PFB1CR_B1MW_SHIFT) /* 32 bits */
+#  define FMC_PFB1CR_B1MW_64BITS        (1 << FMC_PFB1CR_B1MW_SHIFT) /* 64 bits */
+                                                  /* Bits 19-27: Reserved */
+#define FMC_PFB1CR_B1RWSC_SHIFT         (28)      /* Bits 28-31: Bank 1 Read Wait State Control */
+#define FMC_PFB1CR_B1RWSC_MASK          (15 << FMC_PFB1CR_B0RWSC_SHIFT)
+
+/* Cache Directory Storage for way=w and set=s, w=0..3, s=0..7 */
+
+#define FMC_TAGVD_VALID                 (1 << 0)  /* Bit 0:  1-bit valid for cache entry */
+                                                  /* Bits 1-4: Reserved */
+#define FMC_TAGVD_TAG_SHIFT             (5)       /* Bits 5-18: 13-bit tag for cache entry */
+#define FMC_TAGVD_TAG_MASK              (0x1fff << FMC_TAGVD_TAG_SHIFT)
+                                                  /* Bits 19-31: Reserved */
+
+/* Cache Data Storage (upper and lower) for way=w and set=s, w=0..3, s=0..7.
+ * 64-bit data in two 32-bit registers.
+ */
+
+/************************************************************************************
+ * Public Types
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Data
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K64FMC_H */
diff --git a/arch/arm/src/kinetis/kinetis_llwu.h b/arch/arm/src/kinetis/chip/kinetis_llwu.h
similarity index 98%
rename from arch/arm/src/kinetis/kinetis_llwu.h
rename to arch/arm/src/kinetis/chip/kinetis_llwu.h
index 4324a76251..ae5c6c8b04 100644
--- a/arch/arm/src/kinetis/kinetis_llwu.h
+++ b/arch/arm/src/kinetis/chip/kinetis_llwu.h
@@ -1,7 +1,7 @@
 /************************************************************************************
- * arch/arm/src/kinetis/kinetis_llwu.h
+ * arch/arm/src/kinetis/chip/kinetis_llwu.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_LLWU_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_LLWU_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_LLWU_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_LLWU_H
 
 /************************************************************************************
  * Included Files
@@ -249,4 +249,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_LLWU_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_LLWU_H */
diff --git a/arch/arm/src/kinetis/kinetis_lptmr.h b/arch/arm/src/kinetis/chip/kinetis_lptmr.h
similarity index 96%
rename from arch/arm/src/kinetis/kinetis_lptmr.h
rename to arch/arm/src/kinetis/chip/kinetis_lptmr.h
index 863b24108e..15aeb4a561 100644
--- a/arch/arm/src/kinetis/kinetis_lptmr.h
+++ b/arch/arm/src/kinetis/chip/kinetis_lptmr.h
@@ -1,7 +1,7 @@
 /****************************************************************************************************
- * arch/arm/src/kinetis/kinetis_lptmr.h
+ * arch/arm/src/kinetis/chip/kinetis_lptmr.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_LPTMR_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_LPTMR_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_LPTMR_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_LPTMR_H
 
 /****************************************************************************************************
  * Included Files
@@ -130,4 +130,4 @@
  * Public Functions
  ****************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_LPTMR_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_LPTMR_H */
diff --git a/arch/arm/src/kinetis/kinetis_mcg.h b/arch/arm/src/kinetis/chip/kinetis_mcg.h
similarity index 94%
rename from arch/arm/src/kinetis/kinetis_mcg.h
rename to arch/arm/src/kinetis/chip/kinetis_mcg.h
index 60f13cd2a0..e426b02e58 100644
--- a/arch/arm/src/kinetis/kinetis_mcg.h
+++ b/arch/arm/src/kinetis/chip/kinetis_mcg.h
@@ -1,7 +1,7 @@
 /************************************************************************************
- * arch/arm/src/kinetis/kinetis_mcg.h
+ * arch/arm/src/kinetis/chip/kinetis_mcg.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_MCG_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_MCG_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MCG_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MCG_H
 
 /************************************************************************************
  * Included Files
@@ -60,6 +60,10 @@
 #define KINETIS_MCG_ATC_OFFSET    0x0008 /* MCG Auto Trim Control Register */
 #define KINETIS_MCG_ATCVH_OFFSET  0x000a /* MCG Auto Trim Compare Value High Register */
 #define KINETIS_MCG_ATCVL_OFFSET  0x000b /* MCG Auto Trim Compare Value Low Register */
+#ifdef KINETIS_K64
+#  define KINETIS_MCG_C7_OFFSET   0x000c /* MCG Control 7 Register */
+#  define KINETIS_MCG_C8_OFFSET   0x000d /* MCG Control 8 Register */
+#endif
 
 /* Register Addresses ***************************************************************/
 
@@ -73,6 +77,10 @@
 #define KINETIS_MCG_ATC           (KINETIS_MCG_BASE+KINETIS_MCG_ATC_OFFSET)
 #define KINETIS_MCG_ATCVH         (KINETIS_MCG_BASE+KINETIS_MCG_ATCVH_OFFSET)
 #define KINETIS_MCG_ATCVL         (KINETIS_MCG_BASE+KINETIS_MCG_ATCVL_OFFSET)
+#ifdef KINETIS_K64
+#  define KINETIS_MCG_C7          (KINETIS_MCG_BASE+KINETIS_MCG_C7_OFFSET)
+#  define KINETIS_MCG_C8          (KINETIS_MCG_BASE+KINETIS_MCG_C8_OFFSET)
+#endif
 
 /* Register Bit Definitions *********************************************************/
 
@@ -171,6 +179,10 @@
 
 /* MCG Auto Trim Compare Value High/Low Registers (8-bit compare value) */
 
+/* MCG Control 7 Register */
+
+/* MCG Control 8 Register */
+
 /************************************************************************************
  * Public Types
  ************************************************************************************/
@@ -183,4 +195,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_MCG_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MCG_H */
diff --git a/arch/arm/src/kinetis/kinetis_clockconfig.c b/arch/arm/src/kinetis/kinetis_clockconfig.c
index 22f840a4dd..eddaafc53e 100644
--- a/arch/arm/src/kinetis/kinetis_clockconfig.c
+++ b/arch/arm/src/kinetis/kinetis_clockconfig.c
@@ -44,10 +44,10 @@
 #include "up_arch.h"
 
 #include "kinetis.h"
-#include "kinetis_mcg.h"
+#include "chip/kinetis_mcg.h"
 #include "kinetis_sim.h"
-#include "kinetis_fmc.h"
-#include "kinetis_llwu.h"
+#include "chip/kinetis_fmc.h"
+#include "chip/kinetis_llwu.h"
 #include "chip/kinetis_pinmux.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/kinetis/kinetis_ftfl.h b/arch/arm/src/kinetis/kinetis_ftfl.h
deleted file mode 100644
index 92e53b650d..0000000000
--- a/arch/arm/src/kinetis/kinetis_ftfl.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/************************************************************************************
- * arch/arm/src/kinetis/kinetis_ftfl.h
- *
- *   Copyright (C) 2011 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.
- *
- ************************************************************************************/
-
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_FTFL_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_FTFL_H
-
-/************************************************************************************
- * Included Files
- ************************************************************************************/
-
-#include 
-
-#include "chip.h"
-
-/************************************************************************************
- * Pre-processor Definitions
- ************************************************************************************/
-
-/* Register Offsets *****************************************************************/
-
-#define KINETIS_FTFL_FSTAT_OFFSET   0x0000 /* Flash Status Register */
-#define KINETIS_FTFL_FCNFG_OFFSET   0x0001 /* Flash Configuration Register */
-#define KINETIS_FTFL_FSEC_OFFSET    0x0002 /* Flash Security Register */
-#define KINETIS_FTFL_FOPT_OFFSET    0x0003 /* Flash Option Register */
-
-#define KINETIS_FTFL_FCCOB3_OFFSET  0x0004 /* Flash Common Command Object Registers */
-#define KINETIS_FTFL_FCCOB2_OFFSET  0x0005 /* Flash Common Command Object Registers */
-#define KINETIS_FTFL_FCCOB1_OFFSET  0x0006 /* Flash Common Command Object Registers */
-#define KINETIS_FTFL_FCCOB0_OFFSET  0x0007 /* Flash Common Command Object Registers */
-#define KINETIS_FTFL_FCCOB7_OFFSET  0x0008 /* Flash Common Command Object Registers */
-#define KINETIS_FTFL_FCCOB6_OFFSET  0x0009 /* Flash Common Command Object Registers */
-#define KINETIS_FTFL_FCCOB5_OFFSET  0x000a /* Flash Common Command Object Registers */
-#define KINETIS_FTFL_FCCOB4_OFFSET  0x000b /* Flash Common Command Object Registers */
-#define KINETIS_FTFL_FCCOBB_OFFSET  0x000c /* Flash Common Command Object Registers */
-#define KINETIS_FTFL_FCCOBA_OFFSET  0x000d /* Flash Common Command Object Registers */
-#define KINETIS_FTFL_FCCOB9_OFFSET  0x000e /* Flash Common Command Object Registers */
-#define KINETIS_FTFL_FCCOB8_OFFSET  0x000f /* Flash Common Command Object Registers */
-#define KINETIS_FTFL_FPROT3_OFFSET  0x0010 /* Program Flash Protection Registers */
-#define KINETIS_FTFL_FPROT2_OFFSET  0x0011 /* Program Flash Protection Registers */
-#define KINETIS_FTFL_FPROT1_OFFSET  0x0012 /* Program Flash Protection Registers */
-#define KINETIS_FTFL_FPROT0_OFFSET  0x0013 /* Program Flash Protection Registers */
-#define KINETIS_FTFL_FEPROT_OFFSET  0x0016 /* EEPROM Protection Register */
-#define KINETIS_FTFL_FDPROT_OFFSET  0x0017 /* Data Flash Protection Register */
-
-/* Register Addresses ***************************************************************/
-
-#define KINETIS_FTFL_FSTAT          (KINETIS_FTFL_BASE+KINETIS_FTFL_FSTAT_OFFSET)
-#define KINETIS_FTFL_FCNFG          (KINETIS_FTFL_BASE+KINETIS_FTFL_FCNFG_OFFSET)
-#define KINETIS_FTFL_FSEC           (KINETIS_FTFL_BASE+KINETIS_FTFL_FSEC_OFFSET)
-#define KINETIS_FTFL_FOPT           (KINETIS_FTFL_BASE+KINETIS_FTFL_FOPT_OFFSET)
-#define KINETIS_FTFL_FCCOB3         (KINETIS_FTFL_BASE+KINETIS_FTFL_FCCOB3_OFFSET)
-#define KINETIS_FTFL_FCCOB2         (KINETIS_FTFL_BASE+KINETIS_FTFL_FCCOB2_OFFSET)
-#define KINETIS_FTFL_FCCOB1         (KINETIS_FTFL_BASE+KINETIS_FTFL_FCCOB1_OFFSET)
-#define KINETIS_FTFL_FCCOB0         (KINETIS_FTFL_BASE+KINETIS_FTFL_FCCOB0_OFFSET)
-#define KINETIS_FTFL_FCCOB7         (KINETIS_FTFL_BASE+KINETIS_FTFL_FCCOB7_OFFSET)
-#define KINETIS_FTFL_FCCOB6         (KINETIS_FTFL_BASE+KINETIS_FTFL_FCCOB6_OFFSET)
-#define KINETIS_FTFL_FCCOB5         (KINETIS_FTFL_BASE+KINETIS_FTFL_FCCOB5_OFFSET)
-#define KINETIS_FTFL_FCCOB4         (KINETIS_FTFL_BASE+KINETIS_FTFL_FCCOB4_OFFSET)
-#define KINETIS_FTFL_FCCOBB         (KINETIS_FTFL_BASE+KINETIS_FTFL_FCCOBB_OFFSET)
-#define KINETIS_FTFL_FCCOBA         (KINETIS_FTFL_BASE+KINETIS_FTFL_FCCOBA_OFFSET)
-#define KINETIS_FTFL_FCCOB9         (KINETIS_FTFL_BASE+KINETIS_FTFL_FCCOB9_OFFSET)
-#define KINETIS_FTFL_FCCOB8         (KINETIS_FTFL_BASE+KINETIS_FTFL_FCCOB8_OFFSET)
-#define KINETIS_FTFL_FPROT3         (KINETIS_FTFL_BASE+KINETIS_FTFL_FPROT3_OFFSET)
-#define KINETIS_FTFL_FPROT2         (KINETIS_FTFL_BASE+KINETIS_FTFL_FPROT2_OFFSET)
-#define KINETIS_FTFL_FPROT1         (KINETIS_FTFL_BASE+KINETIS_FTFL_FPROT1_OFFSET)
-#define KINETIS_FTFL_FPROT0         (KINETIS_FTFL_BASE+KINETIS_FTFL_FPROT0_OFFSET)
-#define KINETIS_FTFL_FEPROT         (KINETIS_FTFL_BASE+KINETIS_FTFL_FEPROT_OFFSET)
-#define KINETIS_FTFL_FDPROT         (KINETIS_FTFL_BASE+KINETIS_FTFL_FDPROT_OFFSET)
-
-/* Register Bit Definitions *********************************************************/
-
-/* Flash Status Register */
-
-#define FTFL_FSTAT_MGSTAT0          (1 << 0)  /* Bit 0:  Memory Controller Command Completion Status Flag */
-                                              /* Bits 1-3: Reserved */
-#define FTFL_FSTAT_FPVIOL           (1 << 4)  /* Bit 4:  Flash Protection Violation Flag */
-#define FTFL_FSTAT_ACCERR           (1 << 5)  /* Bit 5:  Flash Access Error Flag */
-#define FTFL_FSTAT_RDCOLERR         (1 << 6)  /* Bit 6:  FTFL Read Collision Error Flag */
-#define FTFL_FSTAT_CCIF             (1 << 7)  /* Bit 7:  Command Complete Interrupt Flag */
-
-/* Flash Configuration Register */
-
-#define FTFL_FCNFG_EEERDY           (1 << 0)  /* Bit 0:  FEEPROM backup data copied to FlexRAM */
-#define FTFL_FCNFG_RAMRDY           (1 << 1)  /* Bit 1:  RAM Ready */
-#define FTFL_FCNFG_PFLSH            (1 << 2)  /* Bit 2:  FTFL configuration */
-#define FTFL_FCNFG_SWAP             (1 << 3)  /* Bit 3:  Swap */
-#define FTFL_FCNFG_ERSSUSP          (1 << 4)  /* Bit 4:  Erase Suspend */
-#define FTFL_FCNFG_ERSAREQ          (1 << 5)  /* Bit 5:  Erase All Request */
-#define FTFL_FCNFG_RDCOLLIE         (1 << 6)  /* Bit 6:  Read Collision Error Interrupt Enable */
-#define FTFL_FCNFG_CCIE             (1 << 7)  /* Bit 7:  Command Complete Interrupt Enable */
-
-/* Flash Security Register */
-
-#define FTFL_FSEC_SEC_SHIFT         (0)       /* Bits 0-1: Flash Security */
-#define FTFL_FSEC_SEC_MASK          (3 << FTFL_FSEC_SEC_SHIFT)
-#  define FTFL_FSEC_SEC_SECURE      (0 << FTFL_FSEC_SEC_SHIFT) /* 00,01,11: status is secure */
-#  define FTFL_FSEC_SEC_UNSECURE    (2 << FTFL_FSEC_SEC_SHIFT) /* 10: status is insecure */
-#define FTFL_FSEC_FSLACC_SHIFT      (2)       /* Bits 2-3: Freescale Failure Analysis Access Code */
-#define FTFL_FSEC_FSLACC_MASK       (3 << FTFL_FSEC_FSLACC_SHIFT)
-#  define FTFL_FSEC_FSLACC_GRANTED  (0 << FTFL_FSEC_FSLACC_SHIFT) /* 00 or 11: Access granted */
-#  define FTFL_FSEC_FSLACC_DENIED   (1 << FTFL_FSEC_FSLACC_SHIFT) /* 01 or 10: Access denied */
-#define FTFL_FSEC_MEEN_SHIFT        (4)       /* Bits 4-5: Mass Erase Enable Bits */
-#define FTFL_FSEC_MEEN_MASK         (3 << FTFL_FSEC_MEEN_SHIFT)
-#  define FTFL_FSEC_MEEN_ENABLED    (0 << FTFL_FSEC_MEEN_SHIFT) /* All values are enabled */
-#define FTFL_FSEC_KEYEN_SHIFT       (6)       /* Bits 6-7: Backdoor Key Security Enable */
-#define FTFL_FSEC_KEYEN_MASK        (3 << FTFL_FSEC_KEYEN_SHIFT)
-#  define FTFL_FSEC_KEYEN_DISABLED  (1 << FTFL_FSEC_KEYEN_SHIFT) /* All values are disabled */
-
-/* Flash Option Register (32-bits, see Chip Configuration details) */
-/* Flash Common Command Object Registers (8-bit flash command data) */
-/* Program Flash Protection Registers (8-bit flash protection data) */
-/* EEPROM Protection Register (8-bit eeprom protection data) */
-/* Data Flash Protection Register (8-bit data flash protection data) */
-
-/************************************************************************************
- * Public Types
- ************************************************************************************/
-
-/************************************************************************************
- * Public Data
- ************************************************************************************/
-
-/************************************************************************************
- * Public Functions
- ************************************************************************************/
-
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_FTFL_H */
diff --git a/arch/arm/src/kinetis/kinetis_pin.c b/arch/arm/src/kinetis/kinetis_pin.c
index 851d0c9d9c..680d2079cf 100644
--- a/arch/arm/src/kinetis/kinetis_pin.c
+++ b/arch/arm/src/kinetis/kinetis_pin.c
@@ -51,19 +51,7 @@
 #include "kinetis_memorymap.h"
 #include "kinetis.h"
 #include "kinetis_port.h"
-#include "kinetis_gpio.h"
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
+#include "chip/kinetis_gpio.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/arm/src/kinetis/kinetis_pindump.c b/arch/arm/src/kinetis/kinetis_pindump.c
index 579c01bb4d..02367ded7a 100644
--- a/arch/arm/src/kinetis/kinetis_pindump.c
+++ b/arch/arm/src/kinetis/kinetis_pindump.c
@@ -46,7 +46,7 @@
 #include "up_arch.h"
 
 #include "kinetis.h"
-#include "kinetis_gpio.h"
+#include "chip/kinetis_gpio.h"
 #include "kinetis_port.h"
 
 #ifdef CONFIG_DEBUG_GPIO_INFO
diff --git a/arch/arm/src/kinetis/kinetis_pingpio.c b/arch/arm/src/kinetis/kinetis_pingpio.c
index 3663a92399..e92336e64c 100644
--- a/arch/arm/src/kinetis/kinetis_pingpio.c
+++ b/arch/arm/src/kinetis/kinetis_pingpio.c
@@ -50,19 +50,7 @@
 
 #include "kinetis_memorymap.h"
 #include "kinetis.h"
-#include "kinetis_gpio.h"
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
+#include "chip/kinetis_gpio.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/arm/src/kinetis/kinetis_pwm.c b/arch/arm/src/kinetis/kinetis_pwm.c
index 0730bf8dd8..ac48a4af02 100644
--- a/arch/arm/src/kinetis/kinetis_pwm.c
+++ b/arch/arm/src/kinetis/kinetis_pwm.c
@@ -58,9 +58,9 @@
 #include "chip.h"
 
 #include "kinetis.h"
-#include "kinetis_pwm.h"
-#include "kinetis_gpio.h"
-#include "kinetis_ftm.h"
+#include "chip/kinetis_pwm.h"
+#include "chip/kinetis_gpio.h"
+#include "chip/kinetis_ftm.h"
 #include "kinetis_sim.h"
 
 /* This module then only compiles if there is at least one enabled timer
diff --git a/arch/arm/src/kinetis/kinetis_usbdev.c b/arch/arm/src/kinetis/kinetis_usbdev.c
index 8deedb7603..7eeaf8ec15 100644
--- a/arch/arm/src/kinetis/kinetis_usbdev.c
+++ b/arch/arm/src/kinetis/kinetis_usbdev.c
@@ -68,7 +68,7 @@
 #include "kinetis.h"
 #include "kinetis_usbotg.h"
 #include "kinetis_sim.h"
-#include "kinetis_fmc.h"
+#include "chip/kinetis_fmc.h"
 
 #if defined(CONFIG_USBDEV) && defined(CONFIG_KINETIS_USBOTG)
 
-- 
GitLab


From 4acd29692698fca8e89ee08383b65e5d2ab94932 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Fri, 1 Jul 2016 13:15:29 -0600
Subject: [PATCH 124/229] arch/arm/kinetis:  Still moving register header files
 to kinetis/chip directory; still incorporating K64 differences.

---
 arch/arm/src/kinetis/chip.h                   |   2 +-
 arch/arm/src/kinetis/chip/kinetis_fmc.h       |   6 +-
 .../kinetis_k20k40k60mpu.h}                   |   0
 .../src/kinetis/chip/kinetis_k20memorymap.h   | 180 +++++++
 .../src/kinetis/chip/kinetis_k40memormap.h    | 199 ++++++++
 .../src/kinetis/chip/kinetis_k60memormap.h    | 196 ++++++++
 .../src/kinetis/chip/kinetis_k64memorymap.h   | 210 ++++++++
 arch/arm/src/kinetis/chip/kinetis_k64mpu.h    | 358 ++++++++++++++
 arch/arm/src/kinetis/{ => chip}/kinetis_mcm.h |  16 +-
 arch/arm/src/kinetis/chip/kinetis_memorymap.h |  79 +++
 .../src/kinetis/{ => chip}/kinetis_mmcau.h    |  26 +-
 arch/arm/src/kinetis/chip/kinetis_mpu.h       |  75 +++
 arch/arm/src/kinetis/chip/kinetis_pinmux.h    |   8 +-
 arch/arm/src/kinetis/kinetis_enet.c           |   2 +-
 arch/arm/src/kinetis/kinetis_memorymap.h      | 461 ------------------
 arch/arm/src/kinetis/kinetis_pin.c            |   1 -
 arch/arm/src/kinetis/kinetis_pingpio.c        |   1 -
 arch/arm/src/kinetis/kinetis_uart.h           |   2 +-
 18 files changed, 1334 insertions(+), 488 deletions(-)
 rename arch/arm/src/kinetis/{kinetis_mpu.h => chip/kinetis_k20k40k60mpu.h} (100%)
 create mode 100644 arch/arm/src/kinetis/chip/kinetis_k20memorymap.h
 create mode 100644 arch/arm/src/kinetis/chip/kinetis_k40memormap.h
 create mode 100644 arch/arm/src/kinetis/chip/kinetis_k60memormap.h
 create mode 100644 arch/arm/src/kinetis/chip/kinetis_k64memorymap.h
 create mode 100644 arch/arm/src/kinetis/chip/kinetis_k64mpu.h
 rename arch/arm/src/kinetis/{ => chip}/kinetis_mcm.h (94%)
 create mode 100644 arch/arm/src/kinetis/chip/kinetis_memorymap.h
 rename arch/arm/src/kinetis/{ => chip}/kinetis_mmcau.h (89%)
 create mode 100644 arch/arm/src/kinetis/chip/kinetis_mpu.h
 delete mode 100644 arch/arm/src/kinetis/kinetis_memorymap.h

diff --git a/arch/arm/src/kinetis/chip.h b/arch/arm/src/kinetis/chip.h
index 0ed152bac2..26fa7e38a0 100644
--- a/arch/arm/src/kinetis/chip.h
+++ b/arch/arm/src/kinetis/chip.h
@@ -47,7 +47,7 @@
  */
 
 #include 
-#include "kinetis_memorymap.h"
+#include "chip/kinetis_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/kinetis/chip/kinetis_fmc.h b/arch/arm/src/kinetis/chip/kinetis_fmc.h
index 37e6dfda8d..d189d657dd 100644
--- a/arch/arm/src/kinetis/chip/kinetis_fmc.h
+++ b/arch/arm/src/kinetis/chip/kinetis_fmc.h
@@ -49,11 +49,11 @@
  */
 
 #if defined(KINETIS_K20) || defined(KINETIS_K40) || defined(KINETIS_K60)
-#  include "kinetis_k20k40k60fmc.h"
+#  include "chip/kinetis_k20k40k60fmc.h"
 #elif defined(KINETIS_K64)
-#  include "kinetis_k64fmc.h"
+#  include "chip/kinetis_k64fmc.h"
 #else
-#  error "No pin multiplexing for this Kinetis part"
+#  error "No FMC definitions for this Kinetis part"
 #endif
 
 /********************************************************************************************
diff --git a/arch/arm/src/kinetis/kinetis_mpu.h b/arch/arm/src/kinetis/chip/kinetis_k20k40k60mpu.h
similarity index 100%
rename from arch/arm/src/kinetis/kinetis_mpu.h
rename to arch/arm/src/kinetis/chip/kinetis_k20k40k60mpu.h
diff --git a/arch/arm/src/kinetis/chip/kinetis_k20memorymap.h b/arch/arm/src/kinetis/chip/kinetis_k20memorymap.h
new file mode 100644
index 0000000000..7d5aa615cd
--- /dev/null
+++ b/arch/arm/src/kinetis/chip/kinetis_k20memorymap.h
@@ -0,0 +1,180 @@
+/************************************************************************************
+ * arch/arm/src/kinetis/chip/kinetis_k20memorymap.h
+ *
+ *   Copyright (C) 2011, 2015-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.
+ *
+ ************************************************************************************/
+
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K20MEMORYMAP_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K20MEMORYMAP_H
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include 
+
+#include "chip.h"
+
+#ifdef KINETIS_K20
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+/* Memory Map ***********************************************************************/
+/* K20 Family
+ *
+ * The memory map for the following parts is defined in Freescale document
+ * K20P64M72SF1RM
+ */
+
+#define KINETIS_FLASH_BASE     0x00000000  /* –0x0fffffff Program flash and read-
+                                            *             only data (Includes exception
+                                            *             vectors in first 1024 bytes) */
+#if !defined(KINETIS_FLEXMEM_SIZE)
+#  define KINETIS_FLEXNVM_BASE 0x10000000  /* –0x13ffffff FlexNVM */
+#  define KINETIS_FLEXRAM_BASE 0x14000000  /* –0x17ffffff FlexRAM */
+#endif
+                             /* 0x18000000  * –0x1bffffff Reserved */
+#define KINETIS_SRAML_BASE     0x1c000000  /* –0x1fffffff SRAM_L: Lower SRAM
+                                            *             (ICODE/DCODE) */
+#define KINETIS_SRAMU_BASE     0x20000000  /* –0x200fffff SRAM_U: Upper SRAM bitband
+                                            *             region */
+                             /* 0x20100000  * –0x21ffffff Reserved */
+#define KINETIS_SALIAS_BASE    0x22000000  /* –0x23ffffff Aliased to SRAM_U bitband */
+                             /* 0x24000000  * –0x3fffffff Reserved */
+#define KINETIS_BRIDGE0_BASE   0x40000000  /* –0x4007ffff Bitband region for peripheral
+                                            *             bridge 0 (AIPS-Lite0) */
+#define KINETIS_BRIDGE1_BASE   0x40080000  /* –0x400fffff Bitband region for peripheral
+                                            *             bridge 1 (AIPS-Lite1) */
+#define KINETIS_GPIOBB_BASE    0x400ff000  /* –0x400fffff Bitband region for general
+                                            *             purpose input/output (GPIO) */
+                             /* 0x40100000  * –0x41ffffff Reserved */
+#define KINETIS_PALIAS_BASE    0x42000000  /* –0x43ffffff Aliased to peripheral bridge
+                                            *             (AIPS-Lite) and general purpose
+                                            *             input/output (GPIO) bitband */
+                             /* 0x44000000  * –0xdfffffff Reserved */
+#define KINETIS_PERIPH_BASE    0xe0000000  /* –0xe00fffff Private peripherals */
+                             /* 0xe0100000  * –0xffffffff Reserved */
+
+/* Peripheral Bridge 0 Memory Map ***************************************************/
+
+#define KINETIS_AIPS0_BASE     0x40000000  /* Peripheral bridge 0 (AIPS-Lite 0) */
+#define KINETIS_XBAR_BASE      0x40004000  /* Crossbar switch */
+#define KINETIS_DMAC_BASE      0x40008000  /* DMA controller */
+#define KINETIS_DMADESC_BASE   0x40009000  /* DMA controller transfer control descriptors */
+#define KINETIS_FMC_BASE       0x4001f000  /* Flash memory controller */
+#define KINETIS_FTFL_BASE      0x40020000  /* Flash memory */
+#define KINETIS_DMAMUX0_BASE   0x40021000  /* DMA channel mutiplexer 0 */
+#define KINETIS_CAN0_BASE      0x40024000  /* FlexCAN 0 */
+#define KINETIS_SPI0_BASE      0x4002c000  /* SPI 0 */
+#define KINETIS_SPI1_BASE      0x4002d000  /* SPI 1 */
+#define KINETIS_I2S0_BASE      0x4002f000  /* I2S 0 */
+#define KINETIS_CRC_BASE       0x40032000  /* CRC */
+#define KINETIS_USBDCD_BASE    0x40035000  /* USB DCD */
+#define KINETIS_PDB0_BASE      0x40036000  /* Programmable delay block */
+#define KINETIS_PIT_BASE       0x40037000  /* Periodic interrupt timers (PIT) */
+#define KINETIS_FTM0_BASE      0x40038000  /* FlexTimer 0 */
+#define KINETIS_FTM1_BASE      0x40039000  /* FlexTimer 1 */
+#define KINETIS_ADC0_BASE      0x4003b000  /* Analog-to-digital converter (ADC) 0 */
+#define KINETIS_RTC_BASE       0x4003d000  /* Real time clock */
+#define KINETIS_VBATR_BASE     0x4003e000  /* VBAT register file */
+#define KINETIS_LPTMR_BASE     0x40040000  /* Low power timer */
+#define KINETIS_SYSR_BASE      0x40041000  /* System register file */
+#define KINETIS_TSI0_BASE      0x40045000  /* Touch sense interface */
+#define KINETIS_SIMLP_BASE     0x40047000  /* SIM low-power logic */
+#define KINETIS_SIM_BASE       0x40048000  /* System integration module (SIM) */
+#define KINETIS_PORT_BASE(n)   (0x40049000 + ((n) << 12))
+#define KINETIS_PORTA_BASE     0x40049000  /* Port A multiplexing control */
+#define KINETIS_PORTB_BASE     0x4004a000  /* Port B multiplexing control */
+#define KINETIS_PORTC_BASE     0x4004b000  /* Port C multiplexing control */
+#define KINETIS_PORTD_BASE     0x4004c000  /* Port D multiplexing control */
+#define KINETIS_PORTE_BASE     0x4004d000  /* Port E multiplexing control */
+#define KINETIS_WDOG_BASE      0x40052000  /* Software watchdog */
+#define KINETIS_EWM_BASE       0x40061000  /* External watchdog */
+#define KINETIS_CMT_BASE       0x40062000  /* Carrier modulator timer (CMT) */
+#define KINETIS_MCG_BASE       0x40064000  /* Multi-purpose Clock Generator (MCG) */
+#define KINETIS_OSC_BASE       0x40065000  /* System oscillator (OSC) */
+#define KINETIS_I2C0_BASE      0x40066000  /* I2C 0 */
+#define KINETIS_I2C1_BASE      0x40067000  /* I2C 1 */
+#define KINETIS_UART0_BASE     0x4006a000  /* UART0 */
+#define KINETIS_UART1_BASE     0x4006b000  /* UART1 */
+#define KINETIS_UART2_BASE     0x4006c000  /* UART2 */
+#define KINETIS_USB0_BASE      0x40072000  /* USB OTG FS/LS */
+#define KINETIS_CMP_BASE       0x40073000  /* Analog comparator (CMP) / 6-bit digital-to-analog converter (DAC) */
+#define KINETIS_VREF_BASE      0x40074000  /* Voltage reference (VREF) */
+#define KINETIS_LLWU_BASE      0x4007c000  /* Low-leakage wakeup unit (LLWU) */
+#define KINETIS_PMC_BASE       0x4007d000  /* Power management controller (PMC) */
+#define KINETIS_SMC_BASE       0x4007e000  /* System Mode controller (SMC) */
+
+/* Peripheral Bridge 1 Memory Map ***************************************************/
+
+#define KINETIS_AIPS1_BASE     0x40080000  /* Peripheral bridge 1 (AIPS-Lite 1) */
+#define KINETIS_FTM2_BASE      0x400b8000  /* FlexTimer 2 */
+#define KINETIS_ADC1_BASE      0x400bb000  /* Analog-to-digital converter (ADC) 1 */
+#define KINETIS_DAC0_BASE      0x400cc000  /* 12-bit digital-to-analog converter (DAC) 0 */
+
+#define KINETIS_XBARSS_BASE    0x400ff000  /* Not an AIPS-Lite slot. The 32-bit general
+                                            * purpose input/output module that shares the
+                                            * crossbar switch slave port with the AIPS-Lite
+                                            * is accessed at this address. */
+#define KINETIS_GPIO_BASE(n)   (0x400ff000 + ((n) << 6))
+#define KINETIS_GPIOA_BASE     0x400ff000  /* GPIO PORTA registers */
+#define KINETIS_GPIOB_BASE     0x400ff040  /* GPIO PORTB registers */
+#define KINETIS_GPIOC_BASE     0x400ff080  /* GPIO PORTC registers */
+#define KINETIS_GPIOD_BASE     0x400ff0c0  /* GPIO PORTD registers */
+#define KINETIS_GPIOE_BASE     0x400ff100  /* GPIO PORTE registers */
+
+/* Private Peripheral Bus (PPB) Memory Map ******************************************/
+
+#define KINETIS_ITM_BASE       0xe0000000  /* Instrumentation Trace Macrocell (ITM) */
+#define KINETIS_DWT_BASE       0xe0001000  /* Data Watchpoint and Trace (DWT) */
+#define KINETIS_FPB_BASE       0xe0002000  /* Flash Patch and Breakpoint (FPB) */
+#define KINETIS_SCS_BASE       0xe000e000  /* System Control Space (SCS) (for NVIC) */
+#define KINETIS_TPIU_BASE      0xe0040000  /* Trace Port Interface Unit (TPIU) */
+#define KINETIS_MCM_BASE       0xe0080000  /* Miscellaneous Control Module (including ETB Almost Full) */
+#define KINETIS_ROMTAB_BASE    0xe00ff000  /* ROM Table - allows auto-detection of debug components */
+
+/************************************************************************************
+ * Public Types
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Data
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+#endif /* KINETIS_K20 */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K20MEMORYMAP_H */
diff --git a/arch/arm/src/kinetis/chip/kinetis_k40memormap.h b/arch/arm/src/kinetis/chip/kinetis_k40memormap.h
new file mode 100644
index 0000000000..65f2788ab6
--- /dev/null
+++ b/arch/arm/src/kinetis/chip/kinetis_k40memormap.h
@@ -0,0 +1,199 @@
+/************************************************************************************
+ * arch/arm/src/kinetis/chip/kinetis_k40memorymap.h
+ *
+ *   Copyright (C) 2011, 2015-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.
+ *
+ ************************************************************************************/
+
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K40MEMORYMAP_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K40MEMORYMAP_H
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include 
+
+#include "chip.h"
+
+#ifdef KINETIS_K40
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+/* Memory Map ***********************************************************************/
+/* K40 Family
+ *
+ * The memory map for the following parts is defined in Freescale document
+ * K40P144M100SF2RM
+ */
+
+#define KINETIS_FLASH_BASE     0x00000000  /* -0x0fffffff Program flash and read-
+                                            *             only data (Includes exception
+                                            *             vectors in first 1024 bytes) */
+# if !defined(KINETIS_FLEXMEM_SIZE)
+#  define KINETIS_FLEXNVM_BASE 0x10000000  /* -0x13ffffff FlexNVM */
+#  define KINETIS_FLEXRAM_BASE 0x14000000  /* -0x17ffffff FlexRAM */
+# endif
+#define KINETIS_SRAML_BASE     0x18000000  /* -0x1fffffff SRAM_L: Lower SRAM
+                                            *             (ICODE/DCODE) */
+#define KINETIS_SRAMU_BASE     0x20000000  /* -0x200fffff SRAM_U: Upper SRAM bitband
+                                            *             region */
+                             /* 0x20100000  * -0x21ffffff Reserved */
+#define KINETIS_SALIAS_BASE    0x22000000  /* -0x23ffffff Aliased to SRAM_U bitband */
+                             /* 0x24000000  * -0x3fffffff Reserved */
+#define KINETIS_BRIDGE0_BASE   0x40000000  /* -0x4007ffff Bitband region for peripheral
+                                            *             bridge 0 (AIPS-Lite0) */
+#define KINETIS_BRIDGE1_BASE   0x40080000  /* -0x400fffff Bitband region for peripheral
+                                            *             bridge 1 (AIPS-Lite1) */
+#define KINETIS_GPIOBB_BASE    0x400ff000  /* -0x400fffff Bitband region for general
+                                            *             purpose input/output (GPIO) */
+                             /* 0x40100000  * -0x41ffffff Reserved */
+#define KINETIS_PALIAS_BASE    0x42000000  /* -0x43ffffff Aliased to peripheral bridge
+                                            *             (AIPS-Lite) and general purpose
+                                            *             input/output (GPIO) bitband */
+                             /* 0x44000000  * -0x5fffffff Reserved */
+#define KINETIS_FLEXBUS_WBBASE 0x60000000  /* -0x7fffffff FlexBus (External Memory -
+                                            *             Write-back) */
+#define KINETIS_FLEXBUS_WTBASE 0x80000000  /* -0x9fffffff FlexBus (External Memory -
+                                            *             Write-through) */
+#define KINETIS_FLEXBUS_NXBASE 0xa0000000  /* -0xdfffffff FlexBus (External Memory -
+                                            *             Non-executable) */
+#define KINETIS_PERIPH_BASE    0xe0000000  /* -0xe00fffff Private peripherals */
+                             /* 0xe0100000  * -0xffffffff Reserved */
+
+/* Peripheral Bridge 0 Memory Map ***************************************************/
+
+#define KINETIS_AIPS0_BASE     0x40000000  /* Peripheral bridge 0 (AIPS-Lite 0) */
+#define KINETIS_XBAR_BASE      0x40004000  /* Crossbar switch */
+#define KINETIS_DMAC_BASE      0x40008000  /* DMA controller */
+#define KINETIS_DMADESC_BASE   0x40009000  /* DMA controller transfer control descriptors */
+#define KINETIS_FLEXBUSC_BASE  0x4000c000  /* FlexBus controller */
+#define KINETIS_MPU_BASE       0x4000d000  /* MPU */
+#define KINETIS_FMC_BASE       0x4001f000  /* Flash memory controller */
+#define KINETIS_FTFL_BASE      0x40020000  /* Flash memory */
+#define KINETIS_DMAMUX0_BASE   0x40021000  /* DMA channel mutiplexer 0 */
+#define KINETIS_CAN0_BASE      0x40024000  /* FlexCAN 0 */
+#define KINETIS_SPI0_BASE      0x4002c000  /* SPI 0 */
+#define KINETIS_SPI1_BASE      0x4002d000  /* SPI 1 */
+#define KINETIS_I2S0_BASE      0x4002f000  /* I2S 0 */
+#define KINETIS_CRC_BASE       0x40032000  /* CRC */
+#define KINETIS_USBDCD_BASE    0x40035000  /* USB DCD */
+#define KINETIS_PDB0_BASE      0x40036000  /* Programmable delay block */
+#define KINETIS_PIT_BASE       0x40037000  /* Periodic interrupt timers (PIT) */
+#define KINETIS_FTM0_BASE      0x40038000  /* FlexTimer 0 */
+#define KINETIS_FTM1_BASE      0x40039000  /* FlexTimer 1 */
+#define KINETIS_ADC0_BASE      0x4003b000  /* Analog-to-digital converter (ADC) 0 */
+#define KINETIS_RTC_BASE       0x4003d000  /* Real time clock */
+#define KINETIS_VBATR_BASE     0x4003e000  /* VBAT register file */
+#define KINETIS_LPTMR_BASE     0x40040000  /* Low power timer */
+#define KINETIS_SYSR_BASE      0x40041000  /* System register file */
+#define KINETIS_DRYICE_BASE    0x40042000  /* DryIce */
+#define KINETIS_DRYICESS_BASE  0x40043000  /* DryIce secure storage */
+#define KINETIS_TSI0_BASE      0x40045000  /* Touch sense interface */
+#define KINETIS_SIMLP_BASE     0x40047000  /* SIM low-power logic */
+#define KINETIS_SIM_BASE       0x40048000  /* System integration module (SIM) */
+#define KINETIS_PORT_BASE(n)   (0x40049000 + ((n) << 12))
+#define KINETIS_PORTA_BASE     0x40049000  /* Port A multiplexing control */
+#define KINETIS_PORTB_BASE     0x4004a000  /* Port B multiplexing control */
+#define KINETIS_PORTC_BASE     0x4004b000  /* Port C multiplexing control */
+#define KINETIS_PORTD_BASE     0x4004c000  /* Port D multiplexing control */
+#define KINETIS_PORTE_BASE     0x4004d000  /* Port E multiplexing control */
+#define KINETIS_WDOG_BASE      0x40052000  /* Software watchdog */
+#define KINETIS_EWM_BASE       0x40061000  /* External watchdog */
+#define KINETIS_CMT_BASE       0x40062000  /* Carrier modulator timer (CMT) */
+#define KINETIS_MCG_BASE       0x40064000  /* Multi-purpose Clock Generator (MCG) */
+#define KINETIS_OSC_BASE       0x40065000  /* System oscillator (OSC) */
+#define KINETIS_I2C0_BASE      0x40066000  /* I2C 0 */
+#define KINETIS_I2C1_BASE      0x40067000  /* I2C 1 */
+#define KINETIS_UART0_BASE     0x4006a000  /* UART0 */
+#define KINETIS_UART1_BASE     0x4006b000  /* UART1 */
+#define KINETIS_UART2_BASE     0x4006c000  /* UART2 */
+#define KINETIS_UART3_BASE     0x4006d000  /* UART3 */
+#define KINETIS_USB0_BASE      0x40072000  /* USB OTG FS/LS */
+#define KINETIS_CMP_BASE       0x40073000  /* Analog comparator (CMP) / 6-bit digital-to-analog converter (DAC) */
+#define KINETIS_VREF_BASE      0x40074000  /* Voltage reference (VREF) */
+#define KINETIS_LLWU_BASE      0x4007c000  /* Low-leakage wakeup unit (LLWU) */
+#define KINETIS_PMC_BASE       0x4007d000  /* Power management controller (PMC) */
+#define KINETIS_SMC_BASE       0x4007e000  /* System Mode controller (SMC) */
+
+/* Peripheral Bridge 1 Memory Map ***************************************************/
+
+#define KINETIS_AIPS1_BASE     0x40080000  /* Peripheral bridge 1 (AIPS-Lite 1) */
+#define KINETIS_CAN1_BASE      0x400a4000  /* FlexCAN 1 */
+#define KINETIS_SPI2_BASE      0x400ac000  /* SPI 2 */
+#define KINETIS_SDHC_BASE      0x400b1000  /* SDHC */
+#define KINETIS_FTM2_BASE      0x400b8000  /* FlexTimer 2 */
+#define KINETIS_ADC1_BASE      0x400bb000  /* Analog-to-digital converter (ADC) 1 */
+#define KINETIS_SLCD_BASE      0x400be000  /* Segment LCD */
+#define KINETIS_DAC0_BASE      0x400cc000  /* 12-bit digital-to-analog converter (DAC) 0 */
+#define KINETIS_DAC1_BASE      0x400cd000  /* 12-bit digital-to-analog converter (DAC) 1 */
+#define KINETIS_UART4_BASE     0x400ea000  /* UART4 */
+#define KINETIS_UART5_BASE     0x400eb000  /* UART5 */
+#define KINETIS_XBARSS_BASE    0x400ff000  /* Not an AIPS-Lite slot. The 32-bit general
+                                            * purpose input/output module that shares the
+                                            * crossbar switch slave port with the AIPS-Lite
+                                            * is accessed at this address. */
+#define KINETIS_GPIO_BASE(n)   (0x400ff000 + ((n) << 6))
+#define KINETIS_GPIOA_BASE     0x400ff000  /* GPIO PORTA registers */
+#define KINETIS_GPIOB_BASE     0x400ff040  /* GPIO PORTB registers */
+#define KINETIS_GPIOC_BASE     0x400ff080  /* GPIO PORTC registers */
+#define KINETIS_GPIOD_BASE     0x400ff0c0  /* GPIO PORTD registers */
+#define KINETIS_GPIOE_BASE     0x400ff100  /* GPIO PORTE registers */
+
+/* Private Peripheral Bus (PPB) Memory Map ******************************************/
+
+#define KINETIS_ITM_BASE       0xe0000000  /* Instrumentation Trace Macrocell (ITM) */
+#define KINETIS_DWT_BASE       0xe0001000  /* Data Watchpoint and Trace (DWT) */
+#define KINETIS_FPB_BASE       0xe0002000  /* Flash Patch and Breakpoint (FPB) */
+#define KINETIS_SCS_BASE       0xe000e000  /* System Control Space (SCS) (for NVIC) */
+#define KINETIS_TPIU_BASE      0xe0040000  /* Trace Port Interface Unit (TPIU) */
+#define KINETIS_ETM_BASE       0xe0041000  /* Embedded Trace Macrocell (ETM) */
+#define KINETIS_ETB_BASE       0xe0042000  /* Embedded Trace Buffer (ETB) */
+#define KINETIS_TFUN_BASE      0xe0043000  /* Embedded Trace Funnel */
+#define KINETIS_MCM_BASE       0xe0080000  /* Miscellaneous Control Module (including ETB Almost Full) */
+#define KINETIS_ROMTAB_BASE    0xe00ff000  /* ROM Table - allows auto-detection of debug components */
+
+/************************************************************************************
+ * Public Types
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Data
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+#endif /* KINETIS_K40 */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K40MEMORYMAP_H */
diff --git a/arch/arm/src/kinetis/chip/kinetis_k60memormap.h b/arch/arm/src/kinetis/chip/kinetis_k60memormap.h
new file mode 100644
index 0000000000..8b00303ef7
--- /dev/null
+++ b/arch/arm/src/kinetis/chip/kinetis_k60memormap.h
@@ -0,0 +1,196 @@
+/************************************************************************************
+ * arch/arm/src/kinetis/chip/kinetis_k60memorymap.h
+ *
+ *   Copyright (C) 2011, 2015-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.
+ *
+ ************************************************************************************/
+
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K60MEMORYMAP_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K60MEMORYMAP_H
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include 
+
+#include "chip.h"
+
+#ifdef KINETIS_K64
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+/* Memory Map ***********************************************************************/
+/* K60 Family
+ *
+ * The memory map for the following parts is defined in Freescale document
+ * K60P144M100SF2RM
+ */
+
+#define KINETIS_FLASH_BASE     0x00000000  /* -0x0fffffff Program flash and read-
+                                            *             only data (Includes exception
+                                            *             vectors in first 1024 bytes) */
+#if !defined(KINETIS_FLEXMEM_SIZE)
+#  define KINETIS_FLEXNVM_BASE 0x10000000  /* -0x13ffffff FlexNVM */
+#  define KINETIS_FLEXRAM_BASE 0x14000000  /* -0x17ffffff FlexRAM */
+#endif
+#define KINETIS_SRAML_BASE     0x18000000  /* -0x1fffffff SRAM_L: Lower SRAM
+                                            *             (ICODE/DCODE) */
+#define KINETIS_SRAMU_BASE     0x20000000  /* -0x200fffff SRAM_U: Upper SRAM bitband
+                                            *             region */
+                             /* 0x20100000  * -0x21ffffff Reserved */
+#define KINETIS_SALIAS_BASE    0x22000000  /* -0x23ffffff Aliased to SRAM_U bitband */
+                             /* 0x24000000  * -0x3fffffff Reserved */
+#define KINETIS_BRIDGE0_BASE   0x40000000  /* -0x4007ffff Bitband region for peripheral
+                                            *             bridge 0 (AIPS-Lite0) */
+#define KINETIS_BRIDGE1_BASE   0x40080000   /* -0x400fffff Bitband region for peripheral
+                                            *             bridge 1 (AIPS-Lite1) */
+#define KINETIS_GPIOBB_BASE    0x400ff000  /* -0x400fffff Bitband region for general
+                                            *             purpose input/output (GPIO) */
+                             /* 0x40100000  * -0x41ffffff Reserved */
+#define KINETIS_PALIAS_BASE    0x42000000  /* -0x43ffffff Aliased to peripheral bridge
+                                            *             (AIPS-Lite) and general purpose
+                                            *             input/output (GPIO) bitband */
+                             /* 0x44000000  * -0x5fffffff Reserved */
+#define KINETIS_FLEXBUS_BASE   0x60000000  /* -0x7fffffff FlexBus */
+#define KINETIS_PERIPH_BASE    0xe0000000  /* -0xe00fffff Private peripherals */
+                             /* 0xe0100000  * -0xffffffff Reserved */
+
+/* Peripheral Bridge 0 Memory Map ***************************************************/
+
+#define KINETIS_AIPS0_BASE     0x40000000  /* Peripheral bridge 0 (AIPS-Lite 0) */
+#define KINETIS_XBAR_BASE      0x40004000  /* Crossbar switch */
+#define KINETIS_DMAC_BASE      0x40008000  /* DMA controller */
+#define KINETIS_DMADESC_BASE   0x40009000  /* DMA controller transfer control descriptors */
+#define KINETIS_FLEXBUSC_BASE  0x4000c000  /* FlexBus controller */
+#define KINETIS_MPU_BASE       0x4000d000  /* MPU */
+#define KINETIS_FMC_BASE       0x4001f000  /* Flash memory controller */
+#define KINETIS_FTFL_BASE      0x40020000  /* Flash memory */
+#define KINETIS_DMAMUX0_BASE   0x40021000  /* DMA channel mutiplexer 0 */
+#define KINETIS_CAN0_BASE      0x40024000  /* FlexCAN 0 */
+#define KINETIS_SPI0_BASE      0x4002c000  /* DSPI 0 */
+#define KINETIS_SPI1_BASE      0x4002d000  /* DSPI 1 */
+#define KINETIS_I2S0_BASE      0x4002f000  /* I2S 0 */
+#define KINETIS_CRC_BASE       0x40032000  /* CRC */
+#define KINETIS_USBDCD_BASE    0x40035000  /* USB DCD */
+#define KINETIS_PDB0_BASE      0x40036000  /* Programmable delay block */
+#define KINETIS_PIT_BASE       0x40037000  /* Periodic interrupt timers (PIT) */
+#define KINETIS_FTM0_BASE      0x40038000  /* FlexTimer (FTM) 0 */
+#define KINETIS_FTM1_BASE      0x40039000  /* FlexTimer (FTM) 1 */
+#define KINETIS_ADC0_BASE      0x4003b000  /* Analog-to-digital converter (ADC) 0 */
+#define KINETIS_RTC_BASE       0x4003d000  /* Real time clock */
+#define KINETIS_VBATR_BASE     0x4003e000  /* VBAT register file */
+#define KINETIS_LPTMR_BASE     0x40040000  /* Low power timer */
+#define KINETIS_SYSR_BASE      0x40041000  /* System register file */
+#define KINETIS_DRYICE_BASE    0x40042000  /* DryIce */
+#define KINETIS_DRYICESS_BASE  0x40043000  /* DryIce secure storage */
+#define KINETIS_TSI0_BASE      0x40045000  /* Touch sense interface */
+#define KINETIS_SIMLP_BASE     0x40047000  /* SIM low-power logic */
+#define KINETIS_SIM_BASE       0x40048000  /* System integration module (SIM) */
+#define KINETIS_PORT_BASE(n)   (0x40049000 + ((n) << 12))
+#define KINETIS_PORTA_BASE     0x40049000  /* Port A multiplexing control */
+#define KINETIS_PORTB_BASE     0x4004a000  /* Port B multiplexing control */
+#define KINETIS_PORTC_BASE     0x4004b000  /* Port C multiplexing control */
+#define KINETIS_PORTD_BASE     0x4004c000  /* Port D multiplexing control */
+#define KINETIS_PORTE_BASE     0x4004d000  /* Port E multiplexing control */
+#define KINETIS_WDOG_BASE      0x40052000  /* Software watchdog */
+#define KINETIS_EWM_BASE       0x40061000  /* External watchdog */
+#define KINETIS_CMT_BASE       0x40062000  /* Carrier modulator timer (CMT) */
+#define KINETIS_MCG_BASE       0x40064000  /* Multi-purpose Clock Generator (MCG) */
+#define KINETIS_OSC_BASE       0x40065000  /* System oscillator (XOSC) */
+#define KINETIS_I2C0_BASE      0x40066000  /* I2C 0 */
+#define KINETIS_I2C1_BASE      0x40067000  /* I2C 1 */
+#define KINETIS_UART0_BASE     0x4006a000  /* UART0 */
+#define KINETIS_UART1_BASE     0x4006b000  /* UART1 */
+#define KINETIS_UART2_BASE     0x4006c000  /* UART2 */
+#define KINETIS_UART3_BASE     0x4006d000  /* UART3 */
+#define KINETIS_USB0_BASE      0x40072000  /* USB OTG FS/LS */
+#define KINETIS_CMP_BASE       0x40073000  /* Analog comparator (CMP) / 6-bit digital-to-analog converter (DAC) */
+#define KINETIS_VREF_BASE      0x40074000  /* Voltage reference (VREF) */
+#define KINETIS_LLWU_BASE      0x4007c000  /* Low-leakage wakeup unit (LLWU) */
+#define KINETIS_PMC_BASE       0x4007d000  /* Power management controller (PMC) */
+#define KINETIS_SMC_BASE       0x4007e000  /* System Mode controller (SMC) */
+
+/* Peripheral Bridge 1 Memory Map ***************************************************/
+
+#define KINETIS_AIPS1_BASE     0x40080000  /* Peripheral bridge 1 (AIPS-Lite 1) */
+#define KINETIS_RNGB_BASE      0x400a0000  /* Random number generator (RNGB) */
+#define KINETIS_CAN1_BASE      0x400a4000  /* FlexCAN 1 */
+#define KINETIS_SPI2_BASE      0x400ac000  /* DSPI 2 */
+#define KINETIS_SDHC_BASE      0x400b1000  /* SDHC */
+#define KINETIS_FTM2_BASE      0x400b8000  /* FlexTimer 2 */
+#define KINETIS_ADC1_BASE      0x400bb000  /* Analog-to-digital converter (ADC) 1 */
+#define KINETIS_EMAC_BASE      0x400c0000  /* Ethernet MAC and IEEE 1588 timers */
+#define KINETIS_DAC0_BASE      0x400cc000  /* 12-bit digital-to-analog converter (DAC) 0 */
+#define KINETIS_DAC1_BASE      0x400cd000  /* 12-bit digital-to-analog converter (DAC) 1 */
+#define KINETIS_UART4_BASE     0x400ea000  /* UART4 */
+#define KINETIS_UART5_BASE     0x400eb000  /* UART5 */
+#define KINETIS_XBARSS_BASE    0x400ff000  /* Not an AIPS-Lite slot. The 32-bit general
+                                            * purpose input/output module that shares the
+                                            * crossbar switch slave port with the AIPS-Lite
+                                            * is accessed at this address. */
+#define KINETIS_GPIO_BASE(n)   (0x400ff000 + ((n) << 6))
+#define KINETIS_GPIOA_BASE     0x400ff000  /* GPIO PORTA registers */
+#define KINETIS_GPIOB_BASE     0x400ff040  /* GPIO PORTB registers */
+#define KINETIS_GPIOC_BASE     0x400ff080  /* GPIO PORTC registers */
+#define KINETIS_GPIOD_BASE     0x400ff0c0  /* GPIO PORTD registers */
+#define KINETIS_GPIOE_BASE     0x400ff100  /* GPIO PORTE registers */
+
+/* Private Peripheral Bus (PPB) Memory Map ******************************************/
+
+#define KINETIS_ITM_BASE       0xe0000000  /* Instrumentation Trace Macrocell (ITM) */
+#define KINETIS_DWT_BASE       0xe0001000  /* Data Watchpoint and Trace (DWT) */
+#define KINETIS_FPB_BASE       0xe0002000  /* Flash Patch and Breakpoint (FPB) */
+#define KINETIS_SCS_BASE       0xe000e000  /* System Control Space (SCS) (for NVIC) */
+#define KINETIS_TPIU_BASE      0xe0040000  /* Trace Port Interface Unit (TPIU) */
+#define KINETIS_ETM_BASE       0xe0041000  /* Embedded Trace Macrocell (ETM) */
+#define KINETIS_ETB_BASE       0xe0042000  /* Embedded Trace Buffer (ETB) */
+#define KINETIS_TFUN_BASE      0xe0043000  /* Embedded Trace Funnel */
+#define KINETIS_MCM_BASE       0xe0080000  /* Miscellaneous Control Module (including ETB Almost Full) */
+#define KINETIS_MMCAU_BASE     0xe0081000  /* Memory Mapped Cryptographic Acceleration Unit (MMCAU) */
+#define KINETIS_ROMTAB_BASE    0xe00ff000  /* ROM Table - allows auto-detection of debug components */
+
+/************************************************************************************
+ * Public Types
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Data
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+#endif /* KINETIS_K64 */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K60MEMORYMAP_H */
diff --git a/arch/arm/src/kinetis/chip/kinetis_k64memorymap.h b/arch/arm/src/kinetis/chip/kinetis_k64memorymap.h
new file mode 100644
index 0000000000..e0e4a911ed
--- /dev/null
+++ b/arch/arm/src/kinetis/chip/kinetis_k64memorymap.h
@@ -0,0 +1,210 @@
+/************************************************************************************
+ * arch/arm/src/kinetis/chip/kinetis_k64memorymap.h
+ *
+ *   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.
+ *
+ ************************************************************************************/
+
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K64MEMORYMAP_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K64MEMORYMAP_H
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include 
+
+#include "chip.h"
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+/* Memory Map ***********************************************************************/
+/* K64 Family ***********************************************************************
+ *
+ * The memory map for the following parts is defined in NXP document
+ * K64P144M120SF5RM.pdf
+ */
+
+#if defined(CONFIG_ARCH_CHIP_MK64FX512VLL12) || defined(CONFIG_ARCH_CHIP_MK64FN1M0VLL12) || \
+      defined(CONFIG_ARCH_CHIP_MK64FX512VDC12) || defined(CONFIG_ARCH_CHIP_MK64FN1M0VDC12) || \
+      defined(CONFIG_ARCH_CHIP_MK64FX512VLQ12) || defined(CONFIG_ARCH_CHIP_MK64FX512VMD12) || \
+      defined(CONFIG_ARCH_CHIP_MK64FN1M0VLQ12) || defined(CONFIG_ARCH_CHIP_MK64FN1M0VMD12)
+
+# define KINETIS_FLASH_BASE     0x00000000 /* -0x0fffffff Program flash and read-
+                                            *             only data (Includes exception
+                                            *             vectors in first 1024 bytes) */
+# if !defined(KINETIS_FLEXMEM_SIZE)
+#  define KINETIS_FLEXNVM_BASE  0x10000000 /* -0x13ffffff FlexNVM */
+#  define KINETIS_FLEXRAM_BASE  0x14000000 /* -0x17ffffff FlexRAM */
+# endif
+# define KINETIS_SRAML_BASE     0x18000000 /* -0x1fffffff SRAM_L: Lower SRAM
+                                            *             (ICODE/DCODE) */
+# define KINETIS_SRAMU_BASE     0x20000000 /* -0x200fffff SRAM_U: Upper SRAM bitband
+                                            *             region */
+                             /* 0x20100000  * -0x21ffffff Reserved */
+# define KINETIS_SALIAS_BASE    0x22000000 /* -0x23ffffff Aliased to SRAM_U bitband */
+                             /* 0x24000000  * -0x3fffffff Reserved */
+# define KINETIS_BRIDGE0_BASE   0x40000000 /* -0x4007ffff Bitband region for peripheral
+                                            *             bridge 0 (AIPS-Lite0) */
+# define KINETIS_BRIDGE1_BASE   0x40080000 /* -0x400fffff Bitband region for peripheral
+                                            *             bridge 1 (AIPS-Lite1) */
+# define KINETIS_GPIOBB_BASE    0x400ff000 /* -0x400fffff Bitband region for general
+                                            *             purpose input/output (GPIO) */
+                             /* 0x40100000  * -0x41ffffff Reserved */
+# define KINETIS_PALIAS_BASE    0x42000000 /* -0x43ffffff Aliased to peripheral bridge
+                                            *             (AIPS-Lite) and general purpose
+                                            *             input/output (GPIO) bitband */
+                             /* 0x44000000  * -0x5fffffff Reserved */
+# define KINETIS_FLEXBUS_BASE   0x60000000 /* -0x7fffffff FlexBus */
+# define KINETIS_PERIPH_BASE    0xe0000000 /* -0xe00fffff Private peripherals */
+                             /* 0xe0100000  * -0xffffffff Reserved */
+
+/* Peripheral Bridge 0 Memory Map ***************************************************/
+
+# define KINETIS_AIPS0_BASE     0x40000000 /* Peripheral bridge 0 (AIPS-Lite 0) */
+# define KINETIS_XBAR_BASE      0x40004000 /* Crossbar switch */
+# define KINETIS_DMAC_BASE      0x40008000 /* DMA controller */
+# define KINETIS_DMADESC_BASE   0x40009000 /* DMA controller transfer control descriptors */
+# define KINETIS_FLEXBUSC_BASE  0x4000c000 /* FlexBus controller */
+# define KINETIS_MPU_BASE       0x4000d000 /* MPU */
+# define KINETIS_FMC_BASE       0x4001f000 /* Flash memory controller */
+# define KINETIS_FTFE_BASE      0x40020000 /* Flash memory */
+# define KINETIS_DMAMUX0_BASE   0x40021000 /* DMA channel mutiplexer 0 */
+# define KINETIS_CAN0_BASE      0x40024000 /* FlexCAN 0 */
+# define KINETIS_SPI0_BASE      0x4002c000 /* DSPI 0 */
+# define KINETIS_SPI1_BASE      0x4002d000 /* DSPI 1 */
+# define KINETIS_I2S0_BASE      0x4002f000 /* I2S 0 */
+# define KINETIS_CRC_BASE       0x40032000 /* CRC */
+# define KINETIS_USBDCD_BASE    0x40035000 /* USB DCD */
+# define KINETIS_PDB0_BASE      0x40036000 /* Programmable delay block */
+# define KINETIS_PIT_BASE       0x40037000 /* Periodic interrupt timers (PIT) */
+# define KINETIS_FTM0_BASE      0x40038000 /* FlexTimer (FTM) 0 */
+# define KINETIS_FTM1_BASE      0x40039000 /* FlexTimer (FTM) 1 */
+# define KINETIS_ADC0_BASE      0x4003b000 /* Analog-to-digital converter (ADC) 0 */
+# define KINETIS_RTC_BASE       0x4003d000 /* Real time clock */
+# define KINETIS_VBATR_BASE     0x4003e000 /* VBAT register file */
+# define KINETIS_LPTMR_BASE     0x40040000 /* Low power timer */
+# define KINETIS_SYSR_BASE      0x40041000 /* System register file */
+# define KINETIS_DRYICE_BASE    0x40042000 /* DryIce */
+# define KINETIS_DRYICESS_BASE  0x40043000 /* DryIce secure storage */
+# define KINETIS_TSI0_BASE      0x40045000 /* Touch sense interface */
+# define KINETIS_SIMLP_BASE     0x40047000 /* SIM low-power logic */
+# define KINETIS_SIM_BASE       0x40048000 /* System integration module (SIM) */
+# define KINETIS_PORT_BASE(n)   (0x40049000 + ((n) << 12))
+# define KINETIS_PORTA_BASE     0x40049000 /* Port A multiplexing control */
+# define KINETIS_PORTB_BASE     0x4004a000 /* Port B multiplexing control */
+# define KINETIS_PORTC_BASE     0x4004b000 /* Port C multiplexing control */
+# define KINETIS_PORTD_BASE     0x4004c000 /* Port D multiplexing control */
+# define KINETIS_PORTE_BASE     0x4004d000 /* Port E multiplexing control */
+# define KINETIS_WDOG_BASE      0x40052000 /* Software watchdog */
+# define KINETIS_EWM_BASE       0x40061000 /* External watchdog */
+# define KINETIS_CMT_BASE       0x40062000 /* Carrier modulator timer (CMT) */
+# define KINETIS_MCG_BASE       0x40064000 /* Multi-purpose Clock Generator (MCG) */
+# define KINETIS_OSC_BASE       0x40065000 /* System oscillator (XOSC) */
+# define KINETIS_I2C0_BASE      0x40066000 /* I2C 0 */
+# define KINETIS_I2C1_BASE      0x40067000 /* I2C 1 */
+# define KINETIS_I2C2_BASE      0x400E6000 /* I2C 2 */                                            
+# define KINETIS_UART0_BASE     0x4006a000 /* UART0 */
+# define KINETIS_UART1_BASE     0x4006b000 /* UART1 */
+# define KINETIS_UART2_BASE     0x4006c000 /* UART2 */
+# define KINETIS_UART3_BASE     0x4006d000 /* UART3 */
+# define KINETIS_USB0_BASE      0x40072000 /* USB OTG FS/LS */
+# define KINETIS_CMP_BASE       0x40073000 /* Analog comparator (CMP) / 6-bit digital-to-analog converter (DAC) */
+# define KINETIS_VREF_BASE      0x40074000 /* Voltage reference (VREF) */
+# define KINETIS_LLWU_BASE      0x4007c000 /* Low-leakage wakeup unit (LLWU) */
+# define KINETIS_PMC_BASE       0x4007d000 /* Power management controller (PMC) */
+# define KINETIS_SMC_BASE       0x4007e000 /* System Mode controller (SMC) */
+
+/* Peripheral Bridge 1 Memory Map ***************************************************/
+
+# define KINETIS_AIPS1_BASE     0x40080000 /* Peripheral bridge 1 (AIPS-Lite 1) */
+# define KINETIS_RNGB_BASE      0x400a0000 /* Random number generator (RNGB) */
+# define KINETIS_CAN1_BASE      0x400a4000 /* FlexCAN 1 */
+# define KINETIS_SPI2_BASE      0x400ac000 /* DSPI 2 */
+# define KINETIS_SDHC_BASE      0x400b1000 /* SDHC */
+# define KINETIS_FTM2_BASE      0x4003a000 /* FlexTimer 2 */
+# define KINETIS_FTM3_BASE      0x400b9000 /* FlexTimer 3 */
+# define KINETIS_ADC1_BASE      0x400bb000 /* Analog-to-digital converter (ADC) 1 */
+# define KINETIS_EMAC_BASE      0x400c0000 /* Ethernet MAC and IEEE 1588 timers */
+# define KINETIS_DAC0_BASE      0x400cc000 /* 12-bit digital-to-analog converter (DAC) 0 */
+# define KINETIS_DAC1_BASE      0x400cd000 /* 12-bit digital-to-analog converter (DAC) 1 */
+# define KINETIS_UART4_BASE     0x400ea000 /* UART4 */
+# define KINETIS_UART5_BASE     0x400eb000 /* UART5 */
+# define KINETIS_XBARSS_BASE    0x400ff000 /* Not an AIPS-Lite slot. The 32-bit general
+                                            * purpose input/output module that shares the
+                                            * crossbar switch slave port with the AIPS-Lite
+                                            * is accessed at this address. */
+# define KINETIS_GPIO_BASE(n)   (0x400ff000 + ((n) << 6))
+# define KINETIS_GPIOA_BASE     0x400ff000 /* GPIO PORTA registers */
+# define KINETIS_GPIOB_BASE     0x400ff040 /* GPIO PORTB registers */
+# define KINETIS_GPIOC_BASE     0x400ff080 /* GPIO PORTC registers */
+# define KINETIS_GPIOD_BASE     0x400ff0c0 /* GPIO PORTD registers */
+# define KINETIS_GPIOE_BASE     0x400ff100 /* GPIO PORTE registers */
+
+/* Private Peripheral Bus (PPB) Memory Map ******************************************/
+
+# define KINETIS_ITM_BASE       0xe0000000 /* Instrumentation Trace Macrocell (ITM) */
+# define KINETIS_DWT_BASE       0xe0001000 /* Data Watchpoint and Trace (DWT) */
+# define KINETIS_FPB_BASE       0xe0002000 /* Flash Patch and Breakpoint (FPB) */
+# define KINETIS_SCS_BASE       0xe000e000 /* System Control Space (SCS) (for NVIC) */
+# define KINETIS_TPIU_BASE      0xe0040000 /* Trace Port Interface Unit (TPIU) */
+# define KINETIS_ETM_BASE       0xe0041000 /* Embedded Trace Macrocell (ETM) */
+# define KINETIS_ETB_BASE       0xe0042000 /* Embedded Trace Buffer (ETB) */
+# define KINETIS_TFUN_BASE      0xe0043000 /* Embedded Trace Funnel */
+# define KINETIS_MCM_BASE       0xe0080000 /* Miscellaneous Control Module (including ETB Almost Full) */
+# define KINETIS_MMCAU_BASE     0xe0081000 /* Memory Mapped Cryptographic Acceleration Unit (MMCAU) */
+# define KINETIS_ROMTAB_BASE    0xe00ff000 /* ROM Table - allows auto-detection of debug components */
+
+#else
+  /* The memory map for other parts is defined in other documents and may or may not
+   * be the same as above (the family members are all very similar)  This error just
+   * means that you have to look at the document and determine for yourself if the
+   * memory map is the same.
+   */
+
+#  error "No memory map for this K64 part"
+#endif
+
+/************************************************************************************
+ * Public Types
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Data
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K64MEMORYMAP_H */
diff --git a/arch/arm/src/kinetis/chip/kinetis_k64mpu.h b/arch/arm/src/kinetis/chip/kinetis_k64mpu.h
new file mode 100644
index 0000000000..808ff15be2
--- /dev/null
+++ b/arch/arm/src/kinetis/chip/kinetis_k64mpu.h
@@ -0,0 +1,358 @@
+/****************************************************************************************************
+ * arch/arm/src/kinetis/kinetis_mpu.h
+ *
+ *   Copyright (C) 2011 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.
+ *
+ ****************************************************************************************************/
+
+#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_MPU_H
+#define __ARCH_ARM_SRC_KINETIS_KINETIS_MPU_H
+
+/****************************************************************************************************
+ * Included Files
+ ****************************************************************************************************/
+
+#include 
+
+#include "chip.h"
+
+/****************************************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************************************/
+
+/* Register Offsets *********************************************************************************/
+
+#define KINETIS_MPU_CESR_OFFSET         0x0000 /* Control/Error Status Register */
+
+#define KINETIS_MPU_EAR_OFFSET(n)      (0x0010+((n)<<3)) /* Error Address Register, Slave Port n */
+#define KINETIS_MPU_EDR_OFFSET(n)      (0x0014+((n)<<3)) /* Error Detail Register, Slave Port n */
+
+#define KINETIS_MPU_EAR0_OFFSET        0x0010 /* Error Address Register, Slave Port 0 */
+#define KINETIS_MPU_EDR0_OFFSET        0x0014 /* Error Detail Register, Slave Port 0 */
+#define KINETIS_MPU_EAR1_OFFSET        0x0018 /* Error Address Register, Slave Port 1 */
+#define KINETIS_MPU_EDR1_OFFSET        0x001c /* Error Detail Register, Slave Port 1 */
+#define KINETIS_MPU_EAR2_OFFSET        0x0020 /* Error Address Register, Slave Port 2 */
+#define KINETIS_MPU_EDR2_OFFSET        0x0024 /* Error Detail Register, Slave Port 2 */
+#define KINETIS_MPU_EAR3_OFFSET        0x0028 /* Error Address Register, Slave Port 3 */
+#define KINETIS_MPU_EDR3_OFFSET        0x002c /* Error Detail Register, Slave Port 3 */
+#define KINETIS_MPU_EAR4_OFFSET        0x0030 /* Error Address Register, Slave Port 4 */
+#define KINETIS_MPU_EDR4_OFFSET        0x0034 /* Error Detail Register, Slave Port 4 */
+
+#define KINETIS_MPU_RGD_WORD_OFFSET(n,m) (x0400+((n)<<4)+((m)<< 2) /* Region Descriptor n, Word m */
+
+#define KINETIS_MPU_RGD0_WORD0_OFFSET  0x0400 /* Region Descriptor 0, Word 0 */
+#define KINETIS_MPU_RGD0_WORD1_OFFSET  0x0404 /* Region Descriptor 0, Word 1 */
+#define KINETIS_MPU_RGD0_WORD2_OFFSET  0x0408 /* Region Descriptor 0, Word 2 */
+#define KINETIS_MPU_RGD0_WORD3_OFFSET  0x040c /* Region Descriptor 0, Word 3 */
+#define KINETIS_MPU_RGD1_WORD0_OFFSET  0x0410 /* Region Descriptor 1, Word 0 */
+#define KINETIS_MPU_RGD1_WORD1_OFFSET  0x0414 /* Region Descriptor 1, Word 1 */
+#define KINETIS_MPU_RGD1_WORD2_OFFSET  0x0418 /* Region Descriptor 1, Word 2 */
+#define KINETIS_MPU_RGD1_WORD3_OFFSET  0x041c /* Region Descriptor 1, Word 3 */
+#define KINETIS_MPU_RGD2_WORD0_OFFSET  0x0420 /* Region Descriptor 2, Word 0 */
+#define KINETIS_MPU_RGD2_WORD1_OFFSET  0x0424 /* Region Descriptor 2, Word 1 */
+#define KINETIS_MPU_RGD2_WORD2_OFFSET  0x0428 /* Region Descriptor 2, Word 2 */
+#define KINETIS_MPU_RGD2_WORD3_OFFSET  0x042c /* Region Descriptor 2, Word 3 */
+#define KINETIS_MPU_RGD3_WORD0_OFFSET  0x0430 /* Region Descriptor 3, Word 0 */
+#define KINETIS_MPU_RGD3_WORD1_OFFSET  0x0434 /* Region Descriptor 3, Word 1 */
+#define KINETIS_MPU_RGD3_WORD2_OFFSET  0x0438 /* Region Descriptor 3, Word 2 */
+#define KINETIS_MPU_RGD3_WORD3_OFFSET  0x043c /* Region Descriptor 3, Word 3 */
+#define KINETIS_MPU_RGD4_WORD0_OFFSET  0x0440 /* Region Descriptor 4, Word 0 */
+#define KINETIS_MPU_RGD4_WORD1_OFFSET  0x0444 /* Region Descriptor 4, Word 1 */
+#define KINETIS_MPU_RGD4_WORD2_OFFSET  0x0448 /* Region Descriptor 4, Word 2 */
+#define KINETIS_MPU_RGD4_WORD3_OFFSET  0x044c /* Region Descriptor 4, Word 3 */
+#define KINETIS_MPU_RGD5_WORD0_OFFSET  0x0450 /* Region Descriptor 5, Word 0 */
+#define KINETIS_MPU_RGD5_WORD1_OFFSET  0x0454 /* Region Descriptor 5, Word 1 */
+#define KINETIS_MPU_RGD5_WORD2_OFFSET  0x0458 /* Region Descriptor 5, Word 2 */
+#define KINETIS_MPU_RGD5_WORD3_OFFSET  0x045c /* Region Descriptor 5, Word 3 */
+#define KINETIS_MPU_RGD6_WORD0_OFFSET  0x0460 /* Region Descriptor 6, Word 0 */
+#define KINETIS_MPU_RGD6_WORD1_OFFSET  0x0464 /* Region Descriptor 6, Word 1 */
+#define KINETIS_MPU_RGD6_WORD2_OFFSET  0x0468 /* Region Descriptor 6, Word 2 */
+#define KINETIS_MPU_RGD6_WORD3_OFFSET  0x046c /* Region Descriptor 6, Word 3 */
+#define KINETIS_MPU_RGD7_WORD0_OFFSET  0x0470 /* Region Descriptor 7, Word 0 */
+#define KINETIS_MPU_RGD7_WORD1_OFFSET  0x0474 /* Region Descriptor 7, Word 1 */
+#define KINETIS_MPU_RGD7_WORD2_OFFSET  0x0478 /* Region Descriptor 7, Word 2 */
+#define KINETIS_MPU_RGD7_WORD3_OFFSET  0x047c /* Region Descriptor 7, Word 3 */
+#define KINETIS_MPU_RGD8_WORD0_OFFSET  0x0480 /* Region Descriptor 8, Word 0 */
+#define KINETIS_MPU_RGD8_WORD1_OFFSET  0x0484 /* Region Descriptor 8, Word 1 */
+#define KINETIS_MPU_RGD8_WORD2_OFFSET  0x0488 /* Region Descriptor 8, Word 2 */
+#define KINETIS_MPU_RGD8_WORD3_OFFSET  0x048c /* Region Descriptor 8, Word 3 */
+#define KINETIS_MPU_RGD9_WORD0_OFFSET  0x0490 /* Region Descriptor 9, Word 0 */
+#define KINETIS_MPU_RGD9_WORD1_OFFSET  0x0494 /* Region Descriptor 9, Word 1 */
+#define KINETIS_MPU_RGD9_WORD2_OFFSET  0x0498 /* Region Descriptor 9, Word 2 */
+#define KINETIS_MPU_RGD9_WORD3_OFFSET  0x049c /* Region Descriptor 9, Word 3 */
+#define KINETIS_MPU_RGD10_WORD0_OFFSET 0x04a0 /* Region Descriptor 10, Word 0 */
+#define KINETIS_MPU_RGD10_WORD1_OFFSET 0x04a4 /* Region Descriptor 10, Word 1 */
+#define KINETIS_MPU_RGD10_WORD2_OFFSET 0x04a8 /* Region Descriptor 10, Word 2 */
+#define KINETIS_MPU_RGD10_WORD3_OFFSET 0x04ac /* Region Descriptor 10, Word 3 */
+#define KINETIS_MPU_RGD11_WORD0_OFFSET 0x04b0 /* Region Descriptor 11, Word 0 */
+#define KINETIS_MPU_RGD11_WORD1_OFFSET 0x04b4 /* Region Descriptor 11, Word 1 */
+#define KINETIS_MPU_RGD11_WORD2_OFFSET 0x04b8 /* Region Descriptor 11, Word 2 */
+#define KINETIS_MPU_RGD11_WORD3_OFFSET 0x04bc /* Region Descriptor 11, Word 3 */
+
+#define KINETIS_MPU_RGDAAC_OFFSET(n)   (0x0800+((n)<<2)) /* Region Descriptor Alternate Access Control n */
+
+#define KINETIS_MPU_RGDAAC0_OFFSET     0x0800 /* Region Descriptor Alternate Access Control 0 */
+#define KINETIS_MPU_RGDAAC1_OFFSET     0x0804 /* Region Descriptor Alternate Access Control 1 */
+#define KINETIS_MPU_RGDAAC2_OFFSET     0x0808 /* Region Descriptor Alternate Access Control 2 */
+#define KINETIS_MPU_RGDAAC3_OFFSET     0x080c /* Region Descriptor Alternate Access Control 3 */
+#define KINETIS_MPU_RGDAAC4_OFFSET     0x0810 /* Region Descriptor Alternate Access Control 4 */
+#define KINETIS_MPU_RGDAAC5_OFFSET     0x0814 /* Region Descriptor Alternate Access Control 5 */
+#define KINETIS_MPU_RGDAAC6_OFFSET     0x0818 /* Region Descriptor Alternate Access Control 6 */
+#define KINETIS_MPU_RGDAAC7_OFFSET     0x081c /* Region Descriptor Alternate Access Control 7 */
+#define KINETIS_MPU_RGDAAC8_OFFSET     0x0820 /* Region Descriptor Alternate Access Control 8 */
+#define KINETIS_MPU_RGDAAC9_OFFSET     0x0824 /* Region Descriptor Alternate Access Control 9 */
+#define KINETIS_MPU_RGDAAC10_OFFSET    0x0828 /* Region Descriptor Alternate Access Control 10 */
+#define KINETIS_MPU_RGDAAC11_OFFSET    0x082c /* Region Descriptor Alternate Access Control 11 */
+
+/* Register Addresses *******************************************************************************/
+
+#define KINETIS_MPU_CESR               (KINETIS_MPU_BASE+KINETIS_MPU_CESR_OFFSET)
+
+#define KINETIS_MPU_EAR(n)             (KINETIS_MPU_BASE+KINETIS_MPU_EAR_OFFSET(n))
+#define KINETIS_MPU_EDR(n)             (KINETIS_MPU_BASE+KINETIS_MPU_EDR_OFFSET(n))
+
+#define KINETIS_MPU_EAR0               (KINETIS_MPU_BASE+KINETIS_MPU_EAR0_OFFSET)
+#define KINETIS_MPU_EDR0               (KINETIS_MPU_BASE+KINETIS_MPU_EDR0_OFFSET)
+#define KINETIS_MPU_EAR1               (KINETIS_MPU_BASE+KINETIS_MPU_EAR1_OFFSET)
+#define KINETIS_MPU_EDR1               (KINETIS_MPU_BASE+KINETIS_MPU_EDR1_OFFSET)
+#define KINETIS_MPU_EAR2               (KINETIS_MPU_BASE+KINETIS_MPU_EAR2_OFFSET)
+#define KINETIS_MPU_EDR2               (KINETIS_MPU_BASE+KINETIS_MPU_EDR2_OFFSET)
+#define KINETIS_MPU_EAR3               (KINETIS_MPU_BASE+KINETIS_MPU_EAR3_OFFSET)
+#define KINETIS_MPU_EDR3               (KINETIS_MPU_BASE+KINETIS_MPU_EDR3_OFFSET)
+#define KINETIS_MPU_EAR4               (KINETIS_MPU_BASE+KINETIS_MPU_EAR4_OFFSET)
+#define KINETIS_MPU_EDR4               (KINETIS_MPU_BASE+KINETIS_MPU_EDR4_OFFSET)
+
+#define KINETIS_MPU_RGD_WORD(n,m)      (KINETIS_MPU_BASE+KINETIS_MPU_RGD_WORD_OFFSET(n,m))
+
+#define KINETIS_MPU_RGD0_WORD0         (KINETIS_MPU_BASE+KINETIS_MPU_RGD0_WORD0_OFFSET)
+#define KINETIS_MPU_RGD0_WORD1         (KINETIS_MPU_BASE+KINETIS_MPU_RGD0_WORD1_OFFSET)
+#define KINETIS_MPU_RGD0_WORD2         (KINETIS_MPU_BASE+KINETIS_MPU_RGD0_WORD2_OFFSET)
+#define KINETIS_MPU_RGD0_WORD3         (KINETIS_MPU_BASE+KINETIS_MPU_RGD0_WORD3_OFFSET)
+#define KINETIS_MPU_RGD1_WORD0         (KINETIS_MPU_BASE+KINETIS_MPU_RGD1_WORD0_OFFSET)
+#define KINETIS_MPU_RGD1_WORD1         (KINETIS_MPU_BASE+KINETIS_MPU_RGD1_WORD1_OFFSET)
+#define KINETIS_MPU_RGD1_WORD2         (KINETIS_MPU_BASE+KINETIS_MPU_RGD1_WORD2_OFFSET)
+#define KINETIS_MPU_RGD1_WORD3         (KINETIS_MPU_BASE+KINETIS_MPU_RGD1_WORD3_OFFSET)
+#define KINETIS_MPU_RGD2_WORD0         (KINETIS_MPU_BASE+KINETIS_MPU_RGD2_WORD0_OFFSET)
+#define KINETIS_MPU_RGD2_WORD1         (KINETIS_MPU_BASE+KINETIS_MPU_RGD2_WORD1_OFFSET)
+#define KINETIS_MPU_RGD2_WORD2         (KINETIS_MPU_BASE+KINETIS_MPU_RGD2_WORD2_OFFSET)
+#define KINETIS_MPU_RGD2_WORD3         (KINETIS_MPU_BASE+KINETIS_MPU_RGD2_WORD3_OFFSET)
+#define KINETIS_MPU_RGD3_WORD0         (KINETIS_MPU_BASE+KINETIS_MPU_RGD3_WORD0_OFFSET)
+#define KINETIS_MPU_RGD3_WORD1         (KINETIS_MPU_BASE+KINETIS_MPU_RGD3_WORD1_OFFSET)
+#define KINETIS_MPU_RGD3_WORD2         (KINETIS_MPU_BASE+KINETIS_MPU_RGD3_WORD2_OFFSET)
+#define KINETIS_MPU_RGD3_WORD3         (KINETIS_MPU_BASE+KINETIS_MPU_RGD3_WORD3_OFFSET)
+#define KINETIS_MPU_RGD4_WORD0         (KINETIS_MPU_BASE+KINETIS_MPU_RGD4_WORD0_OFFSET)
+#define KINETIS_MPU_RGD4_WORD1         (KINETIS_MPU_BASE+KINETIS_MPU_RGD4_WORD1_OFFSET)
+#define KINETIS_MPU_RGD4_WORD2         (KINETIS_MPU_BASE+KINETIS_MPU_RGD4_WORD2_OFFSET)
+#define KINETIS_MPU_RGD4_WORD3         (KINETIS_MPU_BASE+KINETIS_MPU_RGD4_WORD3_OFFSET)
+#define KINETIS_MPU_RGD5_WORD0         (KINETIS_MPU_BASE+KINETIS_MPU_RGD5_WORD0_OFFSET)
+#define KINETIS_MPU_RGD5_WORD1         (KINETIS_MPU_BASE+KINETIS_MPU_RGD5_WORD1_OFFSET)
+#define KINETIS_MPU_RGD5_WORD2         (KINETIS_MPU_BASE+KINETIS_MPU_RGD5_WORD2_OFFSET)
+#define KINETIS_MPU_RGD5_WORD3         (KINETIS_MPU_BASE+KINETIS_MPU_RGD5_WORD3_OFFSET)
+#define KINETIS_MPU_RGD6_WORD0         (KINETIS_MPU_BASE+KINETIS_MPU_RGD6_WORD0_OFFSET)
+#define KINETIS_MPU_RGD6_WORD1         (KINETIS_MPU_BASE+KINETIS_MPU_RGD6_WORD1_OFFSET)
+#define KINETIS_MPU_RGD6_WORD2         (KINETIS_MPU_BASE+KINETIS_MPU_RGD6_WORD2_OFFSET)
+#define KINETIS_MPU_RGD6_WORD3         (KINETIS_MPU_BASE+KINETIS_MPU_RGD6_WORD3_OFFSET)
+#define KINETIS_MPU_RGD7_WORD0         (KINETIS_MPU_BASE+KINETIS_MPU_RGD7_WORD0_OFFSET)
+#define KINETIS_MPU_RGD7_WORD1         (KINETIS_MPU_BASE+KINETIS_MPU_RGD7_WORD1_OFFSET)
+#define KINETIS_MPU_RGD7_WORD2         (KINETIS_MPU_BASE+KINETIS_MPU_RGD7_WORD2_OFFSET)
+#define KINETIS_MPU_RGD7_WORD3         (KINETIS_MPU_BASE+KINETIS_MPU_RGD7_WORD3_OFFSET)
+#define KINETIS_MPU_RGD8_WORD0         (KINETIS_MPU_BASE+KINETIS_MPU_RGD8_WORD0_OFFSET)
+#define KINETIS_MPU_RGD8_WORD1         (KINETIS_MPU_BASE+KINETIS_MPU_RGD8_WORD1_OFFSET)
+#define KINETIS_MPU_RGD8_WORD2         (KINETIS_MPU_BASE+KINETIS_MPU_RGD8_WORD2_OFFSET)
+#define KINETIS_MPU_RGD8_WORD3         (KINETIS_MPU_BASE+KINETIS_MPU_RGD8_WORD3_OFFSET)
+#define KINETIS_MPU_RGD9_WORD0         (KINETIS_MPU_BASE+KINETIS_MPU_RGD9_WORD0_OFFSET)
+#define KINETIS_MPU_RGD9_WORD1         (KINETIS_MPU_BASE+KINETIS_MPU_RGD9_WORD1_OFFSET)
+#define KINETIS_MPU_RGD9_WORD2         (KINETIS_MPU_BASE+KINETIS_MPU_RGD9_WORD2_OFFSET)
+#define KINETIS_MPU_RGD9_WORD3         (KINETIS_MPU_BASE+KINETIS_MPU_RGD9_WORD3_OFFSET)
+#define KINETIS_MPU_RGD10_WORD0        (KINETIS_MPU_BASE+KINETIS_MPU_RGD10_WORD0_OFFSET)
+#define KINETIS_MPU_RGD10_WORD1        (KINETIS_MPU_BASE+KINETIS_MPU_RGD10_WORD1_OFFSET)
+#define KINETIS_MPU_RGD10_WORD2        (KINETIS_MPU_BASE+KINETIS_MPU_RGD10_WORD2_OFFSET)
+#define KINETIS_MPU_RGD10_WORD3        (KINETIS_MPU_BASE+KINETIS_MPU_RGD10_WORD3_OFFSET)
+#define KINETIS_MPU_RGD11_WORD0        (KINETIS_MPU_BASE+KINETIS_MPU_RGD11_WORD0_OFFSET)
+#define KINETIS_MPU_RGD11_WORD1        (KINETIS_MPU_BASE+KINETIS_MPU_RGD11_WORD1_OFFSET)
+#define KINETIS_MPU_RGD11_WORD2        (KINETIS_MPU_BASE+KINETIS_MPU_RGD11_WORD2_OFFSET)
+#define KINETIS_MPU_RGD11_WORD3        (KINETIS_MPU_BASE+KINETIS_MPU_RGD11_WORD3_OFFSET)
+
+#define KINETIS_MPU_RGDAAC(n)          (KINETIS_MPU_BASE+KINETIS_MPU_RGDAAC_OFFSET(n))
+
+#define KINETIS_MPU_RGDAAC0            (KINETIS_MPU_BASE+KINETIS_MPU_RGDAAC0_OFFSET)
+#define KINETIS_MPU_RGDAAC1            (KINETIS_MPU_BASE+KINETIS_MPU_RGDAAC1_OFFSET)
+#define KINETIS_MPU_RGDAAC2            (KINETIS_MPU_BASE+KINETIS_MPU_RGDAAC2_OFFSET)
+#define KINETIS_MPU_RGDAAC3            (KINETIS_MPU_BASE+KINETIS_MPU_RGDAAC3_OFFSET)
+#define KINETIS_MPU_RGDAAC4            (KINETIS_MPU_BASE+KINETIS_MPU_RGDAAC4_OFFSET)
+#define KINETIS_MPU_RGDAAC5            (KINETIS_MPU_BASE+KINETIS_MPU_RGDAAC5_OFFSET)
+#define KINETIS_MPU_RGDAAC6            (KINETIS_MPU_BASE+KINETIS_MPU_RGDAAC6_OFFSET)
+#define KINETIS_MPU_RGDAAC7            (KINETIS_MPU_BASE+KINETIS_MPU_RGDAAC7_OFFSET)
+#define KINETIS_MPU_RGDAAC8            (KINETIS_MPU_BASE+KINETIS_MPU_RGDAAC8_OFFSET)
+#define KINETIS_MPU_RGDAAC9            (KINETIS_MPU_BASE+KINETIS_MPU_RGDAAC9_OFFSET)
+#define KINETIS_MPU_RGDAAC10           (KINETIS_MPU_BASE+KINETIS_MPU_RGDAAC10_OFFSET)
+#define KINETIS_MPU_RGDAAC11           (KINETIS_MPU_BASE+KINETIS_MPU_RGDAAC11_OFFSET)
+
+/* Register Bit Definitions *************************************************************************/
+
+/* Control/Error Status Register */
+
+#define MPU_CESR_VLD                   (1 << 0)  /* Bit 0:  Valid (global enable/disable for the MPU) */
+                                                 /* Bits 1-7: Reserved */
+#define MPU_CESR_NRGD_SHIFT            (8)       /* Bits 8-11: Number of region descriptors */
+#define MPU_CESR_NRGD_MASK             (15 << MPU_CESR_NRGD_SHIFT)
+#  define MPU_CESR_NRGD_8DESC          (0 << MPU_CESR_NRGD_SHIFT) /* 8 region descriptors */
+#  define MPU_CESR_NRGD_12DESC         (1 << MPU_CESR_NRGD_SHIFT) /* 12 region descriptors */
+#  define MPU_CESR_NRGD_16DESC         (2 << MPU_CESR_NRGD_SHIFT) /* 16 region descriptors */
+#define MPU_CESR_NSP_SHIFT             (12)      /* Bits 12-15: Number of slave ports */
+#define MPU_CESR_NSP_MASK              (15 << MPU_CESR_NSP_SHIFT)
+#define MPU_CESR_HRL_SHIFT             (16)      /* Bits 16-19: Hardware revision level */
+#define MPU_CESR_HRL_MASK              (15 << MPU_CESR_HRL_SHIFT)
+                                                 /* Bits 20-26: Reserved */
+#define MPU_CESR_SPERR_SHIFT           (27)      /* Bits 27-31: Slave port n error */
+#define MPU_CESR_SPERR_MASK            (31 << MPU_CESR_SPERR_SHIFT)
+#  define MPU_CESR_SPERR_SPORT(n)      ((1 << (4-(n))) << MPU_CESR_SPERR_SHIFT) /* Slave port nn */
+#  define MPU_CESR_SPERR_SPORT0        (16 << MPU_CESR_SPERR_SHIFT) /* Slave port 0 */
+#  define MPU_CESR_SPERR_SPORT1        (8 << MPU_CESR_SPERR_SHIFT)  /* Slave port 1 */
+#  define MPU_CESR_SPERR_SPORT2        (4 << MPU_CESR_SPERR_SHIFT)  /* Slave port 2 */
+#  define MPU_CESR_SPERR_SPORT3        (2 << MPU_CESR_SPERR_SHIFT)  /* Slave port 3 */
+#  define MPU_CESR_SPERR_SPORT4        (1 << MPU_CESR_SPERR_SHIFT)  /* Slave port 4 */
+
+/* Error Address Register, Slave Port n.  32-bit error address. */
+
+/* Error Detail Register, Slave Port n */
+
+#define MPU_EDR_ERW                    (1 << 0)  /* Bit 0:  Error read/write */
+#define MPU_EDR_EATTR_SHIFT            (1)       /* Bits 1-3: Error attributes */
+#define MPU_EDR_EATTR_MASK             (7 << MPU_EDR_EATTR_SHIFT)
+#  define MPU_EDR_EATTR_USRINST        (0 << MPU_EDR_EATTR_SHIFT) /* User mode, instruction access */
+#  define MPU_EDR_EATTR_USRDATA        (1 << MPU_EDR_EATTR_SHIFT) /* User mode, data access */
+#  define MPU_EDR_EATTR_SUPINST        (2 << MPU_EDR_EATTR_SHIFT) /* Supervisor mode, instruction access */
+#  define MPU_EDR_EATTR_SUPDATA        (3 << MPU_EDR_EATTR_SHIFT) /* Supervisor mode, data access */
+#define MPU_EDR_EMN_SHIFT              (4)       /* Bits 4-7: Error master number */
+#define MPU_EDR_EMN_MASK               (15 << MPU_EDR_EMN_SHIFT)
+                                                 /* Bits 8-15: Reserved */
+#define MPU_EDR_EACD_SHIFT             (26)      /* Bits 16-31: Error access control detail */
+#define MPU_EDR_EACD_MASK              (0xffff << MPU_EDR_EACD_SHIFT)
+
+/* Region Descriptor n, Word 0 */
+                                                 /* Bits 0-4: Reserved */
+#define MPU_RGD_WORD0_SRTADDR_SHIFT    (5)       /* Bits 5-31: Start address */
+#define MPU_RGD_WORD0_SRTADDR_MASK     (0xffffffe0)
+
+/* Region Descriptor n, Word 1 */
+                                                 /* Bits 0-4: Reserved */
+#define MPU_RGD_WORD1_ENDADDR_SHIFT    (5)       /* Bits 5-31: End address */
+#define MPU_RGD_WORD1_ENDADDR_MASK     (0xffffffe0)
+
+/* Region Descriptor n, Word 2 */
+
+#define MPU_RGD_MSM_RWX                0         /* R/W/X; read, write and execute allowed */
+#define MPU_RGD_MSM_RX                 1         /* R/X; read and execute allowed, but no write */
+#define MPU_RGD_MSM_RW                 2         /* R/W; read and write allowed, but no execute */
+#define MPU_RGD_MSM_UM                 3         /* Same as user mode defined in MUM */
+
+#define MPU_RGD_MUM_R                  4         /* Read allowed */
+#define MPU_RGD_MUM_W                  2         /* Write allowed */
+#define MPU_RGD_MUM_X                  1         /* Execute allocated */
+
+#define MPU_RGD_WORD2_M0UM_SHIFT       (0)       /* Bits 0-2: Bus master 0 user mode access control */
+#define MPU_RGD_WORD2_M0UM_MASK        (7 << MPU_RGD_WORD2_M0UM_SHIFT)
+#define MPU_RGD_WORD2_M0SM_SHIFT       (3)       /* Bits 3-4: Bus master 0 supervisor mode access control */
+#define MPU_RGD_WORD2_M0SM_MASK        (3 << MPU_RGD_WORD2_M0SM_SHIFT)
+#define MPU_RGD_WORD2_M0PE             (1 << 5) /* Bit 5: Bus Master 0 Process Identifier Enable */
+#define MPU_RGD_WORD2_M1UM_SHIFT       (6)       /* Bits 6-8: Bus master 1 user mode access control */
+#define MPU_RGD_WORD2_M1UM_MASK        (7 << MPU_RGD_WORD2_M1UM_SHIFT)
+#define MPU_RGD_WORD2_M1SM_SHIFT       (9)       /* Bits 9-10: Bus master 1 supervisor mode access control */
+#define MPU_RGD_WORD2_M1SM_MASK        (3 << MPU_RGD_WORD2_M1SM_SHIFT)
+#define MPU_RGD_WORD2_M1PE             (1 << 11) /* Bit 11: Bus Master 1 Process Identifier Enable */
+#define MPU_RGD_WORD2_M2UM_SHIFT       (12)      /* Bits 12-14: Bus master 2 user mode access control */
+#define MPU_RGD_WORD2_M2UM_MASK        (7 << MPU_RGD_WORD2_M2UM_SHIFT)
+#define MPU_RGD_WORD2_M2SM_SHIFT       (15)      /* Bits 15-16: Bus master 2 supervisor mode access control */
+#define MPU_RGD_WORD2_M2SM_MASK        (3 << MPU_RGD_WORD2_M2SM_SHIFT)
+#define MPU_RGD_WORD2_M2PE             (1 << 17) /* Bit 17: Bus Master 2 Process Identifier Enable */
+#define MPU_RGD_WORD2_M3UM_SHIFT       (18)      /* Bits 18-20: Bus master 3 user mode access control */
+#define MPU_RGD_WORD2_M3UM_MASK        (7 << MPU_RGD_WORD2_M3UM_SHIFT)
+#define MPU_RGD_WORD2_M3SM_SHIFT       (21)      /* Bits 21-22: Bus master 3 supervisor mode access control */
+#define MPU_RGD_WORD2_M3SM_MASK        (3 << MPU_RGD_WORD2_M3SM_SHIFT)
+#define MPU_RGD_WORD2_M3PE             (1 << 23) /* Bit 23: Bus Master 3 Process Identifier Enable */
+#define MPU_RGD_WORD2_M4WE             (1 << 24) /* Bit 24: Bus master 4 write enable */
+#define MPU_RGD_WORD2_M4RE             (1 << 25) /* Bit 25: Bus master 4 read enable */
+#define MPU_RGD_WORD2_M5WE             (1 << 26) /* Bit 26: Bus master 5 write enable */
+#define MPU_RGD_WORD2_M5RE             (1 << 27) /* Bit 27: Bus master 5 read enable */
+#define MPU_RGD_WORD2_M6WE             (1 << 28) /* Bit 28: Bus master 6 write enable */
+#define MPU_RGD_WORD2_M6RE             (1 << 29) /* Bit 29: Bus master 6 read enable */
+#define MPU_RGD_WORD2_M7WE             (1 << 30) /* Bit 30: Bus master 7 write enable */
+#define MPU_RGD_WORD2_M7RE             (1 << 31) /* Bit 31: Bus master 7 read enable */
+
+/* Region Descriptor n, Word 3 */
+
+#define MPU_RGD_WORD3_VLD              (1 << 0)  /* Bit 0:  Valid */
+                                                 /* Bits 1-31: Reserved */
+/* Region Descriptor Alternate Access Control n */
+
+#define MPU_RGD_RBDACC_M0UM_SHIFT      (0)       /* Bits 0-2: Bus master 0 user mode access control */
+#define MPU_RGD_RBDACC_M0UM_MASK       (7 << MPU_RGD_RBDACC_M0UM_SHIFT)
+#define MPU_RGD_RBDACC_M0SM_SHIFT      (3)       /* Bits 3-4: Bus master 0 supervisor mode access control */
+#define MPU_RGD_RBDACC_M0SM_MASK       (3 << MPU_RGD_RBDACC_M0SM_SHIFT)
+                                                 /* Bit 5: Reserved */
+#define MPU_RGD_RBDACC_M1UM_SHIFT      (6)       /* Bits 6-8: Bus master 1 user mode access control */
+#define MPU_RGD_RBDACC_M1UM_MASK       (7 << MPU_RGD_RBDACC_M1UM_SHIFT)
+#define MPU_RGD_RBDACC_M1SM_SHIFT      (9)       /* Bits 9-10: Bus master 1 supervisor mode access control */
+#define MPU_RGD_RBDACC_M1SM_MASK       (3 << MPU_RGD_RBDACC_M1SM_SHIFT)
+                                                 /* Bit 11: Reserved */
+#define MPU_RGD_RBDACC_M2UM_SHIFT      (12)      /* Bits 12-14: Bus master 2 user mode access control */
+#define MPU_RGD_RBDACC_M2UM_MASK       (7 << MPU_RGD_RBDACC_M2UM_SHIFT)
+#define MPU_RGD_RBDACC_M2SM_SHIFT      (15)      /* Bits 15-16: Bus master 2 supervisor mode access control */
+#define MPU_RGD_RBDACC_M2SM_MASK       (3 << MPU_RGD_RBDACC_M2SM_SHIFT)
+                                                 /* Bit 17: Reserved */
+#define MPU_RGD_RBDACC_M3UM_SHIFT      (18)      /* Bits 18-20: Bus master 3 user mode access control */
+#define MPU_RGD_RBDACC_M3UM_MASK       (7 << MPU_RGD_RBDACC_M3UM_SHIFT)
+#define MPU_RGD_RBDACC_M3SM_SHIFT      (21)      /* Bits 21-22: Bus master 3 supervisor mode access control */
+#define MPU_RGD_RBDACC_M3SM_MASK       (3 << MPU_RGD_RBDACC_M3SM_SHIFT)
+                                                 /* Bit 23: Reserved */
+#define MPU_RGD_RBDACC_M4WE            (1 << 24) /* Bit 24: Bus master 4 write enable */
+#define MPU_RGD_RBDACC_M4RE            (1 << 25) /* Bit 25: Bus master 4 read enable */
+#define MPU_RGD_RBDACC_M5WE            (1 << 26) /* Bit 26: Bus master 5 write enable */
+#define MPU_RGD_RBDACC_M5RE            (1 << 27) /* Bit 27: Bus master 5 read enable */
+#define MPU_RGD_RBDACC_M6WE            (1 << 28) /* Bit 28: Bus master 6 write enable */
+#define MPU_RGD_RBDACC_M6RE            (1 << 29) /* Bit 29: Bus master 6 read enable */
+#define MPU_RGD_RBDACC_M7WE            (1 << 30) /* Bit 30: Bus master 7 write enable */
+#define MPU_RGD_RBDACC_M7RE            (1 << 31) /* Bit 31: Bus master 7 read enable */
+
+/****************************************************************************************************
+ * Public Types
+ ****************************************************************************************************/
+
+/****************************************************************************************************
+ * Public Data
+ ****************************************************************************************************/
+
+/****************************************************************************************************
+ * Public Functions
+ ****************************************************************************************************/
+
+#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_MPU_H */
diff --git a/arch/arm/src/kinetis/kinetis_mcm.h b/arch/arm/src/kinetis/chip/kinetis_mcm.h
similarity index 94%
rename from arch/arm/src/kinetis/kinetis_mcm.h
rename to arch/arm/src/kinetis/chip/kinetis_mcm.h
index d899b77027..f46305056e 100644
--- a/arch/arm/src/kinetis/kinetis_mcm.h
+++ b/arch/arm/src/kinetis/chip/kinetis_mcm.h
@@ -1,7 +1,7 @@
 /************************************************************************************
- * arch/arm/src/kinetis/kinetis_mcm.h
+ * arch/arm/src/kinetis/chip/kinetis_mcm.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_MCM_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_MCM_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MCM_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MCM_H
 
 /************************************************************************************
  * Included Files
@@ -57,6 +57,9 @@
 #define KINETIS_MCM_ETBCC_OFFSET    0x0014 /* ETB counter control register */
 #define KINETIS_MCM_ETBRL_OFFSET    0x0018 /* ETB reload register */
 #define KINETIS_MCM_ETBCNT_OFFSET   0x001c /* ETB counter value register */
+#ifdef KINETIS_K64
+#  define KINETIS_MCM_PID_OFFSET    0x0030 /* Process ID register */
+#endif
 
 /* Register Addresses ***************************************************************/
 
@@ -67,6 +70,9 @@
 #define KINETIS_MCM_ETBCC           (KINETIS_MCM_BASE+KINETIS_MCM_ETBCC_OFFSET)
 #define KINETIS_MCM_ETBRL           (KINETIS_MCM_BASE+KINETIS_MCM_ETBRL_OFFSET)
 #define KINETIS_MCM_ETBCNT          (KINETIS_MCM_BASE+KINETIS_MCM_ETBCNT_OFFSET)
+#ifdef KINETIS_K64
+#  define KINETIS_MCM_PID           (KINETIS_MCM_BASE+KINETIS_MCM_PID_OFFSET)
+#endif
 
 /* Register Bit Definitions *********************************************************/
 
@@ -148,4 +154,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_MCM_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MCM_H */
diff --git a/arch/arm/src/kinetis/chip/kinetis_memorymap.h b/arch/arm/src/kinetis/chip/kinetis_memorymap.h
new file mode 100644
index 0000000000..ec67d42820
--- /dev/null
+++ b/arch/arm/src/kinetis/chip/kinetis_memorymap.h
@@ -0,0 +1,79 @@
+/********************************************************************************************
+ * arch/arm/src/kinetis/chip/kinetis_memorymap.h
+ *
+ *   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.
+ *
+ ********************************************************************************************/
+
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MEMORYMAP_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MEMORYMAP_H
+
+/********************************************************************************************
+ * Included Files
+ ********************************************************************************************/
+
+#include 
+
+#include "chip.h"
+
+/* This file is just a wrapper around pin muxing header files for the Kinetis family selected
+ * by the logic in chip.h.
+ */
+
+#if defined(KINETIS_K20)
+#  include "chip/kinetis_k20memorymap.h"
+#elif defined(KINETIS_K40)
+#  include "chip/kinetis_k40memorymap.h"
+#elif defined(KINETIS_K60)
+#  include "chip/kinetis_k60memorymap.h"
+#elif defined(KINETIS_K64)
+#  include "chip/kinetis_k64memorymap.h"
+#else
+#  error "No memory map for this Kinetis part"
+#endif
+
+/********************************************************************************************
+ * Pre-processor Definitions
+ ********************************************************************************************/
+
+/********************************************************************************************
+ * Public Types
+ ********************************************************************************************/
+
+/********************************************************************************************
+ * Public Data
+ ********************************************************************************************/
+
+/********************************************************************************************
+ * Public Functions
+ ********************************************************************************************/
+
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MEMORYMAP_H */
diff --git a/arch/arm/src/kinetis/kinetis_mmcau.h b/arch/arm/src/kinetis/chip/kinetis_mmcau.h
similarity index 89%
rename from arch/arm/src/kinetis/kinetis_mmcau.h
rename to arch/arm/src/kinetis/chip/kinetis_mmcau.h
index 7468a1d0bf..90c9cf6552 100644
--- a/arch/arm/src/kinetis/kinetis_mmcau.h
+++ b/arch/arm/src/kinetis/chip/kinetis_mmcau.h
@@ -1,7 +1,7 @@
 /************************************************************************************
- * arch/arm/src/kinetis/kinetis_mmcau.h
+ * arch/arm/src/kinetis/chip/kinetis_mmcau.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_MMCAU_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_MMCAU_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MMCAU_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MMCAU_H
 
 /************************************************************************************
  * Included Files
@@ -61,9 +61,11 @@
 #define KINETIS_CAU_CA3_OFFSET   0x0005  /* General Purpose Register 3 */
 #define KINETIS_CAU_CA4_OFFSET   0x0006  /* General Purpose Register 4 */
 #define KINETIS_CAU_CA5_OFFSET   0x0007  /* General Purpose Register 5 */
-#define KINETIS_CAU_CA6_OFFSET   0x0008  /* General Purpose Register 6 */
-#define KINETIS_CAU_CA7_OFFSET   0x0009  /* General Purpose Register 7 */
-#define KINETIS_CAU_CA8_OFFSET   0x000a  /* General Purpose Register 8 */
+#ifndef KINETIS_K64
+#  define KINETIS_CAU_CA6_OFFSET 0x0008  /* General Purpose Register 6 */
+#  define KINETIS_CAU_CA7_OFFSET 0x0009  /* General Purpose Register 7 */
+#  define KINETIS_CAU_CA8_OFFSET 0x000a  /* General Purpose Register 8 */
+#endif
 
 /* Register Addresses ***************************************************************/
 
@@ -77,9 +79,11 @@
 #define KINETIS_CAU_CA3          (KINETIS_MMCAU_BASE+KINETIS_CAU_CA3_OFFSET)
 #define KINETIS_CAU_CA4          (KINETIS_MMCAU_BASE+KINETIS_CAU_CA4_OFFSET)
 #define KINETIS_CAU_CA5          (KINETIS_MMCAU_BASE+KINETIS_CAU_CA5_OFFSET)
-#define KINETIS_CAU_CA6          (KINETIS_MMCAU_BASE+KINETIS_CAU_CA6_OFFSET)
-#define KINETIS_CAU_CA7          (KINETIS_MMCAU_BASE+KINETIS_CAU_CA7_OFFSET)
-#define KINETIS_CAU_CA8          (KINETIS_MMCAU_BASE+KINETIS_CAU_CA8_OFFSET)
+#ifndef KINETIS_K64
+#  define KINETIS_CAU_CA6        (KINETIS_MMCAU_BASE+KINETIS_CAU_CA6_OFFSET)
+#  define KINETIS_CAU_CA7        (KINETIS_MMCAU_BASE+KINETIS_CAU_CA7_OFFSET)
+#  define KINETIS_CAU_CA8        (KINETIS_MMCAU_BASE+KINETIS_CAU_CA8_OFFSET)
+#endif
 
 /* Register Bit Definitions *********************************************************/
 
@@ -135,4 +139,4 @@
  ************************************************************************************/
 
 #endif /* KINETIS_NMMCAU && KINETIS_NMMCAU > 0 */
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_MMCAU_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MMCAU_H */
diff --git a/arch/arm/src/kinetis/chip/kinetis_mpu.h b/arch/arm/src/kinetis/chip/kinetis_mpu.h
new file mode 100644
index 0000000000..1faa605d75
--- /dev/null
+++ b/arch/arm/src/kinetis/chip/kinetis_mpu.h
@@ -0,0 +1,75 @@
+/********************************************************************************************
+ * arch/arm/src/kinetis/chip/kinetis_mpu.h
+ *
+ *   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.
+ *
+ ********************************************************************************************/
+
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MPU_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MPU_H
+
+/********************************************************************************************
+ * Included Files
+ ********************************************************************************************/
+
+#include 
+
+#include "chip.h"
+
+/* This file is just a wrapper around pin muxing header files for the Kinetis family selected
+ * by the logic in chip.h.
+ */
+
+#if defined(KINETIS_K20) || defined(KINETIS_K40) || defined(KINETIS_K60)
+#  include "chip/kinetis_k20k40k60mpu.h"
+#elif defined(KINETIS_K64)
+#  include "chip/kinetis_k64mpu.h"
+#else
+#  error "No MPU definitions for this Kinetis part"
+#endif
+
+/********************************************************************************************
+ * Pre-processor Definitions
+ ********************************************************************************************/
+
+/********************************************************************************************
+ * Public Types
+ ********************************************************************************************/
+
+/********************************************************************************************
+ * Public Data
+ ********************************************************************************************/
+
+/********************************************************************************************
+ * Public Functions
+ ********************************************************************************************/
+
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_MPU_H */
diff --git a/arch/arm/src/kinetis/chip/kinetis_pinmux.h b/arch/arm/src/kinetis/chip/kinetis_pinmux.h
index bc59e58c9d..0a6aeb8253 100644
--- a/arch/arm/src/kinetis/chip/kinetis_pinmux.h
+++ b/arch/arm/src/kinetis/chip/kinetis_pinmux.h
@@ -49,11 +49,13 @@
  */
 
 #if defined(KINETIS_K20)
-#  include "kinetis_k20pinmux.h"
+#  include "chip/kinetis_k20pinmux.h"
 #elif defined(KINETIS_K40)
-#  include "kinetis_k40pinmux.h"
+#  include "chip/kinetis_k40pinmux.h"
 #elif defined(KINETIS_K60)
-#  include "kinetis_k60pinmux.h"
+#  include "chip/kinetis_k60pinmux.h"
+#elif defined(KINETIS_K64)
+#  include "chip/kinetis_k64pinmux.h"
 #else
 #  error "No pin multiplexing for this Kinetis part"
 #endif
diff --git a/arch/arm/src/kinetis/kinetis_enet.c b/arch/arm/src/kinetis/kinetis_enet.c
index 00fdce77bd..379a2aac27 100644
--- a/arch/arm/src/kinetis/kinetis_enet.c
+++ b/arch/arm/src/kinetis/kinetis_enet.c
@@ -67,7 +67,7 @@
 #include "kinetis_config.h"
 #include "chip/kinetis_pinmux.h"
 #include "kinetis_sim.h"
-#include "kinetis_mpu.h"
+#include "chip/kinetis_mpu.h"
 #include "chip/kinetis_enet.h"
 
 #if defined(KINETIS_NENET) && KINETIS_NENET > 0
diff --git a/arch/arm/src/kinetis/kinetis_memorymap.h b/arch/arm/src/kinetis/kinetis_memorymap.h
deleted file mode 100644
index 1e7d2820de..0000000000
--- a/arch/arm/src/kinetis/kinetis_memorymap.h
+++ /dev/null
@@ -1,461 +0,0 @@
-/************************************************************************************
- * arch/arm/src/kinetis/kinetis_memorymap.h
- *
- *   Copyright (C) 2011, 2015 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.
- *
- ************************************************************************************/
-
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_MEMORYMAP_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_MEMORYMAP_H
-
-/************************************************************************************
- * Included Files
- ************************************************************************************/
-
-#include 
-
-#include "chip.h"
-
-/************************************************************************************
- * Pre-processor Definitions
- ************************************************************************************/
-
-/* Memory Map ***********************************************************************/
-/* K20 Family
- *
- * The memory map for the following parts is defined in Freescale document
- * K20P64M72SF1RM
- */
-
-#if defined(CONFIG_ARCH_CHIP_MK20DX256VLH7)
-
-# define KINETIS_FLASH_BASE     0x00000000 /* –0x0fffffff Program flash and read-
-                                            *             only data (Includes exception
-                                            *             vectors in first 1024 bytes) */
-# if !defined(KINETIS_FLEXMEM_SIZE)
-#  define KINETIS_FLEXNVM_BASE  0x10000000 /* –0x13ffffff FlexNVM */
-#  define KINETIS_FLEXRAM_BASE  0x14000000 /* –0x17ffffff FlexRAM */
-# endif
-                             /* 0x18000000  * –0x1bffffff Reserved */
-# define KINETIS_SRAML_BASE     0x1c000000 /* –0x1fffffff SRAM_L: Lower SRAM
-                                            *             (ICODE/DCODE) */
-# define KINETIS_SRAMU_BASE     0x20000000 /* –0x200fffff SRAM_U: Upper SRAM bitband
-                                            *             region */
-                             /* 0x20100000  * –0x21ffffff Reserved */
-# define KINETIS_SALIAS_BASE    0x22000000 /* –0x23ffffff Aliased to SRAM_U bitband */
-                             /* 0x24000000  * –0x3fffffff Reserved */
-# define KINETIS_BRIDGE0_BASE   0x40000000 /* –0x4007ffff Bitband region for peripheral
-                                            *             bridge 0 (AIPS-Lite0) */
-# define KINETIS_BRIDGE1_BASE   0x40080000 /* –0x400fffff Bitband region for peripheral
-                                            *             bridge 1 (AIPS-Lite1) */
-# define KINETIS_GPIOBB_BASE    0x400ff000 /* –0x400fffff Bitband region for general
-                                            *             purpose input/output (GPIO) */
-                             /* 0x40100000  * –0x41ffffff Reserved */
-# define KINETIS_PALIAS_BASE    0x42000000 /* –0x43ffffff Aliased to peripheral bridge
-                                            *             (AIPS-Lite) and general purpose
-                                            *             input/output (GPIO) bitband */
-                             /* 0x44000000  * –0xdfffffff Reserved */
-# define KINETIS_PERIPH_BASE    0xe0000000 /* –0xe00fffff Private peripherals */
-                             /* 0xe0100000  * –0xffffffff Reserved */
-
-/* Peripheral Bridge 0 Memory Map ***************************************************/
-
-# define KINETIS_AIPS0_BASE     0x40000000 /* Peripheral bridge 0 (AIPS-Lite 0) */
-# define KINETIS_XBAR_BASE      0x40004000 /* Crossbar switch */
-# define KINETIS_DMAC_BASE      0x40008000 /* DMA controller */
-# define KINETIS_DMADESC_BASE   0x40009000 /* DMA controller transfer control descriptors */
-# define KINETIS_FMC_BASE       0x4001f000 /* Flash memory controller */
-# define KINETIS_FTFL_BASE      0x40020000 /* Flash memory */
-# define KINETIS_DMAMUX0_BASE   0x40021000 /* DMA channel mutiplexer 0 */
-# define KINETIS_CAN0_BASE      0x40024000 /* FlexCAN 0 */
-# define KINETIS_SPI0_BASE      0x4002c000 /* SPI 0 */
-# define KINETIS_SPI1_BASE      0x4002d000 /* SPI 1 */
-# define KINETIS_I2S0_BASE      0x4002f000 /* I2S 0 */
-# define KINETIS_CRC_BASE       0x40032000 /* CRC */
-# define KINETIS_USBDCD_BASE    0x40035000 /* USB DCD */
-# define KINETIS_PDB0_BASE      0x40036000 /* Programmable delay block */
-# define KINETIS_PIT_BASE       0x40037000 /* Periodic interrupt timers (PIT) */
-# define KINETIS_FTM0_BASE      0x40038000 /* FlexTimer 0 */
-# define KINETIS_FTM1_BASE      0x40039000 /* FlexTimer 1 */
-# define KINETIS_ADC0_BASE      0x4003b000 /* Analog-to-digital converter (ADC) 0 */
-# define KINETIS_RTC_BASE       0x4003d000 /* Real time clock */
-# define KINETIS_VBATR_BASE     0x4003e000 /* VBAT register file */
-# define KINETIS_LPTMR_BASE     0x40040000 /* Low power timer */
-# define KINETIS_SYSR_BASE      0x40041000 /* System register file */
-# define KINETIS_TSI0_BASE      0x40045000 /* Touch sense interface */
-# define KINETIS_SIMLP_BASE     0x40047000 /* SIM low-power logic */
-# define KINETIS_SIM_BASE       0x40048000 /* System integration module (SIM) */
-# define KINETIS_PORT_BASE(n)   (0x40049000 + ((n) << 12))
-# define KINETIS_PORTA_BASE     0x40049000 /* Port A multiplexing control */
-# define KINETIS_PORTB_BASE     0x4004a000 /* Port B multiplexing control */
-# define KINETIS_PORTC_BASE     0x4004b000 /* Port C multiplexing control */
-# define KINETIS_PORTD_BASE     0x4004c000 /* Port D multiplexing control */
-# define KINETIS_PORTE_BASE     0x4004d000 /* Port E multiplexing control */
-# define KINETIS_WDOG_BASE      0x40052000 /* Software watchdog */
-# define KINETIS_EWM_BASE       0x40061000 /* External watchdog */
-# define KINETIS_CMT_BASE       0x40062000 /* Carrier modulator timer (CMT) */
-# define KINETIS_MCG_BASE       0x40064000 /* Multi-purpose Clock Generator (MCG) */
-# define KINETIS_OSC_BASE       0x40065000 /* System oscillator (OSC) */
-# define KINETIS_I2C0_BASE      0x40066000 /* I2C 0 */
-# define KINETIS_I2C1_BASE      0x40067000 /* I2C 1 */
-# define KINETIS_UART0_BASE     0x4006a000 /* UART0 */
-# define KINETIS_UART1_BASE     0x4006b000 /* UART1 */
-# define KINETIS_UART2_BASE     0x4006c000 /* UART2 */
-# define KINETIS_USB0_BASE      0x40072000 /* USB OTG FS/LS */
-# define KINETIS_CMP_BASE       0x40073000 /* Analog comparator (CMP) / 6-bit digital-to-analog converter (DAC) */
-# define KINETIS_VREF_BASE      0x40074000 /* Voltage reference (VREF) */
-# define KINETIS_LLWU_BASE      0x4007c000 /* Low-leakage wakeup unit (LLWU) */
-# define KINETIS_PMC_BASE       0x4007d000 /* Power management controller (PMC) */
-# define KINETIS_SMC_BASE       0x4007e000 /* System Mode controller (SMC) */
-
-/* Peripheral Bridge 1 Memory Map ***************************************************/
-
-# define KINETIS_AIPS1_BASE     0x40080000 /* Peripheral bridge 1 (AIPS-Lite 1) */
-# define KINETIS_FTM2_BASE      0x400b8000 /* FlexTimer 2 */
-# define KINETIS_ADC1_BASE      0x400bb000 /* Analog-to-digital converter (ADC) 1 */
-# define KINETIS_DAC0_BASE      0x400cc000 /* 12-bit digital-to-analog converter (DAC) 0 */
-
-# define KINETIS_XBARSS_BASE    0x400ff000 /* Not an AIPS-Lite slot. The 32-bit general
-                                            * purpose input/output module that shares the
-                                            * crossbar switch slave port with the AIPS-Lite
-                                            * is accessed at this address. */
-# define KINETIS_GPIO_BASE(n)   (0x400ff000 + ((n) << 6))
-# define KINETIS_GPIOA_BASE     0x400ff000 /* GPIO PORTA registers */
-# define KINETIS_GPIOB_BASE     0x400ff040 /* GPIO PORTB registers */
-# define KINETIS_GPIOC_BASE     0x400ff080 /* GPIO PORTC registers */
-# define KINETIS_GPIOD_BASE     0x400ff0c0 /* GPIO PORTD registers */
-# define KINETIS_GPIOE_BASE     0x400ff100 /* GPIO PORTE registers */
-
-/* Private Peripheral Bus (PPB) Memory Map ******************************************/
-
-# define KINETIS_ITM_BASE       0xe0000000 /* Instrumentation Trace Macrocell (ITM) */
-# define KINETIS_DWT_BASE       0xe0001000 /* Data Watchpoint and Trace (DWT) */
-# define KINETIS_FPB_BASE       0xe0002000 /* Flash Patch and Breakpoint (FPB) */
-# define KINETIS_SCS_BASE       0xe000e000 /* System Control Space (SCS) (for NVIC) */
-# define KINETIS_TPIU_BASE      0xe0040000 /* Trace Port Interface Unit (TPIU) */
-# define KINETIS_MCM_BASE       0xe0080000 /* Miscellaneous Control Module (including ETB Almost Full) */
-# define KINETIS_ROMTAB_BASE    0xe00ff000 /* ROM Table - allows auto-detection of debug components */
-
-/* Memory Map ***********************************************************************/
-/* K40 Family
- *
- * The memory map for the following parts is defined in Freescale document
- * K40P144M100SF2RM
- */
-
-#elif defined(CONFIG_ARCH_CHIP_MK40X128VLQ100) || defined(CONFIG_ARCH_CHIP_MK40X128VMD100) || \
-    defined(CONFIG_ARCH_CHIP_MK40X256VLQ100) || defined(CONFIG_ARCH_CHIP_MK40X256VMD100) || \
-    defined(CONFIG_ARCH_CHIP_MK40N512VLQ100) || defined(CONFIG_ARCH_CHIP_MK40N512VMD100)
-
-# define KINETIS_FLASH_BASE     0x00000000 /* –0x0fffffff Program flash and read-
-                                            *             only data (Includes exception
-                                            *             vectors in first 1024 bytes) */
-# if !defined(KINETIS_FLEXMEM_SIZE)
-#  define KINETIS_FLEXNVM_BASE  0x10000000 /* –0x13ffffff FlexNVM */
-#  define KINETIS_FLEXRAM_BASE  0x14000000 /* –0x17ffffff FlexRAM */
-# endif
-# define KINETIS_SRAML_BASE     0x18000000 /* –0x1fffffff SRAM_L: Lower SRAM
-                                            *             (ICODE/DCODE) */
-# define KINETIS_SRAMU_BASE     0x20000000 /* –0x200fffff SRAM_U: Upper SRAM bitband
-                                            *             region */
-                             /* 0x20100000  * –0x21ffffff Reserved */
-# define KINETIS_SALIAS_BASE    0x22000000 /* –0x23ffffff Aliased to SRAM_U bitband */
-                             /* 0x24000000  * –0x3fffffff Reserved */
-# define KINETIS_BRIDGE0_BASE   0x40000000 /* –0x4007ffff Bitband region for peripheral
-                                            *             bridge 0 (AIPS-Lite0) */
-# define KINETIS_BRIDGE1_BASE   0x40080000 /* –0x400fffff Bitband region for peripheral
-                                            *             bridge 1 (AIPS-Lite1) */
-# define KINETIS_GPIOBB_BASE    0x400ff000 /* –0x400fffff Bitband region for general
-                                            *             purpose input/output (GPIO) */
-                             /* 0x40100000  * –0x41ffffff Reserved */
-# define KINETIS_PALIAS_BASE    0x42000000 /* –0x43ffffff Aliased to peripheral bridge
-                                            *             (AIPS-Lite) and general purpose
-                                            *             input/output (GPIO) bitband */
-                             /* 0x44000000  * –0x5fffffff Reserved */
-# define KINETIS_FLEXBUS_WBBASE 0x60000000 /* –0x7fffffff FlexBus (External Memory -
-                                            *             Write-back) */
-# define KINETIS_FLEXBUS_WTBASE 0x80000000 /* –0x9fffffff FlexBus (External Memory -
-                                            *             Write-through) */
-# define KINETIS_FLEXBUS_NXBASE 0xa0000000 /* –0xdfffffff FlexBus (External Memory -
-                                            *             Non-executable) */
-# define KINETIS_PERIPH_BASE    0xe0000000 /* –0xe00fffff Private peripherals */
-                             /* 0xe0100000  * –0xffffffff Reserved */
-
-/* Peripheral Bridge 0 Memory Map ***************************************************/
-
-# define KINETIS_AIPS0_BASE     0x40000000 /* Peripheral bridge 0 (AIPS-Lite 0) */
-# define KINETIS_XBAR_BASE      0x40004000 /* Crossbar switch */
-# define KINETIS_DMAC_BASE      0x40008000 /* DMA controller */
-# define KINETIS_DMADESC_BASE   0x40009000 /* DMA controller transfer control descriptors */
-# define KINETIS_FLEXBUSC_BASE  0x4000c000 /* FlexBus controller */
-# define KINETIS_MPU_BASE       0x4000d000 /* MPU */
-# define KINETIS_FMC_BASE       0x4001f000 /* Flash memory controller */
-# define KINETIS_FTFL_BASE      0x40020000 /* Flash memory */
-# define KINETIS_DMAMUX0_BASE   0x40021000 /* DMA channel mutiplexer 0 */
-# define KINETIS_CAN0_BASE      0x40024000 /* FlexCAN 0 */
-# define KINETIS_SPI0_BASE      0x4002c000 /* SPI 0 */
-# define KINETIS_SPI1_BASE      0x4002d000 /* SPI 1 */
-# define KINETIS_I2S0_BASE      0x4002f000 /* I2S 0 */
-# define KINETIS_CRC_BASE       0x40032000 /* CRC */
-# define KINETIS_USBDCD_BASE    0x40035000 /* USB DCD */
-# define KINETIS_PDB0_BASE      0x40036000 /* Programmable delay block */
-# define KINETIS_PIT_BASE       0x40037000 /* Periodic interrupt timers (PIT) */
-# define KINETIS_FTM0_BASE      0x40038000 /* FlexTimer 0 */
-# define KINETIS_FTM1_BASE      0x40039000 /* FlexTimer 1 */
-# define KINETIS_ADC0_BASE      0x4003b000 /* Analog-to-digital converter (ADC) 0 */
-# define KINETIS_RTC_BASE       0x4003d000 /* Real time clock */
-# define KINETIS_VBATR_BASE     0x4003e000 /* VBAT register file */
-# define KINETIS_LPTMR_BASE     0x40040000 /* Low power timer */
-# define KINETIS_SYSR_BASE      0x40041000 /* System register file */
-# define KINETIS_DRYICE_BASE    0x40042000 /* DryIce */
-# define KINETIS_DRYICESS_BASE  0x40043000 /* DryIce secure storage */
-# define KINETIS_TSI0_BASE      0x40045000 /* Touch sense interface */
-# define KINETIS_SIMLP_BASE     0x40047000 /* SIM low-power logic */
-# define KINETIS_SIM_BASE       0x40048000 /* System integration module (SIM) */
-# define KINETIS_PORT_BASE(n)   (0x40049000 + ((n) << 12))
-# define KINETIS_PORTA_BASE     0x40049000 /* Port A multiplexing control */
-# define KINETIS_PORTB_BASE     0x4004a000 /* Port B multiplexing control */
-# define KINETIS_PORTC_BASE     0x4004b000 /* Port C multiplexing control */
-# define KINETIS_PORTD_BASE     0x4004c000 /* Port D multiplexing control */
-# define KINETIS_PORTE_BASE     0x4004d000 /* Port E multiplexing control */
-# define KINETIS_WDOG_BASE      0x40052000 /* Software watchdog */
-# define KINETIS_EWM_BASE       0x40061000 /* External watchdog */
-# define KINETIS_CMT_BASE       0x40062000 /* Carrier modulator timer (CMT) */
-# define KINETIS_MCG_BASE       0x40064000 /* Multi-purpose Clock Generator (MCG) */
-# define KINETIS_OSC_BASE       0x40065000 /* System oscillator (OSC) */
-# define KINETIS_I2C0_BASE      0x40066000 /* I2C 0 */
-# define KINETIS_I2C1_BASE      0x40067000 /* I2C 1 */
-# define KINETIS_UART0_BASE     0x4006a000 /* UART0 */
-# define KINETIS_UART1_BASE     0x4006b000 /* UART1 */
-# define KINETIS_UART2_BASE     0x4006c000 /* UART2 */
-# define KINETIS_UART3_BASE     0x4006d000 /* UART3 */
-# define KINETIS_USB0_BASE      0x40072000 /* USB OTG FS/LS */
-# define KINETIS_CMP_BASE       0x40073000 /* Analog comparator (CMP) / 6-bit digital-to-analog converter (DAC) */
-# define KINETIS_VREF_BASE      0x40074000 /* Voltage reference (VREF) */
-# define KINETIS_LLWU_BASE      0x4007c000 /* Low-leakage wakeup unit (LLWU) */
-# define KINETIS_PMC_BASE       0x4007d000 /* Power management controller (PMC) */
-# define KINETIS_SMC_BASE       0x4007e000 /* System Mode controller (SMC) */
-
-/* Peripheral Bridge 1 Memory Map ***************************************************/
-
-# define KINETIS_AIPS1_BASE     0x40080000 /* Peripheral bridge 1 (AIPS-Lite 1) */
-# define KINETIS_CAN1_BASE      0x400a4000 /* FlexCAN 1 */
-# define KINETIS_SPI2_BASE      0x400ac000 /* SPI 2 */
-# define KINETIS_SDHC_BASE      0x400b1000 /* SDHC */
-# define KINETIS_FTM2_BASE      0x400b8000 /* FlexTimer 2 */
-# define KINETIS_ADC1_BASE      0x400bb000 /* Analog-to-digital converter (ADC) 1 */
-# define KINETIS_SLCD_BASE      0x400be000 /* Segment LCD */
-# define KINETIS_DAC0_BASE      0x400cc000 /* 12-bit digital-to-analog converter (DAC) 0 */
-# define KINETIS_DAC1_BASE      0x400cd000 /* 12-bit digital-to-analog converter (DAC) 1 */
-# define KINETIS_UART4_BASE     0x400ea000 /* UART4 */
-# define KINETIS_UART5_BASE     0x400eb000 /* UART5 */
-# define KINETIS_XBARSS_BASE    0x400ff000 /* Not an AIPS-Lite slot. The 32-bit general
-                                            * purpose input/output module that shares the
-                                            * crossbar switch slave port with the AIPS-Lite
-                                            * is accessed at this address. */
-# define KINETIS_GPIO_BASE(n)   (0x400ff000 + ((n) << 6))
-# define KINETIS_GPIOA_BASE     0x400ff000 /* GPIO PORTA registers */
-# define KINETIS_GPIOB_BASE     0x400ff040 /* GPIO PORTB registers */
-# define KINETIS_GPIOC_BASE     0x400ff080 /* GPIO PORTC registers */
-# define KINETIS_GPIOD_BASE     0x400ff0c0 /* GPIO PORTD registers */
-# define KINETIS_GPIOE_BASE     0x400ff100 /* GPIO PORTE registers */
-
-/* Private Peripheral Bus (PPB) Memory Map ******************************************/
-
-# define KINETIS_ITM_BASE       0xe0000000 /* Instrumentation Trace Macrocell (ITM) */
-# define KINETIS_DWT_BASE       0xe0001000 /* Data Watchpoint and Trace (DWT) */
-# define KINETIS_FPB_BASE       0xe0002000 /* Flash Patch and Breakpoint (FPB) */
-# define KINETIS_SCS_BASE       0xe000e000 /* System Control Space (SCS) (for NVIC) */
-# define KINETIS_TPIU_BASE      0xe0040000 /* Trace Port Interface Unit (TPIU) */
-# define KINETIS_ETM_BASE       0xe0041000 /* Embedded Trace Macrocell (ETM) */
-# define KINETIS_ETB_BASE       0xe0042000 /* Embedded Trace Buffer (ETB) */
-# define KINETIS_TFUN_BASE      0xe0043000 /* Embedded Trace Funnel */
-# define KINETIS_MCM_BASE       0xe0080000 /* Miscellaneous Control Module (including ETB Almost Full) */
-# define KINETIS_ROMTAB_BASE    0xe00ff000 /* ROM Table - allows auto-detection of debug components */
-
-/* Memory Map ***********************************************************************/
-/* K60 Family
- *
- * The memory map for the following parts is defined in Freescale document
- * K60P144M100SF2RM
- */
-
-#elif defined(CONFIG_ARCH_CHIP_MK60N256VLQ100) || defined(CONFIG_ARCH_CHIP_MK60X256VLQ100) || \
-      defined(CONFIG_ARCH_CHIP_MK60N512VLQ100) || defined(CONFIG_ARCH_CHIP_MK60N256VMD100) || \
-      defined(CONFIG_ARCH_CHIP_MK60X256VMD100) || defined(CONFIG_ARCH_CHIP_MK60N512VMD100) || \
-      defined(CONFIG_ARCH_CHIP_MK60N512VLL100)
-
-# define KINETIS_FLASH_BASE     0x00000000 /* –0x0fffffff Program flash and read-
-                                            *             only data (Includes exception
-                                            *             vectors in first 1024 bytes) */
-# if !defined(KINETIS_FLEXMEM_SIZE)
-#  define KINETIS_FLEXNVM_BASE  0x10000000 /* –0x13ffffff FlexNVM */
-#  define KINETIS_FLEXRAM_BASE  0x14000000 /* –0x17ffffff FlexRAM */
-# endif
-# define KINETIS_SRAML_BASE     0x18000000 /* –0x1fffffff SRAM_L: Lower SRAM
-                                            *             (ICODE/DCODE) */
-# define KINETIS_SRAMU_BASE     0x20000000 /* –0x200fffff SRAM_U: Upper SRAM bitband
-                                            *             region */
-                             /* 0x20100000  * –0x21ffffff Reserved */
-# define KINETIS_SALIAS_BASE    0x22000000 /* –0x23ffffff Aliased to SRAM_U bitband */
-                             /* 0x24000000  * –0x3fffffff Reserved */
-# define KINETIS_BRIDGE0_BASE   0x40000000 /* –0x4007ffff Bitband region for peripheral
-                                            *             bridge 0 (AIPS-Lite0) */
-# define KINETIS_BRIDGE1_BASE   0x40080000 /* –0x400fffff Bitband region for peripheral
-                                            *             bridge 1 (AIPS-Lite1) */
-# define KINETIS_GPIOBB_BASE    0x400ff000 /* –0x400fffff Bitband region for general
-                                            *             purpose input/output (GPIO) */
-                             /* 0x40100000  * –0x41ffffff Reserved */
-# define KINETIS_PALIAS_BASE    0x42000000 /* –0x43ffffff Aliased to peripheral bridge
-                                            *             (AIPS-Lite) and general purpose
-                                            *             input/output (GPIO) bitband */
-                             /* 0x44000000  * –0x5fffffff Reserved */
-# define KINETIS_FLEXBUS_BASE   0x60000000 /* –0x7fffffff FlexBus */
-# define KINETIS_PERIPH_BASE    0xe0000000 /* –0xe00fffff Private peripherals */
-                             /* 0xe0100000  * –0xffffffff Reserved */
-
-/* Peripheral Bridge 0 Memory Map ***************************************************/
-
-# define KINETIS_AIPS0_BASE     0x40000000 /* Peripheral bridge 0 (AIPS-Lite 0) */
-# define KINETIS_XBAR_BASE      0x40004000 /* Crossbar switch */
-# define KINETIS_DMAC_BASE      0x40008000 /* DMA controller */
-# define KINETIS_DMADESC_BASE   0x40009000 /* DMA controller transfer control descriptors */
-# define KINETIS_FLEXBUSC_BASE  0x4000c000 /* FlexBus controller */
-# define KINETIS_MPU_BASE       0x4000d000 /* MPU */
-# define KINETIS_FMC_BASE       0x4001f000 /* Flash memory controller */
-# define KINETIS_FTFL_BASE      0x40020000 /* Flash memory */
-# define KINETIS_DMAMUX0_BASE   0x40021000 /* DMA channel mutiplexer 0 */
-# define KINETIS_CAN0_BASE      0x40024000 /* FlexCAN 0 */
-# define KINETIS_SPI0_BASE      0x4002c000 /* DSPI 0 */
-# define KINETIS_SPI1_BASE      0x4002d000 /* DSPI 1 */
-# define KINETIS_I2S0_BASE      0x4002f000 /* I2S 0 */
-# define KINETIS_CRC_BASE       0x40032000 /* CRC */
-# define KINETIS_USBDCD_BASE    0x40035000 /* USB DCD */
-# define KINETIS_PDB0_BASE      0x40036000 /* Programmable delay block */
-# define KINETIS_PIT_BASE       0x40037000 /* Periodic interrupt timers (PIT) */
-# define KINETIS_FTM0_BASE      0x40038000 /* FlexTimer (FTM) 0 */
-# define KINETIS_FTM1_BASE      0x40039000 /* FlexTimer (FTM) 1 */
-# define KINETIS_ADC0_BASE      0x4003b000 /* Analog-to-digital converter (ADC) 0 */
-# define KINETIS_RTC_BASE       0x4003d000 /* Real time clock */
-# define KINETIS_VBATR_BASE     0x4003e000 /* VBAT register file */
-# define KINETIS_LPTMR_BASE     0x40040000 /* Low power timer */
-# define KINETIS_SYSR_BASE      0x40041000 /* System register file */
-# define KINETIS_DRYICE_BASE    0x40042000 /* DryIce */
-# define KINETIS_DRYICESS_BASE  0x40043000 /* DryIce secure storage */
-# define KINETIS_TSI0_BASE      0x40045000 /* Touch sense interface */
-# define KINETIS_SIMLP_BASE     0x40047000 /* SIM low-power logic */
-# define KINETIS_SIM_BASE       0x40048000 /* System integration module (SIM) */
-# define KINETIS_PORT_BASE(n)   (0x40049000 + ((n) << 12))
-# define KINETIS_PORTA_BASE     0x40049000 /* Port A multiplexing control */
-# define KINETIS_PORTB_BASE     0x4004a000 /* Port B multiplexing control */
-# define KINETIS_PORTC_BASE     0x4004b000 /* Port C multiplexing control */
-# define KINETIS_PORTD_BASE     0x4004c000 /* Port D multiplexing control */
-# define KINETIS_PORTE_BASE     0x4004d000 /* Port E multiplexing control */
-# define KINETIS_WDOG_BASE      0x40052000 /* Software watchdog */
-# define KINETIS_EWM_BASE       0x40061000 /* External watchdog */
-# define KINETIS_CMT_BASE       0x40062000 /* Carrier modulator timer (CMT) */
-# define KINETIS_MCG_BASE       0x40064000 /* Multi-purpose Clock Generator (MCG) */
-# define KINETIS_OSC_BASE       0x40065000 /* System oscillator (XOSC) */
-# define KINETIS_I2C0_BASE      0x40066000 /* I2C 0 */
-# define KINETIS_I2C1_BASE      0x40067000 /* I2C 1 */
-# define KINETIS_UART0_BASE     0x4006a000 /* UART0 */
-# define KINETIS_UART1_BASE     0x4006b000 /* UART1 */
-# define KINETIS_UART2_BASE     0x4006c000 /* UART2 */
-# define KINETIS_UART3_BASE     0x4006d000 /* UART3 */
-# define KINETIS_USB0_BASE      0x40072000 /* USB OTG FS/LS */
-# define KINETIS_CMP_BASE       0x40073000 /* Analog comparator (CMP) / 6-bit digital-to-analog converter (DAC) */
-# define KINETIS_VREF_BASE      0x40074000 /* Voltage reference (VREF) */
-# define KINETIS_LLWU_BASE      0x4007c000 /* Low-leakage wakeup unit (LLWU) */
-# define KINETIS_PMC_BASE       0x4007d000 /* Power management controller (PMC) */
-# define KINETIS_SMC_BASE       0x4007e000 /* System Mode controller (SMC) */
-
-/* Peripheral Bridge 1 Memory Map ***************************************************/
-
-# define KINETIS_AIPS1_BASE     0x40080000 /* Peripheral bridge 1 (AIPS-Lite 1) */
-# define KINETIS_RNGB_BASE      0x400a0000 /* Random number generator (RNGB) */
-# define KINETIS_CAN1_BASE      0x400a4000 /* FlexCAN 1 */
-# define KINETIS_SPI2_BASE      0x400ac000 /* DSPI 2 */
-# define KINETIS_SDHC_BASE      0x400b1000 /* SDHC */
-# define KINETIS_FTM2_BASE      0x400b8000 /* FlexTimer 2 */
-# define KINETIS_ADC1_BASE      0x400bb000 /* Analog-to-digital converter (ADC) 1 */
-# define KINETIS_EMAC_BASE      0x400c0000 /* Ethernet MAC and IEEE 1588 timers */
-# define KINETIS_DAC0_BASE      0x400cc000 /* 12-bit digital-to-analog converter (DAC) 0 */
-# define KINETIS_DAC1_BASE      0x400cd000 /* 12-bit digital-to-analog converter (DAC) 1 */
-# define KINETIS_UART4_BASE     0x400ea000 /* UART4 */
-# define KINETIS_UART5_BASE     0x400eb000 /* UART5 */
-# define KINETIS_XBARSS_BASE    0x400ff000 /* Not an AIPS-Lite slot. The 32-bit general
-                                            * purpose input/output module that shares the
-                                            * crossbar switch slave port with the AIPS-Lite
-                                            * is accessed at this address. */
-# define KINETIS_GPIO_BASE(n)   (0x400ff000 + ((n) << 6))
-# define KINETIS_GPIOA_BASE     0x400ff000 /* GPIO PORTA registers */
-# define KINETIS_GPIOB_BASE     0x400ff040 /* GPIO PORTB registers */
-# define KINETIS_GPIOC_BASE     0x400ff080 /* GPIO PORTC registers */
-# define KINETIS_GPIOD_BASE     0x400ff0c0 /* GPIO PORTD registers */
-# define KINETIS_GPIOE_BASE     0x400ff100 /* GPIO PORTE registers */
-
-/* Private Peripheral Bus (PPB) Memory Map ******************************************/
-
-# define KINETIS_ITM_BASE       0xe0000000 /* Instrumentation Trace Macrocell (ITM) */
-# define KINETIS_DWT_BASE       0xe0001000 /* Data Watchpoint and Trace (DWT) */
-# define KINETIS_FPB_BASE       0xe0002000 /* Flash Patch and Breakpoint (FPB) */
-# define KINETIS_SCS_BASE       0xe000e000 /* System Control Space (SCS) (for NVIC) */
-# define KINETIS_TPIU_BASE      0xe0040000 /* Trace Port Interface Unit (TPIU) */
-# define KINETIS_ETM_BASE       0xe0041000 /* Embedded Trace Macrocell (ETM) */
-# define KINETIS_ETB_BASE       0xe0042000 /* Embedded Trace Buffer (ETB) */
-# define KINETIS_TFUN_BASE      0xe0043000 /* Embedded Trace Funnel */
-# define KINETIS_MCM_BASE       0xe0080000 /* Miscellaneous Control Module (including ETB Almost Full) */
-# define KINETIS_MMCAU_BASE     0xe0081000 /* Memory Mapped Cryptographic Acceleration Unit (MMCAU) */
-# define KINETIS_ROMTAB_BASE    0xe00ff000 /* ROM Table - allows auto-detection of debug components */
-
-#else
-  /* The memory map for other parts is defined in other documents and may or may not
-   * be the same as above (the family members are all very similar)  This error just
-   * means that you have to look at the document and determine for yourself if the
-   * memory map is the same.
-   */
-
-#  error "No memory map for this Kinetis part"
-#endif
-
-/************************************************************************************
- * Public Types
- ************************************************************************************/
-
-/************************************************************************************
- * Public Data
- ************************************************************************************/
-
-/************************************************************************************
- * Public Functions
- ************************************************************************************/
-
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_MEMORYMAP_H */
diff --git a/arch/arm/src/kinetis/kinetis_pin.c b/arch/arm/src/kinetis/kinetis_pin.c
index 680d2079cf..3f8b1a74fc 100644
--- a/arch/arm/src/kinetis/kinetis_pin.c
+++ b/arch/arm/src/kinetis/kinetis_pin.c
@@ -48,7 +48,6 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "kinetis_memorymap.h"
 #include "kinetis.h"
 #include "kinetis_port.h"
 #include "chip/kinetis_gpio.h"
diff --git a/arch/arm/src/kinetis/kinetis_pingpio.c b/arch/arm/src/kinetis/kinetis_pingpio.c
index e92336e64c..b887920816 100644
--- a/arch/arm/src/kinetis/kinetis_pingpio.c
+++ b/arch/arm/src/kinetis/kinetis_pingpio.c
@@ -48,7 +48,6 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "kinetis_memorymap.h"
 #include "kinetis.h"
 #include "chip/kinetis_gpio.h"
 
diff --git a/arch/arm/src/kinetis/kinetis_uart.h b/arch/arm/src/kinetis/kinetis_uart.h
index fbdf7a3192..27dd40467c 100644
--- a/arch/arm/src/kinetis/kinetis_uart.h
+++ b/arch/arm/src/kinetis/kinetis_uart.h
@@ -42,7 +42,7 @@
 
 #include 
 
-#include "kinetis_memorymap.h"
+#include "chip/kinetis_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
-- 
GitLab


From c8793637eea690a5bb0a9bb694e43280b954feea Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Fri, 1 Jul 2016 13:24:31 -0600
Subject: [PATCH 125/229] Add some conditional compilation to handle improper
 inclusion of header file

---
 arch/arm/src/kinetis/chip/kinetis_k64memorymap.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/arm/src/kinetis/chip/kinetis_k64memorymap.h b/arch/arm/src/kinetis/chip/kinetis_k64memorymap.h
index e0e4a911ed..235343de89 100644
--- a/arch/arm/src/kinetis/chip/kinetis_k64memorymap.h
+++ b/arch/arm/src/kinetis/chip/kinetis_k64memorymap.h
@@ -44,12 +44,14 @@
 
 #include "chip.h"
 
+#ifdef KINETIS_K64
+
 /************************************************************************************
  * Pre-processor Definitions
  ************************************************************************************/
 
 /* Memory Map ***********************************************************************/
-/* K64 Family ***********************************************************************
+/* K64 Family
  *
  * The memory map for the following parts is defined in NXP document
  * K64P144M120SF5RM.pdf
@@ -207,4 +209,5 @@
  * Public Functions
  ************************************************************************************/
 
+#endif /* KINETIS_K64 */
 #endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K64MEMORYMAP_H */
-- 
GitLab


From bccd2ec219e61b5dd29f29ae011649dff44ef18c Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Fri, 1 Jul 2016 14:07:14 -0600
Subject: [PATCH 126/229] arch/arm/kinetis:  Still moving register header files
 to kinetis/chip directory; still incorporating K64 differences.

---
 arch/arm/src/kinetis/chip/kinetis_k64pinmux.h | 474 ++++++++++++++++++
 arch/arm/src/kinetis/{ => chip}/kinetis_osc.h |  10 +-
 arch/arm/src/kinetis/{ => chip}/kinetis_pdb.h |  18 +-
 arch/arm/src/kinetis/{ => chip}/kinetis_pit.h |  10 +-
 arch/arm/src/kinetis/{ => chip}/kinetis_pmc.h |  10 +-
 .../arm/src/kinetis/{ => chip}/kinetis_port.h |  10 +-
 .../arm/src/kinetis/{ => chip}/kinetis_rngb.h |  10 +-
 arch/arm/src/kinetis/{ => chip}/kinetis_rtc.h |  20 +-
 .../arm/src/kinetis/{ => chip}/kinetis_sdhc.h |  10 +-
 arch/arm/src/kinetis/{ => chip}/kinetis_sim.h |  50 +-
 arch/arm/src/kinetis/kinetis.h                |   2 +-
 arch/arm/src/kinetis/kinetis_clockconfig.c    |   2 +-
 arch/arm/src/kinetis/kinetis_enet.c           |   2 +-
 arch/arm/src/kinetis/kinetis_lowputc.c        |   2 +-
 arch/arm/src/kinetis/kinetis_mpuinit.h        |  12 -
 arch/arm/src/kinetis/kinetis_pin.c            |   2 +-
 arch/arm/src/kinetis/kinetis_pindump.c        |   2 +-
 arch/arm/src/kinetis/kinetis_pinirq.c         |   2 +-
 arch/arm/src/kinetis/kinetis_pwm.c            |   2 +-
 arch/arm/src/kinetis/kinetis_sdhc.c           |   4 +-
 arch/arm/src/kinetis/kinetis_usbdev.c         |   2 +-
 21 files changed, 563 insertions(+), 93 deletions(-)
 create mode 100644 arch/arm/src/kinetis/chip/kinetis_k64pinmux.h
 rename arch/arm/src/kinetis/{ => chip}/kinetis_osc.h (93%)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_pdb.h (95%)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_pit.h (96%)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_pmc.h (95%)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_port.h (99%)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_rngb.h (97%)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_rtc.h (95%)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_sdhc.h (99%)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_sim.h (96%)

diff --git a/arch/arm/src/kinetis/chip/kinetis_k64pinmux.h b/arch/arm/src/kinetis/chip/kinetis_k64pinmux.h
new file mode 100644
index 0000000000..48a0f9a0f6
--- /dev/null
+++ b/arch/arm/src/kinetis/chip/kinetis_k64pinmux.h
@@ -0,0 +1,474 @@
+/********************************************************************************************
+ * arch/arm/src/kinetis/chip/kinetis_k64pinmux.h
+ *
+ *   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.
+ *
+ ********************************************************************************************/
+
+#ifndef __ARCH_ARM_SRC_KINETIS_CHP_KINETIS_K64PINMUX_H
+#define __ARCH_ARM_SRC_KINETIS_CHP_KINETIS_K64PINMUX_H
+
+/********************************************************************************************
+ * Included Files
+ ********************************************************************************************/
+
+#include 
+
+#include "chip.h"
+
+#ifdef KINETIS_K64
+
+/********************************************************************************************
+ * Pre-processor Definitions
+ ********************************************************************************************/
+/* Reference: Paragraph 10.3.1, p 258, of FreeScale document K60P144M100SF2RM
+ *
+ * In most cases, there are alternative configurations for various pins. Those alternative
+ * pins are labeled with a suffix like _1, _2, etc. in order to distinguish them.  Logic in
+ * the board.h file must select the correct pin configuration for the board by defining a pin
+ * configuration (with no suffix) that maps to the correct alternative.
+ */
+
+#define PIN_TSI0_CH1             (PIN_ANALOG | PIN_PORTA | PIN0)
+#define PIN_UART0_CTS_1          (PIN_ALT2   | PIN_PORTA | PIN0)
+#define PIN_FTM0_CH5_1           (PIN_ALT3   | PIN_PORTA | PIN0)
+#define PIN_JTAG_TCLK            (PIN_ALT7   | PIN_PORTA | PIN0)
+#define PIN_SWD_CLK              (PIN_ALT7   | PIN_PORTA | PIN0)
+#define PIN_TSI0_CH2             (PIN_ANALOG | PIN_PORTA | PIN1)
+#define PIN_UART0_RX_1           (PIN_ALT2   | PIN_PORTA | PIN1)
+#define PIN_FTM0_CH6_1           (PIN_ALT3   | PIN_PORTA | PIN1)
+#define PIN_JTAG_TDI             (PIN_ALT7   | PIN_PORTA | PIN1)
+#define PIN_TSI0_CH3             (PIN_ANALOG | PIN_PORTA | PIN2)
+#define PIN_UART0_TX_1           (PIN_ALT2   | PIN_PORTA | PIN2)
+#define PIN_FTM0_CH7_1           (PIN_ALT3   | PIN_PORTA | PIN2)
+#define PIN_JTAG_TDO             (PIN_ALT7   | PIN_PORTA | PIN2)
+#define PIN_TRACE_SWO            (PIN_ALT7   | PIN_PORTA | PIN2)
+#define PIN_TSI0_CH4             (PIN_ANALOG | PIN_PORTA | PIN3)
+#define PIN_UART0_RTS_1          (PIN_ALT2   | PIN_PORTA | PIN3)
+#define PIN_FTM0_CH0_1           (PIN_ALT3   | PIN_PORTA | PIN3)
+#define PIN_JTAG_TMS             (PIN_ALT7   | PIN_PORTA | PIN3)
+#define PIN_SWD_DIO              (PIN_ALT7   | PIN_PORTA | PIN3)
+#define PIN_TSI0_CH5             (PIN_ANALOG | PIN_PORTA | PIN4)
+#define PIN_FTM0_CH1_1           (PIN_ALT3   | PIN_PORTA | PIN4)
+#define PIN_NMI                  (PIN_ALT7   | PIN_PORTA | PIN4)
+#define PIN_FTM0_CH2_1           (PIN_ALT3   | PIN_PORTA | PIN5)
+#if 0
+#  define PIN_RMII0_RXER         (PIN_ALT4   | PIN_PORTA | PIN5)
+#  define PIN_MII0_RXER          (PIN_ALT4   | PIN_PORTA | PIN5)
+#else
+#  define PIN_RMII0_RXER         (GPIO_PULLDOWN | PIN_PORTA | PIN5)
+# define PIN_MII0_RXER           (GPIO_PULLDOWN | PIN_PORTA | PIN5)
+#endif
+#define PIN_CMP2_OUT_1           (PIN_ALT5   | PIN_PORTA | PIN5)
+#define PIN_I2S0_RX_BCLK_1       (PIN_ALT6   | PIN_PORTA | PIN5)
+#define PIN_JTAG_TRST            (PIN_ALT7   | PIN_PORTA | PIN5)
+#define PIN_FTM0_CH3_1           (PIN_ALT3   | PIN_PORTA | PIN6)
+#define PIN_TRACE_CLKOUT         (PIN_ALT7   | PIN_PORTA | PIN6)
+#define PIN_ADC0_SE10            (PIN_ANALOG | PIN_PORTA | PIN7)
+#define PIN_FTM0_CH4_1           (PIN_ALT3   | PIN_PORTA | PIN7)
+#define PIN_TRACE_D3             (PIN_ALT7   | PIN_PORTA | PIN7)
+#define PIN_ADC0_SE11            (PIN_ANALOG | PIN_PORTA | PIN8)
+#define PIN_FTM1_CH0_1           (PIN_ALT3   | PIN_PORTA | PIN8)
+#define PIN_FTM1_QD_PHA_1        (PIN_ALT6   | PIN_PORTA | PIN8)
+#define PIN_TRACE_D2             (PIN_ALT7   | PIN_PORTA | PIN8)
+#define PIN_FTM1_CH1_1           (PIN_ALT3   | PIN_PORTA | PIN9)
+#define PIN_MII0_RXD3            (PIN_ALT4   | PIN_PORTA | PIN9)
+#define PIN_FTM1_QD_PHB_1        (PIN_ALT6   | PIN_PORTA | PIN9)
+#define PIN_TRACE_D1             (PIN_ALT7   | PIN_PORTA | PIN9)
+#define PIN_FTM2_CH0_1           (PIN_ALT3   | PIN_PORTA | PIN10)
+#define PIN_MII0_RXD2            (PIN_ALT4   | PIN_PORTA | PIN10)
+#define PIN_FTM2_QD_PHA_1        (PIN_ALT6   | PIN_PORTA | PIN10)
+#define PIN_TRACE_D0             (PIN_ALT7   | PIN_PORTA | PIN10)
+#define PIN_FTM2_CH1_1           (PIN_ALT3   | PIN_PORTA | PIN11)
+#define PIN_MII0_RXCLK           (PIN_ALT4   | PIN_PORTA | PIN11)
+#define PIN_FTM2_QD_PHB_1        (PIN_ALT6   | PIN_PORTA | PIN11)
+#define PIN_CMP2_IN0             (PIN_ANALOG | PIN_PORTA | PIN12)
+#define PIN_CAN0_TX_1            (PIN_ALT2   | PIN_PORTA | PIN12)
+#define PIN_FTM1_CH0_2           (PIN_ALT3   | PIN_PORTA | PIN12)
+#define PIN_RMII0_RXD1           (PIN_ALT4   | PIN_PORTA | PIN12)
+#define PIN_MII0_RXD1            (PIN_ALT4   | PIN_PORTA | PIN12)
+#define PIN_I2S0_TXD_1           (PIN_ALT6   | PIN_PORTA | PIN12)
+#define PIN_FTM1_QD_PHA_2        (PIN_ALT7   | PIN_PORTA | PIN12)
+#define PIN_CMP2_IN1             (PIN_ANALOG | PIN_PORTA | PIN13)
+#define PIN_CAN0_RX_1            (PIN_ALT2   | PIN_PORTA | PIN13)
+#define PIN_FTM1_CH1_2           (PIN_ALT3   | PIN_PORTA | PIN13)
+#define PIN_RMII0_RXD0           (PIN_ALT4   | PIN_PORTA | PIN13)
+#define PIN_MII0_RXD0            (PIN_ALT4   | PIN_PORTA | PIN13)
+#define PIN_I2S0_TX_FS_1         (PIN_ALT6   | PIN_PORTA | PIN13)
+#define PIN_FTM1_QD_PHB_2        (PIN_ALT7   | PIN_PORTA | PIN13)
+#define PIN_SPI0_PCS0_1          (PIN_ALT2   | PIN_PORTA | PIN14)
+#define PIN_UART0_TX_2           (PIN_ALT3   | PIN_PORTA | PIN14)
+#define PIN_RMII0_CRS_DV         (PIN_ALT4   | PIN_PORTA | PIN14)
+#define PIN_MII0_RXDV            (PIN_ALT4   | PIN_PORTA | PIN14)
+#define PIN_I2S0_TX_BCLK_1       (PIN_ALT6   | PIN_PORTA | PIN14)
+#define PIN_SPI0_SCK_1           (PIN_ALT2   | PIN_PORTA | PIN15)
+#define PIN_UART0_RX_2           (PIN_ALT3   | PIN_PORTA | PIN15)
+#define PIN_RMII0_TXEN           (PIN_ALT4   | PIN_PORTA | PIN15)
+#define PIN_MII0_TXEN            (PIN_ALT4   | PIN_PORTA | PIN15)
+#define PIN_I2S0_RXD_1           (PIN_ALT6   | PIN_PORTA | PIN15)
+#define PIN_SPI0_SOUT_1          (PIN_ALT2   | PIN_PORTA | PIN16)
+#define PIN_UART0_CTS_2          (PIN_ALT3   | PIN_PORTA | PIN16)
+#define PIN_RMII0_TXD0           (PIN_ALT4   | PIN_PORTA | PIN16)
+#define PIN_MII0_TXD0            (PIN_ALT4   | PIN_PORTA | PIN16)
+#define PIN_I2S0_RX_FS_1         (PIN_ALT6   | PIN_PORTA | PIN16)
+#define PIN_ADC1_SE17            (PIN_ANALOG | PIN_PORTA | PIN17)
+#define PIN_SPI0_SIN_1           (PIN_ALT2   | PIN_PORTA | PIN17)
+#define PIN_UART0_RTS_2          (PIN_ALT3   | PIN_PORTA | PIN17)
+#define PIN_RMII0_TXD1           (PIN_ALT4   | PIN_PORTA | PIN17)
+#define PIN_MII0_TXD1            (PIN_ALT4   | PIN_PORTA | PIN17)
+#define PIN_I2S0_MCLK_1          (PIN_ALT6   | PIN_PORTA | PIN17)
+#define PIN_I2S0_CLKIN_1         (PIN_ALT7   | PIN_PORTA | PIN17)
+#define PIN_EXTAL                (PIN_ANALOG | PIN_PORTA | PIN18)
+#define PIN_FTM0_FLT2_1          (PIN_ALT3   | PIN_PORTA | PIN18)
+#define PIN_FTM_CLKIN0           (PIN_ALT4   | PIN_PORTA | PIN18)
+#define PIN_XTAL                 (PIN_ANALOG | PIN_PORTA | PIN19)
+#define PIN_FTM1_FLT0_1          (PIN_ALT3   | PIN_PORTA | PIN19)
+#define PIN_FTM_CLKIN1           (PIN_ALT4   | PIN_PORTA | PIN19)
+#define PIN_LPT0_ALT1            (PIN_ALT6   | PIN_PORTA | PIN19)
+#define PIN_MII0_TXD2            (PIN_ALT4   | PIN_PORTA | PIN24)
+#define PIN_FB_A29               (PIN_ALT6   | PIN_PORTA | PIN24)
+#define PIN_MII0_TXCLK           (PIN_ALT4   | PIN_PORTA | PIN25)
+#define PIN_FB_A28               (PIN_ALT6   | PIN_PORTA | PIN25)
+#define PIN_MII0_TXD3            (PIN_ALT4   | PIN_PORTA | PIN26)
+#define PIN_FB_A27               (PIN_ALT6   | PIN_PORTA | PIN26)
+#define PIN_MII0_CRS             (PIN_ALT4   | PIN_PORTA | PIN27)
+#define PIN_FB_A26               (PIN_ALT6   | PIN_PORTA | PIN27)
+#define PIN_MII0_TXER            (PIN_ALT4   | PIN_PORTA | PIN28)
+#define PIN_FB_A25               (PIN_ALT6   | PIN_PORTA | PIN28)
+#define PIN_MII0_COL             (PIN_ALT4   | PIN_PORTA | PIN29)
+#define PIN_FB_A24               (PIN_ALT6   | PIN_PORTA | PIN29)
+
+#define PIN_ADC0_SE8             (PIN_ANALOG | PIN_PORTB | PIN0)
+#define PIN_ADC1_SE8             (PIN_ANALOG | PIN_PORTB | PIN0)
+#define PIN_TSI0_CH0             (PIN_ANALOG | PIN_PORTB | PIN0)
+#define PIN_I2C0_SCL_1           (PIN_ALT2   | PIN_PORTB | PIN0)
+#define PIN_FTM1_CH0_3           (PIN_ALT3   | PIN_PORTB | PIN0)
+#define PIN_RMII0_MDIO           (PIN_ALT4   | PIN_PORTB | PIN0)
+#define PIN_MII0_MDIO            (PIN_ALT4   | PIN_PORTB | PIN0)
+#define PIN_FTM1_QD_PHA_3        (PIN_ALT6   | PIN_PORTB | PIN0)
+#define PIN_ADC0_SE9             (PIN_ANALOG | PIN_PORTB | PIN1)
+#define PIN_ADC1_SE9             (PIN_ANALOG | PIN_PORTB | PIN1)
+#define PIN_TSI0_CH6             (PIN_ANALOG | PIN_PORTB | PIN1)
+#define PIN_I2C0_SDA_1           (PIN_ALT2   | PIN_PORTB | PIN1)
+#define PIN_FTM1_CH1_3           (PIN_ALT3   | PIN_PORTB | PIN1)
+#define PIN_RMII0_MDC            (PIN_ALT4   | PIN_PORTB | PIN1)
+#define PIN_MII0_MDC             (PIN_ALT4   | PIN_PORTB | PIN1)
+#define PIN_FTM1_QD_PHB_3        (PIN_ALT6   | PIN_PORTB | PIN1)
+#define PIN_ADC0_SE12            (PIN_ANALOG | PIN_PORTB | PIN2)
+#define PIN_TSI0_CH7             (PIN_ANALOG | PIN_PORTB | PIN2)
+#define PIN_I2C0_SCL_2           (PIN_ALT2   | PIN_PORTB | PIN2)
+#define PIN_UART0_RTS_3          (PIN_ALT3   | PIN_PORTB | PIN2)
+#define PIN_ENET0_1588_TMR0_1    (PIN_ALT4   | PIN_PORTB | PIN2)
+#define PIN_FTM0_FLT3            (PIN_ALT6   | PIN_PORTB | PIN2)
+#define PIN_ADC0_SE13            (PIN_ANALOG | PIN_PORTB | PIN3)
+#define PIN_TSI0_CH8             (PIN_ANALOG | PIN_PORTB | PIN3)
+#define PIN_I2C0_SDA_2           (PIN_ALT2   | PIN_PORTB | PIN3)
+#define PIN_UART0_CTS_3          (PIN_ALT3   | PIN_PORTB | PIN3)
+#define PIN_ENET0_1588_TMR1_1    (PIN_ALT4   | PIN_PORTB | PIN3)
+#define PIN_FTM0_FLT0_2          (PIN_ALT6   | PIN_PORTB | PIN3)
+#define PIN_ADC1_SE10            (PIN_ANALOG | PIN_PORTB | PIN4)
+#define PIN_ENET0_1588_TMR2_1    (PIN_ALT4   | PIN_PORTB | PIN4)
+#define PIN_FTM1_FLT0_2          (PIN_ALT6   | PIN_PORTB | PIN4)
+#define PIN_ADC1_SE11            (PIN_ANALOG | PIN_PORTB | PIN5)
+#define PIN_ENET0_1588_TMR3_1    (PIN_ALT4   | PIN_PORTB | PIN5)
+#define PIN_FTM2_FLT0_1          (PIN_ALT6   | PIN_PORTB | PIN5)
+#define PIN_ADC1_SE12            (PIN_ANALOG | PIN_PORTB | PIN6)
+#define PIN_FB_AD23              (PIN_ALT5   | PIN_PORTB | PIN6)
+#define PIN_ADC1_SE13            (PIN_ANALOG | PIN_PORTB | PIN7)
+#define PIN_FB_AD22              (PIN_ALT5   | PIN_PORTB | PIN7)
+#define PIN_UART3_RTS_1          (PIN_ALT3   | PIN_PORTB | PIN8)
+#define PIN_FB_AD21              (PIN_ALT5   | PIN_PORTB | PIN8)
+#define PIN_SPI1_PCS1_1          (PIN_ALT2   | PIN_PORTB | PIN9)
+#define PIN_UART3_CTS_1          (PIN_ALT3   | PIN_PORTB | PIN9)
+#define PIN_FB_AD20              (PIN_ALT5   | PIN_PORTB | PIN9)
+#define PIN_ADC1_SE14            (PIN_ANALOG | PIN_PORTB | PIN10)
+#define PIN_SPI1_PCS0_1          (PIN_ALT2   | PIN_PORTB | PIN10)
+#define PIN_UART3_RX_1           (PIN_ALT3   | PIN_PORTB | PIN10)
+#define PIN_FB_AD19              (PIN_ALT5   | PIN_PORTB | PIN10)
+#define PIN_FTM0_FLT1_1          (PIN_ALT6   | PIN_PORTB | PIN10)
+#define PIN_ADC1_SE15            (PIN_ANALOG | PIN_PORTB | PIN11)
+#define PIN_SPI1_SCK_1           (PIN_ALT2   | PIN_PORTB | PIN11)
+#define PIN_UART3_TX_1           (PIN_ALT3   | PIN_PORTB | PIN11)
+#define PIN_FB_AD18              (PIN_ALT5   | PIN_PORTB | PIN11)
+#define PIN_FTM0_FLT2_2          (PIN_ALT6   | PIN_PORTB | PIN11)
+#define PIN_TSI0_CH9             (PIN_ANALOG | PIN_PORTB | PIN16)
+#define PIN_SPI1_SOUT_1          (PIN_ALT2   | PIN_PORTB | PIN16)
+#define PIN_UART0_RX_3           (PIN_ALT3   | PIN_PORTB | PIN16)
+#define PIN_FB_AD17              (PIN_ALT5   | PIN_PORTB | PIN16)
+#define PIN_EWM_IN_1             (PIN_ALT6   | PIN_PORTB | PIN16)
+#define PIN_TSI0_CH10            (PIN_ANALOG | PIN_PORTB | PIN17)
+#define PIN_SPI1_SIN_1           (PIN_ALT2   | PIN_PORTB | PIN17)
+#define PIN_UART0_TX_3           (PIN_ALT3   | PIN_PORTB | PIN17)
+#define PIN_FB_AD16              (PIN_ALT5   | PIN_PORTB | PIN17)
+#define PIN_EWM_OUT_1            (PIN_ALT6   | PIN_PORTB | PIN17)
+#define PIN_TSI0_CH11            (PIN_ANALOG | PIN_PORTB | PIN18)
+#define PIN_CAN0_TX_2            (PIN_ALT2   | PIN_PORTB | PIN18)
+#define PIN_FTM2_CH0_2           (PIN_ALT3   | PIN_PORTB | PIN18)
+#define PIN_I2S0_TX_BCLK_2       (PIN_ALT4   | PIN_PORTB | PIN18)
+#define PIN_FB_AD15              (PIN_ALT5   | PIN_PORTB | PIN18)
+#define PIN_FTM2_QD_PHA_2        (PIN_ALT6   | PIN_PORTB | PIN18)
+#define PIN_TSI0_CH12            (PIN_ANALOG | PIN_PORTB | PIN19)
+#define PIN_CAN0_RX_2            (PIN_ALT2   | PIN_PORTB | PIN19)
+#define PIN_FTM2_CH1_2           (PIN_ALT3   | PIN_PORTB | PIN19)
+#define PIN_I2S0_TX_FS_2         (PIN_ALT4   | PIN_PORTB | PIN19)
+#define PIN_FB_OE                (PIN_ALT5   | PIN_PORTB | PIN19)
+#define PIN_FTM2_QD_PHB_2        (PIN_ALT6   | PIN_PORTB | PIN19)
+#define PIN_SPI2_PCS0_1          (PIN_ALT2   | PIN_PORTB | PIN20)
+#define PIN_FB_AD31              (PIN_ALT5   | PIN_PORTB | PIN20)
+#define PIN_CMP0_OUT_1           (PIN_ALT6   | PIN_PORTB | PIN20)
+#define PIN_SPI2_SCK_1           (PIN_ALT2   | PIN_PORTB | PIN21)
+#define PIN_FB_AD30              (PIN_ALT5   | PIN_PORTB | PIN21)
+#define PIN_CMP1_OUT_1           (PIN_ALT6   | PIN_PORTB | PIN21)
+#define PIN_SPI2_SOUT_1          (PIN_ALT2   | PIN_PORTB | PIN22)
+#define PIN_FB_AD29              (PIN_ALT5   | PIN_PORTB | PIN22)
+#define PIN_CMP2_OUT_2           (PIN_ALT6   | PIN_PORTB | PIN22)
+#define PIN_SPI2_SIN_1           (PIN_ALT2   | PIN_PORTB | PIN23)
+#define PIN_SPI0_PCS5            (PIN_ALT3   | PIN_PORTB | PIN23)
+#define PIN_FB_AD28              (PIN_ALT5   | PIN_PORTB | PIN23)
+
+#define PIN_ADC0_SE14            (PIN_ANALOG | PIN_PORTC | PIN0)
+#define PIN_TSI0_CH13            (PIN_ANALOG | PIN_PORTC | PIN0)
+#define PIN_SPI0_PCS4            (PIN_ALT2   | PIN_PORTC | PIN0)
+#define PIN_PDB0_EXTRG_1         (PIN_ALT3   | PIN_PORTC | PIN0)
+#define PIN_I2S0_TXD_2           (PIN_ALT4   | PIN_PORTC | PIN0)
+#define PIN_FB_AD14              (PIN_ALT5   | PIN_PORTC | PIN0)
+#define PIN_ADC0_SE15            (PIN_ANALOG | PIN_PORTC | PIN1)
+#define PIN_TSI0_CH14            (PIN_ANALOG | PIN_PORTC | PIN1)
+#define PIN_SPI0_PCS3_1          (PIN_ALT2   | PIN_PORTC | PIN1)
+#define PIN_UART1_RTS_1          (PIN_ALT3   | PIN_PORTC | PIN1)
+#define PIN_FTM0_CH0_2           (PIN_ALT4   | PIN_PORTC | PIN1)
+#define PIN_FB_AD13              (PIN_ALT5   | PIN_PORTC | PIN1)
+#define PIN_ADC0_SE4B            (PIN_ANALOG | PIN_PORTC | PIN2)
+#define PIN_CMP1_IN0             (PIN_ANALOG | PIN_PORTC | PIN2)
+#define PIN_TSI0_CH15            (PIN_ANALOG | PIN_PORTC | PIN2)
+#define PIN_SPI0_PCS2_2          (PIN_ALT2   | PIN_PORTC | PIN2)
+#define PIN_UART1_CTS_1          (PIN_ALT3   | PIN_PORTC | PIN2)
+#define PIN_FTM0_CH1_2           (PIN_ALT4   | PIN_PORTC | PIN2)
+#define PIN_FB_AD12              (PIN_ALT5   | PIN_PORTC | PIN2)
+#define PIN_CMP1_IN1             (PIN_ANALOG | PIN_PORTC | PIN3)
+#define PIN_SPI0_PCS1_1          (PIN_ALT2   | PIN_PORTC | PIN3)
+#define PIN_UART1_RX_1           (PIN_ALT3   | PIN_PORTC | PIN3)
+#define PIN_FTM0_CH2_2           (PIN_ALT4   | PIN_PORTC | PIN3)
+#define PIN_FB_CLKOUT            (PIN_ALT5   | PIN_PORTC | PIN3)
+#define PIN_SPI0_PCS0_2          (PIN_ALT2   | PIN_PORTC | PIN4)
+#define PIN_UART1_TX_1           (PIN_ALT3   | PIN_PORTC | PIN4)
+#define PIN_FTM0_CH3_2           (PIN_ALT4   | PIN_PORTC | PIN4)
+#define PIN_FB_AD11              (PIN_ALT5   | PIN_PORTC | PIN4)
+#define PIN_CMP1_OUT_2           (PIN_ALT6   | PIN_PORTC | PIN4)
+#define PIN_SPI0_SCK_2           (PIN_ALT2   | PIN_PORTC | PIN5)
+#define PIN_LPT0_ALT2            (PIN_ALT4   | PIN_PORTC | PIN5)
+#define PIN_FB_AD10              (PIN_ALT5   | PIN_PORTC | PIN5)
+#define PIN_CMP0_OUT_2           (PIN_ALT6   | PIN_PORTC | PIN5)
+#define PIN_CMP0_IN0             (PIN_ANALOG | PIN_PORTC | PIN6)
+#define PIN_SPI0_SOUT_2          (PIN_ALT2   | PIN_PORTC | PIN6)
+#define PIN_PDB0_EXTRG_2         (PIN_ALT3   | PIN_PORTC | PIN6)
+#define PIN_FB_AD9               (PIN_ALT5   | PIN_PORTC | PIN6)
+#define PIN_CMP0_IN1             (PIN_ANALOG | PIN_PORTC | PIN7)
+#define PIN_SPI0_SIN_2           (PIN_ALT2   | PIN_PORTC | PIN7)
+#define PIN_FB_AD8               (PIN_ALT5   | PIN_PORTC | PIN7)
+#define PIN_ADC1_SE4B            (PIN_ANALOG | PIN_PORTC | PIN8)
+#define PIN_CMP0_IN2             (PIN_ANALOG | PIN_PORTC | PIN8)
+#define PIN_I2S0_MCLK_2          (PIN_ALT3   | PIN_PORTC | PIN8)
+#define PIN_I2S0_CLKIN_2         (PIN_ALT4   | PIN_PORTC | PIN8)
+#define PIN_FB_AD7               (PIN_ALT5   | PIN_PORTC | PIN8)
+#define PIN_ADC1_SE5B            (PIN_ANALOG | PIN_PORTC | PIN9)
+#define PIN_CMP0_IN3             (PIN_ANALOG | PIN_PORTC | PIN9)
+#define PIN_I2S0_RX_BCLK_2       (PIN_ALT4   | PIN_PORTC | PIN9)
+#define PIN_FB_AD6               (PIN_ALT5   | PIN_PORTC | PIN9)
+#define PIN_FTM2_FLT0_2          (PIN_ALT6   | PIN_PORTC | PIN9)
+#define PIN_ADC1_SE6B            (PIN_ANALOG | PIN_PORTC | PIN10)
+#define PIN_CMP0_IN4             (PIN_ANALOG | PIN_PORTC | PIN10)
+#define PIN_I2C1_SCL_1           (PIN_ALT2   | PIN_PORTC | PIN10)
+#define PIN_I2S0_RX_FS_2         (PIN_ALT4   | PIN_PORTC | PIN10)
+#define PIN_FB_AD5               (PIN_ALT5   | PIN_PORTC | PIN10)
+#define PIN_ADC1_SE7B            (PIN_ANALOG | PIN_PORTC | PIN11)
+#define PIN_I2C1_SDA_1           (PIN_ALT2   | PIN_PORTC | PIN11)
+#define PIN_I2S0_RXD_2           (PIN_ALT4   | PIN_PORTC | PIN11)
+#define PIN_FB_RW                (PIN_ALT5   | PIN_PORTC | PIN11)
+#define PIN_UART4_RTS_1          (PIN_ALT3   | PIN_PORTC | PIN12)
+#define PIN_FB_AD27              (PIN_ALT5   | PIN_PORTC | PIN12)
+#define PIN_UART4_CTS_1          (PIN_ALT3   | PIN_PORTC | PIN13)
+#define PIN_FB_AD26              (PIN_ALT5   | PIN_PORTC | PIN13)
+#define PIN_UART4_RX_1           (PIN_ALT3   | PIN_PORTC | PIN14)
+#define PIN_FB_AD25              (PIN_ALT5   | PIN_PORTC | PIN14)
+#define PIN_UART4_TX_1           (PIN_ALT3   | PIN_PORTC | PIN15)
+#define PIN_FB_AD24              (PIN_ALT5   | PIN_PORTC | PIN15)
+#define PIN_CAN1_RX_1            (PIN_ALT2   | PIN_PORTC | PIN16)
+#define PIN_UART3_RX_2           (PIN_ALT3   | PIN_PORTC | PIN16)
+#define PIN_ENET0_1588_TMR0_2    (PIN_ALT4   | PIN_PORTC | PIN16)
+#define PIN_FB_CS5               (PIN_ALT5   | PIN_PORTC | PIN16)
+#define PIN_FB_TSIZ1             (PIN_ALT5   | PIN_PORTC | PIN16)
+#define PIN_FB_BE23_16_BLS15_8   (PIN_ALT5   | PIN_PORTC | PIN16)
+#define PIN_CAN1_TX_1            (PIN_ALT2   | PIN_PORTC | PIN17)
+#define PIN_UART3_TX_2           (PIN_ALT3   | PIN_PORTC | PIN17)
+#define PIN_ENET0_1588_TMR1_2    (PIN_ALT4   | PIN_PORTC | PIN17)
+#define PIN_FB_CS4               (PIN_ALT5   | PIN_PORTC | PIN17)
+#define PIN_FB_TSIZ0             (PIN_ALT5   | PIN_PORTC | PIN17)
+#define PIN_FB_BE31_24_BLS7_0    (PIN_ALT5   | PIN_PORTC | PIN17)
+#define PIN_UART3_RTS_2          (PIN_ALT3   | PIN_PORTC | PIN18)
+#define PIN_ENET0_1588_TMR2_2    (PIN_ALT4   | PIN_PORTC | PIN18)
+#define PIN_FB_TBST              (PIN_ALT5   | PIN_PORTC | PIN18)
+#define PIN_FB_CS2               (PIN_ALT5   | PIN_PORTC | PIN18)
+#define PIN_FB_BE15_8_BLS23_16   (PIN_ALT5   | PIN_PORTC | PIN18)
+#define PIN_UART3_CTS_2          (PIN_ALT3   | PIN_PORTC | PIN19)
+#define PIN_ENET0_1588_TMR3_2    (PIN_ALT4   | PIN_PORTC | PIN19)
+#define PIN_FB_CS3               (PIN_ALT5   | PIN_PORTC | PIN19)
+#define PIN_FB_BE7_0_BLS31_24    (PIN_ALT5   | PIN_PORTC | PIN19)
+#define PIN_FB_TA                (PIN_ALT6   | PIN_PORTC | PIN19)
+
+#define PIN_SPI0_PCS0_3          (PIN_ALT2   | PIN_PORTD | PIN0)
+#define PIN_UART2_RTS            (PIN_ALT3   | PIN_PORTD | PIN0)
+#define PIN_FB_ALE               (PIN_ALT5   | PIN_PORTD | PIN0)
+#define PIN_FB_CS1               (PIN_ALT5   | PIN_PORTD | PIN0)
+#define PIN_FB_TS                (PIN_ALT5   | PIN_PORTD | PIN0)
+#define PIN_ADC0_SE5B            (PIN_ANALOG | PIN_PORTD | PIN1)
+#define PIN_SPI0_SCK_3           (PIN_ALT2   | PIN_PORTD | PIN1)
+#define PIN_UART2_CTS            (PIN_ALT3   | PIN_PORTD | PIN1)
+#define PIN_FB_CS0               (PIN_ALT5   | PIN_PORTD | PIN1)
+#define PIN_SPI0_SOUT_3          (PIN_ALT2   | PIN_PORTD | PIN2)
+#define PIN_UART2_RX             (PIN_ALT3   | PIN_PORTD | PIN2)
+#define PIN_FB_AD4               (PIN_ALT5   | PIN_PORTD | PIN2)
+#define PIN_SPI0_SIN_3           (PIN_ALT2   | PIN_PORTD | PIN3)
+#define PIN_UART2_TX             (PIN_ALT3   | PIN_PORTD | PIN3)
+#define PIN_FB_AD3               (PIN_ALT5   | PIN_PORTD | PIN3)
+#define PIN_SPI0_PCS1_2          (PIN_ALT2   | PIN_PORTD | PIN4)
+#define PIN_UART0_RTS_4          (PIN_ALT3   | PIN_PORTD | PIN4)
+#define PIN_FTM0_CH4_2           (PIN_ALT4   | PIN_PORTD | PIN4)
+#define PIN_FB_AD2               (PIN_ALT5   | PIN_PORTD | PIN4)
+#define PIN_EWM_IN_2             (PIN_ALT6   | PIN_PORTD | PIN4)
+#define PIN_ADC0_SE6B            (PIN_ANALOG | PIN_PORTD | PIN5)
+#define PIN_SPI0_PCS2_1          (PIN_ALT2   | PIN_PORTD | PIN5)
+#define PIN_UART0_CTS_4          (PIN_ALT3   | PIN_PORTD | PIN5)
+#define PIN_FTM0_CH5_2           (PIN_ALT4   | PIN_PORTD | PIN5)
+#define PIN_FB_AD1               (PIN_ALT5   | PIN_PORTD | PIN5)
+#define PIN_EWM_OUT_2            (PIN_ALT6   | PIN_PORTD | PIN5)
+#define PIN_ADC0_SE7B            (PIN_ANALOG | PIN_PORTD | PIN6)
+#define PIN_SPI0_PCS3_2          (PIN_ALT2   | PIN_PORTD | PIN6)
+#define PIN_UART0_RX_4           (PIN_ALT3   | PIN_PORTD | PIN6)
+#define PIN_FTM0_CH6_2           (PIN_ALT4   | PIN_PORTD | PIN6)
+#define PIN_FB_AD0               (PIN_ALT5   | PIN_PORTD | PIN6)
+#define PIN_FTM0_FLT0_1          (PIN_ALT6   | PIN_PORTD | PIN6)
+#define PIN_CMT_IRO              (PIN_ALT2   | PIN_PORTD | PIN7)
+#define PIN_UART0_TX_4           (PIN_ALT3   | PIN_PORTD | PIN7)
+#define PIN_FTM0_CH7_2           (PIN_ALT4   | PIN_PORTD | PIN7)
+#define PIN_FTM0_FLT1_2          (PIN_ALT6   | PIN_PORTD | PIN7)
+#define PIN_I2C0_SCL_3           (PIN_ALT2   | PIN_PORTD | PIN8)
+#define PIN_UART5_RX_1           (PIN_ALT3   | PIN_PORTD | PIN8)
+#define PIN_FB_A16               (PIN_ALT6   | PIN_PORTD | PIN8)
+#define PIN_I2C0_SDA_3           (PIN_ALT2   | PIN_PORTD | PIN9)
+#define PIN_UART5_TX_1           (PIN_ALT3   | PIN_PORTD | PIN9)
+#define PIN_FB_A17               (PIN_ALT6   | PIN_PORTD | PIN9)
+#define PIN_UART5_RTS_1          (PIN_ALT3   | PIN_PORTD | PIN10)
+#define PIN_FB_A18               (PIN_ALT6   | PIN_PORTD | PIN10)
+#define PIN_SPI2_PCS0_2          (PIN_ALT2   | PIN_PORTD | PIN11)
+#define PIN_UART5_CTS_1          (PIN_ALT3   | PIN_PORTD | PIN11)
+#define PIN_SDHC0_CLKIN          (PIN_ALT4   | PIN_PORTD | PIN11)
+#define PIN_FB_A19               (PIN_ALT6   | PIN_PORTD | PIN11)
+#define PIN_SPI2_SCK_2           (PIN_ALT2   | PIN_PORTD | PIN12)
+#define PIN_SDHC0_D4             (PIN_ALT4   | PIN_PORTD | PIN12)
+#define PIN_FB_A20               (PIN_ALT6   | PIN_PORTD | PIN12)
+#define PIN_SPI2_SOUT_2          (PIN_ALT2   | PIN_PORTD | PIN13)
+#define PIN_SDHC0_D5             (PIN_ALT4   | PIN_PORTD | PIN13)
+#define PIN_FB_A21               (PIN_ALT6   | PIN_PORTD | PIN13)
+#define PIN_SPI2_SIN_2           (PIN_ALT2   | PIN_PORTD | PIN14)
+#define PIN_SDHC0_D6             (PIN_ALT4   | PIN_PORTD | PIN14)
+#define PIN_FB_A22               (PIN_ALT6   | PIN_PORTD | PIN14)
+#define PIN_SPI2_PCS1            (PIN_ALT2   | PIN_PORTD | PIN15)
+#define PIN_SDHC0_D7             (PIN_ALT4   | PIN_PORTD | PIN15)
+#define PIN_FB_A23               (PIN_ALT6   | PIN_PORTD | PIN15)
+
+#define PIN_ADC1_SE4A            (PIN_ANALOG | PIN_PORTE | PIN0)
+#define PIN_SPI1_PCS1_2          (PIN_ALT2   | PIN_PORTE | PIN0)
+#define PIN_UART1_TX_2           (PIN_ALT3   | PIN_PORTE | PIN0)
+#define PIN_SDHC0_D1             (PIN_ALT4   | PIN_PORTE | PIN0)
+#define PIN_I2C1_SDA_2           (PIN_ALT6   | PIN_PORTE | PIN0)
+#define PIN_ADC1_SE5A            (PIN_ANALOG | PIN_PORTE | PIN1)
+#define PIN_SPI1_SOUT_2          (PIN_ALT2   | PIN_PORTE | PIN1)
+#define PIN_UART1_RX_2           (PIN_ALT3   | PIN_PORTE | PIN1)
+#define PIN_SDHC0_D0             (PIN_ALT4   | PIN_PORTE | PIN1)
+#define PIN_I2C1_SCL_2           (PIN_ALT6   | PIN_PORTE | PIN1)
+#define PIN_ADC1_SE6A            (PIN_ANALOG | PIN_PORTE | PIN2)
+#define PIN_SPI1_SCK_2           (PIN_ALT2   | PIN_PORTE | PIN2)
+#define PIN_UART1_CTS_2          (PIN_ALT3   | PIN_PORTE | PIN2)
+#define PIN_SDHC0_DCLK           (PIN_ALT4   | PIN_PORTE | PIN2)
+#define PIN_ADC1_SE7A            (PIN_ANALOG | PIN_PORTE | PIN3)
+#define PIN_SPI1_SIN_2           (PIN_ALT2   | PIN_PORTE | PIN3)
+#define PIN_UART1_RTS_2          (PIN_ALT3   | PIN_PORTE | PIN3)
+#define PIN_SDHC0_CMD            (PIN_ALT4   | PIN_PORTE | PIN3)
+#define PIN_SPI1_PCS0_2          (PIN_ALT2   | PIN_PORTE | PIN4)
+#define PIN_UART3_TX_3           (PIN_ALT3   | PIN_PORTE | PIN4)
+#define PIN_SDHC0_D3             (PIN_ALT4   | PIN_PORTE | PIN4)
+#define PIN_SPI1_PCS2            (PIN_ALT2   | PIN_PORTE | PIN5)
+#define PIN_UART3_RX_3           (PIN_ALT3   | PIN_PORTE | PIN5)
+#define PIN_SDHC0_D2             (PIN_ALT4   | PIN_PORTE | PIN5)
+#define PIN_SPI1_PCS3            (PIN_ALT2   | PIN_PORTE | PIN6)
+#define PIN_UART3_CTS_3          (PIN_ALT3   | PIN_PORTE | PIN6)
+#define PIN_I2S0_MCLK_3          (PIN_ALT4   | PIN_PORTE | PIN6)
+#define PIN_I2S0_CLKIN_3         (PIN_ALT6   | PIN_PORTE | PIN6)
+#define PIN_UART3_RTS_3          (PIN_ALT3   | PIN_PORTE | PIN7)
+#define PIN_I2S0_RXD_3           (PIN_ALT4   | PIN_PORTE | PIN7)
+#define PIN_UART5_TX_2           (PIN_ALT3   | PIN_PORTE | PIN8)
+#define PIN_I2S0_RX_FS_3         (PIN_ALT4   | PIN_PORTE | PIN8)
+#define PIN_UART5_RX_2           (PIN_ALT3   | PIN_PORTE | PIN9)
+#define PIN_I2S0_RX_BCLK_3       (PIN_ALT4   | PIN_PORTE | PIN9)
+#define PIN_UART5_CTS_2          (PIN_ALT3   | PIN_PORTE | PIN10)
+#define PIN_I2S0_TXD_3           (PIN_ALT4   | PIN_PORTE | PIN10)
+#define PIN_UART5_RTS_2          (PIN_ALT3   | PIN_PORTE | PIN11)
+#define PIN_I2S0_TX_FS_3         (PIN_ALT4   | PIN_PORTE | PIN11)
+#define PIN_I2S0_TX_BCLK_3       (PIN_ALT4   | PIN_PORTE | PIN12)
+#define PIN_ADC0_SE17            (PIN_ANALOG | PIN_PORTE | PIN24)
+#define PIN_CAN1_TX_2            (PIN_ALT2   | PIN_PORTE | PIN24)
+#define PIN_UART4_TX_2           (PIN_ALT3   | PIN_PORTE | PIN24)
+#define PIN_EWM_OUT_3            (PIN_ALT6   | PIN_PORTE | PIN24)
+#define PIN_ADC0_SE18            (PIN_ANALOG | PIN_PORTE | PIN25)
+#define PIN_CAN1_RX_2            (PIN_ALT2   | PIN_PORTE | PIN25)
+#define PIN_UART4_RX_2           (PIN_ALT3   | PIN_PORTE | PIN25)
+#define PIN_EWM_IN_3             (PIN_ALT6   | PIN_PORTE | PIN25)
+#define PIN_UART4_CTS_2          (PIN_ALT3   | PIN_PORTE | PIN26)
+#define PIN_ENET_1588_CLKIN      (PIN_ALT4   | PIN_PORTE | PIN26)
+#define PIN_RTC_CLKOUT           (PIN_ALT6   | PIN_PORTE | PIN26)
+#define PIN_USB_CLKIN            (PIN_ALT7   | PIN_PORTE | PIN26)
+#define PIN_UART4_RTS_2          (PIN_ALT3   | PIN_PORTE | PIN27)
+
+/********************************************************************************************
+ * Public Types
+ ********************************************************************************************/
+
+/********************************************************************************************
+ * Public Data
+ ********************************************************************************************/
+
+/********************************************************************************************
+ * Public Functions
+ ********************************************************************************************/
+
+#endif /* KINETIS_K64 */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHP_KINETIS_K64PINMUX_H */
diff --git a/arch/arm/src/kinetis/kinetis_osc.h b/arch/arm/src/kinetis/chip/kinetis_osc.h
similarity index 93%
rename from arch/arm/src/kinetis/kinetis_osc.h
rename to arch/arm/src/kinetis/chip/kinetis_osc.h
index 16efcf3282..69a7b8a30c 100644
--- a/arch/arm/src/kinetis/kinetis_osc.h
+++ b/arch/arm/src/kinetis/chip/kinetis_osc.h
@@ -1,7 +1,7 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/kinetis_osc.h
+ * arch/arm/src/kinetis/chip/kinetis_osc.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_OSC_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_OSC_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIHP_KINETIS_OSC_H
+#define __ARCH_ARM_SRC_KINETIS_CHIHP_KINETIS_OSC_H
 
 /********************************************************************************************
  * Included Files
@@ -81,4 +81,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_OSC_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIHP_KINETIS_OSC_H */
diff --git a/arch/arm/src/kinetis/kinetis_pdb.h b/arch/arm/src/kinetis/chip/kinetis_pdb.h
similarity index 95%
rename from arch/arm/src/kinetis/kinetis_pdb.h
rename to arch/arm/src/kinetis/chip/kinetis_pdb.h
index 9cfab9b99f..d0238240df 100644
--- a/arch/arm/src/kinetis/kinetis_pdb.h
+++ b/arch/arm/src/kinetis/chip/kinetis_pdb.h
@@ -1,7 +1,7 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/kinetis_pdb.h
+ * arch/arm/src/kinetis/chip/kinetis_pdb.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_PDB_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_PDB_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PDB_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PDB_H
 
 /********************************************************************************************
  * Included Files
@@ -83,6 +83,10 @@
 
 #define KINETIS_PDB_PO0EN_OFFSET     0x0190 /* Pulse-Out 0 Enable Register */
 #define KINETIS_PDB_PO0DLY_OFFSET    0x0194 /* Pulse-Out 0 Delay Register */
+#ifdef KINETIS_K64
+#  define KINETIS_PDB_PO1DLY_OFFSET  0x0198 /* Pulse-Out 1 Delay Register */
+#  define KINETIS_PDB_PO2DLY_OFFSET  0x019c /* Pulse-Out 2 Delay Register */
+#endif
 
 /* Register Addresses ***********************************************************************/
 
@@ -119,6 +123,10 @@
 
 #define KINETIS_PDB0_PO0EN           (KINETIS_PDB0_BASE+KINETIS_PDB_PO0EN_OFFSET)
 #define KINETIS_PDB0_PO0DLY          (KINETIS_PDB0_BASE+KINETIS_PDB_PO0DLY_OFFSET)
+#ifdef KINETIS_K64
+#  define KINETIS_PDB0_PO1DLY        (KINETIS_PDB0_BASE+KINETIS_PDB_PO1DLY_OFFSET)
+#  define KINETIS_PDB0_PO2DLY        (KINETIS_PDB0_BASE+KINETIS_PDB_PO2DLY_OFFSET)
+#endif
 
 /* Register Bit Definitions *****************************************************************/
 
@@ -252,4 +260,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_PDB_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PDB_H */
diff --git a/arch/arm/src/kinetis/kinetis_pit.h b/arch/arm/src/kinetis/chip/kinetis_pit.h
similarity index 96%
rename from arch/arm/src/kinetis/kinetis_pit.h
rename to arch/arm/src/kinetis/chip/kinetis_pit.h
index 808508f8fe..26cd6caea6 100644
--- a/arch/arm/src/kinetis/kinetis_pit.h
+++ b/arch/arm/src/kinetis/chip/kinetis_pit.h
@@ -1,7 +1,7 @@
 /************************************************************************************
- * arch/arm/src/kinetis/kinetis_pit.h
+ * arch/arm/src/kinetis/chip/kinetis_pit.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_PIT_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_PIT_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PIT_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PIT_H
 
 /************************************************************************************
  * Included Files
@@ -121,4 +121,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_PIT_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PIT_H */
diff --git a/arch/arm/src/kinetis/kinetis_pmc.h b/arch/arm/src/kinetis/chip/kinetis_pmc.h
similarity index 95%
rename from arch/arm/src/kinetis/kinetis_pmc.h
rename to arch/arm/src/kinetis/chip/kinetis_pmc.h
index 065847da3d..c0ffe575b3 100644
--- a/arch/arm/src/kinetis/kinetis_pmc.h
+++ b/arch/arm/src/kinetis/chip/kinetis_pmc.h
@@ -1,7 +1,7 @@
 /************************************************************************************
- * arch/arm/src/kinetis/kinetis_pmc.h
+ * arch/arm/src/kinetis/chip/kinetis_pmc.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_PMC_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_PMC_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PMC_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PMC_H
 
 /************************************************************************************
  * Included Files
@@ -108,4 +108,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_PMC_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PMC_H */
diff --git a/arch/arm/src/kinetis/kinetis_port.h b/arch/arm/src/kinetis/chip/kinetis_port.h
similarity index 99%
rename from arch/arm/src/kinetis/kinetis_port.h
rename to arch/arm/src/kinetis/chip/kinetis_port.h
index 5a568537b0..36dfa4e098 100644
--- a/arch/arm/src/kinetis/kinetis_port.h
+++ b/arch/arm/src/kinetis/chip/kinetis_port.h
@@ -1,7 +1,7 @@
 /************************************************************************************
- * arch/arm/src/kinetis/kinetis_port.h
+ * arch/arm/src/kinetis/chip/kinetis_port.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_PORT_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_PORT_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PORT_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PORT_H
 
 /************************************************************************************
  * Included Files
@@ -426,4 +426,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_PORT_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_PORT_H */
diff --git a/arch/arm/src/kinetis/kinetis_rngb.h b/arch/arm/src/kinetis/chip/kinetis_rngb.h
similarity index 97%
rename from arch/arm/src/kinetis/kinetis_rngb.h
rename to arch/arm/src/kinetis/chip/kinetis_rngb.h
index a4f6775550..1e005c08ae 100644
--- a/arch/arm/src/kinetis/kinetis_rngb.h
+++ b/arch/arm/src/kinetis/chip/kinetis_rngb.h
@@ -1,7 +1,7 @@
 /************************************************************************************
- * arch/arm/src/kinetis/kinetis_rngb.h
+ * arch/arm/src/kinetis/chip/kinetis_rngb.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_RNGB_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_RNGB_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_RNGB_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_RNGB_H
 
 /************************************************************************************
  * Included Files
@@ -158,4 +158,4 @@
  ************************************************************************************/
 
 #endif /* KINETIS_NRNG && KINETIS_NRNG > 0 */
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_RNGB_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_RNGB_H */
diff --git a/arch/arm/src/kinetis/kinetis_rtc.h b/arch/arm/src/kinetis/chip/kinetis_rtc.h
similarity index 95%
rename from arch/arm/src/kinetis/kinetis_rtc.h
rename to arch/arm/src/kinetis/chip/kinetis_rtc.h
index 69c097a7c9..d00c02a697 100644
--- a/arch/arm/src/kinetis/kinetis_rtc.h
+++ b/arch/arm/src/kinetis/chip/kinetis_rtc.h
@@ -1,7 +1,7 @@
 /************************************************************************************
- * arch/arm/src/kinetis/kinetis_rtc.h
+ * arch/arm/src/kinetis/chip/kinetis_rtc.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_RTC_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_RTC_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_RTC_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_RTC_H
 
 /************************************************************************************
  * Included Files
@@ -59,7 +59,7 @@
 #define KINETIS_RTC_CR_OFFSET    0x0010 /* RTC Control Register */
 #define KINETIS_RTC_SR_OFFSET    0x0014 /* RTC Status Register */
 #define KINETIS_RTC_LR_OFFSET    0x0018 /* RTC Lock Register */
-#ifdef KINETIS_K40
+#if defined(KINETIS_K40) || defined(KINETIS_K64)
 #  define KINETIS_RTC_IER_OFFSET 0x001c /* RTC Interrupt Enable Register (K40) */
 #endif
 #ifdef KINETIS_K60
@@ -77,7 +77,7 @@
 #define KINETIS_RTC_CR           (KINETIS_RTC_BASE+KINETIS_RTC_CR_OFFSET)
 #define KINETIS_RTC_SR           (KINETIS_RTC_BASE+KINETIS_RTC_SR_OFFSET)
 #define KINETIS_RTC_LR           (KINETIS_RTC_BASE+KINETIS_RTC_LR_OFFSET)
-#ifdef KINETIS_K40
+#if defined(KINETIS_K40) || defined(KINETIS_K64)
 #  define KINETIS_RTC_IER        (KINETIS_RTC_BASE+KINETIS_RTC_IER_OFFSET)
 #endif
 #ifdef KINETIS_K60
@@ -141,7 +141,7 @@
                                            /* Bits 7-31: Reserved */
 /* RTC Interrupt Enable Register (32-bits, K40) */
 
-#ifdef KINETIS_K40
+#if defined(KINETIS_K40) || defined(KINETIS_K64)
 #  define RTC_IER_TIIE           (1 << 0)  /* Bit 0:  Time Invalid Interrupt Enable */
 #  define RTC_IER_TOIE           (1 << 1)  /* Bit 1:  Time Overflow Interrupt Enable */
 #  define RTC_IER_TAIE           (1 << 2)  /* Bit 2:  Time Alarm Interrupt Enable */
@@ -167,7 +167,7 @@
 #define RTC_WAR_CRW              (1 << 4)  /* Bit 4:  Control Register Write */
 #define RTC_WAR_SRW              (1 << 5)  /* Bit 5:  Status Register Write */
 #define RTC_WAR_LRW              (1 << 6)  /* Bit 6:  Lock Register Write */
-#ifdef KINETIS_K40
+#if defined(KINETIS_K40) || defined(KINETIS_K64)
 #  define RTC_WAR_IERW           (1 << 7)  /* Bit 7:  Interrupt Enable Register Write */
 #endif
 #ifdef KINETIS_K60
@@ -183,7 +183,7 @@
 #define RTC_RAR_CRR              (1 << 4)  /* Bit 4:  Control Register Read */
 #define RTC_RAR_SRR              (1 << 5)  /* Bit 5:  Status Register Read */
 #define RTC_RAR_LRR              (1 << 6)  /* Bit 6:  Lock Register Read */
-#ifdef KINETIS_K40
+#if defined(KINETIS_K40) || defined(KINETIS_K64)
 #  define RTC_RAR_IERR           (1 << 7)  /* Bit 7:  Interrupt Enable Register Read */
 #endif
 #ifdef KINETIS_K60
@@ -204,4 +204,4 @@
  ************************************************************************************/
 
 #endif /* KINETIS_NRTC && KINETIS_NRTC > 0 */
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_RTC_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_RTC_H */
diff --git a/arch/arm/src/kinetis/kinetis_sdhc.h b/arch/arm/src/kinetis/chip/kinetis_sdhc.h
similarity index 99%
rename from arch/arm/src/kinetis/kinetis_sdhc.h
rename to arch/arm/src/kinetis/chip/kinetis_sdhc.h
index 5d122315a9..b57b85c94e 100644
--- a/arch/arm/src/kinetis/kinetis_sdhc.h
+++ b/arch/arm/src/kinetis/chip/kinetis_sdhc.h
@@ -1,7 +1,7 @@
 /************************************************************************************
- * arch/arm/src/kinetis/kinetis_sdhc.h
+ * arch/arm/src/kinetis/chip/kinetis_sdhc.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_SDHC_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_SDHC_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_SDHC_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_SDHC_H
 
 /************************************************************************************
  * Included Files
@@ -385,4 +385,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_SDHC_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_SDHC_H */
diff --git a/arch/arm/src/kinetis/kinetis_sim.h b/arch/arm/src/kinetis/chip/kinetis_sim.h
similarity index 96%
rename from arch/arm/src/kinetis/kinetis_sim.h
rename to arch/arm/src/kinetis/chip/kinetis_sim.h
index aad17e923e..6842f9281d 100644
--- a/arch/arm/src/kinetis/kinetis_sim.h
+++ b/arch/arm/src/kinetis/chip/kinetis_sim.h
@@ -1,7 +1,7 @@
 /************************************************************************************
- * arch/arm/src/kinetis/kinetis_sim.h
+ * arch/arm/src/kinetis/chip/kinetis_sim.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_SIM_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_SIM_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_SIM_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_SIM_H
 
 /************************************************************************************
  * Included Files
@@ -489,29 +489,29 @@
 #  define SIM_FCFG1_EESIZE_32B        (9 << SIM_FCFG1_EESIZE_SHIFT)  /* 32 Bytes */
 #  define SIM_FCFG1_EESIZE_NONE       (15 << SIM_FCFG1_EESIZE_SHIFT) /* 0 Bytes */
                                                 /* Bits 20-23: Reserved */
-#ifdef KINETIS_K40
-#define SIM_FCFG1_PFSIZE_SHIFT        (24)      /* Bits 24-27: Program flash size (K40) */
-#define SIM_FCFG1_PFSIZE_MASK         (15 << SIM_FCFG1_PFSIZE_SHIFT)
-#  define SIM_FCFG1_PFSIZE_128KB      (7 << SIM_FCFG1_PFSIZE_SHIFT)  /* 128KB program flash, 4KB protection region */
-#  define SIM_FCFG1_PFSIZE_256KB      (9 << SIM_FCFG1_PFSIZE_SHIFT)  /* 256KB program flash, 8KB protection region */
-#  define SIM_FCFG1_PFSIZE_512KB      (11 << SIM_FCFG1_PFSIZE_SHIFT) /* 512KB program flash, 16KB protection region */
-#  define SIM_FCFG1_PFSIZE_512KB2     (15 << SIM_FCFG1_PFSIZE_SHIFT) /* 512KB program flash, 16KB protection region */
-#define SIM_FCFG1_NVMSIZE_SHIFT       (28)      /* Bits 28-31: FlexNVM size (K40)*/
-#define SIM_FCFG1_NVMSIZE_MASK        (15 << SIM_FCFG1_NVMSIZE_SHIFT)
-#  define SIM_FCFG1_NVMSIZE_NONE      (0 << SIM_FCFG1_NVMSIZE_SHIFT)  /*  0KB FlexNVM */
-#  define SIM_FCFG1_NVMSIZE_128KB     (7 << SIM_FCFG1_NVMSIZE_SHIFT)  /* 128KB FlexNVM, 16KB protection region */
-#  define SIM_FCFG1_NVMSIZE_256KB     (9 << SIM_FCFG1_NVMSIZE_SHIFT)  /* 256KB FlexNVM, 32KB protection region */
-#  define SIM_FCFG1_NVMSIZE_256KB2    (15 << SIM_FCFG1_NVMSIZE_SHIFT) /* 256KB FlexNVM, 32KB protection region */
+#if defined(KINETIS_K40) || defined(KINETIS_K64)
+#  define SIM_FCFG1_PFSIZE_SHIFT      (24)      /* Bits 24-27: Program flash size (K40) */
+#  define SIM_FCFG1_PFSIZE_MASK       (15 << SIM_FCFG1_PFSIZE_SHIFT)
+#    define SIM_FCFG1_PFSIZE_128KB    (7 << SIM_FCFG1_PFSIZE_SHIFT)  /* 128KB program flash, 4KB protection region */
+#    define SIM_FCFG1_PFSIZE_256KB    (9 << SIM_FCFG1_PFSIZE_SHIFT)  /* 256KB program flash, 8KB protection region */
+#    define SIM_FCFG1_PFSIZE_512KB    (11 << SIM_FCFG1_PFSIZE_SHIFT) /* 512KB program flash, 16KB protection region */
+#    define SIM_FCFG1_PFSIZE_512KB2   (15 << SIM_FCFG1_PFSIZE_SHIFT) /* 512KB program flash, 16KB protection region */
+#  define SIM_FCFG1_NVMSIZE_SHIFT     (28)      /* Bits 28-31: FlexNVM size (K40)*/
+#  define SIM_FCFG1_NVMSIZE_MASK      (15 << SIM_FCFG1_NVMSIZE_SHIFT)
+#    define SIM_FCFG1_NVMSIZE_NONE    (0 << SIM_FCFG1_NVMSIZE_SHIFT)  /*  0KB FlexNVM */
+#    define SIM_FCFG1_NVMSIZE_128KB   (7 << SIM_FCFG1_NVMSIZE_SHIFT)  /* 128KB FlexNVM, 16KB protection region */
+#    define SIM_FCFG1_NVMSIZE_256KB   (9 << SIM_FCFG1_NVMSIZE_SHIFT)  /* 256KB FlexNVM, 32KB protection region */
+#    define SIM_FCFG1_NVMSIZE_256KB2  (15 << SIM_FCFG1_NVMSIZE_SHIFT) /* 256KB FlexNVM, 32KB protection region */
 #endif
 
 #ifdef KINETIS_K60
-#define SIM_FCFG1_FSIZE_SHIFT         (24)      /* Bits 24-31: Flash size (K60)*/
-#define SIM_FCFG1_FSIZE_MASK          (0xff << SIM_FCFG1_FSIZE_SHIFT)
-#  define SIM_FCFG1_FSIZE_32KB        (2 << SIM_FCFG1_FSIZE_SHIFT)  /* 32KB program flash, 1KB protection region */
-#  define SIM_FCFG1_FSIZE_64KB        (4 << SIM_FCFG1_FSIZE_SHIFT)  /* 64KB program flash, 2KB protection region */
-#  define SIM_FCFG1_FSIZE_128KB       (6 << SIM_FCFG1_FSIZE_SHIFT)  /* 128KB program flash, 4KB protection region */
-#  define SIM_FCFG1_FSIZE_256KB       (8 << SIM_FCFG1_FSIZE_SHIFT)  /* 256KB program flash, 8KB protection region */
-#  define SIM_FCFG1_FSIZE_512KB       (12 << SIM_FCFG1_FSIZE_SHIFT) /* 512KB program flash, 16KB protection region */
+#  define SIM_FCFG1_FSIZE_SHIFT       (24)      /* Bits 24-31: Flash size (K60)*/
+#  define SIM_FCFG1_FSIZE_MASK        (0xff << SIM_FCFG1_FSIZE_SHIFT)
+#    define SIM_FCFG1_FSIZE_32KB      (2 << SIM_FCFG1_FSIZE_SHIFT)  /* 32KB program flash, 1KB protection region */
+#    define SIM_FCFG1_FSIZE_64KB      (4 << SIM_FCFG1_FSIZE_SHIFT)  /* 64KB program flash, 2KB protection region */
+#    define SIM_FCFG1_FSIZE_128KB     (6 << SIM_FCFG1_FSIZE_SHIFT)  /* 128KB program flash, 4KB protection region */
+#    define SIM_FCFG1_FSIZE_256KB     (8 << SIM_FCFG1_FSIZE_SHIFT)  /* 256KB program flash, 8KB protection region */
+#    define SIM_FCFG1_FSIZE_512KB     (12 << SIM_FCFG1_FSIZE_SHIFT) /* 512KB program flash, 16KB protection region */
 #endif
 
 /* Flash Configuration Register 2 */
@@ -542,4 +542,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_SIM_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_SIM_H */
diff --git a/arch/arm/src/kinetis/kinetis.h b/arch/arm/src/kinetis/kinetis.h
index ae02ce7e4f..fccd4b90af 100644
--- a/arch/arm/src/kinetis/kinetis.h
+++ b/arch/arm/src/kinetis/kinetis.h
@@ -52,7 +52,7 @@
 #include "up_internal.h"
 #include "kinetis_config.h"
 #include "chip.h"
-#include "kinetis_port.h"
+#include "chip/kinetis_port.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/kinetis/kinetis_clockconfig.c b/arch/arm/src/kinetis/kinetis_clockconfig.c
index eddaafc53e..2f703ea96e 100644
--- a/arch/arm/src/kinetis/kinetis_clockconfig.c
+++ b/arch/arm/src/kinetis/kinetis_clockconfig.c
@@ -45,7 +45,7 @@
 
 #include "kinetis.h"
 #include "chip/kinetis_mcg.h"
-#include "kinetis_sim.h"
+#include "chip/kinetis_sim.h"
 #include "chip/kinetis_fmc.h"
 #include "chip/kinetis_llwu.h"
 #include "chip/kinetis_pinmux.h"
diff --git a/arch/arm/src/kinetis/kinetis_enet.c b/arch/arm/src/kinetis/kinetis_enet.c
index 379a2aac27..4a263a8c37 100644
--- a/arch/arm/src/kinetis/kinetis_enet.c
+++ b/arch/arm/src/kinetis/kinetis_enet.c
@@ -66,7 +66,7 @@
 #include "kinetis.h"
 #include "kinetis_config.h"
 #include "chip/kinetis_pinmux.h"
-#include "kinetis_sim.h"
+#include "chip/kinetis_sim.h"
 #include "chip/kinetis_mpu.h"
 #include "chip/kinetis_enet.h"
 
diff --git a/arch/arm/src/kinetis/kinetis_lowputc.c b/arch/arm/src/kinetis/kinetis_lowputc.c
index 4e8389d20d..989efada5e 100644
--- a/arch/arm/src/kinetis/kinetis_lowputc.c
+++ b/arch/arm/src/kinetis/kinetis_lowputc.c
@@ -50,7 +50,7 @@
 #include "kinetis_config.h"
 #include "kinetis.h"
 #include "kinetis_uart.h"
-#include "kinetis_sim.h"
+#include "chip/kinetis_sim.h"
 #include "chip/kinetis_pinmux.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/kinetis/kinetis_mpuinit.h b/arch/arm/src/kinetis/kinetis_mpuinit.h
index f3cf95370e..3327176841 100644
--- a/arch/arm/src/kinetis/kinetis_mpuinit.h
+++ b/arch/arm/src/kinetis/kinetis_mpuinit.h
@@ -42,18 +42,6 @@
 
 #include 
 
-/************************************************************************************
- * Pre-processor Definitions
- ************************************************************************************/
-
-/************************************************************************************
- * Public Types
- ************************************************************************************/
-
-/************************************************************************************
- * Public Data
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
diff --git a/arch/arm/src/kinetis/kinetis_pin.c b/arch/arm/src/kinetis/kinetis_pin.c
index 3f8b1a74fc..8a2e329432 100644
--- a/arch/arm/src/kinetis/kinetis_pin.c
+++ b/arch/arm/src/kinetis/kinetis_pin.c
@@ -49,7 +49,7 @@
 #include "up_internal.h"
 
 #include "kinetis.h"
-#include "kinetis_port.h"
+#include "chip/kinetis_port.h"
 #include "chip/kinetis_gpio.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/kinetis/kinetis_pindump.c b/arch/arm/src/kinetis/kinetis_pindump.c
index 02367ded7a..a660c87307 100644
--- a/arch/arm/src/kinetis/kinetis_pindump.c
+++ b/arch/arm/src/kinetis/kinetis_pindump.c
@@ -47,7 +47,7 @@
 
 #include "kinetis.h"
 #include "chip/kinetis_gpio.h"
-#include "kinetis_port.h"
+#include "chip/kinetis_port.h"
 
 #ifdef CONFIG_DEBUG_GPIO_INFO
 
diff --git a/arch/arm/src/kinetis/kinetis_pinirq.c b/arch/arm/src/kinetis/kinetis_pinirq.c
index 0ec0d64176..919d51e67c 100644
--- a/arch/arm/src/kinetis/kinetis_pinirq.c
+++ b/arch/arm/src/kinetis/kinetis_pinirq.c
@@ -50,7 +50,7 @@
 #include "up_internal.h"
 
 #include "kinetis.h"
-#include "kinetis_port.h"
+#include "chip/kinetis_port.h"
 
 #ifdef CONFIG_GPIO_IRQ
 
diff --git a/arch/arm/src/kinetis/kinetis_pwm.c b/arch/arm/src/kinetis/kinetis_pwm.c
index ac48a4af02..19de382634 100644
--- a/arch/arm/src/kinetis/kinetis_pwm.c
+++ b/arch/arm/src/kinetis/kinetis_pwm.c
@@ -61,7 +61,7 @@
 #include "chip/kinetis_pwm.h"
 #include "chip/kinetis_gpio.h"
 #include "chip/kinetis_ftm.h"
-#include "kinetis_sim.h"
+#include "chip/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.
diff --git a/arch/arm/src/kinetis/kinetis_sdhc.c b/arch/arm/src/kinetis/kinetis_sdhc.c
index 5b4b4b6432..afc85f5989 100644
--- a/arch/arm/src/kinetis/kinetis_sdhc.c
+++ b/arch/arm/src/kinetis/kinetis_sdhc.c
@@ -62,8 +62,8 @@
 
 #include "kinetis.h"
 #include "chip/kinetis_pinmux.h"
-#include "kinetis_sim.h"
-#include "kinetis_sdhc.h"
+#include "chip/kinetis_sim.h"
+#include "chip/kinetis_sdhc.h"
 
 #ifdef CONFIG_KINETIS_SDHC
 
diff --git a/arch/arm/src/kinetis/kinetis_usbdev.c b/arch/arm/src/kinetis/kinetis_usbdev.c
index 7eeaf8ec15..d8d9512cab 100644
--- a/arch/arm/src/kinetis/kinetis_usbdev.c
+++ b/arch/arm/src/kinetis/kinetis_usbdev.c
@@ -67,7 +67,7 @@
 #include "up_arch.h"
 #include "kinetis.h"
 #include "kinetis_usbotg.h"
-#include "kinetis_sim.h"
+#include "chip/kinetis_sim.h"
 #include "chip/kinetis_fmc.h"
 
 #if defined(CONFIG_USBDEV) && defined(CONFIG_KINETIS_USBOTG)
-- 
GitLab


From f73b97c3b25c831a19fe909b316ec5e47666733e Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Fri, 1 Jul 2016 15:00:04 -0600
Subject: [PATCH 127/229] arch/arm/kinetis:  Completes moving register header
 files to kinetis/chip directory with all K64 changes.

---
 .../arm/src/kinetis/{ => chip}/kinetis_slcd.h |  10 +-
 arch/arm/src/kinetis/{ => chip}/kinetis_smc.h |  10 +-
 arch/arm/src/kinetis/{ => chip}/kinetis_tsi.h |  10 +-
 .../arm/src/kinetis/{ => chip}/kinetis_uart.h |  10 +-
 .../src/kinetis/{ => chip}/kinetis_usbdcd.h   |  34 +-
 arch/arm/src/kinetis/chip/kinetis_usbotg.h    | 377 ++++++++++++++++++
 .../src/kinetis/{ => chip}/kinetis_vrefv1.h   |  10 +-
 .../arm/src/kinetis/{ => chip}/kinetis_wdog.h |  14 +-
 arch/arm/src/kinetis/kinetis_lowputc.c        |   2 +-
 arch/arm/src/kinetis/kinetis_serial.c         |   2 +-
 arch/arm/src/kinetis/kinetis_start.c          |   2 +-
 arch/arm/src/kinetis/kinetis_usbotg.h         | 306 +-------------
 arch/arm/src/kinetis/kinetis_vectors.S        | 214 +++++++++-
 arch/arm/src/kinetis/kinetis_wdog.c           |  15 +-
 14 files changed, 634 insertions(+), 382 deletions(-)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_slcd.h (99%)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_smc.h (96%)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_tsi.h (98%)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_uart.h (99%)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_usbdcd.h (87%)
 create mode 100644 arch/arm/src/kinetis/chip/kinetis_usbotg.h
 rename arch/arm/src/kinetis/{ => chip}/kinetis_vrefv1.h (94%)
 rename arch/arm/src/kinetis/{ => chip}/kinetis_wdog.h (95%)

diff --git a/arch/arm/src/kinetis/kinetis_slcd.h b/arch/arm/src/kinetis/chip/kinetis_slcd.h
similarity index 99%
rename from arch/arm/src/kinetis/kinetis_slcd.h
rename to arch/arm/src/kinetis/chip/kinetis_slcd.h
index d56ee5c41e..d4a68f07f5 100644
--- a/arch/arm/src/kinetis/kinetis_slcd.h
+++ b/arch/arm/src/kinetis/chip/kinetis_slcd.h
@@ -1,7 +1,7 @@
 /************************************************************************************
- * arch/arm/src/kinetis/kinetis_slcd.h
+ * arch/arm/src/kinetis/chip/kinetis_slcd.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_SLCD_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_SLCD_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_SLCD_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_SLCD_H
 
 /************************************************************************************
  * Included Files
@@ -417,4 +417,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_SLCD_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_SLCD_H */
diff --git a/arch/arm/src/kinetis/kinetis_smc.h b/arch/arm/src/kinetis/chip/kinetis_smc.h
similarity index 96%
rename from arch/arm/src/kinetis/kinetis_smc.h
rename to arch/arm/src/kinetis/chip/kinetis_smc.h
index 213ea80775..19a9d9d14b 100644
--- a/arch/arm/src/kinetis/kinetis_smc.h
+++ b/arch/arm/src/kinetis/chip/kinetis_smc.h
@@ -1,7 +1,7 @@
 /************************************************************************************
- * arch/arm/src/kinetis/kinetis_smc.h
+ * arch/arm/src/kinetis/chip/kinetis_smc.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_SMC_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_SMC_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_SMC_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_SMC_H
 
 /************************************************************************************
  * Included Files
@@ -119,4 +119,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_SMC_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_SMC_H */
diff --git a/arch/arm/src/kinetis/kinetis_tsi.h b/arch/arm/src/kinetis/chip/kinetis_tsi.h
similarity index 98%
rename from arch/arm/src/kinetis/kinetis_tsi.h
rename to arch/arm/src/kinetis/chip/kinetis_tsi.h
index ea52c0fd1d..6881150160 100644
--- a/arch/arm/src/kinetis/kinetis_tsi.h
+++ b/arch/arm/src/kinetis/chip/kinetis_tsi.h
@@ -1,7 +1,7 @@
 /************************************************************************************
- * arch/arm/src/kinetis/kinetis_tsi.h
+ * arch/arm/src/kinetis/chip/kinetis_tsi.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_TSI_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_TSI_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_TSI_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_TSI_H
 
 /************************************************************************************
  * Included Files
@@ -308,4 +308,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_TSI_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_TSI_H */
diff --git a/arch/arm/src/kinetis/kinetis_uart.h b/arch/arm/src/kinetis/chip/kinetis_uart.h
similarity index 99%
rename from arch/arm/src/kinetis/kinetis_uart.h
rename to arch/arm/src/kinetis/chip/kinetis_uart.h
index 27dd40467c..537332ee78 100644
--- a/arch/arm/src/kinetis/kinetis_uart.h
+++ b/arch/arm/src/kinetis/chip/kinetis_uart.h
@@ -1,7 +1,7 @@
 /************************************************************************************
- * arch/arm/src/kinetis/kinetis_uart.h
+ * arch/arm/src/kinetis/chip/kinetis_uart.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_UART_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_UART_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_UART_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_UART_H
 
 /************************************************************************************
  * Included Files
@@ -508,4 +508,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_UART_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_UART_H */
diff --git a/arch/arm/src/kinetis/kinetis_usbdcd.h b/arch/arm/src/kinetis/chip/kinetis_usbdcd.h
similarity index 87%
rename from arch/arm/src/kinetis/kinetis_usbdcd.h
rename to arch/arm/src/kinetis/chip/kinetis_usbdcd.h
index fad76d1500..6c4297ff7a 100644
--- a/arch/arm/src/kinetis/kinetis_usbdcd.h
+++ b/arch/arm/src/kinetis/chip/kinetis_usbdcd.h
@@ -1,7 +1,7 @@
 /************************************************************************************
- * arch/arm/src/kinetis/kinetis_usbdcd.h
+ * arch/arm/src/kinetis/chip/kinetis_usbdcd.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_USBDCD_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_USBDCD_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_USBDCD_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_USBDCD_H
 
 /************************************************************************************
  * Included Files
@@ -50,12 +50,17 @@
 
 /* Register Offsets *****************************************************************/
 
-#define KINETIS_USBDCD_CONTROL_OFFSET    0x0000 /* Control Register */
-#define KINETIS_USBDCD_CLOCK_OFFSET      0x0004 /* Clock Register */
-#define KINETIS_USBDCD_STATUS_OFFSET     0x0008 /* Status Register */
-#define KINETIS_USBDCD_TIMER0_OFFSET     0x0010 /* TIMER0 Register */
-#define KINETIS_USBDCD_TIMER1_OFFSET     0x0014 /* TIMER1 Register */
-#define KINETIS_USBDCD_TIMER2_OFFSET     0x0018 /* TIMER2 Register */
+#define KINETIS_USBDCD_CONTROL_OFFSET       0x0000 /* Control Register */
+#define KINETIS_USBDCD_CLOCK_OFFSET         0x0004 /* Clock Register */
+#define KINETIS_USBDCD_STATUS_OFFSET        0x0008 /* Status Register */
+#define KINETIS_USBDCD_TIMER0_OFFSET        0x0010 /* TIMER0 Register */
+#define KINETIS_USBDCD_TIMER1_OFFSET        0x0014 /* TIMER1 Register */
+#ifdef KINETIS_K64
+#  define KINETIS_USBDCD_TIMER2_BC11_OFFSET 0x0018 /* TIMER2_BC11 Register */
+#  define KINETIS_USBDCD_TIMER2_BC12_OFFSET 0x001c /* TIMER2_BC12 Register */
+#else
+#  define KINETIS_USBDCD_TIMER2_OFFSET      0x0018 /* TIMER2 Register */
+#endif
 
 /* Register Addresses ***************************************************************/
 
@@ -64,7 +69,12 @@
 #define KINETIS_USBDCD_STATUS            (KINETIS_USBDCD_BASE+KINETIS_USBDCD_STATUS_OFFSET)
 #define KINETIS_USBDCD_TIMER0            (KINETIS_USBDCD_BASE+KINETIS_USBDCD_TIMER0_OFFSET)
 #define KINETIS_USBDCD_TIMER1            (KINETIS_USBDCD_BASE+KINETIS_USBDCD_TIMER1_OFFSET)
-#define KINETIS_USBDCD_TIMER2            (KINETIS_USBDCD_BASE+KINETIS_USBDCD_TIMER2_OFFSET)
+#ifdef KINETIS_K64
+#  define KINETIS_USBDCD_TIMER2_BC11     (KINETIS_USBDCD_BASE+KINETIS_USBDCD_TIMER2_BC11_OFFSET)
+#  define KINETIS_USBDCD_TIMER2_BC12     (KINETIS_USBDCD_BASE+KINETIS_USBDCD_TIMER2_BC12_OFFSET)
+#else
+#  define KINETIS_USBDCD_TIMER2          (KINETIS_USBDCD_BASE+KINETIS_USBDCD_TIMER2_OFFSET)
+#endif
 
 /* Register Bit Definitions *********************************************************/
 
@@ -138,4 +148,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_USBDCD_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_USBDCD_H */
diff --git a/arch/arm/src/kinetis/chip/kinetis_usbotg.h b/arch/arm/src/kinetis/chip/kinetis_usbotg.h
new file mode 100644
index 0000000000..16cecc2261
--- /dev/null
+++ b/arch/arm/src/kinetis/chip/kinetis_usbotg.h
@@ -0,0 +1,377 @@
+/********************************************************************************************
+ * arch/arm/src/kinetis/chip/kinetis_usbotg.h
+ *
+ *   Copyright (C) 2011, 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.
+ *
+ ********************************************************************************************/
+
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_USBOTG_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_USBOTG_H
+
+/********************************************************************************************
+ * Included Files
+ ********************************************************************************************/
+
+#include 
+
+#include "chip.h"
+
+/********************************************************************************************
+ * Pre-processor Definitions
+ ********************************************************************************************/
+
+/* Register Offsets *************************************************************************/
+
+#define KINETIS_USB_PERID_OFFSET    0x0000 /* Peripheral ID Register */
+#define KINETIS_USB_IDCOMP_OFFSET   0x0004 /* Peripheral ID Complement Register */
+#define KINETIS_USB_REV_OFFSET      0x0008 /* Peripheral Revision Register */
+#define KINETIS_USB_ADDINFO_OFFSET  0x000c /* Peripheral Additional Info Register */
+#define KINETIS_USB_OTGISTAT_OFFSET 0x0010 /* OTG Interrupt Status Register */
+#define KINETIS_USB_OTGICR_OFFSET   0x0014 /* OTG Interrupt Control Register */
+#define KINETIS_USB_OTGSTAT_OFFSET  0x0018 /* OTG Status Register */
+#define KINETIS_USB_OTGCTL_OFFSET   0x001c /* OTG Control Register */
+#define KINETIS_USB_ISTAT_OFFSET    0x0080 /* Interrupt Status Register */
+#define KINETIS_USB_INTEN_OFFSET    0x0084 /* Interrupt Enable Register */
+#define KINETIS_USB_ERRSTAT_OFFSET  0x0088 /* Error Interrupt Status Register */
+#define KINETIS_USB_ERREN_OFFSET    0x008c /* Error Interrupt Enable Register */
+#define KINETIS_USB_STAT_OFFSET     0x0090 /* Status Register */
+#define KINETIS_USB_CTL_OFFSET      0x0094 /* Control Register */
+#define KINETIS_USB_ADDR_OFFSET     0x0098 /* Address Register */
+#define KINETIS_USB_BDTPAGE1_OFFSET 0x009c /* BDT Page Register 1 */
+#define KINETIS_USB_FRMNUML_OFFSET  0x00a0 /* Frame Number Register Low */
+#define KINETIS_USB_FRMNUMH_OFFSET  0x00a4 /* Frame Number Register High */
+#define KINETIS_USB_TOKEN_OFFSET    0x00a8 /* Token Register */
+#define KINETIS_USB_SOFTHLD_OFFSET  0x00ac /* SOF Threshold Register */
+#define KINETIS_USB_BDTPAGE2_OFFSET 0x00b0 /* BDT Page Register 2 */
+#define KINETIS_USB_BDTPAGE3_OFFSET 0x00b4 /* BDT Page Register 3 */
+
+#define KINETIS_USB_ENDPT_OFFSET(n) (0x00c0+((n)<<2)) /* Endpoint n Control Register */
+#define KINETIS_USB_ENDPT0_OFFSET   0x00c0 /* Endpoint 0 Control Register */
+#define KINETIS_USB_ENDPT1_OFFSET   0x00c4 /* Endpoint 1 Control Register */
+#define KINETIS_USB_ENDPT2_OFFSET   0x00c8 /* Endpoint 2 Control Register */
+#define KINETIS_USB_ENDPT3_OFFSET   0x00cc /* Endpoint 3 Control Register */
+#define KINETIS_USB_ENDPT4_OFFSET   0x00d0 /* Endpoint 4 Control Register */
+#define KINETIS_USB_ENDPT5_OFFSET   0x00d4 /* Endpoint 5 Control Register */
+#define KINETIS_USB_ENDPT6_OFFSET   0x00d8 /* Endpoint 6 Control Register */
+#define KINETIS_USB_ENDPT7_OFFSET   0x00dc /* Endpoint 7 Control Register */
+#define KINETIS_USB_ENDPT8_OFFSET   0x00e0 /* Endpoint 8 Control Register */
+#define KINETIS_USB_ENDPT9_OFFSET   0x00e4 /* Endpoint 9 Control Register */
+#define KINETIS_USB_ENDPT10_OFFSET  0x00e8 /* Endpoint 10 Control Register */
+#define KINETIS_USB_ENDPT11_OFFSET  0x00ec /* Endpoint 11 Control Register */
+#define KINETIS_USB_ENDPT12_OFFSET  0x00f0 /* Endpoint 12 Control Register */
+#define KINETIS_USB_ENDPT13_OFFSET  0x00f4 /* Endpoint 13 Control Register */
+#define KINETIS_USB_ENDPT14_OFFSET  0x00f8 /* Endpoint 14 Control Register */
+#define KINETIS_USB_ENDPT15_OFFSET  0x00fc /* Endpoint 15 Control Register */
+
+#define KINETIS_USB_USBCTRL_OFFSET  0x0100 /* USB Control Register */
+#define KINETIS_USB_OBSERVE_OFFSET  0x0104 /* USB OTG Observe Register */
+#define KINETIS_USB_CONTROL_OFFSET  0x0108 /* USB OTG Control Register */
+#define KINETIS_USB_USBTRC0_OFFSET  0x010c /* USB Transceiver Control Register 0 */
+
+#ifdef KINETIS_K64
+#  define KINETIS_USB_USBFRMADJUST_OFFSET                0x114 /* Frame Adjust Register */
+#  define KINETIS_USB_USB0_CLK_RECOVER_CTRL_OFFSET       0x140 /* USB Clock recovery control */
+#  define KINETIS_USB_USB0_CLK_RECOVER_IRC_EN_OFFSET     0x144 /* IRC48M oscillator enable register */
+#  define KINETIS_USB_USB0_CLK_RECOVER_INT_STATUS_OFFSET 0x15c /* Clock recovery sperated interrupt status */
+#endif
+
+/* Register Addresses ***********************************************************************/
+
+#define KINETIS_USB0_PERID          (KINETIS_USB0_BASE+KINETIS_USB_PERID_OFFSET)
+#define KINETIS_USB0_IDCOMP         (KINETIS_USB0_BASE+KINETIS_USB_IDCOMP_OFFSET)
+#define KINETIS_USB0_REV            (KINETIS_USB0_BASE+KINETIS_USB_REV_OFFSET)
+#define KINETIS_USB0_ADDINFO        (KINETIS_USB0_BASE+KINETIS_USB_ADDINFO_OFFSET)
+#define KINETIS_USB0_OTGISTAT       (KINETIS_USB0_BASE+KINETIS_USB_OTGISTAT_OFFSET)
+#define KINETIS_USB0_OTGICR         (KINETIS_USB0_BASE+KINETIS_USB_OTGICR_OFFSET)
+#define KINETIS_USB0_OTGSTAT        (KINETIS_USB0_BASE+KINETIS_USB_OTGSTAT_OFFSET)
+#define KINETIS_USB0_OTGCTL         (KINETIS_USB0_BASE+KINETIS_USB_OTGCTL_OFFSET)
+#define KINETIS_USB0_ISTAT          (KINETIS_USB0_BASE+KINETIS_USB_ISTAT_OFFSET)
+#define KINETIS_USB0_INTEN          (KINETIS_USB0_BASE+KINETIS_USB_INTEN_OFFSET)
+#define KINETIS_USB0_ERRSTAT        (KINETIS_USB0_BASE+KINETIS_USB_ERRSTAT_OFFSET)
+#define KINETIS_USB0_ERREN          (KINETIS_USB0_BASE+KINETIS_USB_ERREN_OFFSET)
+#define KINETIS_USB0_STAT           (KINETIS_USB0_BASE+KINETIS_USB_STAT_OFFSET)
+#define KINETIS_USB0_CTL            (KINETIS_USB0_BASE+KINETIS_USB_CTL_OFFSET)
+#define KINETIS_USB0_ADDR           (KINETIS_USB0_BASE+KINETIS_USB_ADDR_OFFSET)
+#define KINETIS_USB0_BDTPAGE1       (KINETIS_USB0_BASE+KINETIS_USB_BDTPAGE1_OFFSET)
+#define KINETIS_USB0_FRMNUML        (KINETIS_USB0_BASE+KINETIS_USB_FRMNUML_OFFSET)
+#define KINETIS_USB0_FRMNUMH        (KINETIS_USB0_BASE+KINETIS_USB_FRMNUMH_OFFSET)
+#define KINETIS_USB0_TOKEN          (KINETIS_USB0_BASE+KINETIS_USB_TOKEN_OFFSET)
+#define KINETIS_USB0_SOFTHLD        (KINETIS_USB0_BASE+KINETIS_USB_SOFTHLD_OFFSET)
+#define KINETIS_USB0_BDTPAGE2       (KINETIS_USB0_BASE+KINETIS_USB_BDTPAGE2_OFFSET)
+#define KINETIS_USB0_BDTPAGE3       (KINETIS_USB0_BASE+KINETIS_USB_BDTPAGE3_OFFSET)
+
+#define KINETIS_USB0_ENDPT(n)       (KINETIS_USB0_BASE+KINETIS_USB_ENDPT_OFFSET(n))
+#define KINETIS_USB0_ENDPT0         (KINETIS_USB0_BASE+KINETIS_USB_ENDPT0_OFFSET)
+#define KINETIS_USB0_ENDPT1         (KINETIS_USB0_BASE+KINETIS_USB_ENDPT1_OFFSET)
+#define KINETIS_USB0_ENDPT2         (KINETIS_USB0_BASE+KINETIS_USB_ENDPT2_OFFSET)
+#define KINETIS_USB0_ENDPT3         (KINETIS_USB0_BASE+KINETIS_USB_ENDPT3_OFFSET)
+#define KINETIS_USB0_ENDPT4         (KINETIS_USB0_BASE+KINETIS_USB_ENDPT4_OFFSET)
+#define KINETIS_USB0_ENDPT5         (KINETIS_USB0_BASE+KINETIS_USB_ENDPT5_OFFSET)
+#define KINETIS_USB0_ENDPT6         (KINETIS_USB0_BASE+KINETIS_USB_ENDPT6_OFFSET)
+#define KINETIS_USB0_ENDPT7         (KINETIS_USB0_BASE+KINETIS_USB_ENDPT7_OFFSET)
+#define KINETIS_USB0_ENDPT8         (KINETIS_USB0_BASE+KINETIS_USB_ENDPT8_OFFSET)
+#define KINETIS_USB0_ENDPT9         (KINETIS_USB0_BASE+KINETIS_USB_ENDPT9_OFFSET)
+#define KINETIS_USB0_ENDPT10        (KINETIS_USB0_BASE+KINETIS_USB_ENDPT10_OFFSET)
+#define KINETIS_USB0_ENDPT11        (KINETIS_USB0_BASE+KINETIS_USB_ENDPT11_OFFSET)
+#define KINETIS_USB0_ENDPT12        (KINETIS_USB0_BASE+KINETIS_USB_ENDPT12_OFFSET)
+#define KINETIS_USB0_ENDPT13        (KINETIS_USB0_BASE+KINETIS_USB_ENDPT13_OFFSET)
+#define KINETIS_USB0_ENDPT14        (KINETIS_USB0_BASE+KINETIS_USB_ENDPT14_OFFSET)
+#define KINETIS_USB0_ENDPT15        (KINETIS_USB0_BASE+KINETIS_USB_ENDPT15_OFFSET)
+
+#define KINETIS_USB0_USBCTRL        (KINETIS_USB0_BASE+KINETIS_USB_USBCTRL_OFFSET)
+#define KINETIS_USB0_OBSERVE        (KINETIS_USB0_BASE+KINETIS_USB_OBSERVE_OFFSET)
+#define KINETIS_USB0_CONTROL        (KINETIS_USB0_BASE+KINETIS_USB_CONTROL_OFFSET)
+#define KINETIS_USB0_USBTRC0        (KINETIS_USB0_BASE+KINETIS_USB_USBTRC0_OFFSET)
+
+#ifdef KINETIS_K64
+#  define KINETIS_USB_USBFRMADJUST \
+    (KINETIS_USB0_BASE+KINETIS_USB_USBFRMADJUST_OFFSET)       
+#  define KINETIS_USB_USB0_CLK_RECOVER_CTRL \
+    (KINETIS_USB0_BASE+KINETIS_USB_USB0_CLK_RECOVER_CTRL_OFFSET)   
+#  define KINETIS_USB_USB0_CLK_RECOVER_IRC_EN \
+    (KINETIS_USB0_BASE+KINETIS_USB_USB0_CLK_RECOVER_IRC_EN_OFFSET)  
+#  define KINETIS_USB_USB0_CLK_RECOVER_INT_STATUS \
+    (KINETIS_USB0_BASE+KINETIS_USB_USB0_CLK_RECOVER_INT_STATUS_OFFSET)
+#endif
+
+/* Register Bit Definitions *****************************************************************/
+
+/* Peripheral ID Register (8-bit) */
+                                              /* Bits 6-7: Reserved */
+#define USB_PERID_MASK              (0x3f)    /* Bits 0-5: Peripheral identification bits */
+
+/* Peripheral ID Complement Register (8-bit) */
+#define USB_IDCOMP_
+                                              /* Bits 6-7: Reserved */
+#define USB_IDCOMP_MASK             (0x3f)    /* Bits 0-5: Ones complement of peripheral identification bits */
+
+/* Peripheral Revision Register (8-bit revision number) */
+
+/* Peripheral Additional Info Register (8-bit) */
+
+#define USB_ADDINFO_IEHOST          (1 << 0)  /* Bit 0:  This bit is set if host mode is enabled */
+                                              /* Bits 1-2: Reserved */
+#define USB_ADDINFO_IRQNUM_SHIFT    (3)       /* Bits 3-7: Assigned Interrupt Request Number */
+#define USB_ADDINFO_IRQNUM_MASK     (31 << USB_ADDINFO_IRQNUM_SHIFT)
+
+/* OTG Interrupt Status Register(8-bit)  */
+
+#define USB_OTGISTAT_AVBUSCHG       (1 << 0)  /* Bit 0:  Change in VBUS is detected on an A device */
+                                              /* Bit 1:  Reserved */
+#define USB_OTGISTAT_B_SESS_CHG     (1 << 2)  /* Bit 2:  Change in VBUS is detected on a B device */
+#define USB_OTGISTAT_SESSVLDCHG     (1 << 3)  /* Bit 3:  Change in VBUS is detected */
+                                              /* Bit 4:  Reserved */
+#define USB_OTGISTAT_LINE_STATE_CHG (1 << 5)  /* Bit 5:  Change USB line state */
+#define USB_OTGISTAT_ONEMSEC        (1 << 6)  /* Bit 6:  Set when the 1 millisecond timer expires */
+#define USB_OTGISTAT_IDCHG          (1 << 7)  /* Bit 7:  Change in ID Signal from the USB connector */
+
+/* OTG Interrupt Control Register (8-bit) */
+
+#define USB_OTGICR_AVBUSEN          (1 << 0)  /* Bit 0:  A VBUS Valid interrupt enable */
+                                              /* Bit 1:  Reserved */
+#define USB_OTGICR_BSESSEN          (1 << 2)  /* Bit 2:  B Session END interrupt enable */
+#define USB_OTGICR_SESSVLDEN        (1 << 3)  /* Bit 3:  Session valid interrupt enable */
+                                              /* Bit 4:  Reserved */
+#define USB_OTGICR_LINESTATEEN      (1 << 5)  /* Bit 5:  Line State change interrupt enable */
+#define USB_OTGICR_ONEMSECEN        (1 << 6)  /* Bit 6:  1 millisecond interrupt enable */
+#define USB_OTGICR_IDEN             (1 << 7)  /* Bit 7:  ID interrupt enable */
+
+/* OTG Status Register (8-bit) */
+
+#define USB_OTGSTAT_AVBUSVLD        (1 << 0)  /* Bit 0:  A VBUS Valid */
+                                              /* Bit 1:  Reserved */
+#define USB_OTGSTAT_BSESSEND        (1 << 2)  /* Bit 2:  B Session END */
+#define USB_OTGSTAT_SESS_VLD        (1 << 3)  /* Bit 3:  Session valid */
+                                              /* Bit 4:  Reserved */
+#define USB_OTGSTAT_LINESTATESTABLE (1 << 5)  /* Bit 5:  OTGISTAT LINE_STATE_CHG bit stable */
+#define USB_OTGSTAT_ONEMSECEN       (1 << 6)  /* Bit 6:  Reserved for the 1msec count */
+#define USB_OTGSTAT_ID              (1 << 7)  /* Bit 7:  Current state of the ID pin on the USB connector */
+
+/* OTG Control Register (8-bit) */
+                                              /* Bits 0-1:  Reserved */
+#define USB_OTGCTL_OTGEN            (1 << 2)  /* Bit 2:  On-The-Go pullup/pulldown resistor enable */
+                                              /* Bit 3:  Reserved */
+#define USB_OTGCTL_DMLOW            (1 << 4)  /* Bit 4:  D- Data Line pull-down resistor enable */
+#define USB_OTGCTL_DPLOW            (1 << 5)  /* Bit 5:  D+ Data Line pull-down resistor enable */
+                                              /* Bit 6:  Reserved */
+#define USB_OTGCTL_DPHIGH           (1 << 7)  /* Bit 7: D+ Data Line pullup resistor enable */
+
+/* Interrupt Status Register Interrupt Enable Register (8-bit) */
+
+#define USB_INT_USBRST              (1 << 0)  /* Bit 0:  USB Module has decoded a valid USB reset */
+#define USB_INT_ERROR               (1 << 1)  /* Bit 1:  Any of the error conditions within the ERRSTAT register */
+#define USB_INT_SOFTOK              (1 << 2)  /* Bit 2:  USB Module received a Start Of Frame (SOF) token */
+#define USB_INT_TOKDNE              (1 << 3)  /* Bit 3:  Current token being processed has completed */
+#define USB_INT_SLEEP               (1 << 4)  /* Bit 4:  Constant idle on the USB bus for 3 milliseconds */
+#define USB_INT_RESUME              (1 << 5)  /* Bit 5:  Signal remote wake-up signaling */
+#define USB_INT_ATTACH              (1 << 6)  /* Bit 6:  Attach Interrupt */
+#define USB_INT_STALL               (1 << 7)  /* Bit 7:  Stall Interrupt */
+
+#define USB_INT_ALL                0xFF
+
+/* Error Interrupt Status Register and Error Interrupt Enable Register (8-bit) */
+
+#define USB_ERRSTAT_PIDERR          (1 << 0)  /* Bit 0:  This bit is set when the PID check field fails */
+#define USB_ERRSTAT_CRC5EOF         (1 << 1)  /* Bit 1:  Host data CRC error or End of frame errors */
+#define USB_ERRSTAT_CRC16           (1 << 2)  /* Bit 2:  Data packet is rejected due to a CRC16 error */
+#define USB_ERRSTAT_DFN8            (1 << 3)  /* Bit 3:  Data field received was not 8 bits in length */
+#define USB_ERRSTAT_BTOERR          (1 << 4)  /* Bit 4:  Bus turnaround timeout error occurred */
+#define USB_ERRSTAT_DMAERR          (1 << 5)  /* Bit 5:  DMA error */
+                                              /* Bit 6:  Reserved */
+#define USB_ERRSTAT_BTSERR          (1 << 7)  /* Bit 7:  Bit stuff error is detected */
+
+#define USB_EINT_ALL               0xBF
+
+/* Status Register (8-bit) */
+
+                                              /* Bits 0-1:  Reserved */
+#define USB_STAT_ODD                (1 << 2)  /* Bit 2:  Last Buffer Descriptor was in the odd bank of the BDT */
+#define USB_STAT_TX                 (1 << 3)  /* Bit 3:  Transmit Indicator */
+#define USB_STAT_ENDP_SHIFT         (4)       /* Bits 4-7: Endpoint address that received or transmitted the token */
+#define USB_STAT_ENDP_MASK          (15 << USB_STAT_ENDP_SHIFT)
+
+/* Control Register (8-bit) */
+
+#define USB_CTL_USBENSOFEN          (1 << 0)  /* Bit 0:  USB Enable */
+#define USB_CTL_ODDRST              (1 << 1)  /* Bit 1:  Resets all the BDT ODD ping/pong bits to 0 */
+#define USB_CTL_RESUME              (1 << 2)  /* Bit 2:  Enables the USB Module to execute resume signaling */
+#define USB_CTL_HOSTMODEEN          (1 << 3)  /* Bit 3:  Enables the USB Module to operate in Host mode */
+#define USB_CTL_RESET               (1 << 4)  /* Bit 4:  Enables the USB Module to generate USB reset signaling */
+#define USB_CTL_TXSUSPENDTOKENBUSY  (1 << 5)  /* Bit 5:  USB Module is busy executing a USB token */
+#define USB_CTL_SE0                 (1 << 6)  /* Bit 6:  Live USB Single Ended Zero signal */
+#define USB_CTL_JSTATE              (1 << 7)  /* Bit 7:  Live USB differential receiver JSTATE signal */
+
+/* Address Register (8-bit) */
+
+#define USB_ADDR_LSEN               (1 << 7)  /* Bit 7:  Low Speed Enable bit */
+#define USB_ADDR_SHIFT              (0)       /* Bits 0-6: USB address */
+#define USB_ADDR_MASK               (0x7f << USB_ADDR_SHIFT)
+
+/* BDT Page Register 1 (8-bit) */
+                                              /* Bit 0:  Reserved */
+#define USB_BDTPAGE1_SHIFT          (1)       /* Bits 1-7: Address bits 9-15 of the BDT base address */
+#define USB_BDTPAGE1_MASK           (0x7f << USB_BDTPAGE1_SHIFT)
+
+/* Frame Number Register Low (8-bit, bits 0-7 of the 11 bit frame number) */
+#define USB_FRMNUML_MASK            0xFF
+/* Frame Number Register High (8-bit) */
+                                              /* Bits 3-7:  Reserved */
+#define USB_FRMNUMH_SHIFT           (0)       /* Bits 0-2: Bits 8-10 of the 11-bit frame number */
+#define USB_FRMNUMH_MASK            (7 << USB_FRMNUMH_SHIFT)
+
+/* Token Register (8-bit) */
+
+#define USB_TOKEN_ENDPT_SHIFT       (0)       /* Bits 0-3: Endpoint address for the token command */
+#define USB_TOKEN_ENDPT_MASK        (15 << USB_TOKEN_ENDPT_SHIFT)
+#define USB_TOKEN_PID_SHIFT         (4)       /* Bits 4-7: Token type executed by the USB Module */
+#define USB_TOKEN_PID_MASK          (15 << USB_TOKEN_PID_SHIFT)
+#  define USB_TOKEN_PID_OUT         (1 << USB_TOKEN_PID_SHIFT)  /* OUT Token */
+#  define USB_TOKEN_PID_IN          (9 << USB_TOKEN_PID_SHIFT)  /* IN Token */
+#  define USB_TOKEN_PID_SETUP       (13 << USB_TOKEN_PID_SHIFT) /* SETUP Token */
+
+/* SOF Threshold Register (8-bit count value) */
+/* BDT Page Register 2/3 (16 bit address in two 8-bit registers) */
+
+/* Endpoint n Control Register (8-bit) */
+
+#define USB_ENDPT_EPHSHK            (1 << 0)  /* Bit 0:  Enable handshaking during a transaction to the endpoint */
+#define USB_ENDPT_EPSTALL           (1 << 1)  /* Bit 1:  Endpoint is stalled */
+#define USB_ENDPT_EPTXEN            (1 << 2)  /* Bit 2:  Enable the endpoint for TX transfers */
+#define USB_ENDPT_EPRXEN            (1 << 3)  /* Bit 3:  Enable the endpoint for RX transfers */
+#define USB_ENDPT_EPCTLDIS          (1 << 4)  /* Bit 4:  Disable control (SETUP) transfers */
+                                              /* Bit 5:  Reserved */
+#define USB_ENDPT_RETRYDIS          (1 << 6)  /* Bit 6:  Disable host retry NAK'ed transactions (host EP0) */
+#define USB_ENDPT_HOSTWOHUB         (1 << 7)  /* Bit 7:  Allows the host to communicate to a low speed device (host EP0) */
+
+/* USB Control Register (8-bit) */
+                                              /* Bits 0-5:  Reserved */
+#define USB_USBCTRL_PDE             (1 << 6)  /* Bit 6:  Enables the weak pulldowns on the USB transceiver */
+#define USB_USBCTRL_SUSP            (1 << 7)  /* Bit 7:  Places the USB transceiver into the suspend state */
+
+/* USB OTG Observe Register (8-bit) */
+                                              /* Bits 0-3:  Reserved */
+#define USB_OBSERVE_DMPD            (1 << 4)  /* Bit 4:  D- Pull Down signal output from the USB OTG module */
+                                              /* Bit 5:  Reserved */
+#define USB_OBSERVE_DPPD            (1 << 6)  /* Bit 6:  D+ Pull Down signal output from the USB OTG module */
+#define USB_OBSERVE_DPPU            (1 << 7)  /* Bit 7:  D+ Pull Up signal output from the USB OTG module */
+
+/* USB OTG Control Register (8-bit) */
+                                              /* Bits 0-3:  Reserved */
+#define USB_CONTROL_DPPULLUPNONOTG  (1 << 4)  /* Bit 4:  Controls of the DP PULLUP in the USB OTG module */
+                                              /* Bits 5-7:  Reserved */
+/* USB Transceiver Control Register 0 (8-bit) */
+
+#define USB_USBTRC0_USBRESET        (1 << 7)  /* Bit 7:  USB reset */
+                                              /* Bit 6:  Reserved */
+#define USB_USBTRC0_USBRESMEN       (1 << 5)  /* Bit 5:  Asynchronous Resume Interrupt Enable */
+                                              /* Bits 2-4:  Reserved */
+#define USB_USBTRC0_SYNC_DET        (1 << 1)  /* Bit 1:  Synchronous USB Interrupt Detect */
+#define USB_USBTRC0_RESUME_INT      (1 << 0)  /* Bit 0:  USB Asynchronous Interrupt */
+
+/* Buffer Descriptor Table (BDT) ****************************************************/
+/* Offset 0: On write (software->hardware) */
+
+#define USB_BDT_STATUS_MASK        0xfc     /* Bits 2-7: Status bits */
+#define USB_BDT_BSTALL             (1 << 2) /*   Bit 2: Buffer Stall Enable bit */
+#define USB_BDT_DTS                (1 << 3) /*   Bit 3: Data Toggle Synchronization Enable bit */
+#define USB_BDT_NINC               (1 << 4) /*   Bit 4: DMA Address Increment Disable bit */
+#define USB_BDT_KEEP               (1 << 5) /*   Bit 5: BD Keep Enable bit */
+#define USB_BDT_DATA01             (1 << 6) /*   Bit 6: Data Toggle Packet bit */
+#define USB_BDT_UOWN               (1 << 7) /*   Bit 7: USB Own bit */
+#define USB_BDT_BYTECOUNT_SHIFT    (16)     /* Bits 16-25: Byte Count bits */
+#define USB_BDT_BYTECOUNT_MASK     (0x3ff << USB_BDT_BYTECOUNT_SHIFT)
+
+#define USB_BDT_DATA0              0              /* DATA0 packet expected next */
+#define USB_BDT_DATA1              USB_BDT_DATA01 /* DATA1 packet expected next */
+#define USB_BDT_COWN               0              /* CPU owns the descriptor */
+
+/* Offset 0: On read (hardware->software) */
+
+#define USB_BDT_PID_SHIFT          (2)      /* Bits 2-5: Packet Identifier bits */
+#define USB_BDT_PID_MASK           (15 << USB_BDT_PID_SHIFT)
+                                            /* Bit 7: USB Own bit (same) */
+                                            /* Bits 16-25: Byte Count bits (same) */
+
+/* Offset 4: BUFFER_ADDRESS, 32-bit Buffer Address bits */
+
+#define USB_BDT_BYTES_SIZE         8        /* Eight bytes per BDT */
+#define USB_BDT_WORD_SIZE          2        /* Two 32-bit words per BDT */
+#define USB_NBDTS_PER_EP           4        /* Number of BDTS per endpoint: IN/OUT and EVEN/ODD */
+
+/************************************************************************************
+ * Public Types
+ ************************************************************************************/
+
+/********************************************************************************************
+ * Public Functions
+ ********************************************************************************************/
+
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_USBOTG_H */
diff --git a/arch/arm/src/kinetis/kinetis_vrefv1.h b/arch/arm/src/kinetis/chip/kinetis_vrefv1.h
similarity index 94%
rename from arch/arm/src/kinetis/kinetis_vrefv1.h
rename to arch/arm/src/kinetis/chip/kinetis_vrefv1.h
index ed9a1ff95c..29c871dd22 100644
--- a/arch/arm/src/kinetis/kinetis_vrefv1.h
+++ b/arch/arm/src/kinetis/chip/kinetis_vrefv1.h
@@ -1,7 +1,7 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/kinetis_vrefv1.h
+ * arch/arm/src/kinetis/chip/kinetis_vrefv1.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_VREFV1_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_VREFV1_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_VREFV1_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_VREFV1_H
 
 /********************************************************************************************
  * Included Files
@@ -89,4 +89,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_VREFV1_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_VREFV1_H */
diff --git a/arch/arm/src/kinetis/kinetis_wdog.h b/arch/arm/src/kinetis/chip/kinetis_wdog.h
similarity index 95%
rename from arch/arm/src/kinetis/kinetis_wdog.h
rename to arch/arm/src/kinetis/chip/kinetis_wdog.h
index 326c2cf628..6f50386049 100644
--- a/arch/arm/src/kinetis/kinetis_wdog.h
+++ b/arch/arm/src/kinetis/chip/kinetis_wdog.h
@@ -1,7 +1,7 @@
 /********************************************************************************************
- * arch/arm/src/kinetis/kinetis_wdog.h
+ * arch/arm/src/kinetis/chip/kinetis_wdog.h
  *
- *   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
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_KINETIS_KINETIS_WDOG_H
-#define __ARCH_ARM_SRC_KINETIS_KINETIS_WDOG_H
+#ifndef __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_WDOG_H
+#define __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_WDOG_H
 
 /********************************************************************************************
  * Included Files
@@ -90,7 +90,9 @@
 #define WDOG_STCTRLH_DBGEN           (1 << 5)  /* Bit 5:  Enables or disables WDOG in Debug mode */
 #define WDOG_STCTRLH_STOPEN          (1 << 6)  /* Bit 6:  Enables or disables WDOG in stop mode */
 #define WDOG_STCTRLH_WAITEN          (1 << 7)  /* Bit 7:  Enables or disables WDOG in wait mode */
-#define WDOG_STCTRLH_STNDBYEN        (1 << 8)  /* Bit 8:  Enables or disables WDOG in Standby mode */
+#ifndef KINETIS_K64
+#  define WDOG_STCTRLH_STNDBYEN      (1 << 8)  /* Bit 8:  Enables or disables WDOG in Standby mode */
+#endif
                                                /* Bit 9:  Reserved */
 #define WDOG_STCTRLH_TESTWDOG        (1 << 10) /* Bit 10: Selects functional test mode */
 #define WDOG_STCTRLH_TESTSEL         (1 << 11) /* Bit 11: Selects the test to be run */
@@ -132,4 +134,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_KINETIS_KINETIS_WDOG_H */
+#endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_WDOG_H */
diff --git a/arch/arm/src/kinetis/kinetis_lowputc.c b/arch/arm/src/kinetis/kinetis_lowputc.c
index 989efada5e..ec85713c93 100644
--- a/arch/arm/src/kinetis/kinetis_lowputc.c
+++ b/arch/arm/src/kinetis/kinetis_lowputc.c
@@ -49,7 +49,7 @@
 
 #include "kinetis_config.h"
 #include "kinetis.h"
-#include "kinetis_uart.h"
+#include "chip/kinetis_uart.h"
 #include "chip/kinetis_sim.h"
 #include "chip/kinetis_pinmux.h"
 
diff --git a/arch/arm/src/kinetis/kinetis_serial.c b/arch/arm/src/kinetis/kinetis_serial.c
index d47235ba90..53fd7e2b4a 100644
--- a/arch/arm/src/kinetis/kinetis_serial.c
+++ b/arch/arm/src/kinetis/kinetis_serial.c
@@ -59,7 +59,7 @@
 
 #include "kinetis_config.h"
 #include "chip.h"
-#include "kinetis_uart.h"
+#include "chip/kinetis_uart.h"
 #include "kinetis.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/kinetis/kinetis_start.c b/arch/arm/src/kinetis/kinetis_start.c
index 8de2524ef5..21885d9268 100644
--- a/arch/arm/src/kinetis/kinetis_start.c
+++ b/arch/arm/src/kinetis/kinetis_start.c
@@ -51,7 +51,7 @@
 #include "up_internal.h"
 
 #include "kinetis.h"
-#include "kinetis_smc.h"
+#include "chip/kinetis_smc.h"
 #include "kinetis_userspace.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/kinetis/kinetis_usbotg.h b/arch/arm/src/kinetis/kinetis_usbotg.h
index de53d51293..655c7ccee9 100644
--- a/arch/arm/src/kinetis/kinetis_usbotg.h
+++ b/arch/arm/src/kinetis/kinetis_usbotg.h
@@ -42,311 +42,7 @@
 
 #include 
 
-#include "chip.h"
-
-/********************************************************************************************
- * Pre-processor Definitions
- ********************************************************************************************/
-
-/* Register Offsets *************************************************************************/
-
-#define KINETIS_USB_PERID_OFFSET    0x0000 /* Peripheral ID Register */
-#define KINETIS_USB_IDCOMP_OFFSET   0x0004 /* Peripheral ID Complement Register */
-#define KINETIS_USB_REV_OFFSET      0x0008 /* Peripheral Revision Register */
-#define KINETIS_USB_ADDINFO_OFFSET  0x000c /* Peripheral Additional Info Register */
-#define KINETIS_USB_OTGISTAT_OFFSET 0x0010 /* OTG Interrupt Status Register */
-#define KINETIS_USB_OTGICR_OFFSET   0x0014 /* OTG Interrupt Control Register */
-#define KINETIS_USB_OTGSTAT_OFFSET  0x0018 /* OTG Status Register */
-#define KINETIS_USB_OTGCTL_OFFSET   0x001c /* OTG Control Register */
-#define KINETIS_USB_ISTAT_OFFSET    0x0080 /* Interrupt Status Register */
-#define KINETIS_USB_INTEN_OFFSET    0x0084 /* Interrupt Enable Register */
-#define KINETIS_USB_ERRSTAT_OFFSET  0x0088 /* Error Interrupt Status Register */
-#define KINETIS_USB_ERREN_OFFSET    0x008c /* Error Interrupt Enable Register */
-#define KINETIS_USB_STAT_OFFSET     0x0090 /* Status Register */
-#define KINETIS_USB_CTL_OFFSET      0x0094 /* Control Register */
-#define KINETIS_USB_ADDR_OFFSET     0x0098 /* Address Register */
-#define KINETIS_USB_BDTPAGE1_OFFSET 0x009c /* BDT Page Register 1 */
-#define KINETIS_USB_FRMNUML_OFFSET  0x00a0 /* Frame Number Register Low */
-#define KINETIS_USB_FRMNUMH_OFFSET  0x00a4 /* Frame Number Register High */
-#define KINETIS_USB_TOKEN_OFFSET    0x00a8 /* Token Register */
-#define KINETIS_USB_SOFTHLD_OFFSET  0x00ac /* SOF Threshold Register */
-#define KINETIS_USB_BDTPAGE2_OFFSET 0x00b0 /* BDT Page Register 2 */
-#define KINETIS_USB_BDTPAGE3_OFFSET 0x00b4 /* BDT Page Register 3 */
-
-#define KINETIS_USB_ENDPT_OFFSET(n) (0x00c0+((n)<<2)) /* Endpoint n Control Register */
-#define KINETIS_USB_ENDPT0_OFFSET   0x00c0 /* Endpoint 0 Control Register */
-#define KINETIS_USB_ENDPT1_OFFSET   0x00c4 /* Endpoint 1 Control Register */
-#define KINETIS_USB_ENDPT2_OFFSET   0x00c8 /* Endpoint 2 Control Register */
-#define KINETIS_USB_ENDPT3_OFFSET   0x00cc /* Endpoint 3 Control Register */
-#define KINETIS_USB_ENDPT4_OFFSET   0x00d0 /* Endpoint 4 Control Register */
-#define KINETIS_USB_ENDPT5_OFFSET   0x00d4 /* Endpoint 5 Control Register */
-#define KINETIS_USB_ENDPT6_OFFSET   0x00d8 /* Endpoint 6 Control Register */
-#define KINETIS_USB_ENDPT7_OFFSET   0x00dc /* Endpoint 7 Control Register */
-#define KINETIS_USB_ENDPT8_OFFSET   0x00e0 /* Endpoint 8 Control Register */
-#define KINETIS_USB_ENDPT9_OFFSET   0x00e4 /* Endpoint 9 Control Register */
-#define KINETIS_USB_ENDPT10_OFFSET  0x00e8 /* Endpoint 10 Control Register */
-#define KINETIS_USB_ENDPT11_OFFSET  0x00ec /* Endpoint 11 Control Register */
-#define KINETIS_USB_ENDPT12_OFFSET  0x00f0 /* Endpoint 12 Control Register */
-#define KINETIS_USB_ENDPT13_OFFSET  0x00f4 /* Endpoint 13 Control Register */
-#define KINETIS_USB_ENDPT14_OFFSET  0x00f8 /* Endpoint 14 Control Register */
-#define KINETIS_USB_ENDPT15_OFFSET  0x00fc /* Endpoint 15 Control Register */
-
-#define KINETIS_USB_USBCTRL_OFFSET  0x0100 /* USB Control Register */
-#define KINETIS_USB_OBSERVE_OFFSET  0x0104 /* USB OTG Observe Register */
-#define KINETIS_USB_CONTROL_OFFSET  0x0108 /* USB OTG Control Register */
-#define KINETIS_USB_USBTRC0_OFFSET  0x010c /* USB Transceiver Control Register 0 */
-
-/* Register Addresses ***********************************************************************/
-
-#define KINETIS_USB0_PERID          (KINETIS_USB0_BASE+KINETIS_USB_PERID_OFFSET)
-#define KINETIS_USB0_IDCOMP         (KINETIS_USB0_BASE+KINETIS_USB_IDCOMP_OFFSET)
-#define KINETIS_USB0_REV            (KINETIS_USB0_BASE+KINETIS_USB_REV_OFFSET)
-#define KINETIS_USB0_ADDINFO        (KINETIS_USB0_BASE+KINETIS_USB_ADDINFO_OFFSET)
-#define KINETIS_USB0_OTGISTAT       (KINETIS_USB0_BASE+KINETIS_USB_OTGISTAT_OFFSET)
-#define KINETIS_USB0_OTGICR         (KINETIS_USB0_BASE+KINETIS_USB_OTGICR_OFFSET)
-#define KINETIS_USB0_OTGSTAT        (KINETIS_USB0_BASE+KINETIS_USB_OTGSTAT_OFFSET)
-#define KINETIS_USB0_OTGCTL         (KINETIS_USB0_BASE+KINETIS_USB_OTGCTL_OFFSET)
-#define KINETIS_USB0_ISTAT          (KINETIS_USB0_BASE+KINETIS_USB_ISTAT_OFFSET)
-#define KINETIS_USB0_INTEN          (KINETIS_USB0_BASE+KINETIS_USB_INTEN_OFFSET)
-#define KINETIS_USB0_ERRSTAT        (KINETIS_USB0_BASE+KINETIS_USB_ERRSTAT_OFFSET)
-#define KINETIS_USB0_ERREN          (KINETIS_USB0_BASE+KINETIS_USB_ERREN_OFFSET)
-#define KINETIS_USB0_STAT           (KINETIS_USB0_BASE+KINETIS_USB_STAT_OFFSET)
-#define KINETIS_USB0_CTL            (KINETIS_USB0_BASE+KINETIS_USB_CTL_OFFSET)
-#define KINETIS_USB0_ADDR           (KINETIS_USB0_BASE+KINETIS_USB_ADDR_OFFSET)
-#define KINETIS_USB0_BDTPAGE1       (KINETIS_USB0_BASE+KINETIS_USB_BDTPAGE1_OFFSET)
-#define KINETIS_USB0_FRMNUML        (KINETIS_USB0_BASE+KINETIS_USB_FRMNUML_OFFSET)
-#define KINETIS_USB0_FRMNUMH        (KINETIS_USB0_BASE+KINETIS_USB_FRMNUMH_OFFSET)
-#define KINETIS_USB0_TOKEN          (KINETIS_USB0_BASE+KINETIS_USB_TOKEN_OFFSET)
-#define KINETIS_USB0_SOFTHLD        (KINETIS_USB0_BASE+KINETIS_USB_SOFTHLD_OFFSET)
-#define KINETIS_USB0_BDTPAGE2       (KINETIS_USB0_BASE+KINETIS_USB_BDTPAGE2_OFFSET)
-#define KINETIS_USB0_BDTPAGE3       (KINETIS_USB0_BASE+KINETIS_USB_BDTPAGE3_OFFSET)
-
-#define KINETIS_USB0_ENDPT(n)       (KINETIS_USB0_BASE+KINETIS_USB_ENDPT_OFFSET(n))
-#define KINETIS_USB0_ENDPT0         (KINETIS_USB0_BASE+KINETIS_USB_ENDPT0_OFFSET)
-#define KINETIS_USB0_ENDPT1         (KINETIS_USB0_BASE+KINETIS_USB_ENDPT1_OFFSET)
-#define KINETIS_USB0_ENDPT2         (KINETIS_USB0_BASE+KINETIS_USB_ENDPT2_OFFSET)
-#define KINETIS_USB0_ENDPT3         (KINETIS_USB0_BASE+KINETIS_USB_ENDPT3_OFFSET)
-#define KINETIS_USB0_ENDPT4         (KINETIS_USB0_BASE+KINETIS_USB_ENDPT4_OFFSET)
-#define KINETIS_USB0_ENDPT5         (KINETIS_USB0_BASE+KINETIS_USB_ENDPT5_OFFSET)
-#define KINETIS_USB0_ENDPT6         (KINETIS_USB0_BASE+KINETIS_USB_ENDPT6_OFFSET)
-#define KINETIS_USB0_ENDPT7         (KINETIS_USB0_BASE+KINETIS_USB_ENDPT7_OFFSET)
-#define KINETIS_USB0_ENDPT8         (KINETIS_USB0_BASE+KINETIS_USB_ENDPT8_OFFSET)
-#define KINETIS_USB0_ENDPT9         (KINETIS_USB0_BASE+KINETIS_USB_ENDPT9_OFFSET)
-#define KINETIS_USB0_ENDPT10        (KINETIS_USB0_BASE+KINETIS_USB_ENDPT10_OFFSET)
-#define KINETIS_USB0_ENDPT11        (KINETIS_USB0_BASE+KINETIS_USB_ENDPT11_OFFSET)
-#define KINETIS_USB0_ENDPT12        (KINETIS_USB0_BASE+KINETIS_USB_ENDPT12_OFFSET)
-#define KINETIS_USB0_ENDPT13        (KINETIS_USB0_BASE+KINETIS_USB_ENDPT13_OFFSET)
-#define KINETIS_USB0_ENDPT14        (KINETIS_USB0_BASE+KINETIS_USB_ENDPT14_OFFSET)
-#define KINETIS_USB0_ENDPT15        (KINETIS_USB0_BASE+KINETIS_USB_ENDPT15_OFFSET)
-
-#define KINETIS_USB0_USBCTRL        (KINETIS_USB0_BASE+KINETIS_USB_USBCTRL_OFFSET)
-#define KINETIS_USB0_OBSERVE        (KINETIS_USB0_BASE+KINETIS_USB_OBSERVE_OFFSET)
-#define KINETIS_USB0_CONTROL        (KINETIS_USB0_BASE+KINETIS_USB_CONTROL_OFFSET)
-#define KINETIS_USB0_USBTRC0        (KINETIS_USB0_BASE+KINETIS_USB_USBTRC0_OFFSET)
-
-/* Register Bit Definitions *****************************************************************/
-
-/* Peripheral ID Register (8-bit) */
-                                              /* Bits 6-7: Reserved */
-#define USB_PERID_MASK              (0x3f)    /* Bits 0-5: Peripheral identification bits */
-
-/* Peripheral ID Complement Register (8-bit) */
-#define USB_IDCOMP_
-                                              /* Bits 6-7: Reserved */
-#define USB_IDCOMP_MASK             (0x3f)    /* Bits 0-5: Ones complement of peripheral identification bits */
-
-/* Peripheral Revision Register (8-bit revision number) */
-
-/* Peripheral Additional Info Register (8-bit) */
-
-#define USB_ADDINFO_IEHOST          (1 << 0)  /* Bit 0:  This bit is set if host mode is enabled */
-                                              /* Bits 1-2: Reserved */
-#define USB_ADDINFO_IRQNUM_SHIFT    (3)       /* Bits 3-7: Assigned Interrupt Request Number */
-#define USB_ADDINFO_IRQNUM_MASK     (31 << USB_ADDINFO_IRQNUM_SHIFT)
-
-/* OTG Interrupt Status Register(8-bit)  */
-
-#define USB_OTGISTAT_AVBUSCHG       (1 << 0)  /* Bit 0:  Change in VBUS is detected on an A device */
-                                              /* Bit 1:  Reserved */
-#define USB_OTGISTAT_B_SESS_CHG     (1 << 2)  /* Bit 2:  Change in VBUS is detected on a B device */
-#define USB_OTGISTAT_SESSVLDCHG     (1 << 3)  /* Bit 3:  Change in VBUS is detected */
-                                              /* Bit 4:  Reserved */
-#define USB_OTGISTAT_LINE_STATE_CHG (1 << 5)  /* Bit 5:  Change USB line state */
-#define USB_OTGISTAT_ONEMSEC        (1 << 6)  /* Bit 6:  Set when the 1 millisecond timer expires */
-#define USB_OTGISTAT_IDCHG          (1 << 7)  /* Bit 7:  Change in ID Signal from the USB connector */
-
-/* OTG Interrupt Control Register (8-bit) */
-
-#define USB_OTGICR_AVBUSEN          (1 << 0)  /* Bit 0:  A VBUS Valid interrupt enable */
-                                              /* Bit 1:  Reserved */
-#define USB_OTGICR_BSESSEN          (1 << 2)  /* Bit 2:  B Session END interrupt enable */
-#define USB_OTGICR_SESSVLDEN        (1 << 3)  /* Bit 3:  Session valid interrupt enable */
-                                              /* Bit 4:  Reserved */
-#define USB_OTGICR_LINESTATEEN      (1 << 5)  /* Bit 5:  Line State change interrupt enable */
-#define USB_OTGICR_ONEMSECEN        (1 << 6)  /* Bit 6:  1 millisecond interrupt enable */
-#define USB_OTGICR_IDEN             (1 << 7)  /* Bit 7:  ID interrupt enable */
-
-/* OTG Status Register (8-bit) */
-
-#define USB_OTGSTAT_AVBUSVLD        (1 << 0)  /* Bit 0:  A VBUS Valid */
-                                              /* Bit 1:  Reserved */
-#define USB_OTGSTAT_BSESSEND        (1 << 2)  /* Bit 2:  B Session END */
-#define USB_OTGSTAT_SESS_VLD        (1 << 3)  /* Bit 3:  Session valid */
-                                              /* Bit 4:  Reserved */
-#define USB_OTGSTAT_LINESTATESTABLE (1 << 5)  /* Bit 5:  OTGISTAT LINE_STATE_CHG bit stable */
-#define USB_OTGSTAT_ONEMSECEN       (1 << 6)  /* Bit 6:  Reserved for the 1msec count */
-#define USB_OTGSTAT_ID              (1 << 7)  /* Bit 7:  Current state of the ID pin on the USB connector */
-
-/* OTG Control Register (8-bit) */
-                                              /* Bits 0-1:  Reserved */
-#define USB_OTGCTL_OTGEN            (1 << 2)  /* Bit 2:  On-The-Go pullup/pulldown resistor enable */
-                                              /* Bit 3:  Reserved */
-#define USB_OTGCTL_DMLOW            (1 << 4)  /* Bit 4:  D- Data Line pull-down resistor enable */
-#define USB_OTGCTL_DPLOW            (1 << 5)  /* Bit 5:  D+ Data Line pull-down resistor enable */
-                                              /* Bit 6:  Reserved */
-#define USB_OTGCTL_DPHIGH           (1 << 7)  /* Bit 7: D+ Data Line pullup resistor enable */
-
-/* Interrupt Status Register Interrupt Enable Register (8-bit) */
-
-#define USB_INT_USBRST              (1 << 0)  /* Bit 0:  USB Module has decoded a valid USB reset */
-#define USB_INT_ERROR               (1 << 1)  /* Bit 1:  Any of the error conditions within the ERRSTAT register */
-#define USB_INT_SOFTOK              (1 << 2)  /* Bit 2:  USB Module received a Start Of Frame (SOF) token */
-#define USB_INT_TOKDNE              (1 << 3)  /* Bit 3:  Current token being processed has completed */
-#define USB_INT_SLEEP               (1 << 4)  /* Bit 4:  Constant idle on the USB bus for 3 milliseconds */
-#define USB_INT_RESUME              (1 << 5)  /* Bit 5:  Signal remote wake-up signaling */
-#define USB_INT_ATTACH              (1 << 6)  /* Bit 6:  Attach Interrupt */
-#define USB_INT_STALL               (1 << 7)  /* Bit 7:  Stall Interrupt */
-
-#define USB_INT_ALL                0xFF
-
-/* Error Interrupt Status Register and Error Interrupt Enable Register (8-bit) */
-
-#define USB_ERRSTAT_PIDERR          (1 << 0)  /* Bit 0:  This bit is set when the PID check field fails */
-#define USB_ERRSTAT_CRC5EOF         (1 << 1)  /* Bit 1:  Host data CRC error or End of frame errors */
-#define USB_ERRSTAT_CRC16           (1 << 2)  /* Bit 2:  Data packet is rejected due to a CRC16 error */
-#define USB_ERRSTAT_DFN8            (1 << 3)  /* Bit 3:  Data field received was not 8 bits in length */
-#define USB_ERRSTAT_BTOERR          (1 << 4)  /* Bit 4:  Bus turnaround timeout error occurred */
-#define USB_ERRSTAT_DMAERR          (1 << 5)  /* Bit 5:  DMA error */
-                                              /* Bit 6:  Reserved */
-#define USB_ERRSTAT_BTSERR          (1 << 7)  /* Bit 7:  Bit stuff error is detected */
-
-#define USB_EINT_ALL               0xBF
-
-/* Status Register (8-bit) */
-
-                                              /* Bits 0-1:  Reserved */
-#define USB_STAT_ODD                (1 << 2)  /* Bit 2:  Last Buffer Descriptor was in the odd bank of the BDT */
-#define USB_STAT_TX                 (1 << 3)  /* Bit 3:  Transmit Indicator */
-#define USB_STAT_ENDP_SHIFT         (4)       /* Bits 4-7: Endpoint address that received or transmitted the token */
-#define USB_STAT_ENDP_MASK          (15 << USB_STAT_ENDP_SHIFT)
-
-/* Control Register (8-bit) */
-
-#define USB_CTL_USBENSOFEN          (1 << 0)  /* Bit 0:  USB Enable */
-#define USB_CTL_ODDRST              (1 << 1)  /* Bit 1:  Resets all the BDT ODD ping/pong bits to 0 */
-#define USB_CTL_RESUME              (1 << 2)  /* Bit 2:  Enables the USB Module to execute resume signaling */
-#define USB_CTL_HOSTMODEEN          (1 << 3)  /* Bit 3:  Enables the USB Module to operate in Host mode */
-#define USB_CTL_RESET               (1 << 4)  /* Bit 4:  Enables the USB Module to generate USB reset signaling */
-#define USB_CTL_TXSUSPENDTOKENBUSY  (1 << 5)  /* Bit 5:  USB Module is busy executing a USB token */
-#define USB_CTL_SE0                 (1 << 6)  /* Bit 6:  Live USB Single Ended Zero signal */
-#define USB_CTL_JSTATE              (1 << 7)  /* Bit 7:  Live USB differential receiver JSTATE signal */
-
-/* Address Register (8-bit) */
-
-#define USB_ADDR_LSEN               (1 << 7)  /* Bit 7:  Low Speed Enable bit */
-#define USB_ADDR_SHIFT              (0)       /* Bits 0-6: USB address */
-#define USB_ADDR_MASK               (0x7f << USB_ADDR_SHIFT)
-
-/* BDT Page Register 1 (8-bit) */
-                                              /* Bit 0:  Reserved */
-#define USB_BDTPAGE1_SHIFT          (1)       /* Bits 1-7: Address bits 9-15 of the BDT base address */
-#define USB_BDTPAGE1_MASK           (0x7f << USB_BDTPAGE1_SHIFT)
-
-/* Frame Number Register Low (8-bit, bits 0-7 of the 11 bit frame number) */
-#define USB_FRMNUML_MASK            0xFF
-/* Frame Number Register High (8-bit) */
-                                              /* Bits 3-7:  Reserved */
-#define USB_FRMNUMH_SHIFT           (0)       /* Bits 0-2: Bits 8-10 of the 11-bit frame number */
-#define USB_FRMNUMH_MASK            (7 << USB_FRMNUMH_SHIFT)
-
-/* Token Register (8-bit) */
-
-#define USB_TOKEN_ENDPT_SHIFT       (0)       /* Bits 0-3: Endpoint address for the token command */
-#define USB_TOKEN_ENDPT_MASK        (15 << USB_TOKEN_ENDPT_SHIFT)
-#define USB_TOKEN_PID_SHIFT         (4)       /* Bits 4-7: Token type executed by the USB Module */
-#define USB_TOKEN_PID_MASK          (15 << USB_TOKEN_PID_SHIFT)
-#  define USB_TOKEN_PID_OUT         (1 << USB_TOKEN_PID_SHIFT)  /* OUT Token */
-#  define USB_TOKEN_PID_IN          (9 << USB_TOKEN_PID_SHIFT)  /* IN Token */
-#  define USB_TOKEN_PID_SETUP       (13 << USB_TOKEN_PID_SHIFT) /* SETUP Token */
-
-/* SOF Threshold Register (8-bit count value) */
-/* BDT Page Register 2/3 (16 bit address in two 8-bit registers) */
-
-/* Endpoint n Control Register (8-bit) */
-
-#define USB_ENDPT_EPHSHK            (1 << 0)  /* Bit 0:  Enable handshaking during a transaction to the endpoint */
-#define USB_ENDPT_EPSTALL           (1 << 1)  /* Bit 1:  Endpoint is stalled */
-#define USB_ENDPT_EPTXEN            (1 << 2)  /* Bit 2:  Enable the endpoint for TX transfers */
-#define USB_ENDPT_EPRXEN            (1 << 3)  /* Bit 3:  Enable the endpoint for RX transfers */
-#define USB_ENDPT_EPCTLDIS          (1 << 4)  /* Bit 4:  Disable control (SETUP) transfers */
-                                              /* Bit 5:  Reserved */
-#define USB_ENDPT_RETRYDIS          (1 << 6)  /* Bit 6:  Disable host retry NAK'ed transactions (host EP0) */
-#define USB_ENDPT_HOSTWOHUB         (1 << 7)  /* Bit 7:  Allows the host to communicate to a low speed device (host EP0) */
-
-/* USB Control Register (8-bit) */
-                                              /* Bits 0-5:  Reserved */
-#define USB_USBCTRL_PDE             (1 << 6)  /* Bit 6:  Enables the weak pulldowns on the USB transceiver */
-#define USB_USBCTRL_SUSP            (1 << 7)  /* Bit 7:  Places the USB transceiver into the suspend state */
-
-/* USB OTG Observe Register (8-bit) */
-                                              /* Bits 0-3:  Reserved */
-#define USB_OBSERVE_DMPD            (1 << 4)  /* Bit 4:  D- Pull Down signal output from the USB OTG module */
-                                              /* Bit 5:  Reserved */
-#define USB_OBSERVE_DPPD            (1 << 6)  /* Bit 6:  D+ Pull Down signal output from the USB OTG module */
-#define USB_OBSERVE_DPPU            (1 << 7)  /* Bit 7:  D+ Pull Up signal output from the USB OTG module */
-
-/* USB OTG Control Register (8-bit) */
-                                              /* Bits 0-3:  Reserved */
-#define USB_CONTROL_DPPULLUPNONOTG  (1 << 4)  /* Bit 4:  Controls of the DP PULLUP in the USB OTG module */
-                                              /* Bits 5-7:  Reserved */
-/* USB Transceiver Control Register 0 (8-bit) */
-
-#define USB_USBTRC0_USBRESET        (1 << 7)  /* Bit 7:  USB reset */
-                                              /* Bit 6:  Reserved */
-#define USB_USBTRC0_USBRESMEN       (1 << 5)  /* Bit 5:  Asynchronous Resume Interrupt Enable */
-                                              /* Bits 2-4:  Reserved */
-#define USB_USBTRC0_SYNC_DET        (1 << 1)  /* Bit 1:  Synchronous USB Interrupt Detect */
-#define USB_USBTRC0_RESUME_INT      (1 << 0)  /* Bit 0:  USB Asynchronous Interrupt */
-
-/* Buffer Descriptor Table (BDT) ****************************************************/
-/* Offset 0: On write (software->hardware) */
-
-#define USB_BDT_STATUS_MASK        0xfc     /* Bits 2-7: Status bits */
-#define USB_BDT_BSTALL             (1 << 2) /*   Bit 2: Buffer Stall Enable bit */
-#define USB_BDT_DTS                (1 << 3) /*   Bit 3: Data Toggle Synchronization Enable bit */
-#define USB_BDT_NINC               (1 << 4) /*   Bit 4: DMA Address Increment Disable bit */
-#define USB_BDT_KEEP               (1 << 5) /*   Bit 5: BD Keep Enable bit */
-#define USB_BDT_DATA01             (1 << 6) /*   Bit 6: Data Toggle Packet bit */
-#define USB_BDT_UOWN               (1 << 7) /*   Bit 7: USB Own bit */
-#define USB_BDT_BYTECOUNT_SHIFT    (16)     /* Bits 16-25: Byte Count bits */
-#define USB_BDT_BYTECOUNT_MASK     (0x3ff << USB_BDT_BYTECOUNT_SHIFT)
-
-#define USB_BDT_DATA0              0              /* DATA0 packet expected next */
-#define USB_BDT_DATA1              USB_BDT_DATA01 /* DATA1 packet expected next */
-#define USB_BDT_COWN               0              /* CPU owns the descriptor */
-
-/* Offset 0: On read (hardware->software) */
-
-#define USB_BDT_PID_SHIFT          (2)      /* Bits 2-5: Packet Identifier bits */
-#define USB_BDT_PID_MASK           (15 << USB_BDT_PID_SHIFT)
-                                            /* Bit 7: USB Own bit (same) */
-                                            /* Bits 16-25: Byte Count bits (same) */
-
-/* Offset 4: BUFFER_ADDRESS, 32-bit Buffer Address bits */
-
-#define USB_BDT_BYTES_SIZE         8        /* Eight bytes per BDT */
-#define USB_BDT_WORD_SIZE          2        /* Two 32-bit words per BDT */
-#define USB_NBDTS_PER_EP           4        /* Number of BDTS per endpoint: IN/OUT and EVEN/ODD */
+#include "chip/kinetis_usbotg.h"
 
 /************************************************************************************
  * Public Types
diff --git a/arch/arm/src/kinetis/kinetis_vectors.S b/arch/arm/src/kinetis/kinetis_vectors.S
index 75c295ae03..39f07fc000 100644
--- a/arch/arm/src/kinetis/kinetis_vectors.S
+++ b/arch/arm/src/kinetis/kinetis_vectors.S
@@ -42,6 +42,7 @@
 
 #include 
 
+#include "chip.h"
 #include "exc_return.h"
 
 /************************************************************************************************
@@ -160,7 +161,7 @@ _vectors:
  * K20P64M72SF1RM
  */
 
-#if defined(CONFIG_ARCH_CHIP_MK20DX256VLH7)
+#if defined(KINETIS_K20)
 	.word	kinetis_dmach0		/* Vector 16: DMA channel 0 transfer complete */
 	.word	kinetis_dmach1		/* Vector 17: DMA channel 1 transfer complete */
 	.word	kinetis_dmach2		/* Vector 18: DMA channel 2 transfer complete */
@@ -263,9 +264,7 @@ _vectors:
  * K40P144M100SF2RM
  */
 
-#elif defined(CONFIG_ARCH_CHIP_MK40X128VLQ100) || defined(CONFIG_ARCH_CHIP_MK40X128VMD100) || \
-    defined(CONFIG_ARCH_CHIP_MK40X256VLQ100) || defined(CONFIG_ARCH_CHIP_MK40X256VMD100) || \
-    defined(CONFIG_ARCH_CHIP_MK40N512VLQ100) || defined(CONFIG_ARCH_CHIP_MK40N512VMD100)
+#elif defined(KINETIS_K40)
 
 	.word	kinetis_dmach0		/* Vector 16: DMA channel 0 transfer complete */
 	.word	kinetis_dmach1		/* Vector 17: DMA channel 1 transfer complete */
@@ -369,10 +368,7 @@ _vectors:
  * K60P144M100SF2RM
  */
 
-#elif defined(CONFIG_ARCH_CHIP_MK60N256VLQ100) || defined(CONFIG_ARCH_CHIP_MK60X256VLQ100) || \
-      defined(CONFIG_ARCH_CHIP_MK60N512VLQ100) || defined(CONFIG_ARCH_CHIP_MK60N256VMD100) || \
-      defined(CONFIG_ARCH_CHIP_MK60X256VMD100) || defined(CONFIG_ARCH_CHIP_MK60N512VMD100) || \
-      defined(CONFIG_ARCH_CHIP_MK60N512VLL100)
+#elif defined(KINETIS_K60)
 
 	.word	kinetis_dmach0		/* Vector 16: DMA channel 0 transfer complete */
 	.word	kinetis_dmach1		/* Vector 17: DMA channel 1 transfer complete */
@@ -478,6 +474,102 @@ _vectors:
 	.word	kinetis_reserved	/* Vector 117: Reserved */
 	.word	kinetis_reserved	/* Vector 118: Reserved */
 	.word	kinetis_reserved	/* Vector 119: Reserved */
+
+/* K64 Family ***********************************************************************************
+ *
+ * The memory map for the following parts is defined in Freescale document
+ * MK64FX512VLL12
+ */
+
+#elif defined(KINETIS_K64)
+
+	.word	kinetis_dmach0		/* Vector 16: DMA channel 0 transfer complete */
+	.word	kinetis_dmach1		/* Vector 17: DMA channel 1 transfer complete */
+	.word	kinetis_dmach2		/* Vector 18: DMA channel 2 transfer complete */
+	.word	kinetis_dmach3		/* Vector 19: DMA channel 3 transfer complete */
+	.word	kinetis_dmach4		/* Vector 20: DMA channel 4 transfer complete */
+	.word	kinetis_dmach5		/* Vector 21: DMA channel 5 transfer complete */
+	.word	kinetis_dmach6		/* Vector 22: DMA channel 6 transfer complete */
+	.word	kinetis_dmach7		/* Vector 23: DMA channel 7 transfer complete */
+	.word	kinetis_dmach8		/* Vector 24: DMA channel 8 transfer complete */
+	.word	kinetis_dmach9		/* Vector 25: DMA channel 9 transfer complete */
+	.word	kinetis_dmach10		/* Vector 26: DMA channel 10 transfer complete */
+	.word	kinetis_dmach11		/* Vector 27: DMA channel 11 transfer complete */
+	.word	kinetis_dmach12		/* Vector 28: DMA channel 12 transfer complete */
+	.word	kinetis_dmach13		/* Vector 29: DMA channel 13 transfer complete */
+	.word	kinetis_dmach14		/* Vector 30: DMA channel 14 transfer complete */
+	.word	kinetis_dmach15		/* Vector 31: DMA channel 15 transfer complete */
+	.word	kinetis_dmaerr		/* Vector 32: DMA error interrupt channels 0-15 */
+	.word	kinetis_mcm			/* Vector 33: MCM Normal interrupt */
+	.word	kinetis_flashcc		/* Vector 34: Flash memory command complete */
+	.word	kinetis_flashrc		/* Vector 35: Flash memory read collision */
+	.word	kinetis_smclvd		/* Vector 36: Mode Controller low-voltage detect, low-voltage warning */
+	.word	kinetis_llwu		/* Vector 37: LLWU Normal Low Leakage Wakeup */
+	.word	kinetis_wdog		/* Vector 38: Watchdog */
+	.word	kinetis_rngb		/* Vector 39: Random number generator */
+	.word	kinetis_i2c0		/* Vector 40: I2C0 */
+	.word	kinetis_i2c1		/* Vector 41: I2C1 */
+	.word	kinetis_spi0		/* Vector 42: SPI0 all sources */
+	.word	kinetis_spi1		/* Vector 43: SPI1 all sources */
+	.word	kinetis_i2s0		/* Vector 44: Transmit */
+	.word	kinetis_i2s1		/* Vector 45: Transmit */
+	.word   kinetis_reserved	/* Vector 46: Reserved */
+	.word	kinetis_uart0s		/* Vector 47: UART0 status */
+	.word	kinetis_uart0e		/* Vector 48: UART0 error */
+	.word	kinetis_uart1s		/* Vector 49: UART1 status */
+	.word	kinetis_uart1e		/* Vector 50: UART1 error */
+	.word	kinetis_uart2s		/* Vector 51: UART2 status */
+	.word	kinetis_uart2e		/* Vector 52: UART2 error */
+	.word	kinetis_uart3s		/* Vector 53: UART3 status */
+	.word	kinetis_uart3e		/* Vector 54: UART3 error */
+	.word	kinetis_adc0		/* Vector 55: ADC0 */
+	.word	kinetis_cmp0		/* Vector 56: CMP0 */
+	.word	kinetis_cmp1		/* Vector 57: CMP1 */
+	.word	kinetis_ftm0		/* Vector 58: FTM0 all sources */
+	.word	kinetis_ftm1		/* Vector 59: FTM1 all sources */
+	.word	kinetis_ftm2		/* Vector 60: FTM2 all sources */
+	.word	kinetis_cmt			/* Vector 61: CMT */
+	.word	kinetis_rtc0		/* Vector 62: RTC alarm interrupt */
+	.word	kinetis_rtc1		/* Vector 63: RTC seconds interrupt */
+	.word	kinetis_pitch0		/* Vector 64: PIT channel 0 */
+	.word	kinetis_pitch1		/* Vector 65: PIT channel 1 */
+	.word	kinetis_pitch2		/* Vector 66: PIT channel 2 */
+	.word	kinetis_pitch3		/* Vector 67: PIT channel 3 */
+	.word	kinetis_pdb			/* Vector 68: PDB */
+	.word	kinetis_usbotg		/* Vector 68: USB OTG */
+	.word	kinetis_usbcd		/* Vector 70: USB charger detect */
+	.word	kinetis_reserved	/* Vector 71: Reserved */
+	.word	kinetis_dac0		/* Vector 72: DAC0 */
+	.word	kinetis_mcg			/* Vector 73: MCG */
+	.word	kinetis_lpt			/* Vector 74: Low power timer */
+	.word	kinetis_porta		/* Vector 75: Pin detect port A */
+	.word	kinetis_portb		/* Vector 76: Pin detect port B */
+	.word	kinetis_portc		/* Vector 77: Pin detect port C */
+	.word	kinetis_portd		/* Vector 78: Pin detect port D */
+	.word	kinetis_porte		/* Vector 79: Pin detect port E */
+	.word	kinetis_software	/* Vector 80: Software interrupt */
+	.word	kinetis_spi2		/* Vector 81: SPI2 all sources */
+	.word	kinetis_uart4s		/* Vector 82: UART4 status */
+	.word	kinetis_uart4e		/* Vector 83: UART4 error */
+	.word	kinetis_uart5s		/* Vector 84: UART5 status */
+	.word	kinetis_uart5e		/* Vector 85: UART5 error */
+	.word	kinetis_cmp2		/* Vector 86: CMP2 */
+	.word	kinetis_ftm3		/* Vector 87: FTM3 all sources */
+	.word	kinetis_dac1		/* Vector 88: DAC1 */
+	.word	kinetis_adc1		/* Vector 89: ADC1 */
+	.word	kinetis_i2c2		/* Vector 90: I2C2 */
+	.word	kinetis_can0mb		/* Vector 91: CAN0 ORed Message buffer (0-15) */
+	.word	kinetis_can0bo		/* Vector 92: CAN0 Bus Off */
+	.word	kinetis_can0err		/* Vector 93: CAN0 Error */
+	.word	kinetis_can0tw		/* Vector 94: CAN0 Transmit Warning */
+	.word	kinetis_can0rw		/* Vector 95: CAN0 Receive Warning */
+	.word	kinetis_can0wu		/* Vector 96: CAN0 Wake UP */
+	.word	kinetis_sdhc		/* Vector 97: SDHC */
+	.word	kinetis_emactmr		/* Vector 91: Ethernet MAC IEEE 1588 timer interrupt */
+	.word	kinetis_emactx		/* Vector 92: Ethernet MAC transmit interrupt */
+	.word	kinetis_emacrx		/* Vector 93: Ethernet MAC receive interrupt */
+	.word	kinetis_emacmisc	/* Vector 94: Ethernet MAC error and misc interrupt */
+
 #else
 #  error "No vectors for this Kinetis part"
 #endif
@@ -505,13 +597,13 @@ handlers:
 	HANDLER	kinetis_systick, KINETIS_IRQ_SYSTICK		/* Vector 15: System tick */
 
 /* External Interrupts **************************************************************************/
-/* K40 Family ***********************************************************************************
+/* K20 Family ***********************************************************************************
  *
  * The interrupt vectors  for the following parts is defined in Freescale document
  * K20P64M72SF1RM
  */
 
-#if defined(CONFIG_ARCH_CHIP_MK20DX256VLH7)
+#if defined(KINETIS_K20)
 
 	HANDLER kinetis_dmach0, KINETIS_IRQ_DMACH0		/* Vector 16: DMA channel 0 transfer complete */
 	HANDLER kinetis_dmach1, KINETIS_IRQ_DMACH1		/* Vector 17: DMA channel 1 transfer complete */
@@ -585,9 +677,7 @@ handlers:
  * K40P144M100SF2RM
  */
 
-#elif defined(CONFIG_ARCH_CHIP_MK40X128VLQ100) || defined(CONFIG_ARCH_CHIP_MK40X128VMD100) || \
-    defined(CONFIG_ARCH_CHIP_MK40X256VLQ100) || defined(CONFIG_ARCH_CHIP_MK40X256VMD100) || \
-    defined(CONFIG_ARCH_CHIP_MK40N512VLQ100) || defined(CONFIG_ARCH_CHIP_MK40N512VMD100)
+#elif defined(KINETIS_K40)
 
 	HANDLER kinetis_dmach0, KINETIS_IRQ_DMACH0		/* Vector 16: DMA channel 0 transfer complete */
 	HANDLER kinetis_dmach1, KINETIS_IRQ_DMACH1		/* Vector 17: DMA channel 1 transfer complete */
@@ -679,10 +769,7 @@ handlers:
  * K60P144M100SF2RM
  */
 
-#elif defined(CONFIG_ARCH_CHIP_MK60N256VLQ100) || defined(CONFIG_ARCH_CHIP_MK60X256VLQ100) || \
-      defined(CONFIG_ARCH_CHIP_MK60N512VLQ100) || defined(CONFIG_ARCH_CHIP_MK60N256VMD100) || \
-      defined(CONFIG_ARCH_CHIP_MK60X256VMD100) || defined(CONFIG_ARCH_CHIP_MK60N512VMD100) || \
-      defined(CONFIG_ARCH_CHIP_MK60N512VLL100)
+#elif defined(KINETIS_K60)
 
 	HANDLER kinetis_dmach0, KINETIS_IRQ_DMACH0		/* Vector 16: DMA channel 0 transfer complete */
 	HANDLER kinetis_dmach1, KINETIS_IRQ_DMACH1		/* Vector 17: DMA channel 1 transfer complete */
@@ -771,6 +858,99 @@ handlers:
 	HANDLER kinetis_portd, KINETIS_IRQ_PORTD		/* Vector 106: Pin detect port D */
 	HANDLER kinetis_porte, KINETIS_IRQ_PORTE		/* Vector 107: Pin detect port E */
 
+/* K64 Family ***********************************************************************************
+ *
+ * The memory map for the following parts is defined in Freescale document
+ * MK64FX512VLL12
+ */
+
+#elif defined(KINETIS_K64)
+
+	HANDLER kinetis_dmach0, KINETIS_IRQ_DMACH0		/* Vector 16: DMA channel 0 transfer complete */
+	HANDLER kinetis_dmach1, KINETIS_IRQ_DMACH1		/* Vector 17: DMA channel 1 transfer complete */
+	HANDLER kinetis_dmach2, KINETIS_IRQ_DMACH2		/* Vector 18: DMA channel 2 transfer complete */
+	HANDLER kinetis_dmach3, KINETIS_IRQ_DMACH3		/* Vector 19: DMA channel 3 transfer complete */
+	HANDLER kinetis_dmach4, KINETIS_IRQ_DMACH4		/* Vector 20: DMA channel 4 transfer complete */
+	HANDLER kinetis_dmach5, KINETIS_IRQ_DMACH5		/* Vector 21: DMA channel 5 transfer complete */
+	HANDLER kinetis_dmach6, KINETIS_IRQ_DMACH6		/* Vector 22: DMA channel 6 transfer complete */
+	HANDLER kinetis_dmach7, KINETIS_IRQ_DMACH7		/* Vector 23: DMA channel 7 transfer complete */
+	HANDLER kinetis_dmach8, KINETIS_IRQ_DMACH8		/* Vector 24: DMA channel 8 transfer complete */
+	HANDLER kinetis_dmach9, KINETIS_IRQ_DMACH9		/* Vector 25: DMA channel 9 transfer complete */
+	HANDLER kinetis_dmach10, KINETIS_IRQ_DMACH10	/* Vector 26: DMA channel 10 transfer complete */
+	HANDLER kinetis_dmach11, KINETIS_IRQ_DMACH11	/* Vector 27: DMA channel 11 transfer complete */
+	HANDLER kinetis_dmach12, KINETIS_IRQ_DMACH12	/* Vector 28: DMA channel 12 transfer complete */
+	HANDLER kinetis_dmach13, KINETIS_IRQ_DMACH13	/* Vector 29: DMA channel 13 transfer complete */
+	HANDLER kinetis_dmach14, KINETIS_IRQ_DMACH14	/* Vector 30: DMA channel 14 transfer complete */
+	HANDLER kinetis_dmach15, KINETIS_IRQ_DMACH15	/* Vector 31: DMA channel 15 transfer complete */
+	HANDLER kinetis_dmaerr, KINETIS_IRQ_DMAERR		/* Vector 32: DMA error interrupt channels 0-15 */
+	HANDLER kinetis_mcm, KINETIS_IRQ_MCM			/* Vector 33: MCM Normal interrupt */
+	HANDLER kinetis_flashcc, KINETIS_IRQ_FLASHCC	/* Vector 34: Flash memory command complete */
+	HANDLER kinetis_flashrc, KINETIS_IRQ_FLASHRC	/* Vector 35: Flash memory read collision */
+	HANDLER kinetis_smclvd, KINETIS_IRQ_SMCLVD		/* Vector 36: Mode Controller low-voltage detect, low-voltage warning */
+	HANDLER kinetis_llwu, KINETIS_IRQ_LLWU			/* Vector 37: LLWU Normal Low Leakage Wakeup */
+	HANDLER kinetis_wdog, KINETIS_IRQ_WDOG			/* Vector 38: Watchdog */
+	HANDLER kinetis_rngb, KINETIS_IRQ_RNGB			/* Vector 39: Random number generator */
+	HANDLER kinetis_i2c0, KINETIS_IRQ_I2C0			/* Vector 40: I2C0 */
+	HANDLER kinetis_i2c1, KINETIS_IRQ_I2C1			/* Vector 41: I2C1 */
+	HANDLER kinetis_spi0, KINETIS_IRQ_SPI0			/* Vector 42: SPI0 all sources */
+	HANDLER kinetis_spi1, KINETIS_IRQ_SPI1			/* Vector 43: SPI1 all sources */
+	HANDLER kinetis_i2s0, KINETIS_IRQ_I2S0			/* Vector 44: Transmit */
+	HANDLER kinetis_i2s1, KINETIS_IRQ_I2S1			/* Vector 45: Transmit */
+	HANDLER kinetis_uart0s, KINETIS_IRQ_UART0S		/* Vector 47: UART0 status */
+	HANDLER kinetis_uart0e, KINETIS_IRQ_UART0E		/* Vector 48: UART0 error */
+	HANDLER kinetis_uart1s, KINETIS_IRQ_UART1S		/* Vector 49: UART1 status */
+	HANDLER kinetis_uart1e, KINETIS_IRQ_UART1E		/* Vector 50: UART1 error */
+	HANDLER kinetis_uart2s, KINETIS_IRQ_UART2S		/* Vector 51: UART2 status */
+	HANDLER kinetis_uart2e, KINETIS_IRQ_UART2E		/* Vector 52: UART2 error */
+	HANDLER kinetis_uart3s, KINETIS_IRQ_UART3S		/* Vector 53: UART3 status */
+	HANDLER kinetis_uart3e, KINETIS_IRQ_UART3E		/* Vector 54: UART3 error */
+	HANDLER kinetis_adc0, KINETIS_IRQ_ADC0			/* Vector 55: ADC0 */
+	HANDLER kinetis_cmp0, KINETIS_IRQ_CMP0			/* Vector 56: CMP0 */
+	HANDLER kinetis_cmp1, KINETIS_IRQ_CMP1			/* Vector 57: CMP1 */
+	HANDLER kinetis_ftm0, KINETIS_IRQ_FTM0			/* Vector 58: FTM0 all sources */
+	HANDLER kinetis_ftm1, KINETIS_IRQ_FTM1			/* Vector 59: FTM1 all sources */
+	HANDLER kinetis_ftm2, KINETIS_IRQ_FTM2			/* Vector 60: FTM2 all sources */
+	HANDLER kinetis_cmt, KINETIS_IRQ_CMT			/* Vector 61: CMT */
+	HANDLER kinetis_rtc0, KINETIS_IRQ_RTC0			/* Vector 62: RTC alarm interrupt */
+	HANDLER kinetis_rtc1, KINETIS_IRQ_RTC1			/* Vector 63: RTC seconds interrupt */
+	HANDLER kinetis_pitch0, KINETIS_IRQ_PITCH0		/* Vector 64: PIT channel 0 */
+	HANDLER kinetis_pitch1, KINETIS_IRQ_PITCH1		/* Vector 65: PIT channel 1 */
+	HANDLER kinetis_pitch2, KINETIS_IRQ_PITCH2		/* Vector 66: PIT channel 2 */
+	HANDLER kinetis_pitch3, KINETIS_IRQ_PITCH3		/* Vector 67: PIT channel 3 */
+	HANDLER kinetis_pdb, KINETIS_IRQ_PDB			/* Vector 68: PDB */
+	HANDLER kinetis_usbotg, KINETIS_IRQ_USBOTG		/* Vector 68: USB OTG */
+	HANDLER kinetis_usbcd, KINETIS_IRQ_USBCD		/* Vector 70: USB charger detect */
+	HANDLER kinetis_dac0, KINETIS_IRQ_DAC0			/* Vector 72: DAC0 */
+	HANDLER kinetis_mcg, KINETIS_IRQ_MCG			/* Vector 73: MCG */
+	HANDLER kinetis_lpt, KINETIS_IRQ_LPT			/* Vector 74: Low power timer */
+	HANDLER kinetis_porta, KINETIS_IRQ_PORTA		/* Vector 75: Pin detect port A */
+	HANDLER kinetis_portb, KINETIS_IRQ_PORTB		/* Vector 76: Pin detect port B */
+	HANDLER kinetis_portc, KINETIS_IRQ_PORTC		/* Vector 77: Pin detect port C */
+	HANDLER kinetis_portd, KINETIS_IRQ_PORTD		/* Vector 78: Pin detect port D */
+	HANDLER kinetis_porte, KINETIS_IRQ_PORTE		/* Vector 79: Pin detect port E */
+	HANDLER kinetis_software, KINETIS_IRQ_SOFTWARE	/* Vector 80: Software interrupt */
+	HANDLER kinetis_spi2, KINETIS_IRQ_SPI2			/* Vector 81: SPI2 all sources */
+	HANDLER kinetis_uart4s, KINETIS_IRQ_UART4S		/* Vector 82: UART4 status */
+	HANDLER kinetis_uart4e, KINETIS_IRQ_UART4E		/* Vector 83: UART4 error */
+	HANDLER kinetis_uart5s, KINETIS_IRQ_UART5S		/* Vector 84: UART5 status */
+	HANDLER kinetis_uart5e, KINETIS_IRQ_UART5E		/* Vector 85: UART5 error */
+	HANDLER kinetis_cmp2, KINETIS_IRQ_CMP2			/* Vector 86: CMP2 */
+	HANDLER kinetis_ftm3, KINETIS_IRQ_FTM3			/* Vector 87: FTM3 all sources */
+	HANDLER kinetis_dac1, KINETIS_IRQ_DAC1			/* Vector 88: DAC1 */
+	HANDLER kinetis_adc1, KINETIS_IRQ_ADC1			/* Vector 89: ADC1 */
+	HANDLER kinetis_i2c2, KINETIS_IRQ_I2C2			/* Vector 90: I2C2 */
+	HANDLER kinetis_can0mb, KINETIS_IRQ_CAN0MB		/* Vector 91: CAN0 ORed Message buffer (0-15) */
+	HANDLER kinetis_can0bo, KINETIS_IRQ_CAN0BO		/* Vector 92: CAN0 Bus Off */
+	HANDLER kinetis_can0err, KINETIS_IRQ_CAN0ERR	/* Vector 93: CAN0 Error */
+	HANDLER kinetis_can0tw, KINETIS_IRQ_CAN0TW		/* Vector 94: CAN0 Transmit Warning */
+	HANDLER kinetis_can0rw, KINETIS_IRQ_CAN0RW		/* Vector 95: CAN0 Receive Warning */
+	HANDLER kinetis_can0wu, KINETIS_IRQ_CAN0WU		/* Vector 96: CAN0 Wake UP */
+	HANDLER kinetis_sdhc, KINETIS_IRQ_SDHC			/* Vector 97: SDHC */
+	HANDLER kinetis_emactmr, KINETIS_IRQ_EMACTMR	/* Vector 91: Ethernet MAC IEEE 1588 timer interrupt */
+	HANDLER kinetis_emactx, KINETIS_IRQ_EMACTX		/* Vector 92: Ethernet MAC transmit interrupt */
+	HANDLER kinetis_emacrx, KINETIS_IRQ_EMACRX		/* Vector 93: Ethernet MAC receive interrupt */
+	HANDLER kinetis_emacmisc, KINETIS_IRQ_EMACMISC	/* Vector 94: Ethernet MAC error and misc interrupt */
+
 #else
 #  error "No handlers for this Kinetis part"
 #endif
diff --git a/arch/arm/src/kinetis/kinetis_wdog.c b/arch/arm/src/kinetis/kinetis_wdog.c
index 9dc29b80d8..3beaad8d4b 100644
--- a/arch/arm/src/kinetis/kinetis_wdog.c
+++ b/arch/arm/src/kinetis/kinetis_wdog.c
@@ -1,6 +1,5 @@
 /****************************************************************************
  * arch/arm/src/kinetis/kinetis_wdog.c
- * arch/arm/src/chip/kinetis_wdog.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
@@ -44,19 +43,7 @@
 
 #include "up_arch.h"
 #include "kinetis.h"
-#include "kinetis_wdog.h"
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
+#include "chip/kinetis_wdog.h"
 
 /****************************************************************************
  * Private Functions
-- 
GitLab


From 7a7998e4f991e23e3bdf8fb2c413acbe07a73562 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Fri, 1 Jul 2016 15:42:21 -0600
Subject: [PATCH 128/229] Add support for the NXP Freedom-K64F board.  This is
 primarily the work of Jordan Macintyre.  I leveraged this code from
 https://github.com/jmacintyre/nuttx-k64f

---
 Documentation/README.html               |   2 +
 README.txt                              |   2 +
 arch/arm/include/kinetis/chip.h         |  16 +-
 configs/Kconfig                         |  14 +
 configs/README.txt                      |   4 +
 configs/freedom-k64f/Kconfig            |   7 +
 configs/freedom-k64f/README.txt         | 692 ++++++++++++++++++
 configs/freedom-k64f/include/board.h    | 407 +++++++++++
 configs/freedom-k64f/nsh/Make.defs      | 111 +++
 configs/freedom-k64f/nsh/defconfig      | 901 ++++++++++++++++++++++++
 configs/freedom-k64f/nsh/setenv.sh      |  61 ++
 configs/freedom-k64f/scripts/flash.ld   | 142 ++++
 configs/freedom-k64f/src/Makefile       |  61 ++
 configs/freedom-k64f/src/freedom-k64f.h | 296 ++++++++
 configs/freedom-k64f/src/k64_appinit.c  | 270 +++++++
 configs/freedom-k64f/src/k64_boot.c     | 102 +++
 configs/freedom-k64f/src/k64_buttons.c  | 171 +++++
 configs/freedom-k64f/src/k64_leds.c     | 250 +++++++
 configs/freedom-k64f/src/k64_spi.c      | 143 ++++
 configs/freedom-k64f/src/k64_usbdev.c   | 113 +++
 configs/freedom-k64f/src/k64_usbmsc.c   |  99 +++
 21 files changed, 3856 insertions(+), 8 deletions(-)
 create mode 100644 configs/freedom-k64f/Kconfig
 create mode 100644 configs/freedom-k64f/README.txt
 create mode 100644 configs/freedom-k64f/include/board.h
 create mode 100644 configs/freedom-k64f/nsh/Make.defs
 create mode 100644 configs/freedom-k64f/nsh/defconfig
 create mode 100644 configs/freedom-k64f/nsh/setenv.sh
 create mode 100644 configs/freedom-k64f/scripts/flash.ld
 create mode 100644 configs/freedom-k64f/src/Makefile
 create mode 100644 configs/freedom-k64f/src/freedom-k64f.h
 create mode 100644 configs/freedom-k64f/src/k64_appinit.c
 create mode 100644 configs/freedom-k64f/src/k64_boot.c
 create mode 100644 configs/freedom-k64f/src/k64_buttons.c
 create mode 100644 configs/freedom-k64f/src/k64_leds.c
 create mode 100644 configs/freedom-k64f/src/k64_spi.c
 create mode 100644 configs/freedom-k64f/src/k64_usbdev.c
 create mode 100644 configs/freedom-k64f/src/k64_usbmsc.c

diff --git a/Documentation/README.html b/Documentation/README.html
index fd9400b6b6..38c6ab0ee4 100644
--- a/Documentation/README.html
+++ b/Documentation/README.html
@@ -103,6 +103,8 @@ nuttx/
  |   |   `- README.txt
  |   |- fire-stm32v2/
  |   |   `- README.txt
+ |   |- freedom-k64f/
+ |   |   `- README.txt
  |   |- freedom-kl25z/
  |   |   `- README.txt
  |   |- freedom-kl26z/
diff --git a/README.txt b/README.txt
index d04a5e4e7c..2d16a30234 100644
--- a/README.txt
+++ b/README.txt
@@ -1283,6 +1283,8 @@ nuttx/
  |   |   `- README.txt
  |   |- fire-stm32v2/
  |   |   `- README.txt
+ |   |- freedom-k64f/
+ |   |   `- README.txt
  |   |- freedom-kl25z/
  |   |   `- README.txt
  |   |- freedom-kl26z/
diff --git a/arch/arm/include/kinetis/chip.h b/arch/arm/include/kinetis/chip.h
index 7f609e1c77..f2fa5fbb4e 100644
--- a/arch/arm/include/kinetis/chip.h
+++ b/arch/arm/include/kinetis/chip.h
@@ -1044,7 +1044,7 @@
 #  define KINETIS_NMMCAU          1            /* Hardware encryption */
 #  define KINETIS_NCRC            1            /* CRC */
 
-#if defined(CONFIG_ARCH_CHIP_MK64FX512VLL12)
+#elif defined(CONFIG_ARCH_CHIP_MK64FX512VLL12)
 #  undef  KINETIS_K20                          /* Not Kinetics K20 family */
 #  undef  KINETIS_K40                          /* Not Kinetics K40 family */
 #  undef  KINETIS_K60                          /* Not Kinetis K60 family */
@@ -1062,7 +1062,7 @@
 #  define KINETIS_NSDHC           1            /* SD host controller */
 #  define KINETIS_NI2C            3            /* Three I2C modules */
 #  define KINETIS_NUART           6            /* Six UART modues */
-#  define KINETIS_NSPI            3             Three SPI modules
+#  define KINETIS_NSPI            3            /* Three SPI modules */
 #  define KINETIS_NCAN            1            /* One CAN controllers */
 #  define KINETIS_NI2S            1            /* One I2S modules */
 #  define KINETIS_NSLCD           1            /* One segment LCD interface (up to 36x8/40x4) */
@@ -1111,7 +1111,7 @@
 #  define KINETIS_NRNG            1            /* Random number generator */
 #  define KINETIS_NMMCAU          1            /* Hardware encryption */
 #  define KINETIS_NCRC            1            /* CRC */
-//
+
 #elif defined(CONFIG_ARCH_CHIP_MK64FN1M0VDC12)
 #  undef  KINETIS_K20                          /* Not Kinetics K20 family */
 #  undef  KINETIS_K40                          /* Not Kinetics K40 family */
@@ -1164,7 +1164,7 @@
 #  define KINETIS_NSDHC           1            /* SD host controller */
 #  define KINETIS_NI2C            3            /* Three I2C modules */
 #  define KINETIS_NUART           6            /* Six UART modues */
-#  define KINETIS_NSPI            3             Three SPI modules
+#  define KINETIS_NSPI            3            /* Three SPI modules */
 #  define KINETIS_NCAN            1            /* One CAN controllers */
 #  define KINETIS_NI2S            1            /* One I2S modules */
 #  define KINETIS_NSLCD           1            /* One segment LCD interface (up to 36x8/40x4) */
@@ -1198,7 +1198,7 @@
 #  define KINETIS_NSDHC           1            /* SD host controller */
 #  define KINETIS_NI2C            3            /* Three I2C modules */
 #  define KINETIS_NUART           6            /* Six UART modues */
-#  define KINETIS_NSPI            3             Three SPI modules
+#  define KINETIS_NSPI            3            /* Three SPI modules */
 #  define KINETIS_NCAN            1            /* One CAN controllers */
 #  define KINETIS_NI2S            1            /* One I2S modules */
 #  define KINETIS_NSLCD           1            /* One segment LCD interface (up to 36x8/40x4) */
@@ -1232,7 +1232,7 @@
 #  define KINETIS_NSDHC           1            /* SD host controller */
 #  define KINETIS_NI2C            3            /* Three I2C modules */
 #  define KINETIS_NUART           6            /* Six UART modues */
-#  define KINETIS_NSPI            3             Three SPI modules
+#  define KINETIS_NSPI            3            /* Three SPI modules */
 #  define KINETIS_NCAN            1            /* One CAN controllers */
 #  define KINETIS_NI2S            1            /* One I2S modules */
 #  define KINETIS_NSLCD           1            /* One segment LCD interface (up to 36x8/40x4) */
@@ -1247,7 +1247,7 @@
 #  define KINETIS_NRNG            1            /* Random number generator */
 #  define KINETIS_NMMCAU          1            /* Hardware encryption */
 #  define KINETIS_NCRC            1            /* CRC */
-//
+
 #elif defined(CONFIG_ARCH_CHIP_MK64FN1M0VMD12)
 #  undef  KINETIS_K20                          /* Not Kinetics K20 family */
 #  undef  KINETIS_K40                          /* Not Kinetics K40 family */
@@ -1266,7 +1266,7 @@
 #  define KINETIS_NSDHC           1            /* SD host controller */
 #  define KINETIS_NI2C            3            /* Three I2C modules */
 #  define KINETIS_NUART           6            /* Six UART modues */
-#  define KINETIS_NSPI            3             Three SPI modules
+#  define KINETIS_NSPI            3            /* Three SPI modules */
 #  define KINETIS_NCAN            1            /* One CAN controllers */
 #  define KINETIS_NI2S            1            /* One I2S modules */
 #  define KINETIS_NSLCD           1            /* One segment LCD interface (up to 36x8/40x4) */
diff --git a/configs/Kconfig b/configs/Kconfig
index 778fa220d5..0ef907bda5 100644
--- a/configs/Kconfig
+++ b/configs/Kconfig
@@ -201,6 +201,16 @@ config ARCH_BOARD_FIRE_STM32
 		and 3 of the boards are supported but only version 2 has been
 		tested.
 
+config ARCH_BOARD_FREEDOM_K64F
+	bool "NXP Freedom-k64f development board"
+	depends on ARCH_CHIP_MK64FN1M0VLL12
+	select ARCH_HAVE_LEDS
+	select ARCH_HAVE_BUTTONS
+	select ARCH_HAVE_IRQBUTTONS
+	---help---
+		Kinetis K64 Cortex-M4 MCU.  This port uses the FreeScale FREEDOM-K64F
+		development board.
+
 config ARCH_BOARD_FREEDOM_KL25Z
 	bool "Freescale Freedom KL25Z"
 	depends on ARCH_CHIP_MKL25Z128
@@ -1352,6 +1362,7 @@ config ARCH_BOARD
 	default "ez80f910200kitg"          if ARCH_BOARD_EZ80F910200KITG
 	default "ez80f910200zco"           if ARCH_BOARD_EZ80F910200ZCO
 	default "fire-stm32v2"             if ARCH_BOARD_FIRE_STM32
+	default "freedom-k64f"             if ARCH_BOARD_FREEDOM_K64F
 	default "freedom-kl25z"            if ARCH_BOARD_FREEDOM_KL25Z
 	default "freedom-kl26z"            if ARCH_BOARD_FREEDOM_KL26Z
 	default "hymini-stm32v"            if ARCH_BOARD_HYMINI_STM32V
@@ -1553,6 +1564,9 @@ endif
 if ARCH_BOARD_FIRE_STM32
 source "configs/fire-stm32v2/Kconfig"
 endif
+if ARCH_BOARD_FREEDOM_K64F
+source "configs/freedom-k64f/Kconfig"
+endif
 if ARCH_BOARD_FREEDOM_KL25Z
 source "configs/freedom-kl25z/Kconfig"
 endif
diff --git a/configs/README.txt b/configs/README.txt
index dca332ae85..70f79490c9 100644
--- a/configs/README.txt
+++ b/configs/README.txt
@@ -261,6 +261,10 @@ configs/fire-stm32v2
   STM32F103VET6 chip.  See http://firestm32.taobao.com .  Version 2 and 3 of
   the boards are supported but only version 2 has been tested.
 
+configs/freedom-k64f
+  Kinetis K64 Cortex-M4 MCU.  This port uses the FreeScale FREEDOM-K64F
+  development board.
+
 configs/freedom-kl25z
 configs/freedom-kl26z
   These configurations are for the Freescale Freedom KL25Z and very similar
diff --git a/configs/freedom-k64f/Kconfig b/configs/freedom-k64f/Kconfig
new file mode 100644
index 0000000000..7c0f1fe281
--- /dev/null
+++ b/configs/freedom-k64f/Kconfig
@@ -0,0 +1,7 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+if ARCH_BOARD_FREEDOM_K64F
+endif
diff --git a/configs/freedom-k64f/README.txt b/configs/freedom-k64f/README.txt
new file mode 100644
index 0000000000..3054e229bf
--- /dev/null
+++ b/configs/freedom-k64f/README.txt
@@ -0,0 +1,692 @@
+README.txt
+==========
+
+This is the README file for the port of NuttX to the Freescale Freedom-K64F
+develoment board.
+
+REVISIT: At present, this is just a clone of the TWR-K60N512 README file.
+
+Contents
+========
+
+  o Kinetis TWR-K60N512 Features
+  o Kinetis TWR-K60N512 Pin Configuration
+    - On-Board Connections
+    - Connections via the General Purpose Tower Plug-in (TWRPI) Socket
+    - Connections via the Tower Primary Connector Side A
+    - Connections via the Tower Primary Connector Side B
+    - TWR-SER Serial Board Connection
+  o LEDs
+  o Development Environment
+  o GNU Toolchain Options
+  o IDEs
+  o NuttX EABI "buildroot" Toolchain
+  o NuttX OABI "buildroot" Toolchain
+  o NXFLAT Toolchain
+
+Kinetis TWR-K60N512 Features:
+=============================
+
+  o K60N512 in 144 MAPBGA, K60N512VMD100
+  o Capacitive Touch Pads
+  o Integrated, Open-Source JTAG
+  o SD Card Slot
+  o MMA7660 3-axis accelerometer
+  o Tower Plug-In (TWRPI) Socket for expansion (sensors, etc.)
+  o Touch TWRPI Socket adds support for various capacitive touch boards
+    (e.g. keypads, rotary dials, sliders, etc.)
+  o Tower connectivity for access to USB, Ethernet, RS232/RS485, CAN, SPI,
+    I²C, Flexbus, etc.
+  o Plus: Potentiometer, 4 LEDs, 2 pushbuttons, infrared port
+
+Kinetis TWR-K60N512 Pin Configuration
+=====================================
+
+On-Board Connections
+-------------------- ------------------------- -------- -------------------
+FEATURE              CONNECTION                PORT/PIN PIN FUNCTION
+-------------------- ------------------------- -------- -------------------
+OSJTAG USB-to-serial OSJTAG Bridge RX Data     PTE9     UART5_RX
+Bridge               OSJTAG Bridge TX Data     PTE8     UART5_TX
+SD Card Slot         SD Clock                  PTE2     SDHC0_DCLK
+                     SD Command                PTE3     SDHC0_CMD
+                     SD Data0                  PTE1     SDHC0_D0
+                     SD Data1                  PTE0     SDHC0_D1
+                     SD Data2                  PTE5     SDHC0_D2
+                     SD Data3                  PTE4     SDHC0_D3
+                     SD Card Detect            PTE28    PTE28
+                     SD Write Protect          PTE27    PTE27
+Infrared Port        IR Transmit               PTD7     CMT_IRO
+                     IR Receive                PTC6     CMP0_IN0
+Pushbuttons          SW1 (IRQ0)                PTA19    PTA19
+                     SW2 (IRQ1)                PTE26    PTE26
+                     SW3 (RESET)               RESET_b  RESET_b
+Touch Pads           E1 / Touch                PTA4     TSI0_CH5
+                     E2 / Touch                PTB3     TSI0_CH8
+                     E3 / Touch                PTB2     TSI0_CH7
+                     E4 / Touch                PTB16    TSI0_CH9
+LEDs                 E1 / Orange LED           PTA11    PTA11
+                     E2 / Yellow LED           PTA28    PTA28
+                     E3 / Green LED            PTA29    PTA29
+                     E4 / Blue LED             PTA10    PTA10
+Potentiometer        Potentiometer (R71)       ?        ADC1_DM1
+Accelerometer        I2C SDA                   PTD9     I2C0_SDA
+                     I2C SCL                   PTD8     I2C0_SCL
+                     IRQ                       PTD10    PTD10
+Touch Pad / Segment  Electrode 0 (J3 Pin 3)    PTB0     TSI0_CH0
+LCD TWRPI Socket     Electrode 1 (J3 Pin 5)    PTB1     TSI0_CH6
+                     Electrode 2 (J3 Pin 7)    PTB2     TSI0_CH7
+                     Electrode 3 (J3 Pin 8)    PTB3     TSI0_CH8
+                     Electrode 4 (J3 Pin 9)    PTC0     TSI0_CH13
+                     Electrode 5 (J3 Pin 10)   PTC1     TSI0_CH14
+                     Electrode 6 (J3 Pin 11)   PTC2     TSI0_CH15
+                     Electrode 7 (J3 Pin 12)   PTA4     TSI0_CH5
+                     Electrode 8 (J3 Pin 13)   PTB16    TSI0_CH9
+                     Electrode 9 (J3 Pin 14)   PTB17    TSI0_CH10
+                     Electrode 10 (J3 Pin 15)  PTB18    TSI0_CH11
+                     Electrode 11 (J3 Pin 16)  PTB19    TSI0_CH12
+                     TWRPI ID0 (J3 Pin 17)     ?        ADC1_DP1
+                     TWRPI ID1 (J3 Pin 18)     ?        ADC1_SE16
+
+Connections via the General Purpose Tower Plug-in (TWRPI) Socket
+-------------------- ------------------------- -------- -------------------
+FEATURE             CONNECTION                 PORT/PIN PIN FUNCTION
+-------------------- ------------------------- -------- -------------------
+General Purpose      TWRPI AN0 (J4 Pin 8)       ?        ADC0_DP0/ADC1_DP3
+TWRPI Socket         TWRPI AN1 (J4 Pin 9)       ?        ADC0_DM0/ADC1_DM3
+                     TWRPI AN2 (J4 Pin 12)      ?        ADC1_DP0/ADC0_DP3
+                     TWRPI ID0 (J4 Pin 17)      ?        ADC0_DP1
+                     TWRPI ID1 (J4 Pin 18)      ?        ADC0_DM1
+                     TWRPI I2C SCL (J5 Pin 3)   PTD8     I2C0_SCL
+                     TWRPI I2C SDA (J5 Pin 4)   PTD9     I2C0_SDA
+                     TWRPI SPI MISO (J5 Pin 9)  PTD14    SPI2_SIN
+                     TWRPI SPI MOSI (J5 Pin 10) PTD13    SPI2_SOUT
+                     TWRPI SPI SS (J5 Pin 11)   PTD15    SPI2_PCS0
+                     TWRPI SPI CLK (J5 Pin 12)  PTD12    SPI2_SCK
+                     TWRPI GPIO0 (J5 Pin 15)    PTD10    PTD10
+                     TWRPI GPIO1 (J5 Pin 16)    PTB8     PTB8
+                     TWRPI GPIO2 (J5 Pin 17)    PTB9     PTB9
+                     TWRPI GPIO3 (J5 Pin 18)    PTA19    PTA19
+                     TWRPI GPIO4 (J5 Pin 19)    PTE26    PTE26
+
+The TWR-K60N512 features two expansion card-edge connectors that interface
+to the Primary and Secondary Elevator boards in a Tower system. The Primary
+Connector (comprised of sides A and B) is utilized by the TWR-K60N512 while
+the Secondary Connector (comprised of sides C and D) only makes connections
+to the GND pins.
+
+Connections via the Tower Primary Connector Side A
+--- -------------------- --------------------------------
+PIN NAME                 USAGE
+--- -------------------- --------------------------------
+A7  SCL0                 PTD8
+A8  SDA0                 PTD9
+A9  GPIO9 / CTS1         PTC19
+A10 GPIO8 / SDHC_D2      PTE5
+A11 GPIO7 / SD_WP_DET    PTE27
+A13 ETH_MDC              PTB1
+A14 ETH_MDIO             PTB0
+A16 ETH_RXDV             PTA14
+A19 ETH_RXD1             PTA12
+A20 ETH_RXD0             PTA13
+A21 SSI_MCLK             PTE6
+A22 SSI_BCLK             PTE12
+A23 SSI_FS               PTE11
+A24 SSI_RXD              PTE7
+A25 SSI_TXD              PTE10
+A27 AN3                  PGA0_DP/ADC0_DP0/ADC1_DP3
+A28 AN2                  PGA0_DM/ADC0_DM0/ADC1_DM3
+A29 AN1                  PGA1_DP/ADC1_DP0/ADC0_DP3
+A30 AN0                  PGA1_DM/ADC1_DM0/ADC0_DM3
+A33 TMR1                 PTA9
+A34 TMR0                 PTA8
+A35 GPIO6                PTB9
+A37 PWM3                 PTA6
+A38 PWM2                 PTC3
+A39 PWM1                 PTC2
+A40 PWM0                 PTC1
+A41 RXD0                 PTE25
+A42 TXD0                 PTE24
+A43 RXD1                 PTC16
+A44 TXD1                 PTC17
+A64 CLKOUT0              PTC3
+A66 EBI_AD14             PTC0
+A67 EBI_AD13             PTC1
+A68 EBI_AD12             PTC2
+A69 EBI_AD11             PTC4
+A70 EBI_AD10             PTC5
+A71 EBI_AD9              PTC6
+A71 EBI_R/W_b            PTC11
+A72 EBI_AD8              PTC7
+A73 EBI_AD7              PTC8
+A74 EBI_AD6              PTC9
+A75 EBI_AD5              PTC10
+A76 EBI_AD4              PTD2
+A77 EBI_AD3              PTD3
+A78 EBI_AD2              PTD4
+A79 EBI_AD1              PTD5
+A80 EBI_AD0              PTD6
+
+Connections via the Tower Primary Connector Side B
+--- -------------------- --------------------------------
+PIN NAME                 USAGE
+--- -------------------- --------------------------------
+B7  SDHC_CLK / SPI1_CLK  PTE2
+B9  SDHC_D3 / SPI1_CS0_b PTE4
+B10 SDHC_CMD / SPI1_MOSI PTE1
+B11 SDHC_D0 / SPI1_MISO  PTE3
+B13 ETH_RXER             PTA5
+B15 ETH_TXEN             PTA15
+B19 ETH_TXD1             PTA17
+B20 ETH_TXD0             PTA16
+B21 GPIO1 / RTS1         PTC18
+B22 GPIO2 / SDHC_D1      PTE0
+B23 GPIO3                PTE28
+B24 CLKIN0               PTA18
+B25 CLKOUT1              PTE26
+B27 AN7                  PTB7
+B28 AN6                  PTB6
+B29 AN5                  PTB5
+B30 AN4                  PTB4
+B34 TMR2                 PTD6
+B35 GPIO4                PTB8
+B37 PWM7                 PTA2
+B38 PWM6                 PTA1
+B39 PWM5                 PTD5
+B40 PWM4                 PTA7
+B41 CANRX0               PTE25
+B42 CANTX0               PTE24
+B44 SPI0_MISO            PTD14
+B45 SPI0_MOSI            PTD13
+B46 SPI0_CS0_b           PTD11
+B47 SPI0_CS1_b           PTD15
+B48 SPI0_CLK             PTD12
+B50 SCL1                 PTD8
+B51 SDA1                 PTD9
+B52 GPIO5 / SD_CARD_DET  PTE28
+B55 IRQ_H                PTA24
+B56 IRQ_G                PTA24
+B57 IRQ_F                PTA25
+B58 IRQ_E                PTA25
+B59 IRQ_D                PTA26
+B60 IRQ_C                PTA26
+B61 IRQ_B                PTA27
+B62 IRQ_A                PTA27
+B63 EBI_ALE / EBI_CS1_b  PTD0
+B64 EBI_CS0_b            PTD1
+B66 EBI_AD15             PTB18
+B67 EBI_AD16             PTB17
+B68 EBI_AD17             PTB16
+B69 EBI_AD18             PTB11
+B70 EBI_AD19             PTB10
+B72 EBI_OE_b             PTB19
+B73 EBI_D7               PTB20
+B74 EBI_D6               PTB21
+B75 EBI_D5               PTB22
+B76 EBI_D4               PTB23
+B77 EBI_D3               PTC12
+B78 EBI_D2               PTC13
+B79 EBI_D1               PTC14
+B80 EBI_D0               PTC15
+
+TWR-SER Serial Board Connection
+===============================
+
+The serial board connects into the tower and then maps to the tower pins to
+yet other functions (see TWR-SER.pdf).
+
+For the serial port, the following jumpers are required:
+
+  J15: 1-2 (default)
+  J17: 1-2 (default)
+  J18: 1-2 (default)
+  J19: 1-2 (default)
+
+The two connections map as follows:
+
+  A41 RXD0  - Not connected
+  A42 TXD0  - Not connected
+  A43 RXD1  - ELE_RXD (connects indirectory to DB-9 connector J8)
+  A44 TXD1  - ELE_TXD (connects indirectory to DB-9 connector J8)
+
+Finally, we can conclude that:
+
+  UART4 (PTE24/25) is not connected, and
+  UART3 (PTC16/17) is associated with the DB9 connector
+
+NOTE: UART5 is associated with OSJTAG bridge and may also be usable.
+
+LEDs
+====
+
+The TWR-K60N100 board has four LEDs labeled D2..D4 on the board.  Usage of
+these LEDs is defined in include/board.h and src/up_leds.c.  They are encoded
+as follows:
+
+    SYMBOL                Meaning                  LED1*    LED2    LED3    LED4
+    -------------------   -----------------------  -------  ------- ------- ------
+    LED_STARTED           NuttX has been started   ON       OFF     OFF     OFF
+    LED_HEAPALLOCATE      Heap has been allocated  OFF      ON      OFF     OFF
+    LED_IRQSENABLED       Interrupts enabled       ON       ON      OFF     OFF
+    LED_STACKCREATED      Idle stack created       OFF      OFF     ON      OFF
+    LED_INIRQ             In an interrupt**        ON       N/C     N/C     OFF
+    LED_SIGNAL            In a signal handler***   N/C      ON      N/C     OFF
+    LED_ASSERTION         An assertion failed      ON       ON      N/C     OFF
+    LED_PANIC             The system has crashed   N/C      N/C      N/C    ON
+    LED_IDLE              STM32 is is sleep mode   (Optional, not used)
+
+  * If LED1, LED2, LED3 are statically on, then NuttX probably failed to boot
+    and these LEDs will give you some indication of where the failure was
+ ** The normal state is LED3 ON and LED1 faintly glowing.  This faint glow
+    is because of timer interrupts that result in the LED being illuminated
+    on a small proportion of the time.
+*** LED2 may also flicker normally if signals are processed.
+
+Development Environment
+=======================
+
+  Either Linux or Cygwin on Windows can be used for the development environment.
+  The source has been built only using the GNU toolchain (see below).  Other
+  toolchains will likely cause problems. Testing was performed using the Cygwin
+  environment.
+
+GNU Toolchain Options
+=====================
+
+  The NuttX make system has been modified to support the following different
+  toolchain options.
+
+  1. The CodeSourcery GNU toolchain,
+  2. The devkitARM GNU toolchain,
+  3. The NuttX buildroot Toolchain (see below).
+
+  All testing has been conducted using the CodeSourcery Windows toolchain.  To
+  use the devkitARM or the NuttX GNU toolchain, you simply need to change the
+  the following configuration options to your .config (or defconfig) file:
+
+    CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y  : CodeSourcery under Windows
+    CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y  : CodeSourcery under Linux
+    CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM=y      : devkitARM under Windows
+    CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y      : NuttX buildroot under Linux or Cygwin (default)
+
+  If you are not using CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT, then you may also have to modify
+  the PATH in the setenv.h file if your make cannot find the tools.
+
+  NOTE: the CodeSourcery (for Windows) and devkitARM toolchains are
+  Windows native toolchains.  The CodeSourcey (for Linux) and NuttX buildroot
+  toolchains are Cygwin and/or Linux native toolchains. There are several limitations
+  to using a Windows based toolchain in a Cygwin environment.  The three biggest are:
+
+  1. The Windows toolchain cannot follow Cygwin paths.  Path conversions are
+     performed automatically in the Cygwin makefiles using the 'cygpath' utility
+     but you might easily find some new path problems.  If so, check out 'cygpath -w'
+
+  2. Windows toolchains cannot follow Cygwin symbolic links.  Many symbolic links
+     are used in Nuttx (e.g., include/arch).  The make system works around these
+     problems for the Windows tools by copying directories instead of linking them.
+     But this can also cause some confusion for you:  For example, you may edit
+     a file in a "linked" directory and find that your changes had no effect.
+     That is because you are building the copy of the file in the "fake" symbolic
+     directory.  If you use a Windows toolchain, you should get in the habit of
+     making like this:
+
+       make clean_context all
+
+     An alias in your .bashrc file might make that less painful.
+
+  NOTE 1: The CodeSourcery toolchain (2009q1) does not work with default optimization
+  level of -Os (See Make.defs).  It will work with -O0, -O1, or -O2, but not with
+  -Os.
+
+  NOTE 2: The devkitARM toolchain includes a version of MSYS make.  Make sure that
+  the paths to Cygwin's /bin and /usr/bin directories appear BEFORE the devkitARM
+  path or will get the wrong version of make.
+
+IDEs
+====
+
+  NuttX is built using command-line make.  It can be used with an IDE, but some
+  effort will be required to create the project.
+
+  Makefile Build
+  --------------
+  Under Eclipse, it is pretty easy to set up an "empty makefile project" and
+  simply use the NuttX makefile to build the system.  That is almost for free
+  under Linux.  Under Windows, you will need to set up the "Cygwin GCC" empty
+  makefile project in order to work with Windows (Google for "Eclipse Cygwin" -
+  there is a lot of help on the internet).
+
+  Native Build
+  ------------
+  Here are a few tips before you start that effort:
+
+  1) Select the toolchain that you will be using in your .config file
+  2) Start the NuttX build at least one time from the Cygwin command line
+     before trying to create your project.  This is necessary to create
+     certain auto-generated files and directories that will be needed.
+  3) Set up include pathes:  You will need include/, arch/arm/src/k40,
+     arch/arm/src/common, arch/arm/src/armv7-m, and sched/.
+  4) All assembly files need to have the definition option -D __ASSEMBLY__
+     on the command line.
+
+  Startup files will probably cause you some headaches.  The NuttX startup file
+  is arch/arm/src/kinetis/k40_vectors.S.
+
+NuttX EABI "buildroot" Toolchain
+================================
+
+  A GNU GCC-based toolchain is assumed.  The files */setenv.sh should
+  be modified to point to the correct path to the Cortex-M4 GCC toolchain (if
+  different from the default in your PATH variable).
+
+  If you have no Cortex-M4 toolchain, one can be downloaded from the NuttX
+  Bitbucket download site (https://bitbucket.org/nuttx/buildroot/downloads/).
+  This GNU toolchain builds and executes in the Linux or Cygwin environment.
+
+  NOTE:  The NuttX toolchain may not include optimizations for Cortex-M4 (ARMv7E-M).
+
+  1. You must have already configured Nuttx in /nuttx.
+
+     cd tools
+     ./configure.sh twr-k60n512/
+
+  2. Download the latest buildroot package into 
+
+  3. unpack the buildroot tarball.  The resulting directory may
+     have versioning information on it like buildroot-x.y.z.  If so,
+     rename /buildroot-x.y.z to /buildroot.
+
+  4. cd /buildroot
+
+  5. cp configs/cortexm3-eabi-defconfig-4.6.3 .config
+
+  6. make oldconfig
+
+  7. make
+
+  8. Edit setenv.h, if necessary, so that the PATH variable includes
+     the path to the newly built binaries.
+
+  See the file configs/README.txt in the buildroot source tree.  That has more
+  details PLUS some special instructions that you will need to follow if you are
+  building a Cortex-M4 toolchain for Cygwin under Windows.
+
+  NOTE:  Unfortunately, the 4.6.3 EABI toolchain is not compatible with the
+  the NXFLAT tools.  See the top-level TODO file (under "Binary loaders") for
+  more information about this problem. If you plan to use NXFLAT, please do not
+  use the GCC 4.6.3 EABI toochain; instead use the GCC 4.3.3 OABI toolchain.
+  See instructions below.
+
+NuttX OABI "buildroot" Toolchain
+================================
+
+  The older, OABI buildroot toolchain is also available.  To use the OABI
+  toolchain:
+
+  1. When building the buildroot toolchain, either (1) modify the cortexm3-eabi-defconfig-4.6.3
+     configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
+     configuration such as cortexm3-defconfig-4.3.3
+
+  2. Modify the Make.defs file to use the OABI conventions:
+
+    +CROSSDEV = arm-nuttx-elf-
+    +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+    +NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
+    -CROSSDEV = arm-nuttx-eabi-
+    -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+    -NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
+
+NXFLAT Toolchain
+================
+
+  If you are *not* using the NuttX buildroot toolchain and you want to use
+  the NXFLAT tools, then you will still have to build a portion of the buildroot
+  tools -- just the NXFLAT tools.  The buildroot with the NXFLAT tools can
+  be downloaded from the NuttX Bitbucket download site
+  (https://bitbucket.org/nuttx/nuttx/downloads/).
+
+  This GNU toolchain builds and executes in the Linux or Cygwin environment.
+
+  1. You must have already configured Nuttx in /nuttx.
+
+     cd tools
+     ./configure.sh lpcxpresso-lpc1768/
+
+  2. Download the latest buildroot package into 
+
+  3. unpack the buildroot tarball.  The resulting directory may
+     have versioning information on it like buildroot-x.y.z.  If so,
+     rename /buildroot-x.y.z to /buildroot.
+
+  4. cd /buildroot
+
+  5. cp configs/cortexm3-defconfig-nxflat .config
+
+  6. make oldconfig
+
+  7. make
+
+  8. Edit setenv.h, if necessary, so that the PATH variable includes
+     the path to the newly builtNXFLAT binaries.
+
+TWR-K60N512-specific Configuration Options
+==========================================
+
+    CONFIG_ARCH - Identifies the arch/ subdirectory.  This sould
+       be set to:
+
+       CONFIG_ARCH=arm
+
+    CONFIG_ARCH_family - For use in C code:
+
+       CONFIG_ARCH_ARM=y
+
+    CONFIG_ARCH_architecture - For use in C code:
+
+       CONFIG_ARCH_CORTEXM4=y
+
+    CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
+
+       CONFIG_ARCH_CHIP=k40
+
+    CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
+       chip:
+
+       CONFIG_ARCH_CHIP_MK60N512VMD100
+
+    CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
+       hence, the board that supports the particular chip or SoC.
+
+       CONFIG_ARCH_BOARD=twr-k60n512 (for the TWR-K60N512 development board)
+
+    CONFIG_ARCH_BOARD_name - For use in C code
+
+       CONFIG_ARCH_BOARD_TWR_K60N512=y
+
+    CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
+       of delay loops
+
+    CONFIG_ENDIAN_BIG - define if big endian (default is little
+       endian)
+
+    CONFIG_RAM_SIZE - Describes the installed DRAM (SRAM in this case):
+
+       CONFIG_RAM_SIZE=0x00010000 (64Kb)
+
+    CONFIG_RAM_START - The start address of installed DRAM
+
+       CONFIG_RAM_START=0x20000000
+
+    CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that
+       have LEDs
+
+    CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
+       stack. If defined, this symbol is the size of the interrupt
+        stack in bytes.  If not defined, the user task stacks will be
+      used during interrupt handling.
+
+    CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
+
+    CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
+
+    CONFIG_ARCH_CALIBRATION - 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 measure
+       the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
+       the delay actually is 100 seconds.
+
+  Individual subsystems can be enabled:
+
+    CONFIG_KINETIS_TRACE    -- Enable trace clocking on power up.
+    CONFIG_KINETIS_FLEXBUS  -- Enable flexbus clocking on power up.
+    CONFIG_KINETIS_UART0    -- Support UART0
+    CONFIG_KINETIS_UART1    -- Support UART1
+    CONFIG_KINETIS_UART2    -- Support UART2
+    CONFIG_KINETIS_UART3    -- Support UART3
+    CONFIG_KINETIS_UART4    -- Support UART4
+    CONFIG_KINETIS_UART5    -- Support UART5
+    CONFIG_KINETIS_ENET     -- Support Ethernet (K60 only)
+    CONFIG_KINETIS_RNGB     -- Support the random number generator(K60 only)
+    CONFIG_KINETIS_FLEXCAN0 -- Support FlexCAN0
+    CONFIG_KINETIS_FLEXCAN1 -- Support FlexCAN1
+    CONFIG_KINETIS_SPI0     -- Support SPI0
+    CONFIG_KINETIS_SPI1     -- Support SPI1
+    CONFIG_KINETIS_SPI2     -- Support SPI2
+    CONFIG_KINETIS_I2C0     -- Support I2C0
+    CONFIG_KINETIS_I2C1     -- Support I2C1
+    CONFIG_KINETIS_I2S      -- Support I2S
+    CONFIG_KINETIS_DAC0     -- Support DAC0
+    CONFIG_KINETIS_DAC1     -- Support DAC1
+    CONFIG_KINETIS_ADC0     -- Support ADC0
+    CONFIG_KINETIS_ADC1     -- Support ADC1
+    CONFIG_KINETIS_CMP      -- Support CMP
+    CONFIG_KINETIS_VREF     -- Support VREF
+    CONFIG_KINETIS_SDHC     -- Support SD host controller
+    CONFIG_KINETIS_FTM0     -- Support FlexTimer 0
+    CONFIG_KINETIS_FTM1     -- Support FlexTimer 1
+    CONFIG_KINETIS_FTM2     -- Support FlexTimer 2
+    CONFIG_KINETIS_LPTIMER  -- Support the low power timer
+    CONFIG_KINETIS_RTC      -- Support RTC
+    CONFIG_KINETIS_SLCD     -- Support the segment LCD (K60 only)
+    CONFIG_KINETIS_EWM      -- Support the external watchdog
+    CONFIG_KINETIS_CMT      -- Support Carrier Modulator Transmitter
+    CONFIG_KINETIS_USBOTG   -- Support USB OTG (see also CONFIG_USBHOST and CONFIG_USBDEV)
+    CONFIG_KINETIS_USBDCD   -- Support the USB Device Charger Detection module
+    CONFIG_KINETIS_LLWU     -- Support the Low Leakage Wake-Up Unit
+    CONFIG_KINETIS_TSI      -- Support the touch screeen interface
+    CONFIG_KINETIS_FTFL     -- Support FLASH
+    CONFIG_KINETIS_DMA      -- Support DMA
+    CONFIG_KINETIS_CRC      -- Support CRC
+    CONFIG_KINETIS_PDB      -- Support the Programmable Delay Block
+    CONFIG_KINETIS_PIT      -- Support Programmable Interval Timers
+    CONFIG_ARM_MPU          -- Support the MPU
+
+  Kinetis interrupt priorities (Default is the mid priority).  These should
+  not be set because they can cause unhandled, nested interrupts.  All
+  interrupts need to be at the default priority in the current design.
+
+    CONFIG_KINETIS_UART0PRIO
+    CONFIG_KINETIS_UART1PRIO
+    CONFIG_KINETIS_UART2PRIO
+    CONFIG_KINETIS_UART3PRIO
+    CONFIG_KINETIS_UART4PRIO
+    CONFIG_KINETIS_UART5PRIO
+
+    CONFIG_KINETIS_EMACTMR_PRIO
+    CONFIG_KINETIS_EMACTX_PRIO
+    CONFIG_KINETIS_EMACRX_PRIO
+    CONFIG_KINETIS_EMACMISC_PRIO
+
+    CONFIG_KINETIS_SDHC_PRIO
+
+  PIN Interrupt Support
+
+    CONFIG_GPIO_IRQ          -- Enable pin interrupt support.  Also needs
+      one or more of the following:
+    CONFIG_KINETIS_PORTAINTS -- Support 32 Port A interrupts
+    CONFIG_KINETIS_PORTBINTS -- Support 32 Port B interrupts
+    CONFIG_KINETIS_PORTCINTS -- Support 32 Port C interrupts
+    CONFIG_KINETIS_PORTDINTS -- Support 32 Port D interrupts
+    CONFIG_KINETIS_PORTEINTS -- Support 32 Port E interrupts
+
+  Kinetis K60 specific device driver settings
+
+    CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn (n=0..5) for the
+      console and ttys0 (default is the UART0).
+    CONFIG_UARTn_RXBUFSIZE - Characters are buffered as received.
+       This specific the size of the receive buffer
+    CONFIG_UARTn_TXBUFSIZE - Characters are buffered before
+       being sent.  This specific the size of the transmit buffer
+    CONFIG_UARTn_BAUD - The configure BAUD of the UART.
+    CONFIG_UARTn_BITS - The number of bits.  Must be either 8 or 8.
+    CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
+
+  Kenetis ethernet controller settings
+
+    CONFIG_ENET_NRXBUFFERS - Number of RX buffers.  The size of one
+        buffer is determined by CONFIG_NET_ETH_MTU.  Default: 6
+    CONFIG_ENET_NTXBUFFERS - Number of TX buffers.  The size of one
+        buffer is determined by CONFIG_NET_ETH_MTU.  Default: 2
+    CONFIG_ENET_USEMII - Use MII mode.  Default: RMII mode.
+    CONFIG_ENET_PHYADDR - PHY address
+
+Configurations
+==============
+
+Each TWR-K60N512 configuration is maintained in a sub-directory and
+can be selected as follow:
+
+    cd tools
+    ./configure.sh twr-k60n512/
+    cd -
+    . ./setenv.sh
+
+Where  is one of the following:
+
+  nsh:
+  ---
+    Configures the NuttShell (nsh) located at apps/examples/nsh.  The
+    Configuration enables both the serial and telnet NSH interfaces.
+    Support for the board's SPI-based MicroSD card is included
+    (but not passing tests as of this writing).
+
+    NOTES:
+
+    1. This configuration uses the mconf-based configuration tool.  To
+       change this configuration using that tool, you should:
+
+       a. Build and install the kconfig-mconf tool.  See nuttx/README.txt
+          see additional README.txt files in the NuttX tools repository.
+
+       b. Execute 'make menuconfig' in nuttx/ in order to start the
+          reconfiguration process.
+
+    2. Default platform/toolchain:
+
+       CONFIG_HOST_LINUX=y                 : Linux (Cygwin under Windows okay too).
+       CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y : Buildroot (arm-nuttx-elf-gcc)
+       CONFIG_ARMV7M_OABI_TOOLCHAIN=y      : The older OABI version
+       CONFIG_RAW_BINARY=y                 : Output formats: ELF and raw binary
+
+    3. An SDHC driver is under work and can be enabled in the NSH configuration
+       for further testing be setting the following configuration values as
+       follows:
+
+      CONFIG_KINETIS_SDHC=y                : Enable the SDHC driver
+
+      CONFIG_MMCSD=y                       : Enable MMC/SD support
+      CONFIG_MMCSD_SDIO=y                  : Use the SDIO-based MMC/SD driver
+      CONFIG_MMCSD_NSLOTS=1                : One MMC/SD slot
+
+      CONFIG_FAT=y                         : Eable FAT file system
+      CONFIG_FAT_LCNAMES=y                 : FAT lower case name support
+      CONFIG_FAT_LFN=y                     : FAT long file name support
+      CONFIG_FAT_MAXFNAME=32               : Maximum lenght of a long file name
+
+      CONFIG_GPIO_IRQ=y                    : Enable GPIO interrupts
+      CONFIG_KINETIS_PORTEINTS=y           : Enable PortE GPIO interrupts
+
+      CONFIG_SCHED_WORKQUEUE=y             : Enable the NuttX workqueue
+
+      CONFIG_NSH_ARCHINIT=y                : Provide NSH initializeation logic
diff --git a/configs/freedom-k64f/include/board.h b/configs/freedom-k64f/include/board.h
new file mode 100644
index 0000000000..61ef7384cf
--- /dev/null
+++ b/configs/freedom-k64f/include/board.h
@@ -0,0 +1,407 @@
+/************************************************************************************
+ * configs/freedom-k64f/include/board.h
+ * include/arch/board/board.h
+ *
+ *   Copyright (C) 2011 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.
+ *
+ ************************************************************************************/
+
+#ifndef __ARCH_BOARD_BOARD_H
+#define __ARCH_BOARD_BOARD_H
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include 
+#ifndef __ASSEMBLY__
+# include 
+#endif
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+/* Clocking *************************************************************************/
+/* The K60 tower board uses a 50MHz external clock */
+
+#define BOARD_EXTCLOCK       1              /* External clock */
+#define BOARD_EXTAL_FREQ     48000000       /* 50MHz Oscillator */
+#define BOARD_XTAL32_FREQ    32768          /* 32KHz RTC Oscillator */
+
+/* PLL Configuration.  Either the external clock or crystal frequency is used to
+ * select the PRDIV value. Only reference clock frequencies are supported that will
+ * produce a 2MHz reference clock to the PLL.
+ *
+ *   PLL Input frequency:   PLLIN  = REFCLK/PRDIV = 50MHz/25 = 2MHz
+ *   PLL Output frequency:  PLLOUT = PLLIN*VDIV   = 2Mhz*48 = 96MHz
+ *   MCG Frequency:         PLLOUT = 96MHz
+ */
+
+#define BOARD_PRDIV          19             /* PLL External Reference Divider */
+#define BOARD_VDIV           24             /* PLL VCO Divider (frequency multiplier) */
+
+#define BOARD_PLLIN_FREQ     (BOARD_EXTAL_FREQ / BOARD_PRDIV)
+#define BOARD_PLLOUT_FREQ    (BOARD_PLLIN_FREQ * BOARD_VDIV)
+#define BOARD_MCG_FREQ       BOARD_PLLOUT_FREQ
+
+/* SIM CLKDIV1 dividers */
+
+#define BOARD_OUTDIV1        1              /* Core        = MCG, 96MHz */
+#define BOARD_OUTDIV2        2              /* Bus         = MCG/2, 48MHz */
+#define BOARD_OUTDIV3        2              /* FlexBus     = MCG/2, 48MHz */
+#define BOARD_OUTDIV4        4              /* Flash clock = MCG/4, 24MHz */
+
+#define BOARD_CORECLK_FREQ  (BOARD_MCG_FREQ / BOARD_OUTDIV1)
+#define BOARD_BUS_FREQ      (BOARD_MCG_FREQ / BOARD_OUTDIV2)
+#define BOARD_FLEXBUS_FREQ  (BOARD_MCG_FREQ / BOARD_OUTDIV3)
+#define BOARD_FLASHCLK_FREQ (BOARD_MCG_FREQ / BOARD_OUTDIV4)
+
+/* SDHC clocking ********************************************************************/
+
+/* SDCLK configurations corresponding to various modes of operation.   Formula is:
+ *
+ *   SDCLK  frequency = (base clock) / (prescaler * divisor)
+ *
+ * The SDHC module is always configure configured so that the core clock is the base
+ * clock.
+ */
+
+/* Identification mode:  400KHz = 96MHz / ( 16 * 15) */
+
+#define BOARD_SDHC_IDMODE_PRESCALER    SDHC_SYSCTL_SDCLKFS_DIV16
+#define BOARD_SDHC_IDMODE_DIVISOR      SDHC_SYSCTL_DVS_DIV(15)
+
+/* MMC normal mode: 16MHz  = 96MHz / (2 * 3) */
+
+#define BOARD_SDHC_MMCMODE_PRESCALER   SDHC_SYSCTL_SDCLKFS_DIV2
+#define BOARD_SDHC_MMCMODE_DIVISOR     SDHC_SYSCTL_DVS_DIV(3)
+
+/* SD normal mode (1-bit): 16MHz  = 96MHz / (2 * 3) */
+
+#define BOARD_SDHC_SD1MODE_PRESCALER   SDHC_SYSCTL_SDCLKFS_DIV2
+#define BOARD_SDHC_SD1MODE_DIVISOR     SDHC_SYSCTL_DVS_DIV(3)
+
+/* SD normal mode (4-bit): 24MHz  = 96MHz / (2 * 2) (with DMA)
+ * SD normal mode (4-bit): 16MHz  = 96MHz / (2 * 3) (no DMA)
+ */
+
+#ifdef CONFIG_SDIO_DMA
+#  define BOARD_SDHC_SD4MODE_PRESCALER SDHC_SYSCTL_SDCLKFS_DIV2
+#  define BOARD_SDHC_SD4MODE_DIVISOR   SDHC_SYSCTL_DVS_DIV(2)
+#else
+//#  define BOARD_SDHC_SD4MODE_PRESCALER SDHC_SYSCTL_SDCLKFS_DIV2
+//#  define BOARD_SDHC_SD4MODE_DIVISOR   SDHC_SYSCTL_DVS_DIV(3)
+#  define BOARD_SDHC_SD4MODE_PRESCALER SDHC_SYSCTL_SDCLKFS_DIV16
+#  define BOARD_SDHC_SD4MODE_DIVISOR   SDHC_SYSCTL_DVS_DIV(15)
+#endif
+
+/* LED definitions ******************************************************************/
+/* The FREEDOM-K64F has four LEDs:
+ *
+ * 1. E1 / Orange LED   PTA11
+ * 2. E2 / Yellow LED   PTA28
+ * 3. E3 / Green LED    PTA29
+ * 4  E4 / Blue LED     PTA10
+ *
+ * The 4 LEDs are encoded as follows:
+ */
+
+#define LED_STARTED       0  /* LED1 */
+#define LED_HEAPALLOCATE  1  /* LED2 */
+#define LED_IRQSENABLED   2  /* LED1 + LED2 */
+#define LED_STACKCREATED  3  /* LED3 */
+#define LED_INIRQ         4  /* LED1 + LED3 */
+#define LED_SIGNAL        5  /* LED2 + LED3 */
+#define LED_ASSERTION     6  /* LED1 + LED2 + LED3 */
+#define LED_PANIC         7  /* N/C  + N/C  + N/C + LED4 */
+
+/* Button definitions ***************************************************************/
+/* The FREEDOM-K64F has user buttons (plus a reset button):
+ *
+ * 1. SW1 (IRQ0)   PTA19
+ * 2. SW2 (IRQ1)   PTE26
+ */
+
+#define BUTTON_SW1        0
+#define BUTTON_SW2        1
+
+#define BUTTON_SW1_BIT    (1 << BUTTON_WAKEUP)
+#define BUTTON_SW2_BIT    (1 << BUTTON_TAMPER)
+
+/* Alternative pin resolution *******************************************************/
+/* If there are alternative configurations for various pins in the
+ * k64_k60pinmux.h header file, those alternative pins will be labeled with a
+ * suffix like _1, _2, etc.  The logic in this file must select the correct pin
+ * configuration for the board by defining a pin configuration (with no suffix) that
+ * maps to the correct alternative.
+ */
+
+/* On-Board Connections
+ * -------------------- ------------------------- -------- -------------------
+ * FEATURE              CONNECTION                PORT/PIN PIN FUNCTION
+ * -------------------- ------------------------- -------- -------------------
+ * OSJTAG USB-to-serial OSJTAG Bridge RX Data     PTE9     UART5_RX
+ * Bridge               OSJTAG Bridge TX Data     PTE8     UART5_TX
+ * SD Card Slot         SD Clock                  PTE2     SDHC0_DCLK
+ *                      SD Command                PTE3     SDHC0_CMD
+ *                      SD Data0                  PTE1     SDHC0_D0
+ *                      SD Data1                  PTE0     SDHC0_D1
+ *                      SD Data2                  PTE5     SDHC0_D2
+ *                      SD Data3                  PTE4     SDHC0_D3
+ *                      SD Card Detect            PTE28    PTE28
+ *                      SD Write Protect          PTE27    PTE27
+ * Infrared Port        IR Transmit               PTD7     CMT_IRO
+ *                      IR Receive                PTC6     CMP0_IN0
+ * Pushbuttons          SW1 (IRQ0)                PTA19    PTA19
+ *                      SW2 (IRQ1)                PTE26    PTE26
+ *                      SW3 (RESET)               RESET_b  RESET_b
+ * Touch Pads           E1 / Touch                PTA4     TSI0_CH5
+ *                      E2 / Touch                PTB3     TSI0_CH8
+ *                      E3 / Touch                PTB2     TSI0_CH7
+ *                      E4 / Touch                PTB16    TSI0_CH9
+ * LEDs                 E1 / Orange LED           PTA11    PTA11
+ *                      E2 / Yellow LED           PTA28    PTA28
+ *                      E3 / Green LED            PTA29    PTA29
+ *                      E4 / Blue LED             PTA10    PTA10
+ * Potentiometer        Potentiometer (R71)       ?        ADC1_DM1
+ * Accelerometer        I2C SDA                   PTD9     I2C0_SDA
+ *                      I2C SCL                   PTD8     I2C0_SCL
+ *                      IRQ                       PTD10    PTD10
+ * Touch Pad / Segment  Electrode 0 (J3 Pin 3)    PTB0     TSI0_CH0
+ * LCD TWRPI Socket     Electrode 1 (J3 Pin 5)    PTB1     TSI0_CH6
+ *                      Electrode 2 (J3 Pin 7)    PTB2     TSI0_CH7
+ *                      Electrode 3 (J3 Pin 8)    PTB3     TSI0_CH8
+ *                      Electrode 4 (J3 Pin 9)    PTC0     TSI0_CH13
+ *                      Electrode 5 (J3 Pin 10)   PTC1     TSI0_CH14
+ *                      Electrode 6 (J3 Pin 11)   PTC2     TSI0_CH15
+ *                      Electrode 7 (J3 Pin 12)   PTA4     TSI0_CH5
+ *                      Electrode 8 (J3 Pin 13)   PTB16    TSI0_CH9
+ *                      Electrode 9 (J3 Pin 14)   PTB17    TSI0_CH10
+ *                      Electrode 10 (J3 Pin 15)  PTB18    TSI0_CH11
+ *                      Electrode 11 (J3 Pin 16)  PTB19    TSI0_CH12
+ *                      TWRPI ID0 (J3 Pin 17)     ?        ADC1_DP1
+ *                      TWRPI ID1 (J3 Pin 18)     ?        ADC1_SE16
+ */
+
+#define PIN_UART5_RX  PIN_UART5_RX_2
+#define PIN_UART5_TX  PIN_UART5_TX_2
+#define PIN_I2C0_SDA  PIN_I2C0_SDA_3
+#define PIN_I2C0_SCL  PIN_I2C0_SCL_3
+
+/* Connections via the General Purpose Tower Plug-in (TWRPI) Socket
+ * -------------------- ------------------------- -------- -------------------
+ * FEATURE             CONNECTION                 PORT/PIN PIN FUNCTION
+ * -------------------- ------------------------- -------- -------------------
+ * General Purpose      TWRPI AN0 (J4 Pin 8)       ?        ADC0_DP0/ADC1_DP3
+ * TWRPI Socket         TWRPI AN1 (J4 Pin 9)       ?        ADC0_DM0/ADC1_DM3
+ *                      TWRPI AN2 (J4 Pin 12)      ?        ADC1_DP0/ADC0_DP3
+ *                      TWRPI ID0 (J4 Pin 17)      ?        ADC0_DP1
+ *                      TWRPI ID1 (J4 Pin 18)      ?        ADC0_DM1
+ *                      TWRPI I2C SCL (J5 Pin 3)   PTD8     I2C0_SCL
+ *                      TWRPI I2C SDA (J5 Pin 4)   PTD9     I2C0_SDA
+ *                      TWRPI SPI MISO (J5 Pin 9)  PTD14    SPI2_SIN
+ *                      TWRPI SPI MOSI (J5 Pin 10) PTD13    SPI2_SOUT
+ *                      TWRPI SPI SS (J5 Pin 11)   PTD15    SPI2_PCS0
+ *                      TWRPI SPI CLK (J5 Pin 12)  PTD12    SPI2_SCK
+ *                      TWRPI GPIO0 (J5 Pin 15)    PTD10    PTD10
+ *                      TWRPI GPIO1 (J5 Pin 16)    PTB8     PTB8
+ *                      TWRPI GPIO2 (J5 Pin 17)    PTB9     PTB9
+ *                      TWRPI GPIO3 (J5 Pin 18)    PTA19    PTA19
+ *                      TWRPI GPIO4 (J5 Pin 19)    PTE26    PTE26
+ */
+
+#define PIN_SPI2_SIN   PIN_SPI2_SIN_2
+#define PIN_SPI2_SOUT  PIN_SPI2_SOUT_2
+#define PIN_SPI2_SCK   PIN_SPI2_SCK_2
+
+/* Connections via the Tower Primary Connector Side A
+ * --- -------------------- --------------------------------
+ * PIN NAME                 USAGE
+ * --- -------------------- --------------------------------
+ * A7  SCL0                 PTD8
+ * A8  SDA0                 PTD9
+ * A9  GPIO9 / CTS1         PTC19
+ * A10 GPIO8 / SDHC_D2      PTE5
+ * A11 GPIO7 / SD_WP_DET    PTE27
+ * A13 ETH_MDC              PTB1
+ * A14 ETH_MDIO             PTB0
+ * A16 ETH_RXDV             PTA14
+ * A19 ETH_RXD1             PTA12
+ * A20 ETH_RXD0             PTA13
+ * A21 SSI_MCLK             PTE6
+ * A22 SSI_BCLK             PTE12
+ * A23 SSI_FS               PTE11
+ * A24 SSI_RXD              PTE7
+ * A25 SSI_TXD              PTE10
+ * A27 AN3                  PGA0_DP/ADC0_DP0/ADC1_DP3
+ * A28 AN2                  PGA0_DM/ADC0_DM0/ADC1_DM3
+ * A29 AN1                  PGA1_DP/ADC1_DP0/ADC0_DP3
+ * A30 AN0                  PGA1_DM/ADC1_DM0/ADC0_DM3
+ * A33 TMR1                 PTA9
+ * A34 TMR0                 PTA8
+ * A35 GPIO6                PTB9
+ * A37 PWM3                 PTA6
+ * A38 PWM2                 PTC3
+ * A39 PWM1                 PTC2
+ * A40 PWM0                 PTC1
+ * A41 RXD0                 PTE25
+ * A42 TXD0                 PTE24
+ * A43 RXD1                 PTC16
+ * A44 TXD1                 PTC17
+ * A64 CLKOUT0              PTC3
+ * A66 EBI_AD14             PTC0
+ * A67 EBI_AD13             PTC1
+ * A68 EBI_AD12             PTC2
+ * A69 EBI_AD11             PTC4
+ * A70 EBI_AD10             PTC5
+ * A71 EBI_AD9              PTC6
+ * A71 EBI_R/W_b            PTC11
+ * A72 EBI_AD8              PTC7
+ * A73 EBI_AD7              PTC8
+ * A74 EBI_AD6              PTC9
+ * A75 EBI_AD5              PTC10
+ * A76 EBI_AD4              PTD2
+ * A77 EBI_AD3              PTD3
+ * A78 EBI_AD2              PTD4
+ * A79 EBI_AD1              PTD5
+ * A80 EBI_AD0              PTD6
+ */
+
+/* PTE 26/27 */
+
+#define PIN_UART3_RX   PIN_UART3_RX_2
+#define PIN_UART3_TX   PIN_UART3_TX_2
+
+/* PTE 24/25 */
+
+#define PIN_UART4_RX   PIN_UART4_RX_2
+#define PIN_UART4_TX   PIN_UART4_TX_2
+
+/* Connections via the Tower Primary Connector Side B
+ * --- -------------------- --------------------------------
+ * PIN NAME                 USAGE
+ * --- -------------------- --------------------------------
+ * B7  SDHC_CLK / SPI1_CLK  PTE2
+ * B9  SDHC_D3 / SPI1_CS0_b PTE4
+ * B10 SDHC_CMD / SPI1_MOSI PTE1
+ * B11 SDHC_D0 / SPI1_MISO  PTE3
+ * B13 ETH_RXER             PTA5
+ * B15 ETH_TXEN             PTA15
+ * B19 ETH_TXD1             PTA17
+ * B20 ETH_TXD0             PTA16
+ * B21 GPIO1 / RTS1         PTC18
+ * B22 GPIO2 / SDHC_D1      PTE0
+ * B23 GPIO3                PTE28
+ * B24 CLKIN0               PTA18
+ * B25 CLKOUT1              PTE26
+ * B27 AN7                  PTB7
+ * B28 AN6                  PTB6
+ * B29 AN5                  PTB5
+ * B30 AN4                  PTB4
+ * B34 TMR2                 PTD6
+ * B35 GPIO4                PTB8
+ * B37 PWM7                 PTA2
+ * B38 PWM6                 PTA1
+ * B39 PWM5                 PTD5
+ * B40 PWM4                 PTA7
+ * B41 CANRX0               PTE25
+ * B42 CANTX0               PTE24
+ * B44 SPI0_MISO            PTD14
+ * B45 SPI0_MOSI            PTD13
+ * B46 SPI0_CS0_b           PTD11
+ * B47 SPI0_CS1_b           PTD15
+ * B48 SPI0_CLK             PTD12
+ * B50 SCL1                 PTD8
+ * B51 SDA1                 PTD9
+ * B52 GPIO5 / SD_CARD_DET  PTE28
+ * B55 IRQ_H                PTA24
+ * B56 IRQ_G                PTA24
+ * B57 IRQ_F                PTA25
+ * B58 IRQ_E                PTA25
+ * B59 IRQ_D                PTA26
+ * B60 IRQ_C                PTA26
+ * B61 IRQ_B                PTA27
+ * B62 IRQ_A                PTA27
+ * B63 EBI_ALE / EBI_CS1_b  PTD0
+ * B64 EBI_CS0_b            PTD1
+ * B66 EBI_AD15             PTB18
+ * B67 EBI_AD16             PTB17
+ * B68 EBI_AD17             PTB16
+ * B69 EBI_AD18             PTB11
+ * B70 EBI_AD19             PTB10
+ * B72 EBI_OE_b             PTB19
+ * B73 EBI_D7               PTB20
+ * B74 EBI_D6               PTB21
+ * B75 EBI_D5               PTB22
+ * B76 EBI_D4               PTB23
+ * B77 EBI_D3               PTC12
+ * B78 EBI_D2               PTC13
+ * B79 EBI_D1               PTC14
+ * B80 EBI_D0               PTC15
+ */
+
+/************************************************************************************
+ * Public Data
+ ************************************************************************************/
+
+#ifndef __ASSEMBLY__
+
+#undef EXTERN
+#if defined(__cplusplus)
+#define EXTERN extern "C"
+extern "C" {
+#else
+#define EXTERN extern
+#endif
+
+/************************************************************************************
+ * Public Function Prototypes
+ ************************************************************************************/
+/************************************************************************************
+ * Name: kinetis_boardinitialize
+ *
+ * Description:
+ *   All STM32 architectures must provide the following entry point.  This entry point
+ *   is called early in the intitialization -- after all memory has been configured
+ *   and mapped but before any devices have been initialized.
+ *
+ ************************************************************************************/
+
+EXTERN void kinetis_boardinitialize(void);
+
+#undef EXTERN
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* __ASSEMBLY__ */
+#endif  /* __ARCH_BOARD_BOARD_H */
diff --git a/configs/freedom-k64f/nsh/Make.defs b/configs/freedom-k64f/nsh/Make.defs
new file mode 100644
index 0000000000..1d02938622
--- /dev/null
+++ b/configs/freedom-k64f/nsh/Make.defs
@@ -0,0 +1,111 @@
+############################################################################
+# configs/freedom-k64f/nsh/Make.defs
+#
+#   Copyright (C) 2011 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.
+#
+############################################################################
+
+include ${TOPDIR}/.config
+include ${TOPDIR}/tools/Config.mk
+include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
+
+ifeq ($(WINTOOL),y)
+  # Windows-native toolchains
+  DIRLINK = $(TOPDIR)/tools/copydir.sh
+  DIRUNLINK = $(TOPDIR)/tools/unlink.sh
+  MKDEP = $(TOPDIR)/tools/mkwindeps.sh
+  ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
+  ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
+  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/flash.ld}"
+else
+  # Linux/Cygwin-native toolchain
+  MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
+  ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
+  ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
+  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/flash.ld
+endif
+
+CC = $(CROSSDEV)gcc
+CXX = $(CROSSDEV)g++
+CPP = $(CROSSDEV)gcc -E
+LD = $(CROSSDEV)ld
+AR = $(CROSSDEV)ar rcs
+NM = $(CROSSDEV)nm
+OBJCOPY = $(CROSSDEV)objcopy
+OBJDUMP = $(CROSSDEV)objdump
+
+ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
+ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
+
+ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
+  ARCHOPTIMIZATION = -g
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
+endif
+
+ARCHCFLAGS = -fno-builtin
+ARCHCXXFLAGS = -fno-builtin -fno-exceptions
+ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
+ARCHWARNINGSXX = -Wall -Wshadow -Wundef
+ARCHDEFINES =
+ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
+
+CFLAGS = $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
+CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
+CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
+AFLAGS = $(CFLAGS) -D__ASSEMBLY__
+
+NXFLATLDFLAGS1 = -r -d -warn-common
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
+LDNXFLATFLAGS = -e main -s 2048
+
+ASMEXT = .S
+OBJEXT = .o
+LIBEXT = .a
+EXEEXT =
+
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
+  LDFLAGS += -nostartfiles -nodefaultlibs
+endif
+ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
+  LDFLAGS += -g
+endif
+
+
+HOSTCC = gcc
+HOSTINCLUDES = -I.
+HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe
+HOSTLDFLAGS =
+
diff --git a/configs/freedom-k64f/nsh/defconfig b/configs/freedom-k64f/nsh/defconfig
new file mode 100644
index 0000000000..085afbde09
--- /dev/null
+++ b/configs/freedom-k64f/nsh/defconfig
@@ -0,0 +1,901 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Nuttx/ Configuration
+#
+
+#
+# Build Setup
+#
+# CONFIG_EXPERIMENTAL is not set
+# CONFIG_DEFAULT_SMALL is not set
+CONFIG_HOST_LINUX=y
+# CONFIG_HOST_OSX is not set
+# CONFIG_HOST_WINDOWS is not set
+# CONFIG_HOST_OTHER is not set
+
+#
+# Build Configuration
+#
+# CONFIG_APPS_DIR="../apps"
+CONFIG_BUILD_FLAT=y
+# CONFIG_BUILD_2PASS is not set
+
+#
+# Binary Output Formats
+#
+# CONFIG_RRLOAD_BINARY is not set
+CONFIG_INTELHEX_BINARY=y
+CONFIG_MOTOROLA_SREC=y
+# CONFIG_RAW_BINARY is not set
+# CONFIG_UBOOT_UIMAGE is not set
+
+#
+# Customize Header Files
+#
+# CONFIG_ARCH_STDINT_H is not set
+# CONFIG_ARCH_STDBOOL_H is not set
+# CONFIG_ARCH_MATH_H is not set
+# CONFIG_ARCH_FLOAT_H is not set
+# CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
+
+#
+# Debug Options
+#
+CONFIG_DEBUG_ALERT=y
+# CONFIG_DEBUG_FEATURES is not set
+CONFIG_ARCH_HAVE_STACKCHECK=y
+# CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
+CONFIG_DEBUG_SYMBOLS=y
+CONFIG_ARCH_HAVE_CUSTOMOPT=y
+# CONFIG_DEBUG_NOOPT is not set
+# CONFIG_DEBUG_CUSTOMOPT is not set
+CONFIG_DEBUG_FULLOPT=y
+
+#
+# System Type
+#
+CONFIG_ARCH_ARM=y
+# CONFIG_ARCH_AVR is not set
+# CONFIG_ARCH_HC is not set
+# CONFIG_ARCH_MIPS is not set
+# CONFIG_ARCH_RGMP is not set
+# CONFIG_ARCH_SH is not set
+# CONFIG_ARCH_SIM is not set
+# CONFIG_ARCH_X86 is not set
+# CONFIG_ARCH_Z16 is not set
+# CONFIG_ARCH_Z80 is not set
+CONFIG_ARCH="arm"
+
+#
+# ARM Options
+#
+# CONFIG_ARCH_CHIP_A1X is not set
+# CONFIG_ARCH_CHIP_C5471 is not set
+# CONFIG_ARCH_CHIP_CALYPSO is not set
+# CONFIG_ARCH_CHIP_DM320 is not set
+# CONFIG_ARCH_CHIP_EFM32 is not set
+# CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
+CONFIG_ARCH_CHIP_KINETIS=y
+# CONFIG_ARCH_CHIP_KL is not set
+# CONFIG_ARCH_CHIP_LM is not set
+# CONFIG_ARCH_CHIP_TIVA is not set
+# CONFIG_ARCH_CHIP_LPC11XX is not set
+# CONFIG_ARCH_CHIP_LPC17XX is not set
+# CONFIG_ARCH_CHIP_LPC214X is not set
+# CONFIG_ARCH_CHIP_LPC2378 is not set
+# CONFIG_ARCH_CHIP_LPC31XX is not set
+# CONFIG_ARCH_CHIP_LPC43XX is not set
+# CONFIG_ARCH_CHIP_NUC1XX is not set
+# CONFIG_ARCH_CHIP_SAMA5 is not set
+# CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
+# CONFIG_ARCH_CHIP_SAM34 is not set
+# CONFIG_ARCH_CHIP_SAMV7 is not set
+# CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
+# CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
+# CONFIG_ARCH_ARM7TDMI is not set
+# CONFIG_ARCH_ARM926EJS is not set
+# CONFIG_ARCH_ARM920T is not set
+# CONFIG_ARCH_CORTEXM0 is not set
+# CONFIG_ARCH_CORTEXM3 is not set
+CONFIG_ARCH_CORTEXM4=y
+# CONFIG_ARCH_CORTEXM7 is not set
+# CONFIG_ARCH_CORTEXA5 is not set
+# CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
+CONFIG_ARCH_FAMILY="armv7-m"
+CONFIG_ARCH_CHIP="kinetis"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
+# CONFIG_ARMV7M_USEBASEPRI is not set
+CONFIG_ARCH_HAVE_FPU=y
+# CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_FPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
+# CONFIG_ARM_MPU is not set
+
+#
+# ARMV7M Configuration Options
+#
+# CONFIG_ARMV7M_HAVE_ICACHE is not set
+# CONFIG_ARMV7M_HAVE_DCACHE is not set
+# CONFIG_ARMV7M_HAVE_ITCM is not set
+# CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
+CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
+# CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
+# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
+# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
+CONFIG_ARMV7M_OABI_TOOLCHAIN=y
+# CONFIG_ARMV7M_HAVE_STACKCHECK is not set
+# CONFIG_ARMV7M_ITMSYSLOG is not set
+
+#
+# Kinetis Configuration Options
+#
+# CONFIG_ARCH_CHIP_MK20DN32VLH5 is not set
+# CONFIG_ARCH_CHIP_MK20DX32VLH5 is not set
+# CONFIG_ARCH_CHIP_MK20DN64VLH5 is not set
+# CONFIG_ARCH_CHIP_MK20DX64VLH5 is not set
+# CONFIG_ARCH_CHIP_MK20DN128VLH5 is not set
+# CONFIG_ARCH_CHIP_MK20DX128VLH5 is not set
+# CONFIG_ARCH_CHIP_MK20DX64VLH7 is not set
+# CONFIG_ARCH_CHIP_MK20DX128VLH7 is not set
+# CONFIG_ARCH_CHIP_MK20DX256VLH7 is not set
+# CONFIG_ARCH_CHIP_MK40N512VLQ100 is not set
+# CONFIG_ARCH_CHIP_MK40N512VMD100 is not set
+# CONFIG_ARCH_CHIP_MK40X128VLQ100 is not set
+# CONFIG_ARCH_CHIP_MK40X128VMD100 is not set
+# CONFIG_ARCH_CHIP_MK40X256VLQ100 is not set
+# CONFIG_ARCH_CHIP_MK40X256VMD100 is not set
+# CONFIG_ARCH_CHIP_MK60N256VLQ100 is not set
+# CONFIG_ARCH_CHIP_MK60N256VMD100 is not set
+# CONFIG_ARCH_CHIP_MK60N512VLL100 is not set
+# CONFIG_ARCH_CHIP_MK60N512VLQ100 is not set
+# CONFIG_ARCH_CHIP_MK60N512VMD100 is not set
+# CONFIG_ARCH_CHIP_MK60X256VLQ100 is not set
+# CONFIG_ARCH_CHIP_MK60X256VMD100 is not set
+CONFIG_ARCH_CHIP_MK64FN1M0VLL12=y
+# CONFIG_ARCH_CHIP_MK64FX512VLL12 is not set
+# CONFIG_ARCH_CHIP_MK64FX512VDC12 is not set
+# CONFIG_ARCH_CHIP_MK64FN1M0VDC12 is not set
+# CONFIG_ARCH_CHIP_MK64FX512VLQ12 is not set
+# CONFIG_ARCH_CHIP_MK64FX512VMD12 is not set
+# CONFIG_ARCH_CHIP_MK64FN1M0VMD12 is not set
+# CONFIG_ARCH_FAMILY_K20 is not set
+# CONFIG_ARCH_FAMILY_K40 is not set
+# CONFIG_ARCH_FAMILY_K60 is not set
+CONFIG_ARCH_FAMILY_K64=y
+
+#
+# Kinetis Peripheral Support
+#
+# CONFIG_KINETIS_TRACE is not set
+# CONFIG_KINETIS_FLEXBUS is not set
+# CONFIG_KINETIS_UART0 is not set
+# CONFIG_KINETIS_UART1 is not set
+# CONFIG_KINETIS_UART2 is not set
+CONFIG_KINETIS_UART3=y
+# CONFIG_KINETIS_UART4 is not set
+# CONFIG_KINETIS_UART5 is not set
+# CONFIG_KINETIS_FLEXCAN0 is not set
+# CONFIG_KINETIS_FLEXCAN1 is not set
+# CONFIG_KINETIS_SPI0 is not set
+# CONFIG_KINETIS_SPI1 is not set
+# CONFIG_KINETIS_SPI2 is not set
+# CONFIG_KINETIS_I2C0 is not set
+# CONFIG_KINETIS_I2C1 is not set
+# CONFIG_KINETIS_I2S is not set
+# CONFIG_KINETIS_DAC0 is not set
+# CONFIG_KINETIS_DAC1 is not set
+# CONFIG_KINETIS_ADC0 is not set
+# CONFIG_KINETIS_ADC1 is not set
+# CONFIG_KINETIS_CMP is not set
+# CONFIG_KINETIS_VREF is not set
+# CONFIG_KINETIS_SDHC is not set
+# CONFIG_KINETIS_FTM0 is not set
+# CONFIG_KINETIS_FTM1 is not set
+# CONFIG_KINETIS_FTM2 is not set
+# CONFIG_KINETIS_LPTIMER is not set
+# CONFIG_KINETIS_RTC is not set
+# CONFIG_KINETIS_EWM is not set
+# CONFIG_KINETIS_CMT is not set
+# CONFIG_KINETIS_USBOTG is not set
+# CONFIG_KINETIS_USBDCD is not set
+# CONFIG_KINETIS_LLWU is not set
+# CONFIG_KINETIS_TSI is not set
+# CONFIG_KINETIS_FTFL is not set
+# CONFIG_KINETIS_DMA is not set
+# CONFIG_KINETIS_CRC is not set
+# CONFIG_KINETIS_PDB is not set
+# CONFIG_KINETIS_PIT is not set
+
+#
+# Kinetis GPIO Interrupt Configuration
+#
+# CONFIG_GPIO_IRQ is not set
+
+#
+# Kinetis UART Configuration
+#
+
+#
+# Architecture Options
+#
+# CONFIG_ARCH_NOINTC is not set
+# CONFIG_ARCH_VECNOTIRQ is not set
+# CONFIG_ARCH_DMA is not set
+CONFIG_ARCH_HAVE_IRQPRIO=y
+# CONFIG_ARCH_L2CACHE is not set
+# CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
+# CONFIG_ARCH_HAVE_ADDRENV is not set
+# CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
+CONFIG_ARCH_HAVE_VFORK=y
+# CONFIG_ARCH_HAVE_MMU is not set
+CONFIG_ARCH_HAVE_MPU=y
+# CONFIG_ARCH_NAND_HWECC is not set
+# CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
+# CONFIG_ARCH_USE_MPU is not set
+# CONFIG_ARCH_IRQPRIO is not set
+CONFIG_ARCH_STACKDUMP=y
+# CONFIG_ENDIAN_BIG is not set
+# CONFIG_ARCH_IDLE_CUSTOM is not set
+CONFIG_ARCH_HAVE_RAMFUNCS=y
+CONFIG_ARCH_RAMFUNCS=y
+CONFIG_ARCH_HAVE_RAMVECTORS=y
+# CONFIG_ARCH_RAMVECTORS is not set
+
+#
+# Board Settings
+#
+CONFIG_BOARD_LOOPSPERMSEC=9535
+# CONFIG_ARCH_CALIBRATION is not set
+
+#
+# Interrupt options
+#
+CONFIG_ARCH_HAVE_INTERRUPTSTACK=y
+CONFIG_ARCH_INTERRUPTSTACK=0
+CONFIG_ARCH_HAVE_HIPRI_INTERRUPT=y
+# CONFIG_ARCH_HIPRI_INTERRUPT is not set
+
+#
+# Boot options
+#
+# CONFIG_BOOT_RUNFROMEXTSRAM is not set
+CONFIG_BOOT_RUNFROMFLASH=y
+# CONFIG_BOOT_RUNFROMISRAM is not set
+# CONFIG_BOOT_RUNFROMSDRAM is not set
+# CONFIG_BOOT_COPYTORAM is not set
+
+#
+# Boot Memory Configuration
+#
+CONFIG_RAM_START=0x1fff0000
+CONFIG_RAM_SIZE=131072
+# CONFIG_ARCH_HAVE_SDRAM is not set
+
+#
+# Board Selection
+#
+CONFIG_ARCH_BOARD_FREEDOM_K64F=y
+# CONFIG_ARCH_BOARD_CUSTOM is not set
+CONFIG_ARCH_BOARD="freedom-k64f"
+
+#
+# Common Board Options
+#
+CONFIG_ARCH_HAVE_LEDS=y
+CONFIG_ARCH_LEDS=y
+CONFIG_ARCH_HAVE_BUTTONS=y
+# CONFIG_ARCH_BUTTONS is not set
+CONFIG_ARCH_HAVE_IRQBUTTONS=y
+
+#
+# Board-Specific Options
+#
+# CONFIG_BOARD_CRASHDUMP is not set
+# CONFIG_LIB_BOARDCTL is not set
+
+#
+# RTOS Features
+#
+CONFIG_DISABLE_OS_API=y
+# CONFIG_DISABLE_POSIX_TIMERS is not set
+# CONFIG_DISABLE_PTHREAD is not set
+# CONFIG_DISABLE_SIGNALS is not set
+# CONFIG_DISABLE_MQUEUE is not set
+# CONFIG_DISABLE_ENVIRON is not set
+
+#
+# Clocks and Timers
+#
+CONFIG_USEC_PER_TICK=10000
+# CONFIG_SYSTEM_TIME64 is not set
+# CONFIG_CLOCK_MONOTONIC is not set
+# CONFIG_JULIAN_TIME is not set
+CONFIG_START_YEAR=2013
+CONFIG_START_MONTH=3
+CONFIG_START_DAY=25
+CONFIG_MAX_WDOGPARMS=2
+CONFIG_PREALLOC_WDOGS=4
+CONFIG_WDOG_INTRESERVE=0
+CONFIG_PREALLOC_TIMERS=4
+
+#
+# Tasks and Scheduling
+#
+# CONFIG_INIT_NONE is not set
+CONFIG_INIT_ENTRYPOINT=y
+# CONFIG_INIT_FILEPATH is not set
+CONFIG_USER_ENTRYPOINT="nsh_main"
+CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
+CONFIG_TASK_NAME_SIZE=0
+CONFIG_MAX_TASKS=16
+# CONFIG_SCHED_HAVE_PARENT is not set
+CONFIG_SCHED_WAITPID=y
+
+#
+# Pthread Options
+#
+# CONFIG_MUTEX_TYPES is not set
+CONFIG_NPTHREAD_KEYS=4
+
+#
+# Performance Monitoring
+#
+# CONFIG_SCHED_CPULOAD is not set
+# CONFIG_SCHED_INSTRUMENTATION is not set
+
+#
+# Files and I/O
+#
+CONFIG_DEV_CONSOLE=y
+# CONFIG_FDCLONE_DISABLE is not set
+# CONFIG_FDCLONE_STDIO is not set
+CONFIG_SDCLONE_DISABLE=y
+CONFIG_NFILE_DESCRIPTORS=8
+CONFIG_NFILE_STREAMS=8
+CONFIG_NAME_MAX=32
+# CONFIG_PRIORITY_INHERITANCE is not set
+
+#
+# RTOS hooks
+#
+# CONFIG_BOARD_INITIALIZE is not set
+# CONFIG_SCHED_STARTHOOK is not set
+# CONFIG_SCHED_ATEXIT is not set
+# CONFIG_SCHED_ONEXIT is not set
+
+#
+# Signal Numbers
+#
+CONFIG_SIG_SIGUSR1=1
+CONFIG_SIG_SIGUSR2=2
+CONFIG_SIG_SIGALARM=3
+CONFIG_SIG_SIGCONDTIMEDOUT=16
+
+#
+# POSIX Message Queue Options
+#
+CONFIG_PREALLOC_MQ_MSGS=4
+CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
+
+#
+# Work queue support
+#
+# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_SCHED_HPWORK is not set
+# CONFIG_SCHED_LPWORK is not set
+
+#
+# Stack and heap information
+#
+CONFIG_IDLETHREAD_STACKSIZE=1024
+CONFIG_USERMAIN_STACKSIZE=2048
+CONFIG_PTHREAD_STACK_MIN=256
+CONFIG_PTHREAD_STACK_DEFAULT=2048
+# CONFIG_LIB_SYSCALL is not set
+
+#
+# Device Drivers
+#
+CONFIG_DISABLE_POLL=y
+CONFIG_DEV_NULL=y
+# CONFIG_DEV_ZERO is not set
+# CONFIG_DEV_LOOP is not set
+
+#
+# Buffering
+#
+# CONFIG_DRVR_WRITEBUFFER is not set
+# CONFIG_DRVR_READAHEAD is not set
+# CONFIG_RAMDISK is not set
+# CONFIG_CAN is not set
+# CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
+# CONFIG_PWM is not set
+# CONFIG_ARCH_HAVE_I2CRESET is not set
+# CONFIG_I2C is not set
+# CONFIG_SPI is not set
+# CONFIG_I2S is not set
+
+#
+# Timer Driver Support
+#
+# CONFIG_TIMER is not set
+# CONFIG_RTC is not set
+# CONFIG_WATCHDOG is not set
+# CONFIG_ANALOG is not set
+# CONFIG_AUDIO_DEVICES is not set
+# CONFIG_VIDEO_DEVICES is not set
+# CONFIG_BCH is not set
+# CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
+# CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
+
+#
+# LCD Driver Support
+#
+# CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
+# CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
+# CONFIG_MTD is not set
+# CONFIG_EEPROM is not set
+# CONFIG_PIPES is not set
+# CONFIG_PM is not set
+# CONFIG_POWER is not set
+# CONFIG_SENSORS is not set
+# CONFIG_SERCOMM_CONSOLE is not set
+CONFIG_SERIAL=y
+# CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
+# CONFIG_16550_UART is not set
+# CONFIG_UART_SERIALDRIVER is not set
+# CONFIG_UART0_SERIALDRIVER is not set
+# CONFIG_UART1_SERIALDRIVER is not set
+# CONFIG_UART2_SERIALDRIVER is not set
+CONFIG_UART3_SERIALDRIVER=y
+# CONFIG_UART4_SERIALDRIVER is not set
+# CONFIG_UART5_SERIALDRIVER is not set
+# CONFIG_UART6_SERIALDRIVER is not set
+# CONFIG_UART7_SERIALDRIVER is not set
+# CONFIG_UART8_SERIALDRIVER is not set
+# CONFIG_SCI0_SERIALDRIVER is not set
+# CONFIG_SCI1_SERIALDRIVER is not set
+# CONFIG_USART0_SERIALDRIVER is not set
+# CONFIG_USART1_SERIALDRIVER is not set
+# CONFIG_USART2_SERIALDRIVER is not set
+# CONFIG_USART3_SERIALDRIVER is not set
+# CONFIG_USART4_SERIALDRIVER is not set
+# CONFIG_USART5_SERIALDRIVER is not set
+# CONFIG_USART6_SERIALDRIVER is not set
+# CONFIG_USART7_SERIALDRIVER is not set
+# CONFIG_USART8_SERIALDRIVER is not set
+# CONFIG_OTHER_UART_SERIALDRIVER is not set
+CONFIG_MCU_SERIAL=y
+CONFIG_STANDARD_SERIAL=y
+# CONFIG_SERIAL_IFLOWCONTROL is not set
+# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
+# CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
+CONFIG_UART3_SERIAL_CONSOLE=y
+# CONFIG_OTHER_SERIAL_CONSOLE is not set
+# CONFIG_NO_SERIAL_CONSOLE is not set
+
+#
+# UART3 Configuration
+#
+CONFIG_UART3_RXBUFSIZE=256
+CONFIG_UART3_TXBUFSIZE=256
+CONFIG_UART3_BAUD=115200
+CONFIG_UART3_BITS=8
+CONFIG_UART3_PARITY=0
+CONFIG_UART3_2STOP=0
+# CONFIG_UART3_IFLOWCONTROL is not set
+# CONFIG_UART3_OFLOWCONTROL is not set
+# CONFIG_UART3_DMA is not set
+# CONFIG_USBDEV is not set
+# CONFIG_USBHOST is not set
+# CONFIG_HAVE_USBTRACE is not set
+# CONFIG_DRIVERS_WIRELESS is not set
+
+#
+# System Logging
+#
+# CONFIG_ARCH_SYSLOG is not set
+# CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+
+#
+# Networking Support
+#
+# CONFIG_ARCH_HAVE_NET is not set
+# CONFIG_ARCH_HAVE_PHY is not set
+# CONFIG_NET is not set
+
+#
+# Crypto API
+#
+# CONFIG_CRYPTO is not set
+
+#
+# File Systems
+#
+
+#
+# File system configuration
+#
+# CONFIG_DISABLE_MOUNTPOINT is not set
+# CONFIG_FS_AUTOMOUNTER is not set
+# CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
+CONFIG_FS_READABLE=y
+CONFIG_FS_WRITABLE=y
+# CONFIG_FS_NAMED_SEMAPHORES is not set
+CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
+# CONFIG_FS_RAMMAP is not set
+CONFIG_FS_FAT=y
+# CONFIG_FAT_LCNAMES is not set
+# CONFIG_FAT_LFN is not set
+# CONFIG_FS_FATTIME is not set
+# CONFIG_FAT_FORCE_INDIRECT is not set
+# CONFIG_FAT_DMAMEMORY is not set
+# CONFIG_FAT_DIRECT_RETRY is not set
+# CONFIG_FS_NXFFS is not set
+# CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
+# CONFIG_FS_SMARTFS is not set
+# CONFIG_FS_PROCFS is not set
+# CONFIG_FS_UNIONFS is not set
+
+#
+# Graphics Support
+#
+# CONFIG_NX is not set
+
+#
+# Memory Management
+#
+# CONFIG_MM_SMALL is not set
+CONFIG_MM_REGIONS=1
+# CONFIG_ARCH_HAVE_HEAP2 is not set
+# CONFIG_GRAN is not set
+
+#
+# Audio Support
+#
+# CONFIG_AUDIO is not set
+
+#
+# Wireless Support
+#
+
+#
+# Binary Loader
+#
+# CONFIG_BINFMT_DISABLE is not set
+# CONFIG_BINFMT_EXEPATH is not set
+# CONFIG_NXFLAT is not set
+# CONFIG_ELF is not set
+# CONFIG_BUILTIN is not set
+# CONFIG_PIC is not set
+# CONFIG_SYMTAB_ORDEREDBYNAME is not set
+
+#
+# Library Routines
+#
+
+#
+# Standard C Library Options
+#
+CONFIG_STDIO_BUFFER_SIZE=64
+CONFIG_STDIO_LINEBUFFER=y
+CONFIG_NUNGET_CHARS=2
+CONFIG_LIB_HOMEDIR="/"
+# CONFIG_LIBM is not set
+# CONFIG_NOPRINTF_FIELDWIDTH is not set
+# CONFIG_LIBC_FLOATINGPOINT is not set
+CONFIG_LIBC_LONG_LONG=y
+# CONFIG_LIBC_IOCTL_VARIADIC is not set
+CONFIG_LIB_RAND_ORDER=1
+# CONFIG_EOL_IS_CR is not set
+# CONFIG_EOL_IS_LF is not set
+# CONFIG_EOL_IS_BOTH_CRLF is not set
+CONFIG_EOL_IS_EITHER_CRLF=y
+# CONFIG_LIBC_EXECFUNCS is not set
+CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
+CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
+# CONFIG_LIBC_STRERROR is not set
+# CONFIG_LIBC_PERROR_STDOUT is not set
+CONFIG_LIBC_TMPDIR="/tmp"
+CONFIG_LIBC_MAX_TMPFILE=32
+CONFIG_ARCH_LOWPUTC=y
+# CONFIG_LIBC_LOCALTIME is not set
+# CONFIG_TIME_EXTENDED is not set
+CONFIG_LIB_SENDFILE_BUFSIZE=512
+# CONFIG_ARCH_ROMGETC is not set
+# CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
+
+#
+# Non-standard Library Support
+#
+# CONFIG_LIB_CRC64_FAST is not set
+# CONFIG_LIB_KBDCODEC is not set
+# CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
+
+#
+# Basic CXX Support
+#
+# CONFIG_C99_BOOL8 is not set
+# CONFIG_HAVE_CXX is not set
+
+#
+# Application Configuration
+#
+
+#
+# CAN Utilities
+#
+
+#
+# Examples
+#
+# CONFIG_EXAMPLES_CHAT is not set
+# CONFIG_EXAMPLES_CONFIGDATA is not set
+# CONFIG_EXAMPLES_CPUHOG is not set
+# CONFIG_EXAMPLES_DHCPD is not set
+# CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FSTEST is not set
+# CONFIG_EXAMPLES_FTPC is not set
+# CONFIG_EXAMPLES_FTPD is not set
+# CONFIG_EXAMPLES_HELLO is not set
+# CONFIG_EXAMPLES_HIDKBD is not set
+# CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
+# CONFIG_EXAMPLES_MM is not set
+# CONFIG_EXAMPLES_MODBUS is not set
+# CONFIG_EXAMPLES_MOUNT is not set
+# CONFIG_EXAMPLES_NRF24L01TERM is not set
+CONFIG_EXAMPLES_NSH=y
+# CONFIG_EXAMPLES_NULL is not set
+# CONFIG_EXAMPLES_NX is not set
+# CONFIG_EXAMPLES_NXFFS is not set
+# CONFIG_EXAMPLES_NXHELLO is not set
+# CONFIG_EXAMPLES_NXIMAGE is not set
+# CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
+# CONFIG_EXAMPLES_NXTEXT is not set
+# CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
+# CONFIG_EXAMPLES_PIPE is not set
+# CONFIG_EXAMPLES_POLL is not set
+# CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
+# CONFIG_EXAMPLES_RGMP is not set
+# CONFIG_EXAMPLES_SENDMAIL is not set
+# CONFIG_EXAMPLES_SERIALBLASTER is not set
+# CONFIG_EXAMPLES_SERIALRX is not set
+# CONFIG_EXAMPLES_SERLOOP is not set
+# CONFIG_EXAMPLES_SLCD is not set
+# CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
+# CONFIG_EXAMPLES_TCPECHO is not set
+# CONFIG_EXAMPLES_TELNETD is not set
+# CONFIG_EXAMPLES_TIFF is not set
+# CONFIG_EXAMPLES_TOUCHSCREEN is not set
+# CONFIG_EXAMPLES_USBTERM is not set
+# CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
+#
+# Graphics Support
+#
+# CONFIG_TIFF is not set
+# CONFIG_GRAPHICS_TRAVELER is not set
+
+#
+# Interpreters
+#
+# CONFIG_INTERPRETERS_BAS is not set
+# CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
+
+#
+# FreeModBus
+#
+# CONFIG_MODBUS is not set
+
+#
+# Network Utilities
+#
+# CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
+# CONFIG_NETUTILS_FTPC is not set
+# CONFIG_NETUTILS_JSON is not set
+# CONFIG_NETUTILS_SMTP is not set
+
+#
+# NSH Library
+#
+CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
+
+#
+# Command Line Configuration
+#
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
+CONFIG_NSH_LINELEN=64
+# CONFIG_NSH_DISABLE_SEMICOLON is not set
+CONFIG_NSH_CMDPARMS=y
+CONFIG_NSH_MAXARGUMENTS=6
+CONFIG_NSH_ARGCAT=y
+CONFIG_NSH_NESTDEPTH=3
+# CONFIG_NSH_DISABLEBG is not set
+
+#
+# Disable Individual commands
+#
+# CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
+# CONFIG_NSH_DISABLE_CAT is not set
+# CONFIG_NSH_DISABLE_CD is not set
+# CONFIG_NSH_DISABLE_CP is not set
+# CONFIG_NSH_DISABLE_CMP is not set
+CONFIG_NSH_DISABLE_DATE=y
+# CONFIG_NSH_DISABLE_DD is not set
+# CONFIG_NSH_DISABLE_DF is not set
+# CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
+# CONFIG_NSH_DISABLE_ECHO is not set
+# CONFIG_NSH_DISABLE_EXEC is not set
+# CONFIG_NSH_DISABLE_EXIT is not set
+# CONFIG_NSH_DISABLE_FREE is not set
+# CONFIG_NSH_DISABLE_GET is not set
+# CONFIG_NSH_DISABLE_HELP is not set
+# CONFIG_NSH_DISABLE_HEXDUMP is not set
+# CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
+# CONFIG_NSH_DISABLE_KILL is not set
+# CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
+# CONFIG_NSH_DISABLE_LS is not set
+# CONFIG_NSH_DISABLE_MB is not set
+# CONFIG_NSH_DISABLE_MKDIR is not set
+# CONFIG_NSH_DISABLE_MKFATFS is not set
+# CONFIG_NSH_DISABLE_MKFIFO is not set
+# CONFIG_NSH_DISABLE_MKRD is not set
+# CONFIG_NSH_DISABLE_MH is not set
+# CONFIG_NSH_DISABLE_MOUNT is not set
+# CONFIG_NSH_DISABLE_MV is not set
+# CONFIG_NSH_DISABLE_MW is not set
+# CONFIG_NSH_DISABLE_PS is not set
+# CONFIG_NSH_DISABLE_PSSTACKUSAGE is not set
+# CONFIG_NSH_DISABLE_PUT is not set
+# CONFIG_NSH_DISABLE_PWD is not set
+# CONFIG_NSH_DISABLE_RM is not set
+# CONFIG_NSH_DISABLE_RMDIR is not set
+# CONFIG_NSH_DISABLE_SET is not set
+# CONFIG_NSH_DISABLE_SH is not set
+# CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
+# CONFIG_NSH_DISABLE_TEST is not set
+# CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
+# CONFIG_NSH_DISABLE_UNSET is not set
+# CONFIG_NSH_DISABLE_USLEEP is not set
+# CONFIG_NSH_DISABLE_WGET is not set
+# CONFIG_NSH_DISABLE_XD is not set
+CONFIG_NSH_MMCSDMINOR=0
+
+#
+# Configure Command Options
+#
+CONFIG_NSH_CMDOPT_DF_H=y
+CONFIG_NSH_CODECS_BUFSIZE=128
+CONFIG_NSH_CMDOPT_HEXDUMP=y
+CONFIG_NSH_FILEIOSIZE=512
+
+#
+# Scripting Support
+#
+# CONFIG_NSH_DISABLESCRIPT is not set
+# CONFIG_NSH_DISABLE_ITEF is not set
+# CONFIG_NSH_DISABLE_LOOPS is not set
+
+#
+# Console Configuration
+#
+CONFIG_NSH_CONSOLE=y
+# CONFIG_NSH_ALTCONDEV is not set
+# CONFIG_NSH_ARCHINIT is not set
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
+
+#
+# NxWidgets/NxWM
+#
+
+#
+# Platform-specific Support
+#
+# CONFIG_PLATFORM_CONFIGDATA is not set
+
+#
+# System Libraries and NSH Add-Ons
+#
+# CONFIG_SYSTEM_CLE is not set
+# CONFIG_SYSTEM_CUTERM is not set
+# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_RAMTEST is not set
+CONFIG_READLINE_HAVE_EXTMATCH=y
+CONFIG_SYSTEM_READLINE=y
+CONFIG_READLINE_ECHO=y
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
+# CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
+# CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/freedom-k64f/nsh/setenv.sh b/configs/freedom-k64f/nsh/setenv.sh
new file mode 100644
index 0000000000..cfb4e25e25
--- /dev/null
+++ b/configs/freedom-k64f/nsh/setenv.sh
@@ -0,0 +1,61 @@
+#!/bin/bash
+# configs/freedom-k64f/nsh/setenv.sh
+#
+#   Copyright (C) 2011 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.
+#
+
+if [ "$_" = "$0" ] ; then
+  echo "You must source this script, not run it!" 1>&2
+  exit 1
+fi
+
+WD=`pwd`
+if [ ! -x "setenv.sh" ]; then
+  echo "This script must be executed from the top-level NuttX build directory"
+  exit 1
+fi
+
+if [ -z "${PATH_ORIG}" ]; then
+  export PATH_ORIG="${PATH}"
+fi
+
+# This is the Cygwin path to the location where I installed the CodeSourcery
+# toolchain under windows.  You will also have to edit this if you install
+# the CodeSourcery toolchain in any other location
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin"
+
+# This is the Cygwin path to the location where I build the buildroot
+# toolchain.
+export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+
+# Add the path to the toolchain to the PATH varialble
+export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
+echo "PATH : ${PATH}"
diff --git a/configs/freedom-k64f/scripts/flash.ld b/configs/freedom-k64f/scripts/flash.ld
new file mode 100644
index 0000000000..7d2da03a9d
--- /dev/null
+++ b/configs/freedom-k64f/scripts/flash.ld
@@ -0,0 +1,142 @@
+/****************************************************************************
+ * configs/freedom-k64f/scripts/flash.ld
+ *
+ *   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.
+ *
+ ****************************************************************************/
+
+/* The MK64FN1M0VLL12 has 1M of FLASH beginning at address 0x0000:0000 and
+ * 128Kb of SRAM beginning at address 0x1800:0000 (SRAM_L) and 0x2000:000
+ * (SRAM_U).
+ *
+ * NOTE: that the first part of the K40 FLASH region is reserved for
+ *       interrupt vectflash and, following that, is a region from 0x0000:0400
+ *       to 0x0000:040f that is reserved for the FLASH control fields (FCF).
+ *
+ * NOTE: The on-chip RAM is split evenly among SRAM_L and SRAM_U. The RAM is
+ *       also implemented such that the SRAM_L and SRAM_U ranges form a
+ *       contiguous block in the memory map.
+ */
+
+MEMORY
+{
+	vectflash (rx)  : ORIGIN = 0x00000000, LENGTH = 1K
+	cfmprotect (rx) : ORIGIN = 0x00000400, LENGTH = 16
+	progflash (rx)  : ORIGIN = 0x00000800, LENGTH = 1M
+	datasram (rwx)  : ORIGIN = 0x1fff0000, LENGTH = 128K
+}
+
+OUTPUT_ARCH(arm)
+ENTRY(_stext)
+EXTERN(__flashconfigbytes)
+SECTIONS
+{
+	.vectors : {
+		_svectors = ABSOLUTE(.);
+		*(.vectors)
+		_evectors = ABSOLUTE(.);
+	} > vectflash
+
+	.cfmprotect : {
+		KEEP(*(.cfmconfig))
+	} > cfmprotect
+
+	.text : {
+		_stext = ABSOLUTE(.);
+		*(.text .text.*)
+		*(.fixup)
+		*(.gnu.warning)
+		*(.rodata .rodata.*)
+		*(.gnu.linkonce.t.*)
+		*(.glue_7)
+		*(.glue_7t)
+		*(.got)
+		*(.gcc_except_table)
+		*(.gnu.linkonce.r.*)
+		_etext = ABSOLUTE(.);
+	} > progflash
+
+	.init_section : {
+		_sinit = ABSOLUTE(.);
+		*(.init_array .init_array.*)
+		_einit = ABSOLUTE(.);
+	} > progflash
+
+	.ARM.extab : {
+		*(.ARM.extab*)
+	} > progflash
+
+	__exidx_start = ABSOLUTE(.);
+	.ARM.exidx : {
+		*(.ARM.exidx*)
+	} > progflash
+	__exidx_end = ABSOLUTE(.);
+
+	.data : {
+		_sdata = ABSOLUTE(.);
+		*(.data .data.*)
+		*(.gnu.linkonce.d.*)
+		CONSTRUCTORS
+		_edata = ABSOLUTE(.);
+	} > datasram AT > progflash
+
+	_eronly = LOADADDR(.data);
+
+	.ramfunc ALIGN(4): {
+		_sramfuncs = ABSOLUTE(.);
+		*(.ramfunc  .ramfunc.*)
+		_eramfuncs = ABSOLUTE(.);
+	} > datasram AT > progflash
+
+	_framfuncs = LOADADDR(.ramfunc);
+
+	.bss : {
+		_sbss = ABSOLUTE(.);
+		*(.bss .bss.*)
+		*(.gnu.linkonce.b.*)
+		*(COMMON)
+		_ebss = ABSOLUTE(.);
+	} > datasram
+
+	/* Stabs debugging sections. */
+	.stab 0 : { *(.stab) }
+	.stabstr 0 : { *(.stabstr) }
+	.stab.excl 0 : { *(.stab.excl) }
+	.stab.exclstr 0 : { *(.stab.exclstr) }
+	.stab.index 0 : { *(.stab.index) }
+	.stab.indexstr 0 : { *(.stab.indexstr) }
+	.comment 0 : { *(.comment) }
+	.debug_abbrev 0 : { *(.debug_abbrev) }
+	.debug_info 0 : { *(.debug_info) }
+	.debug_line 0 : { *(.debug_line) }
+	.debug_pubnames 0 : { *(.debug_pubnames) }
+	.debug_aranges 0 : { *(.debug_aranges) }
+}
diff --git a/configs/freedom-k64f/src/Makefile b/configs/freedom-k64f/src/Makefile
new file mode 100644
index 0000000000..1b6b3167d3
--- /dev/null
+++ b/configs/freedom-k64f/src/Makefile
@@ -0,0 +1,61 @@
+############################################################################
+# configs/freedom-k64f/src/Makefile
+#
+#   Copyright (C) 2011-2012 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.
+#
+############################################################################
+
+-include $(TOPDIR)/Make.defs
+
+ASRCS =
+CSRCS = k64_boot.c k64_spi.c
+
+ifeq ($(CONFIG_ARCH_LEDS),y)
+CSRCS += k64_leds.c
+endif
+
+ifeq ($(CONFIG_ARCH_BUTTONS),y)
+CSRCS += k64_buttons.c
+endif
+
+ifeq ($(CONFIG_LIB_BOARDCTL),y)
+CSRCS += k64_appinit.c
+endif
+
+ifeq ($(CONFIG_USBDEV),y)
+CSRCS += k64_usbdev.c
+endif
+
+ifeq ($(CONFIG_USBMSC),y)
+CSRCS += k64_usbmsc.c
+endif
+
+include $(TOPDIR)/configs/Board.mk
diff --git a/configs/freedom-k64f/src/freedom-k64f.h b/configs/freedom-k64f/src/freedom-k64f.h
new file mode 100644
index 0000000000..36320a34c3
--- /dev/null
+++ b/configs/freedom-k64f/src/freedom-k64f.h
@@ -0,0 +1,296 @@
+/************************************************************************************
+ * configs/twr-k60n512/src/twr-k60n512.h
+ *
+ *   Copyright (C) 2011 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.
+ *
+ ************************************************************************************/
+
+#ifndef __CONFIGS_FREEDOM_K64F_SRC_FRDMK64_H
+#define __CONFIGS_FREEDOM_K64F_SRC_FRDMK64_H
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include 
+#include 
+#include 
+#include 
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+/* How many SPI modules does this chip support? The LM3S6918 supports 2 SPI
+ * modules (others may support more -- in such case, the following must be
+ * expanded).
+ */
+
+#if KINETIS_NSPI < 1
+#  undef CONFIG_K64_SPI1
+#  undef CONFIG_K64_SPI2
+#elif KINETIS_NSPI < 2
+#  undef CONFIG_K64_SPI2
+#endif
+
+/* FREEDOM-K64F GPIOs ****************************************************************/
+/* On-Board Connections
+ * -------------------- ------------------------- -------- -------------------
+ * FEATURE              CONNECTION                PORT/PIN PIN FUNCTION
+ * -------------------- ------------------------- -------- -------------------
+ * OSJTAG USB-to-serial OSJTAG Bridge RX Data     PTE9     UART5_RX
+ * Bridge               OSJTAG Bridge TX Data     PTE8     UART5_TX
+ * SD Card Slot         SD Clock                  PTE2     SDHC0_DCLK
+ *                      SD Command                PTE3     SDHC0_CMD
+ *                      SD Data0                  PTE1     SDHC0_D0
+ *                      SD Data1                  PTE0     SDHC0_D1
+ *                      SD Data2                  PTE5     SDHC0_D2
+ *                      SD Data3                  PTE4     SDHC0_D3
+ *                      SD Card Detect            PTE28    PTE28
+ *                      SD Write Protect          PTE27    PTE27
+ * Infrared Port        IR Transmit               PTD7     CMT_IRO
+ *                      IR Receive                PTC6     CMP0_IN0
+ * Pushbuttons          SW1 (IRQ0)                PTA19    PTA19
+ *                      SW2 (IRQ1)                PTE26    PTE26
+ *                      SW3 (RESET)               RESET_b  RESET_b
+ * Touch Pads           E1 / Touch                PTA4     TSI0_CH5
+ *                      E2 / Touch                PTB3     TSI0_CH8
+ *                      E3 / Touch                PTB2     TSI0_CH7
+ *                      E4 / Touch                PTB16    TSI0_CH9
+ * LEDs                 E1 / Orange LED           PTA11    PTA11
+ *                      E2 / Yellow LED           PTA28    PTA28
+ *                      E3 / Green LED            PTA29    PTA29
+ *                      E4 / Blue LED             PTA10    PTA10
+ * Potentiometer        Potentiometer (R71)       ?        ADC1_DM1
+ * Accelerometer        I2C SDA                   PTD9     I2C0_SDA
+ *                      I2C SCL                   PTD8     I2C0_SCL
+ *                      IRQ                       PTD10    PTD10
+ * Touch Pad / Segment  Electrode 0 (J3 Pin 3)    PTB0     TSI0_CH0
+ * LCD TWRPI Socket     Electrode 1 (J3 Pin 5)    PTB1     TSI0_CH6
+ *                      Electrode 2 (J3 Pin 7)    PTB2     TSI0_CH7
+ *                      Electrode 3 (J3 Pin 8)    PTB3     TSI0_CH8
+ *                      Electrode 4 (J3 Pin 9)    PTC0     TSI0_CH13
+ *                      Electrode 5 (J3 Pin 10)   PTC1     TSI0_CH14
+ *                      Electrode 6 (J3 Pin 11)   PTC2     TSI0_CH15
+ *                      Electrode 7 (J3 Pin 12)   PTA4     TSI0_CH5
+ *                      Electrode 8 (J3 Pin 13)   PTB16    TSI0_CH9
+ *                      Electrode 9 (J3 Pin 14)   PTB17    TSI0_CH10
+ *                      Electrode 10 (J3 Pin 15)  PTB18    TSI0_CH11
+ *                      Electrode 11 (J3 Pin 16)  PTB19    TSI0_CH12
+ *                      TWRPI ID0 (J3 Pin 17)     ?        ADC1_DP1
+ *                      TWRPI ID1 (J3 Pin 18)     ?        ADC1_SE16
+ */
+
+#define GPIO_SD_CARDDETECT (GPIO_PULLUP | PIN_INT_BOTH | PIN_PORTE | PIN28)
+#define GPIO_SD_WRPROTECT  (GPIO_PULLUP | PIN_PORTE | PIN27)
+
+#define GPIO_SW1           (GPIO_PULLUP | PIN_INT_BOTH | PIN_PORTA | PIN19)
+#define GPIO_SW2           (GPIO_PULLUP | PIN_INT_BOTH | PIN_PORTE | PIN26)
+
+#define GPIO_LED1          (GPIO_LOWDRIVE | GPIO_OUTPUT_ZER0 | PIN_PORTA | PIN11)
+#define GPIO_LED2          (GPIO_LOWDRIVE | GPIO_OUTPUT_ZER0 | PIN_PORTA | PIN28)
+#define GPIO_LED3          (GPIO_LOWDRIVE | GPIO_OUTPUT_ZER0 | PIN_PORTA | PIN29)
+#define GPIO_LED4          (GPIO_LOWDRIVE | GPIO_OUTPUT_ZER0 | PIN_PORTA | PIN10)
+
+/* Connections via the General Purpose Tower Plug-in (TWRPI) Socket
+ * -------------------- ------------------------- -------- -------------------
+ * FEATURE             CONNECTION                 PORT/PIN PIN FUNCTION
+ * -------------------- ------------------------- -------- -------------------
+ * General Purpose      TWRPI AN0 (J4 Pin 8)       ?        ADC0_DP0/ADC1_DP3
+ * TWRPI Socket         TWRPI AN1 (J4 Pin 9)       ?        ADC0_DM0/ADC1_DM3
+ *                      TWRPI AN2 (J4 Pin 12)      ?        ADC1_DP0/ADC0_DP3
+ *                      TWRPI ID0 (J4 Pin 17)      ?        ADC0_DP1
+ *                      TWRPI ID1 (J4 Pin 18)      ?        ADC0_DM1
+ *                      TWRPI I2C SCL (J5 Pin 3)   PTD8     I2C0_SCL
+ *                      TWRPI I2C SDA (J5 Pin 4)   PTD9     I2C0_SDA
+ *                      TWRPI SPI MISO (J5 Pin 9)  PTD14    SPI2_SIN
+ *                      TWRPI SPI MOSI (J5 Pin 10) PTD13    SPI2_SOUT
+ *                      TWRPI SPI SS (J5 Pin 11)   PTD15    SPI2_PCS0
+ *                      TWRPI SPI CLK (J5 Pin 12)  PTD12    SPI2_SCK
+ *                      TWRPI GPIO0 (J5 Pin 15)    PTD10    PTD10
+ *                      TWRPI GPIO1 (J5 Pin 16)    PTB8     PTB8
+ *                      TWRPI GPIO2 (J5 Pin 17)    PTB9     PTB9
+ *                      TWRPI GPIO3 (J5 Pin 18)    PTA19    PTA19
+ *                      TWRPI GPIO4 (J5 Pin 19)    PTE26    PTE26
+ */
+
+/* Connections via the Tower Primary Connector Side A
+ * --- -------------------- --------------------------------
+ * PIN NAME                 USAGE
+ * --- -------------------- --------------------------------
+ * A7  SCL0                 PTD8
+ * A8  SDA0                 PTD9
+ * A9  GPIO9 / CTS1         PTC19
+ * A10 GPIO8 / SDHC_D2      PTE5
+ * A11 GPIO7 / SD_WP_DET    PTE27
+ * A13 ETH_MDC              PTB1
+ * A14 ETH_MDIO             PTB0
+ * A16 ETH_RXDV             PTA14
+ * A19 ETH_RXD1             PTA12
+ * A20 ETH_RXD0             PTA13
+ * A21 SSI_MCLK             PTE6
+ * A22 SSI_BCLK             PTE12
+ * A23 SSI_FS               PTE11
+ * A24 SSI_RXD              PTE7
+ * A25 SSI_TXD              PTE10
+ * A27 AN3                  PGA0_DP/ADC0_DP0/ADC1_DP3
+ * A28 AN2                  PGA0_DM/ADC0_DM0/ADC1_DM3
+ * A29 AN1                  PGA1_DP/ADC1_DP0/ADC0_DP3
+ * A30 AN0                  PGA1_DM/ADC1_DM0/ADC0_DM3
+ * A33 TMR1                 PTA9
+ * A34 TMR0                 PTA8
+ * A35 GPIO6                PTB9
+ * A37 PWM3                 PTA6
+ * A38 PWM2                 PTC3
+ * A39 PWM1                 PTC2
+ * A40 PWM0                 PTC1
+ * A41 RXD0                 PTE25
+ * A42 TXD0                 PTE24
+ * A43 RXD1                 PTC16
+ * A44 TXD1                 PTC17
+ * A64 CLKOUT0              PTC3
+ * A66 EBI_AD14             PTC0
+ * A67 EBI_AD13             PTC1
+ * A68 EBI_AD12             PTC2
+ * A69 EBI_AD11             PTC4
+ * A70 EBI_AD10             PTC5
+ * A71 EBI_AD9              PTC6
+ * A71 EBI_R/W_b            PTC11
+ * A72 EBI_AD8              PTC7
+ * A73 EBI_AD7              PTC8
+ * A74 EBI_AD6              PTC9
+ * A75 EBI_AD5              PTC10
+ * A76 EBI_AD4              PTD2
+ * A77 EBI_AD3              PTD3
+ * A78 EBI_AD2              PTD4
+ * A79 EBI_AD1              PTD5
+ * A80 EBI_AD0              PTD6
+ */
+
+/* Connections via the Tower Primary Connector Side B
+ * --- -------------------- --------------------------------
+ * PIN NAME                 USAGE
+ * --- -------------------- --------------------------------
+ * B7  SDHC_CLK / SPI1_CLK  PTE2
+ * B9  SDHC_D3 / SPI1_CS0_b PTE4
+ * B10 SDHC_CMD / SPI1_MOSI PTE1
+ * B11 SDHC_D0 / SPI1_MISO  PTE3
+ * B13 ETH_RXER             PTA5
+ * B15 ETH_TXEN             PTA15
+ * B19 ETH_TXD1             PTA17
+ * B20 ETH_TXD0             PTA16
+ * B21 GPIO1 / RTS1         PTC18
+ * B22 GPIO2 / SDHC_D1      PTE0
+ * B23 GPIO3                PTE28
+ * B24 CLKIN0               PTA18
+ * B25 CLKOUT1              PTE26
+ * B27 AN7                  PTB7
+ * B28 AN6                  PTB6
+ * B29 AN5                  PTB5
+ * B30 AN4                  PTB4
+ * B34 TMR2                 PTD6
+ * B35 GPIO4                PTB8
+ * B37 PWM7                 PTA2
+ * B38 PWM6                 PTA1
+ * B39 PWM5                 PTD5
+ * B40 PWM4                 PTA7
+ * B41 CANRX0               PTE25
+ * B42 CANTX0               PTE24
+ * B44 SPI0_MISO            PTD14
+ * B45 SPI0_MOSI            PTD13
+ * B46 SPI0_CS0_b           PTD11
+ * B47 SPI0_CS1_b           PTD15
+ * B48 SPI0_CLK             PTD12
+ * B50 SCL1                 PTD8
+ * B51 SDA1                 PTD9
+ * B52 GPIO5 / SD_CARD_DET  PTE28
+ * B55 IRQ_H                PTA24
+ * B56 IRQ_G                PTA24
+ * B57 IRQ_F                PTA25
+ * B58 IRQ_E                PTA25
+ * B59 IRQ_D                PTA26
+ * B60 IRQ_C                PTA26
+ * B61 IRQ_B                PTA27
+ * B62 IRQ_A                PTA27
+ * B63 EBI_ALE / EBI_CS1_b  PTD0
+ * B64 EBI_CS0_b            PTD1
+ * B66 EBI_AD15             PTB18
+ * B67 EBI_AD16             PTB17
+ * B68 EBI_AD17             PTB16
+ * B69 EBI_AD18             PTB11
+ * B70 EBI_AD19             PTB10
+ * B72 EBI_OE_b             PTB19
+ * B73 EBI_D7               PTB20
+ * B74 EBI_D6               PTB21
+ * B75 EBI_D5               PTB22
+ * B76 EBI_D4               PTB23
+ * B77 EBI_D3               PTC12
+ * B78 EBI_D2               PTC13
+ * B79 EBI_D1               PTC14
+ * B80 EBI_D0               PTC15
+ */
+
+/************************************************************************************
+ * Public Types
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public data
+ ************************************************************************************/
+
+#ifndef __ASSEMBLY__
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Name: k64_spidev_initialize
+ *
+ * Description:
+ *   Called to configure SPI chip select GPIO pins for the FREEDOM-K64F board.
+ *
+ ************************************************************************************/
+
+void weak_function k64_spidev_initialize(void);
+
+/************************************************************************************
+ * Name: k64_usbinitialize
+ *
+ * Description:
+ *   Called to setup USB-related GPIO pins for the FREEDOM-K64F board.
+ *
+ ************************************************************************************/
+
+void weak_function k64_usbinitialize(void);
+
+#endif /* __ASSEMBLY__ */
+#endif /* __CONFIGS_FREEDOM_K64F_SRC_FRDMK64_H */
diff --git a/configs/freedom-k64f/src/k64_appinit.c b/configs/freedom-k64f/src/k64_appinit.c
new file mode 100644
index 0000000000..034f9e3b7c
--- /dev/null
+++ b/configs/freedom-k64f/src/k64_appinit.c
@@ -0,0 +1,270 @@
+/****************************************************************************
+ * config/freedom-k64f/src/k64_appinit.c
+ *
+ *   Copyright (C) 2011, 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 
+
+#include 
+
+#ifdef CONFIG_K64_SDHC
+#  include 
+#  include 
+#endif
+
+#include "kinetis.h"
+#include "freedom-k64f.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+/* Configuration ************************************************************/
+
+/* PORT and SLOT number probably depend on the board configuration */
+
+#ifdef CONFIG_ARCH_BOARD_FREEDOM_K64F
+#  define NSH_HAVEUSBDEV 1
+#  define NSH_HAVEMMCSD  1
+#  if defined(CONFIG_NSH_MMCSDSLOTNO) && CONFIG_NSH_MMCSDSLOTNO != 0
+#    error "Only one MMC/SD slot, slot 0"
+#    undef CONFIG_NSH_MMCSDSLOTNO
+#  endif
+#  ifndef CONFIG_NSH_MMCSDSLOTNO
+#    define CONFIG_NSH_MMCSDSLOTNO 0
+#  endif
+#else
+   /* Add configuration for new Kinetis boards here */
+#  error "Unrecognized Kinetis board"
+#  undef NSH_HAVEUSBDEV
+#  undef NSH_HAVEMMCSD
+#endif
+
+/* Can't support USB features if USB is not enabled */
+
+#ifndef CONFIG_USBDEV
+#  undef NSH_HAVEUSBDEV
+#endif
+
+/* Can't support MMC/SD features if mountpoints are disabled or if SDHC support
+ * is not enabled.
+ */
+
+#if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_K64_SDHC)
+#  undef NSH_HAVEMMCSD
+#endif
+
+#ifndef CONFIG_NSH_MMCSDMINOR
+#  define CONFIG_NSH_MMCSDMINOR 0
+#endif
+
+/* We expect to receive GPIO interrupts for card insertion events */
+
+#ifndef CONFIG_GPIO_IRQ
+#  error "CONFIG_GPIO_IRQ required for card detect interrupt"
+#endif
+
+#ifndef CONFIG_K64_PORTEINTS
+#  error "CONFIG_K64_PORTEINTS required for card detect interrupt"
+#endif
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/* This structure encapsulates the global variable used in this file and
+ * reduces the probability of name collistions.
+ */
+
+#ifdef NSH_HAVEMMCSD
+struct k64_nsh_s
+{
+  FAR struct sdio_dev_s *sdhc; /* SDIO driver handle */
+  bool inserted;               /* True: card is inserted */
+};
+#endif
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+#ifdef NSH_HAVEMMCSD
+static struct k64_nsh_s g_nsh;
+#endif
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: k64_mediachange
+ ****************************************************************************/
+
+#ifdef NSH_HAVEMMCSD
+static void k64_mediachange(void)
+{
+  bool inserted;
+
+  /* Get the current value of the card detect pin.  This pin is pulled up on
+   * board.  So low means that a card is present.
+   */
+
+  inserted = !kinetis_gpioread(GPIO_SD_CARDDETECT);
+
+  /* Has the pin changed state? */
+
+  if (inserted != g_nsh.inserted)
+    {
+      /* Yes.. perform the appropriate action (this might need some debounce). */
+
+      g_nsh.inserted = inserted;
+      sdhc_mediachange(g_nsh.sdhc, inserted);
+
+      /* If the card has been inserted, then check if it is write protected
+       * as well.  The pin is pulled up, but apparently logic high means
+       * write protected.
+       */
+
+      if (inserted)
+        {
+          sdhc_wrprotect(g_nsh.sdhc, kinetis_gpioread(GPIO_SD_WRPROTECT));
+        }
+    }
+}
+#endif
+
+/****************************************************************************
+ * Name: k64_cdinterrupt
+ ****************************************************************************/
+
+#ifdef NSH_HAVEMMCSD
+static int k64_cdinterrupt(int irq, FAR void *context)
+{
+  /* All of the work is done by k64_mediachange() */
+
+  k64_mediachange();
+  return OK;
+}
+#endif
+
+/****************************************************************************
+ * 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)
+{
+#ifdef NSH_HAVEMMCSD
+  int ret;
+
+  /* Configure GPIO pins */
+
+  /* Attached the card detect interrupt (but don't enable it yet) */
+
+  kinetis_pinconfig(GPIO_SD_CARDDETECT);
+  k64_pinirqattach(GPIO_SD_CARDDETECT, k64_cdinterrupt);
+
+  /* Configure the write protect GPIO */
+
+  kinetis_pinconfig(GPIO_SD_WRPROTECT);
+
+  /* Mount the SDHC-based MMC/SD block driver */
+  /* First, get an instance of the SDHC interface */
+
+  syslog(LOG_INFO, "Initializing SDHC slot %d\n",
+         CONFIG_NSH_MMCSDSLOTNO);
+
+  g_nsh.sdhc = sdhc_initialize(CONFIG_NSH_MMCSDSLOTNO);
+  if (!g_nsh.sdhc)
+    {
+      syslog(LOG_ERR, "ERROR: Failed to initialize SDHC slot %d\n",
+             CONFIG_NSH_MMCSDSLOTNO);
+      return -ENODEV;
+    }
+
+  /* Now bind the SDHC interface to the MMC/SD driver */
+
+  syslog(LOG_INFO, "Bind SDHC to the MMC/SD driver, minor=%d\n",
+         CONFIG_NSH_MMCSDMINOR);
+
+  ret = mmcsd_slotinitialize(CONFIG_NSH_MMCSDMINOR, g_nsh.sdhc);
+  if (ret != OK)
+    {
+      syslog(LOG_ERR, "ERROR: Failed to bind SDHC to the MMC/SD driver: %d\n", ret);
+      return ret;
+    }
+
+  syslog(LOG_INFO, "Successfully bound SDHC to the MMC/SD driver\n");
+
+  /* Handle the initial card state */
+
+  k64_mediachange();
+
+  /* Enable CD interrupts to handle subsequent media changes */
+
+  k64_pinirqenable(GPIO_SD_CARDDETECT);
+#endif
+  return OK;
+}
diff --git a/configs/freedom-k64f/src/k64_boot.c b/configs/freedom-k64f/src/k64_boot.c
new file mode 100644
index 0000000000..2eef462690
--- /dev/null
+++ b/configs/freedom-k64f/src/k64_boot.c
@@ -0,0 +1,102 @@
+/************************************************************************************
+ * configs/freedom-k64f/src/k64_boot.c
+ *
+ *   Copyright (C) 2011, 2015 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 "freedom-k64f.h"
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Private Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Name: kinetis_boardinitialize
+ *
+ * Description:
+ *   All Kinetis architectures must provide the following entry point.  This entry
+ *   point is called early in the initialization -- after all memory has been
+ *   configured and mapped but before any devices have been initialized.
+ *
+ ************************************************************************************/
+
+void kinetis_boardinitialize(void)
+{
+  /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function
+   * k64_spidev_initialize() has been brought into the link.
+   */
+
+#if defined(CONFIG_K64_SPI1) || defined(CONFIG_K64_SPI2)
+  if (k64_spidev_initialize)
+    {
+      k64_spidev_initialize();
+    }
+#endif
+
+   /* Initialize USB is 1) USBDEV is selected, 2) the USB controller is not
+    * disabled, and 3) the weak function k64_usbinitialize() has been brought
+    * into the build.
+    */
+
+#if defined(CONFIG_USBDEV) && defined(CONFIG_K64_USB)
+  if (k64_usbinitialize)
+    {
+      k64_usbinitialize();
+    }
+#endif
+
+  /* Configure on-board LEDs if LED support has been selected. */
+
+#ifdef CONFIG_ARCH_LEDS
+  board_autoled_initialize();
+#endif
+}
diff --git a/configs/freedom-k64f/src/k64_buttons.c b/configs/freedom-k64f/src/k64_buttons.c
new file mode 100644
index 0000000000..c05c82b76c
--- /dev/null
+++ b/configs/freedom-k64f/src/k64_buttons.c
@@ -0,0 +1,171 @@
+/****************************************************************************
+ * configs/freedom-k64f/src/k64_buttons.c
+ *
+ *   Copyright (C) 2011, 2014-2015 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 
+
+#include "freedom-k64f.h"
+
+#ifdef CONFIG_ARCH_BUTTONS
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+/* The TWR-K60N512 has user buttons (plus a reset button):
+ *
+ * 1. SW1 (IRQ0)   PTA19
+ * 2. SW2 (IRQ1)   PTE26
+ */
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: board_button_initialize
+ *
+ * Description:
+ *   board_button_initialize() must be called to initialize button resources.  After
+ *   that, board_buttons() may be called to collect the current state of all
+ *   buttons or board_button_irq() may be called to register button interrupt
+ *   handlers.
+ *
+ ****************************************************************************/
+
+void board_button_initialize(void)
+{
+   /* Configure the two buttons as inputs */
+
+   kinetis_pinconfig(GPIO_SW1);
+   kinetis_pinconfig(GPIO_SW2);
+}
+
+/****************************************************************************
+ * Name: board_buttons
+ ****************************************************************************/
+
+uint8_t board_buttons(void)
+{
+  uint8_t ret = 0;
+
+  if (kinetis_gpioread(GPIO_SW1))
+    {
+      ret |= BUTTON_SW1_BIT;
+    }
+
+  if (kinetis_gpioread(GPIO_SW2))
+    {
+      ret |= BUTTON_SW2_BIT;
+    }
+
+  return ret
+}
+
+/************************************************************************************
+ * Button support.
+ *
+ * Description:
+ *   board_button_initialize() must be called to initialize button resources.  After
+ *   that, board_buttons() may be called to collect the current state of all
+ *   buttons or board_button_irq() may be called to register button interrupt
+ *   handlers.
+ *
+ *   After board_button_initialize() has been called, board_buttons() may be called to
+ *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
+ *   with each bit associated with a button.  See the BUTTON_*_BIT and JOYSTICK_*_BIT
+ *   definitions in board.h for the meaning of each bit.
+ *
+ *   board_button_irq() may be called to register an interrupt handler that will
+ *   be called when a button is depressed or released.  The ID value is a
+ *   button enumeration value that uniquely identifies a button resource. See the
+ *   BUTTON_* and JOYSTICK_* definitions in board.h for the meaning of enumeration
+ *   value.  The previous interrupt handler address is returned (so that it may
+ *   restored, if so desired).
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_ARCH_IRQBUTTONS
+xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+{
+  xcpt_t oldhandler;
+  uint32_t pinset;
+
+  /* Map the button id to the GPIO bit set. */
+
+  if (id == BUTTON_SW1)
+    {
+      pinset = GPIO_SW1;
+    }
+  else if (id == BUTTON_SW2)
+    {
+      pinset = GPIO_SW2;
+    }
+  else
+    {
+      return NULL;
+    }
+
+  /* The button has already been configured as an interrupting input (by
+   * board_button_initialize() above).
+   *
+   * Attach the new button handler.
+   */
+
+  oldhandler = knetis_pinirqattach(pinset, irqhandler);
+
+  /* Then make sure that interrupts are enabled on the pin */
+
+  k64_pindmaenable(pinset);
+  return oldhandler;
+}
+#endif
+#endif /* CONFIG_ARCH_BUTTONS */
diff --git a/configs/freedom-k64f/src/k64_leds.c b/configs/freedom-k64f/src/k64_leds.c
new file mode 100644
index 0000000000..65488f1ccf
--- /dev/null
+++ b/configs/freedom-k64f/src/k64_leds.c
@@ -0,0 +1,250 @@
+/****************************************************************************
+ * configs/freedom-k64f/src/k64_leds.c
+ *
+ *   Copyright (C) 2011, 2013, 2015 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 "kinetis.h"
+#include "freedom-k64f.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+/* The FREEDOM-K64F has four LEDs:
+ *
+ * 1. E1 / Orange LED   PTA11
+ * 2. E2 / Yellow LED   PTA28
+ * 3. E3 / Green LED    PTA29
+ * 4  E4 / Blue LED     PTA10
+ */
+
+/* The following definitions map the encoded LED setting to GPIO settings */
+
+#define K64_LED1          (1 << 0)
+#define K64_LED2          (1 << 1)
+#define K64_LED3          (1 << 2)
+#define K64_LED4          (1 << 3)
+
+#define ON_SETBITS_SHIFT  (0)
+#define ON_CLRBITS_SHIFT  (4)
+#define OFF_SETBITS_SHIFT (8)
+#define OFF_CLRBITS_SHIFT (12)
+
+#define ON_BITS(v)        ((v) & 0xff)
+#define OFF_BITS(v)       (((v) >> 8) & 0x0ff)
+#define SETBITS(b)        ((b) & 0x0f)
+#define CLRBITS(b)        (((b) >> 4) & 0x0f)
+
+#define ON_SETBITS(v)     (SETBITS(ON_BITS(v))
+#define ON_CLRBITS(v)     (CLRBITS(ON_BITS(v))
+#define OFF_SETBITS(v)    (SETBITS(OFF_BITS(v))
+#define OFF_CLRBITS(v)    (CLRBITS(OFF_BITS(v))
+
+#define LED_STARTED_ON_SETBITS       ((K64_LED1) << ON_SETBITS_SHIFT)
+#define LED_STARTED_ON_CLRBITS       ((K64_LED2|K64_LED3|K64_LED4) << ON_CLRBITS_SHIFT)
+#define LED_STARTED_OFF_SETBITS      (0 << OFF_SETBITS_SHIFT)
+#define LED_STARTED_OFF_CLRBITS      ((K64_LED1|K64_LED2|K64_LED3|K64_LED4) << OFF_CLRBITS_SHIFT)
+
+#define LED_HEAPALLOCATE_ON_SETBITS  ((K64_LED2) << ON_SETBITS_SHIFT)
+#define LED_HEAPALLOCATE_ON_CLRBITS  ((K64_LED1|K64_LED3|K64_LED4) << ON_CLRBITS_SHIFT)
+#define LED_HEAPALLOCATE_OFF_SETBITS ((K64_LED1) << OFF_SETBITS_SHIFT)
+#define LED_HEAPALLOCATE_OFF_CLRBITS ((K64_LED2|K64_LED3|K64_LED4) << OFF_CLRBITS_SHIFT)
+
+#define LED_IRQSENABLED_ON_SETBITS   ((K64_LED1|K64_LED2) << ON_SETBITS_SHIFT)
+#define LED_IRQSENABLED_ON_CLRBITS   ((K64_LED3|K64_LED4) << ON_CLRBITS_SHIFT)
+#define LED_IRQSENABLED_OFF_SETBITS  ((K64_LED2) << OFF_SETBITS_SHIFT)
+#define LED_IRQSENABLED_OFF_CLRBITS  ((K64_LED1|K64_LED3|K64_LED4) << OFF_CLRBITS_SHIFT)
+
+#define LED_STACKCREATED_ON_SETBITS  ((K64_LED3) << ON_SETBITS_SHIFT)
+#define LED_STACKCREATED_ON_CLRBITS  ((K64_LED1|K64_LED2|K64_LED4) << ON_CLRBITS_SHIFT)
+#define LED_STACKCREATED_OFF_SETBITS ((K64_LED1|K64_LED2) << OFF_SETBITS_SHIFT)
+#define LED_STACKCREATED_OFF_CLRBITS ((K64_LED3|K64_LED4) << OFF_CLRBITS_SHIFT)
+
+#define LED_INIRQ_ON_SETBITS         ((K64_LED1) << ON_SETBITS_SHIFT)
+#define LED_INIRQ_ON_CLRBITS         ((0) << ON_CLRBITS_SHIFT)
+#define LED_INIRQ_OFF_SETBITS        ((0) << OFF_SETBITS_SHIFT)
+#define LED_INIRQ_OFF_CLRBITS        ((K64_LED1) << OFF_CLRBITS_SHIFT)
+
+#define LED_SIGNAL_ON_SETBITS        ((K64_LED2) << ON_SETBITS_SHIFT)
+#define LED_SIGNAL_ON_CLRBITS        ((0) << ON_CLRBITS_SHIFT)
+#define LED_SIGNAL_OFF_SETBITS       ((0) << OFF_SETBITS_SHIFT)
+#define LED_SIGNAL_OFF_CLRBITS       ((K64_LED2) << OFF_CLRBITS_SHIFT)
+
+#define LED_ASSERTION_ON_SETBITS     ((K64_LED4) << ON_SETBITS_SHIFT)
+#define LED_ASSERTION_ON_CLRBITS     ((0) << ON_CLRBITS_SHIFT)
+#define LED_ASSERTION_OFF_SETBITS    ((0) << OFF_SETBITS_SHIFT)
+#define LED_ASSERTION_OFF_CLRBITS    ((K64_LED4) << OFF_CLRBITS_SHIFT)
+
+#define LED_PANIC_ON_SETBITS         ((K64_LED4) << ON_SETBITS_SHIFT)
+#define LED_PANIC_ON_CLRBITS         ((0) << ON_CLRBITS_SHIFT)
+#define LED_PANIC_OFF_SETBITS        ((0) << OFF_SETBITS_SHIFT)
+#define LED_PANIC_OFF_CLRBITS        ((K64_LED4) << OFF_CLRBITS_SHIFT)
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static const uint16_t g_ledbits[8] =
+{
+  (LED_STARTED_ON_SETBITS       | LED_STARTED_ON_CLRBITS |
+   LED_STARTED_OFF_SETBITS      | LED_STARTED_OFF_CLRBITS),
+
+  (LED_HEAPALLOCATE_ON_SETBITS  | LED_HEAPALLOCATE_ON_CLRBITS |
+   LED_HEAPALLOCATE_OFF_SETBITS | LED_HEAPALLOCATE_OFF_CLRBITS),
+
+  (LED_IRQSENABLED_ON_SETBITS   | LED_IRQSENABLED_ON_CLRBITS |
+   LED_IRQSENABLED_OFF_SETBITS  | LED_IRQSENABLED_OFF_CLRBITS),
+
+  (LED_STACKCREATED_ON_SETBITS  | LED_STACKCREATED_ON_CLRBITS |
+   LED_STACKCREATED_OFF_SETBITS | LED_STACKCREATED_OFF_CLRBITS),
+
+  (LED_INIRQ_ON_SETBITS         | LED_INIRQ_ON_CLRBITS |
+   LED_INIRQ_OFF_SETBITS        | LED_INIRQ_OFF_CLRBITS),
+
+  (LED_SIGNAL_ON_SETBITS        | LED_SIGNAL_ON_CLRBITS |
+   LED_SIGNAL_OFF_SETBITS       | LED_SIGNAL_OFF_CLRBITS),
+
+  (LED_ASSERTION_ON_SETBITS     | LED_ASSERTION_ON_CLRBITS |
+   LED_ASSERTION_OFF_SETBITS    | LED_ASSERTION_OFF_CLRBITS),
+
+  (LED_PANIC_ON_SETBITS         | LED_PANIC_ON_CLRBITS |
+   LED_PANIC_OFF_SETBITS        | LED_PANIC_OFF_CLRBITS)
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static inline void led_clrbits(unsigned int clrbits)
+{
+  if ((clrbits & K64_LED1) != 0)
+    {
+      kinetis_gpiowrite(GPIO_LED1, false);
+    }
+
+  if ((clrbits & K64_LED2) != 0)
+    {
+      kinetis_gpiowrite(GPIO_LED2, false);
+    }
+
+  if ((clrbits & K64_LED3) != 0)
+    {
+      kinetis_gpiowrite(GPIO_LED3, false);
+    }
+
+  if ((clrbits & K64_LED4) != 0)
+    {
+      kinetis_gpiowrite(GPIO_LED4, false);
+    }
+}
+
+static inline void led_setbits(unsigned int setbits)
+{
+  if ((setbits & K64_LED1) != 0)
+    {
+      kinetis_gpiowrite(GPIO_LED1, true);
+    }
+
+  if ((setbits & K64_LED2) != 0)
+    {
+      kinetis_gpiowrite(GPIO_LED2, true);
+    }
+
+  if ((setbits & K64_LED3) != 0)
+    {
+      kinetis_gpiowrite(GPIO_LED3, true);
+    }
+
+  if ((setbits & K64_LED4) != 0)
+    {
+      kinetis_gpiowrite(GPIO_LED4, true);
+    }
+}
+
+static void led_setonoff(unsigned int bits)
+{
+  led_clrbits(CLRBITS(bits));
+  led_setbits(SETBITS(bits));
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: board_autoled_initialize
+ *
+ * Description:
+ *   Initialize LED GPIOs so that LEDs can be controlled.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_ARCH_LEDS
+void board_autoled_initialize(void)
+{
+   /* Configure LED1-4 GPIOs for output */
+
+   kinetis_pinconfig(GPIO_LED1);
+   kinetis_pinconfig(GPIO_LED2);
+   kinetis_pinconfig(GPIO_LED3);
+   kinetis_pinconfig(GPIO_LED4);
+}
+
+/****************************************************************************
+ * Name: board_autoled_on
+ ****************************************************************************/
+
+void board_autoled_on(int led)
+{
+  led_setonoff(ON_BITS(g_ledbits[led]));
+}
+
+/****************************************************************************
+ * Name: board_autoled_off
+ ****************************************************************************/
+
+void board_autoled_off(int led)
+{
+  led_setonoff(OFF_BITS(g_ledbits[led]));
+}
+
+#endif /* CONFIG_ARCH_LEDS */
diff --git a/configs/freedom-k64f/src/k64_spi.c b/configs/freedom-k64f/src/k64_spi.c
new file mode 100644
index 0000000000..b6c5ea32f8
--- /dev/null
+++ b/configs/freedom-k64f/src/k64_spi.c
@@ -0,0 +1,143 @@
+/************************************************************************************
+ * configs/freedom-k64f/src/k60_spi.c
+ *
+ *   Copyright (C) 2011 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 
+#include 
+
+#include "up_arch.h"
+#include "chip.h"
+#include "kinetis.h"
+#include "freedom-k64f.h"
+
+#if defined(CONFIG_K64_SPI1) || defined(CONFIG_K64_SPI2)
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Name: k64_spidev_initialize
+ *
+ * Description:
+ *   Called to configure SPI chip select GPIO pins for the FREEDOM-K64F board.
+ *
+ ************************************************************************************/
+
+void weak_function k64_spidev_initialize(void)
+{
+# warning "Missing logic"
+}
+
+/************************************************************************************
+ * Name:  kinetis_spi[n]select, kinetis_spi[n]status, and kinetis_spi[n]cmddata
+ *
+ * Description:
+ *   These external functions must be provided by board-specific logic.  They are
+ *   implementations of the select, status, and cmddata methods of the SPI interface
+ *   defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods
+ *   including kinetis_spibus_initialize()) are provided by common Kinetis logic.  To use
+ *   this common SPI logic on your board:
+ *
+ *   1. Provide logic in kinetis_boardinitialize() to configure SPI chip select
+ *      pins.
+ *   2. Provide kinetis_spi[n]select() and kinetis_spi[n]status() functions
+ *      in your board-specific logic.  These functions will perform chip selection
+ *      and status operations using GPIOs in the way your board is configured.
+ *   2. If CONFIG_SPI_CMDDATA is defined in the NuttX configuration, provide
+ *      kinetis_spi[n]cmddata() functions in your board-specific logic.  These
+ *      functions will perform cmd/data selection operations using GPIOs in the way
+ *      your board is configured.
+ *   3. Add a call to kinetis_spibus_initialize() in your low level application
+ *      initialization logic
+ *   4. The handle returned by kinetis_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).
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_K64_SPI1
+void kinetis_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");
+# warning "Missing logic"
+}
+
+uint8_t kinetis_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
+{
+# warning "Missing logic"
+  return SPI_STATUS_PRESENT;
+}
+#endif
+
+#ifdef CONFIG_K64_SPI2
+void kinetis_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");
+# warning "Missing logic"
+}
+
+uint8_t kinetis_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
+{
+# warning "Missing logic"
+  return SPI_STATUS_PRESENT;
+}
+#endif
+
+#ifdef CONFIG_K64_SPI3
+void kinetis_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");
+# warning "Missing logic"
+}
+
+uint8_t kinetis_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
+{
+# warning "Missing logic"
+  return SPI_STATUS_PRESENT;
+}
+#endif
+
+#endif /* CONFIG_K64_SPI1 || CONFIG_K64_SPI2 */
diff --git a/configs/freedom-k64f/src/k64_usbdev.c b/configs/freedom-k64f/src/k64_usbdev.c
new file mode 100644
index 0000000000..144aabae49
--- /dev/null
+++ b/configs/freedom-k64f/src/k64_usbdev.c
@@ -0,0 +1,113 @@
+/************************************************************************************
+ * configs/freedom-k64f/src/k60_usbdev.c
+ *
+ *   Copyright (C) 2011 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 
+
+#include 
+#include 
+
+#include "up_arch.h"
+#include "kinetis.h"
+#include "freedom-k64f.h"
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Private Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Name: k64_usbinitialize
+ *
+ * Description:
+ *   Called to setup USB-related GPIO pins for the FREEDOM-K64F board.
+ *
+ ************************************************************************************/
+
+void k64_usbinitialize(void)
+{
+# warning "Missing logic"
+}
+
+/************************************************************************************
+ * Name:  k64_usbpullup
+ *
+ * Description:
+ *   If USB is supported and the board supports a pullup via GPIO (for USB software
+ *   connect and disconnect), then the board software must provide k64_pullup.
+ *   See include/nuttx/usb/usbdev.h for additional description of this method.
+ *   Alternatively, if no pull-up GPIO the following EXTERN can be redefined to be
+ *   NULL.
+ *
+ ************************************************************************************/
+
+int k64_usbpullup(FAR struct usbdev_s *dev, bool enable)
+{
+  usbtrace(TRACE_DEVPULLUP, (uint16_t)enable);
+# warning "Missing logic"
+  return OK;
+}
+
+/************************************************************************************
+ * Name:  k64_usbsuspend
+ *
+ * Description:
+ *   Board logic must provide the k64_usbsuspend logic if the USBDEV driver is
+ *   used.  This function is called whenever the USB enters or leaves suspend mode.
+ *   This is an opportunity for the board logic to shutdown clocks, power, etc.
+ *   while the USB is suspended.
+ *
+ ************************************************************************************/
+
+void k64_usbsuspend(FAR struct usbdev_s *dev, bool resume)
+{
+  ullinfo("resume: %d\n", resume);
+#warning "Missing logic"
+}
diff --git a/configs/freedom-k64f/src/k64_usbmsc.c b/configs/freedom-k64f/src/k64_usbmsc.c
new file mode 100644
index 0000000000..bef62c1ae7
--- /dev/null
+++ b/configs/freedom-k64f/src/k64_usbmsc.c
@@ -0,0 +1,99 @@
+/****************************************************************************
+ * configs/freedom-k64f/src/k60_usbmsc.c
+ *
+ *   Copyright (C) 2011, 2013, 2016 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt 
+ *
+ * Configure and register the Kinetis MMC/SD block driver.
+ *
+ * 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 "kinetis.h"
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Configuration ************************************************************/
+
+#ifndef CONFIG_SYSTEM_USBMSC_DEVMINOR1
+#  define CONFIG_SYSTEM_USBMSC_DEVMINOR1 0
+#endif
+
+/* SLOT number(s) could depend on the board configuration */
+
+#ifdef CONFIG_ARCH_BOARD_FREEDOM_K64F
+#  undef K64_MMCSDSLOTNO
+#  define K64_MMCSDSLOTNO 0
+#else
+   /* Add configuration for new Kinetis boards here */
+#  error "Unrecognized Kinetis board"
+#endif
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: board_usbmsc_initialize
+ *
+ * Description:
+ *   Perform architecture specific initialization as needed to establish
+ *   the mass storage device that will be exported by the USB MSC device.
+ *
+ ****************************************************************************/
+
+int board_usbmsc_initialize(int port)
+{
+  /* If system/usbmsc is built as an NSH command, then SD slot should
+   * already have been initialized in board_app_initialize() (see k60_appinit.c).
+   * In this case, there is nothing further to be done here.
+   */
+
+#ifndef CONFIG_NSH_BUILTIN_APPS
+#  warning "Missing logic"
+#endif /* CONFIG_NSH_BUILTIN_APPS */
+
+   return OK;
+}
-- 
GitLab


From 750659cc2bb95c1a953e34b56e40dd0d625e84b0 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Fri, 1 Jul 2016 17:43:27 -0600
Subject: [PATCH 129/229] configs/freedom-k64f:  More detailed review

---
 configs/freedom-k64f/include/board.h    | 15 +++----
 configs/freedom-k64f/nsh/setenv.sh      | 16 ++++++++
 configs/freedom-k64f/src/Makefile       |  2 +-
 configs/freedom-k64f/src/freedom-k64f.h | 16 ++++----
 configs/freedom-k64f/src/k64_appinit.c  | 14 +++----
 configs/freedom-k64f/src/k64_boot.c     | 16 ++------
 configs/freedom-k64f/src/k64_buttons.c  | 54 +++++++++++--------------
 configs/freedom-k64f/src/k64_leds.c     |  3 +-
 configs/freedom-k64f/src/k64_spi.c      | 18 ++++-----
 configs/freedom-k64f/src/k64_usbdev.c   | 26 +++++-------
 configs/freedom-k64f/src/k64_usbmsc.c   |  4 +-
 11 files changed, 90 insertions(+), 94 deletions(-)

diff --git a/configs/freedom-k64f/include/board.h b/configs/freedom-k64f/include/board.h
index 61ef7384cf..4ce03acd93 100644
--- a/configs/freedom-k64f/include/board.h
+++ b/configs/freedom-k64f/include/board.h
@@ -1,8 +1,7 @@
 /************************************************************************************
  * configs/freedom-k64f/include/board.h
- * include/arch/board/board.h
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_BOARD_BOARD_H
-#define __ARCH_BOARD_BOARD_H
+#ifndef __CONFIG_FREEDOM_K64F_INCLUDE_BOARD_H
+#define __CONFIG_FREEDOM_K64F_INCLUDE_BOARD_H
 
 /************************************************************************************
  * Included Files
@@ -378,7 +377,8 @@
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
@@ -386,6 +386,7 @@ extern "C" {
 /************************************************************************************
  * Public Function Prototypes
  ************************************************************************************/
+
 /************************************************************************************
  * Name: kinetis_boardinitialize
  *
@@ -396,7 +397,7 @@ extern "C" {
  *
  ************************************************************************************/
 
-EXTERN void kinetis_boardinitialize(void);
+void kinetis_boardinitialize(void);
 
 #undef EXTERN
 #if defined(__cplusplus)
@@ -404,4 +405,4 @@ EXTERN void kinetis_boardinitialize(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif  /* __ARCH_BOARD_BOARD_H */
+#endif  /* __CONFIG_FREEDOM_K64F_INCLUDE_BOARD_H */
diff --git a/configs/freedom-k64f/nsh/setenv.sh b/configs/freedom-k64f/nsh/setenv.sh
index cfb4e25e25..43bab49e0a 100644
--- a/configs/freedom-k64f/nsh/setenv.sh
+++ b/configs/freedom-k64f/nsh/setenv.sh
@@ -47,10 +47,25 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
+# This is the Cygwin path to the location where I installed the Atmel GCC
+# toolchain under Windows.  You will also have to edit this if you install
+# this toolchain in any other location
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Atmel/Atmel Toolchain/ARM GCC/Native/4.7.3.99/arm-gnu-toolchain/bin"
+
 # This is the Cygwin path to the location where I installed the CodeSourcery
 # toolchain under windows.  You will also have to edit this if you install
 # the CodeSourcery toolchain in any other location
 #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin"
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin"
+# export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin"
+
+# This is the location where I installed the ARM "GNU Tools for ARM Embedded Processors"
+# You can this free toolchain here https://launchpad.net/gcc-arm-embedded
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/GNU Tools ARM Embedded/4.9 2015q2/bin"
+
+# This is the path to the location where I installed the devkitARM toolchain
+# You can get this free toolchain from http://devkitpro.org/ or http://sourceforge.net/projects/devkitpro/
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/devkitARM/bin"
 
 # This is the Cygwin path to the location where I build the buildroot
 # toolchain.
@@ -58,4 +73,5 @@ export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
 
 # Add the path to the toolchain to the PATH varialble
 export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
+
 echo "PATH : ${PATH}"
diff --git a/configs/freedom-k64f/src/Makefile b/configs/freedom-k64f/src/Makefile
index 1b6b3167d3..05f58900fb 100644
--- a/configs/freedom-k64f/src/Makefile
+++ b/configs/freedom-k64f/src/Makefile
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/freedom-k64f/src/Makefile
 #
-#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2016 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt 
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/configs/freedom-k64f/src/freedom-k64f.h b/configs/freedom-k64f/src/freedom-k64f.h
index 36320a34c3..0f90392bca 100644
--- a/configs/freedom-k64f/src/freedom-k64f.h
+++ b/configs/freedom-k64f/src/freedom-k64f.h
@@ -1,7 +1,7 @@
 /************************************************************************************
- * configs/twr-k60n512/src/twr-k60n512.h
+ * configs/freedom-k64f/src/freedom-k64f.h
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __CONFIGS_FREEDOM_K64F_SRC_FRDMK64_H
-#define __CONFIGS_FREEDOM_K64F_SRC_FRDMK64_H
+#ifndef __CONFIGS_FREEDOM_K64F_SRC_FREEDOM_K64F_H
+#define __CONFIGS_FREEDOM_K64F_SRC_FREEDOM_K64F_H
 
 /************************************************************************************
  * Included Files
@@ -55,10 +55,10 @@
  */
 
 #if KINETIS_NSPI < 1
-#  undef CONFIG_K64_SPI1
-#  undef CONFIG_K64_SPI2
+#  undef CONFIG_KINETIS_SPI1
+#  undef CONFIG_KINETIS_SPI2
 #elif KINETIS_NSPI < 2
-#  undef CONFIG_K64_SPI2
+#  undef CONFIG_KINETIS_SPI2
 #endif
 
 /* FREEDOM-K64F GPIOs ****************************************************************/
@@ -293,4 +293,4 @@ void weak_function k64_spidev_initialize(void);
 void weak_function k64_usbinitialize(void);
 
 #endif /* __ASSEMBLY__ */
-#endif /* __CONFIGS_FREEDOM_K64F_SRC_FRDMK64_H */
+#endif /* __CONFIGS_FREEDOM_K64F_SRC_FREEDOM_K64F_H */
diff --git a/configs/freedom-k64f/src/k64_appinit.c b/configs/freedom-k64f/src/k64_appinit.c
index 034f9e3b7c..d55c3bfd06 100644
--- a/configs/freedom-k64f/src/k64_appinit.c
+++ b/configs/freedom-k64f/src/k64_appinit.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * config/freedom-k64f/src/k64_appinit.c
  *
- *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -46,7 +46,7 @@
 
 #include 
 
-#ifdef CONFIG_K64_SDHC
+#ifdef CONFIG_KINETIS_SDHC
 #  include 
 #  include 
 #endif
@@ -88,7 +88,7 @@
  * is not enabled.
  */
 
-#if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_K64_SDHC)
+#if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_KINETIS_SDHC)
 #  undef NSH_HAVEMMCSD
 #endif
 
@@ -102,8 +102,8 @@
 #  error "CONFIG_GPIO_IRQ required for card detect interrupt"
 #endif
 
-#ifndef CONFIG_K64_PORTEINTS
-#  error "CONFIG_K64_PORTEINTS required for card detect interrupt"
+#ifndef CONFIG_KINETIS_PORTEINTS
+#  error "CONFIG_KINETIS_PORTEINTS required for card detect interrupt"
 #endif
 
 /****************************************************************************
@@ -224,7 +224,7 @@ int board_app_initialize(uintptr_t arg)
   /* Attached the card detect interrupt (but don't enable it yet) */
 
   kinetis_pinconfig(GPIO_SD_CARDDETECT);
-  k64_pinirqattach(GPIO_SD_CARDDETECT, k64_cdinterrupt);
+  kinetis_pinirqattach(GPIO_SD_CARDDETECT, k64_cdinterrupt);
 
   /* Configure the write protect GPIO */
 
@@ -264,7 +264,7 @@ int board_app_initialize(uintptr_t arg)
 
   /* Enable CD interrupts to handle subsequent media changes */
 
-  k64_pinirqenable(GPIO_SD_CARDDETECT);
+  kinetis_pinirqenable(GPIO_SD_CARDDETECT);
 #endif
   return OK;
 }
diff --git a/configs/freedom-k64f/src/k64_boot.c b/configs/freedom-k64f/src/k64_boot.c
index 2eef462690..1358f6633a 100644
--- a/configs/freedom-k64f/src/k64_boot.c
+++ b/configs/freedom-k64f/src/k64_boot.c
@@ -1,7 +1,7 @@
 /************************************************************************************
  * configs/freedom-k64f/src/k64_boot.c
  *
- *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,14 +47,6 @@
 #include "up_arch.h"
 #include "freedom-k64f.h"
 
-/************************************************************************************
- * Pre-processor Definitions
- ************************************************************************************/
-
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
@@ -71,32 +63,32 @@
 
 void kinetis_boardinitialize(void)
 {
+#if defined(CONFIG_KINETIS_SPI1) || defined(CONFIG_KINETIS_SPI2)
   /* Configure SPI chip selects if 1) SPI is not disabled, and 2) the weak function
    * k64_spidev_initialize() has been brought into the link.
    */
 
-#if defined(CONFIG_K64_SPI1) || defined(CONFIG_K64_SPI2)
   if (k64_spidev_initialize)
     {
       k64_spidev_initialize();
     }
 #endif
 
+#if defined(CONFIG_USBDEV) && defined(CONFIG_KINETIS_USB)
    /* Initialize USB is 1) USBDEV is selected, 2) the USB controller is not
     * disabled, and 3) the weak function k64_usbinitialize() has been brought
     * into the build.
     */
 
-#if defined(CONFIG_USBDEV) && defined(CONFIG_K64_USB)
   if (k64_usbinitialize)
     {
       k64_usbinitialize();
     }
 #endif
 
+#ifdef CONFIG_ARCH_LEDS
   /* Configure on-board LEDs if LED support has been selected. */
 
-#ifdef CONFIG_ARCH_LEDS
   board_autoled_initialize();
 #endif
 }
diff --git a/configs/freedom-k64f/src/k64_buttons.c b/configs/freedom-k64f/src/k64_buttons.c
index c05c82b76c..a8d5c3dcce 100644
--- a/configs/freedom-k64f/src/k64_buttons.c
+++ b/configs/freedom-k64f/src/k64_buttons.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/freedom-k64f/src/k64_buttons.c
  *
- *   Copyright (C) 2011, 2014-2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -52,20 +52,13 @@
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
+
 /* The TWR-K60N512 has user buttons (plus a reset button):
  *
  * 1. SW1 (IRQ0)   PTA19
  * 2. SW2 (IRQ1)   PTE26
  */
 
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -74,10 +67,10 @@
  * Name: board_button_initialize
  *
  * Description:
- *   board_button_initialize() must be called to initialize button resources.  After
- *   that, board_buttons() may be called to collect the current state of all
- *   buttons or board_button_irq() may be called to register button interrupt
- *   handlers.
+ *   board_button_initialize() must be called to initialize button resources.
+ *   After that, board_buttons() may be called to collect the current state
+ *   of all buttons or board_button_irq() may be called to register button
+ *   interrupt handlers.
  *
  ****************************************************************************/
 
@@ -110,28 +103,29 @@ uint8_t board_buttons(void)
   return ret
 }
 
-/************************************************************************************
+/****************************************************************************
  * Button support.
  *
  * Description:
- *   board_button_initialize() must be called to initialize button resources.  After
- *   that, board_buttons() may be called to collect the current state of all
- *   buttons or board_button_irq() may be called to register button interrupt
- *   handlers.
+ *   board_button_initialize() must be called to initialize button
+ *   resources.  After that, board_buttons() may be called to collect the
+ *   current state of all buttons or board_button_irq() may be called to
+ *   register button interrupt handlers.
  *
- *   After board_button_initialize() has been called, board_buttons() may be called to
- *   collect the state of all buttons.  board_buttons() returns an 8-bit bit set
- *   with each bit associated with a button.  See the BUTTON_*_BIT and JOYSTICK_*_BIT
- *   definitions in board.h for the meaning of each bit.
+ *   After board_button_initialize() has been called, board_buttons() may
+ *   be called to collect the state of all buttons.  board_buttons() returns
+ *   an 8-bit bit set with each bit associated with a button.  See the
+ *   BUTTON_*_BIT and JOYSTICK_*_BIT definitions in board.h for the meaning
+ *   of each bit.
  *
- *   board_button_irq() may be called to register an interrupt handler that will
- *   be called when a button is depressed or released.  The ID value is a
- *   button enumeration value that uniquely identifies a button resource. See the
- *   BUTTON_* and JOYSTICK_* definitions in board.h for the meaning of enumeration
- *   value.  The previous interrupt handler address is returned (so that it may
- *   restored, if so desired).
+ *   board_button_irq() may be called to register an interrupt handler that
+ *   will be called when a button is depressed or released.  The ID value is
+ *   a button enumeration value that uniquely identifies a button resource.
+ *   See the BUTTON_* and JOYSTICK_* definitions in board.h for the meaning
+ *   of enumeration value.  The previous interrupt handler address is
+ *   returned (so that it may restored, if so desired).
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
 xcpt_t board_button_irq(int id, xcpt_t irqhandler)
@@ -164,7 +158,7 @@ xcpt_t board_button_irq(int id, xcpt_t irqhandler)
 
   /* Then make sure that interrupts are enabled on the pin */
 
-  k64_pindmaenable(pinset);
+  kinetis_pindmaenable(pinset);
   return oldhandler;
 }
 #endif
diff --git a/configs/freedom-k64f/src/k64_leds.c b/configs/freedom-k64f/src/k64_leds.c
index 65488f1ccf..da05edc848 100644
--- a/configs/freedom-k64f/src/k64_leds.c
+++ b/configs/freedom-k64f/src/k64_leds.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/freedom-k64f/src/k64_leds.c
  *
- *   Copyright (C) 2011, 2013, 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,6 +49,7 @@
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
+
 /* The FREEDOM-K64F has four LEDs:
  *
  * 1. E1 / Orange LED   PTA11
diff --git a/configs/freedom-k64f/src/k64_spi.c b/configs/freedom-k64f/src/k64_spi.c
index b6c5ea32f8..847d5af7e4 100644
--- a/configs/freedom-k64f/src/k64_spi.c
+++ b/configs/freedom-k64f/src/k64_spi.c
@@ -1,7 +1,7 @@
 /************************************************************************************
- * configs/freedom-k64f/src/k60_spi.c
+ * configs/freedom-k64f/src/k64_spi.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -51,7 +51,7 @@
 #include "kinetis.h"
 #include "freedom-k64f.h"
 
-#if defined(CONFIG_K64_SPI1) || defined(CONFIG_K64_SPI2)
+#if defined(CONFIG_KINETIS_SPI1) || defined(CONFIG_KINETIS_SPI2)
 
 /************************************************************************************
  * Public Functions
@@ -77,8 +77,8 @@ void weak_function k64_spidev_initialize(void)
  *   These external functions must be provided by board-specific logic.  They are
  *   implementations of the select, status, and cmddata methods of the SPI interface
  *   defined by struct spi_ops_s (see include/nuttx/spi/spi.h). All other methods
- *   including kinetis_spibus_initialize()) are provided by common Kinetis logic.  To use
- *   this common SPI logic on your board:
+ *   including kinetis_spibus_initialize()) are provided by common Kinetis logic.
+ *   To use this common SPI logic on your board:
  *
  *   1. Provide logic in kinetis_boardinitialize() to configure SPI chip select
  *      pins.
@@ -98,7 +98,7 @@ void weak_function k64_spidev_initialize(void)
  *
  ************************************************************************************/
 
-#ifdef CONFIG_K64_SPI1
+#ifdef CONFIG_KINETIS_SPI1
 void kinetis_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");
@@ -112,7 +112,7 @@ uint8_t kinetis_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 }
 #endif
 
-#ifdef CONFIG_K64_SPI2
+#ifdef CONFIG_KINETIS_SPI2
 void kinetis_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");
@@ -126,7 +126,7 @@ uint8_t kinetis_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 }
 #endif
 
-#ifdef CONFIG_K64_SPI3
+#ifdef CONFIG_KINETIS_SPI3
 void kinetis_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");
@@ -140,4 +140,4 @@ uint8_t kinetis_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
 }
 #endif
 
-#endif /* CONFIG_K64_SPI1 || CONFIG_K64_SPI2 */
+#endif /* CONFIG_KINETIS_SPI1 || CONFIG_KINETIS_SPI2 */
diff --git a/configs/freedom-k64f/src/k64_usbdev.c b/configs/freedom-k64f/src/k64_usbdev.c
index 144aabae49..379f0e2cc1 100644
--- a/configs/freedom-k64f/src/k64_usbdev.c
+++ b/configs/freedom-k64f/src/k64_usbdev.c
@@ -1,7 +1,7 @@
 /************************************************************************************
- * configs/freedom-k64f/src/k60_usbdev.c
+ * configs/freedom-k64f/src/k64_usbdev.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -51,14 +51,6 @@
 #include "kinetis.h"
 #include "freedom-k64f.h"
 
-/************************************************************************************
- * Pre-processor Definitions
- ************************************************************************************/
-
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
@@ -77,18 +69,18 @@ void k64_usbinitialize(void)
 }
 
 /************************************************************************************
- * Name:  k64_usbpullup
+ * Name:  kinetis_usbpullup
  *
  * Description:
  *   If USB is supported and the board supports a pullup via GPIO (for USB software
- *   connect and disconnect), then the board software must provide k64_pullup.
+ *   connect and disconnect), then the board software must provide kinetis_usbpullup.
  *   See include/nuttx/usb/usbdev.h for additional description of this method.
  *   Alternatively, if no pull-up GPIO the following EXTERN can be redefined to be
  *   NULL.
  *
  ************************************************************************************/
 
-int k64_usbpullup(FAR struct usbdev_s *dev, bool enable)
+int kinetis_usbpullup(FAR struct usbdev_s *dev, bool enable)
 {
   usbtrace(TRACE_DEVPULLUP, (uint16_t)enable);
 # warning "Missing logic"
@@ -96,18 +88,18 @@ int k64_usbpullup(FAR struct usbdev_s *dev, bool enable)
 }
 
 /************************************************************************************
- * Name:  k64_usbsuspend
+ * Name:  kinetis_usbsuspend
  *
  * Description:
- *   Board logic must provide the k64_usbsuspend logic if the USBDEV driver is
+ *   Board logic must provide the kinetis_usbsuspend logic if the USBDEV driver is
  *   used.  This function is called whenever the USB enters or leaves suspend mode.
  *   This is an opportunity for the board logic to shutdown clocks, power, etc.
  *   while the USB is suspended.
  *
  ************************************************************************************/
 
-void k64_usbsuspend(FAR struct usbdev_s *dev, bool resume)
+void kinetis_usbsuspend(FAR struct usbdev_s *dev, bool resume)
 {
-  ullinfo("resume: %d\n", resume);
+  uinfo("resume: %d\n", resume);
 #warning "Missing logic"
 }
diff --git a/configs/freedom-k64f/src/k64_usbmsc.c b/configs/freedom-k64f/src/k64_usbmsc.c
index bef62c1ae7..06ff717d63 100644
--- a/configs/freedom-k64f/src/k64_usbmsc.c
+++ b/configs/freedom-k64f/src/k64_usbmsc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * configs/freedom-k64f/src/k60_usbmsc.c
+ * configs/freedom-k64f/src/k64_usbmsc.c
  *
- *   Copyright (C) 2011, 2013, 2016 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Configure and register the Kinetis MMC/SD block driver.
-- 
GitLab


From 326be154ad7bdecaa0dc4103c93cd8464a27974e Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sat, 2 Jul 2016 07:56:43 -0600
Subject: [PATCH 130/229] Freedom K64F: Update README.txt; add proper (auto)
 LED support

---
 configs/Kconfig                         |   3 +-
 configs/README.txt                      |   4 +-
 configs/freedom-k64f/README.txt         | 519 +++++-------------------
 configs/freedom-k64f/include/board.h    |  38 +-
 configs/freedom-k64f/src/Makefile       |   2 +-
 configs/freedom-k64f/src/freedom-k64f.h | 196 +--------
 configs/freedom-k64f/src/k64_autoleds.c | 162 ++++++++
 configs/freedom-k64f/src/k64_leds.c     | 251 ------------
 configs/teensy-3.x/src/k20_autoleds.c   |  12 -
 9 files changed, 290 insertions(+), 897 deletions(-)
 create mode 100644 configs/freedom-k64f/src/k64_autoleds.c
 delete mode 100644 configs/freedom-k64f/src/k64_leds.c

diff --git a/configs/Kconfig b/configs/Kconfig
index 0ef907bda5..a46efb462a 100644
--- a/configs/Kconfig
+++ b/configs/Kconfig
@@ -208,8 +208,9 @@ config ARCH_BOARD_FREEDOM_K64F
 	select ARCH_HAVE_BUTTONS
 	select ARCH_HAVE_IRQBUTTONS
 	---help---
-		Kinetis K64 Cortex-M4 MCU.  This port uses the FreeScale FREEDOM-K64F
 		development board.
+		This port uses the FreeScale FREEDOM-K64F development board. This
+		board uses the Kinetis K64 MK64FN1M0VLL12 Cortex-M4 MCU.
 
 config ARCH_BOARD_FREEDOM_KL25Z
 	bool "Freescale Freedom KL25Z"
diff --git a/configs/README.txt b/configs/README.txt
index 70f79490c9..6f30c63104 100644
--- a/configs/README.txt
+++ b/configs/README.txt
@@ -262,8 +262,8 @@ configs/fire-stm32v2
   the boards are supported but only version 2 has been tested.
 
 configs/freedom-k64f
-  Kinetis K64 Cortex-M4 MCU.  This port uses the FreeScale FREEDOM-K64F
-  development board.
+  This port uses the FreeScale FREEDOM-K64F development board. This board
+  uses the Kinetis K64 MK64FN1M0VLL12 Cortex-M4 MCU.
 
 configs/freedom-kl25z
 configs/freedom-kl26z
diff --git a/configs/freedom-k64f/README.txt b/configs/freedom-k64f/README.txt
index 3054e229bf..45034c8056 100644
--- a/configs/freedom-k64f/README.txt
+++ b/configs/freedom-k64f/README.txt
@@ -4,283 +4,88 @@ README.txt
 This is the README file for the port of NuttX to the Freescale Freedom-K64F
 develoment board.
 
-REVISIT: At present, this is just a clone of the TWR-K60N512 README file.
-
 Contents
 ========
 
-  o Kinetis TWR-K60N512 Features
-  o Kinetis TWR-K60N512 Pin Configuration
-    - On-Board Connections
-    - Connections via the General Purpose Tower Plug-in (TWRPI) Socket
-    - Connections via the Tower Primary Connector Side A
-    - Connections via the Tower Primary Connector Side B
-    - TWR-SER Serial Board Connection
-  o LEDs
+  o Freedom K64F Features
+  o Serial Console
+  o LEDs and Buttons
   o Development Environment
   o GNU Toolchain Options
-  o IDEs
-  o NuttX EABI "buildroot" Toolchain
-  o NuttX OABI "buildroot" Toolchain
-  o NXFLAT Toolchain
 
 Kinetis TWR-K60N512 Features:
 =============================
 
-  o K60N512 in 144 MAPBGA, K60N512VMD100
-  o Capacitive Touch Pads
-  o Integrated, Open-Source JTAG
-  o SD Card Slot
-  o MMA7660 3-axis accelerometer
-  o Tower Plug-In (TWRPI) Socket for expansion (sensors, etc.)
-  o Touch TWRPI Socket adds support for various capacitive touch boards
-    (e.g. keypads, rotary dials, sliders, etc.)
-  o Tower connectivity for access to USB, Ethernet, RS232/RS485, CAN, SPI,
-    I²C, Flexbus, etc.
-  o Plus: Potentiometer, 4 LEDs, 2 pushbuttons, infrared port
-
-Kinetis TWR-K60N512 Pin Configuration
-=====================================
-
-On-Board Connections
--------------------- ------------------------- -------- -------------------
-FEATURE              CONNECTION                PORT/PIN PIN FUNCTION
--------------------- ------------------------- -------- -------------------
-OSJTAG USB-to-serial OSJTAG Bridge RX Data     PTE9     UART5_RX
-Bridge               OSJTAG Bridge TX Data     PTE8     UART5_TX
-SD Card Slot         SD Clock                  PTE2     SDHC0_DCLK
-                     SD Command                PTE3     SDHC0_CMD
-                     SD Data0                  PTE1     SDHC0_D0
-                     SD Data1                  PTE0     SDHC0_D1
-                     SD Data2                  PTE5     SDHC0_D2
-                     SD Data3                  PTE4     SDHC0_D3
-                     SD Card Detect            PTE28    PTE28
-                     SD Write Protect          PTE27    PTE27
-Infrared Port        IR Transmit               PTD7     CMT_IRO
-                     IR Receive                PTC6     CMP0_IN0
-Pushbuttons          SW1 (IRQ0)                PTA19    PTA19
-                     SW2 (IRQ1)                PTE26    PTE26
-                     SW3 (RESET)               RESET_b  RESET_b
-Touch Pads           E1 / Touch                PTA4     TSI0_CH5
-                     E2 / Touch                PTB3     TSI0_CH8
-                     E3 / Touch                PTB2     TSI0_CH7
-                     E4 / Touch                PTB16    TSI0_CH9
-LEDs                 E1 / Orange LED           PTA11    PTA11
-                     E2 / Yellow LED           PTA28    PTA28
-                     E3 / Green LED            PTA29    PTA29
-                     E4 / Blue LED             PTA10    PTA10
-Potentiometer        Potentiometer (R71)       ?        ADC1_DM1
-Accelerometer        I2C SDA                   PTD9     I2C0_SDA
-                     I2C SCL                   PTD8     I2C0_SCL
-                     IRQ                       PTD10    PTD10
-Touch Pad / Segment  Electrode 0 (J3 Pin 3)    PTB0     TSI0_CH0
-LCD TWRPI Socket     Electrode 1 (J3 Pin 5)    PTB1     TSI0_CH6
-                     Electrode 2 (J3 Pin 7)    PTB2     TSI0_CH7
-                     Electrode 3 (J3 Pin 8)    PTB3     TSI0_CH8
-                     Electrode 4 (J3 Pin 9)    PTC0     TSI0_CH13
-                     Electrode 5 (J3 Pin 10)   PTC1     TSI0_CH14
-                     Electrode 6 (J3 Pin 11)   PTC2     TSI0_CH15
-                     Electrode 7 (J3 Pin 12)   PTA4     TSI0_CH5
-                     Electrode 8 (J3 Pin 13)   PTB16    TSI0_CH9
-                     Electrode 9 (J3 Pin 14)   PTB17    TSI0_CH10
-                     Electrode 10 (J3 Pin 15)  PTB18    TSI0_CH11
-                     Electrode 11 (J3 Pin 16)  PTB19    TSI0_CH12
-                     TWRPI ID0 (J3 Pin 17)     ?        ADC1_DP1
-                     TWRPI ID1 (J3 Pin 18)     ?        ADC1_SE16
-
-Connections via the General Purpose Tower Plug-in (TWRPI) Socket
--------------------- ------------------------- -------- -------------------
-FEATURE             CONNECTION                 PORT/PIN PIN FUNCTION
--------------------- ------------------------- -------- -------------------
-General Purpose      TWRPI AN0 (J4 Pin 8)       ?        ADC0_DP0/ADC1_DP3
-TWRPI Socket         TWRPI AN1 (J4 Pin 9)       ?        ADC0_DM0/ADC1_DM3
-                     TWRPI AN2 (J4 Pin 12)      ?        ADC1_DP0/ADC0_DP3
-                     TWRPI ID0 (J4 Pin 17)      ?        ADC0_DP1
-                     TWRPI ID1 (J4 Pin 18)      ?        ADC0_DM1
-                     TWRPI I2C SCL (J5 Pin 3)   PTD8     I2C0_SCL
-                     TWRPI I2C SDA (J5 Pin 4)   PTD9     I2C0_SDA
-                     TWRPI SPI MISO (J5 Pin 9)  PTD14    SPI2_SIN
-                     TWRPI SPI MOSI (J5 Pin 10) PTD13    SPI2_SOUT
-                     TWRPI SPI SS (J5 Pin 11)   PTD15    SPI2_PCS0
-                     TWRPI SPI CLK (J5 Pin 12)  PTD12    SPI2_SCK
-                     TWRPI GPIO0 (J5 Pin 15)    PTD10    PTD10
-                     TWRPI GPIO1 (J5 Pin 16)    PTB8     PTB8
-                     TWRPI GPIO2 (J5 Pin 17)    PTB9     PTB9
-                     TWRPI GPIO3 (J5 Pin 18)    PTA19    PTA19
-                     TWRPI GPIO4 (J5 Pin 19)    PTE26    PTE26
-
-The TWR-K60N512 features two expansion card-edge connectors that interface
-to the Primary and Secondary Elevator boards in a Tower system. The Primary
-Connector (comprised of sides A and B) is utilized by the TWR-K60N512 while
-the Secondary Connector (comprised of sides C and D) only makes connections
-to the GND pins.
-
-Connections via the Tower Primary Connector Side A
---- -------------------- --------------------------------
-PIN NAME                 USAGE
---- -------------------- --------------------------------
-A7  SCL0                 PTD8
-A8  SDA0                 PTD9
-A9  GPIO9 / CTS1         PTC19
-A10 GPIO8 / SDHC_D2      PTE5
-A11 GPIO7 / SD_WP_DET    PTE27
-A13 ETH_MDC              PTB1
-A14 ETH_MDIO             PTB0
-A16 ETH_RXDV             PTA14
-A19 ETH_RXD1             PTA12
-A20 ETH_RXD0             PTA13
-A21 SSI_MCLK             PTE6
-A22 SSI_BCLK             PTE12
-A23 SSI_FS               PTE11
-A24 SSI_RXD              PTE7
-A25 SSI_TXD              PTE10
-A27 AN3                  PGA0_DP/ADC0_DP0/ADC1_DP3
-A28 AN2                  PGA0_DM/ADC0_DM0/ADC1_DM3
-A29 AN1                  PGA1_DP/ADC1_DP0/ADC0_DP3
-A30 AN0                  PGA1_DM/ADC1_DM0/ADC0_DM3
-A33 TMR1                 PTA9
-A34 TMR0                 PTA8
-A35 GPIO6                PTB9
-A37 PWM3                 PTA6
-A38 PWM2                 PTC3
-A39 PWM1                 PTC2
-A40 PWM0                 PTC1
-A41 RXD0                 PTE25
-A42 TXD0                 PTE24
-A43 RXD1                 PTC16
-A44 TXD1                 PTC17
-A64 CLKOUT0              PTC3
-A66 EBI_AD14             PTC0
-A67 EBI_AD13             PTC1
-A68 EBI_AD12             PTC2
-A69 EBI_AD11             PTC4
-A70 EBI_AD10             PTC5
-A71 EBI_AD9              PTC6
-A71 EBI_R/W_b            PTC11
-A72 EBI_AD8              PTC7
-A73 EBI_AD7              PTC8
-A74 EBI_AD6              PTC9
-A75 EBI_AD5              PTC10
-A76 EBI_AD4              PTD2
-A77 EBI_AD3              PTD3
-A78 EBI_AD2              PTD4
-A79 EBI_AD1              PTD5
-A80 EBI_AD0              PTD6
-
-Connections via the Tower Primary Connector Side B
---- -------------------- --------------------------------
-PIN NAME                 USAGE
---- -------------------- --------------------------------
-B7  SDHC_CLK / SPI1_CLK  PTE2
-B9  SDHC_D3 / SPI1_CS0_b PTE4
-B10 SDHC_CMD / SPI1_MOSI PTE1
-B11 SDHC_D0 / SPI1_MISO  PTE3
-B13 ETH_RXER             PTA5
-B15 ETH_TXEN             PTA15
-B19 ETH_TXD1             PTA17
-B20 ETH_TXD0             PTA16
-B21 GPIO1 / RTS1         PTC18
-B22 GPIO2 / SDHC_D1      PTE0
-B23 GPIO3                PTE28
-B24 CLKIN0               PTA18
-B25 CLKOUT1              PTE26
-B27 AN7                  PTB7
-B28 AN6                  PTB6
-B29 AN5                  PTB5
-B30 AN4                  PTB4
-B34 TMR2                 PTD6
-B35 GPIO4                PTB8
-B37 PWM7                 PTA2
-B38 PWM6                 PTA1
-B39 PWM5                 PTD5
-B40 PWM4                 PTA7
-B41 CANRX0               PTE25
-B42 CANTX0               PTE24
-B44 SPI0_MISO            PTD14
-B45 SPI0_MOSI            PTD13
-B46 SPI0_CS0_b           PTD11
-B47 SPI0_CS1_b           PTD15
-B48 SPI0_CLK             PTD12
-B50 SCL1                 PTD8
-B51 SDA1                 PTD9
-B52 GPIO5 / SD_CARD_DET  PTE28
-B55 IRQ_H                PTA24
-B56 IRQ_G                PTA24
-B57 IRQ_F                PTA25
-B58 IRQ_E                PTA25
-B59 IRQ_D                PTA26
-B60 IRQ_C                PTA26
-B61 IRQ_B                PTA27
-B62 IRQ_A                PTA27
-B63 EBI_ALE / EBI_CS1_b  PTD0
-B64 EBI_CS0_b            PTD1
-B66 EBI_AD15             PTB18
-B67 EBI_AD16             PTB17
-B68 EBI_AD17             PTB16
-B69 EBI_AD18             PTB11
-B70 EBI_AD19             PTB10
-B72 EBI_OE_b             PTB19
-B73 EBI_D7               PTB20
-B74 EBI_D6               PTB21
-B75 EBI_D5               PTB22
-B76 EBI_D4               PTB23
-B77 EBI_D3               PTC12
-B78 EBI_D2               PTC13
-B79 EBI_D1               PTC14
-B80 EBI_D0               PTC15
-
-TWR-SER Serial Board Connection
-===============================
-
-The serial board connects into the tower and then maps to the tower pins to
-yet other functions (see TWR-SER.pdf).
-
-For the serial port, the following jumpers are required:
-
-  J15: 1-2 (default)
-  J17: 1-2 (default)
-  J18: 1-2 (default)
-  J19: 1-2 (default)
-
-The two connections map as follows:
-
-  A41 RXD0  - Not connected
-  A42 TXD0  - Not connected
-  A43 RXD1  - ELE_RXD (connects indirectory to DB-9 connector J8)
-  A44 TXD1  - ELE_TXD (connects indirectory to DB-9 connector J8)
-
-Finally, we can conclude that:
-
-  UART4 (PTE24/25) is not connected, and
-  UART3 (PTC16/17) is associated with the DB9 connector
-
-NOTE: UART5 is associated with OSJTAG bridge and may also be usable.
-
-LEDs
-====
-
-The TWR-K60N100 board has four LEDs labeled D2..D4 on the board.  Usage of
-these LEDs is defined in include/board.h and src/up_leds.c.  They are encoded
-as follows:
-
-    SYMBOL                Meaning                  LED1*    LED2    LED3    LED4
-    -------------------   -----------------------  -------  ------- ------- ------
-    LED_STARTED           NuttX has been started   ON       OFF     OFF     OFF
-    LED_HEAPALLOCATE      Heap has been allocated  OFF      ON      OFF     OFF
-    LED_IRQSENABLED       Interrupts enabled       ON       ON      OFF     OFF
-    LED_STACKCREATED      Idle stack created       OFF      OFF     ON      OFF
-    LED_INIRQ             In an interrupt**        ON       N/C     N/C     OFF
-    LED_SIGNAL            In a signal handler***   N/C      ON      N/C     OFF
-    LED_ASSERTION         An assertion failed      ON       ON      N/C     OFF
-    LED_PANIC             The system has crashed   N/C      N/C      N/C    ON
-    LED_IDLE              STM32 is is sleep mode   (Optional, not used)
-
-  * If LED1, LED2, LED3 are statically on, then NuttX probably failed to boot
-    and these LEDs will give you some indication of where the failure was
- ** The normal state is LED3 ON and LED1 faintly glowing.  This faint glow
-    is because of timer interrupts that result in the LED being illuminated
-    on a small proportion of the time.
-*** LED2 may also flicker normally if signals are processed.
+  The features of the FRDM-K64F hardware are as follows:
+
+  - MK64FN1M0VLL12 MCU (120 MHz, 1 MB flash memory, 256 KB RAM, low-power,
+    crystal-less USB, and 100 LQFP)
+  - Dual role USB interface with micro-B USB connector
+  - RGB LED
+  - FXOS8700CQ - accelerometer and magnetometer
+  - Two user push buttons
+  - Flexible power supply option - OpenSDAv2 USB, K64 USB, and external
+    source
+  - Easy access to MCU input/output through Arduino R3TM compatible I/O
+    connectors
+  - Programmable OpenSDAv2 debug circuit supporting the CMSIS-DAP Interface
+    software that provides:
+    o Mass storage device (MSD) flash programming interface
+    o CMSIS-DAP debug interface over a driver-less USB HID connection
+       providing run-control debugging and compatibility with IDE tools
+    o Virtual serial port interface
+    o Open-source CMSIS-DAP software project: github.com/mbedmicro/CMSIS-DAP.
+  - Ethernet
+  - SDHC
+  - Add-on RF module: nRF24L01+ Nordic 2.4GHz Radio
+  - Add-on Bluetooth module: JY-MCU BT board V1.05 BT
+
+OpenSDAv2
+=========
+
+  The FRDM-K64F platform features OpenSDAv2, the Freescale open-source
+  hardware embedded serial and debug adapter running an open-source
+  bootloader. This circuit offers several options for serial communication,
+  flash programming, and run-control debugging. OpenSDAv2 is an mbed
+  HDK-compatible debug interface preloaded with the open-source CMSIS-DAP
+  Interface firmware (mbed interface) for rapid prototyping and product
+  development.
+
+Serial Console
+==============
+
+  The primary serial port interface signals are PTB16 UART1_RX and PTB17
+  UART1_TX. These signals are connected to the OpenSDAv2 circuit.
+
+LEDs and Buttons
+================
+
+  RGB LED
+  -------
+  An RGB LED is connected through GPIO as shown below:
+
+    LED    K64
+    ------ -------------------------------------------------------
+    RED    PTB22/SPI2_SOUT/FB_AD29/CMP2_OUT
+    BLUE   PTB21/SPI2_SCK/FB_AD30/CMP1_OUT
+    GREEN  PTE26/ENET_1588_CLKIN/UART4_CTS_b/RTC_CLKOUT/USB0_CLKIN
+
+  If CONFIG_ARCH_LEDs is defined, then NuttX will control the LED on board the
+  Freedom KL25Z.  Usage of these LEDs is defined in include/board.h and
+  src/k64_leds.c.  The following definitions describe how NuttX controls the LEDs:
+
+    SYMBOL                Meaning                 LED state
+                                                  RED   GREEN  BLUE
+    -------------------  -----------------------  -----------------
+    LED_STARTED          NuttX has been started    OFF  OFF  OFF
+    LED_HEAPALLOCATE     Heap has been allocated   OFF  OFF  ON
+    LED_IRQSENABLED      Interrupts enabled        OFF  OFF  ON
+    LED_STACKCREATED     Idle stack created        OFF  ON   OFF
+    LED_INIRQ            In an interrupt          (no change)
+    LED_SIGNAL           In a signal handler      (no change)
+    LED_ASSERTION        An assertion failed      (no change)
+    LED_PANIC            The system has crashed    FLASH OFF OFF
+    LED_IDLE             K64 is in sleep mode     (Optional, not used)
 
 Development Environment
 =======================
@@ -293,29 +98,22 @@ Development Environment
 GNU Toolchain Options
 =====================
 
-  The NuttX make system has been modified to support the following different
-  toolchain options.
+  The NuttX make system supports several GNU-based toolchains under Linux,
+  Cygwin under Windows, and Windoes native.  To select a toolchain:
 
-  1. The CodeSourcery GNU toolchain,
-  2. The devkitARM GNU toolchain,
-  3. The NuttX buildroot Toolchain (see below).
+  1. Use 'make menuconfig' and select the toolchain that you are using
+     under the System Type menu.
+  2. The default toolchain is the NuttX buildroot under Linux or Cygwin:
 
-  All testing has been conducted using the CodeSourcery Windows toolchain.  To
-  use the devkitARM or the NuttX GNU toolchain, you simply need to change the
-  the following configuration options to your .config (or defconfig) file:
+    CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 
-    CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y  : CodeSourcery under Windows
-    CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y  : CodeSourcery under Linux
-    CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM=y      : devkitARM under Windows
-    CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y      : NuttX buildroot under Linux or Cygwin (default)
+     If you are not using CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT, then you may
+     also have to modify the PATH in the setenv.h file if your make cannot
+     find the tools.
 
-  If you are not using CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT, then you may also have to modify
-  the PATH in the setenv.h file if your make cannot find the tools.
-
-  NOTE: the CodeSourcery (for Windows) and devkitARM toolchains are
-  Windows native toolchains.  The CodeSourcey (for Linux) and NuttX buildroot
-  toolchains are Cygwin and/or Linux native toolchains. There are several limitations
-  to using a Windows based toolchain in a Cygwin environment.  The three biggest are:
+  NOTE:  Using native Windows toolchains under Cygwin has some limitations.
+  This incuudes the CodeSourcery (for Windows) and devkitARM toolchains are
+  Windows native toolchains.  The biggest limitations are:
 
   1. The Windows toolchain cannot follow Cygwin paths.  Path conversions are
      performed automatically in the Cygwin makefiles using the 'cygpath' utility
@@ -334,143 +132,8 @@ GNU Toolchain Options
 
      An alias in your .bashrc file might make that less painful.
 
-  NOTE 1: The CodeSourcery toolchain (2009q1) does not work with default optimization
-  level of -Os (See Make.defs).  It will work with -O0, -O1, or -O2, but not with
-  -Os.
-
-  NOTE 2: The devkitARM toolchain includes a version of MSYS make.  Make sure that
-  the paths to Cygwin's /bin and /usr/bin directories appear BEFORE the devkitARM
-  path or will get the wrong version of make.
-
-IDEs
-====
-
-  NuttX is built using command-line make.  It can be used with an IDE, but some
-  effort will be required to create the project.
-
-  Makefile Build
-  --------------
-  Under Eclipse, it is pretty easy to set up an "empty makefile project" and
-  simply use the NuttX makefile to build the system.  That is almost for free
-  under Linux.  Under Windows, you will need to set up the "Cygwin GCC" empty
-  makefile project in order to work with Windows (Google for "Eclipse Cygwin" -
-  there is a lot of help on the internet).
-
-  Native Build
-  ------------
-  Here are a few tips before you start that effort:
-
-  1) Select the toolchain that you will be using in your .config file
-  2) Start the NuttX build at least one time from the Cygwin command line
-     before trying to create your project.  This is necessary to create
-     certain auto-generated files and directories that will be needed.
-  3) Set up include pathes:  You will need include/, arch/arm/src/k40,
-     arch/arm/src/common, arch/arm/src/armv7-m, and sched/.
-  4) All assembly files need to have the definition option -D __ASSEMBLY__
-     on the command line.
-
-  Startup files will probably cause you some headaches.  The NuttX startup file
-  is arch/arm/src/kinetis/k40_vectors.S.
-
-NuttX EABI "buildroot" Toolchain
-================================
-
-  A GNU GCC-based toolchain is assumed.  The files */setenv.sh should
-  be modified to point to the correct path to the Cortex-M4 GCC toolchain (if
-  different from the default in your PATH variable).
-
-  If you have no Cortex-M4 toolchain, one can be downloaded from the NuttX
-  Bitbucket download site (https://bitbucket.org/nuttx/buildroot/downloads/).
-  This GNU toolchain builds and executes in the Linux or Cygwin environment.
-
-  NOTE:  The NuttX toolchain may not include optimizations for Cortex-M4 (ARMv7E-M).
-
-  1. You must have already configured Nuttx in /nuttx.
-
-     cd tools
-     ./configure.sh twr-k60n512/
-
-  2. Download the latest buildroot package into 
-
-  3. unpack the buildroot tarball.  The resulting directory may
-     have versioning information on it like buildroot-x.y.z.  If so,
-     rename /buildroot-x.y.z to /buildroot.
-
-  4. cd /buildroot
-
-  5. cp configs/cortexm3-eabi-defconfig-4.6.3 .config
-
-  6. make oldconfig
-
-  7. make
-
-  8. Edit setenv.h, if necessary, so that the PATH variable includes
-     the path to the newly built binaries.
-
-  See the file configs/README.txt in the buildroot source tree.  That has more
-  details PLUS some special instructions that you will need to follow if you are
-  building a Cortex-M4 toolchain for Cygwin under Windows.
-
-  NOTE:  Unfortunately, the 4.6.3 EABI toolchain is not compatible with the
-  the NXFLAT tools.  See the top-level TODO file (under "Binary loaders") for
-  more information about this problem. If you plan to use NXFLAT, please do not
-  use the GCC 4.6.3 EABI toochain; instead use the GCC 4.3.3 OABI toolchain.
-  See instructions below.
-
-NuttX OABI "buildroot" Toolchain
-================================
-
-  The older, OABI buildroot toolchain is also available.  To use the OABI
-  toolchain:
-
-  1. When building the buildroot toolchain, either (1) modify the cortexm3-eabi-defconfig-4.6.3
-     configuration to use EABI (using 'make menuconfig'), or (2) use an exising OABI
-     configuration such as cortexm3-defconfig-4.3.3
-
-  2. Modify the Make.defs file to use the OABI conventions:
-
-    +CROSSDEV = arm-nuttx-elf-
-    +ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
-    +NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
-    -CROSSDEV = arm-nuttx-eabi-
-    -ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
-    -NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
-
-NXFLAT Toolchain
-================
-
-  If you are *not* using the NuttX buildroot toolchain and you want to use
-  the NXFLAT tools, then you will still have to build a portion of the buildroot
-  tools -- just the NXFLAT tools.  The buildroot with the NXFLAT tools can
-  be downloaded from the NuttX Bitbucket download site
-  (https://bitbucket.org/nuttx/nuttx/downloads/).
-
-  This GNU toolchain builds and executes in the Linux or Cygwin environment.
-
-  1. You must have already configured Nuttx in /nuttx.
-
-     cd tools
-     ./configure.sh lpcxpresso-lpc1768/
-
-  2. Download the latest buildroot package into 
-
-  3. unpack the buildroot tarball.  The resulting directory may
-     have versioning information on it like buildroot-x.y.z.  If so,
-     rename /buildroot-x.y.z to /buildroot.
-
-  4. cd /buildroot
-
-  5. cp configs/cortexm3-defconfig-nxflat .config
-
-  6. make oldconfig
-
-  7. make
-
-  8. Edit setenv.h, if necessary, so that the PATH variable includes
-     the path to the newly builtNXFLAT binaries.
-
-TWR-K60N512-specific Configuration Options
-==========================================
+Freedom K64F Configuration Options
+==================================
 
     CONFIG_ARCH - Identifies the arch/ subdirectory.  This sould
        be set to:
@@ -487,21 +150,21 @@ TWR-K60N512-specific Configuration Options
 
     CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 
-       CONFIG_ARCH_CHIP=k40
+       CONFIG_ARCH_CHIP=kinetis
 
     CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
        chip:
 
-       CONFIG_ARCH_CHIP_MK60N512VMD100
+       CONFIG_ARCH_CHIP_MK64FN1M0VLL12
 
     CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
        hence, the board that supports the particular chip or SoC.
 
-       CONFIG_ARCH_BOARD=twr-k60n512 (for the TWR-K60N512 development board)
+       CONFIG_ARCH_BOARD="freedom-k64f" (for the Freedom K64F development board)
 
     CONFIG_ARCH_BOARD_name - For use in C code
 
-       CONFIG_ARCH_BOARD_TWR_K60N512=y
+       CONFIG_ARCH_BOARD_FREEDOM_K64F=y
 
     CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
        of delay loops
diff --git a/configs/freedom-k64f/include/board.h b/configs/freedom-k64f/include/board.h
index 4ce03acd93..57dd14a6c5 100644
--- a/configs/freedom-k64f/include/board.h
+++ b/configs/freedom-k64f/include/board.h
@@ -124,24 +124,30 @@
 #endif
 
 /* LED definitions ******************************************************************/
-/* The FREEDOM-K64F has four LEDs:
+/* The Freedom K64F has a single RGB LED driven by the K64F as follows:
  *
- * 1. E1 / Orange LED   PTA11
- * 2. E2 / Yellow LED   PTA28
- * 3. E3 / Green LED    PTA29
- * 4  E4 / Blue LED     PTA10
+ *   LED    K64
+ *   ------ -------------------------------------------------------
+ *   RED    PTB22/SPI2_SOUT/FB_AD29/CMP2_OUT
+ *   BLUE   PTB21/SPI2_SCK/FB_AD30/CMP1_OUT
+ *   GREEN  PTE26/ENET_1588_CLKIN/UART4_CTS_b/RTC_CLKOUT/USB0_CLKIN
  *
- * The 4 LEDs are encoded as follows:
- */
-
-#define LED_STARTED       0  /* LED1 */
-#define LED_HEAPALLOCATE  1  /* LED2 */
-#define LED_IRQSENABLED   2  /* LED1 + LED2 */
-#define LED_STACKCREATED  3  /* LED3 */
-#define LED_INIRQ         4  /* LED1 + LED3 */
-#define LED_SIGNAL        5  /* LED2 + LED3 */
-#define LED_ASSERTION     6  /* LED1 + LED2 + LED3 */
-#define LED_PANIC         7  /* N/C  + N/C  + N/C + LED4 */
+ * If CONFIG_ARCH_LEDs is defined, then NuttX will control the LED on board
+ * the Freedom K64F.  The following definitions describe how NuttX controls
+ * the LEDs:
+ *
+ *   SYMBOL                Meaning                 LED state
+ *                                                 RED   GREEN  BLUE
+ *   -------------------  -----------------------  -----------------   */
+#define LED_STARTED       1 /* NuttX has been started    OFF  OFF  OFF */
+#define LED_HEAPALLOCATE  2 /* Heap has been allocated   OFF  OFF  ON  */
+#define LED_IRQSENABLED   0 /* Interrupts enabled        OFF  OFF  ON  */
+#define LED_STACKCREATED  3 /* Idle stack created        OFF  ON   OFF */
+#define LED_INIRQ         0 /* In an interrupt          (no change)    */
+#define LED_SIGNAL        0 /* In a signal handler      (no change)    */
+#define LED_ASSERTION     0 /* An assertion failed      (no change)    */
+#define LED_PANIC         4 /* The system has crashed    FLASH OFF OFF */
+#undef  LED_IDLE            /* K64 is in sleep mode     (Not used)     */
 
 /* Button definitions ***************************************************************/
 /* The FREEDOM-K64F has user buttons (plus a reset button):
diff --git a/configs/freedom-k64f/src/Makefile b/configs/freedom-k64f/src/Makefile
index 05f58900fb..6abbedea70 100644
--- a/configs/freedom-k64f/src/Makefile
+++ b/configs/freedom-k64f/src/Makefile
@@ -39,7 +39,7 @@ ASRCS =
 CSRCS = k64_boot.c k64_spi.c
 
 ifeq ($(CONFIG_ARCH_LEDS),y)
-CSRCS += k64_leds.c
+CSRCS += k64_autoleds.c
 endif
 
 ifeq ($(CONFIG_ARCH_BUTTONS),y)
diff --git a/configs/freedom-k64f/src/freedom-k64f.h b/configs/freedom-k64f/src/freedom-k64f.h
index 0f90392bca..0b8f7d9c6b 100644
--- a/configs/freedom-k64f/src/freedom-k64f.h
+++ b/configs/freedom-k64f/src/freedom-k64f.h
@@ -62,52 +62,6 @@
 #endif
 
 /* FREEDOM-K64F GPIOs ****************************************************************/
-/* On-Board Connections
- * -------------------- ------------------------- -------- -------------------
- * FEATURE              CONNECTION                PORT/PIN PIN FUNCTION
- * -------------------- ------------------------- -------- -------------------
- * OSJTAG USB-to-serial OSJTAG Bridge RX Data     PTE9     UART5_RX
- * Bridge               OSJTAG Bridge TX Data     PTE8     UART5_TX
- * SD Card Slot         SD Clock                  PTE2     SDHC0_DCLK
- *                      SD Command                PTE3     SDHC0_CMD
- *                      SD Data0                  PTE1     SDHC0_D0
- *                      SD Data1                  PTE0     SDHC0_D1
- *                      SD Data2                  PTE5     SDHC0_D2
- *                      SD Data3                  PTE4     SDHC0_D3
- *                      SD Card Detect            PTE28    PTE28
- *                      SD Write Protect          PTE27    PTE27
- * Infrared Port        IR Transmit               PTD7     CMT_IRO
- *                      IR Receive                PTC6     CMP0_IN0
- * Pushbuttons          SW1 (IRQ0)                PTA19    PTA19
- *                      SW2 (IRQ1)                PTE26    PTE26
- *                      SW3 (RESET)               RESET_b  RESET_b
- * Touch Pads           E1 / Touch                PTA4     TSI0_CH5
- *                      E2 / Touch                PTB3     TSI0_CH8
- *                      E3 / Touch                PTB2     TSI0_CH7
- *                      E4 / Touch                PTB16    TSI0_CH9
- * LEDs                 E1 / Orange LED           PTA11    PTA11
- *                      E2 / Yellow LED           PTA28    PTA28
- *                      E3 / Green LED            PTA29    PTA29
- *                      E4 / Blue LED             PTA10    PTA10
- * Potentiometer        Potentiometer (R71)       ?        ADC1_DM1
- * Accelerometer        I2C SDA                   PTD9     I2C0_SDA
- *                      I2C SCL                   PTD8     I2C0_SCL
- *                      IRQ                       PTD10    PTD10
- * Touch Pad / Segment  Electrode 0 (J3 Pin 3)    PTB0     TSI0_CH0
- * LCD TWRPI Socket     Electrode 1 (J3 Pin 5)    PTB1     TSI0_CH6
- *                      Electrode 2 (J3 Pin 7)    PTB2     TSI0_CH7
- *                      Electrode 3 (J3 Pin 8)    PTB3     TSI0_CH8
- *                      Electrode 4 (J3 Pin 9)    PTC0     TSI0_CH13
- *                      Electrode 5 (J3 Pin 10)   PTC1     TSI0_CH14
- *                      Electrode 6 (J3 Pin 11)   PTC2     TSI0_CH15
- *                      Electrode 7 (J3 Pin 12)   PTA4     TSI0_CH5
- *                      Electrode 8 (J3 Pin 13)   PTB16    TSI0_CH9
- *                      Electrode 9 (J3 Pin 14)   PTB17    TSI0_CH10
- *                      Electrode 10 (J3 Pin 15)  PTB18    TSI0_CH11
- *                      Electrode 11 (J3 Pin 16)  PTB19    TSI0_CH12
- *                      TWRPI ID0 (J3 Pin 17)     ?        ADC1_DP1
- *                      TWRPI ID1 (J3 Pin 18)     ?        ADC1_SE16
- */
 
 #define GPIO_SD_CARDDETECT (GPIO_PULLUP | PIN_INT_BOTH | PIN_PORTE | PIN28)
 #define GPIO_SD_WRPROTECT  (GPIO_PULLUP | PIN_PORTE | PIN27)
@@ -115,148 +69,18 @@
 #define GPIO_SW1           (GPIO_PULLUP | PIN_INT_BOTH | PIN_PORTA | PIN19)
 #define GPIO_SW2           (GPIO_PULLUP | PIN_INT_BOTH | PIN_PORTE | PIN26)
 
-#define GPIO_LED1          (GPIO_LOWDRIVE | GPIO_OUTPUT_ZER0 | PIN_PORTA | PIN11)
-#define GPIO_LED2          (GPIO_LOWDRIVE | GPIO_OUTPUT_ZER0 | PIN_PORTA | PIN28)
-#define GPIO_LED3          (GPIO_LOWDRIVE | GPIO_OUTPUT_ZER0 | PIN_PORTA | PIN29)
-#define GPIO_LED4          (GPIO_LOWDRIVE | GPIO_OUTPUT_ZER0 | PIN_PORTA | PIN10)
-
-/* Connections via the General Purpose Tower Plug-in (TWRPI) Socket
- * -------------------- ------------------------- -------- -------------------
- * FEATURE             CONNECTION                 PORT/PIN PIN FUNCTION
- * -------------------- ------------------------- -------- -------------------
- * General Purpose      TWRPI AN0 (J4 Pin 8)       ?        ADC0_DP0/ADC1_DP3
- * TWRPI Socket         TWRPI AN1 (J4 Pin 9)       ?        ADC0_DM0/ADC1_DM3
- *                      TWRPI AN2 (J4 Pin 12)      ?        ADC1_DP0/ADC0_DP3
- *                      TWRPI ID0 (J4 Pin 17)      ?        ADC0_DP1
- *                      TWRPI ID1 (J4 Pin 18)      ?        ADC0_DM1
- *                      TWRPI I2C SCL (J5 Pin 3)   PTD8     I2C0_SCL
- *                      TWRPI I2C SDA (J5 Pin 4)   PTD9     I2C0_SDA
- *                      TWRPI SPI MISO (J5 Pin 9)  PTD14    SPI2_SIN
- *                      TWRPI SPI MOSI (J5 Pin 10) PTD13    SPI2_SOUT
- *                      TWRPI SPI SS (J5 Pin 11)   PTD15    SPI2_PCS0
- *                      TWRPI SPI CLK (J5 Pin 12)  PTD12    SPI2_SCK
- *                      TWRPI GPIO0 (J5 Pin 15)    PTD10    PTD10
- *                      TWRPI GPIO1 (J5 Pin 16)    PTB8     PTB8
- *                      TWRPI GPIO2 (J5 Pin 17)    PTB9     PTB9
- *                      TWRPI GPIO3 (J5 Pin 18)    PTA19    PTA19
- *                      TWRPI GPIO4 (J5 Pin 19)    PTE26    PTE26
- */
-
-/* Connections via the Tower Primary Connector Side A
- * --- -------------------- --------------------------------
- * PIN NAME                 USAGE
- * --- -------------------- --------------------------------
- * A7  SCL0                 PTD8
- * A8  SDA0                 PTD9
- * A9  GPIO9 / CTS1         PTC19
- * A10 GPIO8 / SDHC_D2      PTE5
- * A11 GPIO7 / SD_WP_DET    PTE27
- * A13 ETH_MDC              PTB1
- * A14 ETH_MDIO             PTB0
- * A16 ETH_RXDV             PTA14
- * A19 ETH_RXD1             PTA12
- * A20 ETH_RXD0             PTA13
- * A21 SSI_MCLK             PTE6
- * A22 SSI_BCLK             PTE12
- * A23 SSI_FS               PTE11
- * A24 SSI_RXD              PTE7
- * A25 SSI_TXD              PTE10
- * A27 AN3                  PGA0_DP/ADC0_DP0/ADC1_DP3
- * A28 AN2                  PGA0_DM/ADC0_DM0/ADC1_DM3
- * A29 AN1                  PGA1_DP/ADC1_DP0/ADC0_DP3
- * A30 AN0                  PGA1_DM/ADC1_DM0/ADC0_DM3
- * A33 TMR1                 PTA9
- * A34 TMR0                 PTA8
- * A35 GPIO6                PTB9
- * A37 PWM3                 PTA6
- * A38 PWM2                 PTC3
- * A39 PWM1                 PTC2
- * A40 PWM0                 PTC1
- * A41 RXD0                 PTE25
- * A42 TXD0                 PTE24
- * A43 RXD1                 PTC16
- * A44 TXD1                 PTC17
- * A64 CLKOUT0              PTC3
- * A66 EBI_AD14             PTC0
- * A67 EBI_AD13             PTC1
- * A68 EBI_AD12             PTC2
- * A69 EBI_AD11             PTC4
- * A70 EBI_AD10             PTC5
- * A71 EBI_AD9              PTC6
- * A71 EBI_R/W_b            PTC11
- * A72 EBI_AD8              PTC7
- * A73 EBI_AD7              PTC8
- * A74 EBI_AD6              PTC9
- * A75 EBI_AD5              PTC10
- * A76 EBI_AD4              PTD2
- * A77 EBI_AD3              PTD3
- * A78 EBI_AD2              PTD4
- * A79 EBI_AD1              PTD5
- * A80 EBI_AD0              PTD6
+/* An RGB LED is connected through GPIO as shown below:
+ *
+ *   LED    K64
+ *   ------ -------------------------------------------------------
+ *   RED    PTB22/SPI2_SOUT/FB_AD29/CMP2_OUT
+ *   BLUE   PTB21/SPI2_SCK/FB_AD30/CMP1_OUT
+ *   GREEN  PTE26/ENET_1588_CLKIN/UART4_CTS_b/RTC_CLKOUT/USB0_CLKIN
  */
 
-/* Connections via the Tower Primary Connector Side B
- * --- -------------------- --------------------------------
- * PIN NAME                 USAGE
- * --- -------------------- --------------------------------
- * B7  SDHC_CLK / SPI1_CLK  PTE2
- * B9  SDHC_D3 / SPI1_CS0_b PTE4
- * B10 SDHC_CMD / SPI1_MOSI PTE1
- * B11 SDHC_D0 / SPI1_MISO  PTE3
- * B13 ETH_RXER             PTA5
- * B15 ETH_TXEN             PTA15
- * B19 ETH_TXD1             PTA17
- * B20 ETH_TXD0             PTA16
- * B21 GPIO1 / RTS1         PTC18
- * B22 GPIO2 / SDHC_D1      PTE0
- * B23 GPIO3                PTE28
- * B24 CLKIN0               PTA18
- * B25 CLKOUT1              PTE26
- * B27 AN7                  PTB7
- * B28 AN6                  PTB6
- * B29 AN5                  PTB5
- * B30 AN4                  PTB4
- * B34 TMR2                 PTD6
- * B35 GPIO4                PTB8
- * B37 PWM7                 PTA2
- * B38 PWM6                 PTA1
- * B39 PWM5                 PTD5
- * B40 PWM4                 PTA7
- * B41 CANRX0               PTE25
- * B42 CANTX0               PTE24
- * B44 SPI0_MISO            PTD14
- * B45 SPI0_MOSI            PTD13
- * B46 SPI0_CS0_b           PTD11
- * B47 SPI0_CS1_b           PTD15
- * B48 SPI0_CLK             PTD12
- * B50 SCL1                 PTD8
- * B51 SDA1                 PTD9
- * B52 GPIO5 / SD_CARD_DET  PTE28
- * B55 IRQ_H                PTA24
- * B56 IRQ_G                PTA24
- * B57 IRQ_F                PTA25
- * B58 IRQ_E                PTA25
- * B59 IRQ_D                PTA26
- * B60 IRQ_C                PTA26
- * B61 IRQ_B                PTA27
- * B62 IRQ_A                PTA27
- * B63 EBI_ALE / EBI_CS1_b  PTD0
- * B64 EBI_CS0_b            PTD1
- * B66 EBI_AD15             PTB18
- * B67 EBI_AD16             PTB17
- * B68 EBI_AD17             PTB16
- * B69 EBI_AD18             PTB11
- * B70 EBI_AD19             PTB10
- * B72 EBI_OE_b             PTB19
- * B73 EBI_D7               PTB20
- * B74 EBI_D6               PTB21
- * B75 EBI_D5               PTB22
- * B76 EBI_D4               PTB23
- * B77 EBI_D3               PTC12
- * B78 EBI_D2               PTC13
- * B79 EBI_D1               PTC14
- * B80 EBI_D0               PTC15
- */
+#define GPIO_LED_R         (GPIO_LOWDRIVE | GPIO_OUTPUT_ONE | PIN_PORTB | PIN22)
+#define GPIO_LED_G         (GPIO_LOWDRIVE | GPIO_OUTPUT_ONE | PIN_PORTB | PIN21)
+#define GPIO_LED_B         (GPIO_LOWDRIVE | GPIO_OUTPUT_ONE | PIN_PORTE | PIN26)
 
 /************************************************************************************
  * Public Types
diff --git a/configs/freedom-k64f/src/k64_autoleds.c b/configs/freedom-k64f/src/k64_autoleds.c
new file mode 100644
index 0000000000..5fb416f208
--- /dev/null
+++ b/configs/freedom-k64f/src/k64_autoleds.c
@@ -0,0 +1,162 @@
+/****************************************************************************
+ * configs/freedom-k64f/src/k64_autoleds.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.
+ *
+ ****************************************************************************/
+/* The Freedom K64F has a single RGB LED driven by the K64F as follows:
+ *
+ *   LED    K64
+ *   ------ -------------------------------------------------------
+ *   RED    PTB22/SPI2_SOUT/FB_AD29/CMP2_OUT
+ *   BLUE   PTB21/SPI2_SCK/FB_AD30/CMP1_OUT
+ *   GREEN  PTE26/ENET_1588_CLKIN/UART4_CTS_b/RTC_CLKOUT/USB0_CLKIN
+ *
+ * If CONFIG_ARCH_LEDs is defined, then NuttX will control the LED on board
+ * the Freedom K64F.  The following definitions describe how NuttX controls
+ * the LEDs:
+ *
+ *   SYMBOL                Meaning                 LED state
+ *                                                 RED   GREEN  BLUE
+ *   -------------------  -----------------------  -----------------
+ *   LED_STARTED          NuttX has been started    OFF  OFF  OFF
+ *   LED_HEAPALLOCATE     Heap has been allocated   OFF  OFF  ON
+ *   LED_IRQSENABLED      Interrupts enabled        OFF  OFF  ON
+ *   LED_STACKCREATED     Idle stack created        OFF  ON   OFF
+ *   LED_INIRQ            In an interrupt          (no change)
+ *   LED_SIGNAL           In a signal handler      (no change)
+ *   LED_ASSERTION        An assertion failed      (no change)
+ *   LED_PANIC            The system has crashed    FLASH OFF OFF
+ *   LED_IDLE             K64 is in sleep mode     (Optional, not used)
+ */
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include 
+
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+#include "chip.h"
+#include "kinetis.h"
+#include "freedom-k64f.h"
+
+#ifdef CONFIG_ARCH_LEDS
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Summary of all possible settings */
+
+#define LED_NOCHANGE      0 /* LED_IRQSENABLED, LED_INIRQ, LED_SIGNAL, LED_ASSERTION */
+#define LED_OFF_OFF_OFF   1 /* LED_STARTED */
+#define LED_OFF_OFF_ON    2 /* LED_HEAPALLOCATE */
+#define LED_OFF_ON_OFF    3 /* LED_STACKCREATED */
+#define LED_ON_OFF_OFF    4 /* LED_PANIC */
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: board_autoled_initialize
+ *
+ * Description:
+ *   Initialize the on-board LED
+ *
+ ****************************************************************************/
+
+void board_autoled_initialize(void)
+{
+  kinetis_pinconfig(GPIO_LED_R);
+  kinetis_pinconfig(GPIO_LED_G);
+  kinetis_pinconfig(GPIO_LED_B);
+}
+
+/****************************************************************************
+ * Name: board_autoled_on
+ ****************************************************************************/
+
+void board_autoled_on(int led)
+{
+  if (led != LED_NOCHANGE)
+    {
+      bool redoff   = true;
+      bool greenoff = true;
+      bool blueoff  = true;
+
+      switch (led)
+        {
+          default:
+          case LED_OFF_OFF_OFF:
+            break;
+
+          case LED_OFF_OFF_ON:
+            blueoff = false;
+            break;
+
+          case LED_OFF_ON_OFF:
+            greenoff = false;
+            break;
+
+          case LED_ON_OFF_OFF:
+            redoff = false;
+            break;
+        }
+
+      kinetis_gpiowrite(GPIO_LED_R, redoff);
+      kinetis_gpiowrite(GPIO_LED_G, greenoff);
+      kinetis_gpiowrite(GPIO_LED_B, blueoff);
+    }
+}
+
+/****************************************************************************
+ * Name: board_autoled_off
+ ****************************************************************************/
+
+void board_autoled_off(int led)
+{
+  if (led == LED_ON_OFF_OFF)
+    {
+      kinetis_gpiowrite(GPIO_LED_R, true);
+      kinetis_gpiowrite(GPIO_LED_G, true);
+      kinetis_gpiowrite(GPIO_LED_B, true);
+    }
+}
+
+#endif /* CONFIG_ARCH_LEDS */
diff --git a/configs/freedom-k64f/src/k64_leds.c b/configs/freedom-k64f/src/k64_leds.c
deleted file mode 100644
index da05edc848..0000000000
--- a/configs/freedom-k64f/src/k64_leds.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/****************************************************************************
- * configs/freedom-k64f/src/k64_leds.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 
-
-#include "kinetis.h"
-#include "freedom-k64f.h"
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/* The FREEDOM-K64F has four LEDs:
- *
- * 1. E1 / Orange LED   PTA11
- * 2. E2 / Yellow LED   PTA28
- * 3. E3 / Green LED    PTA29
- * 4  E4 / Blue LED     PTA10
- */
-
-/* The following definitions map the encoded LED setting to GPIO settings */
-
-#define K64_LED1          (1 << 0)
-#define K64_LED2          (1 << 1)
-#define K64_LED3          (1 << 2)
-#define K64_LED4          (1 << 3)
-
-#define ON_SETBITS_SHIFT  (0)
-#define ON_CLRBITS_SHIFT  (4)
-#define OFF_SETBITS_SHIFT (8)
-#define OFF_CLRBITS_SHIFT (12)
-
-#define ON_BITS(v)        ((v) & 0xff)
-#define OFF_BITS(v)       (((v) >> 8) & 0x0ff)
-#define SETBITS(b)        ((b) & 0x0f)
-#define CLRBITS(b)        (((b) >> 4) & 0x0f)
-
-#define ON_SETBITS(v)     (SETBITS(ON_BITS(v))
-#define ON_CLRBITS(v)     (CLRBITS(ON_BITS(v))
-#define OFF_SETBITS(v)    (SETBITS(OFF_BITS(v))
-#define OFF_CLRBITS(v)    (CLRBITS(OFF_BITS(v))
-
-#define LED_STARTED_ON_SETBITS       ((K64_LED1) << ON_SETBITS_SHIFT)
-#define LED_STARTED_ON_CLRBITS       ((K64_LED2|K64_LED3|K64_LED4) << ON_CLRBITS_SHIFT)
-#define LED_STARTED_OFF_SETBITS      (0 << OFF_SETBITS_SHIFT)
-#define LED_STARTED_OFF_CLRBITS      ((K64_LED1|K64_LED2|K64_LED3|K64_LED4) << OFF_CLRBITS_SHIFT)
-
-#define LED_HEAPALLOCATE_ON_SETBITS  ((K64_LED2) << ON_SETBITS_SHIFT)
-#define LED_HEAPALLOCATE_ON_CLRBITS  ((K64_LED1|K64_LED3|K64_LED4) << ON_CLRBITS_SHIFT)
-#define LED_HEAPALLOCATE_OFF_SETBITS ((K64_LED1) << OFF_SETBITS_SHIFT)
-#define LED_HEAPALLOCATE_OFF_CLRBITS ((K64_LED2|K64_LED3|K64_LED4) << OFF_CLRBITS_SHIFT)
-
-#define LED_IRQSENABLED_ON_SETBITS   ((K64_LED1|K64_LED2) << ON_SETBITS_SHIFT)
-#define LED_IRQSENABLED_ON_CLRBITS   ((K64_LED3|K64_LED4) << ON_CLRBITS_SHIFT)
-#define LED_IRQSENABLED_OFF_SETBITS  ((K64_LED2) << OFF_SETBITS_SHIFT)
-#define LED_IRQSENABLED_OFF_CLRBITS  ((K64_LED1|K64_LED3|K64_LED4) << OFF_CLRBITS_SHIFT)
-
-#define LED_STACKCREATED_ON_SETBITS  ((K64_LED3) << ON_SETBITS_SHIFT)
-#define LED_STACKCREATED_ON_CLRBITS  ((K64_LED1|K64_LED2|K64_LED4) << ON_CLRBITS_SHIFT)
-#define LED_STACKCREATED_OFF_SETBITS ((K64_LED1|K64_LED2) << OFF_SETBITS_SHIFT)
-#define LED_STACKCREATED_OFF_CLRBITS ((K64_LED3|K64_LED4) << OFF_CLRBITS_SHIFT)
-
-#define LED_INIRQ_ON_SETBITS         ((K64_LED1) << ON_SETBITS_SHIFT)
-#define LED_INIRQ_ON_CLRBITS         ((0) << ON_CLRBITS_SHIFT)
-#define LED_INIRQ_OFF_SETBITS        ((0) << OFF_SETBITS_SHIFT)
-#define LED_INIRQ_OFF_CLRBITS        ((K64_LED1) << OFF_CLRBITS_SHIFT)
-
-#define LED_SIGNAL_ON_SETBITS        ((K64_LED2) << ON_SETBITS_SHIFT)
-#define LED_SIGNAL_ON_CLRBITS        ((0) << ON_CLRBITS_SHIFT)
-#define LED_SIGNAL_OFF_SETBITS       ((0) << OFF_SETBITS_SHIFT)
-#define LED_SIGNAL_OFF_CLRBITS       ((K64_LED2) << OFF_CLRBITS_SHIFT)
-
-#define LED_ASSERTION_ON_SETBITS     ((K64_LED4) << ON_SETBITS_SHIFT)
-#define LED_ASSERTION_ON_CLRBITS     ((0) << ON_CLRBITS_SHIFT)
-#define LED_ASSERTION_OFF_SETBITS    ((0) << OFF_SETBITS_SHIFT)
-#define LED_ASSERTION_OFF_CLRBITS    ((K64_LED4) << OFF_CLRBITS_SHIFT)
-
-#define LED_PANIC_ON_SETBITS         ((K64_LED4) << ON_SETBITS_SHIFT)
-#define LED_PANIC_ON_CLRBITS         ((0) << ON_CLRBITS_SHIFT)
-#define LED_PANIC_OFF_SETBITS        ((0) << OFF_SETBITS_SHIFT)
-#define LED_PANIC_OFF_CLRBITS        ((K64_LED4) << OFF_CLRBITS_SHIFT)
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-static const uint16_t g_ledbits[8] =
-{
-  (LED_STARTED_ON_SETBITS       | LED_STARTED_ON_CLRBITS |
-   LED_STARTED_OFF_SETBITS      | LED_STARTED_OFF_CLRBITS),
-
-  (LED_HEAPALLOCATE_ON_SETBITS  | LED_HEAPALLOCATE_ON_CLRBITS |
-   LED_HEAPALLOCATE_OFF_SETBITS | LED_HEAPALLOCATE_OFF_CLRBITS),
-
-  (LED_IRQSENABLED_ON_SETBITS   | LED_IRQSENABLED_ON_CLRBITS |
-   LED_IRQSENABLED_OFF_SETBITS  | LED_IRQSENABLED_OFF_CLRBITS),
-
-  (LED_STACKCREATED_ON_SETBITS  | LED_STACKCREATED_ON_CLRBITS |
-   LED_STACKCREATED_OFF_SETBITS | LED_STACKCREATED_OFF_CLRBITS),
-
-  (LED_INIRQ_ON_SETBITS         | LED_INIRQ_ON_CLRBITS |
-   LED_INIRQ_OFF_SETBITS        | LED_INIRQ_OFF_CLRBITS),
-
-  (LED_SIGNAL_ON_SETBITS        | LED_SIGNAL_ON_CLRBITS |
-   LED_SIGNAL_OFF_SETBITS       | LED_SIGNAL_OFF_CLRBITS),
-
-  (LED_ASSERTION_ON_SETBITS     | LED_ASSERTION_ON_CLRBITS |
-   LED_ASSERTION_OFF_SETBITS    | LED_ASSERTION_OFF_CLRBITS),
-
-  (LED_PANIC_ON_SETBITS         | LED_PANIC_ON_CLRBITS |
-   LED_PANIC_OFF_SETBITS        | LED_PANIC_OFF_CLRBITS)
-};
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-static inline void led_clrbits(unsigned int clrbits)
-{
-  if ((clrbits & K64_LED1) != 0)
-    {
-      kinetis_gpiowrite(GPIO_LED1, false);
-    }
-
-  if ((clrbits & K64_LED2) != 0)
-    {
-      kinetis_gpiowrite(GPIO_LED2, false);
-    }
-
-  if ((clrbits & K64_LED3) != 0)
-    {
-      kinetis_gpiowrite(GPIO_LED3, false);
-    }
-
-  if ((clrbits & K64_LED4) != 0)
-    {
-      kinetis_gpiowrite(GPIO_LED4, false);
-    }
-}
-
-static inline void led_setbits(unsigned int setbits)
-{
-  if ((setbits & K64_LED1) != 0)
-    {
-      kinetis_gpiowrite(GPIO_LED1, true);
-    }
-
-  if ((setbits & K64_LED2) != 0)
-    {
-      kinetis_gpiowrite(GPIO_LED2, true);
-    }
-
-  if ((setbits & K64_LED3) != 0)
-    {
-      kinetis_gpiowrite(GPIO_LED3, true);
-    }
-
-  if ((setbits & K64_LED4) != 0)
-    {
-      kinetis_gpiowrite(GPIO_LED4, true);
-    }
-}
-
-static void led_setonoff(unsigned int bits)
-{
-  led_clrbits(CLRBITS(bits));
-  led_setbits(SETBITS(bits));
-}
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: board_autoled_initialize
- *
- * Description:
- *   Initialize LED GPIOs so that LEDs can be controlled.
- *
- ****************************************************************************/
-
-#ifdef CONFIG_ARCH_LEDS
-void board_autoled_initialize(void)
-{
-   /* Configure LED1-4 GPIOs for output */
-
-   kinetis_pinconfig(GPIO_LED1);
-   kinetis_pinconfig(GPIO_LED2);
-   kinetis_pinconfig(GPIO_LED3);
-   kinetis_pinconfig(GPIO_LED4);
-}
-
-/****************************************************************************
- * Name: board_autoled_on
- ****************************************************************************/
-
-void board_autoled_on(int led)
-{
-  led_setonoff(ON_BITS(g_ledbits[led]));
-}
-
-/****************************************************************************
- * Name: board_autoled_off
- ****************************************************************************/
-
-void board_autoled_off(int led)
-{
-  led_setonoff(OFF_BITS(g_ledbits[led]));
-}
-
-#endif /* CONFIG_ARCH_LEDS */
diff --git a/configs/teensy-3.x/src/k20_autoleds.c b/configs/teensy-3.x/src/k20_autoleds.c
index 67ce3776a3..7682bab7f5 100644
--- a/configs/teensy-3.x/src/k20_autoleds.c
+++ b/configs/teensy-3.x/src/k20_autoleds.c
@@ -48,18 +48,6 @@
 
 #ifdef CONFIG_ARCH_LEDS
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
-- 
GitLab


From 966a6d3ba2f47d32e1682bb320e4fb68733f8eab Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sat, 2 Jul 2016 08:07:08 -0600
Subject: [PATCH 131/229] Freedom K64F: Add user LED support.

---
 configs/freedom-k64f/include/board.h    |  19 ++++-
 configs/freedom-k64f/src/Makefile       |   2 +
 configs/freedom-k64f/src/k64_userleds.c | 109 ++++++++++++++++++++++++
 3 files changed, 129 insertions(+), 1 deletion(-)
 create mode 100644 configs/freedom-k64f/src/k64_userleds.c

diff --git a/configs/freedom-k64f/include/board.h b/configs/freedom-k64f/include/board.h
index 57dd14a6c5..1e3211e6b1 100644
--- a/configs/freedom-k64f/include/board.h
+++ b/configs/freedom-k64f/include/board.h
@@ -132,7 +132,24 @@
  *   BLUE   PTB21/SPI2_SCK/FB_AD30/CMP1_OUT
  *   GREEN  PTE26/ENET_1588_CLKIN/UART4_CTS_b/RTC_CLKOUT/USB0_CLKIN
  *
- * If CONFIG_ARCH_LEDs is defined, then NuttX will control the LED on board
+ * If CONFIG_ARCH_LEDS is not defined, then the user can control the LEDs in any
+ * way.  The following definitions are used to access individual LEDs.
+ */
+
+/* LED index values for use with board_userled() */
+
+#define BOARD_LED_R       0
+#define BOARD_LED_G       1
+#define BOARD_LED_B       2
+#define BOARD_NLEDS       3
+
+/* LED bits for use with board_userled_all() */
+
+#define BOARD_LED_R_BIT   (1 << BOARD_LED_R)
+#define BOARD_LED_G_BIT   (1 << BOARD_LED_G)
+#define BOARD_LED_B_BIT   (1 << BOARD_LED_B)
+
+/* If CONFIG_ARCH_LEDs is defined, then NuttX will control the LED on board
  * the Freedom K64F.  The following definitions describe how NuttX controls
  * the LEDs:
  *
diff --git a/configs/freedom-k64f/src/Makefile b/configs/freedom-k64f/src/Makefile
index 6abbedea70..d980101d39 100644
--- a/configs/freedom-k64f/src/Makefile
+++ b/configs/freedom-k64f/src/Makefile
@@ -40,6 +40,8 @@ CSRCS = k64_boot.c k64_spi.c
 
 ifeq ($(CONFIG_ARCH_LEDS),y)
 CSRCS += k64_autoleds.c
+else
+CSRCS += k64_userleds.c
 endif
 
 ifeq ($(CONFIG_ARCH_BUTTONS),y)
diff --git a/configs/freedom-k64f/src/k64_userleds.c b/configs/freedom-k64f/src/k64_userleds.c
new file mode 100644
index 0000000000..48a396a3ce
--- /dev/null
+++ b/configs/freedom-k64f/src/k64_userleds.c
@@ -0,0 +1,109 @@
+/****************************************************************************
+ * configs/freedom-k64f/src/k64_userleds.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 
+#include 
+
+#include 
+#include 
+
+#include "chip.h"
+#include "kinetis.h"
+#include "freedom-k64f.h"
+
+#ifndef CONFIG_ARCH_LEDS
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: board_userled_initialize
+ ****************************************************************************/
+
+void board_userled_initialize(void)
+{
+  kinetis_pinconfig(GPIO_LED_R);
+  kinetis_pinconfig(GPIO_LED_G);
+  kinetis_pinconfig(GPIO_LED_B);
+}
+
+/****************************************************************************
+ * Name: board_userled
+ ****************************************************************************/
+
+void board_userled(int led, bool ledon)
+{
+  uint32_t ledcfg;
+
+  if (led == BOARD_LED_R)
+    {
+      ledcfg = GPIO_LED_R;
+    }
+  else if (led == BOARD_LED_G)
+    {
+      ledcfg = GPIO_LED_G;
+    }
+  else if (led == BOARD_LED_B)
+    {
+      ledcfg = GPIO_LED_B;
+    }
+  else
+    {
+      return;
+    }
+
+  kinetis_gpiowrite(ledcfg, !ledon); /* Low illuminates */
+}
+
+/****************************************************************************
+ * Name: board_userled_all
+ ****************************************************************************/
+
+void board_userled_all(uint8_t ledset)
+{
+  /* Low illuminates */
+
+  kinetis_gpiowrite(GPIO_LED_R, (ledset & BOARD_LED_R_BIT) == 0);
+  kinetis_gpiowrite(GPIO_LED_G, (ledset & BOARD_LED_G_BIT) == 0);
+  kinetis_gpiowrite(GPIO_LED_B, (ledset & BOARD_LED_B_BIT) == 0);
+}
-- 
GitLab


From adbbca0bfc20b023504ab055a3c0cf4ba3b42100 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sat, 2 Jul 2016 08:18:42 -0600
Subject: [PATCH 132/229] Freedom K64F: Correct button support

---
 configs/freedom-k64f/README.txt         | 12 ++++++++++
 configs/freedom-k64f/include/board.h    | 19 ++++++++++------
 configs/freedom-k64f/src/freedom-k64f.h | 25 +++++++++++++++++----
 configs/freedom-k64f/src/k64_buttons.c  | 29 +++++++++++++++----------
 4 files changed, 62 insertions(+), 23 deletions(-)

diff --git a/configs/freedom-k64f/README.txt b/configs/freedom-k64f/README.txt
index 45034c8056..7ec86c49a0 100644
--- a/configs/freedom-k64f/README.txt
+++ b/configs/freedom-k64f/README.txt
@@ -87,6 +87,18 @@ LEDs and Buttons
     LED_PANIC            The system has crashed    FLASH OFF OFF
     LED_IDLE             K64 is in sleep mode     (Optional, not used)
 
+  Buttons
+  -------
+  Two push buttons, SW2 and SW3, are available on FRDM-K64F board, where
+  SW2 is connected to PTC6 and SW3 is connected to PTA4. Besides the
+  general purpose input/output functions, SW2 and SW3 can be low-power
+  wake up signal. Also, only SW3 can be a non-maskable interrupt.
+
+  Switch    GPIO Function
+  --------- ---------------------------------------------------------------
+  SW2       PTC6/SPI0_SOUT/PD0_EXTRG/I2S0_RX_BCLK/FB_AD9/I2S0_MCLK/LLWU_P10
+  SW3       PTA4/FTM0_CH1/NMI_b/LLWU_P3
+
 Development Environment
 =======================
 
diff --git a/configs/freedom-k64f/include/board.h b/configs/freedom-k64f/include/board.h
index 1e3211e6b1..3f3e089062 100644
--- a/configs/freedom-k64f/include/board.h
+++ b/configs/freedom-k64f/include/board.h
@@ -167,17 +167,22 @@
 #undef  LED_IDLE            /* K64 is in sleep mode     (Not used)     */
 
 /* Button definitions ***************************************************************/
-/* The FREEDOM-K64F has user buttons (plus a reset button):
+/* Two push buttons, SW2 and SW3, are available on FRDM-K64F board, where SW2 is
+ * connected to PTC6 and SW3 is connected to PTA4. Besides the general purpose
+ * input/output functions, SW2 and SW3 can be low-power wake up signal. Also, only
+ * SW3 can be a non-maskable interrupt.
  *
- * 1. SW1 (IRQ0)   PTA19
- * 2. SW2 (IRQ1)   PTE26
+ *   Switch    GPIO Function
+ *   --------- ---------------------------------------------------------------
+ *   SW2       PTC6/SPI0_SOUT/PD0_EXTRG/I2S0_RX_BCLK/FB_AD9/I2S0_MCLK/LLWU_P10
+ *   SW3       PTA4/FTM0_CH1/NMI_b/LLWU_P3
  */
 
-#define BUTTON_SW1        0
-#define BUTTON_SW2        1
+#define BUTTON_SW2        0
+#define BUTTON_SW3        1
 
-#define BUTTON_SW1_BIT    (1 << BUTTON_WAKEUP)
-#define BUTTON_SW2_BIT    (1 << BUTTON_TAMPER)
+#define BUTTON_SW2_BIT    (1 << BUTTON_WAKEUP)
+#define BUTTON_SW3_BIT    (1 << BUTTON_TAMPER)
 
 /* Alternative pin resolution *******************************************************/
 /* If there are alternative configurations for various pins in the
diff --git a/configs/freedom-k64f/src/freedom-k64f.h b/configs/freedom-k64f/src/freedom-k64f.h
index 0b8f7d9c6b..7a6eeef964 100644
--- a/configs/freedom-k64f/src/freedom-k64f.h
+++ b/configs/freedom-k64f/src/freedom-k64f.h
@@ -62,12 +62,29 @@
 #endif
 
 /* FREEDOM-K64F GPIOs ****************************************************************/
+/* A micro Secure Digital (SD) card slot is available on the FRDM-K64F connected to
+ * the SD Host Controller (SDHC) signals of the MCU. This slot will accept micro
+ * format SD memory cards. The SD card detect pin (PTE6) is an open switch that
+ * shorts with VDD when card is inserted.
+ *
+ * There is no Write Protect pin available to the K64F.
+ */
+
+#define GPIO_SD_CARDDETECT (GPIO_PULLUP | PIN_INT_BOTH | PIN_PORTE | PIN6)
 
-#define GPIO_SD_CARDDETECT (GPIO_PULLUP | PIN_INT_BOTH | PIN_PORTE | PIN28)
-#define GPIO_SD_WRPROTECT  (GPIO_PULLUP | PIN_PORTE | PIN27)
+/* Two push buttons, SW2 and SW3, are available on FRDM-K64F board, where SW2 is
+ * connected to PTC6 and SW3 is connected to PTA4. Besides the general purpose
+ * input/output functions, SW2 and SW3 can be low-power wake up signal. Also, only
+ * SW3 can be a non-maskable interrupt.
+ *
+ *   Switch    GPIO Function
+ *   --------- ---------------------------------------------------------------
+ *   SW2       PTC6/SPI0_SOUT/PD0_EXTRG/I2S0_RX_BCLK/FB_AD9/I2S0_MCLK/LLWU_P10
+ *   SW3       PTA4/FTM0_CH1/NMI_b/LLWU_P3
+ */
 
-#define GPIO_SW1           (GPIO_PULLUP | PIN_INT_BOTH | PIN_PORTA | PIN19)
-#define GPIO_SW2           (GPIO_PULLUP | PIN_INT_BOTH | PIN_PORTE | PIN26)
+#define GPIO_SW2           (GPIO_PULLUP | PIN_INT_BOTH | PIN_PORTC | PIN6)
+#define GPIO_SW3           (GPIO_PULLUP | PIN_INT_BOTH | PIN_PORTA | PIN4)
 
 /* An RGB LED is connected through GPIO as shown below:
  *
diff --git a/configs/freedom-k64f/src/k64_buttons.c b/configs/freedom-k64f/src/k64_buttons.c
index a8d5c3dcce..f1f4ba8847 100644
--- a/configs/freedom-k64f/src/k64_buttons.c
+++ b/configs/freedom-k64f/src/k64_buttons.c
@@ -53,10 +53,15 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* The TWR-K60N512 has user buttons (plus a reset button):
+/* Two push buttons, SW2 and SW3, are available on FRDM-K64F board, where SW2 is
+ * connected to PTC6 and SW3 is connected to PTA4. Besides the general purpose
+ * input/output functions, SW2 and SW3 can be low-power wake up signal. Also, only
+ * SW3 can be a non-maskable interrupt.
  *
- * 1. SW1 (IRQ0)   PTA19
- * 2. SW2 (IRQ1)   PTE26
+ *   Switch    GPIO Function
+ *   --------- ---------------------------------------------------------------
+ *   SW2       PTC6/SPI0_SOUT/PD0_EXTRG/I2S0_RX_BCLK/FB_AD9/I2S0_MCLK/LLWU_P10
+ *   SW3       PTA4/FTM0_CH1/NMI_b/LLWU_P3
  */
 
 /****************************************************************************
@@ -78,8 +83,8 @@ void board_button_initialize(void)
 {
    /* Configure the two buttons as inputs */
 
-   kinetis_pinconfig(GPIO_SW1);
    kinetis_pinconfig(GPIO_SW2);
+   kinetis_pinconfig(GPIO_SW3);
 }
 
 /****************************************************************************
@@ -90,14 +95,14 @@ uint8_t board_buttons(void)
 {
   uint8_t ret = 0;
 
-  if (kinetis_gpioread(GPIO_SW1))
+  if (kinetis_gpioread(GPIO_SW2))
     {
-      ret |= BUTTON_SW1_BIT;
+      ret |= BUTTON_SW2_BIT;
     }
 
-  if (kinetis_gpioread(GPIO_SW2))
+  if (kinetis_gpioread(GPIO_SW3))
     {
-      ret |= BUTTON_SW2_BIT;
+      ret |= BUTTON_SW3_BIT;
     }
 
   return ret
@@ -135,13 +140,13 @@ xcpt_t board_button_irq(int id, xcpt_t irqhandler)
 
   /* Map the button id to the GPIO bit set. */
 
-  if (id == BUTTON_SW1)
+  if (id == BUTTON_SW2)
     {
-      pinset = GPIO_SW1;
+      pinset = GPIO_SW2;
     }
-  else if (id == BUTTON_SW2)
+  else if (id == BUTTON_SW3)
     {
-      pinset = GPIO_SW2;
+      pinset = GPIO_SW3;
     }
   else
     {
-- 
GitLab


From 042c9d0b38bc436f09e30368b00a2a7558e39d58 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sat, 2 Jul 2016 09:04:27 -0600
Subject: [PATCH 133/229] Update some C comments

---
 configs/freedom-k64f/include/board.h | 214 +--------------------------
 1 file changed, 8 insertions(+), 206 deletions(-)

diff --git a/configs/freedom-k64f/include/board.h b/configs/freedom-k64f/include/board.h
index 3f3e089062..036b5ec186 100644
--- a/configs/freedom-k64f/include/board.h
+++ b/configs/freedom-k64f/include/board.h
@@ -50,7 +50,13 @@
  ************************************************************************************/
 
 /* Clocking *************************************************************************/
-/* The K60 tower board uses a 50MHz external clock */
+/* The Freedom K64F uses a 50MHz external clock from the Micrel Ethernet PHY.  The
+ * Kinetis MCU startup from an internal digitally-controlled oscillator (DCO). Nuttx
+ * will enable the main external oscillator (EXTAL0/XTAL0).   The external
+ * oscillator/resonator can range from 32.768 KHz up to 50 MHz. The default external
+ * source for the MCG oscillator inputs (EXTAL) is 50 MHz clock source from Micrel
+ * Ethernet PHY.
+ */
 
 #define BOARD_EXTCLOCK       1              /* External clock */
 #define BOARD_EXTAL_FREQ     48000000       /* 50MHz Oscillator */
@@ -186,216 +192,12 @@
 
 /* Alternative pin resolution *******************************************************/
 /* If there are alternative configurations for various pins in the
- * k64_k60pinmux.h header file, those alternative pins will be labeled with a
+ * kinetis_k64pinmux.h header file, those alternative pins will be labeled with a
  * suffix like _1, _2, etc.  The logic in this file must select the correct pin
  * configuration for the board by defining a pin configuration (with no suffix) that
  * maps to the correct alternative.
  */
 
-/* On-Board Connections
- * -------------------- ------------------------- -------- -------------------
- * FEATURE              CONNECTION                PORT/PIN PIN FUNCTION
- * -------------------- ------------------------- -------- -------------------
- * OSJTAG USB-to-serial OSJTAG Bridge RX Data     PTE9     UART5_RX
- * Bridge               OSJTAG Bridge TX Data     PTE8     UART5_TX
- * SD Card Slot         SD Clock                  PTE2     SDHC0_DCLK
- *                      SD Command                PTE3     SDHC0_CMD
- *                      SD Data0                  PTE1     SDHC0_D0
- *                      SD Data1                  PTE0     SDHC0_D1
- *                      SD Data2                  PTE5     SDHC0_D2
- *                      SD Data3                  PTE4     SDHC0_D3
- *                      SD Card Detect            PTE28    PTE28
- *                      SD Write Protect          PTE27    PTE27
- * Infrared Port        IR Transmit               PTD7     CMT_IRO
- *                      IR Receive                PTC6     CMP0_IN0
- * Pushbuttons          SW1 (IRQ0)                PTA19    PTA19
- *                      SW2 (IRQ1)                PTE26    PTE26
- *                      SW3 (RESET)               RESET_b  RESET_b
- * Touch Pads           E1 / Touch                PTA4     TSI0_CH5
- *                      E2 / Touch                PTB3     TSI0_CH8
- *                      E3 / Touch                PTB2     TSI0_CH7
- *                      E4 / Touch                PTB16    TSI0_CH9
- * LEDs                 E1 / Orange LED           PTA11    PTA11
- *                      E2 / Yellow LED           PTA28    PTA28
- *                      E3 / Green LED            PTA29    PTA29
- *                      E4 / Blue LED             PTA10    PTA10
- * Potentiometer        Potentiometer (R71)       ?        ADC1_DM1
- * Accelerometer        I2C SDA                   PTD9     I2C0_SDA
- *                      I2C SCL                   PTD8     I2C0_SCL
- *                      IRQ                       PTD10    PTD10
- * Touch Pad / Segment  Electrode 0 (J3 Pin 3)    PTB0     TSI0_CH0
- * LCD TWRPI Socket     Electrode 1 (J3 Pin 5)    PTB1     TSI0_CH6
- *                      Electrode 2 (J3 Pin 7)    PTB2     TSI0_CH7
- *                      Electrode 3 (J3 Pin 8)    PTB3     TSI0_CH8
- *                      Electrode 4 (J3 Pin 9)    PTC0     TSI0_CH13
- *                      Electrode 5 (J3 Pin 10)   PTC1     TSI0_CH14
- *                      Electrode 6 (J3 Pin 11)   PTC2     TSI0_CH15
- *                      Electrode 7 (J3 Pin 12)   PTA4     TSI0_CH5
- *                      Electrode 8 (J3 Pin 13)   PTB16    TSI0_CH9
- *                      Electrode 9 (J3 Pin 14)   PTB17    TSI0_CH10
- *                      Electrode 10 (J3 Pin 15)  PTB18    TSI0_CH11
- *                      Electrode 11 (J3 Pin 16)  PTB19    TSI0_CH12
- *                      TWRPI ID0 (J3 Pin 17)     ?        ADC1_DP1
- *                      TWRPI ID1 (J3 Pin 18)     ?        ADC1_SE16
- */
-
-#define PIN_UART5_RX  PIN_UART5_RX_2
-#define PIN_UART5_TX  PIN_UART5_TX_2
-#define PIN_I2C0_SDA  PIN_I2C0_SDA_3
-#define PIN_I2C0_SCL  PIN_I2C0_SCL_3
-
-/* Connections via the General Purpose Tower Plug-in (TWRPI) Socket
- * -------------------- ------------------------- -------- -------------------
- * FEATURE             CONNECTION                 PORT/PIN PIN FUNCTION
- * -------------------- ------------------------- -------- -------------------
- * General Purpose      TWRPI AN0 (J4 Pin 8)       ?        ADC0_DP0/ADC1_DP3
- * TWRPI Socket         TWRPI AN1 (J4 Pin 9)       ?        ADC0_DM0/ADC1_DM3
- *                      TWRPI AN2 (J4 Pin 12)      ?        ADC1_DP0/ADC0_DP3
- *                      TWRPI ID0 (J4 Pin 17)      ?        ADC0_DP1
- *                      TWRPI ID1 (J4 Pin 18)      ?        ADC0_DM1
- *                      TWRPI I2C SCL (J5 Pin 3)   PTD8     I2C0_SCL
- *                      TWRPI I2C SDA (J5 Pin 4)   PTD9     I2C0_SDA
- *                      TWRPI SPI MISO (J5 Pin 9)  PTD14    SPI2_SIN
- *                      TWRPI SPI MOSI (J5 Pin 10) PTD13    SPI2_SOUT
- *                      TWRPI SPI SS (J5 Pin 11)   PTD15    SPI2_PCS0
- *                      TWRPI SPI CLK (J5 Pin 12)  PTD12    SPI2_SCK
- *                      TWRPI GPIO0 (J5 Pin 15)    PTD10    PTD10
- *                      TWRPI GPIO1 (J5 Pin 16)    PTB8     PTB8
- *                      TWRPI GPIO2 (J5 Pin 17)    PTB9     PTB9
- *                      TWRPI GPIO3 (J5 Pin 18)    PTA19    PTA19
- *                      TWRPI GPIO4 (J5 Pin 19)    PTE26    PTE26
- */
-
-#define PIN_SPI2_SIN   PIN_SPI2_SIN_2
-#define PIN_SPI2_SOUT  PIN_SPI2_SOUT_2
-#define PIN_SPI2_SCK   PIN_SPI2_SCK_2
-
-/* Connections via the Tower Primary Connector Side A
- * --- -------------------- --------------------------------
- * PIN NAME                 USAGE
- * --- -------------------- --------------------------------
- * A7  SCL0                 PTD8
- * A8  SDA0                 PTD9
- * A9  GPIO9 / CTS1         PTC19
- * A10 GPIO8 / SDHC_D2      PTE5
- * A11 GPIO7 / SD_WP_DET    PTE27
- * A13 ETH_MDC              PTB1
- * A14 ETH_MDIO             PTB0
- * A16 ETH_RXDV             PTA14
- * A19 ETH_RXD1             PTA12
- * A20 ETH_RXD0             PTA13
- * A21 SSI_MCLK             PTE6
- * A22 SSI_BCLK             PTE12
- * A23 SSI_FS               PTE11
- * A24 SSI_RXD              PTE7
- * A25 SSI_TXD              PTE10
- * A27 AN3                  PGA0_DP/ADC0_DP0/ADC1_DP3
- * A28 AN2                  PGA0_DM/ADC0_DM0/ADC1_DM3
- * A29 AN1                  PGA1_DP/ADC1_DP0/ADC0_DP3
- * A30 AN0                  PGA1_DM/ADC1_DM0/ADC0_DM3
- * A33 TMR1                 PTA9
- * A34 TMR0                 PTA8
- * A35 GPIO6                PTB9
- * A37 PWM3                 PTA6
- * A38 PWM2                 PTC3
- * A39 PWM1                 PTC2
- * A40 PWM0                 PTC1
- * A41 RXD0                 PTE25
- * A42 TXD0                 PTE24
- * A43 RXD1                 PTC16
- * A44 TXD1                 PTC17
- * A64 CLKOUT0              PTC3
- * A66 EBI_AD14             PTC0
- * A67 EBI_AD13             PTC1
- * A68 EBI_AD12             PTC2
- * A69 EBI_AD11             PTC4
- * A70 EBI_AD10             PTC5
- * A71 EBI_AD9              PTC6
- * A71 EBI_R/W_b            PTC11
- * A72 EBI_AD8              PTC7
- * A73 EBI_AD7              PTC8
- * A74 EBI_AD6              PTC9
- * A75 EBI_AD5              PTC10
- * A76 EBI_AD4              PTD2
- * A77 EBI_AD3              PTD3
- * A78 EBI_AD2              PTD4
- * A79 EBI_AD1              PTD5
- * A80 EBI_AD0              PTD6
- */
-
-/* PTE 26/27 */
-
-#define PIN_UART3_RX   PIN_UART3_RX_2
-#define PIN_UART3_TX   PIN_UART3_TX_2
-
-/* PTE 24/25 */
-
-#define PIN_UART4_RX   PIN_UART4_RX_2
-#define PIN_UART4_TX   PIN_UART4_TX_2
-
-/* Connections via the Tower Primary Connector Side B
- * --- -------------------- --------------------------------
- * PIN NAME                 USAGE
- * --- -------------------- --------------------------------
- * B7  SDHC_CLK / SPI1_CLK  PTE2
- * B9  SDHC_D3 / SPI1_CS0_b PTE4
- * B10 SDHC_CMD / SPI1_MOSI PTE1
- * B11 SDHC_D0 / SPI1_MISO  PTE3
- * B13 ETH_RXER             PTA5
- * B15 ETH_TXEN             PTA15
- * B19 ETH_TXD1             PTA17
- * B20 ETH_TXD0             PTA16
- * B21 GPIO1 / RTS1         PTC18
- * B22 GPIO2 / SDHC_D1      PTE0
- * B23 GPIO3                PTE28
- * B24 CLKIN0               PTA18
- * B25 CLKOUT1              PTE26
- * B27 AN7                  PTB7
- * B28 AN6                  PTB6
- * B29 AN5                  PTB5
- * B30 AN4                  PTB4
- * B34 TMR2                 PTD6
- * B35 GPIO4                PTB8
- * B37 PWM7                 PTA2
- * B38 PWM6                 PTA1
- * B39 PWM5                 PTD5
- * B40 PWM4                 PTA7
- * B41 CANRX0               PTE25
- * B42 CANTX0               PTE24
- * B44 SPI0_MISO            PTD14
- * B45 SPI0_MOSI            PTD13
- * B46 SPI0_CS0_b           PTD11
- * B47 SPI0_CS1_b           PTD15
- * B48 SPI0_CLK             PTD12
- * B50 SCL1                 PTD8
- * B51 SDA1                 PTD9
- * B52 GPIO5 / SD_CARD_DET  PTE28
- * B55 IRQ_H                PTA24
- * B56 IRQ_G                PTA24
- * B57 IRQ_F                PTA25
- * B58 IRQ_E                PTA25
- * B59 IRQ_D                PTA26
- * B60 IRQ_C                PTA26
- * B61 IRQ_B                PTA27
- * B62 IRQ_A                PTA27
- * B63 EBI_ALE / EBI_CS1_b  PTD0
- * B64 EBI_CS0_b            PTD1
- * B66 EBI_AD15             PTB18
- * B67 EBI_AD16             PTB17
- * B68 EBI_AD17             PTB16
- * B69 EBI_AD18             PTB11
- * B70 EBI_AD19             PTB10
- * B72 EBI_OE_b             PTB19
- * B73 EBI_D7               PTB20
- * B74 EBI_D6               PTB21
- * B75 EBI_D5               PTB22
- * B76 EBI_D4               PTB23
- * B77 EBI_D3               PTC12
- * B78 EBI_D2               PTC13
- * B79 EBI_D1               PTC14
- * B80 EBI_D0               PTC15
- */
-
 /************************************************************************************
  * Public Data
  ************************************************************************************/
-- 
GitLab


From 59de06f7f9a8835710370a5962c10e3faeaea8a7 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sat, 2 Jul 2016 11:48:56 -0600
Subject: [PATCH 134/229] Update K64 pin multixplexing

---
 arch/arm/src/kinetis/chip/kinetis_k64pinmux.h | 1012 ++++++++++-------
 configs/freedom-k64f/include/board.h          |    8 +
 2 files changed, 617 insertions(+), 403 deletions(-)

diff --git a/arch/arm/src/kinetis/chip/kinetis_k64pinmux.h b/arch/arm/src/kinetis/chip/kinetis_k64pinmux.h
index 48a0f9a0f6..2fcf6c84ff 100644
--- a/arch/arm/src/kinetis/chip/kinetis_k64pinmux.h
+++ b/arch/arm/src/kinetis/chip/kinetis_k64pinmux.h
@@ -49,414 +49,620 @@
 /********************************************************************************************
  * Pre-processor Definitions
  ********************************************************************************************/
-/* Reference: Paragraph 10.3.1, p 258, of FreeScale document K60P144M100SF2RM
- *
- * In most cases, there are alternative configurations for various pins. Those alternative
+/* In most cases, there are alternative configurations for various pins. Those alternative
  * pins are labeled with a suffix like _1, _2, etc. in order to distinguish them.  Logic in
  * the board.h file must select the correct pin configuration for the board by defining a pin
  * configuration (with no suffix) that maps to the correct alternative.
+ *
+ * WARNING!!! WARNING!!! WARNING!!! WARNING!!! WARNING!!! WARNING!!! WARNING!!!
+ * Additional effort is required to select specific GPIO options such as frequency,
+ * open-drain/push-pull, and pull-up/down!  Just the basics are defined for most
+ * pins in the initial version of this file.
  */
 
-#define PIN_TSI0_CH1             (PIN_ANALOG | PIN_PORTA | PIN0)
-#define PIN_UART0_CTS_1          (PIN_ALT2   | PIN_PORTA | PIN0)
-#define PIN_FTM0_CH5_1           (PIN_ALT3   | PIN_PORTA | PIN0)
-#define PIN_JTAG_TCLK            (PIN_ALT7   | PIN_PORTA | PIN0)
-#define PIN_SWD_CLK              (PIN_ALT7   | PIN_PORTA | PIN0)
-#define PIN_TSI0_CH2             (PIN_ANALOG | PIN_PORTA | PIN1)
-#define PIN_UART0_RX_1           (PIN_ALT2   | PIN_PORTA | PIN1)
-#define PIN_FTM0_CH6_1           (PIN_ALT3   | PIN_PORTA | PIN1)
-#define PIN_JTAG_TDI             (PIN_ALT7   | PIN_PORTA | PIN1)
-#define PIN_TSI0_CH3             (PIN_ANALOG | PIN_PORTA | PIN2)
-#define PIN_UART0_TX_1           (PIN_ALT2   | PIN_PORTA | PIN2)
-#define PIN_FTM0_CH7_1           (PIN_ALT3   | PIN_PORTA | PIN2)
-#define PIN_JTAG_TDO             (PIN_ALT7   | PIN_PORTA | PIN2)
-#define PIN_TRACE_SWO            (PIN_ALT7   | PIN_PORTA | PIN2)
-#define PIN_TSI0_CH4             (PIN_ANALOG | PIN_PORTA | PIN3)
-#define PIN_UART0_RTS_1          (PIN_ALT2   | PIN_PORTA | PIN3)
-#define PIN_FTM0_CH0_1           (PIN_ALT3   | PIN_PORTA | PIN3)
-#define PIN_JTAG_TMS             (PIN_ALT7   | PIN_PORTA | PIN3)
-#define PIN_SWD_DIO              (PIN_ALT7   | PIN_PORTA | PIN3)
-#define PIN_TSI0_CH5             (PIN_ANALOG | PIN_PORTA | PIN4)
-#define PIN_FTM0_CH1_1           (PIN_ALT3   | PIN_PORTA | PIN4)
-#define PIN_NMI                  (PIN_ALT7   | PIN_PORTA | PIN4)
-#define PIN_FTM0_CH2_1           (PIN_ALT3   | PIN_PORTA | PIN5)
-#if 0
-#  define PIN_RMII0_RXER         (PIN_ALT4   | PIN_PORTA | PIN5)
-#  define PIN_MII0_RXER          (PIN_ALT4   | PIN_PORTA | PIN5)
-#else
-#  define PIN_RMII0_RXER         (GPIO_PULLDOWN | PIN_PORTA | PIN5)
-# define PIN_MII0_RXER           (GPIO_PULLDOWN | PIN_PORTA | PIN5)
-#endif
-#define PIN_CMP2_OUT_1           (PIN_ALT5   | PIN_PORTA | PIN5)
-#define PIN_I2S0_RX_BCLK_1       (PIN_ALT6   | PIN_PORTA | PIN5)
-#define PIN_JTAG_TRST            (PIN_ALT7   | PIN_PORTA | PIN5)
-#define PIN_FTM0_CH3_1           (PIN_ALT3   | PIN_PORTA | PIN6)
-#define PIN_TRACE_CLKOUT         (PIN_ALT7   | PIN_PORTA | PIN6)
-#define PIN_ADC0_SE10            (PIN_ANALOG | PIN_PORTA | PIN7)
-#define PIN_FTM0_CH4_1           (PIN_ALT3   | PIN_PORTA | PIN7)
-#define PIN_TRACE_D3             (PIN_ALT7   | PIN_PORTA | PIN7)
-#define PIN_ADC0_SE11            (PIN_ANALOG | PIN_PORTA | PIN8)
-#define PIN_FTM1_CH0_1           (PIN_ALT3   | PIN_PORTA | PIN8)
-#define PIN_FTM1_QD_PHA_1        (PIN_ALT6   | PIN_PORTA | PIN8)
-#define PIN_TRACE_D2             (PIN_ALT7   | PIN_PORTA | PIN8)
-#define PIN_FTM1_CH1_1           (PIN_ALT3   | PIN_PORTA | PIN9)
-#define PIN_MII0_RXD3            (PIN_ALT4   | PIN_PORTA | PIN9)
-#define PIN_FTM1_QD_PHB_1        (PIN_ALT6   | PIN_PORTA | PIN9)
-#define PIN_TRACE_D1             (PIN_ALT7   | PIN_PORTA | PIN9)
-#define PIN_FTM2_CH0_1           (PIN_ALT3   | PIN_PORTA | PIN10)
-#define PIN_MII0_RXD2            (PIN_ALT4   | PIN_PORTA | PIN10)
-#define PIN_FTM2_QD_PHA_1        (PIN_ALT6   | PIN_PORTA | PIN10)
-#define PIN_TRACE_D0             (PIN_ALT7   | PIN_PORTA | PIN10)
-#define PIN_FTM2_CH1_1           (PIN_ALT3   | PIN_PORTA | PIN11)
-#define PIN_MII0_RXCLK           (PIN_ALT4   | PIN_PORTA | PIN11)
-#define PIN_FTM2_QD_PHB_1        (PIN_ALT6   | PIN_PORTA | PIN11)
-#define PIN_CMP2_IN0             (PIN_ANALOG | PIN_PORTA | PIN12)
-#define PIN_CAN0_TX_1            (PIN_ALT2   | PIN_PORTA | PIN12)
-#define PIN_FTM1_CH0_2           (PIN_ALT3   | PIN_PORTA | PIN12)
-#define PIN_RMII0_RXD1           (PIN_ALT4   | PIN_PORTA | PIN12)
-#define PIN_MII0_RXD1            (PIN_ALT4   | PIN_PORTA | PIN12)
-#define PIN_I2S0_TXD_1           (PIN_ALT6   | PIN_PORTA | PIN12)
-#define PIN_FTM1_QD_PHA_2        (PIN_ALT7   | PIN_PORTA | PIN12)
-#define PIN_CMP2_IN1             (PIN_ANALOG | PIN_PORTA | PIN13)
-#define PIN_CAN0_RX_1            (PIN_ALT2   | PIN_PORTA | PIN13)
-#define PIN_FTM1_CH1_2           (PIN_ALT3   | PIN_PORTA | PIN13)
-#define PIN_RMII0_RXD0           (PIN_ALT4   | PIN_PORTA | PIN13)
-#define PIN_MII0_RXD0            (PIN_ALT4   | PIN_PORTA | PIN13)
-#define PIN_I2S0_TX_FS_1         (PIN_ALT6   | PIN_PORTA | PIN13)
-#define PIN_FTM1_QD_PHB_2        (PIN_ALT7   | PIN_PORTA | PIN13)
-#define PIN_SPI0_PCS0_1          (PIN_ALT2   | PIN_PORTA | PIN14)
-#define PIN_UART0_TX_2           (PIN_ALT3   | PIN_PORTA | PIN14)
-#define PIN_RMII0_CRS_DV         (PIN_ALT4   | PIN_PORTA | PIN14)
-#define PIN_MII0_RXDV            (PIN_ALT4   | PIN_PORTA | PIN14)
-#define PIN_I2S0_TX_BCLK_1       (PIN_ALT6   | PIN_PORTA | PIN14)
-#define PIN_SPI0_SCK_1           (PIN_ALT2   | PIN_PORTA | PIN15)
-#define PIN_UART0_RX_2           (PIN_ALT3   | PIN_PORTA | PIN15)
-#define PIN_RMII0_TXEN           (PIN_ALT4   | PIN_PORTA | PIN15)
-#define PIN_MII0_TXEN            (PIN_ALT4   | PIN_PORTA | PIN15)
-#define PIN_I2S0_RXD_1           (PIN_ALT6   | PIN_PORTA | PIN15)
-#define PIN_SPI0_SOUT_1          (PIN_ALT2   | PIN_PORTA | PIN16)
-#define PIN_UART0_CTS_2          (PIN_ALT3   | PIN_PORTA | PIN16)
-#define PIN_RMII0_TXD0           (PIN_ALT4   | PIN_PORTA | PIN16)
-#define PIN_MII0_TXD0            (PIN_ALT4   | PIN_PORTA | PIN16)
-#define PIN_I2S0_RX_FS_1         (PIN_ALT6   | PIN_PORTA | PIN16)
-#define PIN_ADC1_SE17            (PIN_ANALOG | PIN_PORTA | PIN17)
-#define PIN_SPI0_SIN_1           (PIN_ALT2   | PIN_PORTA | PIN17)
-#define PIN_UART0_RTS_2          (PIN_ALT3   | PIN_PORTA | PIN17)
-#define PIN_RMII0_TXD1           (PIN_ALT4   | PIN_PORTA | PIN17)
-#define PIN_MII0_TXD1            (PIN_ALT4   | PIN_PORTA | PIN17)
-#define PIN_I2S0_MCLK_1          (PIN_ALT6   | PIN_PORTA | PIN17)
-#define PIN_I2S0_CLKIN_1         (PIN_ALT7   | PIN_PORTA | PIN17)
-#define PIN_EXTAL                (PIN_ANALOG | PIN_PORTA | PIN18)
-#define PIN_FTM0_FLT2_1          (PIN_ALT3   | PIN_PORTA | PIN18)
-#define PIN_FTM_CLKIN0           (PIN_ALT4   | PIN_PORTA | PIN18)
-#define PIN_XTAL                 (PIN_ANALOG | PIN_PORTA | PIN19)
-#define PIN_FTM1_FLT0_1          (PIN_ALT3   | PIN_PORTA | PIN19)
-#define PIN_FTM_CLKIN1           (PIN_ALT4   | PIN_PORTA | PIN19)
-#define PIN_LPT0_ALT1            (PIN_ALT6   | PIN_PORTA | PIN19)
-#define PIN_MII0_TXD2            (PIN_ALT4   | PIN_PORTA | PIN24)
-#define PIN_FB_A29               (PIN_ALT6   | PIN_PORTA | PIN24)
-#define PIN_MII0_TXCLK           (PIN_ALT4   | PIN_PORTA | PIN25)
-#define PIN_FB_A28               (PIN_ALT6   | PIN_PORTA | PIN25)
-#define PIN_MII0_TXD3            (PIN_ALT4   | PIN_PORTA | PIN26)
-#define PIN_FB_A27               (PIN_ALT6   | PIN_PORTA | PIN26)
-#define PIN_MII0_CRS             (PIN_ALT4   | PIN_PORTA | PIN27)
-#define PIN_FB_A26               (PIN_ALT6   | PIN_PORTA | PIN27)
-#define PIN_MII0_TXER            (PIN_ALT4   | PIN_PORTA | PIN28)
-#define PIN_FB_A25               (PIN_ALT6   | PIN_PORTA | PIN28)
-#define PIN_MII0_COL             (PIN_ALT4   | PIN_PORTA | PIN29)
-#define PIN_FB_A24               (PIN_ALT6   | PIN_PORTA | PIN29)
-
-#define PIN_ADC0_SE8             (PIN_ANALOG | PIN_PORTB | PIN0)
-#define PIN_ADC1_SE8             (PIN_ANALOG | PIN_PORTB | PIN0)
-#define PIN_TSI0_CH0             (PIN_ANALOG | PIN_PORTB | PIN0)
-#define PIN_I2C0_SCL_1           (PIN_ALT2   | PIN_PORTB | PIN0)
-#define PIN_FTM1_CH0_3           (PIN_ALT3   | PIN_PORTB | PIN0)
-#define PIN_RMII0_MDIO           (PIN_ALT4   | PIN_PORTB | PIN0)
-#define PIN_MII0_MDIO            (PIN_ALT4   | PIN_PORTB | PIN0)
-#define PIN_FTM1_QD_PHA_3        (PIN_ALT6   | PIN_PORTB | PIN0)
-#define PIN_ADC0_SE9             (PIN_ANALOG | PIN_PORTB | PIN1)
-#define PIN_ADC1_SE9             (PIN_ANALOG | PIN_PORTB | PIN1)
-#define PIN_TSI0_CH6             (PIN_ANALOG | PIN_PORTB | PIN1)
-#define PIN_I2C0_SDA_1           (PIN_ALT2   | PIN_PORTB | PIN1)
-#define PIN_FTM1_CH1_3           (PIN_ALT3   | PIN_PORTB | PIN1)
-#define PIN_RMII0_MDC            (PIN_ALT4   | PIN_PORTB | PIN1)
-#define PIN_MII0_MDC             (PIN_ALT4   | PIN_PORTB | PIN1)
-#define PIN_FTM1_QD_PHB_3        (PIN_ALT6   | PIN_PORTB | PIN1)
-#define PIN_ADC0_SE12            (PIN_ANALOG | PIN_PORTB | PIN2)
-#define PIN_TSI0_CH7             (PIN_ANALOG | PIN_PORTB | PIN2)
-#define PIN_I2C0_SCL_2           (PIN_ALT2   | PIN_PORTB | PIN2)
-#define PIN_UART0_RTS_3          (PIN_ALT3   | PIN_PORTB | PIN2)
-#define PIN_ENET0_1588_TMR0_1    (PIN_ALT4   | PIN_PORTB | PIN2)
-#define PIN_FTM0_FLT3            (PIN_ALT6   | PIN_PORTB | PIN2)
-#define PIN_ADC0_SE13            (PIN_ANALOG | PIN_PORTB | PIN3)
-#define PIN_TSI0_CH8             (PIN_ANALOG | PIN_PORTB | PIN3)
-#define PIN_I2C0_SDA_2           (PIN_ALT2   | PIN_PORTB | PIN3)
-#define PIN_UART0_CTS_3          (PIN_ALT3   | PIN_PORTB | PIN3)
-#define PIN_ENET0_1588_TMR1_1    (PIN_ALT4   | PIN_PORTB | PIN3)
-#define PIN_FTM0_FLT0_2          (PIN_ALT6   | PIN_PORTB | PIN3)
-#define PIN_ADC1_SE10            (PIN_ANALOG | PIN_PORTB | PIN4)
-#define PIN_ENET0_1588_TMR2_1    (PIN_ALT4   | PIN_PORTB | PIN4)
-#define PIN_FTM1_FLT0_2          (PIN_ALT6   | PIN_PORTB | PIN4)
-#define PIN_ADC1_SE11            (PIN_ANALOG | PIN_PORTB | PIN5)
-#define PIN_ENET0_1588_TMR3_1    (PIN_ALT4   | PIN_PORTB | PIN5)
-#define PIN_FTM2_FLT0_1          (PIN_ALT6   | PIN_PORTB | PIN5)
-#define PIN_ADC1_SE12            (PIN_ANALOG | PIN_PORTB | PIN6)
-#define PIN_FB_AD23              (PIN_ALT5   | PIN_PORTB | PIN6)
-#define PIN_ADC1_SE13            (PIN_ANALOG | PIN_PORTB | PIN7)
-#define PIN_FB_AD22              (PIN_ALT5   | PIN_PORTB | PIN7)
-#define PIN_UART3_RTS_1          (PIN_ALT3   | PIN_PORTB | PIN8)
-#define PIN_FB_AD21              (PIN_ALT5   | PIN_PORTB | PIN8)
-#define PIN_SPI1_PCS1_1          (PIN_ALT2   | PIN_PORTB | PIN9)
-#define PIN_UART3_CTS_1          (PIN_ALT3   | PIN_PORTB | PIN9)
-#define PIN_FB_AD20              (PIN_ALT5   | PIN_PORTB | PIN9)
-#define PIN_ADC1_SE14            (PIN_ANALOG | PIN_PORTB | PIN10)
-#define PIN_SPI1_PCS0_1          (PIN_ALT2   | PIN_PORTB | PIN10)
-#define PIN_UART3_RX_1           (PIN_ALT3   | PIN_PORTB | PIN10)
-#define PIN_FB_AD19              (PIN_ALT5   | PIN_PORTB | PIN10)
-#define PIN_FTM0_FLT1_1          (PIN_ALT6   | PIN_PORTB | PIN10)
-#define PIN_ADC1_SE15            (PIN_ANALOG | PIN_PORTB | PIN11)
-#define PIN_SPI1_SCK_1           (PIN_ALT2   | PIN_PORTB | PIN11)
-#define PIN_UART3_TX_1           (PIN_ALT3   | PIN_PORTB | PIN11)
-#define PIN_FB_AD18              (PIN_ALT5   | PIN_PORTB | PIN11)
-#define PIN_FTM0_FLT2_2          (PIN_ALT6   | PIN_PORTB | PIN11)
-#define PIN_TSI0_CH9             (PIN_ANALOG | PIN_PORTB | PIN16)
-#define PIN_SPI1_SOUT_1          (PIN_ALT2   | PIN_PORTB | PIN16)
-#define PIN_UART0_RX_3           (PIN_ALT3   | PIN_PORTB | PIN16)
-#define PIN_FB_AD17              (PIN_ALT5   | PIN_PORTB | PIN16)
-#define PIN_EWM_IN_1             (PIN_ALT6   | PIN_PORTB | PIN16)
-#define PIN_TSI0_CH10            (PIN_ANALOG | PIN_PORTB | PIN17)
-#define PIN_SPI1_SIN_1           (PIN_ALT2   | PIN_PORTB | PIN17)
-#define PIN_UART0_TX_3           (PIN_ALT3   | PIN_PORTB | PIN17)
-#define PIN_FB_AD16              (PIN_ALT5   | PIN_PORTB | PIN17)
-#define PIN_EWM_OUT_1            (PIN_ALT6   | PIN_PORTB | PIN17)
-#define PIN_TSI0_CH11            (PIN_ANALOG | PIN_PORTB | PIN18)
-#define PIN_CAN0_TX_2            (PIN_ALT2   | PIN_PORTB | PIN18)
-#define PIN_FTM2_CH0_2           (PIN_ALT3   | PIN_PORTB | PIN18)
-#define PIN_I2S0_TX_BCLK_2       (PIN_ALT4   | PIN_PORTB | PIN18)
-#define PIN_FB_AD15              (PIN_ALT5   | PIN_PORTB | PIN18)
-#define PIN_FTM2_QD_PHA_2        (PIN_ALT6   | PIN_PORTB | PIN18)
-#define PIN_TSI0_CH12            (PIN_ANALOG | PIN_PORTB | PIN19)
-#define PIN_CAN0_RX_2            (PIN_ALT2   | PIN_PORTB | PIN19)
-#define PIN_FTM2_CH1_2           (PIN_ALT3   | PIN_PORTB | PIN19)
-#define PIN_I2S0_TX_FS_2         (PIN_ALT4   | PIN_PORTB | PIN19)
-#define PIN_FB_OE                (PIN_ALT5   | PIN_PORTB | PIN19)
-#define PIN_FTM2_QD_PHB_2        (PIN_ALT6   | PIN_PORTB | PIN19)
-#define PIN_SPI2_PCS0_1          (PIN_ALT2   | PIN_PORTB | PIN20)
-#define PIN_FB_AD31              (PIN_ALT5   | PIN_PORTB | PIN20)
-#define PIN_CMP0_OUT_1           (PIN_ALT6   | PIN_PORTB | PIN20)
-#define PIN_SPI2_SCK_1           (PIN_ALT2   | PIN_PORTB | PIN21)
-#define PIN_FB_AD30              (PIN_ALT5   | PIN_PORTB | PIN21)
-#define PIN_CMP1_OUT_1           (PIN_ALT6   | PIN_PORTB | PIN21)
-#define PIN_SPI2_SOUT_1          (PIN_ALT2   | PIN_PORTB | PIN22)
-#define PIN_FB_AD29              (PIN_ALT5   | PIN_PORTB | PIN22)
-#define PIN_CMP2_OUT_2           (PIN_ALT6   | PIN_PORTB | PIN22)
-#define PIN_SPI2_SIN_1           (PIN_ALT2   | PIN_PORTB | PIN23)
-#define PIN_SPI0_PCS5            (PIN_ALT3   | PIN_PORTB | PIN23)
-#define PIN_FB_AD28              (PIN_ALT5   | PIN_PORTB | PIN23)
-
-#define PIN_ADC0_SE14            (PIN_ANALOG | PIN_PORTC | PIN0)
-#define PIN_TSI0_CH13            (PIN_ANALOG | PIN_PORTC | PIN0)
-#define PIN_SPI0_PCS4            (PIN_ALT2   | PIN_PORTC | PIN0)
-#define PIN_PDB0_EXTRG_1         (PIN_ALT3   | PIN_PORTC | PIN0)
-#define PIN_I2S0_TXD_2           (PIN_ALT4   | PIN_PORTC | PIN0)
-#define PIN_FB_AD14              (PIN_ALT5   | PIN_PORTC | PIN0)
-#define PIN_ADC0_SE15            (PIN_ANALOG | PIN_PORTC | PIN1)
-#define PIN_TSI0_CH14            (PIN_ANALOG | PIN_PORTC | PIN1)
-#define PIN_SPI0_PCS3_1          (PIN_ALT2   | PIN_PORTC | PIN1)
-#define PIN_UART1_RTS_1          (PIN_ALT3   | PIN_PORTC | PIN1)
-#define PIN_FTM0_CH0_2           (PIN_ALT4   | PIN_PORTC | PIN1)
-#define PIN_FB_AD13              (PIN_ALT5   | PIN_PORTC | PIN1)
-#define PIN_ADC0_SE4B            (PIN_ANALOG | PIN_PORTC | PIN2)
-#define PIN_CMP1_IN0             (PIN_ANALOG | PIN_PORTC | PIN2)
-#define PIN_TSI0_CH15            (PIN_ANALOG | PIN_PORTC | PIN2)
-#define PIN_SPI0_PCS2_2          (PIN_ALT2   | PIN_PORTC | PIN2)
-#define PIN_UART1_CTS_1          (PIN_ALT3   | PIN_PORTC | PIN2)
-#define PIN_FTM0_CH1_2           (PIN_ALT4   | PIN_PORTC | PIN2)
-#define PIN_FB_AD12              (PIN_ALT5   | PIN_PORTC | PIN2)
-#define PIN_CMP1_IN1             (PIN_ANALOG | PIN_PORTC | PIN3)
-#define PIN_SPI0_PCS1_1          (PIN_ALT2   | PIN_PORTC | PIN3)
-#define PIN_UART1_RX_1           (PIN_ALT3   | PIN_PORTC | PIN3)
-#define PIN_FTM0_CH2_2           (PIN_ALT4   | PIN_PORTC | PIN3)
-#define PIN_FB_CLKOUT            (PIN_ALT5   | PIN_PORTC | PIN3)
-#define PIN_SPI0_PCS0_2          (PIN_ALT2   | PIN_PORTC | PIN4)
-#define PIN_UART1_TX_1           (PIN_ALT3   | PIN_PORTC | PIN4)
-#define PIN_FTM0_CH3_2           (PIN_ALT4   | PIN_PORTC | PIN4)
-#define PIN_FB_AD11              (PIN_ALT5   | PIN_PORTC | PIN4)
-#define PIN_CMP1_OUT_2           (PIN_ALT6   | PIN_PORTC | PIN4)
-#define PIN_SPI0_SCK_2           (PIN_ALT2   | PIN_PORTC | PIN5)
-#define PIN_LPT0_ALT2            (PIN_ALT4   | PIN_PORTC | PIN5)
-#define PIN_FB_AD10              (PIN_ALT5   | PIN_PORTC | PIN5)
-#define PIN_CMP0_OUT_2           (PIN_ALT6   | PIN_PORTC | PIN5)
-#define PIN_CMP0_IN0             (PIN_ANALOG | PIN_PORTC | PIN6)
-#define PIN_SPI0_SOUT_2          (PIN_ALT2   | PIN_PORTC | PIN6)
-#define PIN_PDB0_EXTRG_2         (PIN_ALT3   | PIN_PORTC | PIN6)
-#define PIN_FB_AD9               (PIN_ALT5   | PIN_PORTC | PIN6)
-#define PIN_CMP0_IN1             (PIN_ANALOG | PIN_PORTC | PIN7)
-#define PIN_SPI0_SIN_2           (PIN_ALT2   | PIN_PORTC | PIN7)
-#define PIN_FB_AD8               (PIN_ALT5   | PIN_PORTC | PIN7)
-#define PIN_ADC1_SE4B            (PIN_ANALOG | PIN_PORTC | PIN8)
-#define PIN_CMP0_IN2             (PIN_ANALOG | PIN_PORTC | PIN8)
-#define PIN_I2S0_MCLK_2          (PIN_ALT3   | PIN_PORTC | PIN8)
-#define PIN_I2S0_CLKIN_2         (PIN_ALT4   | PIN_PORTC | PIN8)
-#define PIN_FB_AD7               (PIN_ALT5   | PIN_PORTC | PIN8)
-#define PIN_ADC1_SE5B            (PIN_ANALOG | PIN_PORTC | PIN9)
-#define PIN_CMP0_IN3             (PIN_ANALOG | PIN_PORTC | PIN9)
-#define PIN_I2S0_RX_BCLK_2       (PIN_ALT4   | PIN_PORTC | PIN9)
-#define PIN_FB_AD6               (PIN_ALT5   | PIN_PORTC | PIN9)
-#define PIN_FTM2_FLT0_2          (PIN_ALT6   | PIN_PORTC | PIN9)
-#define PIN_ADC1_SE6B            (PIN_ANALOG | PIN_PORTC | PIN10)
-#define PIN_CMP0_IN4             (PIN_ANALOG | PIN_PORTC | PIN10)
-#define PIN_I2C1_SCL_1           (PIN_ALT2   | PIN_PORTC | PIN10)
-#define PIN_I2S0_RX_FS_2         (PIN_ALT4   | PIN_PORTC | PIN10)
-#define PIN_FB_AD5               (PIN_ALT5   | PIN_PORTC | PIN10)
-#define PIN_ADC1_SE7B            (PIN_ANALOG | PIN_PORTC | PIN11)
-#define PIN_I2C1_SDA_1           (PIN_ALT2   | PIN_PORTC | PIN11)
-#define PIN_I2S0_RXD_2           (PIN_ALT4   | PIN_PORTC | PIN11)
-#define PIN_FB_RW                (PIN_ALT5   | PIN_PORTC | PIN11)
-#define PIN_UART4_RTS_1          (PIN_ALT3   | PIN_PORTC | PIN12)
-#define PIN_FB_AD27              (PIN_ALT5   | PIN_PORTC | PIN12)
-#define PIN_UART4_CTS_1          (PIN_ALT3   | PIN_PORTC | PIN13)
-#define PIN_FB_AD26              (PIN_ALT5   | PIN_PORTC | PIN13)
-#define PIN_UART4_RX_1           (PIN_ALT3   | PIN_PORTC | PIN14)
-#define PIN_FB_AD25              (PIN_ALT5   | PIN_PORTC | PIN14)
-#define PIN_UART4_TX_1           (PIN_ALT3   | PIN_PORTC | PIN15)
-#define PIN_FB_AD24              (PIN_ALT5   | PIN_PORTC | PIN15)
-#define PIN_CAN1_RX_1            (PIN_ALT2   | PIN_PORTC | PIN16)
-#define PIN_UART3_RX_2           (PIN_ALT3   | PIN_PORTC | PIN16)
-#define PIN_ENET0_1588_TMR0_2    (PIN_ALT4   | PIN_PORTC | PIN16)
-#define PIN_FB_CS5               (PIN_ALT5   | PIN_PORTC | PIN16)
-#define PIN_FB_TSIZ1             (PIN_ALT5   | PIN_PORTC | PIN16)
-#define PIN_FB_BE23_16_BLS15_8   (PIN_ALT5   | PIN_PORTC | PIN16)
-#define PIN_CAN1_TX_1            (PIN_ALT2   | PIN_PORTC | PIN17)
-#define PIN_UART3_TX_2           (PIN_ALT3   | PIN_PORTC | PIN17)
-#define PIN_ENET0_1588_TMR1_2    (PIN_ALT4   | PIN_PORTC | PIN17)
-#define PIN_FB_CS4               (PIN_ALT5   | PIN_PORTC | PIN17)
-#define PIN_FB_TSIZ0             (PIN_ALT5   | PIN_PORTC | PIN17)
-#define PIN_FB_BE31_24_BLS7_0    (PIN_ALT5   | PIN_PORTC | PIN17)
-#define PIN_UART3_RTS_2          (PIN_ALT3   | PIN_PORTC | PIN18)
-#define PIN_ENET0_1588_TMR2_2    (PIN_ALT4   | PIN_PORTC | PIN18)
-#define PIN_FB_TBST              (PIN_ALT5   | PIN_PORTC | PIN18)
-#define PIN_FB_CS2               (PIN_ALT5   | PIN_PORTC | PIN18)
-#define PIN_FB_BE15_8_BLS23_16   (PIN_ALT5   | PIN_PORTC | PIN18)
-#define PIN_UART3_CTS_2          (PIN_ALT3   | PIN_PORTC | PIN19)
-#define PIN_ENET0_1588_TMR3_2    (PIN_ALT4   | PIN_PORTC | PIN19)
-#define PIN_FB_CS3               (PIN_ALT5   | PIN_PORTC | PIN19)
-#define PIN_FB_BE7_0_BLS31_24    (PIN_ALT5   | PIN_PORTC | PIN19)
-#define PIN_FB_TA                (PIN_ALT6   | PIN_PORTC | PIN19)
-
-#define PIN_SPI0_PCS0_3          (PIN_ALT2   | PIN_PORTD | PIN0)
-#define PIN_UART2_RTS            (PIN_ALT3   | PIN_PORTD | PIN0)
-#define PIN_FB_ALE               (PIN_ALT5   | PIN_PORTD | PIN0)
-#define PIN_FB_CS1               (PIN_ALT5   | PIN_PORTD | PIN0)
-#define PIN_FB_TS                (PIN_ALT5   | PIN_PORTD | PIN0)
-#define PIN_ADC0_SE5B            (PIN_ANALOG | PIN_PORTD | PIN1)
-#define PIN_SPI0_SCK_3           (PIN_ALT2   | PIN_PORTD | PIN1)
-#define PIN_UART2_CTS            (PIN_ALT3   | PIN_PORTD | PIN1)
-#define PIN_FB_CS0               (PIN_ALT5   | PIN_PORTD | PIN1)
-#define PIN_SPI0_SOUT_3          (PIN_ALT2   | PIN_PORTD | PIN2)
-#define PIN_UART2_RX             (PIN_ALT3   | PIN_PORTD | PIN2)
-#define PIN_FB_AD4               (PIN_ALT5   | PIN_PORTD | PIN2)
-#define PIN_SPI0_SIN_3           (PIN_ALT2   | PIN_PORTD | PIN3)
-#define PIN_UART2_TX             (PIN_ALT3   | PIN_PORTD | PIN3)
-#define PIN_FB_AD3               (PIN_ALT5   | PIN_PORTD | PIN3)
-#define PIN_SPI0_PCS1_2          (PIN_ALT2   | PIN_PORTD | PIN4)
-#define PIN_UART0_RTS_4          (PIN_ALT3   | PIN_PORTD | PIN4)
-#define PIN_FTM0_CH4_2           (PIN_ALT4   | PIN_PORTD | PIN4)
-#define PIN_FB_AD2               (PIN_ALT5   | PIN_PORTD | PIN4)
-#define PIN_EWM_IN_2             (PIN_ALT6   | PIN_PORTD | PIN4)
-#define PIN_ADC0_SE6B            (PIN_ANALOG | PIN_PORTD | PIN5)
-#define PIN_SPI0_PCS2_1          (PIN_ALT2   | PIN_PORTD | PIN5)
-#define PIN_UART0_CTS_4          (PIN_ALT3   | PIN_PORTD | PIN5)
-#define PIN_FTM0_CH5_2           (PIN_ALT4   | PIN_PORTD | PIN5)
-#define PIN_FB_AD1               (PIN_ALT5   | PIN_PORTD | PIN5)
-#define PIN_EWM_OUT_2            (PIN_ALT6   | PIN_PORTD | PIN5)
-#define PIN_ADC0_SE7B            (PIN_ANALOG | PIN_PORTD | PIN6)
-#define PIN_SPI0_PCS3_2          (PIN_ALT2   | PIN_PORTD | PIN6)
-#define PIN_UART0_RX_4           (PIN_ALT3   | PIN_PORTD | PIN6)
-#define PIN_FTM0_CH6_2           (PIN_ALT4   | PIN_PORTD | PIN6)
-#define PIN_FB_AD0               (PIN_ALT5   | PIN_PORTD | PIN6)
-#define PIN_FTM0_FLT0_1          (PIN_ALT6   | PIN_PORTD | PIN6)
-#define PIN_CMT_IRO              (PIN_ALT2   | PIN_PORTD | PIN7)
-#define PIN_UART0_TX_4           (PIN_ALT3   | PIN_PORTD | PIN7)
-#define PIN_FTM0_CH7_2           (PIN_ALT4   | PIN_PORTD | PIN7)
-#define PIN_FTM0_FLT1_2          (PIN_ALT6   | PIN_PORTD | PIN7)
-#define PIN_I2C0_SCL_3           (PIN_ALT2   | PIN_PORTD | PIN8)
-#define PIN_UART5_RX_1           (PIN_ALT3   | PIN_PORTD | PIN8)
-#define PIN_FB_A16               (PIN_ALT6   | PIN_PORTD | PIN8)
-#define PIN_I2C0_SDA_3           (PIN_ALT2   | PIN_PORTD | PIN9)
-#define PIN_UART5_TX_1           (PIN_ALT3   | PIN_PORTD | PIN9)
-#define PIN_FB_A17               (PIN_ALT6   | PIN_PORTD | PIN9)
-#define PIN_UART5_RTS_1          (PIN_ALT3   | PIN_PORTD | PIN10)
-#define PIN_FB_A18               (PIN_ALT6   | PIN_PORTD | PIN10)
-#define PIN_SPI2_PCS0_2          (PIN_ALT2   | PIN_PORTD | PIN11)
-#define PIN_UART5_CTS_1          (PIN_ALT3   | PIN_PORTD | PIN11)
-#define PIN_SDHC0_CLKIN          (PIN_ALT4   | PIN_PORTD | PIN11)
-#define PIN_FB_A19               (PIN_ALT6   | PIN_PORTD | PIN11)
-#define PIN_SPI2_SCK_2           (PIN_ALT2   | PIN_PORTD | PIN12)
-#define PIN_SDHC0_D4             (PIN_ALT4   | PIN_PORTD | PIN12)
-#define PIN_FB_A20               (PIN_ALT6   | PIN_PORTD | PIN12)
-#define PIN_SPI2_SOUT_2          (PIN_ALT2   | PIN_PORTD | PIN13)
-#define PIN_SDHC0_D5             (PIN_ALT4   | PIN_PORTD | PIN13)
-#define PIN_FB_A21               (PIN_ALT6   | PIN_PORTD | PIN13)
-#define PIN_SPI2_SIN_2           (PIN_ALT2   | PIN_PORTD | PIN14)
-#define PIN_SDHC0_D6             (PIN_ALT4   | PIN_PORTD | PIN14)
-#define PIN_FB_A22               (PIN_ALT6   | PIN_PORTD | PIN14)
-#define PIN_SPI2_PCS1            (PIN_ALT2   | PIN_PORTD | PIN15)
-#define PIN_SDHC0_D7             (PIN_ALT4   | PIN_PORTD | PIN15)
-#define PIN_FB_A23               (PIN_ALT6   | PIN_PORTD | PIN15)
-
-#define PIN_ADC1_SE4A            (PIN_ANALOG | PIN_PORTE | PIN0)
-#define PIN_SPI1_PCS1_2          (PIN_ALT2   | PIN_PORTE | PIN0)
-#define PIN_UART1_TX_2           (PIN_ALT3   | PIN_PORTE | PIN0)
-#define PIN_SDHC0_D1             (PIN_ALT4   | PIN_PORTE | PIN0)
-#define PIN_I2C1_SDA_2           (PIN_ALT6   | PIN_PORTE | PIN0)
-#define PIN_ADC1_SE5A            (PIN_ANALOG | PIN_PORTE | PIN1)
-#define PIN_SPI1_SOUT_2          (PIN_ALT2   | PIN_PORTE | PIN1)
-#define PIN_UART1_RX_2           (PIN_ALT3   | PIN_PORTE | PIN1)
-#define PIN_SDHC0_D0             (PIN_ALT4   | PIN_PORTE | PIN1)
-#define PIN_I2C1_SCL_2           (PIN_ALT6   | PIN_PORTE | PIN1)
-#define PIN_ADC1_SE6A            (PIN_ANALOG | PIN_PORTE | PIN2)
-#define PIN_SPI1_SCK_2           (PIN_ALT2   | PIN_PORTE | PIN2)
-#define PIN_UART1_CTS_2          (PIN_ALT3   | PIN_PORTE | PIN2)
-#define PIN_SDHC0_DCLK           (PIN_ALT4   | PIN_PORTE | PIN2)
-#define PIN_ADC1_SE7A            (PIN_ANALOG | PIN_PORTE | PIN3)
-#define PIN_SPI1_SIN_2           (PIN_ALT2   | PIN_PORTE | PIN3)
-#define PIN_UART1_RTS_2          (PIN_ALT3   | PIN_PORTE | PIN3)
-#define PIN_SDHC0_CMD            (PIN_ALT4   | PIN_PORTE | PIN3)
-#define PIN_SPI1_PCS0_2          (PIN_ALT2   | PIN_PORTE | PIN4)
-#define PIN_UART3_TX_3           (PIN_ALT3   | PIN_PORTE | PIN4)
-#define PIN_SDHC0_D3             (PIN_ALT4   | PIN_PORTE | PIN4)
-#define PIN_SPI1_PCS2            (PIN_ALT2   | PIN_PORTE | PIN5)
-#define PIN_UART3_RX_3           (PIN_ALT3   | PIN_PORTE | PIN5)
-#define PIN_SDHC0_D2             (PIN_ALT4   | PIN_PORTE | PIN5)
-#define PIN_SPI1_PCS3            (PIN_ALT2   | PIN_PORTE | PIN6)
-#define PIN_UART3_CTS_3          (PIN_ALT3   | PIN_PORTE | PIN6)
-#define PIN_I2S0_MCLK_3          (PIN_ALT4   | PIN_PORTE | PIN6)
-#define PIN_I2S0_CLKIN_3         (PIN_ALT6   | PIN_PORTE | PIN6)
-#define PIN_UART3_RTS_3          (PIN_ALT3   | PIN_PORTE | PIN7)
-#define PIN_I2S0_RXD_3           (PIN_ALT4   | PIN_PORTE | PIN7)
-#define PIN_UART5_TX_2           (PIN_ALT3   | PIN_PORTE | PIN8)
-#define PIN_I2S0_RX_FS_3         (PIN_ALT4   | PIN_PORTE | PIN8)
-#define PIN_UART5_RX_2           (PIN_ALT3   | PIN_PORTE | PIN9)
-#define PIN_I2S0_RX_BCLK_3       (PIN_ALT4   | PIN_PORTE | PIN9)
-#define PIN_UART5_CTS_2          (PIN_ALT3   | PIN_PORTE | PIN10)
-#define PIN_I2S0_TXD_3           (PIN_ALT4   | PIN_PORTE | PIN10)
-#define PIN_UART5_RTS_2          (PIN_ALT3   | PIN_PORTE | PIN11)
-#define PIN_I2S0_TX_FS_3         (PIN_ALT4   | PIN_PORTE | PIN11)
-#define PIN_I2S0_TX_BCLK_3       (PIN_ALT4   | PIN_PORTE | PIN12)
-#define PIN_ADC0_SE17            (PIN_ANALOG | PIN_PORTE | PIN24)
-#define PIN_CAN1_TX_2            (PIN_ALT2   | PIN_PORTE | PIN24)
-#define PIN_UART4_TX_2           (PIN_ALT3   | PIN_PORTE | PIN24)
-#define PIN_EWM_OUT_3            (PIN_ALT6   | PIN_PORTE | PIN24)
-#define PIN_ADC0_SE18            (PIN_ANALOG | PIN_PORTE | PIN25)
-#define PIN_CAN1_RX_2            (PIN_ALT2   | PIN_PORTE | PIN25)
-#define PIN_UART4_RX_2           (PIN_ALT3   | PIN_PORTE | PIN25)
-#define PIN_EWM_IN_3             (PIN_ALT6   | PIN_PORTE | PIN25)
-#define PIN_UART4_CTS_2          (PIN_ALT3   | PIN_PORTE | PIN26)
-#define PIN_ENET_1588_CLKIN      (PIN_ALT4   | PIN_PORTE | PIN26)
-#define PIN_RTC_CLKOUT           (PIN_ALT6   | PIN_PORTE | PIN26)
-#define PIN_USB_CLKIN            (PIN_ALT7   | PIN_PORTE | PIN26)
-#define PIN_UART4_RTS_2          (PIN_ALT3   | PIN_PORTE | PIN27)
+#define PIN_ADC0_DM2              (PIN_ALT0 | PIN_PORTE | PIN3)
+#define PIN_ADC0_DP2              (PIN_ALT0 | PIN_PORTE | PIN2)
+#define PIN_ADC0_SE4b             (PIN_ALT0 | PIN_PORTC | PIN2)
+#define PIN_ADC0_SE5b             (PIN_ALT0 | PIN_PORTD | PIN1)
+#define PIN_ADC0_SE6b             (PIN_ALT0 | PIN_PORTD | PIN5)
+#define PIN_ADC0_SE7b             (PIN_ALT0 | PIN_PORTD | PIN6)
+#define PIN_ADC0_SE8              (PIN_ALT0 | PIN_PORTB | PIN0)
+#define PIN_ADC0_SE9              (PIN_ALT0 | PIN_PORTB | PIN1)
+#define PIN_ADC0_SE10             (PIN_ALT0 | PIN_PORTA | PIN7)
+#define PIN_ADC0_SE11             (PIN_ALT0 | PIN_PORTA | PIN8)
+#define PIN_ADC0_SE12             (PIN_ALT0 | PIN_PORTB | PIN2)
+#define PIN_ADC0_SE13             (PIN_ALT0 | PIN_PORTB | PIN3)
+#define PIN_ADC0_SE14             (PIN_ALT0 | PIN_PORTC | PIN0)
+#define PIN_ADC0_SE15             (PIN_ALT0 | PIN_PORTC | PIN1)
+#define PIN_ADC0_SE17             (PIN_ALT0 | PIN_PORTE | PIN24)
+#define PIN_ADC0_SE18             (PIN_ALT0 | PIN_PORTE | PIN25)
+
+#define PIN_ADC1_SE4a             (PIN_ALT0 | PIN_PORTE | PIN0)
+#define PIN_ADC1_SE4b             (PIN_ALT0 | PIN_PORTC | PIN8)
+#define PIN_ADC1_SE5a             (PIN_ALT0 | PIN_PORTE | PIN1)
+#define PIN_ADC1_SE5b             (PIN_ALT0 | PIN_PORTC | PIN9)
+#define PIN_ADC1_SE6a             (PIN_ALT0 | PIN_PORTE | PIN2)
+#define PIN_ADC1_SE6b             (PIN_ALT0 | PIN_PORTC | PIN10)
+#define PIN_ADC1_SE7a             (PIN_ALT0 | PIN_PORTE | PIN3)
+#define PIN_ADC1_SE7b             (PIN_ALT0 | PIN_PORTC | PIN11)
+#define PIN_ADC1_SE8              (PIN_ALT0 | PIN_PORTB | PIN0)
+#define PIN_ADC1_SE9              (PIN_ALT0 | PIN_PORTB | PIN1)
+#define PIN_ADC1_SE10             (PIN_ALT0 | PIN_PORTB | PIN4)
+#define PIN_ADC1_SE11             (PIN_ALT0 | PIN_PORTB | PIN5)
+#define PIN_ADC1_SE12             (PIN_ALT0 | PIN_PORTB | PIN6)
+#define PIN_ADC1_SE13             (PIN_ALT0 | PIN_PORTB | PIN7)
+#define PIN_ADC1_SE14             (PIN_ALT0 | PIN_PORTB | PIN10)
+#define PIN_ADC1_SE15             (PIN_ALT0 | PIN_PORTB | PIN11)
+#define PIN_ADC1_SE17             (PIN_ALT0 | PIN_PORTA | PIN17)
+
+#define PIN_CAN0_RX_1             (PIN_ALT2 | PIN_PORTA | PIN13)
+#define PIN_CAN0_RX_2             (PIN_ALT2 | PIN_PORTB | PIN19)
+#define PIN_CAN0_TX_1             (PIN_ALT2 | PIN_PORTA | PIN12)
+#define PIN_CAN0_TX_2             (PIN_ALT2 | PIN_PORTB | PIN18)
+
+#define PIN_CLKOUT_1              (PIN_ALT5 | PIN_PORTA | PIN6)
+#define PIN_CLKOUT_2              (PIN_ALT5 | PIN_PORTC | PIN3)
+
+#define PIN_CMP0_IN0              (PIN_ALT0 | PIN_PORTC | PIN6)
+#define PIN_CMP0_IN1              (PIN_ALT0 | PIN_PORTC | PIN7)
+#define PIN_CMP0_IN2              (PIN_ALT0 | PIN_PORTC | PIN8)
+#define PIN_CMP0_IN3              (PIN_ALT0 | PIN_PORTC | PIN9)
+#define PIN_CMP0_OUT_1            (PIN_ALT6 | PIN_PORTB | PIN20)
+#define PIN_CMP0_OUT_2            (PIN_ALT6 | PIN_PORTC | PIN5)
+
+#define PIN_CMP1_IN0              (PIN_ALT0 | PIN_PORTC | PIN2)
+#define PIN_CMP1_IN1              (PIN_ALT0 | PIN_PORTC | PIN3)
+#define PIN_CMP1_OUT_1            (PIN_ALT6 | PIN_PORTB | PIN21)
+#define PIN_CMP1_OUT_2            (PIN_ALT6 | PIN_PORTC | PIN4)
+
+#define PIN_CMP2_IN0              (PIN_ALT0 | PIN_PORTA | PIN12)
+#define PIN_CMP2_IN1              (PIN_ALT0 | PIN_PORTA | PIN13)
+#define PIN_CMP2_OUT_1            (PIN_ALT5 | PIN_PORTA | PIN5)
+#define PIN_CMP2_OUT_2            (PIN_ALT6 | PIN_PORTB | PIN22)
+
+#define PIN_CMT_IRO               (PIN_ALT2 | PIN_PORTD | PIN7)
+
+#define PIN_ENET_1588_CLKIN       (PIN_ALT2 | PIN_PORTE | PIN26)
+#define PIN_ENET0_1588_TMR0_1     (PIN_ALT4 | PIN_PORTB | PIN2)
+#define PIN_ENET0_1588_TMR0_2     (PIN_ALT4 | PIN_PORTC | PIN16)
+#define PIN_ENET0_1588_TMR1_1     (PIN_ALT4 | PIN_PORTB | PIN3)
+#define PIN_ENET0_1588_TMR1_2     (PIN_ALT4 | PIN_PORTC | PIN17)
+#define PIN_ENET0_1588_TMR2_1     (PIN_ALT4 | PIN_PORTB | PIN4)
+#define PIN_ENET0_1588_TMR2_2     (PIN_ALT4 | PIN_PORTC | PIN18)
+#define PIN_ENET0_1588_TMR3_1     (PIN_ALT4 | PIN_PORTB | PIN5)
+#define PIN_ENET0_1588_TMR3_2     (PIN_ALT4 | PIN_PORTC | PIN19)
+
+#define PIN_EWM_IN_1              (PIN_ALT6 | PIN_PORTB | PIN16)
+#define PIN_EWM_IN_2              (PIN_ALT6 | PIN_PORTD | PIN4)
+#define PIN_EWM_IN_3              (PIN_ALT6 | PIN_PORTE | PIN25)
+#define PIN_EWM_OUT_1             (PIN_ALT6 | PIN_PORTB | PIN17)
+#define PIN_EWM_OUT_2             (PIN_ALT6 | PIN_PORTD | PIN5)
+#define PIN_EWM_OUT_3             (PIN_ALT6 | PIN_PORTE | PIN24)
+
+#define PIN_EXTAL0                (PIN_ALT0 | PIN_PORTA | PIN18)
+
+#define PIN_FB_A16                (PIN_ALT6 | PIN_PORTD | PIN8)
+#define PIN_FB_A17                (PIN_ALT6 | PIN_PORTD | PIN9)
+#define PIN_FB_A18                (PIN_ALT6 | PIN_PORTD | PIN10)
+#define PIN_FB_A19                (PIN_ALT6 | PIN_PORTD | PIN11)
+#define PIN_FB_A20                (PIN_ALT6 | PIN_PORTD | PIN12)
+#define PIN_FB_A21                (PIN_ALT6 | PIN_PORTD | PIN13)
+#define PIN_FB_A22                (PIN_ALT6 | PIN_PORTD | PIN14)
+#define PIN_FB_A23                (PIN_ALT6 | PIN_PORTD | PIN15)
+#define PIN_FB_A24                (PIN_ALT6 | PIN_PORTA | PIN29)
+#define PIN_FB_A25                (PIN_ALT6 | PIN_PORTA | PIN28)
+#define PIN_FB_A26                (PIN_ALT6 | PIN_PORTA | PIN27)
+#define PIN_FB_A27                (PIN_ALT6 | PIN_PORTA | PIN26)
+#define PIN_FB_A28                (PIN_ALT6 | PIN_PORTA | PIN25)
+#define PIN_FB_A29                (PIN_ALT6 | PIN_PORTA | PIN24)
+#define PIN_FB_AD0                (PIN_ALT5 | PIN_PORTD | PIN6)
+#define PIN_FB_AD1                (PIN_ALT5 | PIN_PORTD | PIN5)
+#define PIN_FB_AD2                (PIN_ALT5 | PIN_PORTD | PIN4)
+#define PIN_FB_AD3                (PIN_ALT5 | PIN_PORTD | PIN3)
+#define PIN_FB_AD4                (PIN_ALT5 | PIN_PORTD | PIN2)
+#define PIN_FB_AD5                (PIN_ALT5 | PIN_PORTC | PIN10)
+#define PIN_FB_AD6                (PIN_ALT5 | PIN_PORTC | PIN9)
+#define PIN_FB_AD7                (PIN_ALT5 | PIN_PORTC | PIN8)
+#define PIN_FB_AD8                (PIN_ALT5 | PIN_PORTC | PIN7)
+#define PIN_FB_AD9                (PIN_ALT5 | PIN_PORTC | PIN6)
+#define PIN_FB_AD10               (PIN_ALT5 | PIN_PORTC | PIN5)
+#define PIN_FB_AD11               (PIN_ALT5 | PIN_PORTC | PIN4)
+#define PIN_FB_AD12               (PIN_ALT5 | PIN_PORTC | PIN2)
+#define PIN_FB_AD13               (PIN_ALT5 | PIN_PORTC | PIN1)
+#define PIN_FB_AD14               (PIN_ALT5 | PIN_PORTC | PIN0)
+#define PIN_FB_AD15               (PIN_ALT5 | PIN_PORTB | PIN18)
+#define PIN_FB_AD16               (PIN_ALT5 | PIN_PORTB | PIN17)
+#define PIN_FB_AD17               (PIN_ALT5 | PIN_PORTB | PIN16)
+#define PIN_FB_AD18               (PIN_ALT5 | PIN_PORTB | PIN11)
+#define PIN_FB_AD19               (PIN_ALT5 | PIN_PORTB | PIN10)
+#define PIN_FB_AD20               (PIN_ALT5 | PIN_PORTB | PIN9)
+#define PIN_FB_AD21               (PIN_ALT5 | PIN_PORTB | PIN8)
+#define PIN_FB_AD22               (PIN_ALT5 | PIN_PORTB | PIN7)
+#define PIN_FB_AD23               (PIN_ALT5 | PIN_PORTB | PIN6)
+#define PIN_FB_AD24               (PIN_ALT5 | PIN_PORTC | PIN15)
+#define PIN_FB_AD25               (PIN_ALT5 | PIN_PORTC | PIN14)
+#define PIN_FB_AD26               (PIN_ALT5 | PIN_PORTC | PIN13)
+#define PIN_FB_AD27               (PIN_ALT5 | PIN_PORTC | PIN12)
+#define PIN_FB_AD28               (PIN_ALT5 | PIN_PORTB | PIN23)
+#define PIN_FB_AD29               (PIN_ALT5 | PIN_PORTB | PIN22)
+#define PIN_FB_AD30               (PIN_ALT5 | PIN_PORTB | PIN21)
+#define PIN_FB_AD31               (PIN_ALT5 | PIN_PORTB | PIN20)
+#define PIN_FB_ALE                (PIN_ALT5 | PIN_PORTD | PIN0)
+#define PIN_FB_BE15_8_BLS23_16    (PIN_ALT5 | PIN_PORTC | PIN18)
+#define PIN_FB_BE23_16_BLS15_8    (PIN_ALT5 | PIN_PORTC | PIN16)
+#define PIN_FB_BE31_24_BLS7_0     (PIN_ALT5 | PIN_PORTC | PIN17)
+#define PIN_FB_BE7_0_BLS31_24     (PIN_ALT5 | PIN_PORTC | PIN19)
+#define PIN_FB_CS0                (PIN_ALT5 | PIN_PORTD | PIN1)
+#define PIN_FB_CS1                (PIN_ALT5 | PIN_PORTD | PIN0)
+#define PIN_FB_CS2                (PIN_ALT5 | PIN_PORTC | PIN18)
+#define PIN_FB_CS3                (PIN_ALT5 | PIN_PORTC | PIN19)
+#define PIN_FB_CS4                (PIN_ALT5 | PIN_PORTC | PIN17)
+#define PIN_FB_CS5                (PIN_ALT5 | PIN_PORTC | PIN16)
+#define PIN_FB_OE                 (PIN_ALT5 | PIN_PORTB | PIN19)
+#define PIN_FB_RW                 (PIN_ALT5 | PIN_PORTC | PIN11)
+#define PIN_FB_TA                 (PIN_ALT6 | PIN_PORTC | PIN19)
+#define PIN_FB_TBST               (PIN_ALT5 | PIN_PORTC | PIN18)
+#define PIN_FB_TS                 (PIN_ALT5 | PIN_PORTD | PIN0)
+#define PIN_FB_TSIZ0              (PIN_ALT5 | PIN_PORTC | PIN17)
+#define PIN_FB_TSIZ1              (PIN_ALT5 | PIN_PORTC | PIN16)
+
+#define PIN_FTM_CLKIN0_1          (PIN_ALT4 | PIN_PORTA | PIN18)
+#define PIN_FTM_CLKIN0_2          (PIN_ALT4 | PIN_PORTB | PIN16)
+#define PIN_FTM_CLKIN1_1          (PIN_ALT4 | PIN_PORTA | PIN19)
+#define PIN_FTM_CLKIN1_2          (PIN_ALT4 | PIN_PORTB | PIN17)
+
+#define PIN_FTM0_CH0_1            (PIN_ALT3 | PIN_PORTA | PIN3)
+#define PIN_FTM0_CH0_2            (PIN_ALT4 | PIN_PORTC | PIN1)
+#define PIN_FTM0_CH1_1            (PIN_ALT3 | PIN_PORTA | PIN4)
+#define PIN_FTM0_CH1_2            (PIN_ALT4 | PIN_PORTC | PIN2)
+#define PIN_FTM0_CH2_1            (PIN_ALT3 | PIN_PORTA | PIN5)
+#define PIN_FTM0_CH2_2            (PIN_ALT4 | PIN_PORTC | PIN3)
+#define PIN_FTM0_CH2_3            (PIN_ALT7 | PIN_PORTC | PIN5)
+#define PIN_FTM0_CH3_1            (PIN_ALT3 | PIN_PORTA | PIN6)
+#define PIN_FTM0_CH3_2            (PIN_ALT4 | PIN_PORTC | PIN4)
+#define PIN_FTM0_CH4_1            (PIN_ALT3 | PIN_PORTA | PIN7)
+#define PIN_FTM0_CH4_2            (PIN_ALT4 | PIN_PORTB | PIN12)
+#define PIN_FTM0_CH4_3            (PIN_ALT4 | PIN_PORTD | PIN4)
+#define PIN_FTM0_CH5_1            (PIN_ALT3 | PIN_PORTA | PIN0)
+#define PIN_FTM0_CH5_2            (PIN_ALT4 | PIN_PORTB | PIN13)
+#define PIN_FTM0_CH5_3            (PIN_ALT4 | PIN_PORTD | PIN5)
+#define PIN_FTM0_CH6_1            (PIN_ALT3 | PIN_PORTA | PIN1)
+#define PIN_FTM0_CH6_2            (PIN_ALT4 | PIN_PORTD | PIN6)
+#define PIN_FTM0_CH7_1            (PIN_ALT3 | PIN_PORTA | PIN2)
+#define PIN_FTM0_CH7_2            (PIN_ALT4 | PIN_PORTD | PIN7)
+#define PIN_FTM0_FLT0_1           (PIN_ALT6 | PIN_PORTB | PIN3)
+#define PIN_FTM0_FLT0_2           (PIN_ALT6 | PIN_PORTD | PIN6)
+#define PIN_FTM0_FLT1_1           (PIN_ALT6 | PIN_PORTB | PIN10)
+#define PIN_FTM0_FLT1_2           (PIN_ALT6 | PIN_PORTD | PIN7)
+#define PIN_FTM0_FLT2_1           (PIN_ALT3 | PIN_PORTA | PIN18)
+#define PIN_FTM0_FLT2_2           (PIN_ALT6 | PIN_PORTB | PIN11)
+#define PIN_FTM0_FLT3             (PIN_ALT6 | PIN_PORTB | PIN2)
+
+#define PIN_FTM1_CH0_1            (PIN_ALT3 | PIN_PORTA | PIN12)
+#define PIN_FTM1_CH0_2            (PIN_ALT3 | PIN_PORTA | PIN8)
+#define PIN_FTM1_CH0_3            (PIN_ALT3 | PIN_PORTB | PIN0)
+#define PIN_FTM1_CH0_4            (PIN_ALT3 | PIN_PORTB | PIN12)
+#define PIN_FTM1_CH1_1            (PIN_ALT3 | PIN_PORTA | PIN13)
+#define PIN_FTM1_CH1_2            (PIN_ALT3 | PIN_PORTA | PIN9)
+#define PIN_FTM1_CH1_3            (PIN_ALT3 | PIN_PORTB | PIN1)
+#define PIN_FTM1_CH1_4            (PIN_ALT3 | PIN_PORTB | PIN13)
+#define PIN_FTM1_FLT0_1           (PIN_ALT3 | PIN_PORTA | PIN19)
+#define PIN_FTM1_FLT0_2           (PIN_ALT6 | PIN_PORTB | PIN4)
+#define PIN_FTM1_QD_PHA_1         (PIN_ALT6 | PIN_PORTA | PIN8)
+#define PIN_FTM1_QD_PHA_2         (PIN_ALT6 | PIN_PORTB | PIN0)
+#define PIN_FTM1_QD_PHA_3         (PIN_ALT6 | PIN_PORTB | PIN12)
+#define PIN_FTM1_QD_PHA_4         (PIN_ALT7 | PIN_PORTA | PIN12)
+#define PIN_FTM1_QD_PHB_1         (PIN_ALT6 | PIN_PORTA | PIN9)
+#define PIN_FTM1_QD_PHB_2         (PIN_ALT6 | PIN_PORTB | PIN1)
+#define PIN_FTM1_QD_PHB_3         (PIN_ALT6 | PIN_PORTB | PIN13)
+#define PIN_FTM1_QD_PHB_4         (PIN_ALT7 | PIN_PORTA | PIN13)
+
+#define PIN_FTM2_CH0_1            (PIN_ALT3 | PIN_PORTA | PIN10)
+#define PIN_FTM2_CH0_2            (PIN_ALT3 | PIN_PORTB | PIN18)
+#define PIN_FTM2_CH1_1            (PIN_ALT3 | PIN_PORTA | PIN11)
+#define PIN_FTM2_CH1_2            (PIN_ALT3 | PIN_PORTB | PIN19)
+#define PIN_FTM2_FLT0_1           (PIN_ALT6 | PIN_PORTB | PIN5)
+#define PIN_FTM2_FLT0_2           (PIN_ALT6 | PIN_PORTC | PIN9)
+#define PIN_FTM2_QD_PHA_1         (PIN_ALT6 | PIN_PORTA | PIN10)
+#define PIN_FTM2_QD_PHA_2         (PIN_ALT6 | PIN_PORTB | PIN18)
+#define PIN_FTM2_QD_PHB_1         (PIN_ALT6 | PIN_PORTA | PIN11)
+#define PIN_FTM2_QD_PHB_2         (PIN_ALT6 | PIN_PORTB | PIN19)
+
+#define PIN_FTM3_CH0_1            (PIN_ALT4 | PIN_PORTD | PIN0)
+#define PIN_FTM3_CH0_2            (PIN_ALT6 | PIN_PORTE | PIN5)
+#define PIN_FTM3_CH1_1            (PIN_ALT4 | PIN_PORTD | PIN1)
+#define PIN_FTM3_CH1_2            (PIN_ALT6 | PIN_PORTE | PIN6)
+#define PIN_FTM3_CH2_1            (PIN_ALT4 | PIN_PORTD | PIN2)
+#define PIN_FTM3_CH2_2            (PIN_ALT6 | PIN_PORTE | PIN7)
+#define PIN_FTM3_CH3_1            (PIN_ALT4 | PIN_PORTD | PIN3)
+#define PIN_FTM3_CH3_2            (PIN_ALT6 | PIN_PORTE | PIN8)
+#define PIN_FTM3_CH4_1            (PIN_ALT3 | PIN_PORTC | PIN8)
+#define PIN_FTM3_CH4_2            (PIN_ALT6 | PIN_PORTE | PIN9)
+#define PIN_FTM3_CH5_1            (PIN_ALT3 | PIN_PORTC | PIN9)
+#define PIN_FTM3_CH5_2            (PIN_ALT6 | PIN_PORTE | PIN10)
+#define PIN_FTM3_CH6_1            (PIN_ALT3 | PIN_PORTC | PIN10)
+#define PIN_FTM3_CH6_2            (PIN_ALT6 | PIN_PORTE | PIN11)
+#define PIN_FTM3_CH7_1            (PIN_ALT3 | PIN_PORTC | PIN11)
+#define PIN_FTM3_CH7_2            (PIN_ALT6 | PIN_PORTE | PIN12)
+#define PIN_FTM3_FLT0_1           (PIN_ALT3 | PIN_PORTD | PIN12)
+#define PIN_FTM3_FLT0_2           (PIN_ALT6 | PIN_PORTC | PIN12)
+
+#define PIN_I2C0_SCL_1            (PIN_ALT2 | PIN_PORTB | PIN0)
+#define PIN_I2C0_SCL_2            (PIN_ALT2 | PIN_PORTB | PIN2)
+#define PIN_I2C0_SCL_3            (PIN_ALT2 | PIN_PORTD | PIN8)
+#define PIN_I2C0_SCL_4            (PIN_ALT5 | PIN_PORTE | PIN24)
+#define PIN_I2C0_SCL_5            (PIN_ALT7 | PIN_PORTD | PIN2)
+#define PIN_I2C0_SDA_1            (PIN_ALT2 | PIN_PORTB | PIN1)
+#define PIN_I2C0_SDA_2            (PIN_ALT2 | PIN_PORTB | PIN3)
+#define PIN_I2C0_SDA_3            (PIN_ALT2 | PIN_PORTD | PIN9)
+#define PIN_I2C0_SDA_4            (PIN_ALT5 | PIN_PORTE | PIN25)
+#define PIN_I2C0_SDA_5            (PIN_ALT7 | PIN_PORTD | PIN3)
+
+#define PIN_I2C1_SCL_1            (PIN_ALT2 | PIN_PORTC | PIN10)
+#define PIN_I2C1_SCL_2            (PIN_ALT6 | PIN_PORTE | PIN1)
+#define PIN_I2C1_SDA_1            (PIN_ALT2 | PIN_PORTC | PIN11)
+#define PIN_I2C1_SDA_2            (PIN_ALT6 | PIN_PORTE | PIN0)
+
+#define PIN_I2C2_SCL_1            (PIN_ALT5 | PIN_PORTA | PIN12)
+#define PIN_I2C2_SCL_2            (PIN_ALT5 | PIN_PORTA | PIN14)
+#define PIN_I2C2_SDA_1            (PIN_ALT5 | PIN_PORTA | PIN11)
+#define PIN_I2C2_SDA_2            (PIN_ALT5 | PIN_PORTA | PIN13)
+
+#define PIN_I2S0_MCLK_1           (PIN_ALT4 | PIN_PORTC | PIN8)
+#define PIN_I2S0_MCLK_2           (PIN_ALT4 | PIN_PORTE | PIN6)
+#define PIN_I2S0_MCLK_3           (PIN_ALT6 | PIN_PORTA | PIN17)
+#define PIN_I2S0_MCLK_4           (PIN_ALT6 | PIN_PORTC | PIN6)
+#define PIN_I2S0_RX_BCLK_1        (PIN_ALT4 | PIN_PORTC | PIN6)
+#define PIN_I2S0_RX_BCLK_2        (PIN_ALT4 | PIN_PORTC | PIN9)
+#define PIN_I2S0_RX_BCLK_3        (PIN_ALT4 | PIN_PORTE | PIN9)
+#define PIN_I2S0_RX_BCLK_4        (PIN_ALT6 | PIN_PORTA | PIN14)
+#define PIN_I2S0_RX_FS_1          (PIN_ALT4 | PIN_PORTC | PIN10)
+#define PIN_I2S0_RX_FS_2          (PIN_ALT4 | PIN_PORTC | PIN7)
+#define PIN_I2S0_RX_FS_3          (PIN_ALT4 | PIN_PORTE | PIN8)
+#define PIN_I2S0_RX_FS_4          (PIN_ALT6 | PIN_PORTA | PIN16)
+#define PIN_I2S0_RXD0_1           (PIN_ALT4 | PIN_PORTC | PIN5)
+#define PIN_I2S0_RXD0_2           (PIN_ALT4 | PIN_PORTE | PIN7)
+#define PIN_I2S0_RXD0_3           (PIN_ALT6 | PIN_PORTA | PIN15)
+#define PIN_I2S0_RXD1_1           (PIN_ALT2 | PIN_PORTE | PIN8)
+#define PIN_I2S0_RXD1_2           (PIN_ALT4 | PIN_PORTC | PIN11)
+#define PIN_I2S0_RXD1_3           (PIN_ALT7 | PIN_PORTA | PIN16)
+#define PIN_I2S0_TX_BCLK_1        (PIN_ALT4 | PIN_PORTB | PIN18)
+#define PIN_I2S0_TX_BCLK_2        (PIN_ALT4 | PIN_PORTE | PIN12)
+#define PIN_I2S0_TX_BCLK_3        (PIN_ALT6 | PIN_PORTA | PIN5)
+#define PIN_I2S0_TX_BCLK_4        (PIN_ALT6 | PIN_PORTC | PIN3)
+#define PIN_I2S0_TX_FS_1          (PIN_ALT4 | PIN_PORTB | PIN19)
+#define PIN_I2S0_TX_FS_2          (PIN_ALT4 | PIN_PORTE | PIN11)
+#define PIN_I2S0_TX_FS_3          (PIN_ALT6 | PIN_PORTA | PIN13)
+#define PIN_I2S0_TX_FS_4          (PIN_ALT6 | PIN_PORTC | PIN2)
+#define PIN_I2S0_TXD0_1           (PIN_ALT4 | PIN_PORTE | PIN10)
+#define PIN_I2S0_TXD0_2           (PIN_ALT6 | PIN_PORTA | PIN12)
+#define PIN_I2S0_TXD0_3           (PIN_ALT6 | PIN_PORTC | PIN1)
+#define PIN_I2S0_TXD1_1           (PIN_ALT2 | PIN_PORTE | PIN9)
+#define PIN_I2S0_TXD1_2           (PIN_ALT6 | PIN_PORTC | PIN0)
+#define PIN_I2S0_TXD1_3           (PIN_ALT7 | PIN_PORTA | PIN14)
+
+#define PIN_JTAG_TCLK             (PIN_ALT7 | PIN_PORTA | PIN0)
+#define PIN_JTAG_TDI              (PIN_ALT7 | PIN_PORTA | PIN1)
+#define PIN_JTAG_TDO              (PIN_ALT7 | PIN_PORTA | PIN2)
+#define PIN_JTAG_TMS              (PIN_ALT7 | PIN_PORTA | PIN3)
+#define PIN_JTAG_TRST             (PIN_ALT7 | PIN_PORTA | PIN5)
+
+#define PIN_LLWU_P0               (PIN_ALT1 | PIN_PORTE | PIN1)
+#define PIN_LLWU_P1               (PIN_ALT1 | PIN_PORTE | PIN2)
+#define PIN_LLWU_P2               (PIN_ALT1 | PIN_PORTE | PIN4)
+#define PIN_LLWU_P3               (PIN_ALT1 | PIN_PORTA | PIN4)
+#define PIN_LLWU_P4               (PIN_ALT1 | PIN_PORTA | PIN13)
+#define PIN_LLWU_P5               (PIN_ALT1 | PIN_PORTB | PIN0)
+#define PIN_LLWU_P6               (PIN_ALT1 | PIN_PORTC | PIN1)
+#define PIN_LLWU_P7               (PIN_ALT1 | PIN_PORTC | PIN3)
+#define PIN_LLWU_P8               (PIN_ALT1 | PIN_PORTC | PIN4)
+#define PIN_LLWU_P9               (PIN_ALT1 | PIN_PORTC | PIN5)
+#define PIN_LLWU_P10              (PIN_ALT1 | PIN_PORTC | PIN6)
+#define PIN_LLWU_P11              (PIN_ALT1 | PIN_PORTC | PIN11)
+#define PIN_LLWU_P12              (PIN_ALT1 | PIN_PORTD | PIN0)
+#define PIN_LLWU_P13              (PIN_ALT1 | PIN_PORTD | PIN2)
+#define PIN_LLWU_P14              (PIN_ALT1 | PIN_PORTD | PIN4)
+#define PIN_LLWU_P15              (PIN_ALT1 | PIN_PORTD | PIN6)
+
+#define PIN_LPTMR0_ALT1           (PIN_ALT6 | PIN_PORTA | PIN19)
+#define PIN_LPTMR0_ALT2           (PIN_ALT3 | PIN_PORTC | PIN5)
+
+#define PIN_MII0_COL              (PIN_ALT4 | PIN_PORTA | PIN29)
+#define PIN_MII0_CRS              (PIN_ALT4 | PIN_PORTA | PIN27)
+#define PIN_MII0_MDC              (PIN_ALT4 | PIN_PORTB | PIN1)
+#define PIN_MII0_MDIO             (PIN_ALT4 | PIN_PORTB | PIN0)
+#define PIN_MII0_RXCLK            (PIN_ALT4 | PIN_PORTA | PIN11)
+#define PIN_MII0_RXD0             (PIN_ALT4 | PIN_PORTA | PIN13)
+#define PIN_MII0_RXD1             (PIN_ALT4 | PIN_PORTA | PIN12)
+#define PIN_MII0_RXD2             (PIN_ALT4 | PIN_PORTA | PIN10)
+#define PIN_MII0_RXD3             (PIN_ALT4 | PIN_PORTA | PIN9)
+#define PIN_MII0_RXDV             (PIN_ALT4 | PIN_PORTA | PIN14)
+#define PIN_MII0_RXER             (PIN_ALT4 | PIN_PORTA | PIN5)
+#define PIN_MII0_TXCLK            (PIN_ALT4 | PIN_PORTA | PIN25)
+#define PIN_MII0_TXD0             (PIN_ALT4 | PIN_PORTA | PIN16)
+#define PIN_MII0_TXD1             (PIN_ALT4 | PIN_PORTA | PIN17)
+#define PIN_MII0_TXD2             (PIN_ALT4 | PIN_PORTA | PIN24)
+#define PIN_MII0_TXD3             (PIN_ALT4 | PIN_PORTA | PIN26)
+#define PIN_MII0_TXEN             (PIN_ALT4 | PIN_PORTA | PIN15)
+#define PIN_MII0_TXER             (PIN_ALT4 | PIN_PORTA | PIN28)
+
+#define PIN_NMI                   (PIN_ALT7 | PIN_PORTA | PIN4)
+
+#define PIN_PDB0_EXTRG_1          (PIN_ALT3 | PIN_PORTC | PIN0)
+#define PIN_PDB0_EXTRG_2          (PIN_ALT3 | PIN_PORTC | PIN6)
+
+#define PIN_PTA0                  (PIN_ALT1 | PIN_PORTA | PIN0)
+#define PIN_PTA1                  (PIN_ALT1 | PIN_PORTA | PIN1)
+#define PIN_PTA2                  (PIN_ALT1 | PIN_PORTA | PIN2)
+#define PIN_PTA3                  (PIN_ALT1 | PIN_PORTA | PIN3)
+#define PIN_PTA4                  (PIN_ALT1 | PIN_PORTA | PIN4)
+#define PIN_PTA5                  (PIN_ALT1 | PIN_PORTA | PIN5)
+#define PIN_PTA6                  (PIN_ALT1 | PIN_PORTA | PIN6)
+#define PIN_PTA7                  (PIN_ALT1 | PIN_PORTA | PIN7)
+#define PIN_PTA8                  (PIN_ALT1 | PIN_PORTA | PIN8)
+#define PIN_PTA9                  (PIN_ALT1 | PIN_PORTA | PIN9)
+#define PIN_PTA10                 (PIN_ALT1 | PIN_PORTA | PIN10)
+#define PIN_PTA11                 (PIN_ALT1 | PIN_PORTA | PIN11)
+#define PIN_PTA12                 (PIN_ALT1 | PIN_PORTA | PIN12)
+#define PIN_PTA13                 (PIN_ALT1 | PIN_PORTA | PIN13)
+#define PIN_PTA14                 (PIN_ALT1 | PIN_PORTA | PIN14)
+#define PIN_PTA15                 (PIN_ALT1 | PIN_PORTA | PIN15)
+#define PIN_PTA16                 (PIN_ALT1 | PIN_PORTA | PIN16)
+#define PIN_PTA17                 (PIN_ALT1 | PIN_PORTA | PIN17)
+#define PIN_PTA18                 (PIN_ALT1 | PIN_PORTA | PIN18)
+#define PIN_PTA19                 (PIN_ALT1 | PIN_PORTA | PIN19)
+#define PIN_PTA24                 (PIN_ALT1 | PIN_PORTA | PIN24)
+#define PIN_PTA25                 (PIN_ALT1 | PIN_PORTA | PIN25)
+#define PIN_PTA26                 (PIN_ALT1 | PIN_PORTA | PIN26)
+#define PIN_PTA27                 (PIN_ALT1 | PIN_PORTA | PIN27)
+#define PIN_PTA28                 (PIN_ALT1 | PIN_PORTA | PIN28)
+#define PIN_PTA29                 (PIN_ALT1 | PIN_PORTA | PIN29)
+
+#define PIN_PTB0                  (PIN_ALT1 | PIN_PORTB | PIN0)
+#define PIN_PTB1                  (PIN_ALT1 | PIN_PORTB | PIN1)
+#define PIN_PTB2                  (PIN_ALT1 | PIN_PORTB | PIN2)
+#define PIN_PTB3                  (PIN_ALT1 | PIN_PORTB | PIN3)
+#define PIN_PTB4                  (PIN_ALT1 | PIN_PORTB | PIN4)
+#define PIN_PTB5                  (PIN_ALT1 | PIN_PORTB | PIN5)
+#define PIN_PTB6                  (PIN_ALT1 | PIN_PORTB | PIN6)
+#define PIN_PTB7                  (PIN_ALT1 | PIN_PORTB | PIN7)
+#define PIN_PTB8                  (PIN_ALT1 | PIN_PORTB | PIN8)
+#define PIN_PTB9                  (PIN_ALT1 | PIN_PORTB | PIN9)
+#define PIN_PTB10                 (PIN_ALT1 | PIN_PORTB | PIN10)
+#define PIN_PTB11                 (PIN_ALT1 | PIN_PORTB | PIN11)
+#define PIN_PTB12                 (PIN_ALT1 | PIN_PORTB | PIN12)
+#define PIN_PTB13                 (PIN_ALT1 | PIN_PORTB | PIN13)
+#define PIN_PTB16                 (PIN_ALT1 | PIN_PORTB | PIN16)
+#define PIN_PTB17                 (PIN_ALT1 | PIN_PORTB | PIN17)
+#define PIN_PTB18                 (PIN_ALT1 | PIN_PORTB | PIN18)
+#define PIN_PTB19                 (PIN_ALT1 | PIN_PORTB | PIN19)
+#define PIN_PTB20                 (PIN_ALT1 | PIN_PORTB | PIN20)
+#define PIN_PTB21                 (PIN_ALT1 | PIN_PORTB | PIN21)
+#define PIN_PTB22                 (PIN_ALT1 | PIN_PORTB | PIN22)
+#define PIN_PTB23                 (PIN_ALT1 | PIN_PORTB | PIN23)
+
+#define PIN_PTC0                  (PIN_ALT1 | PIN_PORTC | PIN0)
+#define PIN_PTC1                  (PIN_ALT1 | PIN_PORTC | PIN1)
+#define PIN_PTC2                  (PIN_ALT1 | PIN_PORTC | PIN2)
+#define PIN_PTC3                  (PIN_ALT1 | PIN_PORTC | PIN3)
+#define PIN_PTC4                  (PIN_ALT1 | PIN_PORTC | PIN4)
+#define PIN_PTC5                  (PIN_ALT1 | PIN_PORTC | PIN5)
+#define PIN_PTC6                  (PIN_ALT1 | PIN_PORTC | PIN6)
+#define PIN_PTC7                  (PIN_ALT1 | PIN_PORTC | PIN7)
+#define PIN_PTC8                  (PIN_ALT1 | PIN_PORTC | PIN8)
+#define PIN_PTC9                  (PIN_ALT1 | PIN_PORTC | PIN9)
+#define PIN_PTC10                 (PIN_ALT1 | PIN_PORTC | PIN10)
+#define PIN_PTC11                 (PIN_ALT1 | PIN_PORTC | PIN11)
+#define PIN_PTC12                 (PIN_ALT1 | PIN_PORTC | PIN12)
+#define PIN_PTC13                 (PIN_ALT1 | PIN_PORTC | PIN13)
+#define PIN_PTC14                 (PIN_ALT1 | PIN_PORTC | PIN14)
+#define PIN_PTC15                 (PIN_ALT1 | PIN_PORTC | PIN15)
+#define PIN_PTC16                 (PIN_ALT1 | PIN_PORTC | PIN16)
+#define PIN_PTC17                 (PIN_ALT1 | PIN_PORTC | PIN17)
+#define PIN_PTC18                 (PIN_ALT1 | PIN_PORTC | PIN18)
+#define PIN_PTC19                 (PIN_ALT1 | PIN_PORTC | PIN19)
+
+#define PIN_PTD0                  (PIN_ALT1 | PIN_PORTD | PIN0)
+#define PIN_PTD1                  (PIN_ALT1 | PIN_PORTD | PIN1)
+#define PIN_PTD2                  (PIN_ALT1 | PIN_PORTD | PIN2)
+#define PIN_PTD3                  (PIN_ALT1 | PIN_PORTD | PIN3)
+#define PIN_PTD4                  (PIN_ALT1 | PIN_PORTD | PIN4)
+#define PIN_PTD5                  (PIN_ALT1 | PIN_PORTD | PIN5)
+#define PIN_PTD6                  (PIN_ALT1 | PIN_PORTD | PIN6)
+#define PIN_PTD7                  (PIN_ALT1 | PIN_PORTD | PIN7)
+#define PIN_PTD8                  (PIN_ALT1 | PIN_PORTD | PIN8)
+#define PIN_PTD9                  (PIN_ALT1 | PIN_PORTD | PIN9)
+#define PIN_PTD10                 (PIN_ALT1 | PIN_PORTD | PIN10)
+#define PIN_PTD11                 (PIN_ALT1 | PIN_PORTD | PIN11)
+#define PIN_PTD12                 (PIN_ALT1 | PIN_PORTD | PIN12)
+#define PIN_PTD13                 (PIN_ALT1 | PIN_PORTD | PIN13)
+#define PIN_PTD14                 (PIN_ALT1 | PIN_PORTD | PIN14)
+#define PIN_PTD15                 (PIN_ALT1 | PIN_PORTD | PIN15)
+
+#define PIN_PTE0                  (PIN_ALT1 | PIN_PORTE | PIN0)
+#define PIN_PTE1                  (PIN_ALT1 | PIN_PORTE | PIN1)
+#define PIN_PTE2                  (PIN_ALT1 | PIN_PORTE | PIN2)
+#define PIN_PTE3                  (PIN_ALT1 | PIN_PORTE | PIN3)
+#define PIN_PTE4                  (PIN_ALT1 | PIN_PORTE | PIN4)
+#define PIN_PTE5                  (PIN_ALT1 | PIN_PORTE | PIN5)
+#define PIN_PTE6                  (PIN_ALT1 | PIN_PORTE | PIN6)
+#define PIN_PTE7                  (PIN_ALT1 | PIN_PORTE | PIN7)
+#define PIN_PTE8                  (PIN_ALT1 | PIN_PORTE | PIN8)
+#define PIN_PTE9                  (PIN_ALT1 | PIN_PORTE | PIN9)
+#define PIN_PTE10                 (PIN_ALT1 | PIN_PORTE | PIN10)
+#define PIN_PTE11                 (PIN_ALT1 | PIN_PORTE | PIN11)
+#define PIN_PTE12                 (PIN_ALT1 | PIN_PORTE | PIN12)
+#define PIN_PTE24                 (PIN_ALT1 | PIN_PORTE | PIN24)
+#define PIN_PTE25                 (PIN_ALT1 | PIN_PORTE | PIN25)
+#define PIN_PTE26                 (PIN_ALT1 | PIN_PORTE | PIN26)
+#define PIN_PTE27                 (PIN_ALT1 | PIN_PORTE | PIN27)
+#define PIN_PTE28                 (PIN_ALT1 | PIN_PORTE | PIN28)
+
+#define PIN_RMII0_CRS_DV          (PIN_ALT4 | PIN_PORTA | PIN14)
+#define PIN_RMII0_MDC             (PIN_ALT4 | PIN_PORTB | PIN1)
+#define PIN_RMII0_MDIO            (PIN_ALT4 | PIN_PORTB | PIN0)
+#define PIN_RMII0_RXD0            (PIN_ALT4 | PIN_PORTA | PIN13)
+#define PIN_RMII0_RXD1            (PIN_ALT4 | PIN_PORTA | PIN12)
+#define PIN_RMII0_RXER            (PIN_ALT4 | PIN_PORTA | PIN5)
+#define PIN_RMII0_TXD0            (PIN_ALT4 | PIN_PORTA | PIN16)
+#define PIN_RMII0_TXD1            (PIN_ALT4 | PIN_PORTA | PIN17)
+#define PIN_RMII0_TXEN            (PIN_ALT4 | PIN_PORTA | PIN15)
+
+#define PIN_RTC_CLKOUT_1          (PIN_ALT6 | PIN_PORTE | PIN26)
+#define PIN_RTC_CLKOUT_2          (PIN_ALT7 | PIN_PORTE | PIN0)
+
+#define PIN_SDHC0_CLKIN           (PIN_ALT4 | PIN_PORTD | PIN11)
+#define PIN_SDHC0_CMD             (PIN_ALT4 | PIN_PORTE | PIN3)
+#define PIN_SDHC0_D0              (PIN_ALT4 | PIN_PORTE | PIN1)
+#define PIN_SDHC0_D1              (PIN_ALT4 | PIN_PORTE | PIN0)
+#define PIN_SDHC0_D2              (PIN_ALT4 | PIN_PORTE | PIN5)
+#define PIN_SDHC0_D3              (PIN_ALT4 | PIN_PORTE | PIN4)
+#define PIN_SDHC0_D4              (PIN_ALT4 | PIN_PORTD | PIN12)
+#define PIN_SDHC0_D5              (PIN_ALT4 | PIN_PORTD | PIN13)
+#define PIN_SDHC0_D6              (PIN_ALT4 | PIN_PORTD | PIN14)
+#define PIN_SDHC0_D7              (PIN_ALT4 | PIN_PORTD | PIN15)
+#define PIN_SDHC0_DCLK            (PIN_ALT4 | PIN_PORTE | PIN2)
+
+#define PIN_SPI0_PCS0_1           (PIN_ALT2 | PIN_PORTA | PIN14)
+#define PIN_SPI0_PCS0_2           (PIN_ALT2 | PIN_PORTC | PIN4)
+#define PIN_SPI0_PCS0_3           (PIN_ALT2 | PIN_PORTD | PIN0)
+#define PIN_SPI0_PCS1_1           (PIN_ALT2 | PIN_PORTC | PIN3)
+#define PIN_SPI0_PCS1_2           (PIN_ALT2 | PIN_PORTD | PIN4)
+#define PIN_SPI0_PCS2_1           (PIN_ALT2 | PIN_PORTC | PIN2)
+#define PIN_SPI0_PCS2_3           (PIN_ALT2 | PIN_PORTD | PIN5)
+#define PIN_SPI0_PCS3_1           (PIN_ALT2 | PIN_PORTC | PIN1)
+#define PIN_SPI0_PCS3_2           (PIN_ALT2 | PIN_PORTD | PIN6)
+#define PIN_SPI0_PCS4             (PIN_ALT2 | PIN_PORTC | PIN0)
+#define PIN_SPI0_PCS5             (PIN_ALT3 | PIN_PORTB | PIN23)
+#define PIN_SPI0_SCK_1            (PIN_ALT2 | PIN_PORTA | PIN15)
+#define PIN_SPI0_SCK_2            (PIN_ALT2 | PIN_PORTC | PIN5)
+#define PIN_SPI0_SCK_3            (PIN_ALT2 | PIN_PORTD | PIN1)
+#define PIN_SPI0_SIN_1            (PIN_ALT2 | PIN_PORTA | PIN17)
+#define PIN_SPI0_SIN_2            (PIN_ALT2 | PIN_PORTC | PIN7)
+#define PIN_SPI0_SIN_3            (PIN_ALT2 | PIN_PORTD | PIN3)
+#define PIN_SPI0_SOUT_1           (PIN_ALT2 | PIN_PORTA | PIN16)
+#define PIN_SPI0_SOUT_2           (PIN_ALT2 | PIN_PORTC | PIN6)
+#define PIN_SPI0_SOUT_3           (PIN_ALT2 | PIN_PORTD | PIN2)
+
+#define PIN_SPI1_PCS0_1           (PIN_ALT2 | PIN_PORTB | PIN10)
+#define PIN_SPI1_PCS0_2           (PIN_ALT2 | PIN_PORTE | PIN4)
+#define PIN_SPI1_PCS0_3           (PIN_ALT7 | PIN_PORTD | PIN4)
+#define PIN_SPI1_PCS1_1           (PIN_ALT2 | PIN_PORTB | PIN9)
+#define PIN_SPI1_PCS1_2           (PIN_ALT2 | PIN_PORTE | PIN0)
+#define PIN_SPI1_PCS2             (PIN_ALT2 | PIN_PORTE | PIN5)
+#define PIN_SPI1_PCS3             (PIN_ALT2 | PIN_PORTE | PIN6)
+#define PIN_SPI1_SCK_1            (PIN_ALT2 | PIN_PORTB | PIN11)
+#define PIN_SPI1_SCK_2            (PIN_ALT2 | PIN_PORTE | PIN2)
+#define PIN_SPI1_SCK_3            (PIN_ALT7 | PIN_PORTD | PIN5)
+#define PIN_SPI1_SIN_1            (PIN_ALT2 | PIN_PORTB | PIN17)
+#define PIN_SPI1_SIN_2            (PIN_ALT2 | PIN_PORTE | PIN3)
+#define PIN_SPI1_SIN_3            (PIN_ALT7 | PIN_PORTD | PIN7)
+#define PIN_SPI1_SIN_4            (PIN_ALT7 | PIN_PORTE | PIN1)
+#define PIN_SPI1_SOUT_1           (PIN_ALT2 | PIN_PORTB | PIN16)
+#define PIN_SPI1_SOUT_2           (PIN_ALT2 | PIN_PORTE | PIN1)
+#define PIN_SPI1_SOUT_3           (PIN_ALT7 | PIN_PORTD | PIN6)
+#define PIN_SPI1_SOUT_4           (PIN_ALT7 | PIN_PORTE | PIN3)
+
+#define PIN_SPI2_PCS0_1           (PIN_ALT2 | PIN_PORTB | PIN20)
+#define PIN_SPI2_PCS0_2           (PIN_ALT2 | PIN_PORTD | PIN11)
+#define PIN_SPI2_PCS1             (PIN_ALT2 | PIN_PORTD | PIN15)
+#define PIN_SPI2_SCK_1            (PIN_ALT2 | PIN_PORTB | PIN21)
+#define PIN_SPI2_SCK_2            (PIN_ALT2 | PIN_PORTD | PIN12)
+#define PIN_SPI2_SIN_1            (PIN_ALT2 | PIN_PORTB | PIN23)
+#define PIN_SPI2_SIN_2            (PIN_ALT2 | PIN_PORTD | PIN14)
+#define PIN_SPI2_SOUT_1           (PIN_ALT2 | PIN_PORTB | PIN22)
+#define PIN_SPI2_SOUT_2           (PIN_ALT2 | PIN_PORTD | PIN13)
+
+#define PIN_SWD_CLK               (PIN_ALT7 | PIN_PORTA | PIN0)
+#define PIN_SWD_DIO               (PIN_ALT7 | PIN_PORTA | PIN3)
+
+#define PIN_TRACE_CLKOUT_1        (PIN_ALT5 | PIN_PORTE | PIN0)
+#define PIN_TRACE_CLKOUT_2        (PIN_ALT7 | PIN_PORTA | PIN6)
+#define PIN_TRACE_D0_1            (PIN_ALT5 | PIN_PORTE | PIN4)
+#define PIN_TRACE_D0_2            (PIN_ALT7 | PIN_PORTA | PIN10)
+#define PIN_TRACE_D1_1            (PIN_ALT5 | PIN_PORTE | PIN3)
+#define PIN_TRACE_D1_2            (PIN_ALT7 | PIN_PORTA | PIN9)
+#define PIN_TRACE_D2_1            (PIN_ALT5 | PIN_PORTE | PIN2)
+#define PIN_TRACE_D2_2            (PIN_ALT7 | PIN_PORTA | PIN8)
+#define PIN_TRACE_D3_1            (PIN_ALT5 | PIN_PORTE | PIN1)
+#define PIN_TRACE_D3_2            (PIN_ALT7 | PIN_PORTA | PIN7)
+#define PIN_TRACE_SWO             (PIN_ALT7 | PIN_PORTA | PIN2)
+
+#define PIN_UART0_COL_1           (PIN_ALT2 | PIN_PORTA | PIN0)
+#define PIN_UART0_COL_2           (PIN_ALT3 | PIN_PORTA | PIN16)
+#define PIN_UART0_COL_3           (PIN_ALT3 | PIN_PORTB | PIN3)
+#define PIN_UART0_COL_4           (PIN_ALT3 | PIN_PORTD | PIN5)
+#define PIN_UART0_CTS_1           (PIN_ALT2 | PIN_PORTA | PIN0)
+#define PIN_UART0_CTS_2           (PIN_ALT3 | PIN_PORTA | PIN16)
+#define PIN_UART0_CTS_3           (PIN_ALT3 | PIN_PORTB | PIN3)
+#define PIN_UART0_CTS_4           (PIN_ALT3 | PIN_PORTD | PIN5)
+#define PIN_UART0_RTS_1           (PIN_ALT2 | PIN_PORTA | PIN3)
+#define PIN_UART0_RTS_2           (PIN_ALT3 | PIN_PORTA | PIN17)
+#define PIN_UART0_RTS_3           (PIN_ALT3 | PIN_PORTB | PIN2)
+#define PIN_UART0_RTS_4           (PIN_ALT3 | PIN_PORTD | PIN4)
+#define PIN_UART0_RX_1            (PIN_ALT2 | PIN_PORTA | PIN1)
+#define PIN_UART0_RX_2            (PIN_ALT3 | PIN_PORTA | PIN15)
+#define PIN_UART0_RX_3            (PIN_ALT3 | PIN_PORTB | PIN16)
+#define PIN_UART0_RX_4            (PIN_ALT3 | PIN_PORTD | PIN6)
+#define PIN_UART0_TX_1            (PIN_ALT2 | PIN_PORTA | PIN2)
+#define PIN_UART0_TX_2            (PIN_ALT3 | PIN_PORTA | PIN14)
+#define PIN_UART0_TX_3            (PIN_ALT3 | PIN_PORTB | PIN17)
+#define PIN_UART0_TX_4            (PIN_ALT3 | PIN_PORTD | PIN7)
+
+#define PIN_UART1_CTS_1           (PIN_ALT3 | PIN_PORTC | PIN2)
+#define PIN_UART1_CTS_2           (PIN_ALT3 | PIN_PORTE | PIN2)
+#define PIN_UART1_RTS_1           (PIN_ALT3 | PIN_PORTC | PIN1)
+#define PIN_UART1_RTS_2           (PIN_ALT3 | PIN_PORTE | PIN3)
+#define PIN_UART1_RX_1            (PIN_ALT3 | PIN_PORTC | PIN3)
+#define PIN_UART1_RX_2            (PIN_ALT3 | PIN_PORTE | PIN1)
+#define PIN_UART1_TX_1            (PIN_ALT3 | PIN_PORTC | PIN4)
+#define PIN_UART1_TX_2            (PIN_ALT3 | PIN_PORTE | PIN0)
+
+#define PIN_UART2_CTS             (PIN_ALT3 | PIN_PORTD | PIN1)
+#define PIN_UART2_RTS             (PIN_ALT3 | PIN_PORTD | PIN0)
+#define PIN_UART2_RX              (PIN_ALT3 | PIN_PORTD | PIN2)
+#define PIN_UART2_TX              (PIN_ALT3 | PIN_PORTD | PIN3)
+
+#define PIN_UART3_CTS_1           (PIN_ALT2 | PIN_PORTB | PIN13)
+#define PIN_UART3_CTS_2           (PIN_ALT3 | PIN_PORTB | PIN9)
+#define PIN_UART3_CTS_3           (PIN_ALT3 | PIN_PORTC | PIN19)
+#define PIN_UART3_CTS_4           (PIN_ALT3 | PIN_PORTE | PIN6)
+#define PIN_UART3_RTS_1           (PIN_ALT2 | PIN_PORTB | PIN12)
+#define PIN_UART3_RTS_2           (PIN_ALT3 | PIN_PORTB | PIN8)
+#define PIN_UART3_RTS_3           (PIN_ALT3 | PIN_PORTC | PIN18)
+#define PIN_UART3_RTS_4           (PIN_ALT3 | PIN_PORTE | PIN7)
+#define PIN_UART3_RX_1            (PIN_ALT3 | PIN_PORTB | PIN10)
+#define PIN_UART3_RX_2            (PIN_ALT3 | PIN_PORTC | PIN16)
+#define PIN_UART3_RX_3            (PIN_ALT3 | PIN_PORTE | PIN5)
+#define PIN_UART3_TX_1            (PIN_ALT3 | PIN_PORTB | PIN11)
+#define PIN_UART3_TX_2            (PIN_ALT3 | PIN_PORTC | PIN17)
+#define PIN_UART3_TX_3            (PIN_ALT3 | PIN_PORTE | PIN4)
+
+#define PIN_UART4_CTS_1           (PIN_ALT3 | PIN_PORTC | PIN13)
+#define PIN_UART4_CTS_2           (PIN_ALT3 | PIN_PORTE | PIN26)
+#define PIN_UART4_RTS_1           (PIN_ALT3 | PIN_PORTC | PIN12)
+#define PIN_UART4_RTS_2           (PIN_ALT3 | PIN_PORTE | PIN27)
+#define PIN_UART4_RX_1            (PIN_ALT3 | PIN_PORTC | PIN14)
+#define PIN_UART4_RX_2            (PIN_ALT3 | PIN_PORTE | PIN25)
+#define PIN_UART4_TX_1            (PIN_ALT3 | PIN_PORTC | PIN15)
+#define PIN_UART4_TX_2            (PIN_ALT3 | PIN_PORTE | PIN24)
+
+#define PIN_UART5_CTS_1           (PIN_ALT3 | PIN_PORTD | PIN11)
+#define PIN_UART5_CTS_2           (PIN_ALT3 | PIN_PORTE | PIN10)
+#define PIN_UART5_RTS_1           (PIN_ALT3 | PIN_PORTD | PIN10)
+#define PIN_UART5_RTS_2           (PIN_ALT3 | PIN_PORTE | PIN11)
+#define PIN_UART5_RX_1            (PIN_ALT3 | PIN_PORTD | PIN8)
+#define PIN_UART5_RX_2            (PIN_ALT3 | PIN_PORTE | PIN9)
+#define PIN_UART5_TX_1            (PIN_ALT3 | PIN_PORTD | PIN9)
+#define PIN_UART5_TX_2            (PIN_ALT3 | PIN_PORTE | PIN8)
+
+#define PIN_USB_CLKIN_1           (PIN_ALT2 | PIN_PORTA | PIN5)
+#define PIN_USB_CLKIN_2           (PIN_ALT7 | PIN_PORTE | PIN26)
+#define PIN_USB_SOF_OUT_1         (PIN_ALT3 | PIN_PORTC | PIN7)
+#define PIN_USB_SOF_OUT_2         (PIN_ALT4 | PIN_PORTC | PIN0)
+#define PIN_USB_SOF_OUT_3         (PIN_ALT7 | PIN_PORTE | PIN6)
+
+#define PIN_XTAL0                 (PIN_ALT0 | PIN_PORTA | PIN19)
 
 /********************************************************************************************
  * Public Types
diff --git a/configs/freedom-k64f/include/board.h b/configs/freedom-k64f/include/board.h
index 036b5ec186..76490a4c7f 100644
--- a/configs/freedom-k64f/include/board.h
+++ b/configs/freedom-k64f/include/board.h
@@ -198,6 +198,14 @@
  * maps to the correct alternative.
  */
 
+/* The primary serial port interface signals are PTB16 UART1_RX and PTB17 UART1_TX.
+ * These signals are connected to the OpenSDAv2 circuit.
+ *
+ * REVISIT: The above quoate was taken from the "FRDM-K64F Freedom Module User’s
+ * Guide". It appears from the "K64 Sub-Family Reference Manual" that the only
+ * options for UART1 are {PTC3, PTE1} for UART1_RX and {PTC4, PTE0} for UART1_TX.
+ */
+
 /************************************************************************************
  * Public Data
  ************************************************************************************/
-- 
GitLab


From 4ad7129ac932bf1f1b6193eba884e457d56304e9 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sat, 2 Jul 2016 11:55:31 -0600
Subject: [PATCH 135/229] Update README and some comments

---
 configs/freedom-k64f/README.txt      | 6 ++++++
 configs/freedom-k64f/include/board.h | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/configs/freedom-k64f/README.txt b/configs/freedom-k64f/README.txt
index 7ec86c49a0..da219bad6a 100644
--- a/configs/freedom-k64f/README.txt
+++ b/configs/freedom-k64f/README.txt
@@ -57,6 +57,12 @@ Serial Console
   The primary serial port interface signals are PTB16 UART1_RX and PTB17
   UART1_TX. These signals are connected to the OpenSDAv2 circuit.
 
+  REVISIT: The above quote was taken from the "FRDM-K64F Freedom Module User’s
+  Guide". It appears from the "K64 Sub-Family Reference Manual" that the only
+  options for UART1 are {PTC3, PTE1} for UART1_RX and {PTC4, PTE0} for UART1_TX.
+
+  PTB16 and PTB17 are valid options for UART0, however.
+
 LEDs and Buttons
 ================
 
diff --git a/configs/freedom-k64f/include/board.h b/configs/freedom-k64f/include/board.h
index 76490a4c7f..041edeb6b5 100644
--- a/configs/freedom-k64f/include/board.h
+++ b/configs/freedom-k64f/include/board.h
@@ -201,9 +201,11 @@
 /* The primary serial port interface signals are PTB16 UART1_RX and PTB17 UART1_TX.
  * These signals are connected to the OpenSDAv2 circuit.
  *
- * REVISIT: The above quoate was taken from the "FRDM-K64F Freedom Module User’s
+ * REVISIT: The above quote was taken from the "FRDM-K64F Freedom Module User’s
  * Guide". It appears from the "K64 Sub-Family Reference Manual" that the only
  * options for UART1 are {PTC3, PTE1} for UART1_RX and {PTC4, PTE0} for UART1_TX.
+ *
+ * PTB16 and PTB17 are valid options for UART0, however.
  */
 
 /************************************************************************************
-- 
GitLab


From f1d0214c61abc57a8c4e43f2f525601ca559e5b8 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sat, 2 Jul 2016 12:09:34 -0600
Subject: [PATCH 136/229] K64 pinmap:  Use uppercase to math k60 pin naming

---
 arch/arm/src/kinetis/chip/kinetis_k64pinmux.h | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/arch/arm/src/kinetis/chip/kinetis_k64pinmux.h b/arch/arm/src/kinetis/chip/kinetis_k64pinmux.h
index 2fcf6c84ff..62c787c183 100644
--- a/arch/arm/src/kinetis/chip/kinetis_k64pinmux.h
+++ b/arch/arm/src/kinetis/chip/kinetis_k64pinmux.h
@@ -62,10 +62,10 @@
 
 #define PIN_ADC0_DM2              (PIN_ALT0 | PIN_PORTE | PIN3)
 #define PIN_ADC0_DP2              (PIN_ALT0 | PIN_PORTE | PIN2)
-#define PIN_ADC0_SE4b             (PIN_ALT0 | PIN_PORTC | PIN2)
-#define PIN_ADC0_SE5b             (PIN_ALT0 | PIN_PORTD | PIN1)
-#define PIN_ADC0_SE6b             (PIN_ALT0 | PIN_PORTD | PIN5)
-#define PIN_ADC0_SE7b             (PIN_ALT0 | PIN_PORTD | PIN6)
+#define PIN_ADC0_SE4B             (PIN_ALT0 | PIN_PORTC | PIN2)
+#define PIN_ADC0_SE5B             (PIN_ALT0 | PIN_PORTD | PIN1)
+#define PIN_ADC0_SE6B             (PIN_ALT0 | PIN_PORTD | PIN5)
+#define PIN_ADC0_SE7B             (PIN_ALT0 | PIN_PORTD | PIN6)
 #define PIN_ADC0_SE8              (PIN_ALT0 | PIN_PORTB | PIN0)
 #define PIN_ADC0_SE9              (PIN_ALT0 | PIN_PORTB | PIN1)
 #define PIN_ADC0_SE10             (PIN_ALT0 | PIN_PORTA | PIN7)
@@ -77,14 +77,14 @@
 #define PIN_ADC0_SE17             (PIN_ALT0 | PIN_PORTE | PIN24)
 #define PIN_ADC0_SE18             (PIN_ALT0 | PIN_PORTE | PIN25)
 
-#define PIN_ADC1_SE4a             (PIN_ALT0 | PIN_PORTE | PIN0)
-#define PIN_ADC1_SE4b             (PIN_ALT0 | PIN_PORTC | PIN8)
-#define PIN_ADC1_SE5a             (PIN_ALT0 | PIN_PORTE | PIN1)
-#define PIN_ADC1_SE5b             (PIN_ALT0 | PIN_PORTC | PIN9)
-#define PIN_ADC1_SE6a             (PIN_ALT0 | PIN_PORTE | PIN2)
-#define PIN_ADC1_SE6b             (PIN_ALT0 | PIN_PORTC | PIN10)
-#define PIN_ADC1_SE7a             (PIN_ALT0 | PIN_PORTE | PIN3)
-#define PIN_ADC1_SE7b             (PIN_ALT0 | PIN_PORTC | PIN11)
+#define PIN_ADC1_SE4A             (PIN_ALT0 | PIN_PORTE | PIN0)
+#define PIN_ADC1_SE4B             (PIN_ALT0 | PIN_PORTC | PIN8)
+#define PIN_ADC1_SE5A             (PIN_ALT0 | PIN_PORTE | PIN1)
+#define PIN_ADC1_SE5B             (PIN_ALT0 | PIN_PORTC | PIN9)
+#define PIN_ADC1_SE6A             (PIN_ALT0 | PIN_PORTE | PIN2)
+#define PIN_ADC1_SE6B             (PIN_ALT0 | PIN_PORTC | PIN10)
+#define PIN_ADC1_SE7A             (PIN_ALT0 | PIN_PORTE | PIN3)
+#define PIN_ADC1_SE7B             (PIN_ALT0 | PIN_PORTC | PIN11)
 #define PIN_ADC1_SE8              (PIN_ALT0 | PIN_PORTB | PIN0)
 #define PIN_ADC1_SE9              (PIN_ALT0 | PIN_PORTB | PIN1)
 #define PIN_ADC1_SE10             (PIN_ALT0 | PIN_PORTB | PIN4)
-- 
GitLab


From ba8e6083bfab0136973364571799814024e71206 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sat, 2 Jul 2016 13:22:11 -0600
Subject: [PATCH 137/229] K64 pin mux fixes:  No PIN_ALT1, use PIN_ANALOG. 
 Remove GPIO pin mux definitions.

---
 arch/arm/src/kinetis/chip/kinetis_k64pinmux.h | 1150 ++++++++---------
 1 file changed, 547 insertions(+), 603 deletions(-)

diff --git a/arch/arm/src/kinetis/chip/kinetis_k64pinmux.h b/arch/arm/src/kinetis/chip/kinetis_k64pinmux.h
index 62c787c183..724761a6e8 100644
--- a/arch/arm/src/kinetis/chip/kinetis_k64pinmux.h
+++ b/arch/arm/src/kinetis/chip/kinetis_k64pinmux.h
@@ -60,609 +60,553 @@
  * pins in the initial version of this file.
  */
 
-#define PIN_ADC0_DM2              (PIN_ALT0 | PIN_PORTE | PIN3)
-#define PIN_ADC0_DP2              (PIN_ALT0 | PIN_PORTE | PIN2)
-#define PIN_ADC0_SE4B             (PIN_ALT0 | PIN_PORTC | PIN2)
-#define PIN_ADC0_SE5B             (PIN_ALT0 | PIN_PORTD | PIN1)
-#define PIN_ADC0_SE6B             (PIN_ALT0 | PIN_PORTD | PIN5)
-#define PIN_ADC0_SE7B             (PIN_ALT0 | PIN_PORTD | PIN6)
-#define PIN_ADC0_SE8              (PIN_ALT0 | PIN_PORTB | PIN0)
-#define PIN_ADC0_SE9              (PIN_ALT0 | PIN_PORTB | PIN1)
-#define PIN_ADC0_SE10             (PIN_ALT0 | PIN_PORTA | PIN7)
-#define PIN_ADC0_SE11             (PIN_ALT0 | PIN_PORTA | PIN8)
-#define PIN_ADC0_SE12             (PIN_ALT0 | PIN_PORTB | PIN2)
-#define PIN_ADC0_SE13             (PIN_ALT0 | PIN_PORTB | PIN3)
-#define PIN_ADC0_SE14             (PIN_ALT0 | PIN_PORTC | PIN0)
-#define PIN_ADC0_SE15             (PIN_ALT0 | PIN_PORTC | PIN1)
-#define PIN_ADC0_SE17             (PIN_ALT0 | PIN_PORTE | PIN24)
-#define PIN_ADC0_SE18             (PIN_ALT0 | PIN_PORTE | PIN25)
-
-#define PIN_ADC1_SE4A             (PIN_ALT0 | PIN_PORTE | PIN0)
-#define PIN_ADC1_SE4B             (PIN_ALT0 | PIN_PORTC | PIN8)
-#define PIN_ADC1_SE5A             (PIN_ALT0 | PIN_PORTE | PIN1)
-#define PIN_ADC1_SE5B             (PIN_ALT0 | PIN_PORTC | PIN9)
-#define PIN_ADC1_SE6A             (PIN_ALT0 | PIN_PORTE | PIN2)
-#define PIN_ADC1_SE6B             (PIN_ALT0 | PIN_PORTC | PIN10)
-#define PIN_ADC1_SE7A             (PIN_ALT0 | PIN_PORTE | PIN3)
-#define PIN_ADC1_SE7B             (PIN_ALT0 | PIN_PORTC | PIN11)
-#define PIN_ADC1_SE8              (PIN_ALT0 | PIN_PORTB | PIN0)
-#define PIN_ADC1_SE9              (PIN_ALT0 | PIN_PORTB | PIN1)
-#define PIN_ADC1_SE10             (PIN_ALT0 | PIN_PORTB | PIN4)
-#define PIN_ADC1_SE11             (PIN_ALT0 | PIN_PORTB | PIN5)
-#define PIN_ADC1_SE12             (PIN_ALT0 | PIN_PORTB | PIN6)
-#define PIN_ADC1_SE13             (PIN_ALT0 | PIN_PORTB | PIN7)
-#define PIN_ADC1_SE14             (PIN_ALT0 | PIN_PORTB | PIN10)
-#define PIN_ADC1_SE15             (PIN_ALT0 | PIN_PORTB | PIN11)
-#define PIN_ADC1_SE17             (PIN_ALT0 | PIN_PORTA | PIN17)
-
-#define PIN_CAN0_RX_1             (PIN_ALT2 | PIN_PORTA | PIN13)
-#define PIN_CAN0_RX_2             (PIN_ALT2 | PIN_PORTB | PIN19)
-#define PIN_CAN0_TX_1             (PIN_ALT2 | PIN_PORTA | PIN12)
-#define PIN_CAN0_TX_2             (PIN_ALT2 | PIN_PORTB | PIN18)
-
-#define PIN_CLKOUT_1              (PIN_ALT5 | PIN_PORTA | PIN6)
-#define PIN_CLKOUT_2              (PIN_ALT5 | PIN_PORTC | PIN3)
-
-#define PIN_CMP0_IN0              (PIN_ALT0 | PIN_PORTC | PIN6)
-#define PIN_CMP0_IN1              (PIN_ALT0 | PIN_PORTC | PIN7)
-#define PIN_CMP0_IN2              (PIN_ALT0 | PIN_PORTC | PIN8)
-#define PIN_CMP0_IN3              (PIN_ALT0 | PIN_PORTC | PIN9)
-#define PIN_CMP0_OUT_1            (PIN_ALT6 | PIN_PORTB | PIN20)
-#define PIN_CMP0_OUT_2            (PIN_ALT6 | PIN_PORTC | PIN5)
-
-#define PIN_CMP1_IN0              (PIN_ALT0 | PIN_PORTC | PIN2)
-#define PIN_CMP1_IN1              (PIN_ALT0 | PIN_PORTC | PIN3)
-#define PIN_CMP1_OUT_1            (PIN_ALT6 | PIN_PORTB | PIN21)
-#define PIN_CMP1_OUT_2            (PIN_ALT6 | PIN_PORTC | PIN4)
-
-#define PIN_CMP2_IN0              (PIN_ALT0 | PIN_PORTA | PIN12)
-#define PIN_CMP2_IN1              (PIN_ALT0 | PIN_PORTA | PIN13)
-#define PIN_CMP2_OUT_1            (PIN_ALT5 | PIN_PORTA | PIN5)
-#define PIN_CMP2_OUT_2            (PIN_ALT6 | PIN_PORTB | PIN22)
-
-#define PIN_CMT_IRO               (PIN_ALT2 | PIN_PORTD | PIN7)
-
-#define PIN_ENET_1588_CLKIN       (PIN_ALT2 | PIN_PORTE | PIN26)
-#define PIN_ENET0_1588_TMR0_1     (PIN_ALT4 | PIN_PORTB | PIN2)
-#define PIN_ENET0_1588_TMR0_2     (PIN_ALT4 | PIN_PORTC | PIN16)
-#define PIN_ENET0_1588_TMR1_1     (PIN_ALT4 | PIN_PORTB | PIN3)
-#define PIN_ENET0_1588_TMR1_2     (PIN_ALT4 | PIN_PORTC | PIN17)
-#define PIN_ENET0_1588_TMR2_1     (PIN_ALT4 | PIN_PORTB | PIN4)
-#define PIN_ENET0_1588_TMR2_2     (PIN_ALT4 | PIN_PORTC | PIN18)
-#define PIN_ENET0_1588_TMR3_1     (PIN_ALT4 | PIN_PORTB | PIN5)
-#define PIN_ENET0_1588_TMR3_2     (PIN_ALT4 | PIN_PORTC | PIN19)
-
-#define PIN_EWM_IN_1              (PIN_ALT6 | PIN_PORTB | PIN16)
-#define PIN_EWM_IN_2              (PIN_ALT6 | PIN_PORTD | PIN4)
-#define PIN_EWM_IN_3              (PIN_ALT6 | PIN_PORTE | PIN25)
-#define PIN_EWM_OUT_1             (PIN_ALT6 | PIN_PORTB | PIN17)
-#define PIN_EWM_OUT_2             (PIN_ALT6 | PIN_PORTD | PIN5)
-#define PIN_EWM_OUT_3             (PIN_ALT6 | PIN_PORTE | PIN24)
-
-#define PIN_EXTAL0                (PIN_ALT0 | PIN_PORTA | PIN18)
-
-#define PIN_FB_A16                (PIN_ALT6 | PIN_PORTD | PIN8)
-#define PIN_FB_A17                (PIN_ALT6 | PIN_PORTD | PIN9)
-#define PIN_FB_A18                (PIN_ALT6 | PIN_PORTD | PIN10)
-#define PIN_FB_A19                (PIN_ALT6 | PIN_PORTD | PIN11)
-#define PIN_FB_A20                (PIN_ALT6 | PIN_PORTD | PIN12)
-#define PIN_FB_A21                (PIN_ALT6 | PIN_PORTD | PIN13)
-#define PIN_FB_A22                (PIN_ALT6 | PIN_PORTD | PIN14)
-#define PIN_FB_A23                (PIN_ALT6 | PIN_PORTD | PIN15)
-#define PIN_FB_A24                (PIN_ALT6 | PIN_PORTA | PIN29)
-#define PIN_FB_A25                (PIN_ALT6 | PIN_PORTA | PIN28)
-#define PIN_FB_A26                (PIN_ALT6 | PIN_PORTA | PIN27)
-#define PIN_FB_A27                (PIN_ALT6 | PIN_PORTA | PIN26)
-#define PIN_FB_A28                (PIN_ALT6 | PIN_PORTA | PIN25)
-#define PIN_FB_A29                (PIN_ALT6 | PIN_PORTA | PIN24)
-#define PIN_FB_AD0                (PIN_ALT5 | PIN_PORTD | PIN6)
-#define PIN_FB_AD1                (PIN_ALT5 | PIN_PORTD | PIN5)
-#define PIN_FB_AD2                (PIN_ALT5 | PIN_PORTD | PIN4)
-#define PIN_FB_AD3                (PIN_ALT5 | PIN_PORTD | PIN3)
-#define PIN_FB_AD4                (PIN_ALT5 | PIN_PORTD | PIN2)
-#define PIN_FB_AD5                (PIN_ALT5 | PIN_PORTC | PIN10)
-#define PIN_FB_AD6                (PIN_ALT5 | PIN_PORTC | PIN9)
-#define PIN_FB_AD7                (PIN_ALT5 | PIN_PORTC | PIN8)
-#define PIN_FB_AD8                (PIN_ALT5 | PIN_PORTC | PIN7)
-#define PIN_FB_AD9                (PIN_ALT5 | PIN_PORTC | PIN6)
-#define PIN_FB_AD10               (PIN_ALT5 | PIN_PORTC | PIN5)
-#define PIN_FB_AD11               (PIN_ALT5 | PIN_PORTC | PIN4)
-#define PIN_FB_AD12               (PIN_ALT5 | PIN_PORTC | PIN2)
-#define PIN_FB_AD13               (PIN_ALT5 | PIN_PORTC | PIN1)
-#define PIN_FB_AD14               (PIN_ALT5 | PIN_PORTC | PIN0)
-#define PIN_FB_AD15               (PIN_ALT5 | PIN_PORTB | PIN18)
-#define PIN_FB_AD16               (PIN_ALT5 | PIN_PORTB | PIN17)
-#define PIN_FB_AD17               (PIN_ALT5 | PIN_PORTB | PIN16)
-#define PIN_FB_AD18               (PIN_ALT5 | PIN_PORTB | PIN11)
-#define PIN_FB_AD19               (PIN_ALT5 | PIN_PORTB | PIN10)
-#define PIN_FB_AD20               (PIN_ALT5 | PIN_PORTB | PIN9)
-#define PIN_FB_AD21               (PIN_ALT5 | PIN_PORTB | PIN8)
-#define PIN_FB_AD22               (PIN_ALT5 | PIN_PORTB | PIN7)
-#define PIN_FB_AD23               (PIN_ALT5 | PIN_PORTB | PIN6)
-#define PIN_FB_AD24               (PIN_ALT5 | PIN_PORTC | PIN15)
-#define PIN_FB_AD25               (PIN_ALT5 | PIN_PORTC | PIN14)
-#define PIN_FB_AD26               (PIN_ALT5 | PIN_PORTC | PIN13)
-#define PIN_FB_AD27               (PIN_ALT5 | PIN_PORTC | PIN12)
-#define PIN_FB_AD28               (PIN_ALT5 | PIN_PORTB | PIN23)
-#define PIN_FB_AD29               (PIN_ALT5 | PIN_PORTB | PIN22)
-#define PIN_FB_AD30               (PIN_ALT5 | PIN_PORTB | PIN21)
-#define PIN_FB_AD31               (PIN_ALT5 | PIN_PORTB | PIN20)
-#define PIN_FB_ALE                (PIN_ALT5 | PIN_PORTD | PIN0)
-#define PIN_FB_BE15_8_BLS23_16    (PIN_ALT5 | PIN_PORTC | PIN18)
-#define PIN_FB_BE23_16_BLS15_8    (PIN_ALT5 | PIN_PORTC | PIN16)
-#define PIN_FB_BE31_24_BLS7_0     (PIN_ALT5 | PIN_PORTC | PIN17)
-#define PIN_FB_BE7_0_BLS31_24     (PIN_ALT5 | PIN_PORTC | PIN19)
-#define PIN_FB_CS0                (PIN_ALT5 | PIN_PORTD | PIN1)
-#define PIN_FB_CS1                (PIN_ALT5 | PIN_PORTD | PIN0)
-#define PIN_FB_CS2                (PIN_ALT5 | PIN_PORTC | PIN18)
-#define PIN_FB_CS3                (PIN_ALT5 | PIN_PORTC | PIN19)
-#define PIN_FB_CS4                (PIN_ALT5 | PIN_PORTC | PIN17)
-#define PIN_FB_CS5                (PIN_ALT5 | PIN_PORTC | PIN16)
-#define PIN_FB_OE                 (PIN_ALT5 | PIN_PORTB | PIN19)
-#define PIN_FB_RW                 (PIN_ALT5 | PIN_PORTC | PIN11)
-#define PIN_FB_TA                 (PIN_ALT6 | PIN_PORTC | PIN19)
-#define PIN_FB_TBST               (PIN_ALT5 | PIN_PORTC | PIN18)
-#define PIN_FB_TS                 (PIN_ALT5 | PIN_PORTD | PIN0)
-#define PIN_FB_TSIZ0              (PIN_ALT5 | PIN_PORTC | PIN17)
-#define PIN_FB_TSIZ1              (PIN_ALT5 | PIN_PORTC | PIN16)
-
-#define PIN_FTM_CLKIN0_1          (PIN_ALT4 | PIN_PORTA | PIN18)
-#define PIN_FTM_CLKIN0_2          (PIN_ALT4 | PIN_PORTB | PIN16)
-#define PIN_FTM_CLKIN1_1          (PIN_ALT4 | PIN_PORTA | PIN19)
-#define PIN_FTM_CLKIN1_2          (PIN_ALT4 | PIN_PORTB | PIN17)
-
-#define PIN_FTM0_CH0_1            (PIN_ALT3 | PIN_PORTA | PIN3)
-#define PIN_FTM0_CH0_2            (PIN_ALT4 | PIN_PORTC | PIN1)
-#define PIN_FTM0_CH1_1            (PIN_ALT3 | PIN_PORTA | PIN4)
-#define PIN_FTM0_CH1_2            (PIN_ALT4 | PIN_PORTC | PIN2)
-#define PIN_FTM0_CH2_1            (PIN_ALT3 | PIN_PORTA | PIN5)
-#define PIN_FTM0_CH2_2            (PIN_ALT4 | PIN_PORTC | PIN3)
-#define PIN_FTM0_CH2_3            (PIN_ALT7 | PIN_PORTC | PIN5)
-#define PIN_FTM0_CH3_1            (PIN_ALT3 | PIN_PORTA | PIN6)
-#define PIN_FTM0_CH3_2            (PIN_ALT4 | PIN_PORTC | PIN4)
-#define PIN_FTM0_CH4_1            (PIN_ALT3 | PIN_PORTA | PIN7)
-#define PIN_FTM0_CH4_2            (PIN_ALT4 | PIN_PORTB | PIN12)
-#define PIN_FTM0_CH4_3            (PIN_ALT4 | PIN_PORTD | PIN4)
-#define PIN_FTM0_CH5_1            (PIN_ALT3 | PIN_PORTA | PIN0)
-#define PIN_FTM0_CH5_2            (PIN_ALT4 | PIN_PORTB | PIN13)
-#define PIN_FTM0_CH5_3            (PIN_ALT4 | PIN_PORTD | PIN5)
-#define PIN_FTM0_CH6_1            (PIN_ALT3 | PIN_PORTA | PIN1)
-#define PIN_FTM0_CH6_2            (PIN_ALT4 | PIN_PORTD | PIN6)
-#define PIN_FTM0_CH7_1            (PIN_ALT3 | PIN_PORTA | PIN2)
-#define PIN_FTM0_CH7_2            (PIN_ALT4 | PIN_PORTD | PIN7)
-#define PIN_FTM0_FLT0_1           (PIN_ALT6 | PIN_PORTB | PIN3)
-#define PIN_FTM0_FLT0_2           (PIN_ALT6 | PIN_PORTD | PIN6)
-#define PIN_FTM0_FLT1_1           (PIN_ALT6 | PIN_PORTB | PIN10)
-#define PIN_FTM0_FLT1_2           (PIN_ALT6 | PIN_PORTD | PIN7)
-#define PIN_FTM0_FLT2_1           (PIN_ALT3 | PIN_PORTA | PIN18)
-#define PIN_FTM0_FLT2_2           (PIN_ALT6 | PIN_PORTB | PIN11)
-#define PIN_FTM0_FLT3             (PIN_ALT6 | PIN_PORTB | PIN2)
-
-#define PIN_FTM1_CH0_1            (PIN_ALT3 | PIN_PORTA | PIN12)
-#define PIN_FTM1_CH0_2            (PIN_ALT3 | PIN_PORTA | PIN8)
-#define PIN_FTM1_CH0_3            (PIN_ALT3 | PIN_PORTB | PIN0)
-#define PIN_FTM1_CH0_4            (PIN_ALT3 | PIN_PORTB | PIN12)
-#define PIN_FTM1_CH1_1            (PIN_ALT3 | PIN_PORTA | PIN13)
-#define PIN_FTM1_CH1_2            (PIN_ALT3 | PIN_PORTA | PIN9)
-#define PIN_FTM1_CH1_3            (PIN_ALT3 | PIN_PORTB | PIN1)
-#define PIN_FTM1_CH1_4            (PIN_ALT3 | PIN_PORTB | PIN13)
-#define PIN_FTM1_FLT0_1           (PIN_ALT3 | PIN_PORTA | PIN19)
-#define PIN_FTM1_FLT0_2           (PIN_ALT6 | PIN_PORTB | PIN4)
-#define PIN_FTM1_QD_PHA_1         (PIN_ALT6 | PIN_PORTA | PIN8)
-#define PIN_FTM1_QD_PHA_2         (PIN_ALT6 | PIN_PORTB | PIN0)
-#define PIN_FTM1_QD_PHA_3         (PIN_ALT6 | PIN_PORTB | PIN12)
-#define PIN_FTM1_QD_PHA_4         (PIN_ALT7 | PIN_PORTA | PIN12)
-#define PIN_FTM1_QD_PHB_1         (PIN_ALT6 | PIN_PORTA | PIN9)
-#define PIN_FTM1_QD_PHB_2         (PIN_ALT6 | PIN_PORTB | PIN1)
-#define PIN_FTM1_QD_PHB_3         (PIN_ALT6 | PIN_PORTB | PIN13)
-#define PIN_FTM1_QD_PHB_4         (PIN_ALT7 | PIN_PORTA | PIN13)
-
-#define PIN_FTM2_CH0_1            (PIN_ALT3 | PIN_PORTA | PIN10)
-#define PIN_FTM2_CH0_2            (PIN_ALT3 | PIN_PORTB | PIN18)
-#define PIN_FTM2_CH1_1            (PIN_ALT3 | PIN_PORTA | PIN11)
-#define PIN_FTM2_CH1_2            (PIN_ALT3 | PIN_PORTB | PIN19)
-#define PIN_FTM2_FLT0_1           (PIN_ALT6 | PIN_PORTB | PIN5)
-#define PIN_FTM2_FLT0_2           (PIN_ALT6 | PIN_PORTC | PIN9)
-#define PIN_FTM2_QD_PHA_1         (PIN_ALT6 | PIN_PORTA | PIN10)
-#define PIN_FTM2_QD_PHA_2         (PIN_ALT6 | PIN_PORTB | PIN18)
-#define PIN_FTM2_QD_PHB_1         (PIN_ALT6 | PIN_PORTA | PIN11)
-#define PIN_FTM2_QD_PHB_2         (PIN_ALT6 | PIN_PORTB | PIN19)
-
-#define PIN_FTM3_CH0_1            (PIN_ALT4 | PIN_PORTD | PIN0)
-#define PIN_FTM3_CH0_2            (PIN_ALT6 | PIN_PORTE | PIN5)
-#define PIN_FTM3_CH1_1            (PIN_ALT4 | PIN_PORTD | PIN1)
-#define PIN_FTM3_CH1_2            (PIN_ALT6 | PIN_PORTE | PIN6)
-#define PIN_FTM3_CH2_1            (PIN_ALT4 | PIN_PORTD | PIN2)
-#define PIN_FTM3_CH2_2            (PIN_ALT6 | PIN_PORTE | PIN7)
-#define PIN_FTM3_CH3_1            (PIN_ALT4 | PIN_PORTD | PIN3)
-#define PIN_FTM3_CH3_2            (PIN_ALT6 | PIN_PORTE | PIN8)
-#define PIN_FTM3_CH4_1            (PIN_ALT3 | PIN_PORTC | PIN8)
-#define PIN_FTM3_CH4_2            (PIN_ALT6 | PIN_PORTE | PIN9)
-#define PIN_FTM3_CH5_1            (PIN_ALT3 | PIN_PORTC | PIN9)
-#define PIN_FTM3_CH5_2            (PIN_ALT6 | PIN_PORTE | PIN10)
-#define PIN_FTM3_CH6_1            (PIN_ALT3 | PIN_PORTC | PIN10)
-#define PIN_FTM3_CH6_2            (PIN_ALT6 | PIN_PORTE | PIN11)
-#define PIN_FTM3_CH7_1            (PIN_ALT3 | PIN_PORTC | PIN11)
-#define PIN_FTM3_CH7_2            (PIN_ALT6 | PIN_PORTE | PIN12)
-#define PIN_FTM3_FLT0_1           (PIN_ALT3 | PIN_PORTD | PIN12)
-#define PIN_FTM3_FLT0_2           (PIN_ALT6 | PIN_PORTC | PIN12)
-
-#define PIN_I2C0_SCL_1            (PIN_ALT2 | PIN_PORTB | PIN0)
-#define PIN_I2C0_SCL_2            (PIN_ALT2 | PIN_PORTB | PIN2)
-#define PIN_I2C0_SCL_3            (PIN_ALT2 | PIN_PORTD | PIN8)
-#define PIN_I2C0_SCL_4            (PIN_ALT5 | PIN_PORTE | PIN24)
-#define PIN_I2C0_SCL_5            (PIN_ALT7 | PIN_PORTD | PIN2)
-#define PIN_I2C0_SDA_1            (PIN_ALT2 | PIN_PORTB | PIN1)
-#define PIN_I2C0_SDA_2            (PIN_ALT2 | PIN_PORTB | PIN3)
-#define PIN_I2C0_SDA_3            (PIN_ALT2 | PIN_PORTD | PIN9)
-#define PIN_I2C0_SDA_4            (PIN_ALT5 | PIN_PORTE | PIN25)
-#define PIN_I2C0_SDA_5            (PIN_ALT7 | PIN_PORTD | PIN3)
-
-#define PIN_I2C1_SCL_1            (PIN_ALT2 | PIN_PORTC | PIN10)
-#define PIN_I2C1_SCL_2            (PIN_ALT6 | PIN_PORTE | PIN1)
-#define PIN_I2C1_SDA_1            (PIN_ALT2 | PIN_PORTC | PIN11)
-#define PIN_I2C1_SDA_2            (PIN_ALT6 | PIN_PORTE | PIN0)
-
-#define PIN_I2C2_SCL_1            (PIN_ALT5 | PIN_PORTA | PIN12)
-#define PIN_I2C2_SCL_2            (PIN_ALT5 | PIN_PORTA | PIN14)
-#define PIN_I2C2_SDA_1            (PIN_ALT5 | PIN_PORTA | PIN11)
-#define PIN_I2C2_SDA_2            (PIN_ALT5 | PIN_PORTA | PIN13)
-
-#define PIN_I2S0_MCLK_1           (PIN_ALT4 | PIN_PORTC | PIN8)
-#define PIN_I2S0_MCLK_2           (PIN_ALT4 | PIN_PORTE | PIN6)
-#define PIN_I2S0_MCLK_3           (PIN_ALT6 | PIN_PORTA | PIN17)
-#define PIN_I2S0_MCLK_4           (PIN_ALT6 | PIN_PORTC | PIN6)
-#define PIN_I2S0_RX_BCLK_1        (PIN_ALT4 | PIN_PORTC | PIN6)
-#define PIN_I2S0_RX_BCLK_2        (PIN_ALT4 | PIN_PORTC | PIN9)
-#define PIN_I2S0_RX_BCLK_3        (PIN_ALT4 | PIN_PORTE | PIN9)
-#define PIN_I2S0_RX_BCLK_4        (PIN_ALT6 | PIN_PORTA | PIN14)
-#define PIN_I2S0_RX_FS_1          (PIN_ALT4 | PIN_PORTC | PIN10)
-#define PIN_I2S0_RX_FS_2          (PIN_ALT4 | PIN_PORTC | PIN7)
-#define PIN_I2S0_RX_FS_3          (PIN_ALT4 | PIN_PORTE | PIN8)
-#define PIN_I2S0_RX_FS_4          (PIN_ALT6 | PIN_PORTA | PIN16)
-#define PIN_I2S0_RXD0_1           (PIN_ALT4 | PIN_PORTC | PIN5)
-#define PIN_I2S0_RXD0_2           (PIN_ALT4 | PIN_PORTE | PIN7)
-#define PIN_I2S0_RXD0_3           (PIN_ALT6 | PIN_PORTA | PIN15)
-#define PIN_I2S0_RXD1_1           (PIN_ALT2 | PIN_PORTE | PIN8)
-#define PIN_I2S0_RXD1_2           (PIN_ALT4 | PIN_PORTC | PIN11)
-#define PIN_I2S0_RXD1_3           (PIN_ALT7 | PIN_PORTA | PIN16)
-#define PIN_I2S0_TX_BCLK_1        (PIN_ALT4 | PIN_PORTB | PIN18)
-#define PIN_I2S0_TX_BCLK_2        (PIN_ALT4 | PIN_PORTE | PIN12)
-#define PIN_I2S0_TX_BCLK_3        (PIN_ALT6 | PIN_PORTA | PIN5)
-#define PIN_I2S0_TX_BCLK_4        (PIN_ALT6 | PIN_PORTC | PIN3)
-#define PIN_I2S0_TX_FS_1          (PIN_ALT4 | PIN_PORTB | PIN19)
-#define PIN_I2S0_TX_FS_2          (PIN_ALT4 | PIN_PORTE | PIN11)
-#define PIN_I2S0_TX_FS_3          (PIN_ALT6 | PIN_PORTA | PIN13)
-#define PIN_I2S0_TX_FS_4          (PIN_ALT6 | PIN_PORTC | PIN2)
-#define PIN_I2S0_TXD0_1           (PIN_ALT4 | PIN_PORTE | PIN10)
-#define PIN_I2S0_TXD0_2           (PIN_ALT6 | PIN_PORTA | PIN12)
-#define PIN_I2S0_TXD0_3           (PIN_ALT6 | PIN_PORTC | PIN1)
-#define PIN_I2S0_TXD1_1           (PIN_ALT2 | PIN_PORTE | PIN9)
-#define PIN_I2S0_TXD1_2           (PIN_ALT6 | PIN_PORTC | PIN0)
-#define PIN_I2S0_TXD1_3           (PIN_ALT7 | PIN_PORTA | PIN14)
-
-#define PIN_JTAG_TCLK             (PIN_ALT7 | PIN_PORTA | PIN0)
-#define PIN_JTAG_TDI              (PIN_ALT7 | PIN_PORTA | PIN1)
-#define PIN_JTAG_TDO              (PIN_ALT7 | PIN_PORTA | PIN2)
-#define PIN_JTAG_TMS              (PIN_ALT7 | PIN_PORTA | PIN3)
-#define PIN_JTAG_TRST             (PIN_ALT7 | PIN_PORTA | PIN5)
-
-#define PIN_LLWU_P0               (PIN_ALT1 | PIN_PORTE | PIN1)
-#define PIN_LLWU_P1               (PIN_ALT1 | PIN_PORTE | PIN2)
-#define PIN_LLWU_P2               (PIN_ALT1 | PIN_PORTE | PIN4)
-#define PIN_LLWU_P3               (PIN_ALT1 | PIN_PORTA | PIN4)
-#define PIN_LLWU_P4               (PIN_ALT1 | PIN_PORTA | PIN13)
-#define PIN_LLWU_P5               (PIN_ALT1 | PIN_PORTB | PIN0)
-#define PIN_LLWU_P6               (PIN_ALT1 | PIN_PORTC | PIN1)
-#define PIN_LLWU_P7               (PIN_ALT1 | PIN_PORTC | PIN3)
-#define PIN_LLWU_P8               (PIN_ALT1 | PIN_PORTC | PIN4)
-#define PIN_LLWU_P9               (PIN_ALT1 | PIN_PORTC | PIN5)
-#define PIN_LLWU_P10              (PIN_ALT1 | PIN_PORTC | PIN6)
-#define PIN_LLWU_P11              (PIN_ALT1 | PIN_PORTC | PIN11)
-#define PIN_LLWU_P12              (PIN_ALT1 | PIN_PORTD | PIN0)
-#define PIN_LLWU_P13              (PIN_ALT1 | PIN_PORTD | PIN2)
-#define PIN_LLWU_P14              (PIN_ALT1 | PIN_PORTD | PIN4)
-#define PIN_LLWU_P15              (PIN_ALT1 | PIN_PORTD | PIN6)
-
-#define PIN_LPTMR0_ALT1           (PIN_ALT6 | PIN_PORTA | PIN19)
-#define PIN_LPTMR0_ALT2           (PIN_ALT3 | PIN_PORTC | PIN5)
-
-#define PIN_MII0_COL              (PIN_ALT4 | PIN_PORTA | PIN29)
-#define PIN_MII0_CRS              (PIN_ALT4 | PIN_PORTA | PIN27)
-#define PIN_MII0_MDC              (PIN_ALT4 | PIN_PORTB | PIN1)
-#define PIN_MII0_MDIO             (PIN_ALT4 | PIN_PORTB | PIN0)
-#define PIN_MII0_RXCLK            (PIN_ALT4 | PIN_PORTA | PIN11)
-#define PIN_MII0_RXD0             (PIN_ALT4 | PIN_PORTA | PIN13)
-#define PIN_MII0_RXD1             (PIN_ALT4 | PIN_PORTA | PIN12)
-#define PIN_MII0_RXD2             (PIN_ALT4 | PIN_PORTA | PIN10)
-#define PIN_MII0_RXD3             (PIN_ALT4 | PIN_PORTA | PIN9)
-#define PIN_MII0_RXDV             (PIN_ALT4 | PIN_PORTA | PIN14)
-#define PIN_MII0_RXER             (PIN_ALT4 | PIN_PORTA | PIN5)
-#define PIN_MII0_TXCLK            (PIN_ALT4 | PIN_PORTA | PIN25)
-#define PIN_MII0_TXD0             (PIN_ALT4 | PIN_PORTA | PIN16)
-#define PIN_MII0_TXD1             (PIN_ALT4 | PIN_PORTA | PIN17)
-#define PIN_MII0_TXD2             (PIN_ALT4 | PIN_PORTA | PIN24)
-#define PIN_MII0_TXD3             (PIN_ALT4 | PIN_PORTA | PIN26)
-#define PIN_MII0_TXEN             (PIN_ALT4 | PIN_PORTA | PIN15)
-#define PIN_MII0_TXER             (PIN_ALT4 | PIN_PORTA | PIN28)
-
-#define PIN_NMI                   (PIN_ALT7 | PIN_PORTA | PIN4)
-
-#define PIN_PDB0_EXTRG_1          (PIN_ALT3 | PIN_PORTC | PIN0)
-#define PIN_PDB0_EXTRG_2          (PIN_ALT3 | PIN_PORTC | PIN6)
-
-#define PIN_PTA0                  (PIN_ALT1 | PIN_PORTA | PIN0)
-#define PIN_PTA1                  (PIN_ALT1 | PIN_PORTA | PIN1)
-#define PIN_PTA2                  (PIN_ALT1 | PIN_PORTA | PIN2)
-#define PIN_PTA3                  (PIN_ALT1 | PIN_PORTA | PIN3)
-#define PIN_PTA4                  (PIN_ALT1 | PIN_PORTA | PIN4)
-#define PIN_PTA5                  (PIN_ALT1 | PIN_PORTA | PIN5)
-#define PIN_PTA6                  (PIN_ALT1 | PIN_PORTA | PIN6)
-#define PIN_PTA7                  (PIN_ALT1 | PIN_PORTA | PIN7)
-#define PIN_PTA8                  (PIN_ALT1 | PIN_PORTA | PIN8)
-#define PIN_PTA9                  (PIN_ALT1 | PIN_PORTA | PIN9)
-#define PIN_PTA10                 (PIN_ALT1 | PIN_PORTA | PIN10)
-#define PIN_PTA11                 (PIN_ALT1 | PIN_PORTA | PIN11)
-#define PIN_PTA12                 (PIN_ALT1 | PIN_PORTA | PIN12)
-#define PIN_PTA13                 (PIN_ALT1 | PIN_PORTA | PIN13)
-#define PIN_PTA14                 (PIN_ALT1 | PIN_PORTA | PIN14)
-#define PIN_PTA15                 (PIN_ALT1 | PIN_PORTA | PIN15)
-#define PIN_PTA16                 (PIN_ALT1 | PIN_PORTA | PIN16)
-#define PIN_PTA17                 (PIN_ALT1 | PIN_PORTA | PIN17)
-#define PIN_PTA18                 (PIN_ALT1 | PIN_PORTA | PIN18)
-#define PIN_PTA19                 (PIN_ALT1 | PIN_PORTA | PIN19)
-#define PIN_PTA24                 (PIN_ALT1 | PIN_PORTA | PIN24)
-#define PIN_PTA25                 (PIN_ALT1 | PIN_PORTA | PIN25)
-#define PIN_PTA26                 (PIN_ALT1 | PIN_PORTA | PIN26)
-#define PIN_PTA27                 (PIN_ALT1 | PIN_PORTA | PIN27)
-#define PIN_PTA28                 (PIN_ALT1 | PIN_PORTA | PIN28)
-#define PIN_PTA29                 (PIN_ALT1 | PIN_PORTA | PIN29)
-
-#define PIN_PTB0                  (PIN_ALT1 | PIN_PORTB | PIN0)
-#define PIN_PTB1                  (PIN_ALT1 | PIN_PORTB | PIN1)
-#define PIN_PTB2                  (PIN_ALT1 | PIN_PORTB | PIN2)
-#define PIN_PTB3                  (PIN_ALT1 | PIN_PORTB | PIN3)
-#define PIN_PTB4                  (PIN_ALT1 | PIN_PORTB | PIN4)
-#define PIN_PTB5                  (PIN_ALT1 | PIN_PORTB | PIN5)
-#define PIN_PTB6                  (PIN_ALT1 | PIN_PORTB | PIN6)
-#define PIN_PTB7                  (PIN_ALT1 | PIN_PORTB | PIN7)
-#define PIN_PTB8                  (PIN_ALT1 | PIN_PORTB | PIN8)
-#define PIN_PTB9                  (PIN_ALT1 | PIN_PORTB | PIN9)
-#define PIN_PTB10                 (PIN_ALT1 | PIN_PORTB | PIN10)
-#define PIN_PTB11                 (PIN_ALT1 | PIN_PORTB | PIN11)
-#define PIN_PTB12                 (PIN_ALT1 | PIN_PORTB | PIN12)
-#define PIN_PTB13                 (PIN_ALT1 | PIN_PORTB | PIN13)
-#define PIN_PTB16                 (PIN_ALT1 | PIN_PORTB | PIN16)
-#define PIN_PTB17                 (PIN_ALT1 | PIN_PORTB | PIN17)
-#define PIN_PTB18                 (PIN_ALT1 | PIN_PORTB | PIN18)
-#define PIN_PTB19                 (PIN_ALT1 | PIN_PORTB | PIN19)
-#define PIN_PTB20                 (PIN_ALT1 | PIN_PORTB | PIN20)
-#define PIN_PTB21                 (PIN_ALT1 | PIN_PORTB | PIN21)
-#define PIN_PTB22                 (PIN_ALT1 | PIN_PORTB | PIN22)
-#define PIN_PTB23                 (PIN_ALT1 | PIN_PORTB | PIN23)
-
-#define PIN_PTC0                  (PIN_ALT1 | PIN_PORTC | PIN0)
-#define PIN_PTC1                  (PIN_ALT1 | PIN_PORTC | PIN1)
-#define PIN_PTC2                  (PIN_ALT1 | PIN_PORTC | PIN2)
-#define PIN_PTC3                  (PIN_ALT1 | PIN_PORTC | PIN3)
-#define PIN_PTC4                  (PIN_ALT1 | PIN_PORTC | PIN4)
-#define PIN_PTC5                  (PIN_ALT1 | PIN_PORTC | PIN5)
-#define PIN_PTC6                  (PIN_ALT1 | PIN_PORTC | PIN6)
-#define PIN_PTC7                  (PIN_ALT1 | PIN_PORTC | PIN7)
-#define PIN_PTC8                  (PIN_ALT1 | PIN_PORTC | PIN8)
-#define PIN_PTC9                  (PIN_ALT1 | PIN_PORTC | PIN9)
-#define PIN_PTC10                 (PIN_ALT1 | PIN_PORTC | PIN10)
-#define PIN_PTC11                 (PIN_ALT1 | PIN_PORTC | PIN11)
-#define PIN_PTC12                 (PIN_ALT1 | PIN_PORTC | PIN12)
-#define PIN_PTC13                 (PIN_ALT1 | PIN_PORTC | PIN13)
-#define PIN_PTC14                 (PIN_ALT1 | PIN_PORTC | PIN14)
-#define PIN_PTC15                 (PIN_ALT1 | PIN_PORTC | PIN15)
-#define PIN_PTC16                 (PIN_ALT1 | PIN_PORTC | PIN16)
-#define PIN_PTC17                 (PIN_ALT1 | PIN_PORTC | PIN17)
-#define PIN_PTC18                 (PIN_ALT1 | PIN_PORTC | PIN18)
-#define PIN_PTC19                 (PIN_ALT1 | PIN_PORTC | PIN19)
-
-#define PIN_PTD0                  (PIN_ALT1 | PIN_PORTD | PIN0)
-#define PIN_PTD1                  (PIN_ALT1 | PIN_PORTD | PIN1)
-#define PIN_PTD2                  (PIN_ALT1 | PIN_PORTD | PIN2)
-#define PIN_PTD3                  (PIN_ALT1 | PIN_PORTD | PIN3)
-#define PIN_PTD4                  (PIN_ALT1 | PIN_PORTD | PIN4)
-#define PIN_PTD5                  (PIN_ALT1 | PIN_PORTD | PIN5)
-#define PIN_PTD6                  (PIN_ALT1 | PIN_PORTD | PIN6)
-#define PIN_PTD7                  (PIN_ALT1 | PIN_PORTD | PIN7)
-#define PIN_PTD8                  (PIN_ALT1 | PIN_PORTD | PIN8)
-#define PIN_PTD9                  (PIN_ALT1 | PIN_PORTD | PIN9)
-#define PIN_PTD10                 (PIN_ALT1 | PIN_PORTD | PIN10)
-#define PIN_PTD11                 (PIN_ALT1 | PIN_PORTD | PIN11)
-#define PIN_PTD12                 (PIN_ALT1 | PIN_PORTD | PIN12)
-#define PIN_PTD13                 (PIN_ALT1 | PIN_PORTD | PIN13)
-#define PIN_PTD14                 (PIN_ALT1 | PIN_PORTD | PIN14)
-#define PIN_PTD15                 (PIN_ALT1 | PIN_PORTD | PIN15)
-
-#define PIN_PTE0                  (PIN_ALT1 | PIN_PORTE | PIN0)
-#define PIN_PTE1                  (PIN_ALT1 | PIN_PORTE | PIN1)
-#define PIN_PTE2                  (PIN_ALT1 | PIN_PORTE | PIN2)
-#define PIN_PTE3                  (PIN_ALT1 | PIN_PORTE | PIN3)
-#define PIN_PTE4                  (PIN_ALT1 | PIN_PORTE | PIN4)
-#define PIN_PTE5                  (PIN_ALT1 | PIN_PORTE | PIN5)
-#define PIN_PTE6                  (PIN_ALT1 | PIN_PORTE | PIN6)
-#define PIN_PTE7                  (PIN_ALT1 | PIN_PORTE | PIN7)
-#define PIN_PTE8                  (PIN_ALT1 | PIN_PORTE | PIN8)
-#define PIN_PTE9                  (PIN_ALT1 | PIN_PORTE | PIN9)
-#define PIN_PTE10                 (PIN_ALT1 | PIN_PORTE | PIN10)
-#define PIN_PTE11                 (PIN_ALT1 | PIN_PORTE | PIN11)
-#define PIN_PTE12                 (PIN_ALT1 | PIN_PORTE | PIN12)
-#define PIN_PTE24                 (PIN_ALT1 | PIN_PORTE | PIN24)
-#define PIN_PTE25                 (PIN_ALT1 | PIN_PORTE | PIN25)
-#define PIN_PTE26                 (PIN_ALT1 | PIN_PORTE | PIN26)
-#define PIN_PTE27                 (PIN_ALT1 | PIN_PORTE | PIN27)
-#define PIN_PTE28                 (PIN_ALT1 | PIN_PORTE | PIN28)
-
-#define PIN_RMII0_CRS_DV          (PIN_ALT4 | PIN_PORTA | PIN14)
-#define PIN_RMII0_MDC             (PIN_ALT4 | PIN_PORTB | PIN1)
-#define PIN_RMII0_MDIO            (PIN_ALT4 | PIN_PORTB | PIN0)
-#define PIN_RMII0_RXD0            (PIN_ALT4 | PIN_PORTA | PIN13)
-#define PIN_RMII0_RXD1            (PIN_ALT4 | PIN_PORTA | PIN12)
-#define PIN_RMII0_RXER            (PIN_ALT4 | PIN_PORTA | PIN5)
-#define PIN_RMII0_TXD0            (PIN_ALT4 | PIN_PORTA | PIN16)
-#define PIN_RMII0_TXD1            (PIN_ALT4 | PIN_PORTA | PIN17)
-#define PIN_RMII0_TXEN            (PIN_ALT4 | PIN_PORTA | PIN15)
-
-#define PIN_RTC_CLKOUT_1          (PIN_ALT6 | PIN_PORTE | PIN26)
-#define PIN_RTC_CLKOUT_2          (PIN_ALT7 | PIN_PORTE | PIN0)
-
-#define PIN_SDHC0_CLKIN           (PIN_ALT4 | PIN_PORTD | PIN11)
-#define PIN_SDHC0_CMD             (PIN_ALT4 | PIN_PORTE | PIN3)
-#define PIN_SDHC0_D0              (PIN_ALT4 | PIN_PORTE | PIN1)
-#define PIN_SDHC0_D1              (PIN_ALT4 | PIN_PORTE | PIN0)
-#define PIN_SDHC0_D2              (PIN_ALT4 | PIN_PORTE | PIN5)
-#define PIN_SDHC0_D3              (PIN_ALT4 | PIN_PORTE | PIN4)
-#define PIN_SDHC0_D4              (PIN_ALT4 | PIN_PORTD | PIN12)
-#define PIN_SDHC0_D5              (PIN_ALT4 | PIN_PORTD | PIN13)
-#define PIN_SDHC0_D6              (PIN_ALT4 | PIN_PORTD | PIN14)
-#define PIN_SDHC0_D7              (PIN_ALT4 | PIN_PORTD | PIN15)
-#define PIN_SDHC0_DCLK            (PIN_ALT4 | PIN_PORTE | PIN2)
-
-#define PIN_SPI0_PCS0_1           (PIN_ALT2 | PIN_PORTA | PIN14)
-#define PIN_SPI0_PCS0_2           (PIN_ALT2 | PIN_PORTC | PIN4)
-#define PIN_SPI0_PCS0_3           (PIN_ALT2 | PIN_PORTD | PIN0)
-#define PIN_SPI0_PCS1_1           (PIN_ALT2 | PIN_PORTC | PIN3)
-#define PIN_SPI0_PCS1_2           (PIN_ALT2 | PIN_PORTD | PIN4)
-#define PIN_SPI0_PCS2_1           (PIN_ALT2 | PIN_PORTC | PIN2)
-#define PIN_SPI0_PCS2_3           (PIN_ALT2 | PIN_PORTD | PIN5)
-#define PIN_SPI0_PCS3_1           (PIN_ALT2 | PIN_PORTC | PIN1)
-#define PIN_SPI0_PCS3_2           (PIN_ALT2 | PIN_PORTD | PIN6)
-#define PIN_SPI0_PCS4             (PIN_ALT2 | PIN_PORTC | PIN0)
-#define PIN_SPI0_PCS5             (PIN_ALT3 | PIN_PORTB | PIN23)
-#define PIN_SPI0_SCK_1            (PIN_ALT2 | PIN_PORTA | PIN15)
-#define PIN_SPI0_SCK_2            (PIN_ALT2 | PIN_PORTC | PIN5)
-#define PIN_SPI0_SCK_3            (PIN_ALT2 | PIN_PORTD | PIN1)
-#define PIN_SPI0_SIN_1            (PIN_ALT2 | PIN_PORTA | PIN17)
-#define PIN_SPI0_SIN_2            (PIN_ALT2 | PIN_PORTC | PIN7)
-#define PIN_SPI0_SIN_3            (PIN_ALT2 | PIN_PORTD | PIN3)
-#define PIN_SPI0_SOUT_1           (PIN_ALT2 | PIN_PORTA | PIN16)
-#define PIN_SPI0_SOUT_2           (PIN_ALT2 | PIN_PORTC | PIN6)
-#define PIN_SPI0_SOUT_3           (PIN_ALT2 | PIN_PORTD | PIN2)
-
-#define PIN_SPI1_PCS0_1           (PIN_ALT2 | PIN_PORTB | PIN10)
-#define PIN_SPI1_PCS0_2           (PIN_ALT2 | PIN_PORTE | PIN4)
-#define PIN_SPI1_PCS0_3           (PIN_ALT7 | PIN_PORTD | PIN4)
-#define PIN_SPI1_PCS1_1           (PIN_ALT2 | PIN_PORTB | PIN9)
-#define PIN_SPI1_PCS1_2           (PIN_ALT2 | PIN_PORTE | PIN0)
-#define PIN_SPI1_PCS2             (PIN_ALT2 | PIN_PORTE | PIN5)
-#define PIN_SPI1_PCS3             (PIN_ALT2 | PIN_PORTE | PIN6)
-#define PIN_SPI1_SCK_1            (PIN_ALT2 | PIN_PORTB | PIN11)
-#define PIN_SPI1_SCK_2            (PIN_ALT2 | PIN_PORTE | PIN2)
-#define PIN_SPI1_SCK_3            (PIN_ALT7 | PIN_PORTD | PIN5)
-#define PIN_SPI1_SIN_1            (PIN_ALT2 | PIN_PORTB | PIN17)
-#define PIN_SPI1_SIN_2            (PIN_ALT2 | PIN_PORTE | PIN3)
-#define PIN_SPI1_SIN_3            (PIN_ALT7 | PIN_PORTD | PIN7)
-#define PIN_SPI1_SIN_4            (PIN_ALT7 | PIN_PORTE | PIN1)
-#define PIN_SPI1_SOUT_1           (PIN_ALT2 | PIN_PORTB | PIN16)
-#define PIN_SPI1_SOUT_2           (PIN_ALT2 | PIN_PORTE | PIN1)
-#define PIN_SPI1_SOUT_3           (PIN_ALT7 | PIN_PORTD | PIN6)
-#define PIN_SPI1_SOUT_4           (PIN_ALT7 | PIN_PORTE | PIN3)
-
-#define PIN_SPI2_PCS0_1           (PIN_ALT2 | PIN_PORTB | PIN20)
-#define PIN_SPI2_PCS0_2           (PIN_ALT2 | PIN_PORTD | PIN11)
-#define PIN_SPI2_PCS1             (PIN_ALT2 | PIN_PORTD | PIN15)
-#define PIN_SPI2_SCK_1            (PIN_ALT2 | PIN_PORTB | PIN21)
-#define PIN_SPI2_SCK_2            (PIN_ALT2 | PIN_PORTD | PIN12)
-#define PIN_SPI2_SIN_1            (PIN_ALT2 | PIN_PORTB | PIN23)
-#define PIN_SPI2_SIN_2            (PIN_ALT2 | PIN_PORTD | PIN14)
-#define PIN_SPI2_SOUT_1           (PIN_ALT2 | PIN_PORTB | PIN22)
-#define PIN_SPI2_SOUT_2           (PIN_ALT2 | PIN_PORTD | PIN13)
-
-#define PIN_SWD_CLK               (PIN_ALT7 | PIN_PORTA | PIN0)
-#define PIN_SWD_DIO               (PIN_ALT7 | PIN_PORTA | PIN3)
-
-#define PIN_TRACE_CLKOUT_1        (PIN_ALT5 | PIN_PORTE | PIN0)
-#define PIN_TRACE_CLKOUT_2        (PIN_ALT7 | PIN_PORTA | PIN6)
-#define PIN_TRACE_D0_1            (PIN_ALT5 | PIN_PORTE | PIN4)
-#define PIN_TRACE_D0_2            (PIN_ALT7 | PIN_PORTA | PIN10)
-#define PIN_TRACE_D1_1            (PIN_ALT5 | PIN_PORTE | PIN3)
-#define PIN_TRACE_D1_2            (PIN_ALT7 | PIN_PORTA | PIN9)
-#define PIN_TRACE_D2_1            (PIN_ALT5 | PIN_PORTE | PIN2)
-#define PIN_TRACE_D2_2            (PIN_ALT7 | PIN_PORTA | PIN8)
-#define PIN_TRACE_D3_1            (PIN_ALT5 | PIN_PORTE | PIN1)
-#define PIN_TRACE_D3_2            (PIN_ALT7 | PIN_PORTA | PIN7)
-#define PIN_TRACE_SWO             (PIN_ALT7 | PIN_PORTA | PIN2)
-
-#define PIN_UART0_COL_1           (PIN_ALT2 | PIN_PORTA | PIN0)
-#define PIN_UART0_COL_2           (PIN_ALT3 | PIN_PORTA | PIN16)
-#define PIN_UART0_COL_3           (PIN_ALT3 | PIN_PORTB | PIN3)
-#define PIN_UART0_COL_4           (PIN_ALT3 | PIN_PORTD | PIN5)
-#define PIN_UART0_CTS_1           (PIN_ALT2 | PIN_PORTA | PIN0)
-#define PIN_UART0_CTS_2           (PIN_ALT3 | PIN_PORTA | PIN16)
-#define PIN_UART0_CTS_3           (PIN_ALT3 | PIN_PORTB | PIN3)
-#define PIN_UART0_CTS_4           (PIN_ALT3 | PIN_PORTD | PIN5)
-#define PIN_UART0_RTS_1           (PIN_ALT2 | PIN_PORTA | PIN3)
-#define PIN_UART0_RTS_2           (PIN_ALT3 | PIN_PORTA | PIN17)
-#define PIN_UART0_RTS_3           (PIN_ALT3 | PIN_PORTB | PIN2)
-#define PIN_UART0_RTS_4           (PIN_ALT3 | PIN_PORTD | PIN4)
-#define PIN_UART0_RX_1            (PIN_ALT2 | PIN_PORTA | PIN1)
-#define PIN_UART0_RX_2            (PIN_ALT3 | PIN_PORTA | PIN15)
-#define PIN_UART0_RX_3            (PIN_ALT3 | PIN_PORTB | PIN16)
-#define PIN_UART0_RX_4            (PIN_ALT3 | PIN_PORTD | PIN6)
-#define PIN_UART0_TX_1            (PIN_ALT2 | PIN_PORTA | PIN2)
-#define PIN_UART0_TX_2            (PIN_ALT3 | PIN_PORTA | PIN14)
-#define PIN_UART0_TX_3            (PIN_ALT3 | PIN_PORTB | PIN17)
-#define PIN_UART0_TX_4            (PIN_ALT3 | PIN_PORTD | PIN7)
-
-#define PIN_UART1_CTS_1           (PIN_ALT3 | PIN_PORTC | PIN2)
-#define PIN_UART1_CTS_2           (PIN_ALT3 | PIN_PORTE | PIN2)
-#define PIN_UART1_RTS_1           (PIN_ALT3 | PIN_PORTC | PIN1)
-#define PIN_UART1_RTS_2           (PIN_ALT3 | PIN_PORTE | PIN3)
-#define PIN_UART1_RX_1            (PIN_ALT3 | PIN_PORTC | PIN3)
-#define PIN_UART1_RX_2            (PIN_ALT3 | PIN_PORTE | PIN1)
-#define PIN_UART1_TX_1            (PIN_ALT3 | PIN_PORTC | PIN4)
-#define PIN_UART1_TX_2            (PIN_ALT3 | PIN_PORTE | PIN0)
-
-#define PIN_UART2_CTS             (PIN_ALT3 | PIN_PORTD | PIN1)
-#define PIN_UART2_RTS             (PIN_ALT3 | PIN_PORTD | PIN0)
-#define PIN_UART2_RX              (PIN_ALT3 | PIN_PORTD | PIN2)
-#define PIN_UART2_TX              (PIN_ALT3 | PIN_PORTD | PIN3)
-
-#define PIN_UART3_CTS_1           (PIN_ALT2 | PIN_PORTB | PIN13)
-#define PIN_UART3_CTS_2           (PIN_ALT3 | PIN_PORTB | PIN9)
-#define PIN_UART3_CTS_3           (PIN_ALT3 | PIN_PORTC | PIN19)
-#define PIN_UART3_CTS_4           (PIN_ALT3 | PIN_PORTE | PIN6)
-#define PIN_UART3_RTS_1           (PIN_ALT2 | PIN_PORTB | PIN12)
-#define PIN_UART3_RTS_2           (PIN_ALT3 | PIN_PORTB | PIN8)
-#define PIN_UART3_RTS_3           (PIN_ALT3 | PIN_PORTC | PIN18)
-#define PIN_UART3_RTS_4           (PIN_ALT3 | PIN_PORTE | PIN7)
-#define PIN_UART3_RX_1            (PIN_ALT3 | PIN_PORTB | PIN10)
-#define PIN_UART3_RX_2            (PIN_ALT3 | PIN_PORTC | PIN16)
-#define PIN_UART3_RX_3            (PIN_ALT3 | PIN_PORTE | PIN5)
-#define PIN_UART3_TX_1            (PIN_ALT3 | PIN_PORTB | PIN11)
-#define PIN_UART3_TX_2            (PIN_ALT3 | PIN_PORTC | PIN17)
-#define PIN_UART3_TX_3            (PIN_ALT3 | PIN_PORTE | PIN4)
-
-#define PIN_UART4_CTS_1           (PIN_ALT3 | PIN_PORTC | PIN13)
-#define PIN_UART4_CTS_2           (PIN_ALT3 | PIN_PORTE | PIN26)
-#define PIN_UART4_RTS_1           (PIN_ALT3 | PIN_PORTC | PIN12)
-#define PIN_UART4_RTS_2           (PIN_ALT3 | PIN_PORTE | PIN27)
-#define PIN_UART4_RX_1            (PIN_ALT3 | PIN_PORTC | PIN14)
-#define PIN_UART4_RX_2            (PIN_ALT3 | PIN_PORTE | PIN25)
-#define PIN_UART4_TX_1            (PIN_ALT3 | PIN_PORTC | PIN15)
-#define PIN_UART4_TX_2            (PIN_ALT3 | PIN_PORTE | PIN24)
-
-#define PIN_UART5_CTS_1           (PIN_ALT3 | PIN_PORTD | PIN11)
-#define PIN_UART5_CTS_2           (PIN_ALT3 | PIN_PORTE | PIN10)
-#define PIN_UART5_RTS_1           (PIN_ALT3 | PIN_PORTD | PIN10)
-#define PIN_UART5_RTS_2           (PIN_ALT3 | PIN_PORTE | PIN11)
-#define PIN_UART5_RX_1            (PIN_ALT3 | PIN_PORTD | PIN8)
-#define PIN_UART5_RX_2            (PIN_ALT3 | PIN_PORTE | PIN9)
-#define PIN_UART5_TX_1            (PIN_ALT3 | PIN_PORTD | PIN9)
-#define PIN_UART5_TX_2            (PIN_ALT3 | PIN_PORTE | PIN8)
-
-#define PIN_USB_CLKIN_1           (PIN_ALT2 | PIN_PORTA | PIN5)
-#define PIN_USB_CLKIN_2           (PIN_ALT7 | PIN_PORTE | PIN26)
-#define PIN_USB_SOF_OUT_1         (PIN_ALT3 | PIN_PORTC | PIN7)
-#define PIN_USB_SOF_OUT_2         (PIN_ALT4 | PIN_PORTC | PIN0)
-#define PIN_USB_SOF_OUT_3         (PIN_ALT7 | PIN_PORTE | PIN6)
-
-#define PIN_XTAL0                 (PIN_ALT0 | PIN_PORTA | PIN19)
+/* ADC */
+
+#define PIN_ADC0_DM2              (PIN_ANALOG | PIN_PORTE | PIN3)
+#define PIN_ADC0_DP2              (PIN_ANALOG | PIN_PORTE | PIN2)
+#define PIN_ADC0_SE4B             (PIN_ANALOG | PIN_PORTC | PIN2)
+#define PIN_ADC0_SE5B             (PIN_ANALOG | PIN_PORTD | PIN1)
+#define PIN_ADC0_SE6B             (PIN_ANALOG | PIN_PORTD | PIN5)
+#define PIN_ADC0_SE7B             (PIN_ANALOG | PIN_PORTD | PIN6)
+#define PIN_ADC0_SE8              (PIN_ANALOG | PIN_PORTB | PIN0)
+#define PIN_ADC0_SE9              (PIN_ANALOG | PIN_PORTB | PIN1)
+#define PIN_ADC0_SE10             (PIN_ANALOG | PIN_PORTA | PIN7)
+#define PIN_ADC0_SE11             (PIN_ANALOG | PIN_PORTA | PIN8)
+#define PIN_ADC0_SE12             (PIN_ANALOG | PIN_PORTB | PIN2)
+#define PIN_ADC0_SE13             (PIN_ANALOG | PIN_PORTB | PIN3)
+#define PIN_ADC0_SE14             (PIN_ANALOG | PIN_PORTC | PIN0)
+#define PIN_ADC0_SE15             (PIN_ANALOG | PIN_PORTC | PIN1)
+#define PIN_ADC0_SE17             (PIN_ANALOG | PIN_PORTE | PIN24)
+#define PIN_ADC0_SE18             (PIN_ANALOG | PIN_PORTE | PIN25)
+
+#define PIN_ADC1_SE4A             (PIN_ANALOG | PIN_PORTE | PIN0)
+#define PIN_ADC1_SE4B             (PIN_ANALOG | PIN_PORTC | PIN8)
+#define PIN_ADC1_SE5A             (PIN_ANALOG | PIN_PORTE | PIN1)
+#define PIN_ADC1_SE5B             (PIN_ANALOG | PIN_PORTC | PIN9)
+#define PIN_ADC1_SE6A             (PIN_ANALOG | PIN_PORTE | PIN2)
+#define PIN_ADC1_SE6B             (PIN_ANALOG | PIN_PORTC | PIN10)
+#define PIN_ADC1_SE7A             (PIN_ANALOG | PIN_PORTE | PIN3)
+#define PIN_ADC1_SE7B             (PIN_ANALOG | PIN_PORTC | PIN11)
+#define PIN_ADC1_SE8              (PIN_ANALOG | PIN_PORTB | PIN0)
+#define PIN_ADC1_SE9              (PIN_ANALOG | PIN_PORTB | PIN1)
+#define PIN_ADC1_SE10             (PIN_ANALOG | PIN_PORTB | PIN4)
+#define PIN_ADC1_SE11             (PIN_ANALOG | PIN_PORTB | PIN5)
+#define PIN_ADC1_SE12             (PIN_ANALOG | PIN_PORTB | PIN6)
+#define PIN_ADC1_SE13             (PIN_ANALOG | PIN_PORTB | PIN7)
+#define PIN_ADC1_SE14             (PIN_ANALOG | PIN_PORTB | PIN10)
+#define PIN_ADC1_SE15             (PIN_ANALOG | PIN_PORTB | PIN11)
+#define PIN_ADC1_SE17             (PIN_ANALOG | PIN_PORTA | PIN17)
+
+/* CAN */
+
+#define PIN_CAN0_RX_1             (PIN_ALT2   | PIN_PORTA | PIN13)
+#define PIN_CAN0_RX_2             (PIN_ALT2   | PIN_PORTB | PIN19)
+#define PIN_CAN0_TX_1             (PIN_ALT2   | PIN_PORTA | PIN12)
+#define PIN_CAN0_TX_2             (PIN_ALT2   | PIN_PORTB | PIN18)
+
+/* Output clock */
+
+#define PIN_CLKOUT_1              (PIN_ALT5   | PIN_PORTA | PIN6)
+#define PIN_CLKOUT_2              (PIN_ALT5   | PIN_PORTC | PIN3)
+
+/* Comparators */
+
+#define PIN_CMP0_IN0              (PIN_ANALOG | PIN_PORTC | PIN6)
+#define PIN_CMP0_IN1              (PIN_ANALOG | PIN_PORTC | PIN7)
+#define PIN_CMP0_IN2              (PIN_ANALOG | PIN_PORTC | PIN8)
+#define PIN_CMP0_IN3              (PIN_ANALOG | PIN_PORTC | PIN9)
+#define PIN_CMP0_OUT_1            (PIN_ALT6   | PIN_PORTB | PIN20)
+#define PIN_CMP0_OUT_2            (PIN_ALT6   | PIN_PORTC | PIN5)
+
+#define PIN_CMP1_IN0              (PIN_ANALOG | PIN_PORTC | PIN2)
+#define PIN_CMP1_IN1              (PIN_ANALOG | PIN_PORTC | PIN3)
+#define PIN_CMP1_OUT_1            (PIN_ALT6   | PIN_PORTB | PIN21)
+#define PIN_CMP1_OUT_2            (PIN_ALT6   | PIN_PORTC | PIN4)
+
+#define PIN_CMP2_IN0              (PIN_ANALOG | PIN_PORTA | PIN12)
+#define PIN_CMP2_IN1              (PIN_ANALOG | PIN_PORTA | PIN13)
+#define PIN_CMP2_OUT_1            (PIN_ALT5   | PIN_PORTA | PIN5)
+#define PIN_CMP2_OUT_2            (PIN_ALT6   | PIN_PORTB | PIN22)
+
+/* Carrier Modulator Transmittor (CMT) */
+
+#define PIN_CMT_IRO               (PIN_ALT2   | PIN_PORTD | PIN7)
+
+/* Ethernet */
+
+#define PIN_ENET_1588_CLKIN       (PIN_ALT2   | PIN_PORTE | PIN26)
+#define PIN_ENET0_1588_TMR0_1     (PIN_ALT4   | PIN_PORTB | PIN2)
+#define PIN_ENET0_1588_TMR0_2     (PIN_ALT4   | PIN_PORTC | PIN16)
+#define PIN_ENET0_1588_TMR1_1     (PIN_ALT4   | PIN_PORTB | PIN3)
+#define PIN_ENET0_1588_TMR1_2     (PIN_ALT4   | PIN_PORTC | PIN17)
+#define PIN_ENET0_1588_TMR2_1     (PIN_ALT4   | PIN_PORTB | PIN4)
+#define PIN_ENET0_1588_TMR2_2     (PIN_ALT4   | PIN_PORTC | PIN18)
+#define PIN_ENET0_1588_TMR3_1     (PIN_ALT4   | PIN_PORTB | PIN5)
+#define PIN_ENET0_1588_TMR3_2     (PIN_ALT4   | PIN_PORTC | PIN19)
+
+/* External Watchdog Monitor (EWM) */
+
+#define PIN_EWM_IN_1              (PIN_ALT6   | PIN_PORTB | PIN16)
+#define PIN_EWM_IN_2              (PIN_ALT6   | PIN_PORTD | PIN4)
+#define PIN_EWM_IN_3              (PIN_ALT6   | PIN_PORTE | PIN25)
+#define PIN_EWM_OUT_1             (PIN_ALT6   | PIN_PORTB | PIN17)
+#define PIN_EWM_OUT_2             (PIN_ALT6   | PIN_PORTD | PIN5)
+#define PIN_EWM_OUT_3             (PIN_ALT6   | PIN_PORTE | PIN24)
+
+/* FlexBus */
+
+#define PIN_FB_A16                (PIN_ALT6   | PIN_PORTD | PIN8)
+#define PIN_FB_A17                (PIN_ALT6   | PIN_PORTD | PIN9)
+#define PIN_FB_A18                (PIN_ALT6   | PIN_PORTD | PIN10)
+#define PIN_FB_A19                (PIN_ALT6   | PIN_PORTD | PIN11)
+#define PIN_FB_A20                (PIN_ALT6   | PIN_PORTD | PIN12)
+#define PIN_FB_A21                (PIN_ALT6   | PIN_PORTD | PIN13)
+#define PIN_FB_A22                (PIN_ALT6   | PIN_PORTD | PIN14)
+#define PIN_FB_A23                (PIN_ALT6   | PIN_PORTD | PIN15)
+#define PIN_FB_A24                (PIN_ALT6   | PIN_PORTA | PIN29)
+#define PIN_FB_A25                (PIN_ALT6   | PIN_PORTA | PIN28)
+#define PIN_FB_A26                (PIN_ALT6   | PIN_PORTA | PIN27)
+#define PIN_FB_A27                (PIN_ALT6   | PIN_PORTA | PIN26)
+#define PIN_FB_A28                (PIN_ALT6   | PIN_PORTA | PIN25)
+#define PIN_FB_A29                (PIN_ALT6   | PIN_PORTA | PIN24)
+#define PIN_FB_AD0                (PIN_ALT5   | PIN_PORTD | PIN6)
+#define PIN_FB_AD1                (PIN_ALT5   | PIN_PORTD | PIN5)
+#define PIN_FB_AD2                (PIN_ALT5   | PIN_PORTD | PIN4)
+#define PIN_FB_AD3                (PIN_ALT5   | PIN_PORTD | PIN3)
+#define PIN_FB_AD4                (PIN_ALT5   | PIN_PORTD | PIN2)
+#define PIN_FB_AD5                (PIN_ALT5   | PIN_PORTC | PIN10)
+#define PIN_FB_AD6                (PIN_ALT5   | PIN_PORTC | PIN9)
+#define PIN_FB_AD7                (PIN_ALT5   | PIN_PORTC | PIN8)
+#define PIN_FB_AD8                (PIN_ALT5   | PIN_PORTC | PIN7)
+#define PIN_FB_AD9                (PIN_ALT5   | PIN_PORTC | PIN6)
+#define PIN_FB_AD10               (PIN_ALT5   | PIN_PORTC | PIN5)
+#define PIN_FB_AD11               (PIN_ALT5   | PIN_PORTC | PIN4)
+#define PIN_FB_AD12               (PIN_ALT5   | PIN_PORTC | PIN2)
+#define PIN_FB_AD13               (PIN_ALT5   | PIN_PORTC | PIN1)
+#define PIN_FB_AD14               (PIN_ALT5   | PIN_PORTC | PIN0)
+#define PIN_FB_AD15               (PIN_ALT5   | PIN_PORTB | PIN18)
+#define PIN_FB_AD16               (PIN_ALT5   | PIN_PORTB | PIN17)
+#define PIN_FB_AD17               (PIN_ALT5   | PIN_PORTB | PIN16)
+#define PIN_FB_AD18               (PIN_ALT5   | PIN_PORTB | PIN11)
+#define PIN_FB_AD19               (PIN_ALT5   | PIN_PORTB | PIN10)
+#define PIN_FB_AD20               (PIN_ALT5   | PIN_PORTB | PIN9)
+#define PIN_FB_AD21               (PIN_ALT5   | PIN_PORTB | PIN8)
+#define PIN_FB_AD22               (PIN_ALT5   | PIN_PORTB | PIN7)
+#define PIN_FB_AD23               (PIN_ALT5   | PIN_PORTB | PIN6)
+#define PIN_FB_AD24               (PIN_ALT5   | PIN_PORTC | PIN15)
+#define PIN_FB_AD25               (PIN_ALT5   | PIN_PORTC | PIN14)
+#define PIN_FB_AD26               (PIN_ALT5   | PIN_PORTC | PIN13)
+#define PIN_FB_AD27               (PIN_ALT5   | PIN_PORTC | PIN12)
+#define PIN_FB_AD28               (PIN_ALT5   | PIN_PORTB | PIN23)
+#define PIN_FB_AD29               (PIN_ALT5   | PIN_PORTB | PIN22)
+#define PIN_FB_AD30               (PIN_ALT5   | PIN_PORTB | PIN21)
+#define PIN_FB_AD31               (PIN_ALT5   | PIN_PORTB | PIN20)
+#define PIN_FB_ALE                (PIN_ALT5   | PIN_PORTD | PIN0)
+#define PIN_FB_BE15_8_BLS23_16    (PIN_ALT5   | PIN_PORTC | PIN18)
+#define PIN_FB_BE23_16_BLS15_8    (PIN_ALT5   | PIN_PORTC | PIN16)
+#define PIN_FB_BE31_24_BLS7_0     (PIN_ALT5   | PIN_PORTC | PIN17)
+#define PIN_FB_BE7_0_BLS31_24     (PIN_ALT5   | PIN_PORTC | PIN19)
+#define PIN_FB_CS0                (PIN_ALT5   | PIN_PORTD | PIN1)
+#define PIN_FB_CS1                (PIN_ALT5   | PIN_PORTD | PIN0)
+#define PIN_FB_CS2                (PIN_ALT5   | PIN_PORTC | PIN18)
+#define PIN_FB_CS3                (PIN_ALT5   | PIN_PORTC | PIN19)
+#define PIN_FB_CS4                (PIN_ALT5   | PIN_PORTC | PIN17)
+#define PIN_FB_CS5                (PIN_ALT5   | PIN_PORTC | PIN16)
+#define PIN_FB_OE                 (PIN_ALT5   | PIN_PORTB | PIN19)
+#define PIN_FB_RW                 (PIN_ALT5   | PIN_PORTC | PIN11)
+#define PIN_FB_TA                 (PIN_ALT6   | PIN_PORTC | PIN19)
+#define PIN_FB_TBST               (PIN_ALT5   | PIN_PORTC | PIN18)
+#define PIN_FB_TS                 (PIN_ALT5   | PIN_PORTD | PIN0)
+#define PIN_FB_TSIZ0              (PIN_ALT5   | PIN_PORTC | PIN17)
+#define PIN_FB_TSIZ1              (PIN_ALT5   | PIN_PORTC | PIN16)
+
+/* FlexTimer Module (FTM) */
+
+#define PIN_FTM_CLKIN0_1          (PIN_ALT4   | PIN_PORTA | PIN18)
+#define PIN_FTM_CLKIN0_2          (PIN_ALT4   | PIN_PORTB | PIN16)
+#define PIN_FTM_CLKIN1_1          (PIN_ALT4   | PIN_PORTA | PIN19)
+#define PIN_FTM_CLKIN1_2          (PIN_ALT4   | PIN_PORTB | PIN17)
+
+#define PIN_FTM0_CH0_1            (PIN_ALT3   | PIN_PORTA | PIN3)
+#define PIN_FTM0_CH0_2            (PIN_ALT4   | PIN_PORTC | PIN1)
+#define PIN_FTM0_CH1_1            (PIN_ALT3   | PIN_PORTA | PIN4)
+#define PIN_FTM0_CH1_2            (PIN_ALT4   | PIN_PORTC | PIN2)
+#define PIN_FTM0_CH2_1            (PIN_ALT3   | PIN_PORTA | PIN5)
+#define PIN_FTM0_CH2_2            (PIN_ALT4   | PIN_PORTC | PIN3)
+#define PIN_FTM0_CH2_3            (PIN_ALT7   | PIN_PORTC | PIN5)
+#define PIN_FTM0_CH3_1            (PIN_ALT3   | PIN_PORTA | PIN6)
+#define PIN_FTM0_CH3_2            (PIN_ALT4   | PIN_PORTC | PIN4)
+#define PIN_FTM0_CH4_1            (PIN_ALT3   | PIN_PORTA | PIN7)
+#define PIN_FTM0_CH4_2            (PIN_ALT4   | PIN_PORTB | PIN12)
+#define PIN_FTM0_CH4_3            (PIN_ALT4   | PIN_PORTD | PIN4)
+#define PIN_FTM0_CH5_1            (PIN_ALT3   | PIN_PORTA | PIN0)
+#define PIN_FTM0_CH5_2            (PIN_ALT4   | PIN_PORTB | PIN13)
+#define PIN_FTM0_CH5_3            (PIN_ALT4   | PIN_PORTD | PIN5)
+#define PIN_FTM0_CH6_1            (PIN_ALT3   | PIN_PORTA | PIN1)
+#define PIN_FTM0_CH6_2            (PIN_ALT4   | PIN_PORTD | PIN6)
+#define PIN_FTM0_CH7_1            (PIN_ALT3   | PIN_PORTA | PIN2)
+#define PIN_FTM0_CH7_2            (PIN_ALT4   | PIN_PORTD | PIN7)
+#define PIN_FTM0_FLT0_1           (PIN_ALT6   | PIN_PORTB | PIN3)
+#define PIN_FTM0_FLT0_2           (PIN_ALT6   | PIN_PORTD | PIN6)
+#define PIN_FTM0_FLT1_1           (PIN_ALT6   | PIN_PORTB | PIN10)
+#define PIN_FTM0_FLT1_2           (PIN_ALT6   | PIN_PORTD | PIN7)
+#define PIN_FTM0_FLT2_1           (PIN_ALT3   | PIN_PORTA | PIN18)
+#define PIN_FTM0_FLT2_2           (PIN_ALT6   | PIN_PORTB | PIN11)
+#define PIN_FTM0_FLT3             (PIN_ALT6   | PIN_PORTB | PIN2)
+
+#define PIN_FTM1_CH0_1            (PIN_ALT3   | PIN_PORTA | PIN12)
+#define PIN_FTM1_CH0_2            (PIN_ALT3   | PIN_PORTA | PIN8)
+#define PIN_FTM1_CH0_3            (PIN_ALT3   | PIN_PORTB | PIN0)
+#define PIN_FTM1_CH0_4            (PIN_ALT3   | PIN_PORTB | PIN12)
+#define PIN_FTM1_CH1_1            (PIN_ALT3   | PIN_PORTA | PIN13)
+#define PIN_FTM1_CH1_2            (PIN_ALT3   | PIN_PORTA | PIN9)
+#define PIN_FTM1_CH1_3            (PIN_ALT3   | PIN_PORTB | PIN1)
+#define PIN_FTM1_CH1_4            (PIN_ALT3   | PIN_PORTB | PIN13)
+#define PIN_FTM1_FLT0_1           (PIN_ALT3   | PIN_PORTA | PIN19)
+#define PIN_FTM1_FLT0_2           (PIN_ALT6   | PIN_PORTB | PIN4)
+#define PIN_FTM1_QD_PHA_1         (PIN_ALT6   | PIN_PORTA | PIN8)
+#define PIN_FTM1_QD_PHA_2         (PIN_ALT6   | PIN_PORTB | PIN0)
+#define PIN_FTM1_QD_PHA_3         (PIN_ALT6   | PIN_PORTB | PIN12)
+#define PIN_FTM1_QD_PHA_4         (PIN_ALT7   | PIN_PORTA | PIN12)
+#define PIN_FTM1_QD_PHB_1         (PIN_ALT6   | PIN_PORTA | PIN9)
+#define PIN_FTM1_QD_PHB_2         (PIN_ALT6   | PIN_PORTB | PIN1)
+#define PIN_FTM1_QD_PHB_3         (PIN_ALT6   | PIN_PORTB | PIN13)
+#define PIN_FTM1_QD_PHB_4         (PIN_ALT7   | PIN_PORTA | PIN13)
+
+#define PIN_FTM2_CH0_1            (PIN_ALT3   | PIN_PORTA | PIN10)
+#define PIN_FTM2_CH0_2            (PIN_ALT3   | PIN_PORTB | PIN18)
+#define PIN_FTM2_CH1_1            (PIN_ALT3   | PIN_PORTA | PIN11)
+#define PIN_FTM2_CH1_2            (PIN_ALT3   | PIN_PORTB | PIN19)
+#define PIN_FTM2_FLT0_1           (PIN_ALT6   | PIN_PORTB | PIN5)
+#define PIN_FTM2_FLT0_2           (PIN_ALT6   | PIN_PORTC | PIN9)
+#define PIN_FTM2_QD_PHA_1         (PIN_ALT6   | PIN_PORTA | PIN10)
+#define PIN_FTM2_QD_PHA_2         (PIN_ALT6   | PIN_PORTB | PIN18)
+#define PIN_FTM2_QD_PHB_1         (PIN_ALT6   | PIN_PORTA | PIN11)
+#define PIN_FTM2_QD_PHB_2         (PIN_ALT6   | PIN_PORTB | PIN19)
+
+#define PIN_FTM3_CH0_1            (PIN_ALT4   | PIN_PORTD | PIN0)
+#define PIN_FTM3_CH0_2            (PIN_ALT6   | PIN_PORTE | PIN5)
+#define PIN_FTM3_CH1_1            (PIN_ALT4   | PIN_PORTD | PIN1)
+#define PIN_FTM3_CH1_2            (PIN_ALT6   | PIN_PORTE | PIN6)
+#define PIN_FTM3_CH2_1            (PIN_ALT4   | PIN_PORTD | PIN2)
+#define PIN_FTM3_CH2_2            (PIN_ALT6   | PIN_PORTE | PIN7)
+#define PIN_FTM3_CH3_1            (PIN_ALT4   | PIN_PORTD | PIN3)
+#define PIN_FTM3_CH3_2            (PIN_ALT6   | PIN_PORTE | PIN8)
+#define PIN_FTM3_CH4_1            (PIN_ALT3   | PIN_PORTC | PIN8)
+#define PIN_FTM3_CH4_2            (PIN_ALT6   | PIN_PORTE | PIN9)
+#define PIN_FTM3_CH5_1            (PIN_ALT3   | PIN_PORTC | PIN9)
+#define PIN_FTM3_CH5_2            (PIN_ALT6   | PIN_PORTE | PIN10)
+#define PIN_FTM3_CH6_1            (PIN_ALT3   | PIN_PORTC | PIN10)
+#define PIN_FTM3_CH6_2            (PIN_ALT6   | PIN_PORTE | PIN11)
+#define PIN_FTM3_CH7_1            (PIN_ALT3   | PIN_PORTC | PIN11)
+#define PIN_FTM3_CH7_2            (PIN_ALT6   | PIN_PORTE | PIN12)
+#define PIN_FTM3_FLT0_1           (PIN_ALT3   | PIN_PORTD | PIN12)
+#define PIN_FTM3_FLT0_2           (PIN_ALT6   | PIN_PORTC | PIN12)
+
+/* I2C */
+
+#define PIN_I2C0_SCL_1            (PIN_ALT2   | PIN_PORTB | PIN0)
+#define PIN_I2C0_SCL_2            (PIN_ALT2   | PIN_PORTB | PIN2)
+#define PIN_I2C0_SCL_3            (PIN_ALT2   | PIN_PORTD | PIN8)
+#define PIN_I2C0_SCL_4            (PIN_ALT5   | PIN_PORTE | PIN24)
+#define PIN_I2C0_SCL_5            (PIN_ALT7   | PIN_PORTD | PIN2)
+#define PIN_I2C0_SDA_1            (PIN_ALT2   | PIN_PORTB | PIN1)
+#define PIN_I2C0_SDA_2            (PIN_ALT2   | PIN_PORTB | PIN3)
+#define PIN_I2C0_SDA_3            (PIN_ALT2   | PIN_PORTD | PIN9)
+#define PIN_I2C0_SDA_4            (PIN_ALT5   | PIN_PORTE | PIN25)
+#define PIN_I2C0_SDA_5            (PIN_ALT7   | PIN_PORTD | PIN3)
+
+#define PIN_I2C1_SCL_1            (PIN_ALT2   | PIN_PORTC | PIN10)
+#define PIN_I2C1_SCL_2            (PIN_ALT6   | PIN_PORTE | PIN1)
+#define PIN_I2C1_SDA_1            (PIN_ALT2   | PIN_PORTC | PIN11)
+#define PIN_I2C1_SDA_2            (PIN_ALT6   | PIN_PORTE | PIN0)
+
+#define PIN_I2C2_SCL_1            (PIN_ALT5   | PIN_PORTA | PIN12)
+#define PIN_I2C2_SCL_2            (PIN_ALT5   | PIN_PORTA | PIN14)
+#define PIN_I2C2_SDA_1            (PIN_ALT5   | PIN_PORTA | PIN11)
+#define PIN_I2C2_SDA_2            (PIN_ALT5   | PIN_PORTA | PIN13)
+
+/* I2S */
+
+#define PIN_I2S0_MCLK_1           (PIN_ALT4   | PIN_PORTC | PIN8)
+#define PIN_I2S0_MCLK_2           (PIN_ALT4   | PIN_PORTE | PIN6)
+#define PIN_I2S0_MCLK_3           (PIN_ALT6   | PIN_PORTA | PIN17)
+#define PIN_I2S0_MCLK_4           (PIN_ALT6   | PIN_PORTC | PIN6)
+#define PIN_I2S0_RX_BCLK_1        (PIN_ALT4   | PIN_PORTC | PIN6)
+#define PIN_I2S0_RX_BCLK_2        (PIN_ALT4   | PIN_PORTC | PIN9)
+#define PIN_I2S0_RX_BCLK_3        (PIN_ALT4   | PIN_PORTE | PIN9)
+#define PIN_I2S0_RX_BCLK_4        (PIN_ALT6   | PIN_PORTA | PIN14)
+#define PIN_I2S0_RX_FS_1          (PIN_ALT4   | PIN_PORTC | PIN10)
+#define PIN_I2S0_RX_FS_2          (PIN_ALT4   | PIN_PORTC | PIN7)
+#define PIN_I2S0_RX_FS_3          (PIN_ALT4   | PIN_PORTE | PIN8)
+#define PIN_I2S0_RX_FS_4          (PIN_ALT6   | PIN_PORTA | PIN16)
+#define PIN_I2S0_RXD0_1           (PIN_ALT4   | PIN_PORTC | PIN5)
+#define PIN_I2S0_RXD0_2           (PIN_ALT4   | PIN_PORTE | PIN7)
+#define PIN_I2S0_RXD0_3           (PIN_ALT6   | PIN_PORTA | PIN15)
+#define PIN_I2S0_RXD1_1           (PIN_ALT2   | PIN_PORTE | PIN8)
+#define PIN_I2S0_RXD1_2           (PIN_ALT4   | PIN_PORTC | PIN11)
+#define PIN_I2S0_RXD1_3           (PIN_ALT7   | PIN_PORTA | PIN16)
+#define PIN_I2S0_TX_BCLK_1        (PIN_ALT4   | PIN_PORTB | PIN18)
+#define PIN_I2S0_TX_BCLK_2        (PIN_ALT4   | PIN_PORTE | PIN12)
+#define PIN_I2S0_TX_BCLK_3        (PIN_ALT6   | PIN_PORTA | PIN5)
+#define PIN_I2S0_TX_BCLK_4        (PIN_ALT6   | PIN_PORTC | PIN3)
+#define PIN_I2S0_TX_FS_1          (PIN_ALT4   | PIN_PORTB | PIN19)
+#define PIN_I2S0_TX_FS_2          (PIN_ALT4   | PIN_PORTE | PIN11)
+#define PIN_I2S0_TX_FS_3          (PIN_ALT6   | PIN_PORTA | PIN13)
+#define PIN_I2S0_TX_FS_4          (PIN_ALT6   | PIN_PORTC | PIN2)
+#define PIN_I2S0_TXD0_1           (PIN_ALT4   | PIN_PORTE | PIN10)
+#define PIN_I2S0_TXD0_2           (PIN_ALT6   | PIN_PORTA | PIN12)
+#define PIN_I2S0_TXD0_3           (PIN_ALT6   | PIN_PORTC | PIN1)
+#define PIN_I2S0_TXD1_1           (PIN_ALT2   | PIN_PORTE | PIN9)
+#define PIN_I2S0_TXD1_2           (PIN_ALT6   | PIN_PORTC | PIN0)
+#define PIN_I2S0_TXD1_3           (PIN_ALT7   | PIN_PORTA | PIN14)
+
+/* JTAG */
+
+#define PIN_JTAG_TCLK             (PIN_ALT7   | PIN_PORTA | PIN0)
+#define PIN_JTAG_TDI              (PIN_ALT7   | PIN_PORTA | PIN1)
+#define PIN_JTAG_TDO              (PIN_ALT7   | PIN_PORTA | PIN2)
+#define PIN_JTAG_TMS              (PIN_ALT7   | PIN_PORTA | PIN3)
+#define PIN_JTAG_TRST             (PIN_ALT7   | PIN_PORTA | PIN5)
+
+/* Low-leakage wakeup module (LLWU, actually GPIO configurations) */
+
+#define PIN_LLWU_P0               (PIN_ALT1   | PIN_PORTE | PIN1)
+#define PIN_LLWU_P1               (PIN_ALT1   | PIN_PORTE | PIN2)
+#define PIN_LLWU_P2               (PIN_ALT1   | PIN_PORTE | PIN4)
+#define PIN_LLWU_P3               (PIN_ALT1   | PIN_PORTA | PIN4)
+#define PIN_LLWU_P4               (PIN_ALT1   | PIN_PORTA | PIN13)
+#define PIN_LLWU_P5               (PIN_ALT1   | PIN_PORTB | PIN0)
+#define PIN_LLWU_P6               (PIN_ALT1   | PIN_PORTC | PIN1)
+#define PIN_LLWU_P7               (PIN_ALT1   | PIN_PORTC | PIN3)
+#define PIN_LLWU_P8               (PIN_ALT1   | PIN_PORTC | PIN4)
+#define PIN_LLWU_P9               (PIN_ALT1   | PIN_PORTC | PIN5)
+#define PIN_LLWU_P10              (PIN_ALT1   | PIN_PORTC | PIN6)
+#define PIN_LLWU_P11              (PIN_ALT1   | PIN_PORTC | PIN11)
+#define PIN_LLWU_P12              (PIN_ALT1   | PIN_PORTD | PIN0)
+#define PIN_LLWU_P13              (PIN_ALT1   | PIN_PORTD | PIN2)
+#define PIN_LLWU_P14              (PIN_ALT1   | PIN_PORTD | PIN4)
+#define PIN_LLWU_P15              (PIN_ALT1   | PIN_PORTD | PIN6)
+
+/* Low-Power Timer (LPTMR) */
+
+#define PIN_LPTMR0_ALT1           (PIN_ALT6   | PIN_PORTA | PIN19)
+#define PIN_LPTMR0_ALT2           (PIN_ALT3   | PIN_PORTC | PIN5)
+
+/* MII */
+
+#define PIN_MII0_COL              (PIN_ALT4   | PIN_PORTA | PIN29)
+#define PIN_MII0_CRS              (PIN_ALT4   | PIN_PORTA | PIN27)
+#define PIN_MII0_MDC              (PIN_ALT4   | PIN_PORTB | PIN1)
+#define PIN_MII0_MDIO             (PIN_ALT4   | PIN_PORTB | PIN0)
+#define PIN_MII0_RXCLK            (PIN_ALT4   | PIN_PORTA | PIN11)
+#define PIN_MII0_RXD0             (PIN_ALT4   | PIN_PORTA | PIN13)
+#define PIN_MII0_RXD1             (PIN_ALT4   | PIN_PORTA | PIN12)
+#define PIN_MII0_RXD2             (PIN_ALT4   | PIN_PORTA | PIN10)
+#define PIN_MII0_RXD3             (PIN_ALT4   | PIN_PORTA | PIN9)
+#define PIN_MII0_RXDV             (PIN_ALT4   | PIN_PORTA | PIN14)
+#define PIN_MII0_RXER             (PIN_ALT4   | PIN_PORTA | PIN5)
+#define PIN_MII0_TXCLK            (PIN_ALT4   | PIN_PORTA | PIN25)
+#define PIN_MII0_TXD0             (PIN_ALT4   | PIN_PORTA | PIN16)
+#define PIN_MII0_TXD1             (PIN_ALT4   | PIN_PORTA | PIN17)
+#define PIN_MII0_TXD2             (PIN_ALT4   | PIN_PORTA | PIN24)
+#define PIN_MII0_TXD3             (PIN_ALT4   | PIN_PORTA | PIN26)
+#define PIN_MII0_TXEN             (PIN_ALT4   | PIN_PORTA | PIN15)
+#define PIN_MII0_TXER             (PIN_ALT4   | PIN_PORTA | PIN28)
+
+/* NMI */
+
+#define PIN_NMI                   (PIN_ALT7   | PIN_PORTA | PIN4)
+
+/* Programmable Delay Block (PDB) */
+
+#define PIN_PDB0_EXTRG_1          (PIN_ALT3   | PIN_PORTC | PIN0)
+#define PIN_PDB0_EXTRG_2          (PIN_ALT3   | PIN_PORTC | PIN6)
+
+/* RMII */
+
+#define PIN_RMII0_CRS_DV          (PIN_ALT4   | PIN_PORTA | PIN14)
+#define PIN_RMII0_MDC             (PIN_ALT4   | PIN_PORTB | PIN1)
+#define PIN_RMII0_MDIO            (PIN_ALT4   | PIN_PORTB | PIN0)
+#define PIN_RMII0_RXD0            (PIN_ALT4   | PIN_PORTA | PIN13)
+#define PIN_RMII0_RXD1            (PIN_ALT4   | PIN_PORTA | PIN12)
+#define PIN_RMII0_RXER            (PIN_ALT4   | PIN_PORTA | PIN5)
+#define PIN_RMII0_TXD0            (PIN_ALT4   | PIN_PORTA | PIN16)
+#define PIN_RMII0_TXD1            (PIN_ALT4   | PIN_PORTA | PIN17)
+#define PIN_RMII0_TXEN            (PIN_ALT4   | PIN_PORTA | PIN15)
+
+/* Real-Time Clock (RTC) */
+
+#define PIN_RTC_CLKOUT_1          (PIN_ALT6   | PIN_PORTE | PIN26)
+#define PIN_RTC_CLKOUT_2          (PIN_ALT7   | PIN_PORTE | PIN0)
+
+/* Secured digital host controller (SDHC) */
+
+#define PIN_SDHC0_CLKIN           (PIN_ALT4   | PIN_PORTD | PIN11)
+#define PIN_SDHC0_CMD             (PIN_ALT4   | PIN_PORTE | PIN3)
+#define PIN_SDHC0_D0              (PIN_ALT4   | PIN_PORTE | PIN1)
+#define PIN_SDHC0_D1              (PIN_ALT4   | PIN_PORTE | PIN0)
+#define PIN_SDHC0_D2              (PIN_ALT4   | PIN_PORTE | PIN5)
+#define PIN_SDHC0_D3              (PIN_ALT4   | PIN_PORTE | PIN4)
+#define PIN_SDHC0_D4              (PIN_ALT4   | PIN_PORTD | PIN12)
+#define PIN_SDHC0_D5              (PIN_ALT4   | PIN_PORTD | PIN13)
+#define PIN_SDHC0_D6              (PIN_ALT4   | PIN_PORTD | PIN14)
+#define PIN_SDHC0_D7              (PIN_ALT4   | PIN_PORTD | PIN15)
+#define PIN_SDHC0_DCLK            (PIN_ALT4   | PIN_PORTE | PIN2)
+
+/* SPI */
+
+#define PIN_SPI0_PCS0_1           (PIN_ALT2   | PIN_PORTA | PIN14)
+#define PIN_SPI0_PCS0_2           (PIN_ALT2   | PIN_PORTC | PIN4)
+#define PIN_SPI0_PCS0_3           (PIN_ALT2   | PIN_PORTD | PIN0)
+#define PIN_SPI0_PCS1_1           (PIN_ALT2   | PIN_PORTC | PIN3)
+#define PIN_SPI0_PCS1_2           (PIN_ALT2   | PIN_PORTD | PIN4)
+#define PIN_SPI0_PCS2_1           (PIN_ALT2   | PIN_PORTC | PIN2)
+#define PIN_SPI0_PCS2_3           (PIN_ALT2   | PIN_PORTD | PIN5)
+#define PIN_SPI0_PCS3_1           (PIN_ALT2   | PIN_PORTC | PIN1)
+#define PIN_SPI0_PCS3_2           (PIN_ALT2   | PIN_PORTD | PIN6)
+#define PIN_SPI0_PCS4             (PIN_ALT2   | PIN_PORTC | PIN0)
+#define PIN_SPI0_PCS5             (PIN_ALT3   | PIN_PORTB | PIN23)
+#define PIN_SPI0_SCK_1            (PIN_ALT2   | PIN_PORTA | PIN15)
+#define PIN_SPI0_SCK_2            (PIN_ALT2   | PIN_PORTC | PIN5)
+#define PIN_SPI0_SCK_3            (PIN_ALT2   | PIN_PORTD | PIN1)
+#define PIN_SPI0_SIN_1            (PIN_ALT2   | PIN_PORTA | PIN17)
+#define PIN_SPI0_SIN_2            (PIN_ALT2   | PIN_PORTC | PIN7)
+#define PIN_SPI0_SIN_3            (PIN_ALT2   | PIN_PORTD | PIN3)
+#define PIN_SPI0_SOUT_1           (PIN_ALT2   | PIN_PORTA | PIN16)
+#define PIN_SPI0_SOUT_2           (PIN_ALT2   | PIN_PORTC | PIN6)
+#define PIN_SPI0_SOUT_3           (PIN_ALT2   | PIN_PORTD | PIN2)
+
+#define PIN_SPI1_PCS0_1           (PIN_ALT2   | PIN_PORTB | PIN10)
+#define PIN_SPI1_PCS0_2           (PIN_ALT2   | PIN_PORTE | PIN4)
+#define PIN_SPI1_PCS0_3           (PIN_ALT7   | PIN_PORTD | PIN4)
+#define PIN_SPI1_PCS1_1           (PIN_ALT2   | PIN_PORTB | PIN9)
+#define PIN_SPI1_PCS1_2           (PIN_ALT2   | PIN_PORTE | PIN0)
+#define PIN_SPI1_PCS2             (PIN_ALT2   | PIN_PORTE | PIN5)
+#define PIN_SPI1_PCS3             (PIN_ALT2   | PIN_PORTE | PIN6)
+#define PIN_SPI1_SCK_1            (PIN_ALT2   | PIN_PORTB | PIN11)
+#define PIN_SPI1_SCK_2            (PIN_ALT2   | PIN_PORTE | PIN2)
+#define PIN_SPI1_SCK_3            (PIN_ALT7   | PIN_PORTD | PIN5)
+#define PIN_SPI1_SIN_1            (PIN_ALT2   | PIN_PORTB | PIN17)
+#define PIN_SPI1_SIN_2            (PIN_ALT2   | PIN_PORTE | PIN3)
+#define PIN_SPI1_SIN_3            (PIN_ALT7   | PIN_PORTD | PIN7)
+#define PIN_SPI1_SIN_4            (PIN_ALT7   | PIN_PORTE | PIN1)
+#define PIN_SPI1_SOUT_1           (PIN_ALT2   | PIN_PORTB | PIN16)
+#define PIN_SPI1_SOUT_2           (PIN_ALT2   | PIN_PORTE | PIN1)
+#define PIN_SPI1_SOUT_3           (PIN_ALT7   | PIN_PORTD | PIN6)
+#define PIN_SPI1_SOUT_4           (PIN_ALT7   | PIN_PORTE | PIN3)
+
+#define PIN_SPI2_PCS0_1           (PIN_ALT2   | PIN_PORTB | PIN20)
+#define PIN_SPI2_PCS0_2           (PIN_ALT2   | PIN_PORTD | PIN11)
+#define PIN_SPI2_PCS1             (PIN_ALT2   | PIN_PORTD | PIN15)
+#define PIN_SPI2_SCK_1            (PIN_ALT2   | PIN_PORTB | PIN21)
+#define PIN_SPI2_SCK_2            (PIN_ALT2   | PIN_PORTD | PIN12)
+#define PIN_SPI2_SIN_1            (PIN_ALT2   | PIN_PORTB | PIN23)
+#define PIN_SPI2_SIN_2            (PIN_ALT2   | PIN_PORTD | PIN14)
+#define PIN_SPI2_SOUT_1           (PIN_ALT2   | PIN_PORTB | PIN22)
+#define PIN_SPI2_SOUT_2           (PIN_ALT2   | PIN_PORTD | PIN13)
+
+/* SWD */
+
+#define PIN_SWD_CLK               (PIN_ALT7   | PIN_PORTA | PIN0)
+#define PIN_SWD_DIO               (PIN_ALT7   | PIN_PORTA | PIN3)
+
+/* Trace */
+
+#define PIN_TRACE_CLKOUT_1        (PIN_ALT5   | PIN_PORTE | PIN0)
+#define PIN_TRACE_CLKOUT_2        (PIN_ALT7   | PIN_PORTA | PIN6)
+#define PIN_TRACE_D0_1            (PIN_ALT5   | PIN_PORTE | PIN4)
+#define PIN_TRACE_D0_2            (PIN_ALT7   | PIN_PORTA | PIN10)
+#define PIN_TRACE_D1_1            (PIN_ALT5   | PIN_PORTE | PIN3)
+#define PIN_TRACE_D1_2            (PIN_ALT7   | PIN_PORTA | PIN9)
+#define PIN_TRACE_D2_1            (PIN_ALT5   | PIN_PORTE | PIN2)
+#define PIN_TRACE_D2_2            (PIN_ALT7   | PIN_PORTA | PIN8)
+#define PIN_TRACE_D3_1            (PIN_ALT5   | PIN_PORTE | PIN1)
+#define PIN_TRACE_D3_2            (PIN_ALT7   | PIN_PORTA | PIN7)
+#define PIN_TRACE_SWO             (PIN_ALT7   | PIN_PORTA | PIN2)
+
+/* UARTs */
+
+#define PIN_UART0_COL_1           (PIN_ALT2   | PIN_PORTA | PIN0)
+#define PIN_UART0_COL_2           (PIN_ALT3   | PIN_PORTA | PIN16)
+#define PIN_UART0_COL_3           (PIN_ALT3   | PIN_PORTB | PIN3)
+#define PIN_UART0_COL_4           (PIN_ALT3   | PIN_PORTD | PIN5)
+#define PIN_UART0_CTS_1           (PIN_ALT2   | PIN_PORTA | PIN0)
+#define PIN_UART0_CTS_2           (PIN_ALT3   | PIN_PORTA | PIN16)
+#define PIN_UART0_CTS_3           (PIN_ALT3   | PIN_PORTB | PIN3)
+#define PIN_UART0_CTS_4           (PIN_ALT3   | PIN_PORTD | PIN5)
+#define PIN_UART0_RTS_1           (PIN_ALT2   | PIN_PORTA | PIN3)
+#define PIN_UART0_RTS_2           (PIN_ALT3   | PIN_PORTA | PIN17)
+#define PIN_UART0_RTS_3           (PIN_ALT3   | PIN_PORTB | PIN2)
+#define PIN_UART0_RTS_4           (PIN_ALT3   | PIN_PORTD | PIN4)
+#define PIN_UART0_RX_1            (PIN_ALT2   | PIN_PORTA | PIN1)
+#define PIN_UART0_RX_2            (PIN_ALT3   | PIN_PORTA | PIN15)
+#define PIN_UART0_RX_3            (PIN_ALT3   | PIN_PORTB | PIN16)
+#define PIN_UART0_RX_4            (PIN_ALT3   | PIN_PORTD | PIN6)
+#define PIN_UART0_TX_1            (PIN_ALT2   | PIN_PORTA | PIN2)
+#define PIN_UART0_TX_2            (PIN_ALT3   | PIN_PORTA | PIN14)
+#define PIN_UART0_TX_3            (PIN_ALT3   | PIN_PORTB | PIN17)
+#define PIN_UART0_TX_4            (PIN_ALT3   | PIN_PORTD | PIN7)
+
+#define PIN_UART1_CTS_1           (PIN_ALT3   | PIN_PORTC | PIN2)
+#define PIN_UART1_CTS_2           (PIN_ALT3   | PIN_PORTE | PIN2)
+#define PIN_UART1_RTS_1           (PIN_ALT3   | PIN_PORTC | PIN1)
+#define PIN_UART1_RTS_2           (PIN_ALT3   | PIN_PORTE | PIN3)
+#define PIN_UART1_RX_1            (PIN_ALT3   | PIN_PORTC | PIN3)
+#define PIN_UART1_RX_2            (PIN_ALT3   | PIN_PORTE | PIN1)
+#define PIN_UART1_TX_1            (PIN_ALT3   | PIN_PORTC | PIN4)
+#define PIN_UART1_TX_2            (PIN_ALT3   | PIN_PORTE | PIN0)
+
+#define PIN_UART2_CTS             (PIN_ALT3   | PIN_PORTD | PIN1)
+#define PIN_UART2_RTS             (PIN_ALT3   | PIN_PORTD | PIN0)
+#define PIN_UART2_RX              (PIN_ALT3   | PIN_PORTD | PIN2)
+#define PIN_UART2_TX              (PIN_ALT3   | PIN_PORTD | PIN3)
+
+#define PIN_UART3_CTS_1           (PIN_ALT2   | PIN_PORTB | PIN13)
+#define PIN_UART3_CTS_2           (PIN_ALT3   | PIN_PORTB | PIN9)
+#define PIN_UART3_CTS_3           (PIN_ALT3   | PIN_PORTC | PIN19)
+#define PIN_UART3_CTS_4           (PIN_ALT3   | PIN_PORTE | PIN6)
+#define PIN_UART3_RTS_1           (PIN_ALT2   | PIN_PORTB | PIN12)
+#define PIN_UART3_RTS_2           (PIN_ALT3   | PIN_PORTB | PIN8)
+#define PIN_UART3_RTS_3           (PIN_ALT3   | PIN_PORTC | PIN18)
+#define PIN_UART3_RTS_4           (PIN_ALT3   | PIN_PORTE | PIN7)
+#define PIN_UART3_RX_1            (PIN_ALT3   | PIN_PORTB | PIN10)
+#define PIN_UART3_RX_2            (PIN_ALT3   | PIN_PORTC | PIN16)
+#define PIN_UART3_RX_3            (PIN_ALT3   | PIN_PORTE | PIN5)
+#define PIN_UART3_TX_1            (PIN_ALT3   | PIN_PORTB | PIN11)
+#define PIN_UART3_TX_2            (PIN_ALT3   | PIN_PORTC | PIN17)
+#define PIN_UART3_TX_3            (PIN_ALT3   | PIN_PORTE | PIN4)
+
+#define PIN_UART4_CTS_1           (PIN_ALT3   | PIN_PORTC | PIN13)
+#define PIN_UART4_CTS_2           (PIN_ALT3   | PIN_PORTE | PIN26)
+#define PIN_UART4_RTS_1           (PIN_ALT3   | PIN_PORTC | PIN12)
+#define PIN_UART4_RTS_2           (PIN_ALT3   | PIN_PORTE | PIN27)
+#define PIN_UART4_RX_1            (PIN_ALT3   | PIN_PORTC | PIN14)
+#define PIN_UART4_RX_2            (PIN_ALT3   | PIN_PORTE | PIN25)
+#define PIN_UART4_TX_1            (PIN_ALT3   | PIN_PORTC | PIN15)
+#define PIN_UART4_TX_2            (PIN_ALT3   | PIN_PORTE | PIN24)
+
+#define PIN_UART5_CTS_1           (PIN_ALT3   | PIN_PORTD | PIN11)
+#define PIN_UART5_CTS_2           (PIN_ALT3   | PIN_PORTE | PIN10)
+#define PIN_UART5_RTS_1           (PIN_ALT3   | PIN_PORTD | PIN10)
+#define PIN_UART5_RTS_2           (PIN_ALT3   | PIN_PORTE | PIN11)
+#define PIN_UART5_RX_1            (PIN_ALT3   | PIN_PORTD | PIN8)
+#define PIN_UART5_RX_2            (PIN_ALT3   | PIN_PORTE | PIN9)
+#define PIN_UART5_TX_1            (PIN_ALT3   | PIN_PORTD | PIN9)
+#define PIN_UART5_TX_2            (PIN_ALT3   | PIN_PORTE | PIN8)
+
+/* USB */
+
+#define PIN_USB_CLKIN_1           (PIN_ALT2   | PIN_PORTA | PIN5)
+#define PIN_USB_CLKIN_2           (PIN_ALT7   | PIN_PORTE | PIN26)
+#define PIN_USB_SOF_OUT_1         (PIN_ALT3   | PIN_PORTC | PIN7)
+#define PIN_USB_SOF_OUT_2         (PIN_ALT4   | PIN_PORTC | PIN0)
+#define PIN_USB_SOF_OUT_3         (PIN_ALT7   | PIN_PORTE | PIN6)
+
+/* External Crystal */
+
+#define PIN_EXTAL0                (PIN_ANALOG | PIN_PORTA | PIN18)
+#define PIN_XTAL0                 (PIN_ANALOG | PIN_PORTA | PIN19)
 
 /********************************************************************************************
  * Public Types
-- 
GitLab


From 874c61411730f7cb6a9b28e13412cb6b4886401d Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sat, 2 Jul 2016 13:58:29 -0600
Subject: [PATCH 138/229] Freedom K64F:  Correct comments about VCOM serial
 console.  Add pin multi-plexing disambiguaration for the VCOM UART pins.

---
 configs/freedom-k64f/README.txt      | 10 ++--------
 configs/freedom-k64f/include/board.h | 11 ++++-------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/configs/freedom-k64f/README.txt b/configs/freedom-k64f/README.txt
index da219bad6a..3a6184a138 100644
--- a/configs/freedom-k64f/README.txt
+++ b/configs/freedom-k64f/README.txt
@@ -54,14 +54,8 @@ OpenSDAv2
 Serial Console
 ==============
 
-  The primary serial port interface signals are PTB16 UART1_RX and PTB17
-  UART1_TX. These signals are connected to the OpenSDAv2 circuit.
-
-  REVISIT: The above quote was taken from the "FRDM-K64F Freedom Module User’s
-  Guide". It appears from the "K64 Sub-Family Reference Manual" that the only
-  options for UART1 are {PTC3, PTE1} for UART1_RX and {PTC4, PTE0} for UART1_TX.
-
-  PTB16 and PTB17 are valid options for UART0, however.
+  The primary serial port interface signals are PTB16 UART0_RX and PTB17
+  UART0_TX. These signals are connected to the OpenSDAv2 circuit.
 
 LEDs and Buttons
 ================
diff --git a/configs/freedom-k64f/include/board.h b/configs/freedom-k64f/include/board.h
index 041edeb6b5..624595324f 100644
--- a/configs/freedom-k64f/include/board.h
+++ b/configs/freedom-k64f/include/board.h
@@ -198,16 +198,13 @@
  * maps to the correct alternative.
  */
 
-/* The primary serial port interface signals are PTB16 UART1_RX and PTB17 UART1_TX.
+/* The primary serial port interface signals are PTB16 UART0_RX and PTB17 UART0_TX.
  * These signals are connected to the OpenSDAv2 circuit.
- *
- * REVISIT: The above quote was taken from the "FRDM-K64F Freedom Module User’s
- * Guide". It appears from the "K64 Sub-Family Reference Manual" that the only
- * options for UART1 are {PTC3, PTE1} for UART1_RX and {PTC4, PTE0} for UART1_TX.
- *
- * PTB16 and PTB17 are valid options for UART0, however.
  */
 
+#define PIN_UART0_RX      PIN_UART0_RX_3
+#define PIN_UART0_TX      PIN_UART0_TX_3
+
 /************************************************************************************
  * Public Data
  ************************************************************************************/
-- 
GitLab


From d31f0bd076b3a2632ec6e6cbb89b07dc3252970d Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sat, 2 Jul 2016 14:42:29 -0600
Subject: [PATCH 139/229] Fix some button definitions

---
 configs/freedom-k64f/include/board.h      | 4 ++--
 configs/stm32l476vg-disco/include/board.h | 2 +-
 configs/twr-k60n512/include/board.h       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configs/freedom-k64f/include/board.h b/configs/freedom-k64f/include/board.h
index 624595324f..6581944190 100644
--- a/configs/freedom-k64f/include/board.h
+++ b/configs/freedom-k64f/include/board.h
@@ -187,8 +187,8 @@
 #define BUTTON_SW2        0
 #define BUTTON_SW3        1
 
-#define BUTTON_SW2_BIT    (1 << BUTTON_WAKEUP)
-#define BUTTON_SW3_BIT    (1 << BUTTON_TAMPER)
+#define BUTTON_SW2_BIT    (1 << BUTTON_SW2)
+#define BUTTON_SW3_BIT    (1 << BUTTON_SW3)
 
 /* Alternative pin resolution *******************************************************/
 /* If there are alternative configurations for various pins in the
diff --git a/configs/stm32l476vg-disco/include/board.h b/configs/stm32l476vg-disco/include/board.h
index c05f74a7e5..ee28c35a06 100644
--- a/configs/stm32l476vg-disco/include/board.h
+++ b/configs/stm32l476vg-disco/include/board.h
@@ -271,7 +271,7 @@
 #define BUTTON_CENTER_BIT  (1 << BUTTON_CENTER)
 #define BUTTON_LEFT_BIT    (1 << BUTTON_LEFT)
 #define BUTTON_DOWN_BIT    (1 << BUTTON_DOWN)
-#define BUTTON_TIGHT_BIT   (1 << BUTTON_RIGHT)
+#define BUTTON_RIGHT_BIT   (1 << BUTTON_RIGHT)
 #define BUTTON_UP_BIT      (1 << BUTTON_UP)
 
 /************************************************************************************
diff --git a/configs/twr-k60n512/include/board.h b/configs/twr-k60n512/include/board.h
index 92c6dce940..ea464c0d43 100644
--- a/configs/twr-k60n512/include/board.h
+++ b/configs/twr-k60n512/include/board.h
@@ -154,8 +154,8 @@
 #define BUTTON_SW1        0
 #define BUTTON_SW2        1
 
-#define BUTTON_SW1_BIT    (1 << BUTTON_WAKEUP)
-#define BUTTON_SW2_BIT    (1 << BUTTON_TAMPER)
+#define BUTTON_SW1_BIT    (1 << BUTTON_SW1)
+#define BUTTON_SW2_BIT    (1 << BUTTON_SW2)
 
 /* Alternative pin resolution *******************************************************/
 /* If there are alternative configurations for various pins in the
-- 
GitLab


From 1bf745a841e87b111b0cdb549e82ce9497914199 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sat, 2 Jul 2016 15:27:12 -0600
Subject: [PATCH 140/229] Freedom K64F: Add pin configuration to use a serial
 Shield as the Serial Console.

---
 configs/freedom-k64f/README.txt      | 33 ++++++++++++++++++++++++++--
 configs/freedom-k64f/include/board.h | 21 ++++++++++++++++++
 2 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/configs/freedom-k64f/README.txt b/configs/freedom-k64f/README.txt
index 3a6184a138..40239fe15d 100644
--- a/configs/freedom-k64f/README.txt
+++ b/configs/freedom-k64f/README.txt
@@ -54,8 +54,34 @@ OpenSDAv2
 Serial Console
 ==============
 
+  USB VCOM Console
+  ----------------
   The primary serial port interface signals are PTB16 UART0_RX and PTB17
-  UART0_TX. These signals are connected to the OpenSDAv2 circuit.
+  UART0_TX. These signals are connected to the OpenSDAv2 VCOM circuit.
+
+  Serial Shield Console
+  ---------------------
+  An alternative serial port might use a standard serial shield mounted
+  on the Freedom Board.  In this case, Arduino pin D1 provides UART TX and
+  pin D0 privides UART RX.
+
+  The I/O headers on the FRDM-K64F board are arranged to enable
+  compatibility with Arduino shield. The outer rows of pins (even numbered
+  pins) on the headers, share the same mechanical spacing and placement with
+  the I/O headers on the Arduino Revision 3 (R3) standard.
+
+  The Arduino D0 and D1 pins then correspond to pins 2 and 4 on the J1 I/O
+  connector:
+
+    Arduino Pin              FRDM-K64F J1 Connector
+    ------------------------ -----------------------
+    UART TX, Arduino D1 pin  Pin 4, PTC17, UART3_TX
+    UART RX, Arduino D0 pin  Pin 2, PTC16, UART3_RX
+
+  Default Serial Console
+  ----------------------
+  By default, these configuration are setup to use the Serial Console on
+  UART3.  That, however, is easily reconfigured.
 
 LEDs and Buttons
 ================
@@ -344,7 +370,10 @@ Where  is one of the following:
        CONFIG_ARMV7M_OABI_TOOLCHAIN=y      : The older OABI version
        CONFIG_RAW_BINARY=y                 : Output formats: ELF and raw binary
 
-    3. An SDHC driver is under work and can be enabled in the NSH configuration
+    3. The Serial Console is provided on UART3 with the correct pin
+       configuration for use with an Arduino Serial Shield.
+
+    4. An SDHC driver is under work and can be enabled in the NSH configuration
        for further testing be setting the following configuration values as
        follows:
 
diff --git a/configs/freedom-k64f/include/board.h b/configs/freedom-k64f/include/board.h
index 6581944190..07af717c70 100644
--- a/configs/freedom-k64f/include/board.h
+++ b/configs/freedom-k64f/include/board.h
@@ -205,6 +205,27 @@
 #define PIN_UART0_RX      PIN_UART0_RX_3
 #define PIN_UART0_TX      PIN_UART0_TX_3
 
+/* An alternative serial port might use a standard serial shield mounted
+ * on the Freedom Board.  In this case, Arduino pin D1 provides UART TX and
+ * pin D0 privides UART RX.
+ *
+ * The I/O headers on the FRDM-K64F board are arranged to enable
+ * compatibility with Arduino shield. The outer rows of pins (even numbered
+ * pins) on the headers, share the same mechanical spacing and placement with
+ * the I/O headers on the Arduino Revision 3 (R3) standard.
+ *
+ * The Arduino D0 and D1 pins then correspond to pins 2 and 4 on the J1 I/O
+ * connector:
+ *
+ *   Arduino Pin              FRDM-K64F J1 Connector
+ *   ------------------------ -----------------------
+ *   UART TX, Arduino D1 pin  Pin 4, PTC17, UART3_TX
+ *   UART RX, Arduino D0 pin  Pin 2, PTC16, UART3_RX
+ */
+
+#define PIN_UART3_RX      PIN_UART3_RX_2
+#define PIN_UART3_TX      PIN_UART3_TX_2
+
 /************************************************************************************
  * Public Data
  ************************************************************************************/
-- 
GitLab


From 5792491427ed8cbb6784d4c47b797b558bd9582e Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sun, 3 Jul 2016 07:55:25 -0600
Subject: [PATCH 141/229] Remove configs/mt-db-x3, unfinished XMega port

---
 Documentation/README.html   |  2 -
 README.txt                  |  2 -
 configs/mt-db-x3/README.txt | 88 -------------------------------------
 3 files changed, 92 deletions(-)
 delete mode 100644 configs/mt-db-x3/README.txt

diff --git a/Documentation/README.html b/Documentation/README.html
index 38c6ab0ee4..298accc787 100644
--- a/Documentation/README.html
+++ b/Documentation/README.html
@@ -148,8 +148,6 @@ nuttx/
  |   |   `- README.txt
  |   |- mirtoo/
  |   |   `- README.txt
- |   |- mt-db-x3//
- |   |   `- README.txt
  |   |- moteino-mega/
  |   |   `- README.txt
  |   |- mx1ads/
diff --git a/README.txt b/README.txt
index 2d16a30234..4c12dca85a 100644
--- a/README.txt
+++ b/README.txt
@@ -1327,8 +1327,6 @@ nuttx/
  |   |   `- README.txt
  |   |- mirtoo/
  |   |   `- README.txt
- |   |- mt-db-x3/
- |   |   `- README.txt
  |   |- moteino-mega/
  |   |   `- README.txt
  |   |- mx1ads/
diff --git a/configs/mt-db-x3/README.txt b/configs/mt-db-x3/README.txt
deleted file mode 100644
index 5ea012e1ff..0000000000
--- a/configs/mt-db-x3/README.txt
+++ /dev/null
@@ -1,88 +0,0 @@
-README
-======
-
-  This README file discusses the port of NuttX to the MT-DB-X3 development
-  board from MattairTech.  This board may host a variety of 64-pin AVR XMega
-  part.  This port was specifically performed using the ATXmega384c3.
-
-  See the MattairTech website for further information about the MT-DB-X3:
-  http://www.mattairtech.com/.
-
-  NOTE: There is no port for the XMEGA in place as of this writing.  At this
-  point in time, this README file is only a repository for pre-porting
-  information.  It is not clear as of this writing whether there ever will
-  be a port to the MT-DB-X3 development board or not.
-
-Contents
-========
-
-  - PIO Usage
-  - LEDs and Buttons
-  - Serial Console
-  - Configurations
-
-PIO Usage
-=========
-
-  PA0  CONN_P_10 pin 1, Aref via J34
-  PA1  CONN_P_10 pin 2
-  PA2  CONN_P_10 pin 3
-  PA3  CONN_P_10 pin 4
-  PA4  CONN_P_10 pin 5
-  PA5  CONN_P_10 pin 6
-  PA6  CONN_P_10 pin 7
-  PA7  CONN_P_10 pin 8
-
-  PB0  CONN_P_10 pin 9, Aref via J25
-  PB1  CONN_P_10 pin 10
-  PB2  C4_LS CONN_P14 pin 5
-  PB3  C4_LS CONN_P14 pin 5
-  PB4  C4_LS CONN_P14 pin 5, Alt JTAG TMS
-  PB5  C4_LS CONN_P14 pin 5, Alt JTAG TDI
-  PB6  C4_LS CONN_P14 pin 5, Alt JTAG TCK
-  PB7  C4_LS CONN_P14 pin 5, Alt JTAG TDO, Voltage measurement via J15
-
-  PC0  C0_LS CONN_P14 pin 7
-  PC1  C1_LS CONN_P14 pin 8
-  PC2  C2_LS CONN_P14 pin 9
-  PC3  C3_LS CONN_P14 pin 10
-  PC4  C4_LS CONN_P14 pin 5, PDI/SPI Header pin 5 via J8
-  PC5  C5_LS CONN_P14 pin 6, PDI/SPI Header pin 4 via J8
-  PC6  C6_LS CONN_P14 pin 7, PDI/SPI Header pin 1 via J13
-  PC7  C7_LS CONN_P14 pin 8, PDI/SPI Header pin 3 via J12
-
-  PD0  CONN_P14 pin 9
-  PD1  CONN_P14 pin 10
-  PD2  CONN_P14 pin 11
-  PD3  CONN_P14 pin 12
-  PD4  CONN_P14 pin 13
-  PD5  CONN_P14 pin 14, TXB0103 Output Enable
-  PD6  CONN_P14 pin 12, USB D-
-  PD7  CONN_P14 pin 13, USB D+
-
-  PE0  CONN_P10 pin 1
-  PE1  CONN_P10 pin 2
-  PE2  CONN_P10 pin 3
-  PE3  CONN_P10 pin 4
-  PE4  CONN_P10 pin 5
-  PE5  CONN_P10 pin 6
-  PE6  CONN_P10 pin 7, TOSC1 via J28
-  PE7  CONN_P10 pin 8, TOSC1 via J29
-
-  PF0  PORT F pin 1
-  PF1  PORT F pin 2
-  PF2  PORT F pin 3
-  PF3  PORT F pin 4
-  PF4  PORT F pin 5, Bootloader jumper
-  PF5  PORT F pin 6
-  PF6  PORT F pin 7, Green LED via J31
-  PF7  PORT F pin 8, User button via J33 (otherwise reset)
-
-LEDs and Buttons
-================
-
-Serial Console
-==============
-
-Configurations
-==============
-- 
GitLab


From a43edef2298ebf73d0735eb350751e55cf70b343 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sun, 3 Jul 2016 08:16:28 -0600
Subject: [PATCH 142/229] Fix some URLs

---
 Documentation/README.html | 298 +++++++++++++++++++-------------------
 1 file changed, 149 insertions(+), 149 deletions(-)

diff --git a/Documentation/README.html b/Documentation/README.html
index 298accc787..d9199a4827 100644
--- a/Documentation/README.html
+++ b/Documentation/README.html
@@ -8,7 +8,7 @@
   
     
       
            NuttX README Files
            
-      
            Last Updated:  May 26, 2016
            
+      
            Last Updated:  July 3, 2016
            
     
   
 
@@ -30,24 +30,24 @@ nuttx/
  |   |
  |   |- arm/
  |   |   `- src
- |   |       `- lpc214x/README.txt
+ |   |       `- lpc214x/README.txt
  |   |- sh/
  |   |   |- include/
- |   |   |   `-README.txt
+ |   |   |   `-README.txt
  |   |   |- src/
- |   |   |   `-README.txt
+ |   |   |   `-README.txt
  |   |- x86/
  |   |   |- include/
- |   |   |   `-README.txt
+ |   |   |   `-README.txt
  |   |   `- src/
- |   |       `-README.txt
+ |   |       `-README.txt
  |   |- z80/
  |   |   |- src/z80
- |   |   |   `- README.txt
+ |   |   |   `- README.txt
  |   |   `- src/z180
- |   |       |- README.txt
- |   |       `- z180_mmu.txt
- |   `- README.txt
+ |   |       |- README.txt
+ |   |       `- z180_mmu.txt
+ |   `- README.txt
  |- binfmt/
  |   |- libpcode/
  |   `- README.txt
@@ -55,263 +55,263 @@ nuttx/
  |   `- README.txt
  |- configs/
  |   |- amber/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- arduino-mega2560/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- arduino-due/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- avr32dev1/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- c5471evm/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- cc3200-launchpad/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- cloudctrl/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- compal_e86/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- compal_e88/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- compal_e99/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- demo9s12ne64/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- dk-tm4c129x/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- ea3131/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- ea3152/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- eagle100/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- efm32-g8xx-stk/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- efm32gg-stk3700/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- ekk-lm3s9b96/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- ez80f910200kitg/
- |   |   |- ostest/README.txt
- |   |   `- README.txt
+ |   |   |- ostest/README.txt
+ |   |   `- README.txt
  |   |- ez80f910200zco/
- |   |   |- dhcpd/README.txt
- |   |   |- httpd/README.txt
- |   |   |- nettest/README.txt
- |   |   |- nsh/README.txt
- |   |   |- ostest/README.txt
- |   |   |- poll/README.txt
- |   |   `- README.txt
+ |   |   |- dhcpd/README.txt
+ |   |   |- httpd/README.txt
+ |   |   |- nettest/README.txt
+ |   |   |- nsh/README.txt
+ |   |   |- ostest/README.txt
+ |   |   |- poll/README.txt
+ |   |   `- README.txt
  |   |- fire-stm32v2/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- freedom-k64f/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- freedom-kl25z/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- freedom-kl26z/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- hymini-stm32v/
- |   |   |- RIDE/README.txt
- |   |   `- README.txt
+ |   |   |- RIDE/README.txt
+ |   |   `- README.txt
  |   |- kwikstik-k40/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- launchxl-tms57004/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- lincoln60/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- lm3s6432-s2e/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- lm3s6965-ek/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- lm3s8962-ek/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- lpc4330-xplorer/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- lpc4337-ws/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- lpc4357-evb/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- lpc4370-link2/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- lpcxpresso-lpc1115/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- lpcxpresso-lpc1768/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- maple/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- mbed/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- mcu123-lpc214x/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- micropendous3/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- mikroe-stm32f4/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- mirtoo/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- moteino-mega/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- mx1ads/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- ne64badge/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- ntosd-dm320/
- |   |   |- doc/README.txt
- |   |   `- README.txt
+ |   |   |- doc/README.txt
+ |   |   `- README.txt
  |   |- nucleo-144/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- nucleo-f4x1re/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- nutiny-nuc120/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- olimex-efm32g880f129-stk/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- olimex-lpc1766stk/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- olimex-lpc2378/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- olimex-lpc-h3131/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- olimex-stm32-h405/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- olimex-stm32-h407/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- olimex-stm32-p107/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- olimex-stm32-p207/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- olimex-strp711/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- open1788/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- p112/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- pcblogic-pic32mx/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- pcduino-a10/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- pic32mx-starterkit/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- pic32mx7mmb/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- pic32mz-starterkit/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- pirelli_dpl10/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- qemu-i486/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- rgmp/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- sabre-6quad/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- sama5d2-xult/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- sama5d3x-ek/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- sama5d3-xplained/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- sama5d4-ek/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- samd20-xplained/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- samd21-xplained/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- saml21-xplained/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- sam3u-ek/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- sam4e-ek/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- sam4l-xplained/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- sam4s-xplained/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- sam4s-xplained-pro/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- same70-xplained/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- samv71-xult/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- shenzhou/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- sim/
- |   |   |- include/README.txt
- |   |   `- README.txt
+ |   |   |- include/README.txt
+ |   |   `- README.txt
  |   |- skp16c26/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- spark/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- stm3210e-eval/
- |   |   |- RIDE/README.txt
- |   |   `- README.txt
+ |   |   |- RIDE/README.txt
+ |   |   `- README.txt
  |   |- stm3220g-eval/
- |   |   |- ide/nsh/uvision/README.txt
- |   |   |- ide/nsh/iar/README.txt
- |   |   `- README.txt
+ |   |   |- ide/nsh/uvision/README.txt
+ |   |   |- ide/nsh/iar/README.txt
+ |   |   `- README.txt
  |   |- stm3240g-eval/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- stm32_tiny/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- stm32f103-minumum/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- stm32f3discovery/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- stm32f4discovery/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- stm32f411e-disco/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- stm32f429i-disco/
- |   |   |- ide/ltcd/uvision/README.txt
- |   |   |- ltdc/README.txt
- |   |   `- README.txt
+ |   |   |- ide/ltcd/uvision/README.txt
+ |   |   |- ltdc/README.txt
+ |   |   `- README.txt
  |   |- stm32f746g-disco/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- stm32l476vg-disco/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- stm32ldiscovery/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- stm32vldiscovery/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- sure-pic32mx/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- teensy-2.0/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- teensy-3.1/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- teensy-lc/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- tm4c123g-launchpad/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- tm4c1294-launchpad/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- twr-k60n512/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- "u-blox-c027/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- ubw32/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- us7032evb1/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- viewtool-stm32f107/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- xtrs/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- z16f2800100zcog/
- |   |   |- ostest/README.txt
- |   |   |- pashello/README.txt
- |   |   `- README.txt
+ |   |   |- ostest/README.txt
+ |   |   |- pashello/README.txt
+ |   |   `- README.txt
  |   |- z80sim/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- z8encore000zco/
- |   |   |- ostest/README.txt
- |   |   `- README.txt
+ |   |   |- ostest/README.txt
+ |   |   `- README.txt
  |   |- z8f64200100kit/
- |   |   |- ostest/README.txt
- |   |   `- README.txt
+ |   |   |- ostest/README.txt
+ |   |   `- README.txt
  |   |- zkit-arm-1769/
- |   |   `- README.txt
+ |   |   `- README.txt
  |   |- zp214xpa/
- |   |   `- README.txt
- |   `- README.txt
+ |   |   `- README.txt
+ |   `- README.txt
  |- drivers/
  |   |- eeprom/
  |   |   `- README.txt
-- 
GitLab


From 4bb6bb2cc16315219712818e26b1aa1fb8711ae2 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sun, 3 Jul 2016 11:20:14 -0600
Subject: [PATCH 143/229] Update README and some comments

---
 configs/freedom-k64f/README.txt       | 14 +++++++-------
 configs/freedom-k64f/nsh/Make.defs    |  2 +-
 configs/freedom-k64f/nsh/setenv.sh    |  2 +-
 configs/freedom-k64f/scripts/flash.ld |  2 +-
 configs/freedom-k64f/src/k64_usbmsc.c |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/configs/freedom-k64f/README.txt b/configs/freedom-k64f/README.txt
index 40239fe15d..8fea59243a 100644
--- a/configs/freedom-k64f/README.txt
+++ b/configs/freedom-k64f/README.txt
@@ -13,7 +13,7 @@ Contents
   o Development Environment
   o GNU Toolchain Options
 
-Kinetis TWR-K60N512 Features:
+Kinetis Freedom K64F Features:
 =============================
 
   The features of the FRDM-K64F hardware are as follows:
@@ -247,8 +247,8 @@ Freedom K64F Configuration Options
     CONFIG_KINETIS_UART3    -- Support UART3
     CONFIG_KINETIS_UART4    -- Support UART4
     CONFIG_KINETIS_UART5    -- Support UART5
-    CONFIG_KINETIS_ENET     -- Support Ethernet (K60 only)
-    CONFIG_KINETIS_RNGB     -- Support the random number generator(K60 only)
+    CONFIG_KINETIS_ENET     -- Support Ethernet (K5x, K6x, and K7x only)
+    CONFIG_KINETIS_RNGB     -- Support the random number generator(K6x only)
     CONFIG_KINETIS_FLEXCAN0 -- Support FlexCAN0
     CONFIG_KINETIS_FLEXCAN1 -- Support FlexCAN1
     CONFIG_KINETIS_SPI0     -- Support SPI0
@@ -269,7 +269,7 @@ Freedom K64F Configuration Options
     CONFIG_KINETIS_FTM2     -- Support FlexTimer 2
     CONFIG_KINETIS_LPTIMER  -- Support the low power timer
     CONFIG_KINETIS_RTC      -- Support RTC
-    CONFIG_KINETIS_SLCD     -- Support the segment LCD (K60 only)
+    CONFIG_KINETIS_SLCD     -- Support the segment LCD (K3x, K4x, and K5x only)
     CONFIG_KINETIS_EWM      -- Support the external watchdog
     CONFIG_KINETIS_CMT      -- Support Carrier Modulator Transmitter
     CONFIG_KINETIS_USBOTG   -- Support USB OTG (see also CONFIG_USBHOST and CONFIG_USBDEV)
@@ -311,7 +311,7 @@ Freedom K64F Configuration Options
     CONFIG_KINETIS_PORTDINTS -- Support 32 Port D interrupts
     CONFIG_KINETIS_PORTEINTS -- Support 32 Port E interrupts
 
-  Kinetis K60 specific device driver settings
+  Kinetis K64 specific device driver settings
 
     CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn (n=0..5) for the
       console and ttys0 (default is the UART0).
@@ -335,11 +335,11 @@ Freedom K64F Configuration Options
 Configurations
 ==============
 
-Each TWR-K60N512 configuration is maintained in a sub-directory and
+Each Freedom K64F configuration is maintained in a sub-directory and
 can be selected as follow:
 
     cd tools
-    ./configure.sh twr-k60n512/
+    ./configure.sh freedom-k64f/
     cd -
     . ./setenv.sh
 
diff --git a/configs/freedom-k64f/nsh/Make.defs b/configs/freedom-k64f/nsh/Make.defs
index 1d02938622..c0f3c57b41 100644
--- a/configs/freedom-k64f/nsh/Make.defs
+++ b/configs/freedom-k64f/nsh/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/freedom-k64f/nsh/Make.defs
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2016 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt 
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/configs/freedom-k64f/nsh/setenv.sh b/configs/freedom-k64f/nsh/setenv.sh
index 43bab49e0a..45d7f9dd11 100644
--- a/configs/freedom-k64f/nsh/setenv.sh
+++ b/configs/freedom-k64f/nsh/setenv.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # configs/freedom-k64f/nsh/setenv.sh
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2016 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt 
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/configs/freedom-k64f/scripts/flash.ld b/configs/freedom-k64f/scripts/flash.ld
index 7d2da03a9d..f60e7d330e 100644
--- a/configs/freedom-k64f/scripts/flash.ld
+++ b/configs/freedom-k64f/scripts/flash.ld
@@ -37,7 +37,7 @@
  * 128Kb of SRAM beginning at address 0x1800:0000 (SRAM_L) and 0x2000:000
  * (SRAM_U).
  *
- * NOTE: that the first part of the K40 FLASH region is reserved for
+ * NOTE: that the first part of the K64 FLASH region is reserved for
  *       interrupt vectflash and, following that, is a region from 0x0000:0400
  *       to 0x0000:040f that is reserved for the FLASH control fields (FCF).
  *
diff --git a/configs/freedom-k64f/src/k64_usbmsc.c b/configs/freedom-k64f/src/k64_usbmsc.c
index 06ff717d63..0c5ff493c0 100644
--- a/configs/freedom-k64f/src/k64_usbmsc.c
+++ b/configs/freedom-k64f/src/k64_usbmsc.c
@@ -87,7 +87,7 @@
 int board_usbmsc_initialize(int port)
 {
   /* If system/usbmsc is built as an NSH command, then SD slot should
-   * already have been initialized in board_app_initialize() (see k60_appinit.c).
+   * already have been initialized in board_app_initialize() (see k64_appinit.c).
    * In this case, there is nothing further to be done here.
    */
 
-- 
GitLab


From 3a594c07f877b3d01badd0528a2e69de167f94aa Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sun, 3 Jul 2016 15:13:32 -0600
Subject: [PATCH 144/229] Update TODO list

---
 TODO | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/TODO b/TODO
index a2c38f1d7b..5c67ae83ac 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-NuttX TODO List (Last updated June 6, 2016)
+NuttX TODO List (Last updated July 3, 2016)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 This file summarizes known NuttX bugs, limitations, inconsistencies with
@@ -17,7 +17,7 @@ nuttx/:
   (9)  Kernel/Protected Build
   (3)  C++ Support
   (6)  Binary loaders (binfmt/)
- (12)  Network (net/, drivers/net)
+ (11)  Network (net/, drivers/net)
   (4)  USB (drivers/usbdev, drivers/usbhost)
   (0)  Other drivers (drivers/)
  (11)  Libraries (libc/, libm/)
@@ -1353,12 +1353,6 @@ o File system / Generic drivers (fs/, drivers/)
   Status:      Open
   Priority:    Low
 
-  Title:       CAN POLL SUPPORT
-  Description: At present, the CAN driver does not support the poll() method.
-               See drivers/can.c
-  Status:      Open
-  Priority:    Low
-
   Title:       ROMFS CHECKSUMS
   Description: The ROMFS file system does not verify checksums on either
                volume header on on the individual files.
-- 
GitLab


From 83b0e8508116cffc3890f9820bd62fbdc4fd7dfa Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sun, 3 Jul 2016 15:14:43 -0600
Subject: [PATCH 145/229] Freedom K64F: Add board_initialize() hooks and
 bringup C file like more contemporary board configurations

---
 configs/freedom-k64f/src/Makefile       |   4 +-
 configs/freedom-k64f/src/freedom-k64f.h |  16 +-
 configs/freedom-k64f/src/k64_appinit.c  | 198 +-----------------
 configs/freedom-k64f/src/k64_boot.c     |  23 +++
 configs/freedom-k64f/src/k64_bringup.c  | 255 ++++++++++++++++++++++++
 configs/samv71-xult/src/sam_appinit.c   |   4 +-
 6 files changed, 304 insertions(+), 196 deletions(-)
 create mode 100644 configs/freedom-k64f/src/k64_bringup.c

diff --git a/configs/freedom-k64f/src/Makefile b/configs/freedom-k64f/src/Makefile
index d980101d39..65cba8c536 100644
--- a/configs/freedom-k64f/src/Makefile
+++ b/configs/freedom-k64f/src/Makefile
@@ -49,7 +49,9 @@ CSRCS += k64_buttons.c
 endif
 
 ifeq ($(CONFIG_LIB_BOARDCTL),y)
-CSRCS += k64_appinit.c
+CSRCS += k64_appinit.c k64_bringup.c
+else ifeq ($(CONFIG_BOARD_INITIALIZE),y)
+CSRCS += k64_bringup.c
 endif
 
 ifeq ($(CONFIG_USBDEV),y)
diff --git a/configs/freedom-k64f/src/freedom-k64f.h b/configs/freedom-k64f/src/freedom-k64f.h
index 7a6eeef964..53a6e000e9 100644
--- a/configs/freedom-k64f/src/freedom-k64f.h
+++ b/configs/freedom-k64f/src/freedom-k64f.h
@@ -99,10 +99,6 @@
 #define GPIO_LED_G         (GPIO_LOWDRIVE | GPIO_OUTPUT_ONE | PIN_PORTB | PIN21)
 #define GPIO_LED_B         (GPIO_LOWDRIVE | GPIO_OUTPUT_ONE | PIN_PORTE | PIN26)
 
-/************************************************************************************
- * Public Types
- ************************************************************************************/
-
 /************************************************************************************
  * Public data
  ************************************************************************************/
@@ -133,5 +129,17 @@ void weak_function k64_spidev_initialize(void);
 
 void weak_function k64_usbinitialize(void);
 
+/************************************************************************************
+ * Name: k64_bringup
+ *
+ * Description:
+ *   Bring up board features
+ *
+ ************************************************************************************/
+
+#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_INITIALIZE)
+int k64_bringup(void);
+#endif
+
 #endif /* __ASSEMBLY__ */
 #endif /* __CONFIGS_FREEDOM_K64F_SRC_FREEDOM_K64F_H */
diff --git a/configs/freedom-k64f/src/k64_appinit.c b/configs/freedom-k64f/src/k64_appinit.c
index d55c3bfd06..ba19f5b851 100644
--- a/configs/freedom-k64f/src/k64_appinit.c
+++ b/configs/freedom-k64f/src/k64_appinit.c
@@ -39,151 +39,13 @@
 
 #include 
 
-#include 
-#include 
-#include 
-#include 
+#include 
 
 #include 
 
-#ifdef CONFIG_KINETIS_SDHC
-#  include 
-#  include 
-#endif
-
-#include "kinetis.h"
 #include "freedom-k64f.h"
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-/* Configuration ************************************************************/
-
-/* PORT and SLOT number probably depend on the board configuration */
-
-#ifdef CONFIG_ARCH_BOARD_FREEDOM_K64F
-#  define NSH_HAVEUSBDEV 1
-#  define NSH_HAVEMMCSD  1
-#  if defined(CONFIG_NSH_MMCSDSLOTNO) && CONFIG_NSH_MMCSDSLOTNO != 0
-#    error "Only one MMC/SD slot, slot 0"
-#    undef CONFIG_NSH_MMCSDSLOTNO
-#  endif
-#  ifndef CONFIG_NSH_MMCSDSLOTNO
-#    define CONFIG_NSH_MMCSDSLOTNO 0
-#  endif
-#else
-   /* Add configuration for new Kinetis boards here */
-#  error "Unrecognized Kinetis board"
-#  undef NSH_HAVEUSBDEV
-#  undef NSH_HAVEMMCSD
-#endif
-
-/* Can't support USB features if USB is not enabled */
-
-#ifndef CONFIG_USBDEV
-#  undef NSH_HAVEUSBDEV
-#endif
-
-/* Can't support MMC/SD features if mountpoints are disabled or if SDHC support
- * is not enabled.
- */
-
-#if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_KINETIS_SDHC)
-#  undef NSH_HAVEMMCSD
-#endif
-
-#ifndef CONFIG_NSH_MMCSDMINOR
-#  define CONFIG_NSH_MMCSDMINOR 0
-#endif
-
-/* We expect to receive GPIO interrupts for card insertion events */
-
-#ifndef CONFIG_GPIO_IRQ
-#  error "CONFIG_GPIO_IRQ required for card detect interrupt"
-#endif
-
-#ifndef CONFIG_KINETIS_PORTEINTS
-#  error "CONFIG_KINETIS_PORTEINTS required for card detect interrupt"
-#endif
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/* This structure encapsulates the global variable used in this file and
- * reduces the probability of name collistions.
- */
-
-#ifdef NSH_HAVEMMCSD
-struct k64_nsh_s
-{
-  FAR struct sdio_dev_s *sdhc; /* SDIO driver handle */
-  bool inserted;               /* True: card is inserted */
-};
-#endif
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-#ifdef NSH_HAVEMMCSD
-static struct k64_nsh_s g_nsh;
-#endif
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: k64_mediachange
- ****************************************************************************/
-
-#ifdef NSH_HAVEMMCSD
-static void k64_mediachange(void)
-{
-  bool inserted;
-
-  /* Get the current value of the card detect pin.  This pin is pulled up on
-   * board.  So low means that a card is present.
-   */
-
-  inserted = !kinetis_gpioread(GPIO_SD_CARDDETECT);
-
-  /* Has the pin changed state? */
-
-  if (inserted != g_nsh.inserted)
-    {
-      /* Yes.. perform the appropriate action (this might need some debounce). */
-
-      g_nsh.inserted = inserted;
-      sdhc_mediachange(g_nsh.sdhc, inserted);
-
-      /* If the card has been inserted, then check if it is write protected
-       * as well.  The pin is pulled up, but apparently logic high means
-       * write protected.
-       */
-
-      if (inserted)
-        {
-          sdhc_wrprotect(g_nsh.sdhc, kinetis_gpioread(GPIO_SD_WRPROTECT));
-        }
-    }
-}
-#endif
-
-/****************************************************************************
- * Name: k64_cdinterrupt
- ****************************************************************************/
-
-#ifdef NSH_HAVEMMCSD
-static int k64_cdinterrupt(int irq, FAR void *context)
-{
-  /* All of the work is done by k64_mediachange() */
-
-  k64_mediachange();
-  return OK;
-}
-#endif
+#ifdef CONFIG_LIB_BOARDCTL
 
 /****************************************************************************
  * Public Functions
@@ -216,55 +78,13 @@ static int k64_cdinterrupt(int irq, FAR void *context)
 
 int board_app_initialize(uintptr_t arg)
 {
-#ifdef NSH_HAVEMMCSD
-  int ret;
+#ifndef CONFIG_BOARD_INITIALIZE
+  /* Perform board initialization */
 
-  /* Configure GPIO pins */
-
-  /* Attached the card detect interrupt (but don't enable it yet) */
-
-  kinetis_pinconfig(GPIO_SD_CARDDETECT);
-  kinetis_pinirqattach(GPIO_SD_CARDDETECT, k64_cdinterrupt);
-
-  /* Configure the write protect GPIO */
-
-  kinetis_pinconfig(GPIO_SD_WRPROTECT);
-
-  /* Mount the SDHC-based MMC/SD block driver */
-  /* First, get an instance of the SDHC interface */
-
-  syslog(LOG_INFO, "Initializing SDHC slot %d\n",
-         CONFIG_NSH_MMCSDSLOTNO);
-
-  g_nsh.sdhc = sdhc_initialize(CONFIG_NSH_MMCSDSLOTNO);
-  if (!g_nsh.sdhc)
-    {
-      syslog(LOG_ERR, "ERROR: Failed to initialize SDHC slot %d\n",
-             CONFIG_NSH_MMCSDSLOTNO);
-      return -ENODEV;
-    }
-
-  /* Now bind the SDHC interface to the MMC/SD driver */
-
-  syslog(LOG_INFO, "Bind SDHC to the MMC/SD driver, minor=%d\n",
-         CONFIG_NSH_MMCSDMINOR);
-
-  ret = mmcsd_slotinitialize(CONFIG_NSH_MMCSDMINOR, g_nsh.sdhc);
-  if (ret != OK)
-    {
-      syslog(LOG_ERR, "ERROR: Failed to bind SDHC to the MMC/SD driver: %d\n", ret);
-      return ret;
-    }
-
-  syslog(LOG_INFO, "Successfully bound SDHC to the MMC/SD driver\n");
-
-  /* Handle the initial card state */
-
-  k64_mediachange();
-
-  /* Enable CD interrupts to handle subsequent media changes */
-
-  kinetis_pinirqenable(GPIO_SD_CARDDETECT);
-#endif
+  return k64_bringup();
+#else
   return OK;
+#endif
 }
+
+#endif /* CONFIG_LIB_BOARDCTL */
diff --git a/configs/freedom-k64f/src/k64_boot.c b/configs/freedom-k64f/src/k64_boot.c
index 1358f6633a..4ca687d96f 100644
--- a/configs/freedom-k64f/src/k64_boot.c
+++ b/configs/freedom-k64f/src/k64_boot.c
@@ -92,3 +92,26 @@ void kinetis_boardinitialize(void)
   board_autoled_initialize();
 #endif
 }
+
+/****************************************************************************
+ * Name: board_initialize
+ *
+ * Description:
+ *   If CONFIG_BOARD_INITIALIZE is selected, then an additional
+ *   initialization call will be performed in the boot-up sequence to a
+ *   function called board_initialize().  board_initialize() will be
+ *   called immediately after up_intitialize() is called and just before the
+ *   initial application is started.  This additional initialization phase
+ *   may be used, for example, to initialize board-specific device drivers.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_BOARD_INITIALIZE
+void board_initialize(void)
+{
+  /* Perform board initialization */
+
+  (void)k64_bringup();
+}
+#endif /* CONFIG_BOARD_INITIALIZE */
+
diff --git a/configs/freedom-k64f/src/k64_bringup.c b/configs/freedom-k64f/src/k64_bringup.c
new file mode 100644
index 0000000000..0739f95d00
--- /dev/null
+++ b/configs/freedom-k64f/src/k64_bringup.c
@@ -0,0 +1,255 @@
+/****************************************************************************
+ * config/freedom-k64f/src/k64_bringup.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 
+#include 
+#include 
+
+#ifdef CONFIG_KINETIS_SDHC
+#  include 
+#  include 
+#endif
+
+#include "kinetis.h"
+#include "freedom-k64f.h"
+
+#if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_INITIALIZE)
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+/* Configuration ************************************************************/
+
+/* PORT and SLOT number probably depend on the board configuration */
+
+#ifdef CONFIG_ARCH_BOARD_FREEDOM_K64F
+#  define NSH_HAVEUSBDEV 1
+#  define NSH_HAVEMMCSD  1
+#  if defined(CONFIG_NSH_MMCSDSLOTNO) && CONFIG_NSH_MMCSDSLOTNO != 0
+#    error "Only one MMC/SD slot, slot 0"
+#    undef CONFIG_NSH_MMCSDSLOTNO
+#  endif
+#  ifndef CONFIG_NSH_MMCSDSLOTNO
+#    define CONFIG_NSH_MMCSDSLOTNO 0
+#  endif
+#else
+   /* Add configuration for new Kinetis boards here */
+#  error "Unrecognized Kinetis board"
+#  undef NSH_HAVEUSBDEV
+#  undef NSH_HAVEMMCSD
+#endif
+
+/* Can't support USB features if USB is not enabled */
+
+#ifndef CONFIG_USBDEV
+#  undef NSH_HAVEUSBDEV
+#endif
+
+/* Can't support MMC/SD features if mountpoints are disabled or if SDHC support
+ * is not enabled.
+ */
+
+#if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_KINETIS_SDHC)
+#  undef NSH_HAVEMMCSD
+#endif
+
+#ifndef CONFIG_NSH_MMCSDMINOR
+#  define CONFIG_NSH_MMCSDMINOR 0
+#endif
+
+/* We expect to receive GPIO interrupts for card insertion events */
+
+#ifndef CONFIG_GPIO_IRQ
+#  error "CONFIG_GPIO_IRQ required for card detect interrupt"
+#endif
+
+#ifndef CONFIG_KINETIS_PORTEINTS
+#  error "CONFIG_KINETIS_PORTEINTS required for card detect interrupt"
+#endif
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/* This structure encapsulates the global variable used in this file and
+ * reduces the probability of name collistions.
+ */
+
+#ifdef NSH_HAVEMMCSD
+struct k64_nsh_s
+{
+  FAR struct sdio_dev_s *sdhc; /* SDIO driver handle */
+  bool inserted;               /* True: card is inserted */
+};
+#endif
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+#ifdef NSH_HAVEMMCSD
+static struct k64_nsh_s g_nsh;
+#endif
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: k64_mediachange
+ ****************************************************************************/
+
+#ifdef NSH_HAVEMMCSD
+static void k64_mediachange(void)
+{
+  bool inserted;
+
+  /* Get the current value of the card detect pin.  This pin is pulled up on
+   * board.  So low means that a card is present.
+   */
+
+  inserted = !kinetis_gpioread(GPIO_SD_CARDDETECT);
+
+  /* Has the pin changed state? */
+
+  if (inserted != g_nsh.inserted)
+    {
+      /* Yes.. perform the appropriate action (this might need some debounce). */
+
+      g_nsh.inserted = inserted;
+      sdhc_mediachange(g_nsh.sdhc, inserted);
+
+      /* If the card has been inserted, then check if it is write protected
+       * as well.  The pin is pulled up, but apparently logic high means
+       * write protected.
+       */
+
+      if (inserted)
+        {
+          sdhc_wrprotect(g_nsh.sdhc, kinetis_gpioread(GPIO_SD_WRPROTECT));
+        }
+    }
+}
+#endif
+
+/****************************************************************************
+ * Name: k64_cdinterrupt
+ ****************************************************************************/
+
+#ifdef NSH_HAVEMMCSD
+static int k64_cdinterrupt(int irq, FAR void *context)
+{
+  /* All of the work is done by k64_mediachange() */
+
+  k64_mediachange();
+  return OK;
+}
+#endif
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/************************************************************************************
+ * Name: k64_bringup
+ *
+ * Description:
+ *   Bring up board features
+ *
+ ************************************************************************************/
+
+int k64_bringup(void)
+{
+#ifdef NSH_HAVEMMCSD
+  int ret;
+
+  /* Configure GPIO pins */
+
+  /* Attached the card detect interrupt (but don't enable it yet) */
+
+  kinetis_pinconfig(GPIO_SD_CARDDETECT);
+  kinetis_pinirqattach(GPIO_SD_CARDDETECT, k64_cdinterrupt);
+
+  /* Configure the write protect GPIO */
+
+  kinetis_pinconfig(GPIO_SD_WRPROTECT);
+
+  /* Mount the SDHC-based MMC/SD block driver */
+  /* First, get an instance of the SDHC interface */
+
+  syslog(LOG_INFO, "Initializing SDHC slot %d\n",
+         CONFIG_NSH_MMCSDSLOTNO);
+
+  g_nsh.sdhc = sdhc_initialize(CONFIG_NSH_MMCSDSLOTNO);
+  if (!g_nsh.sdhc)
+    {
+      syslog(LOG_ERR, "ERROR: Failed to initialize SDHC slot %d\n",
+             CONFIG_NSH_MMCSDSLOTNO);
+      return -ENODEV;
+    }
+
+  /* Now bind the SDHC interface to the MMC/SD driver */
+
+  syslog(LOG_INFO, "Bind SDHC to the MMC/SD driver, minor=%d\n",
+         CONFIG_NSH_MMCSDMINOR);
+
+  ret = mmcsd_slotinitialize(CONFIG_NSH_MMCSDMINOR, g_nsh.sdhc);
+  if (ret != OK)
+    {
+      syslog(LOG_ERR, "ERROR: Failed to bind SDHC to the MMC/SD driver: %d\n", ret);
+      return ret;
+    }
+
+  syslog(LOG_INFO, "Successfully bound SDHC to the MMC/SD driver\n");
+
+  /* Handle the initial card state */
+
+  k64_mediachange();
+
+  /* Enable CD interrupts to handle subsequent media changes */
+
+  kinetis_pinirqenable(GPIO_SD_CARDDETECT);
+#endif
+  return OK;
+}
+
+#endif /* CONFIG_LIB_BOARDCTL CONFIG_BOARD_INITIALIZE */
diff --git a/configs/samv71-xult/src/sam_appinit.c b/configs/samv71-xult/src/sam_appinit.c
index f7215ff465..9e59395cc1 100644
--- a/configs/samv71-xult/src/sam_appinit.c
+++ b/configs/samv71-xult/src/sam_appinit.c
@@ -45,7 +45,7 @@
 
 #include "samv71-xult.h"
 
-#if defined(CONFIG_LIB_BOARDCTL) && !defined(CONFIG_BUILD_KERNEL)
+#ifdef CONFIG_LIB_BOARDCTL
 
 /****************************************************************************
  * Public Functions
@@ -87,4 +87,4 @@ int board_app_initialize(uintptr_t arg)
 #endif
 }
 
-#endif /* CONFIG_LIB_BOARDCTL && !CONFIG_BUILD_KERNEL */
+#endif /* CONFIG_LIB_BOARDCTL */
-- 
GitLab


From 88f1f426770a666a706d42106abef47c93cfda7c Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sun, 3 Jul 2016 15:26:27 -0600
Subject: [PATCH 146/229] Remove an unnecessary (and incorrect) factor in
 conditional compilation

---
 configs/sabre-6quad/src/imx_appinit.c     | 4 ++--
 configs/same70-xplained/src/sam_appinit.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configs/sabre-6quad/src/imx_appinit.c b/configs/sabre-6quad/src/imx_appinit.c
index 7b7f66ead6..2e32a6771f 100644
--- a/configs/sabre-6quad/src/imx_appinit.c
+++ b/configs/sabre-6quad/src/imx_appinit.c
@@ -45,7 +45,7 @@
 
 #include "sabre-6quad.h"
 
-#if defined(CONFIG_LIB_BOARDCTL) && !defined(CONFIG_BUILD_KERNEL)
+#ifdef CONFIG_LIB_BOARDCTL
 
 /****************************************************************************
  * Public Functions
@@ -87,4 +87,4 @@ int board_app_initialize(uintptr_t arg)
 #endif
 }
 
-#endif /* CONFIG_LIB_BOARDCTL && !CONFIG_BUILD_KERNEL */
+#endif /* CONFIG_LIB_BOARDCTL */
diff --git a/configs/same70-xplained/src/sam_appinit.c b/configs/same70-xplained/src/sam_appinit.c
index 5e8a871522..4dd89315b7 100644
--- a/configs/same70-xplained/src/sam_appinit.c
+++ b/configs/same70-xplained/src/sam_appinit.c
@@ -45,7 +45,7 @@
 
 #include "same70-xplained.h"
 
-#if defined(CONFIG_LIB_BOARDCTL) && !defined(CONFIG_BUILD_KERNEL)
+#ifdef CONFIG_LIB_BOARDCTL
 
 /****************************************************************************
  * Public Functions
@@ -87,4 +87,4 @@ int board_app_initialize(uintptr_t arg)
 #endif
 }
 
-#endif /* CONFIG_LIB_BOARDCTL && !CONFIG_BUILD_KERNEL */
+#endif /* CONFIG_LIB_BOARDCTL */
-- 
GitLab


From 830af912a1b5ad4ade1b9b0ef065713181fc6ced Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 4 Jul 2016 09:32:36 -0600
Subject: [PATCH 147/229] Add sig_raise()

---
 include/signal.h             |  9 ++--
 libc/signal/Make.defs        |  6 +--
 libc/signal/sig_raise.c      | 88 ++++++++++++++++++++++++++++++++++++
 sched/pthread/pthread_kill.c |  4 +-
 4 files changed, 98 insertions(+), 9 deletions(-)
 create mode 100644 libc/signal/sig_raise.c

diff --git a/include/signal.h b/include/signal.h
index 7cfc93b136..bd8ee9f317 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -280,8 +280,9 @@ extern "C"
 #define EXTERN extern
 #endif
 
-int kill(pid_t, int);
-int sigaction(int sig, FAR const struct sigaction *act,
+int kill(pid_t pid, int signo);
+int raise(int signo);
+int sigaction(int signo, FAR const struct sigaction *act,
               FAR struct sigaction *oact);
 int sigaddset(FAR sigset_t *set, int signo);
 int sigdelset(FAR sigset_t *set, int signo);
@@ -290,7 +291,7 @@ int sigfillset(FAR sigset_t *set);
 int sighold(int signo);
 int sigismember(FAR const sigset_t *set, int signo);
 int sigignore(int signo);
-CODE void (*signal(int sig, CODE void (*func)(int signo)))(int signo);
+CODE void (*signal(int signo, CODE void (*func)(int signo)))(int signo);
 int sigprocmask(int how, FAR const sigset_t *set, FAR sigset_t *oset);
 int sigpause(int signo);
 int sigpending(FAR sigset_t *set);
@@ -300,7 +301,7 @@ int sigqueue(int pid, int signo, union sigval value);
 int sigqueue(int pid, int signo, FAR void *sival_ptr);
 #endif
 int sigrelse(int signo);
-CODE void (*sigset(int sig, CODE void (*func)(int signo)))(int signo);
+CODE void (*sigset(int signo, CODE void (*func)(int signo)))(int signo);
 int sigtimedwait(FAR const sigset_t *set, FAR struct siginfo *value,
                  FAR const struct timespec *timeout);
 int sigsuspend(FAR const sigset_t *sigmask);
diff --git a/libc/signal/Make.defs b/libc/signal/Make.defs
index 0c642ff8c7..bedee1895e 100644
--- a/libc/signal/Make.defs
+++ b/libc/signal/Make.defs
@@ -37,9 +37,9 @@ ifneq ($(CONFIG_DISABLE_SIGNALS),y)
 
 # Add the signal C files to the build
 
-CSRCS += sig_emptyset.c sig_fillset.c sig_addset.c sig_delset.c
-CSRCS += sig_ismember.c sig_hold.c sig_relse.c sig_ignore.c sig_pause.c
-CSRCS += sig_set.c signal.c
+CSRCS += sig_addset.c sig_delset.c sig_emptyset.c sig_fillset.c
+CSRCS += sig_hold.c sig_ignore.c sig_ismember.c sig_pause.c sig_raise.c
+CSRCS += sig_relse.c sig_set.c signal.c
 
 # Add the signal directory to the build
 
diff --git a/libc/signal/sig_raise.c b/libc/signal/sig_raise.c
new file mode 100644
index 0000000000..e2e1b32654
--- /dev/null
+++ b/libc/signal/sig_raise.c
@@ -0,0 +1,88 @@
+/****************************************************************************
+ * libc/signal/sig_raise.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 
+#include 
+#include 
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: sig_raise
+ *
+ * Description:
+ *   The raise() function sends the signal signo to the executing thread or
+ *   process. If a signal handler is called, the raise() function does not
+ *   return until after the signal handler does.
+ *
+ *   If the implementation supports the Threads option, the effect of the
+ *   raise() function is equivalent to calling:
+ *
+ *     pthread_kill(pthread_self(), signo);
+ *
+ *   except that on failures, -1 (ERROR) is returned and the errno() variable
+ *   is set accordingly.  Otherwise, the effect of the raise() function is
+ *   equivalent to calling:
+ *
+ *     kill(getpid(), signo)
+ *
+ ****************************************************************************/
+
+int raise(int signo)
+{
+#ifndef CONFIG_DISABLE_PTHREAD
+  int errcode = pthread_kill(pthread_self(), signo);
+  if (errcode != OK)
+    {
+      DEBUGASSERT(errcode > 0);
+      set_errno(errcode);
+      return ERROR;
+    }
+
+  return OK;
+
+#else
+  return kill(getpid(), signo);
+#endif
+}
diff --git a/sched/pthread/pthread_kill.c b/sched/pthread/pthread_kill.c
index a53842308a..902cbcd78c 100644
--- a/sched/pthread/pthread_kill.c
+++ b/sched/pthread/pthread_kill.c
@@ -86,8 +86,8 @@
 int pthread_kill(pthread_t thread, int signo)
 {
 #ifdef HAVE_GROUP_MEMBERS
-  /* If group members are support then pthread_kill() differs from kill().
-   * kill(), in this case, must following the POSIX rules for delivery of
+  /* If group members are supported then pthread_kill() differs from kill().
+   * kill(), in this case, must follow the POSIX rules for delivery of
    * signals in the group environment.  Otherwise, kill(), like
    * pthread_kill() will just deliver the signal to the thread ID it is
    * requested to use.
-- 
GitLab


From d7c55868b983b06d99c35b3dcb8dd2ad9a389fb2 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 4 Jul 2016 09:47:41 -0600
Subject: [PATCH 148/229] Update ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index fb716d517e..116684e053 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -12249,3 +12249,21 @@
 	  target Kconfig file (2016-06-29).
 	* arch/arm/src/stm32l4: Port support for both RX FIFOs from STM32 CAN.
 	  From Paul Alexander Patience (2016-06-29).
+	* Remove all inclusion of header files from the apps/include directory.
+	  This caused a lot of reshuffling of logic:  binfmt pcode support,
+	  usbmonitor is now a kernel thread, TZ/Olson database moved to
+	  libc/zoneinfo (2016-06-29).
+	* drivers/mtd: Several MTD FLASH drivers nullify the freed 'priv'
+	  structure and failed to return NULL as stated in the comments.
+	  Result, will operate on a NULL pointer later.  Noted by David Sidrane
+	  (2016-06-30).
+	* arch/arm/src/kinetis:  Add basic support for the K64 family.  I
+	  leveraged the changes from https://github.com/jmacintyre/nuttx-k64f
+	  and merged into the existing kinetis code  with a lot of changes and
+	  additions (like pin multiplexing definitions).  (2016-07-01).
+	* configs/freedom-k64f: Add support for the NXP Freedom-K64F board.
+	  This is primarily the work of Jordan Macintyre.  I leveraged this
+	  code from https://github.com/jmacintyre/nuttx-k64f but with
+	  significant corrections (LEDs, buttons, README, etc) and extensions
+	  and updates to match more recent BSPs (2016-07-01).
+	* libc/signal: Add raise() (2016-07-04).
-- 
GitLab


From f1cf6731ebcd4bd07d0c3c00e0c7ebdb0677cc11 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 4 Jul 2016 12:22:33 -0600
Subject: [PATCH 149/229] Add raise to std:: namespace in csignal

---
 include/cxx/csignal | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/cxx/csignal b/include/cxx/csignal
index 2303a864dd..c66473bb57 100644
--- a/include/cxx/csignal
+++ b/include/cxx/csignal
@@ -1,7 +1,7 @@
 //***************************************************************************
 // include/cxx/csignal
 //
-//   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
@@ -55,6 +55,7 @@ namespace std
   using ::siginfo_t;
   using ::sigaction;
   using ::kill;
+  using ::raise;
   using ::sigemptyset;
   using ::sigfillset;
   using ::sigaddset;
-- 
GitLab


From 3b825b3e009429762a3313480c67f46097961c4a Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 5 Jul 2016 09:50:54 -0600
Subject: [PATCH 150/229] Improve a debug assertion

---
 drivers/syslog/syslog_device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/syslog/syslog_device.c b/drivers/syslog/syslog_device.c
index 22bc08eb35..1350b9084e 100644
--- a/drivers/syslog/syslog_device.c
+++ b/drivers/syslog/syslog_device.c
@@ -199,7 +199,7 @@ static inline ssize_t syslog_dev_write(FAR const void *buf, size_t nbytes)
   /* Let the driver perform the write */
 
   inode = g_syslog_dev.sl_file.f_inode;
-  DEBUGASSERT(inode != NULL);
+  DEBUGASSERT(inode != NULL && inode->u.i_ops->write != NULL);
 
   return inode->u.i_ops->write(&g_syslog_dev.sl_file, buf, nbytes);
 }
-- 
GitLab


From a39ce80add0cd62ba4850b3e41ebbabc44eeff49 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 5 Jul 2016 12:12:44 -0600
Subject: [PATCH 151/229] SYSLOG logic should use existing file interfaces, not
 re-invent them.

---
 configs/nucleo-f4x1re/src/stm32_ajoystick.c  |  3 +-
 configs/nucleo-l476rg/src/stm32_ajoystick.c  |  3 +-
 configs/sama5d3-xplained/src/sam_ajoystick.c |  3 +-
 drivers/syslog/syslog_device.c               | 52 ++++------------
 fs/vfs/fs_ioctl.c                            | 65 ++++++++++++++------
 include/nuttx/fs/fs.h                        | 20 ++++++
 6 files changed, 85 insertions(+), 61 deletions(-)

diff --git a/configs/nucleo-f4x1re/src/stm32_ajoystick.c b/configs/nucleo-f4x1re/src/stm32_ajoystick.c
index 432d91667b..a40f08f4b0 100644
--- a/configs/nucleo-f4x1re/src/stm32_ajoystick.c
+++ b/configs/nucleo-f4x1re/src/stm32_ajoystick.c
@@ -206,7 +206,8 @@ static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower,
    * channels are enabled).
    */
 
-  nread = file_read(&g_adcfile, adcmsg, MAX_ADC_CHANNELS * sizeof(struct adc_msg_s));
+  nread = file_read(&g_adcfile, adcmsg,
+                    MAX_ADC_CHANNELS * sizeof(struct adc_msg_s));
   if (nread < 0)
     {
       int errcode = get_errno();
diff --git a/configs/nucleo-l476rg/src/stm32_ajoystick.c b/configs/nucleo-l476rg/src/stm32_ajoystick.c
index 6f49fd9823..71a61ef417 100644
--- a/configs/nucleo-l476rg/src/stm32_ajoystick.c
+++ b/configs/nucleo-l476rg/src/stm32_ajoystick.c
@@ -205,7 +205,8 @@ static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower,
    * channels are enabled).
    */
 
-  nread = file_read(&g_adcfile, adcmsg, MAX_ADC_CHANNELS * sizeof(struct adc_msg_s));
+  nread = file_read(&g_adcfile, adcmsg,
+                    MAX_ADC_CHANNELS * sizeof(struct adc_msg_s));
   if (nread < 0)
     {
       int errcode = get_errno();
diff --git a/configs/sama5d3-xplained/src/sam_ajoystick.c b/configs/sama5d3-xplained/src/sam_ajoystick.c
index 15b53d3f70..7ff2f02195 100644
--- a/configs/sama5d3-xplained/src/sam_ajoystick.c
+++ b/configs/sama5d3-xplained/src/sam_ajoystick.c
@@ -187,7 +187,8 @@ static int ajoy_sample(FAR const struct ajoy_lowerhalf_s *lower,
    * channels are enabled).
    */
 
-  nread = file_read(&g_adcfile, adcmsg, MAX_ADC_CHANNELS * sizeof(struct adc_msg_s));
+  nread = file_read(&g_adcfile, adcmsg,
+                    MAX_ADC_CHANNELS * sizeof(struct adc_msg_s));
   if (nread < 0)
     {
       int errcode = get_errno();
diff --git a/drivers/syslog/syslog_device.c b/drivers/syslog/syslog_device.c
index 1350b9084e..c3bf74834a 100644
--- a/drivers/syslog/syslog_device.c
+++ b/drivers/syslog/syslog_device.c
@@ -133,9 +133,9 @@ static inline int syslog_dev_takesem(void)
   int ret;
 
   /* Does this thread already hold the semaphore?  That could happen if
-   * we wer called recursively, i.e., if the logic kicked off by
-   * syslog_dev_write() where to generate more debug output.  Return an error
-   * in that case.
+   * we were called recursively, i.e., if the logic kicked off by
+   * file_write() where to generate more debug output.  Return an
+   * error in that case.
    */
 
   if (g_syslog_dev.sl_holder == me)
@@ -184,26 +184,6 @@ static inline void syslog_dev_givesem(void)
   sem_post(&g_syslog_dev.sl_sem);
 }
 
-/****************************************************************************
- * Name: syslog_dev_write
- *
- * Description:
- *   Write to the syslog device
- *
- ****************************************************************************/
-
-static inline ssize_t syslog_dev_write(FAR const void *buf, size_t nbytes)
-{
-  FAR struct inode *inode;
-
-  /* Let the driver perform the write */
-
-  inode = g_syslog_dev.sl_file.f_inode;
-  DEBUGASSERT(inode != NULL && inode->u.i_ops->write != NULL);
-
-  return inode->u.i_ops->write(&g_syslog_dev.sl_file, buf, nbytes);
-}
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -505,7 +485,7 @@ int syslog_dev_putc(int ch)
   if (ret < 0)
     {
       /* We probably already hold the semaphore and were probably
-       * re-entered by the logic kicked off by syslog_dev_write().
+       * re-entered by the logic kicked off by file_write().
        * We might also have been interrupted by a signal.  Either
        * way, we are outta here.
        */
@@ -520,7 +500,7 @@ int syslog_dev_putc(int ch)
     {
       /* Write the CR-LF sequence */
 
-      nbytes = syslog_dev_write(g_syscrlf, 2);
+      nbytes = file_write(&g_syslog_dev.sl_file, g_syscrlf, 2);
 
       /* Synchronize the file when each CR-LF is encountered (i.e.,
        * implements line buffering always).
@@ -538,7 +518,7 @@ int syslog_dev_putc(int ch)
       /* Write the non-newline character (and don't flush) */
 
       uch = (uint8_t)ch;
-      nbytes = syslog_dev_write(&uch, 1);
+      nbytes = file_write(&g_syslog_dev.sl_file, &uch, 1);
     }
 
   syslog_dev_givesem();
@@ -576,24 +556,16 @@ errout_with_errcode:
 
 int syslog_dev_flush(void)
 {
-  int ret = 0;;
-
 #if defined(CONFIG_SYSLOG_FILE) && !defined(CONFIG_DISABLE_MOUNTPOINT)
-  FAR struct inode *inode = g_syslog_dev.sl_file.f_inode;
-
-  /* Is this a mountpoint? Does it support the sync method? */
-
-  if (inode != NULL &&                /* File opened (i.e., has inode)? */
-      INODE_IS_MOUNTPT(inode) &&      /* Inode is a mountpoint? */
-      inode->u.i_mops->sync != NULL)  /* And supports synce method? */
-    {
-      /* Yes... synchronize to the stream */
+  /* Ignore return value, always return success.  file_fsync() could fail
+   * because the file is not open, the inode is not a mountpoint, or the
+   * mountpoint does not support the sync() method.
+   */
 
-      ret = inode->u.i_mops->sync(&g_syslog_dev.sl_file);
-    }
+  (void)file_fsync(&g_syslog_dev.sl_file);
 #endif
 
-  return ret;
+  return OK;
 }
 
 #endif /* CONFIG_NFILE_DESCRIPTORS > 0 */
diff --git a/fs/vfs/fs_ioctl.c b/fs/vfs/fs_ioctl.c
index 238da907a7..fda5be76cd 100644
--- a/fs/vfs/fs_ioctl.c
+++ b/fs/vfs/fs_ioctl.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * fs/vfs/fs_ioctl.c
  *
- *   Copyright (C) 2007-2010, 2012-2014 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2010, 2012-2014, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,47 @@
  * Public Functions
  ****************************************************************************/
 
+/****************************************************************************
+ * Name: file_ioctl
+ *
+ * Description:
+ *   Perform device specific operations.
+ *
+ * Parameters:
+ *   file     File structure instance
+ *   req      The ioctl command
+ *   arg      The argument of the ioctl cmd
+ *
+ * Return:
+ *   See ioctl() below.
+ *
+ ****************************************************************************/
+
+#if CONFIG_NFILE_DESCRIPTORS > 0
+int file_ioctl(FAR struct file *filep, int req, unsigned long arg)
+{
+  FAR struct inode *inode;
+  int ret;
+
+  /* Is a driver registered? Does it support the ioctl method? */
+
+  inode = filep->f_inode;
+  if (inode && inode->u.i_ops && inode->u.i_ops->ioctl)
+    {
+      /* Yes, then let it perform the ioctl */
+
+      ret = (int)inode->u.i_ops->ioctl(filep, req, arg);
+      if (ret < 0)
+        {
+          set_errno(-ret);
+          return ERROR;
+        }
+    }
+
+  return OK;
+}
+#endif /* CONFIG_NFILE_DESCRIPTORS > 0 */
+
 /****************************************************************************
  * Name: ioctl/fs_ioctl
  *
@@ -93,9 +134,8 @@ int ioctl(int fd, int req, unsigned long arg)
 {
   int errcode;
 #if CONFIG_NFILE_DESCRIPTORS > 0
-  FAR struct file     *filep;
-  FAR struct inode    *inode;
-  int                  ret = OK;
+  FAR struct file *filep;
+  int ret = OK;
 
   /* Did we get a valid file descriptor? */
 
@@ -130,20 +170,9 @@ int ioctl(int fd, int req, unsigned long arg)
 
   /* Is a driver registered? Does it support the ioctl method? */
 
-  inode = filep->f_inode;
-  if (inode && inode->u.i_ops && inode->u.i_ops->ioctl)
-    {
-      /* Yes, then let it perform the ioctl */
-
-      ret = (int)inode->u.i_ops->ioctl(filep, req, arg);
-      if (ret < 0)
-        {
-          errcode = -ret;
-          goto errout;
-        }
-    }
-
-  return ret;
+  return file_ioctl(filep, req, arg);
+#else
+  errcode = ENOTTY;
 #endif
 
 errout:
diff --git a/include/nuttx/fs/fs.h b/include/nuttx/fs/fs.h
index f1bc737ffe..f383c4ac06 100644
--- a/include/nuttx/fs/fs.h
+++ b/include/nuttx/fs/fs.h
@@ -895,6 +895,26 @@ off_t file_seek(FAR struct file *filep, off_t offset, int whence);
 int file_fsync(FAR struct file *filep);
 #endif
 
+/****************************************************************************
+ * Name: file_ioctl
+ *
+ * Description:
+ *   Perform device specific operations.
+ *
+ * Parameters:
+ *   file     File structure instance
+ *   req      The ioctl command
+ *   arg      The argument of the ioctl cmd
+ *
+ * Return:
+ *   See ioctl() below.
+ *
+ ****************************************************************************/
+
+#if CONFIG_NFILE_DESCRIPTORS > 0
+int file_ioctl(FAR struct file *filep, int req, unsigned long arg);
+#endif
+
 /****************************************************************************
  * Name: file_vfcntl
  *
-- 
GitLab


From 02b91d98800e47bbfc309c0aa6e326936cf0d449 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 5 Jul 2016 12:58:18 -0600
Subject: [PATCH 152/229] Add a SYSLOG character device that can be used to
 re-direct output to the SYSLOG

---
 ReleaseNotes                    |   2 +-
 drivers/syslog/Kconfig          |  15 +++-
 drivers/syslog/Make.defs        |   4 +-
 drivers/syslog/syslog_chardev.c | 129 ++++++++++++++++++++++++++++++++
 fs/vfs/fs_ioctl.c               |   1 -
 include/nuttx/syslog/syslog.h   |  18 +++++
 6 files changed, 165 insertions(+), 4 deletions(-)
 create mode 100644 drivers/syslog/syslog_chardev.c

diff --git a/ReleaseNotes b/ReleaseNotes
index b5c3fbe321..5afe3d5724 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2570,7 +2570,7 @@ New features and extended functionality:
       particular for a CDC/ACM with MSC USB composite driver).
 
       Added a new RAM logging driver.  This will allow debug output into
-      a RAM buffer associated with a character driver at /dev/syslog.
+      a RAM buffer associated with a character driver at /dev/ramlog.
       Added the new command 'dmesg' to NSH that can be used to dump the
       current contents of the log.  This is useful for systems that do not
       have the usual serial console (for example, if you only have a
diff --git a/drivers/syslog/Kconfig b/drivers/syslog/Kconfig
index 07a7f92a4c..3ac22d8b68 100644
--- a/drivers/syslog/Kconfig
+++ b/drivers/syslog/Kconfig
@@ -172,7 +172,7 @@ config SYSLOG_CHAR_CRLF
 
 config SYSLOG_DEVPATH
 	string "System log device"
-	default "/dev/syslog"
+	default "/dev/ttyS1"
 	depends on SYSLOG_CHAR
 	---help---
 		The full path to the system logging device.  For the RAMLOG SYSLOG device,
@@ -180,4 +180,17 @@ config SYSLOG_DEVPATH
 		some other existing character device (or file) supported by the configuration
 		(such as "/dev/ttyS1")/
 
+config SYSLOG_CHARDEV
+	bool "SYSLOG character device"
+	default n
+	---help---
+		Enables support for a simple character driver at /dev/syslog whose
+		write() method will transfer data to the SYSLOG device.  This can be
+		useful if, for example, you want to redirect the output of a program
+		to the SYSLOG.
+
+		NOTE that unlike other syslog output, this data is unformatted raw
+		byte output with no time-stamping or any other SYSLOG features
+		supported.
+
 endmenu # System logging
diff --git a/drivers/syslog/Make.defs b/drivers/syslog/Make.defs
index 95583059e1..2cad218e5a 100644
--- a/drivers/syslog/Make.defs
+++ b/drivers/syslog/Make.defs
@@ -80,7 +80,9 @@ ifeq ($(CONFIG_SYSLOG_FILE),y)
 CSRCS += syslog_filechannel.c
 endif
 
-# (Add other SYSLOG drivers here)
+ifeq ($(CONFIG_SYSLOG_CHARDEV),y)
+CSRCS += syslog_chardev.c
+endif
 
 ifeq ($(CONFIG_CONSOLE_SYSLOG),y)
   CSRCS += syslog_console.c
diff --git a/drivers/syslog/syslog_chardev.c b/drivers/syslog/syslog_chardev.c
new file mode 100644
index 0000000000..b852db05a2
--- /dev/null
+++ b/drivers/syslog/syslog_chardev.c
@@ -0,0 +1,129 @@
+/****************************************************************************
+ * drivers/syslog/syslog_chardev.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 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+#include "syslog.h"
+
+#ifdef CONFIG_SYSLOG_CHARDEV
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static ssize_t syslog_write(FAR struct file *filep, FAR const char *buffer,
+                 size_t buflen);
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static const struct file_operations syslog_fops =
+{
+  NULL,          /* open */
+  NULL,          /* close */
+  NULL,          /* read */
+  syslog_write,  /* write */
+  NULL,          /* seek */
+  NULL           /* ioctl */
+#ifndef CONFIG_DISABLE_POLL
+  , NULL         /* poll */
+#endif
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL         /* unlink */
+#endif
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: syslog_write
+ ****************************************************************************/
+
+static ssize_t syslog_write(FAR struct file *filep, FAR const char *buffer,
+                            size_t len)
+{
+  size_t nwritten;
+  int ret;
+
+  for (nwritten = 0; nwritten < len; nwritten++)
+    {
+      int ch = *buffer++;
+      ret = syslog_putc(ch);
+      UNUSED(ret);
+    }
+
+  return len;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: syslog_register
+ *
+ * Description:
+ *   Register a simple character driver at /dev/syslog whose write() method
+ *   will transfer data to the SYSLOG device.  This can be useful if, for
+ *   example, you want to redirect the output of a program to the SYSLOG.
+ *
+ *   NOTE that unlike other syslog output, this data is unformatted raw
+ *   byte output with no time-stamping or any other SYSLOG features
+ *   supported.
+ *
+ ****************************************************************************/
+
+void syslog_register(void)
+{
+  (void)register_driver("/dev/syslog", &syslog_fops, 0222, NULL);
+}
+
+#endif /* CONFIG_SYSLOG_CHARDEV */
diff --git a/fs/vfs/fs_ioctl.c b/fs/vfs/fs_ioctl.c
index fda5be76cd..97a5056a39 100644
--- a/fs/vfs/fs_ioctl.c
+++ b/fs/vfs/fs_ioctl.c
@@ -135,7 +135,6 @@ int ioctl(int fd, int req, unsigned long arg)
   int errcode;
 #if CONFIG_NFILE_DESCRIPTORS > 0
   FAR struct file *filep;
-  int ret = OK;
 
   /* Did we get a valid file descriptor? */
 
diff --git a/include/nuttx/syslog/syslog.h b/include/nuttx/syslog/syslog.h
index fdb2794b79..01de19736d 100644
--- a/include/nuttx/syslog/syslog.h
+++ b/include/nuttx/syslog/syslog.h
@@ -271,6 +271,24 @@ int syslog_flush(void);
 
 int _vsyslog(int priority, FAR const IPTR char *src, FAR va_list *ap);
 
+/****************************************************************************
+ * Name: syslog_register
+ *
+ * Description:
+ *   Register a simple character driver at /dev/syslog whose write() method
+ *   will transfer data to the SYSLOG device.  This can be useful if, for
+ *   example, you want to redirect the output of a program to the SYSLOG.
+ *
+ *   NOTE that unlike other syslog output, this data is unformatted raw
+ *   byte output with no time-stamping or any other SYSLOG features
+ *   supported.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_SYSLOG_CHARDEV
+void syslog_register(void);
+#endif
+
 #undef EXTERN
 #ifdef __cplusplus
 }
-- 
GitLab


From 0690391d420e9c9967beb262eedf012e3a36f29c Mon Sep 17 00:00:00 2001
From: "Paul A. Patience" 
Date: Tue, 5 Jul 2016 15:47:11 -0400
Subject: [PATCH 153/229] ioexpander/gpio: Add missing argument to gpin_read
 and gpout_read

---
 drivers/ioexpander/gpio.c       | 115 ++++++++++++++++++--------------
 include/nuttx/ioexpander/gpio.h |   4 +-
 2 files changed, 66 insertions(+), 53 deletions(-)

diff --git a/drivers/ioexpander/gpio.c b/drivers/ioexpander/gpio.c
index 4eacefbef5..291652eb4d 100644
--- a/drivers/ioexpander/gpio.c
+++ b/drivers/ioexpander/gpio.c
@@ -56,11 +56,11 @@
 static int     gpio_open(FAR struct file *filep);
 static int     gpio_close(FAR struct file *filep);
 static ssize_t gpio_read(FAR struct file *filep, FAR char *buffer,
-                 size_t buflen);
+                         size_t buflen);
 static ssize_t gpio_write(FAR struct file *filep, FAR const char *buffer,
-                 size_t buflen);
+                          size_t buflen);
 static int     gpio_ioctl(FAR struct file *filep, int cmd,
-                 unsigned long arg);
+                          unsigned long arg);
 
 /****************************************************************************
  * Private Data
@@ -168,7 +168,7 @@ static int gpio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 {
   FAR struct inode *inode;
   FAR struct gpio_common_dev_s *dev;
-  int ret = OK;
+  int ret;
 
   DEBUGASSERT(filep != NULL && filep->f_inode != NULL);
   inode = filep->f_inode;
@@ -176,53 +176,66 @@ static int gpio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
   dev = inode->i_private;
 
   switch (cmd)
-  {
-  /* Command:     GPIO_WRITE
-   * Description: Set the value of an output GPIO
-   * Argument:    0=output a low value; 1=outut a high value
-   */
-
-  case GPIO_WRITE:
-    if (dev->gp_output)
-      {
-        FAR struct gpio_output_dev_s *outdev =
-          (FAR struct gpio_output_dev_s *)dev;
-
-        DEBUGASSERT(outdev->gpout_write != NULL &&
-                    ((arg == 0UL) || (arg == 1UL)));
-        ret = outdev->gpout_write(outdev, (int)arg);
-      }
-    else
-      {
-        ret = -EACCES;
-      }
-    break;
-
-  /* Command:     GPIO_READ
-   * Description: Read the value of an input or output GPIO
-   * Argument:    A pointer to an integer value to receive the result:
-   *              0=low value; 1=high value.
-   */
-
-  case GPIO_READ:
-    if (dev->gp_output)
-      {
-        FAR struct gpio_output_dev_s *outdev =
-          (FAR struct gpio_output_dev_s *)dev;
-
-        DEBUGASSERT(outdev->gpout_read != NULL);
-        ret = outdev->gpout_read(outdev);
-      }
-    else
-      {
-        FAR struct gpio_input_dev_s *indev =
-          (FAR struct gpio_input_dev_s *)dev;
-
-        DEBUGASSERT(indev->gpin_read != NULL);
-        ret = indev->gpin_read(indev);
-      }
-    break;
-  }
+    {
+      /* Command:     GPIO_WRITE
+       * Description: Set the value of an output GPIO
+       * Argument:    0=output a low value; 1=outut a high value
+       */
+
+      case GPIO_WRITE:
+        if (dev->gp_output)
+          {
+            FAR struct gpio_output_dev_s *outdev =
+              (FAR struct gpio_output_dev_s *)dev;
+
+            DEBUGASSERT(outdev->gpout_write != NULL &&
+                        ((arg == 0UL) || (arg == 1UL)));
+            ret = outdev->gpout_write(outdev, (int)arg);
+          }
+        else
+          {
+            ret = -EACCES;
+          }
+        break;
+
+      /* Command:     GPIO_READ
+       * Description: Read the value of an input or output GPIO
+       * Argument:    A pointer to an integer value to receive the result:
+       *              0=low value; 1=high value.
+       */
+
+      case GPIO_READ:
+        {
+          FAR int *ptr = (FAR int *)((uintptr_t)arg);
+          DEBUGASSERT(ptr != NULL);
+
+          if (dev->gp_output)
+            {
+              FAR struct gpio_output_dev_s *outdev =
+                (FAR struct gpio_output_dev_s *)dev;
+
+              DEBUGASSERT(outdev->gpout_read != NULL);
+              ret = outdev->gpout_read(outdev, ptr);
+            }
+          else
+            {
+              FAR struct gpio_input_dev_s *indev =
+                (FAR struct gpio_input_dev_s *)dev;
+
+              DEBUGASSERT(indev->gpin_read != NULL);
+              ret = indev->gpin_read(indev, ptr);
+            }
+
+          DEBUGASSERT(ret < 0 || *ptr == 0 || *ptr == 1);
+        }
+        break;
+
+      /* Unrecognized command */
+
+      default:
+        ret = -ENOTTY;
+        break;
+    }
 
   return ret;
 }
diff --git a/include/nuttx/ioexpander/gpio.h b/include/nuttx/ioexpander/gpio.h
index 07d6e3e0fd..ce6e13794b 100644
--- a/include/nuttx/ioexpander/gpio.h
+++ b/include/nuttx/ioexpander/gpio.h
@@ -85,7 +85,7 @@ struct gpio_input_dev_s
 
   /* Fields unique to input pins */
 
-  CODE int (*gpin_read)(FAR struct gpio_input_dev_s *dev);
+  CODE int (*gpin_read)(FAR struct gpio_input_dev_s *dev, FAR int *value);
 
   /* Lower-half private definitions may follow */
 };
@@ -101,7 +101,7 @@ struct gpio_output_dev_s
 
   /* Fields unique to output pins */
 
-  CODE int (*gpout_read)(FAR struct gpio_output_dev_s *dev);
+  CODE int (*gpout_read)(FAR struct gpio_output_dev_s *dev, FAR int *value);
   CODE int (*gpout_write)(FAR struct gpio_output_dev_s *dev, int value);
 
   /* Lower-half private definitions may follow */
-- 
GitLab


From 88a03ae3ecb09426c3911f81fc94a83b39d234ac Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Wed, 6 Jul 2016 07:30:09 -0600
Subject: [PATCH 154/229] Break out internal interface psock_ioctl()

---
 include/nuttx/net/net.h   | 35 ++++++++++++++++++++++++++-
 net/netdev/netdev_ioctl.c | 51 +++++++++++++++++++++++++++++++++------
 2 files changed, 78 insertions(+), 8 deletions(-)

diff --git a/include/nuttx/net/net.h b/include/nuttx/net/net.h
index 4fadfd2c8f..74abc0d701 100644
--- a/include/nuttx/net/net.h
+++ b/include/nuttx/net/net.h
@@ -968,6 +968,39 @@ int psock_getsockopt(FAR struct socket *psock, int level, int option,
 int psock_setsockopt(FAR struct socket *psock, int level, int option,
                      FAR const void *value, socklen_t value_len);
 
+/****************************************************************************
+ * Name: psock_ioctl
+ *
+ * Description:
+ *   Perform network device specific operations.
+ *
+ * Parameters:
+ *   psock    A pointer to a NuttX-specific, internal socket structure
+ *   cmd      The ioctl command
+ *   arg      The argument of the ioctl cmd
+ *
+ * Return:
+ *   >=0 on success (positive non-zero values are cmd-specific)
+ *   On a failure, -1 is returned with errno set appropriately
+ *
+ *   EBADF
+ *     'psock' is not a valid, connected socket structure.
+ *   EFAULT
+ *     'arg' references an inaccessible memory area.
+ *   ENOTTY
+ *     'cmd' not valid.
+ *   EINVAL
+ *     'arg' is not valid.
+ *   ENOTTY
+ *     'sockfd' is not associated with a network device.
+ *   ENOTTY
+ *      The specified request does not apply to the kind of object that the
+ *      descriptor 'sockfd' references.
+ *
+ ****************************************************************************/
+
+int psock_ioctl(FAR struct socket *psock, int cmd, unsigned long arg);
+
 /****************************************************************************
  * Name: netdev_ioctl
  *
@@ -984,7 +1017,7 @@ int psock_setsockopt(FAR struct socket *psock, int level, int option,
  *   On a failure, -1 is returned with errno set appropriately
  *
  *   EBADF
- *     'sockfd' is not a valid descriptor.
+ *     'sockfd' is not a valid socket descriptor.
  *   EFAULT
  *     'arg' references an inaccessible memory area.
  *   ENOTTY
diff --git a/net/netdev/netdev_ioctl.c b/net/netdev/netdev_ioctl.c
index d12d3bdbbd..10d9bf2df6 100644
--- a/net/netdev/netdev_ioctl.c
+++ b/net/netdev/netdev_ioctl.c
@@ -1026,13 +1026,13 @@ static int netdev_rtioctl(FAR struct socket *psock, int cmd,
  ****************************************************************************/
 
 /****************************************************************************
- * Name: netdev_ioctl
+ * Name: psock_ioctl
  *
  * Description:
  *   Perform network device specific operations.
  *
  * Parameters:
- *   sockfd   Socket descriptor of device
+ *   psock    A pointer to a NuttX-specific, internal socket structure
  *   cmd      The ioctl command
  *   arg      The argument of the ioctl cmd
  *
@@ -1041,7 +1041,7 @@ static int netdev_rtioctl(FAR struct socket *psock, int cmd,
  *   On a failure, -1 is returned with errno set appropriately
  *
  *   EBADF
- *     'sockfd' is not a valid descriptor.
+ *     'psock' is not a valid, connected socket structure.
  *   EFAULT
  *     'arg' references an inaccessible memory area.
  *   ENOTTY
@@ -1056,9 +1056,8 @@ static int netdev_rtioctl(FAR struct socket *psock, int cmd,
  *
  ****************************************************************************/
 
-int netdev_ioctl(int sockfd, int cmd, unsigned long arg)
+int psock_ioctl(FAR struct socket *psock, int cmd, unsigned long arg)
 {
-  FAR struct socket *psock = sockfd_socket(sockfd);
   int ret;
 
   /* Check if this is a valid command.  In all cases, arg is a pointer that has
@@ -1072,9 +1071,9 @@ int netdev_ioctl(int sockfd, int cmd, unsigned long arg)
       goto errout;
     }
 
-  /* Verify that the sockfd corresponds to valid, allocated socket */
+  /* Verify that the psock corresponds to valid, allocated socket */
 
-  if (!psock || psock->s_crefs <= 0)
+  if (psock == NULL || psock->s_crefs <= 0)
     {
       ret = -EBADF;
       goto errout;
@@ -1125,6 +1124,44 @@ errout:
   return ERROR;
 }
 
+/****************************************************************************
+ * Name: netdev_ioctl
+ *
+ * Description:
+ *   Perform network device specific operations.
+ *
+ * Parameters:
+ *   sockfd   Socket descriptor of device
+ *   cmd      The ioctl command
+ *   arg      The argument of the ioctl cmd
+ *
+ * Return:
+ *   >=0 on success (positive non-zero values are cmd-specific)
+ *   On a failure, -1 is returned with errno set appropriately
+ *
+ *   EBADF
+ *     'sockfd' is not a valid socket descriptor.
+ *   EFAULT
+ *     'arg' references an inaccessible memory area.
+ *   ENOTTY
+ *     'cmd' not valid.
+ *   EINVAL
+ *     'arg' is not valid.
+ *   ENOTTY
+ *     'sockfd' is not associated with a network device.
+ *   ENOTTY
+ *      The specified request does not apply to the kind of object that the
+ *      descriptor 'sockfd' references.
+ *
+ ****************************************************************************/
+
+int netdev_ioctl(int sockfd, int cmd, unsigned long arg)
+{
+  FAR struct socket *psock = sockfd_socket(sockfd);
+
+  return psock_ioctl(psock, cmd, arg);
+}
+
 /****************************************************************************
  * Name: netdev_ifup / netdev_ifdown
  *
-- 
GitLab


From b5ef244b18d0ff91c32a25da6721f9a805088d5b Mon Sep 17 00:00:00 2001
From: Matthias Renner 
Date: Wed, 6 Jul 2016 17:35:58 +0200
Subject: [PATCH 155/229] add can driver for stm32f4discovery

---
 configs/stm32f4discovery/src/Makefile    |   4 +
 configs/stm32f4discovery/src/stm32_can.c | 122 +++++++++++++++++++++++
 2 files changed, 126 insertions(+)
 create mode 100644 configs/stm32f4discovery/src/stm32_can.c

diff --git a/configs/stm32f4discovery/src/Makefile b/configs/stm32f4discovery/src/Makefile
index 58d3e7c487..f1ee252997 100644
--- a/configs/stm32f4discovery/src/Makefile
+++ b/configs/stm32f4discovery/src/Makefile
@@ -48,6 +48,10 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y)
 CSRCS +=  stm32_buttons.c
 endif
 
+ifeq ($(CONFIG_CAN),y)
+CSRCS += stm32_can.c
+endif
+
 ifeq ($(CONFIG_STM32_OTGFS),y)
 CSRCS += stm32_usb.c
 endif
diff --git a/configs/stm32f4discovery/src/stm32_can.c b/configs/stm32f4discovery/src/stm32_can.c
new file mode 100644
index 0000000000..ffd0af45cd
--- /dev/null
+++ b/configs/stm32f4discovery/src/stm32_can.c
@@ -0,0 +1,122 @@
+/************************************************************************************
+ * configs/stm32f4discovery/src/stm32_can.c
+ *
+ *   Copyright (C) 2011-2012 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 
+
+#include "chip.h"
+#include "up_arch.h"
+
+#include "stm32.h"
+#include "stm32_can.h"
+#include "stm32f4discovery.h"
+
+#if defined(CONFIG_CAN) && (defined(CONFIG_STM32_CAN1) || defined(CONFIG_STM32_CAN2))
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+/* Configuration ********************************************************************/
+
+#if defined(CONFIG_STM32_CAN1) && defined(CONFIG_STM32_CAN2)
+#  warning "Both CAN1 and CAN2 are enabled.  Assuming only CAN1."
+#  undef CONFIG_STM32_CAN2
+#endif
+
+#ifdef CONFIG_STM32_CAN1
+#  define CAN_PORT 1
+#else
+#  define CAN_PORT 2
+#endif
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Name: board_can_initialize
+ *
+ * Description:
+ *   All STM32 architectures must provide the following interface to work with
+ *   examples/can.
+ *
+ ************************************************************************************/
+
+int board_can_initialize(void)
+{
+  static bool initialized = false;
+  struct can_dev_s *can;
+  int ret;
+
+  /* Check if we have already initialized */
+
+  if (!initialized)
+    {
+      /* Call stm32_caninitialize() to get an instance of the CAN interface */
+
+      can = stm32_caninitialize(CAN_PORT);
+      if (can == NULL)
+        {
+          canerr("ERROR:  Failed to get CAN interface\n");
+          return -ENODEV;
+        }
+
+      /* Register the CAN driver at "/dev/can0" */
+
+      ret = can_register("/dev/can0", can);
+      if (ret < 0)
+        {
+          canerr("ERROR: can_register failed: %d\n", ret);
+          return ret;
+        }
+
+      /* Now we are initialized */
+
+      initialized = true;
+    }
+
+  return OK;
+}
+
+#endif /* CONFIG_CAN && (CONFIG_STM32_CAN1 || CONFIG_STM32_CAN2) */
-- 
GitLab


From c8d6707aaf6ba767d5516b684d86f096df8d0289 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Wed, 6 Jul 2016 11:03:27 -0600
Subject: [PATCH 156/229] Freedom-K64F:  Increase MCU clock to 120MHz

---
 arch/arm/src/kinetis/chip/kinetis_mcg.h |  4 ++--
 configs/freedom-k64f/README.txt         | 11 ++++-------
 configs/freedom-k64f/include/board.h    | 21 ++++++++++++---------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/arch/arm/src/kinetis/chip/kinetis_mcg.h b/arch/arm/src/kinetis/chip/kinetis_mcg.h
index e426b02e58..fe8dccc60e 100644
--- a/arch/arm/src/kinetis/chip/kinetis_mcg.h
+++ b/arch/arm/src/kinetis/chip/kinetis_mcg.h
@@ -142,7 +142,7 @@
 
 #define MCG_C5_PRDIV_SHIFT        (0)       /* Bits 0-4: PLL External Reference Divider */
 #define MCG_C5_PRDIV_MASK         (31 << MCG_C5_PRDIV_SHIFT)
-#  define MCG_C5_PRDIV(n)         (((n)-1) << MCG_C5_PRDIV_SHIFT) /* Divide factor n=1..25 */
+#  define MCG_C5_PRDIV(n)         ((uint32_t)((n)-1) << MCG_C5_PRDIV_SHIFT) /* n=1..25 */
 #define MCG_C5_PLLSTEN            (1 << 5)  /* Bit 5:  PLL Stop Enable */
 #define MCG_C5_PLLCLKEN           (1 << 6)  /* Bit 6:  PLL Clock Enable */
                                             /* Bit 7: Reserved */
@@ -151,7 +151,7 @@
 
 #define MCG_C6_VDIV_SHIFT         (0)       /* Bits 0-4: VCO Divider */
 #define MCG_C6_VDIV_MASK          (31 << MCG_C6_VDIV_SHIFT)
-#  define MCG_C6_VDIV(n)          (((n)-24) << MCG_C6_VDIV_SHIFT) /* Divide factor n=24..55 */
+#  define MCG_C6_VDIV(n)          ((uint32_t)((n)-24) << MCG_C6_VDIV_SHIFT) /* n=24..55 */
 #define MCG_C6_CME                (1 << 5)  /* Bit 5:  Clock Monitor Enable */
 #define MCG_C6_PLLS               (1 << 6)  /* Bit 6:  PLL Select */
 #define MCG_C6_LOLIE              (1 << 7)  /* Bit 7:  Loss of Lock Interrrupt Enable */
diff --git a/configs/freedom-k64f/README.txt b/configs/freedom-k64f/README.txt
index 8fea59243a..9ef9660763 100644
--- a/configs/freedom-k64f/README.txt
+++ b/configs/freedom-k64f/README.txt
@@ -347,10 +347,8 @@ Where  is one of the following:
 
   nsh:
   ---
-    Configures the NuttShell (nsh) located at apps/examples/nsh.  The
-    Configuration enables both the serial and telnet NSH interfaces.
-    Support for the board's SPI-based MicroSD card is included
-    (but not passing tests as of this writing).
+    Configures the NuttShell (nsh) located at apps/examples/nsh using a
+    serial console on UART3.
 
     NOTES:
 
@@ -373,9 +371,8 @@ Where  is one of the following:
     3. The Serial Console is provided on UART3 with the correct pin
        configuration for use with an Arduino Serial Shield.
 
-    4. An SDHC driver is under work and can be enabled in the NSH configuration
-       for further testing be setting the following configuration values as
-       follows:
+    4. An SDHC driver is has not yet been tested but can be enabled in the NSH
+       configuration by setting the following configuration values as follows:
 
       CONFIG_KINETIS_SDHC=y                : Enable the SDHC driver
 
diff --git a/configs/freedom-k64f/include/board.h b/configs/freedom-k64f/include/board.h
index 07af717c70..37125bac41 100644
--- a/configs/freedom-k64f/include/board.h
+++ b/configs/freedom-k64f/include/board.h
@@ -59,20 +59,23 @@
  */
 
 #define BOARD_EXTCLOCK       1              /* External clock */
-#define BOARD_EXTAL_FREQ     48000000       /* 50MHz Oscillator */
+#define BOARD_EXTAL_FREQ     50000000       /* 50MHz Oscillator from Micrel PHY */
 #define BOARD_XTAL32_FREQ    32768          /* 32KHz RTC Oscillator */
 
 /* PLL Configuration.  Either the external clock or crystal frequency is used to
  * select the PRDIV value. Only reference clock frequencies are supported that will
  * produce a 2MHz reference clock to the PLL.
  *
- *   PLL Input frequency:   PLLIN  = REFCLK/PRDIV = 50MHz/25 = 2MHz
- *   PLL Output frequency:  PLLOUT = PLLIN*VDIV   = 2Mhz*48 = 96MHz
+ *   PLL Input frequency:   PLLIN  = REFCLK / PRDIV = 50  Mhz  / 20 = 2.5 MHz
+ *   PLL Output frequency:  PLLOUT = PLLIN  * VDIV  = 2.5 Mhz  * 48 = 120 MHz
  *   MCG Frequency:         PLLOUT = 96MHz
+ *
+ * PRDIV register value is the divider minus one.  So 20 -> 19
+ * VDIV  regiser value is offset by 24.  So 28 -> 24
  */
 
-#define BOARD_PRDIV          19             /* PLL External Reference Divider */
-#define BOARD_VDIV           24             /* PLL VCO Divider (frequency multiplier) */
+#define BOARD_PRDIV          20             /* PLL External Reference Divider */
+#define BOARD_VDIV           48             /* PLL VCO Divider (frequency multiplier) */
 
 #define BOARD_PLLIN_FREQ     (BOARD_EXTAL_FREQ / BOARD_PRDIV)
 #define BOARD_PLLOUT_FREQ    (BOARD_PLLIN_FREQ * BOARD_VDIV)
@@ -80,10 +83,10 @@
 
 /* SIM CLKDIV1 dividers */
 
-#define BOARD_OUTDIV1        1              /* Core        = MCG, 96MHz */
-#define BOARD_OUTDIV2        2              /* Bus         = MCG/2, 48MHz */
-#define BOARD_OUTDIV3        2              /* FlexBus     = MCG/2, 48MHz */
-#define BOARD_OUTDIV4        4              /* Flash clock = MCG/4, 24MHz */
+#define BOARD_OUTDIV1        1              /* Core        = MCG,    120 MHz */
+#define BOARD_OUTDIV2        2              /* Bus         = MCG / 2, 60 MHz */
+#define BOARD_OUTDIV3        2              /* FlexBus     = MCG / 2, 60 MHz */
+#define BOARD_OUTDIV4        4              /* Flash clock = MCG / 4, 30 MHz */
 
 #define BOARD_CORECLK_FREQ  (BOARD_MCG_FREQ / BOARD_OUTDIV1)
 #define BOARD_BUS_FREQ      (BOARD_MCG_FREQ / BOARD_OUTDIV2)
-- 
GitLab


From 4d8213870cd3bb097c3308014f1713431114728c Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Wed, 6 Jul 2016 12:11:26 -0600
Subject: [PATCH 157/229] Freedom-K64F: Update Flash Clock divider.  Flash
 clock must not exceed 24 Mhz

---
 arch/arm/src/kinetis/chip/kinetis_sim.h | 10 +++++-----
 configs/freedom-k64f/include/board.h    |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/src/kinetis/chip/kinetis_sim.h b/arch/arm/src/kinetis/chip/kinetis_sim.h
index 6842f9281d..ae56504ff0 100644
--- a/arch/arm/src/kinetis/chip/kinetis_sim.h
+++ b/arch/arm/src/kinetis/chip/kinetis_sim.h
@@ -207,7 +207,7 @@
                                                 /* Bits 0-23: Reserved */
 #define SIM_SOPT6_RSTFLTSEL_SHIFT     (24)      /* Bits 24-28: Reset pin filter select */
 #define SIM_SOPT6_RSTFLTSEL_MASK      (31 << SIM_SOPT6_RSTFLTSEL_SHIFT)
-#   define SIM_SOPT6_RSTFLTSEL(n)     (((n)-1) << SIM_SOPT6_RSTFLTSEL_SHIFT) /* Bux clock filter count n, n=1..32 */
+#   define SIM_SOPT6_RSTFLTSEL(n)     ((uint32_t)((n)-1) << SIM_SOPT6_RSTFLTSEL_SHIFT) /* n=1..32 */
 #define SIM_SOPT6_RSTFLTEN_SHIFT      (29)      /* Bits 29-31: Reset pin filter enable */
 #define SIM_SOPT6_RSTFLTEN_MASK       (7 << SIM_SOPT6_RSTFLTEN_SHIFT)
 #define SIM_SOPT6_RSTFLTEN_DISABLED   (0 << SIM_SOPT6_RSTFLTEN_SHIFT) /* All filtering disabled */
@@ -385,7 +385,7 @@
                                                 /* Bits 0-15: Reserved */
 #define SIM_CLKDIV1_OUTDIV4_SHIFT     (16)      /* Bits 16-19: Clock 4 output divider value */
 #define SIM_CLKDIV1_OUTDIV4_MASK      (15 << SIM_CLKDIV1_OUTDIV4_SHIFT)
-#  define SIM_CLKDIV1_OUTDIV4(n)      (((n)-1) << SIM_CLKDIV1_OUTDIV4_SHIFT) /* Divide by n, n=1..16 */
+#  define SIM_CLKDIV1_OUTDIV4(n)      ((uint32_t)((n)-1) << SIM_CLKDIV1_OUTDIV4_SHIFT) /* n=1..16 */
 #  define SIM_CLKDIV1_OUTDIV4_1       (0 << SIM_CLKDIV1_OUTDIV4_SHIFT)  /* Divide by 1 */
 #  define SIM_CLKDIV1_OUTDIV4_2       (1 << SIM_CLKDIV1_OUTDIV4_SHIFT)  /* Divide by 2 */
 #  define SIM_CLKDIV1_OUTDIV4_3       (2 << SIM_CLKDIV1_OUTDIV4_SHIFT)  /* Divide by 3 */
@@ -404,7 +404,7 @@
 #  define SIM_CLKDIV1_OUTDIV4_16      (15 << SIM_CLKDIV1_OUTDIV4_SHIFT) /* Divide by 16 */
 #define SIM_CLKDIV1_OUTDIV3_SHIFT     (20)      /* Bits 20-23: Clock 3 output divider value */
 #define SIM_CLKDIV1_OUTDIV3_MASK      (15 << SIM_CLKDIV1_OUTDIV3_SHIFT)
-#  define SIM_CLKDIV1_OUTDIV3(n)      (((n)-1) << SIM_CLKDIV1_OUTDIV3_SHIFT) /* Divide by n, n=1..16 */
+#  define SIM_CLKDIV1_OUTDIV3(n)      ((uint32_t)((n)-1) << SIM_CLKDIV1_OUTDIV3_SHIFT) /* n=1..16 */
 #  define SIM_CLKDIV1_OUTDIV3_1       (0 << SIM_CLKDIV1_OUTDIV3_SHIFT)  /* Divide by 1 */
 #  define SIM_CLKDIV1_OUTDIV3_2       (1 << SIM_CLKDIV1_OUTDIV3_SHIFT)  /* Divide by 2 */
 #  define SIM_CLKDIV1_OUTDIV3_3       (2 << SIM_CLKDIV1_OUTDIV3_SHIFT)  /* Divide by 3 */
@@ -423,7 +423,7 @@
 #  define SIM_CLKDIV1_OUTDIV3_16      (15 << SIM_CLKDIV1_OUTDIV3_SHIFT) /* Divide by 16 */
 #define SIM_CLKDIV1_OUTDIV2_SHIFT     (24)      /* Bits 24-27: Clock 2 output divider value */
 #define SIM_CLKDIV1_OUTDIV2_MASK      (15 << SIM_CLKDIV1_OUTDIV2_SHIFT)
-#  define SIM_CLKDIV1_OUTDIV2(n)      (((n)-1) << SIM_CLKDIV1_OUTDIV2_SHIFT) /* Divide by n, n=1..16 */
+#  define SIM_CLKDIV1_OUTDIV2(n)      ((uint32_t)((n)-1) << SIM_CLKDIV1_OUTDIV2_SHIFT) /* n=1..16 */
 #  define SIM_CLKDIV1_OUTDIV2_1       (0 << SIM_CLKDIV1_OUTDIV2_SHIFT)  /* Divide by 1 */
 #  define SIM_CLKDIV1_OUTDIV2_2       (1 << SIM_CLKDIV1_OUTDIV2_SHIFT)  /* Divide by 2 */
 #  define SIM_CLKDIV1_OUTDIV2_3       (2 << SIM_CLKDIV1_OUTDIV2_SHIFT)  /* Divide by 3 */
@@ -442,7 +442,7 @@
 #  define SIM_CLKDIV1_OUTDIV2_16      (15 << SIM_CLKDIV1_OUTDIV2_SHIFT) /* Divide by 16 */
 #define SIM_CLKDIV1_OUTDIV1_SHIFT     (28)      /* Bits 28-31: Clock 1 output divider value */
 #define SIM_CLKDIV1_OUTDIV1_MASK      (15 << SIM_CLKDIV1_OUTDIV1_SHIFT)
-#  define SIM_CLKDIV1_OUTDIV1(n)      (((n)-1) << SIM_CLKDIV1_OUTDIV1_SHIFT) /* Divide by n, n=1..16 */
+#  define SIM_CLKDIV1_OUTDIV1(n)      ((uint32_t)((n)-1) << SIM_CLKDIV1_OUTDIV1_SHIFT) /* n=1..16 */
 #  define SIM_CLKDIV1_OUTDIV1_1       (0 << SIM_CLKDIV1_OUTDIV1_SHIFT)  /* Divide by 1 */
 #  define SIM_CLKDIV1_OUTDIV1_2       (1 << SIM_CLKDIV1_OUTDIV1_SHIFT)  /* Divide by 2 */
 #  define SIM_CLKDIV1_OUTDIV1_3       (2 << SIM_CLKDIV1_OUTDIV1_SHIFT)  /* Divide by 3 */
diff --git a/configs/freedom-k64f/include/board.h b/configs/freedom-k64f/include/board.h
index 37125bac41..92247416c3 100644
--- a/configs/freedom-k64f/include/board.h
+++ b/configs/freedom-k64f/include/board.h
@@ -86,7 +86,7 @@
 #define BOARD_OUTDIV1        1              /* Core        = MCG,    120 MHz */
 #define BOARD_OUTDIV2        2              /* Bus         = MCG / 2, 60 MHz */
 #define BOARD_OUTDIV3        2              /* FlexBus     = MCG / 2, 60 MHz */
-#define BOARD_OUTDIV4        4              /* Flash clock = MCG / 4, 30 MHz */
+#define BOARD_OUTDIV4        5              /* Flash clock = MCG / 5, 24 MHz */
 
 #define BOARD_CORECLK_FREQ  (BOARD_MCG_FREQ / BOARD_OUTDIV1)
 #define BOARD_BUS_FREQ      (BOARD_MCG_FREQ / BOARD_OUTDIV2)
-- 
GitLab


From d8286a7f4724f15a17b387757518a3a67933b83d Mon Sep 17 00:00:00 2001
From: Max Neklyudov 
Date: Wed, 6 Jul 2016 12:48:30 -0600
Subject: [PATCH 158/229] STM32:  Add support for Tickless mode (two timer
 implementation)

---
 arch/arm/src/stm32/Kconfig          |  37 +++
 arch/arm/src/stm32/Make.defs        |  10 +
 arch/arm/src/stm32/stm32_freerun.c  | 296 ++++++++++++++++++++
 arch/arm/src/stm32/stm32_freerun.h  | 157 +++++++++++
 arch/arm/src/stm32/stm32_oneshot.c  | 414 ++++++++++++++++++++++++++++
 arch/arm/src/stm32/stm32_oneshot.h  | 189 +++++++++++++
 arch/arm/src/stm32/stm32_tickless.c | 350 +++++++++++++++++++++++
 arch/arm/src/stm32/stm32_tim.c      |  34 ++-
 arch/arm/src/stm32/stm32_tim.h      |   7 +-
 9 files changed, 1483 insertions(+), 11 deletions(-)
 create mode 100644 arch/arm/src/stm32/stm32_freerun.c
 create mode 100644 arch/arm/src/stm32/stm32_freerun.h
 create mode 100644 arch/arm/src/stm32/stm32_oneshot.c
 create mode 100644 arch/arm/src/stm32/stm32_oneshot.h
 create mode 100644 arch/arm/src/stm32/stm32_tickless.c

diff --git a/arch/arm/src/stm32/Kconfig b/arch/arm/src/stm32/Kconfig
index 4a838eb07d..bd8e0ca00c 100644
--- a/arch/arm/src/stm32/Kconfig
+++ b/arch/arm/src/stm32/Kconfig
@@ -1285,6 +1285,7 @@ config STM32_LOWDENSITY
 config STM32_STM32F20XX
 	bool
 	default n
+	select ARCH_HAVE_TICKLESS
 
 config STM32_STM32F205
 	bool
@@ -2166,6 +2167,42 @@ config STM32_TSC
 	default n
 	depends on STM32_STM32F30XX
 
+config STM32_ONESHOT
+	bool "TIM one-shot wrapper"
+	default n if !SCHED_TICKLESS
+	default y if SCHED_TICKLESS
+	---help---
+		Enable a wrapper around the low level timer/counter functions to
+		support one-shot timer.
+
+config STM32_FREERUN
+	bool "TIM free-running wrapper"
+	default n if !SCHED_TICKLESS
+	default y if SCHED_TICKLESS
+	---help---
+		Enable a wrapper around the low level timer/counter functions to
+		support a free-running timer.
+
+if SCHED_TICKLESS
+
+config STM32_TICKLESS_ONESHOT
+	int "Tickless one-shot timer channel"
+	default 2
+	range 1 14
+	---help---
+		If the Tickless OS feature is enabled, the one clock must be
+		assigned to provided the one-shot timer needed by the OS.
+
+config STM32_TICKLESS_FREERUN
+	int "Tickless free-running timer channel"
+	default 5
+	range 1 14
+	---help---
+		If the Tickless OS feature is enabled, the one clock must be
+		assigned to provided the free-running timer needed by the OS.
+
+endif
+
 config STM32_USART1
 	bool "USART1"
 	default n
diff --git a/arch/arm/src/stm32/Make.defs b/arch/arm/src/stm32/Make.defs
index 1a3355d24d..aef4ef0815 100644
--- a/arch/arm/src/stm32/Make.defs
+++ b/arch/arm/src/stm32/Make.defs
@@ -120,6 +120,16 @@ endif
 
 ifneq ($(CONFIG_SCHED_TICKLESS),y)
 CHIP_CSRCS += stm32_timerisr.c
+else
+CHIP_CSRCS += stm32_tickless.c
+endif
+
+ifeq ($(CONFIG_STM32_ONESHOT),y)
+CHIP_CSRCS += stm32_oneshot.c
+endif
+
+ifeq ($(CONFIG_STM32_FREERUN),y)
+CHIP_CSRCS += stm32_freerun.c
 endif
 
 ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y)
diff --git a/arch/arm/src/stm32/stm32_freerun.c b/arch/arm/src/stm32/stm32_freerun.c
new file mode 100644
index 0000000000..42a2128a6d
--- /dev/null
+++ b/arch/arm/src/stm32/stm32_freerun.c
@@ -0,0 +1,296 @@
+/****************************************************************************
+ * arch/arm/src/stm32/stm32_freerun.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 names NuttX nor Atmel 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 "stm32_freerun.h"
+
+#ifdef CONFIG_STM32_FREERUN
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static struct stm32_freerun_s *g_freerun;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stm32_freerun_handler
+ *
+ * Description:
+ *   Timer interrupt callback.  When the freerun timer counter overflows,
+ *   this interrupt will occur.  We will just increment an overflow count.
+ *
+ * Input Parameters:
+ *   tch - The handle that represents the timer state
+ *   arg - An opaque argument provided when the interrupt was registered
+ *   sr  - The value of the timer interrupt status register at the time
+ *         that the interrupt occurred.
+ *
+ * Returned Value:
+ *   None
+ *
+ ****************************************************************************/
+
+static int stm32_freerun_handler(int irq, void *context)
+{
+  struct stm32_freerun_s *freerun = g_freerun;
+
+  DEBUGASSERT(freerun != NULL && freerun->overflow < UINT32_MAX);
+  freerun->overflow++;
+
+  STM32_TIM_ACKINT(freerun->tch, 0);
+  return OK;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stm32_freerun_initialize
+ *
+ * Description:
+ *   Initialize the freerun timer wrapper
+ *
+ * Input Parameters:
+ *   freerun    Caller allocated instance of the freerun state structure
+ *   chan       Timer counter channel to be used.
+ *   resolution The required resolution of the timer in units of
+ *              microseconds.  NOTE that the range is restricted to the
+ *              range of uint16_t (excluding zero).
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned
+ *   on failure.
+ *
+ ****************************************************************************/
+
+int stm32_freerun_initialize(struct stm32_freerun_s *freerun, int chan,
+                             uint16_t resolution)
+{
+  uint32_t frequency;
+
+  tmrinfo("chan=%d resolution=%d usec\n", chan, resolution);
+  DEBUGASSERT(freerun != NULL && resolution > 0);
+
+  /* Get the TC frequency the corresponds to the requested resolution */
+
+  frequency = USEC_PER_SEC / (uint32_t)resolution;
+  freerun->frequency = frequency;
+
+  freerun->tch = stm32_tim_init(chan);
+  if (!freerun->tch)
+    {
+      tmrerr("ERROR: Failed to allocate TIM%d\n", chan);
+      return -EBUSY;
+    }
+
+  STM32_TIM_SETCLOCK(freerun->tch, frequency);
+
+  /* Initialize the remaining fields in the state structure and return
+   * success.
+   */
+
+  freerun->chan     = chan;
+  freerun->running  = false;
+  freerun->overflow = 0;
+
+  g_freerun = freerun;
+
+  /* Set up to receive the callback when the counter overflow occurs */
+
+  STM32_TIM_SETISR(freerun->tch, stm32_freerun_handler, 0);
+
+  /* Set timer period */
+
+  STM32_TIM_SETPERIOD(freerun->tch, UINT32_MAX);
+
+  /* Start the counter */
+
+  STM32_TIM_SETMODE(freerun->tch, STM32_TIM_MODE_UP);
+  STM32_TIM_ACKINT(freerun->tch, 0);
+  STM32_TIM_ENABLEINT(freerun->tch, 0);
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stm32_freerun_counter
+ *
+ * Description:
+ *   Read the counter register of the free-running timer.
+ *
+ * Input Parameters:
+ *   freerun Caller allocated instance of the freerun state structure.  This
+ *           structure must have been previously initialized via a call to
+ *           stm32_freerun_initialize();
+ *   ts      The location in which to return the time from the free-running
+ *           timer.
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned
+ *   on failure.
+ *
+ ****************************************************************************/
+
+int stm32_freerun_counter(struct stm32_freerun_s *freerun,
+                          struct timespec *ts)
+{
+  uint64_t usec;
+  uint32_t counter;
+  uint32_t verify;
+  uint32_t overflow;
+  uint32_t sec;
+  int pending;
+  irqstate_t flags;
+
+  DEBUGASSERT(freerun && freerun->tch && ts);
+
+  /* Temporarily disable the overflow counter.  NOTE that we have to be
+   * careful here because  stm32_tc_getpending() will reset the pending
+   * interrupt status.  If we do not handle the overflow here then, it will
+   * be lost.
+   */
+
+  flags    = irqsave();
+
+  overflow = freerun->overflow;
+  counter  = STM32_TIM_GETCOUNTER(freerun->tch);
+  pending  = STM32_TIM_CHECKINT(freerun->tch, 0);
+  verify   = STM32_TIM_GETCOUNTER(freerun->tch);
+
+  /* If an interrupt was pending before we re-enabled interrupts,
+   * then the overflow needs to be incremented.
+   */
+
+  if (pending)
+    {
+      STM32_TIM_ACKINT(freerun->tch, 0);
+
+      /* Increment the overflow count and use the value of the
+       * guaranteed to be AFTER the overflow occurred.
+       */
+
+      overflow++;
+      counter = verify;
+
+      /* Update freerun overflow counter. */
+
+      freerun->overflow = overflow;
+    }
+
+  irqrestore(flags);
+
+  tmrinfo("counter=%lu (%lu) overflow=%lu, pending=%i\n",
+         (unsigned long)counter,  (unsigned long)verify,
+         (unsigned long)overflow, pending);
+  tmrinfo("frequency=%u\n", freerun->frequency);
+
+  /* Convert the whole thing to units of microseconds.
+   *
+   *   frequency = ticks / second
+   *   seconds   = ticks * frequency
+   *   usecs     = (ticks * USEC_PER_SEC) / frequency;
+   */
+
+  usec = ((((uint64_t)overflow << 32) + (uint64_t)counter) * USEC_PER_SEC) /
+         freerun->frequency;
+
+  /* And return the value of the timer */
+
+  sec         = (uint32_t)(usec / USEC_PER_SEC);
+  ts->tv_sec  = sec;
+  ts->tv_nsec = (usec - (sec * USEC_PER_SEC)) * NSEC_PER_USEC;
+
+  tmrinfo("usec=%llu ts=(%u, %lu)\n",
+          usec, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec);
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stm32_freerun_uninitialize
+ *
+ * Description:
+ *   Stop the free-running timer and release all resources that it uses.
+ *
+ * Input Parameters:
+ *   freerun Caller allocated instance of the freerun state structure.  This
+ *           structure must have been previously initialized via a call to
+ *           stm32_freerun_initialize();
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned
+ *   on failure.
+ *
+ ****************************************************************************/
+
+int stm32_freerun_uninitialize(struct stm32_freerun_s *freerun)
+{
+  DEBUGASSERT(freerun && freerun->tch);
+
+  /* Now we can disable the timer interrupt and disable the timer. */
+
+  STM32_TIM_DISABLEINT(freerun->tch, 0);
+  STM32_TIM_SETMODE(freerun->tch, STM32_TIM_MODE_DISABLED);
+  STM32_TIM_SETISR(freerun->tch, NULL, 0);
+
+  /* Free the timer */
+
+  stm32_tim_deinit(freerun->tch);
+  freerun->tch = NULL;
+
+  g_freerun = NULL;
+  return OK;
+}
+
+#endif /* CONFIG_STM32_ONESHOT */
diff --git a/arch/arm/src/stm32/stm32_freerun.h b/arch/arm/src/stm32/stm32_freerun.h
new file mode 100644
index 0000000000..1eae58941b
--- /dev/null
+++ b/arch/arm/src/stm32/stm32_freerun.h
@@ -0,0 +1,157 @@
+/****************************************************************************
+ * arch/arm/src/stm32/stm32_freerun.h
+ *
+ *   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.
+ *
+ ****************************************************************************/
+
+#ifndef __ARCH_ARM_SRC_STM32_FREERUN_H
+#define __ARCH_ARM_SRC_STM32_FREERUN_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include 
+
+#include 
+#include 
+
+#include "stm32_tim.h"
+
+#ifdef CONFIG_STM32_FREERUN
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/* The freerun client must allocate an instance of this structure and called
+ * stm32_freerun_initialize() before using the freerun facilities.  The client
+ * should not access the contents of this structure directly since the
+ * contents are subject to change.
+ */
+
+struct stm32_freerun_s
+{
+  uint8_t chan;                    /* The timer/counter in use */
+  bool running;                    /* True: the timer is running */
+  uint32_t overflow;               /* Timer counter overflow */
+  FAR struct stm32_tim_dev_s *tch; /* Handle returned by stm32_tim_init() */
+  uint32_t frequency;
+};
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+#undef EXTERN
+#if defined(__cplusplus)
+#define EXTERN extern "C"
+extern "C"
+{
+#else
+#define EXTERN extern
+#endif
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stm32_freerun_initialize
+ *
+ * Description:
+ *   Initialize the freerun timer wrapper
+ *
+ * Input Parameters:
+ *   freerun    Caller allocated instance of the freerun state structure
+ *   chan       Timer counter channel to be used.
+ *   resolution The required resolution of the timer in units of
+ *              microseconds.  NOTE that the range is restricted to the
+ *              range of uint16_t (excluding zero).
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned
+ *   on failure.
+ *
+ ****************************************************************************/
+
+int stm32_freerun_initialize(struct stm32_freerun_s *freerun, int chan,
+                             uint16_t resolution);
+
+/****************************************************************************
+ * Name: stm32_freerun_counter
+ *
+ * Description:
+ *   Read the counter register of the free-running timer.
+ *
+ * Input Parameters:
+ *   freerun Caller allocated instance of the freerun state structure.  This
+ *           structure must have been previously initialized via a call to
+ *           stm32_freerun_initialize();
+ *   ts      The location in which to return the time remaining on the
+ *           oneshot timer.
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned
+ *   on failure.
+ *
+ ****************************************************************************/
+
+int stm32_freerun_counter(struct stm32_freerun_s *freerun,
+                          struct timespec *ts);
+
+/****************************************************************************
+ * Name: stm32_freerun_uninitialize
+ *
+ * Description:
+ *   Stop the free-running timer and release all resources that it uses.
+ *
+ * Input Parameters:
+ *   freerun Caller allocated instance of the freerun state structure.  This
+ *           structure must have been previously initialized via a call to
+ *           stm32_freerun_initialize();
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned
+ *   on failure.
+ *
+ ****************************************************************************/
+
+int stm32_freerun_uninitialize(struct stm32_freerun_s *freerun);
+
+#undef EXTERN
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CONFIG_STM32_FREERUN */
+#endif /* __ARCH_ARM_SRC_STM32_FREERUN_H */
diff --git a/arch/arm/src/stm32/stm32_oneshot.c b/arch/arm/src/stm32/stm32_oneshot.c
new file mode 100644
index 0000000000..db724ebfd1
--- /dev/null
+++ b/arch/arm/src/stm32/stm32_oneshot.c
@@ -0,0 +1,414 @@
+/****************************************************************************
+ * arch/arm/src/stm32/stm32_oneshot.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 names NuttX nor Atmel 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 "stm32_oneshot.h"
+
+#ifdef CONFIG_STM32_ONESHOT
+
+/****************************************************************************
+ * Private Date
+ ****************************************************************************/
+
+static struct stm32_oneshot_s *g_oneshot;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stm32_oneshot_handler
+ *
+ * Description:
+ *   Timer interrupt callback.  When the oneshot timer interrupt expires,
+ *   this function will be called.  It will forward the call to the next
+ *   level up.
+ *
+ * Input Parameters:
+ *   tch - The handle that represents the timer state
+ *   arg - An opaque argument provided when the interrupt was registered
+ *   sr  - The value of the timer interrupt status register at the time
+ *         that the interrupt occurred.
+ *
+ * Returned Value:
+ *   None
+ *
+ ****************************************************************************/
+
+static int stm32_oneshot_handler(int irq, void *context)
+{
+  struct stm32_oneshot_s *oneshot = g_oneshot;
+  oneshot_handler_t oneshot_handler;
+  void *oneshot_arg;
+
+  tmrinfo("Expired...\n");
+  DEBUGASSERT(oneshot != NULL && oneshot->handler);
+
+  /* The clock was stopped, but not disabled when the RC match occurred.
+   * Disable the TC now and disable any further interrupts.
+   */
+
+  STM32_TIM_SETMODE(oneshot->tch, STM32_TIM_MODE_DISABLED);
+  STM32_TIM_ACKINT(oneshot->tch, 0);
+  STM32_TIM_DISABLEINT(oneshot->tch, 0);
+
+  /* The timer is no longer running */
+
+  oneshot->running = false;
+
+  /* Forward the event, clearing out any vestiges */
+
+  oneshot_handler  = (oneshot_handler_t)oneshot->handler;
+  oneshot->handler = NULL;
+  oneshot_arg      = (void *)oneshot->arg;
+  oneshot->arg     = NULL;
+
+  oneshot_handler(oneshot_arg);
+  return OK;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stm32_oneshot_initialize
+ *
+ * Description:
+ *   Initialize the oneshot timer wrapper
+ *
+ * Input Parameters:
+ *   oneshot    Caller allocated instance of the oneshot state structure
+ *   chan       Timer counter channel to be used.
+ *   resolution The required resolution of the timer in units of
+ *              microseconds.  NOTE that the range is restricted to the
+ *              range of uint16_t (excluding zero).
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned
+ *   on failure.
+ *
+ ****************************************************************************/
+
+int stm32_oneshot_initialize(struct stm32_oneshot_s *oneshot, int chan,
+                           uint16_t resolution)
+{
+  uint32_t frequency;
+
+  tmrinfo("chan=%d resolution=%d usec\n", chan, resolution);
+  DEBUGASSERT(oneshot && resolution > 0);
+
+  /* Get the TC frequency the corresponds to the requested resolution */
+
+  frequency = USEC_PER_SEC / (uint32_t)resolution;
+  oneshot->frequency = frequency;
+
+  oneshot->tch = stm32_tim_init(chan);
+  if (!oneshot->tch)
+    {
+      tmrerr("ERROR: Failed to allocate TIM%d\n", chan);
+      return -EBUSY;
+    }
+
+  STM32_TIM_SETCLOCK(oneshot->tch, frequency);
+
+  /* Initialize the remaining fields in the state structure and return
+   * success.
+   */
+
+  oneshot->chan       = chan;
+  oneshot->running    = false;
+  oneshot->handler    = NULL;
+  oneshot->arg        = NULL;
+
+  g_oneshot           = oneshot;
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stm32_oneshot_max_delay
+ *
+ * Description:
+ *   Determine the maximum delay of the one-shot timer (in microseconds)
+ *
+ ****************************************************************************/
+
+int stm32_oneshot_max_delay(struct stm32_oneshot_s *oneshot, uint64_t *usec)
+{
+  DEBUGASSERT(oneshot != NULL && usec != NULL);
+
+  *usec = (uint64_t)(UINT32_MAX / oneshot->frequency) *
+          (uint64_t)USEC_PER_SEC;
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stm32_oneshot_start
+ *
+ * Description:
+ *   Start the oneshot timer
+ *
+ * Input Parameters:
+ *   oneshot Caller allocated instance of the oneshot state structure.  This
+ *           structure must have been previously initialized via a call to
+ *           stm32_oneshot_initialize();
+ *   handler The function to call when when the oneshot timer expires.
+ *   arg     An opaque argument that will accompany the callback.
+ *   ts      Provides the duration of the one shot timer.
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned
+ *   on failure.
+ *
+ ****************************************************************************/
+
+int stm32_oneshot_start(struct stm32_oneshot_s *oneshot,
+                        oneshot_handler_t handler, void *arg,
+                        const struct timespec *ts)
+{
+  uint64_t usec;
+  uint64_t period;
+  irqstate_t flags;
+
+  tmrinfo("handler=%p arg=%p, ts=(%lu, %lu)\n",
+         handler, arg, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec);
+  DEBUGASSERT(oneshot && handler && ts);
+  DEBUGASSERT(oneshot->tch);
+
+  /* Was the oneshot already running? */
+
+  flags = irqsave();
+  if (oneshot->running)
+    {
+      /* Yes.. then cancel it */
+
+      tmrinfo("Already running... cancelling\n");
+      (void)stm32_oneshot_cancel(oneshot, NULL);
+    }
+
+  /* Save the new handler and its argument */
+
+  oneshot->handler = handler;
+  oneshot->arg     = arg;
+
+  /* Express the delay in microseconds */
+
+  usec = (uint64_t)ts->tv_sec * USEC_PER_SEC +
+         (uint64_t)(ts->tv_nsec / NSEC_PER_USEC);
+
+  /* Get the timer counter frequency and determine the number of counts need
+   * to achieve the requested delay.
+   *
+   *   frequency = ticks / second
+   *   ticks     = seconds * frequency
+   *             = (usecs * frequency) / USEC_PER_SEC;
+   */
+
+  period = (usec * (uint64_t)oneshot->frequency) / USEC_PER_SEC;
+
+  tmrinfo("usec=%llu period=%08llx\n", usec, period);
+  DEBUGASSERT(period <= UINT32_MAX);
+
+  /* Set up to receive the callback when the interrupt occurs */
+
+  STM32_TIM_SETISR(oneshot->tch, stm32_oneshot_handler, 0);
+
+  /* Set timer period */
+
+  oneshot->period = (uint32_t)period;
+  STM32_TIM_SETPERIOD(oneshot->tch, (uint32_t)period);
+
+  /* Start the counter */
+
+  STM32_TIM_SETMODE(oneshot->tch, STM32_TIM_MODE_PULSE);
+
+  STM32_TIM_ACKINT(oneshot->tch, 0);
+  STM32_TIM_ENABLEINT(oneshot->tch, 0);
+
+  /* Enable interrupts.  We should get the callback when the interrupt
+   * occurs.
+   */
+
+  oneshot->running = true;
+  irqrestore(flags);
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stm32_oneshot_cancel
+ *
+ * Description:
+ *   Cancel the oneshot timer and return the time remaining on the timer.
+ *
+ *   NOTE: This function may execute at a high rate with no timer running (as
+ *   when pre-emption is enabled and disabled).
+ *
+ * Input Parameters:
+ *   oneshot Caller allocated instance of the oneshot state structure.  This
+ *           structure must have been previously initialized via a call to
+ *           stm32_oneshot_initialize();
+ *   ts      The location in which to return the time remaining on the
+ *           oneshot timer.  A time of zero is returned if the timer is
+ *           not running.  ts may be zero in which case the time remaining
+ *           is not returned.
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success.  A call to up_timer_cancel() when
+ *   the timer is not active should also return success; a negated errno
+ *   value is returned on any failure.
+ *
+ ****************************************************************************/
+
+int stm32_oneshot_cancel(struct stm32_oneshot_s *oneshot,
+                         struct timespec *ts)
+{
+  irqstate_t flags;
+  uint64_t usec;
+  uint64_t sec;
+  uint64_t nsec;
+  uint32_t count;
+  uint32_t period;
+
+  /* Was the timer running? */
+
+  flags = irqsave();
+  if (!oneshot->running)
+    {
+      /* No.. Just return zero timer remaining and successful cancellation.
+       * This function may execute at a high rate with no timer running
+       * (as when pre-emption is enabled and disabled).
+       */
+
+      ts->tv_sec  = 0;
+      ts->tv_nsec = 0;
+      irqrestore(flags);
+      return OK;
+    }
+
+  /* Yes.. Get the timer counter and period registers and stop the counter.
+   * If the counter expires while we are doing this, the counter clock will
+   * be stopped, but the clock will not be disabled.
+   *
+   * The expected behavior is that the the counter register will freezes at
+   * a value equal to the RC register when the timer expires.  The counter
+   * should have values between 0 and RC in all other cased.
+   *
+   * REVISIT:  This does not appear to be the case.
+   */
+
+  tmrinfo("Cancelling...\n");
+
+  count  = STM32_TIM_GETCOUNTER(oneshot->tch);
+  period = oneshot->period;
+
+  /* Now we can disable the interrupt and stop the timer. */
+
+  STM32_TIM_DISABLEINT(oneshot->tch, 0);
+  STM32_TIM_SETMODE(oneshot->tch, STM32_TIM_MODE_DISABLED);
+
+  oneshot->running = false;
+  oneshot->handler = NULL;
+  oneshot->arg     = NULL;
+  irqrestore(flags);
+
+  /* Did the caller provide us with a location to return the time
+   * remaining?
+   */
+
+  if (ts)
+    {
+      /* Yes.. then calculate and return the time remaining on the
+       * oneshot timer.
+       */
+
+      tmrinfo("period=%lu count=%lu\n",
+             (unsigned long)period, (unsigned long)count);
+
+      /* REVISIT: I am not certain why the timer counter value sometimes
+       * exceeds RC.  Might be a bug, or perhaps the counter does not stop
+       * in all cases.
+       */
+
+      if (count >= period)
+        {
+          /* No time remaining (?) */
+
+          ts->tv_sec  = 0;
+          ts->tv_nsec = 0;
+        }
+      else
+        {
+          /* The total time remaining is the difference.  Convert the that
+           * to units of microseconds.
+           *
+           *   frequency = ticks / second
+           *   seconds   = ticks * frequency
+           *   usecs     = (ticks * USEC_PER_SEC) / frequency;
+           */
+
+          usec        = (((uint64_t)(period - count)) * USEC_PER_SEC) /
+                        oneshot->frequency;
+
+          /* Return the time remaining in the correct form */
+
+          sec         = usec / USEC_PER_SEC;
+          nsec        = ((usec) - (sec * USEC_PER_SEC)) * NSEC_PER_USEC;
+
+          ts->tv_sec  = (time_t)sec;
+          ts->tv_nsec = (unsigned long)nsec;
+        }
+
+      tmrinfo("remaining (%lu, %lu)\n",
+             (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec);
+    }
+
+  return OK;
+}
+
+#endif /* CONFIG_STM32_ONESHOT */
diff --git a/arch/arm/src/stm32/stm32_oneshot.h b/arch/arm/src/stm32/stm32_oneshot.h
new file mode 100644
index 0000000000..bff2131939
--- /dev/null
+++ b/arch/arm/src/stm32/stm32_oneshot.h
@@ -0,0 +1,189 @@
+/****************************************************************************
+ * arch/arm/src/stm32/stm32_oneshot.h
+ *
+ *   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.
+ *
+ ****************************************************************************/
+
+#ifndef __ARCH_ARM_SRC_STM32_ONESHOT_H
+#define __ARCH_ARM_SRC_STM32_ONESHOT_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include 
+
+#include 
+#include 
+
+#include "stm32_tim.h"
+
+#ifdef CONFIG_STM32_ONESHOT
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/* This describes the callback function that will be invoked when the oneshot
+ * timer expires.  The oneshot fires, the client will receive:
+ *
+ *   arg - The opaque argument provided when the interrupt was registered
+ */
+
+typedef void (*oneshot_handler_t)(void *arg);
+
+/* The oneshot client must allocate an instance of this structure and called
+ * stm32_oneshot_initialize() before using the oneshot facilities.  The client
+ * should not access the contents of this structure directly since the
+ * contents are subject to change.
+ */
+
+struct stm32_oneshot_s
+{
+  uint8_t chan;                       /* The timer/counter in use */
+  volatile bool running;              /* True: the timer is running */
+  FAR struct stm32_tim_dev_s *tch;    /* Pointer returned by
+                                       * stm32_tim_init() */
+  volatile oneshot_handler_t handler; /* Oneshot expiration callback */
+  volatile void *arg;                 /* The argument that will accompany
+                                       * the callback */
+  uint32_t frequency;
+  uint32_t period;
+};
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+#undef EXTERN
+#if defined(__cplusplus)
+#define EXTERN extern "C"
+extern "C"
+{
+#else
+#define EXTERN extern
+#endif
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stm32_oneshot_initialize
+ *
+ * Description:
+ *   Initialize the oneshot timer wrapper
+ *
+ * Input Parameters:
+ *   oneshot    Caller allocated instance of the oneshot state structure
+ *   chan       Timer counter channel to be used.
+ *   resolution The required resolution of the timer in units of
+ *              microseconds.  NOTE that the range is restricted to the
+ *              range of uint16_t (excluding zero).
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned
+ *   on failure.
+ *
+ ****************************************************************************/
+
+int stm32_oneshot_initialize(struct stm32_oneshot_s *oneshot, int chan,
+                             uint16_t resolution);
+
+/****************************************************************************
+ * Name: stm32_oneshot_max_delay
+ *
+ * Description:
+ *   Determine the maximum delay of the one-shot timer (in microseconds)
+ *
+ ****************************************************************************/
+
+int stm32_oneshot_max_delay(struct stm32_oneshot_s *oneshot, uint64_t *usec);
+
+/****************************************************************************
+ * Name: stm32_oneshot_start
+ *
+ * Description:
+ *   Start the oneshot timer
+ *
+ * Input Parameters:
+ *   oneshot Caller allocated instance of the oneshot state structure.  This
+ *           structure must have been previously initialized via a call to
+ *           stm32_oneshot_initialize();
+ *   handler The function to call when when the oneshot timer expires.
+ *   arg     An opaque argument that will accompany the callback.
+ *   ts      Provides the duration of the one shot timer.
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned
+ *   on failure.
+ *
+ ****************************************************************************/
+
+int stm32_oneshot_start(struct stm32_oneshot_s *oneshot,
+                        oneshot_handler_t handler, void *arg,
+                        const struct timespec *ts);
+
+/****************************************************************************
+ * Name: stm32_oneshot_cancel
+ *
+ * Description:
+ *   Cancel the oneshot timer and return the time remaining on the timer.
+ *
+ *   NOTE: This function may execute at a high rate with no timer running (as
+ *   when pre-emption is enabled and disabled).
+ *
+ * Input Parameters:
+ *   oneshot Caller allocated instance of the oneshot state structure.  This
+ *           structure must have been previously initialized via a call to
+ *           stm32_oneshot_initialize();
+ *   ts      The location in which to return the time remaining on the
+ *           oneshot timer.  A time of zero is returned if the timer is
+ *           not running.
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success.  A call to up_timer_cancel() when
+ *   the timer is not active should also return success; a negated errno
+ *   value is returned on any failure.
+ *
+ ****************************************************************************/
+
+int stm32_oneshot_cancel(struct stm32_oneshot_s *oneshot,
+                         struct timespec *ts);
+
+#undef EXTERN
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CONFIG_STM32_ONESHOT */
+#endif /* __ARCH_ARM_SRC_STM32_ONESHOT_H */
diff --git a/arch/arm/src/stm32/stm32_tickless.c b/arch/arm/src/stm32/stm32_tickless.c
new file mode 100644
index 0000000000..eadef5ce90
--- /dev/null
+++ b/arch/arm/src/stm32/stm32_tickless.c
@@ -0,0 +1,350 @@
+/****************************************************************************
+ * arch/arm/src/stm32/stm32_tickless.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.
+ *
+ ****************************************************************************/
+/****************************************************************************
+ * Tickless OS Support.
+ *
+ * When CONFIG_SCHED_TICKLESS is enabled, all support for timer interrupts
+ * is suppressed and the platform specific code is expected to provide the
+ * following custom functions.
+ *
+ *   void up_timer_initialize(void): Initializes the timer facilities.
+ *     Called early in the initialization sequence (by up_intialize()).
+ *   int up_timer_gettime(FAR struct timespec *ts):  Returns the current
+ *     time from the platform specific time source.
+ *   int up_timer_cancel(void):  Cancels the interval timer.
+ *   int up_timer_start(FAR const struct timespec *ts): Start (or re-starts)
+ *     the interval timer.
+ *
+ * The RTOS will provide the following interfaces for use by the platform-
+ * specific interval timer implementation:
+ *
+ *   void sched_timer_expiration(void):  Called by the platform-specific
+ *     logic when the interval timer expires.
+ *
+ ****************************************************************************/
+/****************************************************************************
+ * SAM34 Timer Usage
+ *
+ * This current implementation uses two timers:  A one-shot timer to provide
+ * the timed events and a free running timer to provide the current time.
+ * Since timers are a limited resource, that could be an issue on some
+ * systems.
+ *
+ * We could do the job with a single timer if we were to keep the single
+ * timer in a free-running at all times.  The STM32 timer/counters have
+ * 16-bit/32-bit counters with the capability to generate a compare interrupt
+ * when the timer matches a compare value but also to continue counting
+ * without stopping (giving another, different interrupt when the timer
+ * rolls over from 0xffffffff to zero).  So we could potentially just set
+ * the compare at the number of ticks you want PLUS the current value of
+ * timer.  Then you could have both with a single timer:  An interval timer
+ * and a free-running counter with the same timer!
+ *
+ * Patches are welcome!
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include 
+
+#include 
+#include 
+
+#include 
+#include 
+
+#include "stm32_oneshot.h"
+#include "stm32_freerun.h"
+
+#ifdef CONFIG_SCHED_TICKLESS
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#ifndef CONFIG_STM32_ONESHOT
+#  error CONFIG_STM32_ONESHOT must be selected for the Tickless OS option
+#endif
+
+#ifndef CONFIG_STM32_FREERUN
+#  error CONFIG_STM32_FREERUN must be selected for the Tickless OS option
+#endif
+
+#ifndef CONFIG_STM32_TICKLESS_FREERUN
+#  error CONFIG_STM32_TICKLESS_FREERUN must be selected for the Tickless OS option
+#endif
+
+#ifndef CONFIG_STM32_TICKLESS_ONESHOT
+#  error CONFIG_STM32_TICKLESS_ONESHOT must be selected for the Tickless OS option
+#endif
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct stm32_tickless_s
+{
+  struct stm32_oneshot_s oneshot;
+  struct stm32_freerun_s freerun;
+};
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static struct stm32_tickless_s g_tickless;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stm32_oneshot_handler
+ *
+ * Description:
+ *   Called when the one shot timer expires
+ *
+ * Input Parameters:
+ *   None
+ *
+ * Returned Value:
+ *   None
+ *
+ * Assumptions:
+ *   Called early in the initialization sequence before any special
+ *   concurrency protections are required.
+ *
+ ****************************************************************************/
+
+static void stm32_oneshot_handler(void *arg)
+{
+  tmrinfo("Expired...\n");
+  sched_timer_expiration();
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: up_timer_initialize
+ *
+ * Description:
+ *   Initializes all platform-specific timer facilities.  This function is
+ *   called early in the initialization sequence by up_intialize().
+ *   On return, the current up-time should be available from
+ *   up_timer_gettime() and the interval timer is ready for use (but not
+ *   actively timing.
+ *
+ *   Provided by platform-specific code and called from the architecture-
+ *   specific logic.
+ *
+ * Input Parameters:
+ *   None
+ *
+ * Returned Value:
+ *   None
+ *
+ * Assumptions:
+ *   Called early in the initialization sequence before any special
+ *   concurrency protections are required.
+ *
+ ****************************************************************************/
+
+void up_timer_initialize(void)
+{
+#ifdef CONFIG_SCHED_TICKLESS_LIMIT_MAX_SLEEP
+  uint64_t max_delay;
+#endif
+  int ret;
+
+  /* Initialize the one-shot timer */
+
+  ret = stm32_oneshot_initialize(&g_tickless.oneshot,
+                                 CONFIG_STM32_TICKLESS_ONESHOT,
+                                 CONFIG_USEC_PER_TICK);
+  if (ret < 0)
+    {
+      tmrerr("ERROR: stm32_oneshot_initialize failed\n");
+      PANIC();
+    }
+
+#ifdef CONFIG_SCHED_TICKLESS_LIMIT_MAX_SLEEP
+  /* Get the maximum delay of the one-shot timer in microseconds */
+
+  ret = stm32_oneshot_max_delay(&g_tickless.oneshot, &max_delay);
+  if (ret < 0)
+    {
+      tmrerr("ERROR: stm32_oneshot_max_delay failed\n");
+      PANIC();
+    }
+
+  /* Convert this to configured clock ticks for use by the OS timer logic */
+
+  max_delay /= CONFIG_USEC_PER_TICK;
+  if (max_delay > UINT32_MAX)
+    {
+      g_oneshot_maxticks = UINT32_MAX;
+    }
+  else
+    {
+      g_oneshot_maxticks = max_delay;
+    }
+#endif
+
+  /* Initialize the free-running timer */
+
+  ret = stm32_freerun_initialize(&g_tickless.freerun,
+                                 CONFIG_STM32_TICKLESS_FREERUN,
+                                 CONFIG_USEC_PER_TICK);
+  if (ret < 0)
+    {
+      tmrerr("ERROR: stm32_freerun_initialize failed\n");
+      PANIC();
+    }
+}
+
+/****************************************************************************
+ * Name: up_timer_gettime
+ *
+ * Description:
+ *   Return the elapsed time since power-up (or, more correctly, since
+ *   up_timer_initialize() was called).  This function is functionally
+ *   equivalent to:
+ *
+ *      int clock_gettime(clockid_t clockid, FAR struct timespec *ts);
+ *
+ *   when clockid is CLOCK_MONOTONIC.
+ *
+ *   This function provides the basis for reporting the current time and
+ *   also is used to eliminate error build-up from small errors in interval
+ *   time calculations.
+ *
+ *   Provided by platform-specific code and called from the RTOS base code.
+ *
+ * Input Parameters:
+ *   ts - Provides the location in which to return the up-time.
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned on
+ *   any failure.
+ *
+ * Assumptions:
+ *   Called from the the normal tasking context.  The implementation must
+ *   provide whatever mutual exclusion is necessary for correct operation.
+ *   This can include disabling interrupts in order to assure atomic register
+ *   operations.
+ *
+ ****************************************************************************/
+
+int up_timer_gettime(FAR struct timespec *ts)
+{
+  return stm32_freerun_counter(&g_tickless.freerun, ts);
+}
+
+/****************************************************************************
+ * Name: up_timer_cancel
+ *
+ * Description:
+ *   Cancel the interval timer and return the time remaining on the timer.
+ *   These two steps need to be as nearly atomic as possible.
+ *   sched_timer_expiration() will not be called unless the timer is
+ *   restarted with up_timer_start().
+ *
+ *   If, as a race condition, the timer has already expired when this
+ *   function is called, then that pending interrupt must be cleared so
+ *   that up_timer_start() and the remaining time of zero should be
+ *   returned.
+ *
+ *   NOTE: This function may execute at a high rate with no timer running (as
+ *   when pre-emption is enabled and disabled).
+ *
+ *   Provided by platform-specific code and called from the RTOS base code.
+ *
+ * Input Parameters:
+ *   ts - Location to return the remaining time.  Zero should be returned
+ *        if the timer is not active.  ts may be zero in which case the
+ *        time remaining is not returned.
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success.  A call to up_timer_cancel() when
+ *   the timer is not active should also return success; a negated errno
+ *   value is returned on any failure.
+ *
+ * Assumptions:
+ *   May be called from interrupt level handling or from the normal tasking
+ *   level.  Interrupts may need to be disabled internally to assure
+ *   non-reentrancy.
+ *
+ ****************************************************************************/
+
+int up_timer_cancel(FAR struct timespec *ts)
+{
+  return stm32_oneshot_cancel(&g_tickless.oneshot, ts);
+}
+
+/****************************************************************************
+ * Name: up_timer_start
+ *
+ * Description:
+ *   Start the interval timer.  sched_timer_expiration() will be
+ *   called at the completion of the timeout (unless up_timer_cancel
+ *   is called to stop the timing.
+ *
+ *   Provided by platform-specific code and called from the RTOS base code.
+ *
+ * Input Parameters:
+ *   ts - Provides the time interval until sched_timer_expiration() is
+ *        called.
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned on
+ *   any failure.
+ *
+ * Assumptions:
+ *   May be called from interrupt level handling or from the normal tasking
+ *   level.  Interrupts may need to be disabled internally to assure
+ *   non-reentrancy.
+ *
+ ****************************************************************************/
+
+int up_timer_start(FAR const struct timespec *ts)
+{
+  return stm32_oneshot_start(&g_tickless.oneshot, stm32_oneshot_handler, NULL, ts);
+}
+#endif /* CONFIG_SCHED_TICKLESS */
diff --git a/arch/arm/src/stm32/stm32_tim.c b/arch/arm/src/stm32/stm32_tim.c
index 62e2783e3a..ee19ea1390 100644
--- a/arch/arm/src/stm32/stm32_tim.c
+++ b/arch/arm/src/stm32/stm32_tim.c
@@ -538,6 +538,12 @@ static void stm32_tim_setperiod(FAR struct stm32_tim_dev_s *dev,
   stm32_putreg32(dev, STM32_BTIM_ARR_OFFSET, period);
 }
 
+static uint32_t stm32_tim_getcounter(FAR struct stm32_tim_dev_s *dev)
+{
+  DEBUGASSERT(dev != NULL);
+  return stm32_getreg32(dev, STM32_BTIM_CNT_OFFSET);
+}
+
 static int stm32_tim_setisr(FAR struct stm32_tim_dev_s *dev,
                             int (*handler)(int irq, void *context),
                             int source)
@@ -679,6 +685,12 @@ static void stm32_tim_ackint(FAR struct stm32_tim_dev_s *dev, int source)
   stm32_putreg16(dev, STM32_BTIM_SR_OFFSET, ~ATIM_SR_UIF);
 }
 
+static int stm32_tim_checkint(FAR struct stm32_tim_dev_s *dev, int source)
+{
+  uint16_t regval = stm32_getreg16(dev, STM32_BTIM_SR_OFFSET);
+  return (regval & ATIM_SR_UIF) ? 1 : 0;
+}
+
 /************************************************************************************
  * General Functions
  ************************************************************************************/
@@ -1324,16 +1336,18 @@ static int stm32_tim_getcapture(FAR struct stm32_tim_dev_s *dev, uint8_t channel
 
 struct stm32_tim_ops_s stm32_tim_ops =
 {
-  .setmode        = &stm32_tim_setmode,
-  .setclock       = &stm32_tim_setclock,
-  .setperiod      = &stm32_tim_setperiod,
-  .setchannel     = &stm32_tim_setchannel,
-  .setcompare     = &stm32_tim_setcompare,
-  .getcapture     = &stm32_tim_getcapture,
-  .setisr         = &stm32_tim_setisr,
-  .enableint      = &stm32_tim_enableint,
-  .disableint     = &stm32_tim_disableint,
-  .ackint         = &stm32_tim_ackint
+  .setmode    = stm32_tim_setmode,
+  .setclock   = stm32_tim_setclock,
+  .setperiod  = stm32_tim_setperiod,
+  .getcounter = stm32_tim_getcounter,
+  .setchannel = stm32_tim_setchannel,
+  .setcompare = stm32_tim_setcompare,
+  .getcapture = stm32_tim_getcapture,
+  .setisr     = stm32_tim_setisr,
+  .enableint  = stm32_tim_enableint,
+  .disableint = stm32_tim_disableint,
+  .ackint     = stm32_tim_ackint,
+  .checkint   = stm32_tim_checkint,
 };
 
 #ifdef CONFIG_STM32_TIM1
diff --git a/arch/arm/src/stm32/stm32_tim.h b/arch/arm/src/stm32/stm32_tim.h
index 2d3b01a683..86da6d33bb 100644
--- a/arch/arm/src/stm32/stm32_tim.h
+++ b/arch/arm/src/stm32/stm32_tim.h
@@ -6,7 +6,7 @@
  *
  * With modifications and updates by:
  *
- *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011-2012, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -58,6 +58,7 @@
 #define STM32_TIM_SETMODE(d,mode)       ((d)->ops->setmode(d,mode))
 #define STM32_TIM_SETCLOCK(d,freq)      ((d)->ops->setclock(d,freq))
 #define STM32_TIM_SETPERIOD(d,period)   ((d)->ops->setperiod(d,period))
+#define STM32_TIM_GETCOUNTER(d)         ((d)->ops->getcounter(d))
 #define STM32_TIM_SETCHANNEL(d,ch,mode) ((d)->ops->setchannel(d,ch,mode))
 #define STM32_TIM_SETCOMPARE(d,ch,comp) ((d)->ops->setcompare(d,ch,comp))
 #define STM32_TIM_GETCAPTURE(d,ch)      ((d)->ops->getcapture(d,ch))
@@ -65,6 +66,7 @@
 #define STM32_TIM_ENABLEINT(d,s)        ((d)->ops->enableint(d,s))
 #define STM32_TIM_DISABLEINT(d,s)       ((d)->ops->disableint(d,s))
 #define STM32_TIM_ACKINT(d,s)           ((d)->ops->ackint(d,s))
+#define STM32_TIM_CHECKINT(d,s)         ((d)->ops->checkint(d,s))
 
 /************************************************************************************
  * Public Types
@@ -159,6 +161,8 @@ struct stm32_tim_ops_s
   int  (*setclock)(FAR struct stm32_tim_dev_s *dev, uint32_t freq);
   void (*setperiod)(FAR struct stm32_tim_dev_s *dev, uint32_t period);
 
+  uint32_t (*getcounter)(FAR struct stm32_tim_dev_s *dev);
+
   /* General and Advanced Timers Adds */
 
   int  (*setchannel)(FAR struct stm32_tim_dev_s *dev, uint8_t channel, stm32_tim_channel_t mode);
@@ -171,6 +175,7 @@ struct stm32_tim_ops_s
   void (*enableint)(FAR struct stm32_tim_dev_s *dev, int source);
   void (*disableint)(FAR struct stm32_tim_dev_s *dev, int source);
   void (*ackint)(FAR struct stm32_tim_dev_s *dev, int source);
+  int  (*checkint)(FAR struct stm32_tim_dev_s *dev, int source);
 };
 
 /************************************************************************************
-- 
GitLab


From 711f3318c5b6a5ee22c400aa6ec6501ebb0e272b Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Wed, 6 Jul 2016 13:36:17 -0600
Subject: [PATCH 159/229] STM32 timer: Reorganize to conform better with the
 NuttX coding style

---
 arch/arm/src/stm32/stm32_tim.c | 504 ++++++++++++++++++++-------------
 arch/arm/src/stm32/stm32_tim.h |  10 +-
 2 files changed, 317 insertions(+), 197 deletions(-)

diff --git a/arch/arm/src/stm32/stm32_tim.c b/arch/arm/src/stm32/stm32_tim.c
index ee19ea1390..23b415ddff 100644
--- a/arch/arm/src/stm32/stm32_tim.c
+++ b/arch/arm/src/stm32/stm32_tim.c
@@ -64,8 +64,9 @@
 #include "stm32_tim.h"
 
 /************************************************************************************
- * Private Types
+ * Pre-processor Definitions
  ************************************************************************************/
+
 /* Configuration ********************************************************************/
 /* Timer devices may be used for different purposes.  Such special purposes include:
  *
@@ -284,16 +285,218 @@
 
 struct stm32_tim_priv_s
 {
-  struct stm32_tim_ops_s *ops;
-  stm32_tim_mode_t        mode;
-  uint32_t                base;   /* TIMn base address */
+  const struct stm32_tim_ops_s *ops;
+  stm32_tim_mode_t mode;
+  uint32_t base;                      /* TIMn base address */
 };
 
+/************************************************************************************
+ * Private Function prototypes
+ ************************************************************************************/
+
+/* Timer methods */
+
+static int stm32_tim_setmode(FAR struct stm32_tim_dev_s *dev, stm32_tim_mode_t mode);
+static int stm32_tim_setclock(FAR struct stm32_tim_dev_s *dev, uint32_t freq);
+static void stm32_tim_setperiod(FAR struct stm32_tim_dev_s *dev,
+                                uint32_t period);
+static uint32_t stm32_tim_getcounter(FAR struct stm32_tim_dev_s *dev);
+static int stm32_tim_setchannel(FAR struct stm32_tim_dev_s *dev, uint8_t channel,
+                                stm32_tim_channel_t mode);
+static int stm32_tim_setcompare(FAR struct stm32_tim_dev_s *dev, uint8_t channel,
+                                uint32_t compare);
+static int stm32_tim_getcapture(FAR struct stm32_tim_dev_s *dev, uint8_t channel);
+static int stm32_tim_setisr(FAR struct stm32_tim_dev_s *dev,
+                            int (*handler)(int irq, void *context),
+                            int source);
+static void stm32_tim_enableint(FAR struct stm32_tim_dev_s *dev, int source);
+static void stm32_tim_disableint(FAR struct stm32_tim_dev_s *dev, int source);
+static void stm32_tim_ackint(FAR struct stm32_tim_dev_s *dev, int source);
+static int stm32_tim_checkint(FAR struct stm32_tim_dev_s *dev, int source);
+
+/************************************************************************************
+ * Private Data
+ ************************************************************************************/
+
+static const struct stm32_tim_ops_s stm32_tim_ops =
+{
+  .setmode    = stm32_tim_setmode,
+  .setclock   = stm32_tim_setclock,
+  .setperiod  = stm32_tim_setperiod,
+  .getcounter = stm32_tim_getcounter,
+  .setchannel = stm32_tim_setchannel,
+  .setcompare = stm32_tim_setcompare,
+  .getcapture = stm32_tim_getcapture,
+  .setisr     = stm32_tim_setisr,
+  .enableint  = stm32_tim_enableint,
+  .disableint = stm32_tim_disableint,
+  .ackint     = stm32_tim_ackint,
+  .checkint   = stm32_tim_checkint,
+};
+
+#ifdef CONFIG_STM32_TIM1
+struct stm32_tim_priv_s stm32_tim1_priv =
+{
+  .ops        = &stm32_tim_ops,
+  .mode       = STM32_TIM_MODE_UNUSED,
+  .base       = STM32_TIM1_BASE,
+};
+#endif
+#ifdef CONFIG_STM32_TIM2
+struct stm32_tim_priv_s stm32_tim2_priv =
+{
+  .ops        = &stm32_tim_ops,
+  .mode       = STM32_TIM_MODE_UNUSED,
+  .base       = STM32_TIM2_BASE,
+};
+#endif
+
+#ifdef CONFIG_STM32_TIM3
+struct stm32_tim_priv_s stm32_tim3_priv =
+{
+  .ops        = &stm32_tim_ops,
+  .mode       = STM32_TIM_MODE_UNUSED,
+  .base       = STM32_TIM3_BASE,
+};
+#endif
+
+#ifdef CONFIG_STM32_TIM4
+struct stm32_tim_priv_s stm32_tim4_priv =
+{
+  .ops        = &stm32_tim_ops,
+  .mode       = STM32_TIM_MODE_UNUSED,
+  .base       = STM32_TIM4_BASE,
+};
+#endif
+
+#ifdef CONFIG_STM32_TIM5
+struct stm32_tim_priv_s stm32_tim5_priv =
+{
+  .ops        = &stm32_tim_ops,
+  .mode       = STM32_TIM_MODE_UNUSED,
+  .base       = STM32_TIM5_BASE,
+};
+#endif
+
+#ifdef CONFIG_STM32_TIM6
+struct stm32_tim_priv_s stm32_tim6_priv =
+{
+  .ops        = &stm32_tim_ops,
+  .mode       = STM32_TIM_MODE_UNUSED,
+  .base       = STM32_TIM6_BASE,
+};
+#endif
+
+#ifdef CONFIG_STM32_TIM7
+struct stm32_tim_priv_s stm32_tim7_priv =
+{
+  .ops        = &stm32_tim_ops,
+  .mode       = STM32_TIM_MODE_UNUSED,
+  .base       = STM32_TIM7_BASE,
+};
+#endif
+
+#ifdef CONFIG_STM32_TIM8
+struct stm32_tim_priv_s stm32_tim8_priv =
+{
+  .ops        = &stm32_tim_ops,
+  .mode       = STM32_TIM_MODE_UNUSED,
+  .base       = STM32_TIM8_BASE,
+};
+#endif
+
+#ifdef CONFIG_STM32_TIM9
+struct stm32_tim_priv_s stm32_tim9_priv =
+{
+  .ops        = &stm32_tim_ops,
+  .mode       = STM32_TIM_MODE_UNUSED,
+  .base       = STM32_TIM9_BASE,
+};
+#endif
+
+#ifdef CONFIG_STM32_TIM10
+struct stm32_tim_priv_s stm32_tim10_priv =
+{
+  .ops        = &stm32_tim_ops,
+  .mode       = STM32_TIM_MODE_UNUSED,
+  .base       = STM32_TIM10_BASE,
+};
+#endif
+
+#ifdef CONFIG_STM32_TIM11
+struct stm32_tim_priv_s stm32_tim11_priv =
+{
+  .ops        = &stm32_tim_ops,
+  .mode       = STM32_TIM_MODE_UNUSED,
+  .base       = STM32_TIM11_BASE,
+};
+#endif
+
+#ifdef CONFIG_STM32_TIM12
+struct stm32_tim_priv_s stm32_tim12_priv =
+{
+  .ops        = &stm32_tim_ops,
+  .mode       = STM32_TIM_MODE_UNUSED,
+  .base       = STM32_TIM12_BASE,
+};
+#endif
+
+#ifdef CONFIG_STM32_TIM13
+struct stm32_tim_priv_s stm32_tim13_priv =
+{
+  .ops        = &stm32_tim_ops,
+  .mode       = STM32_TIM_MODE_UNUSED,
+  .base       = STM32_TIM13_BASE,
+};
+#endif
+
+#ifdef CONFIG_STM32_TIM14
+struct stm32_tim_priv_s stm32_tim14_priv =
+{
+  .ops        = &stm32_tim_ops,
+  .mode       = STM32_TIM_MODE_UNUSED,
+  .base       = STM32_TIM14_BASE,
+};
+#endif
+
+#ifdef CONFIG_STM32_TIM15
+struct stm32_tim_priv_s stm32_tim15_priv =
+{
+  .ops        = &stm32_tim_ops,
+  .mode       = STM32_TIM_MODE_UNUSED,
+  .base       = STM32_TIM15_BASE,
+};
+#endif
+
+#ifdef CONFIG_STM32_TIM16
+struct stm32_tim_priv_s stm32_tim16_priv =
+{
+  .ops        = &stm32_tim_ops,
+  .mode       = STM32_TIM_MODE_UNUSED,
+  .base       = STM32_TIM16_BASE,
+};
+#endif
+
+#ifdef CONFIG_STM32_TIM17
+struct stm32_tim_priv_s stm32_tim17_priv =
+{
+  .ops        = &stm32_tim_ops,
+  .mode       = STM32_TIM_MODE_UNUSED,
+  .base       = STM32_TIM17_BASE,
+};
+#endif
+
 /************************************************************************************
  * Private Functions
  ************************************************************************************/
 
-/* Get a 16-bit register value by offset */
+/************************************************************************************
+ * Name: stm32_getreg16
+ *
+ * Description:
+ *   Get a 16-bit register value by offset
+ *
+ ************************************************************************************/
 
 static inline uint16_t stm32_getreg16(FAR struct stm32_tim_dev_s *dev,
                                       uint8_t offset)
@@ -301,7 +504,13 @@ static inline uint16_t stm32_getreg16(FAR struct stm32_tim_dev_s *dev,
   return getreg16(((struct stm32_tim_priv_s *)dev)->base + offset);
 }
 
-/* Put a 16-bit register value by offset */
+/************************************************************************************
+ * Name: stm32_putreg16
+ *
+ * Description:
+ *   Put a 16-bit register value by offset
+ *
+ ************************************************************************************/
 
 static inline void stm32_putreg16(FAR struct stm32_tim_dev_s *dev, uint8_t offset,
                                   uint16_t value)
@@ -309,7 +518,13 @@ static inline void stm32_putreg16(FAR struct stm32_tim_dev_s *dev, uint8_t offse
   putreg16(value, ((struct stm32_tim_priv_s *)dev)->base + offset);
 }
 
-/* Modify a 16-bit register value by offset */
+/************************************************************************************
+ * Name: stm32_modifyreg16
+ *
+ * Description:
+ *   Modify a 16-bit register value by offset
+ *
+ ************************************************************************************/
 
 static inline void stm32_modifyreg16(FAR struct stm32_tim_dev_s *dev,
                                      uint8_t offset, uint16_t clearbits,
@@ -318,9 +533,14 @@ static inline void stm32_modifyreg16(FAR struct stm32_tim_dev_s *dev,
   modifyreg16(((struct stm32_tim_priv_s *)dev)->base + offset, clearbits, setbits);
 }
 
-/* Get a 32-bit register value by offset.  This applies only for the STM32 F4
- * 32-bit registers (CNT, ARR, CRR1-4) in the 32-bit timers TIM2-5.
- */
+/************************************************************************************
+ * Name: stm32_getreg32
+ *
+ * Description:
+ *   Get a 32-bit register value by offset.  This applies only for the STM32 F4
+ *   32-bit registers (CNT, ARR, CRR1-4) in the 32-bit timers TIM2-5.
+ *
+ ************************************************************************************/
 
 static inline uint32_t stm32_getreg32(FAR struct stm32_tim_dev_s *dev,
                                       uint8_t offset)
@@ -328,9 +548,14 @@ static inline uint32_t stm32_getreg32(FAR struct stm32_tim_dev_s *dev,
   return getreg32(((struct stm32_tim_priv_s *)dev)->base + offset);
 }
 
-/* Put a 32-bit register value by offset.  This applies only for the STM32 F4
- * 32-bit registers (CNT, ARR, CRR1-4) in the 32-bit timers TIM2-5.
- */
+/************************************************************************************
+ * Name: stm32_putreg32
+ *
+ * Description:
+ *   Put a 32-bit register value by offset.  This applies only for the STM32 F4
+ *   32-bit registers (CNT, ARR, CRR1-4) in the 32-bit timers TIM2-5.
+ *
+ ************************************************************************************/
 
 static inline void stm32_putreg32(FAR struct stm32_tim_dev_s *dev, uint8_t offset,
                                   uint32_t value)
@@ -338,6 +563,10 @@ static inline void stm32_putreg32(FAR struct stm32_tim_dev_s *dev, uint8_t offse
   putreg32(value, ((struct stm32_tim_priv_s *)dev)->base + offset);
 }
 
+/************************************************************************************
+ * Name: stm32_tim_reload_counter
+ ************************************************************************************/
+
 static void stm32_tim_reload_counter(FAR struct stm32_tim_dev_s *dev)
 {
   uint16_t val = stm32_getreg16(dev, STM32_BTIM_EGR_OFFSET);
@@ -345,6 +574,10 @@ static void stm32_tim_reload_counter(FAR struct stm32_tim_dev_s *dev)
   stm32_putreg16(dev, STM32_BTIM_EGR_OFFSET, val);
 }
 
+/************************************************************************************
+ * Name: stm32_tim_enable
+ ************************************************************************************/
+
 static void stm32_tim_enable(FAR struct stm32_tim_dev_s *dev)
 {
   uint16_t val = stm32_getreg16(dev, STM32_BTIM_CR1_OFFSET);
@@ -353,6 +586,10 @@ static void stm32_tim_enable(FAR struct stm32_tim_dev_s *dev)
   stm32_putreg16(dev, STM32_BTIM_CR1_OFFSET, val);
 }
 
+/************************************************************************************
+ * Name: stm32_tim_disable
+ ************************************************************************************/
+
 static void stm32_tim_disable(FAR struct stm32_tim_dev_s *dev)
 {
   uint16_t val = stm32_getreg16(dev, STM32_BTIM_CR1_OFFSET);
@@ -360,7 +597,13 @@ static void stm32_tim_disable(FAR struct stm32_tim_dev_s *dev)
   stm32_putreg16(dev, STM32_BTIM_CR1_OFFSET, val);
 }
 
-/* Reset timer into system default state, but do not affect output/input pins */
+/************************************************************************************
+ * Name: stm32_tim_reset
+ *
+ * Description:
+ *   Reset timer into system default state, but do not affect output/input pins
+ *
+ ************************************************************************************/
 
 static void stm32_tim_reset(FAR struct stm32_tim_dev_s *dev)
 {
@@ -368,6 +611,10 @@ static void stm32_tim_reset(FAR struct stm32_tim_dev_s *dev)
   stm32_tim_disable(dev);
 }
 
+/************************************************************************************
+ * Name: stm32_tim_gpioconfig
+ ************************************************************************************/
+
 #if defined(HAVE_TIM1_GPIOCONFIG)||defined(HAVE_TIM2_GPIOCONFIG)||\
     defined(HAVE_TIM3_GPIOCONFIG)||defined(HAVE_TIM4_GPIOCONFIG)||\
     defined(HAVE_TIM5_GPIOCONFIG)||defined(HAVE_TIM8_GPIOCONFIG)
@@ -387,7 +634,7 @@ static void stm32_tim_gpioconfig(uint32_t cfg, stm32_tim_channel_t mode)
 #endif
 
 /************************************************************************************
- * Basic Functions
+ * Name: stm32_tim_setclock
  ************************************************************************************/
 
 static int stm32_tim_setclock(FAR struct stm32_tim_dev_s *dev, uint32_t freq)
@@ -531,6 +778,10 @@ static int stm32_tim_setclock(FAR struct stm32_tim_dev_s *dev, uint32_t freq)
   return prescaler;
 }
 
+/************************************************************************************
+ * Name: stm32_tim_setperiod
+ ************************************************************************************/
+
 static void stm32_tim_setperiod(FAR struct stm32_tim_dev_s *dev,
                                 uint32_t period)
 {
@@ -538,12 +789,20 @@ static void stm32_tim_setperiod(FAR struct stm32_tim_dev_s *dev,
   stm32_putreg32(dev, STM32_BTIM_ARR_OFFSET, period);
 }
 
+/************************************************************************************
+ * Name: stm32_tim_getcounter
+ ************************************************************************************/
+
 static uint32_t stm32_tim_getcounter(FAR struct stm32_tim_dev_s *dev)
 {
   DEBUGASSERT(dev != NULL);
   return stm32_getreg32(dev, STM32_BTIM_CNT_OFFSET);
 }
 
+/************************************************************************************
+ * Name: stm32_tim_setisr
+ ************************************************************************************/
+
 static int stm32_tim_setisr(FAR struct stm32_tim_dev_s *dev,
                             int (*handler)(int irq, void *context),
                             int source)
@@ -668,23 +927,39 @@ static int stm32_tim_setisr(FAR struct stm32_tim_dev_s *dev,
   return OK;
 }
 
+/************************************************************************************
+ * Name: stm32_tim_enableint
+ ************************************************************************************/
+
 static void stm32_tim_enableint(FAR struct stm32_tim_dev_s *dev, int source)
 {
   DEBUGASSERT(dev != NULL);
   stm32_modifyreg16(dev, STM32_BTIM_DIER_OFFSET, 0, ATIM_DIER_UIE);
 }
 
+/************************************************************************************
+ * Name: stm32_tim_disableint
+ ************************************************************************************/
+
 static void stm32_tim_disableint(FAR struct stm32_tim_dev_s *dev, int source)
 {
   DEBUGASSERT(dev != NULL);
   stm32_modifyreg16(dev, STM32_BTIM_DIER_OFFSET, ATIM_DIER_UIE, 0);
 }
 
+/************************************************************************************
+ * Name: stm32_tim_ackint
+ ************************************************************************************/
+
 static void stm32_tim_ackint(FAR struct stm32_tim_dev_s *dev, int source)
 {
   stm32_putreg16(dev, STM32_BTIM_SR_OFFSET, ~ATIM_SR_UIF);
 }
 
+/************************************************************************************
+ * Name: stm32_tim_checkint
+ ************************************************************************************/
+
 static int stm32_tim_checkint(FAR struct stm32_tim_dev_s *dev, int source)
 {
   uint16_t regval = stm32_getreg16(dev, STM32_BTIM_SR_OFFSET);
@@ -692,7 +967,7 @@ static int stm32_tim_checkint(FAR struct stm32_tim_dev_s *dev, int source)
 }
 
 /************************************************************************************
- * General Functions
+ * Name: stm32_tim_setmode
  ************************************************************************************/
 
 static int stm32_tim_setmode(FAR struct stm32_tim_dev_s *dev, stm32_tim_mode_t mode)
@@ -761,6 +1036,10 @@ static int stm32_tim_setmode(FAR struct stm32_tim_dev_s *dev, stm32_tim_mode_t m
   return OK;
 }
 
+/************************************************************************************
+ * Name: stm32_tim_setchannel
+ ************************************************************************************/
+
 static int stm32_tim_setchannel(FAR struct stm32_tim_dev_s *dev, uint8_t channel,
                                 stm32_tim_channel_t mode)
 {
@@ -1280,6 +1559,10 @@ static int stm32_tim_setchannel(FAR struct stm32_tim_dev_s *dev, uint8_t channel
   return OK;
 }
 
+/************************************************************************************
+ * Name: stm32_tim_setcompare
+ ************************************************************************************/
+
 static int stm32_tim_setcompare(FAR struct stm32_tim_dev_s *dev, uint8_t channel,
                                 uint32_t compare)
 {
@@ -1305,6 +1588,10 @@ static int stm32_tim_setcompare(FAR struct stm32_tim_dev_s *dev, uint8_t channel
   return OK;
 }
 
+/************************************************************************************
+ * Name: stm32_tim_getcapture
+ ************************************************************************************/
+
 static int stm32_tim_getcapture(FAR struct stm32_tim_dev_s *dev, uint8_t channel)
 {
   DEBUGASSERT(dev != NULL);
@@ -1325,185 +1612,11 @@ static int stm32_tim_getcapture(FAR struct stm32_tim_dev_s *dev, uint8_t channel
 }
 
 /************************************************************************************
- * Advanced Functions
- ************************************************************************************/
-
-/* TODO: Advanced functions for the STM32_ATIM */
-
-/************************************************************************************
- * Device Structures, Instantiation
+ * Pubic Functions
  ************************************************************************************/
 
-struct stm32_tim_ops_s stm32_tim_ops =
-{
-  .setmode    = stm32_tim_setmode,
-  .setclock   = stm32_tim_setclock,
-  .setperiod  = stm32_tim_setperiod,
-  .getcounter = stm32_tim_getcounter,
-  .setchannel = stm32_tim_setchannel,
-  .setcompare = stm32_tim_setcompare,
-  .getcapture = stm32_tim_getcapture,
-  .setisr     = stm32_tim_setisr,
-  .enableint  = stm32_tim_enableint,
-  .disableint = stm32_tim_disableint,
-  .ackint     = stm32_tim_ackint,
-  .checkint   = stm32_tim_checkint,
-};
-
-#ifdef CONFIG_STM32_TIM1
-struct stm32_tim_priv_s stm32_tim1_priv =
-{
-  .ops        = &stm32_tim_ops,
-  .mode       = STM32_TIM_MODE_UNUSED,
-  .base       = STM32_TIM1_BASE,
-};
-#endif
-#ifdef CONFIG_STM32_TIM2
-struct stm32_tim_priv_s stm32_tim2_priv =
-{
-  .ops        = &stm32_tim_ops,
-  .mode       = STM32_TIM_MODE_UNUSED,
-  .base       = STM32_TIM2_BASE,
-};
-#endif
-
-#ifdef CONFIG_STM32_TIM3
-struct stm32_tim_priv_s stm32_tim3_priv =
-{
-  .ops        = &stm32_tim_ops,
-  .mode       = STM32_TIM_MODE_UNUSED,
-  .base       = STM32_TIM3_BASE,
-};
-#endif
-
-#ifdef CONFIG_STM32_TIM4
-struct stm32_tim_priv_s stm32_tim4_priv =
-{
-  .ops        = &stm32_tim_ops,
-  .mode       = STM32_TIM_MODE_UNUSED,
-  .base       = STM32_TIM4_BASE,
-};
-#endif
-
-#ifdef CONFIG_STM32_TIM5
-struct stm32_tim_priv_s stm32_tim5_priv =
-{
-  .ops        = &stm32_tim_ops,
-  .mode       = STM32_TIM_MODE_UNUSED,
-  .base       = STM32_TIM5_BASE,
-};
-#endif
-
-#ifdef CONFIG_STM32_TIM6
-struct stm32_tim_priv_s stm32_tim6_priv =
-{
-  .ops        = &stm32_tim_ops,
-  .mode       = STM32_TIM_MODE_UNUSED,
-  .base       = STM32_TIM6_BASE,
-};
-#endif
-
-#ifdef CONFIG_STM32_TIM7
-struct stm32_tim_priv_s stm32_tim7_priv =
-{
-  .ops        = &stm32_tim_ops,
-  .mode       = STM32_TIM_MODE_UNUSED,
-  .base       = STM32_TIM7_BASE,
-};
-#endif
-
-#ifdef CONFIG_STM32_TIM8
-struct stm32_tim_priv_s stm32_tim8_priv =
-{
-  .ops        = &stm32_tim_ops,
-  .mode       = STM32_TIM_MODE_UNUSED,
-  .base       = STM32_TIM8_BASE,
-};
-#endif
-
-#ifdef CONFIG_STM32_TIM9
-struct stm32_tim_priv_s stm32_tim9_priv =
-{
-  .ops        = &stm32_tim_ops,
-  .mode       = STM32_TIM_MODE_UNUSED,
-  .base       = STM32_TIM9_BASE,
-};
-#endif
-
-#ifdef CONFIG_STM32_TIM10
-struct stm32_tim_priv_s stm32_tim10_priv =
-{
-  .ops        = &stm32_tim_ops,
-  .mode       = STM32_TIM_MODE_UNUSED,
-  .base       = STM32_TIM10_BASE,
-};
-#endif
-
-#ifdef CONFIG_STM32_TIM11
-struct stm32_tim_priv_s stm32_tim11_priv =
-{
-  .ops        = &stm32_tim_ops,
-  .mode       = STM32_TIM_MODE_UNUSED,
-  .base       = STM32_TIM11_BASE,
-};
-#endif
-
-#ifdef CONFIG_STM32_TIM12
-struct stm32_tim_priv_s stm32_tim12_priv =
-{
-  .ops        = &stm32_tim_ops,
-  .mode       = STM32_TIM_MODE_UNUSED,
-  .base       = STM32_TIM12_BASE,
-};
-#endif
-
-#ifdef CONFIG_STM32_TIM13
-struct stm32_tim_priv_s stm32_tim13_priv =
-{
-  .ops        = &stm32_tim_ops,
-  .mode       = STM32_TIM_MODE_UNUSED,
-  .base       = STM32_TIM13_BASE,
-};
-#endif
-
-#ifdef CONFIG_STM32_TIM14
-struct stm32_tim_priv_s stm32_tim14_priv =
-{
-  .ops        = &stm32_tim_ops,
-  .mode       = STM32_TIM_MODE_UNUSED,
-  .base       = STM32_TIM14_BASE,
-};
-#endif
-
-#ifdef CONFIG_STM32_TIM15
-struct stm32_tim_priv_s stm32_tim15_priv =
-{
-  .ops        = &stm32_tim_ops,
-  .mode       = STM32_TIM_MODE_UNUSED,
-  .base       = STM32_TIM15_BASE,
-};
-#endif
-
-#ifdef CONFIG_STM32_TIM16
-struct stm32_tim_priv_s stm32_tim16_priv =
-{
-  .ops        = &stm32_tim_ops,
-  .mode       = STM32_TIM_MODE_UNUSED,
-  .base       = STM32_TIM16_BASE,
-};
-#endif
-
-#ifdef CONFIG_STM32_TIM17
-struct stm32_tim_priv_s stm32_tim17_priv =
-{
-  .ops        = &stm32_tim_ops,
-  .mode       = STM32_TIM_MODE_UNUSED,
-  .base       = STM32_TIM17_BASE,
-};
-#endif
-
 /************************************************************************************
- * Public Function - Initialization
+ * Name: stm32_tim_init
  ************************************************************************************/
 
 FAR struct stm32_tim_dev_s *stm32_tim_init(int timer)
@@ -1632,7 +1745,12 @@ FAR struct stm32_tim_dev_s *stm32_tim_init(int timer)
   return dev;
 }
 
-/* TODO: Detach interrupts, and close down all TIM Channels */
+/************************************************************************************
+ * Name: stm32_tim_deinit
+ *
+ * TODO: Detach interrupts, and close down all TIM Channels
+ *
+ ************************************************************************************/
 
 int stm32_tim_deinit(FAR struct stm32_tim_dev_s * dev)
 {
diff --git a/arch/arm/src/stm32/stm32_tim.h b/arch/arm/src/stm32/stm32_tim.h
index 86da6d33bb..e31250537b 100644
--- a/arch/arm/src/stm32/stm32_tim.h
+++ b/arch/arm/src/stm32/stm32_tim.h
@@ -160,18 +160,20 @@ struct stm32_tim_ops_s
   int  (*setmode)(FAR struct stm32_tim_dev_s *dev, stm32_tim_mode_t mode);
   int  (*setclock)(FAR struct stm32_tim_dev_s *dev, uint32_t freq);
   void (*setperiod)(FAR struct stm32_tim_dev_s *dev, uint32_t period);
-
   uint32_t (*getcounter)(FAR struct stm32_tim_dev_s *dev);
 
   /* General and Advanced Timers Adds */
 
-  int  (*setchannel)(FAR struct stm32_tim_dev_s *dev, uint8_t channel, stm32_tim_channel_t mode);
-  int  (*setcompare)(FAR struct stm32_tim_dev_s *dev, uint8_t channel, uint32_t compare);
+  int  (*setchannel)(FAR struct stm32_tim_dev_s *dev, uint8_t channel,
+                     stm32_tim_channel_t mode);
+  int  (*setcompare)(FAR struct stm32_tim_dev_s *dev, uint8_t channel,
+                     uint32_t compare);
   int  (*getcapture)(FAR struct stm32_tim_dev_s *dev, uint8_t channel);
 
   /* Timer interrupts */
 
-  int  (*setisr)(FAR struct stm32_tim_dev_s *dev, int (*handler)(int irq, void *context), int source);
+  int  (*setisr)(FAR struct stm32_tim_dev_s *dev,
+                 int (*handler)(int irq, void *context), int source);
   void (*enableint)(FAR struct stm32_tim_dev_s *dev, int source);
   void (*disableint)(FAR struct stm32_tim_dev_s *dev, int source);
   void (*ackint)(FAR struct stm32_tim_dev_s *dev, int source);
-- 
GitLab


From 7c568f249a305702d9a0a29aebb828b641b666e7 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Wed, 6 Jul 2016 13:37:08 -0600
Subject: [PATCH 160/229] STM32:  Various fixed to get a clean compile after
 integrating tickless mode.  Mostly because patch came from an old version of
 NuttX.

---
 arch/arm/Kconfig                   |  1 +
 arch/arm/src/stm32/Kconfig         | 85 +++++++++++++++++-------------
 arch/arm/src/stm32/stm32_freerun.c |  6 +--
 arch/arm/src/stm32/stm32_freerun.h |  1 +
 arch/arm/src/stm32/stm32_oneshot.c | 13 ++---
 5 files changed, 60 insertions(+), 46 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index fcc1c9ce98..12af0d6056 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -224,6 +224,7 @@ config ARCH_CHIP_STM32
 	select ARM_HAVE_MPU_UNIFIED
 	select ARCH_HAVE_I2CRESET
 	select ARCH_HAVE_HEAPCHECK
+	select ARCH_HAVE_TICKLESS
 	select ARMV7M_HAVE_STACKCHECK
 	---help---
 		STMicro STM32 architectures (ARM Cortex-M3/4).
diff --git a/arch/arm/src/stm32/Kconfig b/arch/arm/src/stm32/Kconfig
index bd8e0ca00c..932e74c81b 100644
--- a/arch/arm/src/stm32/Kconfig
+++ b/arch/arm/src/stm32/Kconfig
@@ -1285,7 +1285,6 @@ config STM32_LOWDENSITY
 config STM32_STM32F20XX
 	bool
 	default n
-	select ARCH_HAVE_TICKLESS
 
 config STM32_STM32F205
 	bool
@@ -2167,42 +2166,6 @@ config STM32_TSC
 	default n
 	depends on STM32_STM32F30XX
 
-config STM32_ONESHOT
-	bool "TIM one-shot wrapper"
-	default n if !SCHED_TICKLESS
-	default y if SCHED_TICKLESS
-	---help---
-		Enable a wrapper around the low level timer/counter functions to
-		support one-shot timer.
-
-config STM32_FREERUN
-	bool "TIM free-running wrapper"
-	default n if !SCHED_TICKLESS
-	default y if SCHED_TICKLESS
-	---help---
-		Enable a wrapper around the low level timer/counter functions to
-		support a free-running timer.
-
-if SCHED_TICKLESS
-
-config STM32_TICKLESS_ONESHOT
-	int "Tickless one-shot timer channel"
-	default 2
-	range 1 14
-	---help---
-		If the Tickless OS feature is enabled, the one clock must be
-		assigned to provided the one-shot timer needed by the OS.
-
-config STM32_TICKLESS_FREERUN
-	int "Tickless free-running timer channel"
-	default 5
-	range 1 14
-	---help---
-		If the Tickless OS feature is enabled, the one clock must be
-		assigned to provided the free-running timer needed by the OS.
-
-endif
-
 config STM32_USART1
 	bool "USART1"
 	default n
@@ -2581,6 +2544,54 @@ config STM32_FSMC_SRAM
 
 menu "Timer Configuration"
 
+if SCHED_TICKLESS
+
+config STM32_ONESHOT
+	bool
+	default y
+
+config STM32_FREERUN
+	bool
+	default y
+
+endif # SCHED_TICKLESS
+
+if !SCHED_TICKLESS
+
+config STM32_ONESHOT
+	bool "TIM one-shot wrapper"
+	default n
+	---help---
+		Enable a wrapper around the low level timer/counter functions to
+		support one-shot timer.
+
+config STM32_FREERUN
+	bool "TIM free-running wrapper"
+	default n
+	---help---
+		Enable a wrapper around the low level timer/counter functions to
+		support a free-running timer.
+
+endif # !SCHED_TICKLESS
+
+config STM32_TICKLESS_ONESHOT
+	int "Tickless one-shot timer channel"
+	default 2
+	range 1 14
+	depends on STM32_ONESHOT
+	---help---
+		If the Tickless OS feature is enabled, the one clock must be
+		assigned to provided the one-shot timer needed by the OS.
+
+config STM32_TICKLESS_FREERUN
+	int "Tickless free-running timer channel"
+	default 5
+	range 1 14
+	depends on STM32_FREERUN
+	---help---
+		If the Tickless OS feature is enabled, the one clock must be
+		assigned to provided the free-running timer needed by the OS.
+
 config STM32_TIM1_PWM
 	bool "TIM1 PWM"
 	default n
diff --git a/arch/arm/src/stm32/stm32_freerun.c b/arch/arm/src/stm32/stm32_freerun.c
index 42a2128a6d..836df043ad 100644
--- a/arch/arm/src/stm32/stm32_freerun.c
+++ b/arch/arm/src/stm32/stm32_freerun.c
@@ -45,7 +45,7 @@
 #include 
 #include 
 
-#include 
+#include 
 #include 
 
 #include "stm32_freerun.h"
@@ -201,7 +201,7 @@ int stm32_freerun_counter(struct stm32_freerun_s *freerun,
    * be lost.
    */
 
-  flags    = irqsave();
+  flags    = enter_critical_section();
 
   overflow = freerun->overflow;
   counter  = STM32_TIM_GETCOUNTER(freerun->tch);
@@ -228,7 +228,7 @@ int stm32_freerun_counter(struct stm32_freerun_s *freerun,
       freerun->overflow = overflow;
     }
 
-  irqrestore(flags);
+  leave_critical_section(flags);
 
   tmrinfo("counter=%lu (%lu) overflow=%lu, pending=%i\n",
          (unsigned long)counter,  (unsigned long)verify,
diff --git a/arch/arm/src/stm32/stm32_freerun.h b/arch/arm/src/stm32/stm32_freerun.h
index 1eae58941b..08dd1786da 100644
--- a/arch/arm/src/stm32/stm32_freerun.h
+++ b/arch/arm/src/stm32/stm32_freerun.h
@@ -44,6 +44,7 @@
 
 #include 
 #include 
+#include 
 
 #include "stm32_tim.h"
 
diff --git a/arch/arm/src/stm32/stm32_oneshot.c b/arch/arm/src/stm32/stm32_oneshot.c
index db724ebfd1..8f5e89df62 100644
--- a/arch/arm/src/stm32/stm32_oneshot.c
+++ b/arch/arm/src/stm32/stm32_oneshot.c
@@ -44,8 +44,9 @@
 #include 
 #include 
 #include 
+#include 
 
-#include 
+#include 
 #include 
 
 #include "stm32_oneshot.h"
@@ -223,7 +224,7 @@ int stm32_oneshot_start(struct stm32_oneshot_s *oneshot,
 
   /* Was the oneshot already running? */
 
-  flags = irqsave();
+  flags = enter_critical_section();
   if (oneshot->running)
     {
       /* Yes.. then cancel it */
@@ -276,7 +277,7 @@ int stm32_oneshot_start(struct stm32_oneshot_s *oneshot,
    */
 
   oneshot->running = true;
-  irqrestore(flags);
+  leave_critical_section(flags);
   return OK;
 }
 
@@ -317,7 +318,7 @@ int stm32_oneshot_cancel(struct stm32_oneshot_s *oneshot,
 
   /* Was the timer running? */
 
-  flags = irqsave();
+  flags = enter_critical_section();
   if (!oneshot->running)
     {
       /* No.. Just return zero timer remaining and successful cancellation.
@@ -327,7 +328,7 @@ int stm32_oneshot_cancel(struct stm32_oneshot_s *oneshot,
 
       ts->tv_sec  = 0;
       ts->tv_nsec = 0;
-      irqrestore(flags);
+      leave_critical_section(flags);
       return OK;
     }
 
@@ -355,7 +356,7 @@ int stm32_oneshot_cancel(struct stm32_oneshot_s *oneshot,
   oneshot->running = false;
   oneshot->handler = NULL;
   oneshot->arg     = NULL;
-  irqrestore(flags);
+  leave_critical_section(flags);
 
   /* Did the caller provide us with a location to return the time
    * remaining?
-- 
GitLab


From c16500dfdb6b2fcc0db6c3033307e0d2c2bd13c4 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Wed, 6 Jul 2016 14:24:59 -0600
Subject: [PATCH 161/229] STM32 timer. More clean up:  Add all function
 prototypes.  Reorder functions to match ordering in operations structure.

---
 arch/arm/src/stm32/stm32_tim.c | 496 +++++++++++++++++----------------
 1 file changed, 259 insertions(+), 237 deletions(-)

diff --git a/arch/arm/src/stm32/stm32_tim.c b/arch/arm/src/stm32/stm32_tim.c
index 23b415ddff..b001f10cd5 100644
--- a/arch/arm/src/stm32/stm32_tim.c
+++ b/arch/arm/src/stm32/stm32_tim.c
@@ -294,6 +294,28 @@ struct stm32_tim_priv_s
  * Private Function prototypes
  ************************************************************************************/
 
+/* Register helpers */
+
+static inline uint16_t stm32_getreg16(FAR struct stm32_tim_dev_s *dev,
+                                      uint8_t offset);
+static inline void stm32_putreg16(FAR struct stm32_tim_dev_s *dev, uint8_t offset,
+                                  uint16_t value);
+static inline void stm32_modifyreg16(FAR struct stm32_tim_dev_s *dev,
+                                     uint8_t offset, uint16_t clearbits,
+                                     uint16_t setbits);
+static inline uint32_t stm32_getreg32(FAR struct stm32_tim_dev_s *dev,
+                                      uint8_t offset);
+static inline void stm32_putreg32(FAR struct stm32_tim_dev_s *dev, uint8_t offset,
+                                  uint32_t value);
+
+/* Timer helpers */
+
+static void stm32_tim_reload_counter(FAR struct stm32_tim_dev_s *dev);
+static void stm32_tim_enable(FAR struct stm32_tim_dev_s *dev);
+static void stm32_tim_disable(FAR struct stm32_tim_dev_s *dev);
+static void stm32_tim_reset(FAR struct stm32_tim_dev_s *dev);
+static void stm32_tim_gpioconfig(uint32_t cfg, stm32_tim_channel_t mode);
+
 /* Timer methods */
 
 static int stm32_tim_setmode(FAR struct stm32_tim_dev_s *dev, stm32_tim_mode_t mode);
@@ -633,6 +655,76 @@ static void stm32_tim_gpioconfig(uint32_t cfg, stm32_tim_channel_t mode)
 }
 #endif
 
+/************************************************************************************
+ * Name: stm32_tim_setmode
+ ************************************************************************************/
+
+static int stm32_tim_setmode(FAR struct stm32_tim_dev_s *dev, stm32_tim_mode_t mode)
+{
+  uint16_t val = ATIM_CR1_CEN | ATIM_CR1_ARPE;
+
+  DEBUGASSERT(dev != NULL);
+
+  /* This function is not supported on basic timers. To enable or
+   * disable it, simply set its clock to valid frequency or zero.
+   */
+
+#if STM32_NBTIM > 0
+  if (((struct stm32_tim_priv_s *)dev)->base == STM32_TIM6_BASE
+#endif
+#if STM32_NBTIM > 1
+      ||  ((struct stm32_tim_priv_s *)dev)->base == STM32_TIM7_BASE
+#endif
+#if STM32_NBTIM > 0
+  )
+    {
+      return -EINVAL;
+    }
+#endif
+
+  /* Decode operational modes */
+
+  switch (mode & STM32_TIM_MODE_MASK)
+    {
+      case STM32_TIM_MODE_DISABLED:
+        val = 0;
+        break;
+
+      case STM32_TIM_MODE_DOWN:
+        val |= ATIM_CR1_DIR;
+
+      case STM32_TIM_MODE_UP:
+        break;
+
+      case STM32_TIM_MODE_UPDOWN:
+        val |= ATIM_CR1_CENTER1;
+        // Our default: Interrupts are generated on compare, when counting down
+        break;
+
+      case STM32_TIM_MODE_PULSE:
+        val |= ATIM_CR1_OPM;
+        break;
+
+      default:
+        return -EINVAL;
+    }
+
+  stm32_tim_reload_counter(dev);
+  stm32_putreg16(dev, STM32_BTIM_CR1_OFFSET, val);
+
+#if STM32_NATIM > 0
+  /* Advanced registers require Main Output Enable */
+
+    if (((struct stm32_tim_priv_s *)dev)->base == STM32_TIM1_BASE ||
+        ((struct stm32_tim_priv_s *)dev)->base == STM32_TIM8_BASE)
+      {
+        stm32_modifyreg16(dev, STM32_ATIM_BDTR_OFFSET, 0, ATIM_BDTR_MOE);
+      }
+#endif
+
+  return OK;
+}
+
 /************************************************************************************
  * Name: stm32_tim_setclock
  ************************************************************************************/
@@ -799,243 +891,6 @@ static uint32_t stm32_tim_getcounter(FAR struct stm32_tim_dev_s *dev)
   return stm32_getreg32(dev, STM32_BTIM_CNT_OFFSET);
 }
 
-/************************************************************************************
- * Name: stm32_tim_setisr
- ************************************************************************************/
-
-static int stm32_tim_setisr(FAR struct stm32_tim_dev_s *dev,
-                            int (*handler)(int irq, void *context),
-                            int source)
-{
-  int vectorno;
-
-  DEBUGASSERT(dev != NULL);
-  DEBUGASSERT(source == 0);
-
-  switch (((struct stm32_tim_priv_s *)dev)->base)
-    {
-#ifdef CONFIG_STM32_TIM1
-      case STM32_TIM1_BASE:
-        vectorno = STM32_IRQ_TIM1UP;
-        break;
-#endif
-#ifdef CONFIG_STM32_TIM2
-      case STM32_TIM2_BASE:
-        vectorno = STM32_IRQ_TIM2;
-        break;
-#endif
-#ifdef CONFIG_STM32_TIM3
-      case STM32_TIM3_BASE:
-        vectorno = STM32_IRQ_TIM3;
-        break;
-#endif
-#ifdef CONFIG_STM32_TIM4
-      case STM32_TIM4_BASE:
-        vectorno = STM32_IRQ_TIM4;
-        break;
-#endif
-#ifdef CONFIG_STM32_TIM5
-      case STM32_TIM5_BASE:
-        vectorno = STM32_IRQ_TIM5;
-        break;
-#endif
-#ifdef CONFIG_STM32_TIM6
-      case STM32_TIM6_BASE:
-        vectorno = STM32_IRQ_TIM6;
-        break;
-#endif
-#ifdef CONFIG_STM32_TIM7
-      case STM32_TIM7_BASE:
-        vectorno = STM32_IRQ_TIM7;
-        break;
-#endif
-#ifdef CONFIG_STM32_TIM8
-      case STM32_TIM8_BASE:
-        vectorno = STM32_IRQ_TIM8UP;
-        break;
-#endif
-#ifdef CONFIG_STM32_TIM9
-      case STM32_TIM9_BASE:
-        vectorno = STM32_IRQ_TIM9;
-        break;
-#endif
-#ifdef CONFIG_STM32_TIM10
-      case STM32_TIM10_BASE:
-        vectorno = STM32_IRQ_TIM10;
-        break;
-#endif
-#ifdef CONFIG_STM32_TIM11
-      case STM32_TIM11_BASE:
-        vectorno = STM32_IRQ_TIM11;
-        break;
-#endif
-#ifdef CONFIG_STM32_TIM12
-      case STM32_TIM12_BASE:
-        vectorno = STM32_IRQ_TIM12;
-        break;
-#endif
-#ifdef CONFIG_STM32_TIM13
-      case STM32_TIM13_BASE:
-        vectorno = STM32_IRQ_TIM13;
-        break;
-#endif
-#ifdef CONFIG_STM32_TIM14
-      case STM32_TIM14_BASE:
-        vectorno = STM32_IRQ_TIM14;
-        break;
-#endif
-#ifdef CONFIG_STM32_TIM15
-      case STM32_TIM15_BASE:
-        vectorno = STM32_IRQ_TIM15;
-        break;
-#endif
-#ifdef CONFIG_STM32_TIM16
-      case STM32_TIM16_BASE:
-        vectorno = STM32_IRQ_TIM16;
-        break;
-#endif
-#ifdef CONFIG_STM32_TIM17
-      case STM32_TIM17_BASE:
-        vectorno = STM32_IRQ_TIM17;
-        break;
-#endif
-
-      default:
-        return -EINVAL;
-    }
-
-  /* Disable interrupt when callback is removed */
-
-  if (!handler)
-    {
-      up_disable_irq(vectorno);
-      irq_detach(vectorno);
-      return OK;
-    }
-
-  /* Otherwise set callback and enable interrupt */
-
-  irq_attach(vectorno, handler);
-  up_enable_irq(vectorno);
-
-#ifdef CONFIG_ARCH_IRQPRIO
-  /* Set the interrupt priority */
-
-  up_prioritize_irq(vectorno, NVIC_SYSH_PRIORITY_DEFAULT);
-#endif
-
-  return OK;
-}
-
-/************************************************************************************
- * Name: stm32_tim_enableint
- ************************************************************************************/
-
-static void stm32_tim_enableint(FAR struct stm32_tim_dev_s *dev, int source)
-{
-  DEBUGASSERT(dev != NULL);
-  stm32_modifyreg16(dev, STM32_BTIM_DIER_OFFSET, 0, ATIM_DIER_UIE);
-}
-
-/************************************************************************************
- * Name: stm32_tim_disableint
- ************************************************************************************/
-
-static void stm32_tim_disableint(FAR struct stm32_tim_dev_s *dev, int source)
-{
-  DEBUGASSERT(dev != NULL);
-  stm32_modifyreg16(dev, STM32_BTIM_DIER_OFFSET, ATIM_DIER_UIE, 0);
-}
-
-/************************************************************************************
- * Name: stm32_tim_ackint
- ************************************************************************************/
-
-static void stm32_tim_ackint(FAR struct stm32_tim_dev_s *dev, int source)
-{
-  stm32_putreg16(dev, STM32_BTIM_SR_OFFSET, ~ATIM_SR_UIF);
-}
-
-/************************************************************************************
- * Name: stm32_tim_checkint
- ************************************************************************************/
-
-static int stm32_tim_checkint(FAR struct stm32_tim_dev_s *dev, int source)
-{
-  uint16_t regval = stm32_getreg16(dev, STM32_BTIM_SR_OFFSET);
-  return (regval & ATIM_SR_UIF) ? 1 : 0;
-}
-
-/************************************************************************************
- * Name: stm32_tim_setmode
- ************************************************************************************/
-
-static int stm32_tim_setmode(FAR struct stm32_tim_dev_s *dev, stm32_tim_mode_t mode)
-{
-  uint16_t val = ATIM_CR1_CEN | ATIM_CR1_ARPE;
-
-  DEBUGASSERT(dev != NULL);
-
-  /* This function is not supported on basic timers. To enable or
-   * disable it, simply set its clock to valid frequency or zero.
-   */
-
-#if STM32_NBTIM > 0
-  if (((struct stm32_tim_priv_s *)dev)->base == STM32_TIM6_BASE
-#endif
-#if STM32_NBTIM > 1
-      ||  ((struct stm32_tim_priv_s *)dev)->base == STM32_TIM7_BASE
-#endif
-#if STM32_NBTIM > 0
-  )
-    {
-      return -EINVAL;
-    }
-#endif
-
-  /* Decode operational modes */
-
-  switch (mode & STM32_TIM_MODE_MASK)
-    {
-      case STM32_TIM_MODE_DISABLED:
-        val = 0;
-        break;
-
-      case STM32_TIM_MODE_DOWN:
-        val |= ATIM_CR1_DIR;
-
-      case STM32_TIM_MODE_UP:
-        break;
-
-      case STM32_TIM_MODE_UPDOWN:
-        val |= ATIM_CR1_CENTER1;
-        // Our default: Interrupts are generated on compare, when counting down
-        break;
-
-      case STM32_TIM_MODE_PULSE:
-        val |= ATIM_CR1_OPM;
-        break;
-
-      default:
-        return -EINVAL;
-    }
-
-  stm32_tim_reload_counter(dev);
-  stm32_putreg16(dev, STM32_BTIM_CR1_OFFSET, val);
-
-#if STM32_NATIM > 0
-  /* Advanced registers require Main Output Enable */
-
-    if (((struct stm32_tim_priv_s *)dev)->base == STM32_TIM1_BASE ||
-        ((struct stm32_tim_priv_s *)dev)->base == STM32_TIM8_BASE)
-      {
-        stm32_modifyreg16(dev, STM32_ATIM_BDTR_OFFSET, 0, ATIM_BDTR_MOE);
-      }
-#endif
-
-  return OK;
-}
-
 /************************************************************************************
  * Name: stm32_tim_setchannel
  ************************************************************************************/
@@ -1611,6 +1466,173 @@ static int stm32_tim_getcapture(FAR struct stm32_tim_dev_s *dev, uint8_t channel
   return -EINVAL;
 }
 
+/************************************************************************************
+ * Name: stm32_tim_setisr
+ ************************************************************************************/
+
+static int stm32_tim_setisr(FAR struct stm32_tim_dev_s *dev,
+                            int (*handler)(int irq, void *context),
+                            int source)
+{
+  int vectorno;
+
+  DEBUGASSERT(dev != NULL);
+  DEBUGASSERT(source == 0);
+
+  switch (((struct stm32_tim_priv_s *)dev)->base)
+    {
+#ifdef CONFIG_STM32_TIM1
+      case STM32_TIM1_BASE:
+        vectorno = STM32_IRQ_TIM1UP;
+        break;
+#endif
+#ifdef CONFIG_STM32_TIM2
+      case STM32_TIM2_BASE:
+        vectorno = STM32_IRQ_TIM2;
+        break;
+#endif
+#ifdef CONFIG_STM32_TIM3
+      case STM32_TIM3_BASE:
+        vectorno = STM32_IRQ_TIM3;
+        break;
+#endif
+#ifdef CONFIG_STM32_TIM4
+      case STM32_TIM4_BASE:
+        vectorno = STM32_IRQ_TIM4;
+        break;
+#endif
+#ifdef CONFIG_STM32_TIM5
+      case STM32_TIM5_BASE:
+        vectorno = STM32_IRQ_TIM5;
+        break;
+#endif
+#ifdef CONFIG_STM32_TIM6
+      case STM32_TIM6_BASE:
+        vectorno = STM32_IRQ_TIM6;
+        break;
+#endif
+#ifdef CONFIG_STM32_TIM7
+      case STM32_TIM7_BASE:
+        vectorno = STM32_IRQ_TIM7;
+        break;
+#endif
+#ifdef CONFIG_STM32_TIM8
+      case STM32_TIM8_BASE:
+        vectorno = STM32_IRQ_TIM8UP;
+        break;
+#endif
+#ifdef CONFIG_STM32_TIM9
+      case STM32_TIM9_BASE:
+        vectorno = STM32_IRQ_TIM9;
+        break;
+#endif
+#ifdef CONFIG_STM32_TIM10
+      case STM32_TIM10_BASE:
+        vectorno = STM32_IRQ_TIM10;
+        break;
+#endif
+#ifdef CONFIG_STM32_TIM11
+      case STM32_TIM11_BASE:
+        vectorno = STM32_IRQ_TIM11;
+        break;
+#endif
+#ifdef CONFIG_STM32_TIM12
+      case STM32_TIM12_BASE:
+        vectorno = STM32_IRQ_TIM12;
+        break;
+#endif
+#ifdef CONFIG_STM32_TIM13
+      case STM32_TIM13_BASE:
+        vectorno = STM32_IRQ_TIM13;
+        break;
+#endif
+#ifdef CONFIG_STM32_TIM14
+      case STM32_TIM14_BASE:
+        vectorno = STM32_IRQ_TIM14;
+        break;
+#endif
+#ifdef CONFIG_STM32_TIM15
+      case STM32_TIM15_BASE:
+        vectorno = STM32_IRQ_TIM15;
+        break;
+#endif
+#ifdef CONFIG_STM32_TIM16
+      case STM32_TIM16_BASE:
+        vectorno = STM32_IRQ_TIM16;
+        break;
+#endif
+#ifdef CONFIG_STM32_TIM17
+      case STM32_TIM17_BASE:
+        vectorno = STM32_IRQ_TIM17;
+        break;
+#endif
+
+      default:
+        return -EINVAL;
+    }
+
+  /* Disable interrupt when callback is removed */
+
+  if (!handler)
+    {
+      up_disable_irq(vectorno);
+      irq_detach(vectorno);
+      return OK;
+    }
+
+  /* Otherwise set callback and enable interrupt */
+
+  irq_attach(vectorno, handler);
+  up_enable_irq(vectorno);
+
+#ifdef CONFIG_ARCH_IRQPRIO
+  /* Set the interrupt priority */
+
+  up_prioritize_irq(vectorno, NVIC_SYSH_PRIORITY_DEFAULT);
+#endif
+
+  return OK;
+}
+
+/************************************************************************************
+ * Name: stm32_tim_enableint
+ ************************************************************************************/
+
+static void stm32_tim_enableint(FAR struct stm32_tim_dev_s *dev, int source)
+{
+  DEBUGASSERT(dev != NULL);
+  stm32_modifyreg16(dev, STM32_BTIM_DIER_OFFSET, 0, ATIM_DIER_UIE);
+}
+
+/************************************************************************************
+ * Name: stm32_tim_disableint
+ ************************************************************************************/
+
+static void stm32_tim_disableint(FAR struct stm32_tim_dev_s *dev, int source)
+{
+  DEBUGASSERT(dev != NULL);
+  stm32_modifyreg16(dev, STM32_BTIM_DIER_OFFSET, ATIM_DIER_UIE, 0);
+}
+
+/************************************************************************************
+ * Name: stm32_tim_ackint
+ ************************************************************************************/
+
+static void stm32_tim_ackint(FAR struct stm32_tim_dev_s *dev, int source)
+{
+  stm32_putreg16(dev, STM32_BTIM_SR_OFFSET, ~ATIM_SR_UIF);
+}
+
+/************************************************************************************
+ * Name: stm32_tim_checkint
+ ************************************************************************************/
+
+static int stm32_tim_checkint(FAR struct stm32_tim_dev_s *dev, int source)
+{
+  uint16_t regval = stm32_getreg16(dev, STM32_BTIM_SR_OFFSET);
+  return (regval & ATIM_SR_UIF) ? 1 : 0;
+}
+
 /************************************************************************************
  * Pubic Functions
  ************************************************************************************/
-- 
GitLab


From b3a73c36974162ed57c9067fa8a6b692942351e7 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Thu, 7 Jul 2016 10:25:13 -0600
Subject: [PATCH 162/229] Remove newlines from .gitignore files

---
 .gitignore                     | 66 +++++++++++++++++-----------------
 configs/sim/include/.gitignore |  4 +--
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/.gitignore b/.gitignore
index 409232b737..7617ea7cff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,33 +1,33 @@
-.depend
-Make.dep
-*.o
-*.a
-*.d
-*.i
-*~
-.swp
-.*.swp
-core
-.gdbinit
-cscope.out
-/.config
-/.config.old
-/.version
-/Make.defs
-/setenv.sh
-/setenv.bat
-/nuttx
-/nuttx.*
-/nuttx-*
-/_SAVED_APPS_config
-/*.map
-/*.elf
-/*.srec
-/*.bin
-/*.ihx
-/*.hex
-/pcode
-/tags
-/.settings/
-/.cproject
-/.project
+.depend
+Make.dep
+*.o
+*.a
+*.d
+*.i
+*~
+.swp
+.*.swp
+core
+.gdbinit
+cscope.out
+/.config
+/.config.old
+/.version
+/Make.defs
+/setenv.sh
+/setenv.bat
+/nuttx
+/nuttx.*
+/nuttx-*
+/_SAVED_APPS_config
+/*.map
+/*.elf
+/*.srec
+/*.bin
+/*.ihx
+/*.hex
+/pcode
+/tags
+/.settings/
+/.cproject
+/.project
diff --git a/configs/sim/include/.gitignore b/configs/sim/include/.gitignore
index 0561ac1848..e42f6d7bc8 100644
--- a/configs/sim/include/.gitignore
+++ b/configs/sim/include/.gitignore
@@ -1,2 +1,2 @@
-/etc
-/romfs_img
+/etc
+/romfs_img
-- 
GitLab


From 550b7e12e389511706ae28cd0fad605697fb3d5b Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Thu, 7 Jul 2016 10:26:31 -0600
Subject: [PATCH 163/229] Remove Eclipse-specific settings from .gitignore

---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7617ea7cff..3ec700458d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,3 @@ cscope.out
 /*.hex
 /pcode
 /tags
-/.settings/
-/.cproject
-/.project
-- 
GitLab


From 2cadf783fdb491f67efa7c423957226968efa24e Mon Sep 17 00:00:00 2001
From: ziggurat29 
Date: Thu, 7 Jul 2016 12:02:23 -0500
Subject: [PATCH 164/229] cdcacm_unbind leaks write request objects.  This
 arises due to freeing the bulk IN endpoint before the loop that frees the
 requests via cdcasm_freereq. That function checks the parameters and skips
 the freeing if either is NULL. Freeing the bulk IN enpoint will cause the
 first param to be NULL, thereby bypassing the free operation.  To fix, I
 moved the release of the bulk IN endpoint until after to loop (much as was
 the case for the OUT and read requests, which did not exhibit the problem).

---
 drivers/usbdev/cdcacm.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/usbdev/cdcacm.c b/drivers/usbdev/cdcacm.c
index 48dbdf5cb0..28d498363b 100644
--- a/drivers/usbdev/cdcacm.c
+++ b/drivers/usbdev/cdcacm.c
@@ -1162,14 +1162,6 @@ static void cdcacm_unbind(FAR struct usbdevclass_driver_s *driver,
           priv->epintin = NULL;
         }
 
-      /* Free the bulk IN endpoint */
-
-      if (priv->epbulkin)
-        {
-          DEV_FREEEP(dev, priv->epbulkin);
-          priv->epbulkin = NULL;
-        }
-
       /* Free the pre-allocated control request */
 
       if (priv->ctrlreq != NULL)
@@ -1220,6 +1212,14 @@ static void cdcacm_unbind(FAR struct usbdevclass_driver_s *driver,
       DEBUGASSERT(priv->nwrq == 0);
       leave_critical_section(flags);
 
+      /* Free the bulk IN endpoint */
+
+      if (priv->epbulkin)
+        {
+          DEV_FREEEP(dev, priv->epbulkin);
+          priv->epbulkin = NULL;
+        }
+
       /* Clear out all data in the circular buffer */
 
       priv->serdev.xmit.head = 0;
-- 
GitLab


From 42820c0938e2d1570bf10ab7d5ee939b4b6fd093 Mon Sep 17 00:00:00 2001
From: ziggurat29 
Date: Thu, 7 Jul 2016 13:54:35 -0500
Subject: [PATCH 165/229] update usb dev/host controller drivers to reflect
 new(ish) logging standards; augment device enpoint and fifo allocation
 #defines to do more sanity checking, and be automatically adaptive to size
 changes.  Update README.txt to reflect current status of the implementation.

---
 arch/arm/src/stm32l4/README.txt          |  13 ++-
 arch/arm/src/stm32l4/stm32l4_otgfsdev.c  | 139 ++++++++++++++++++-----
 arch/arm/src/stm32l4/stm32l4_otgfshost.c |  42 +++----
 3 files changed, 140 insertions(+), 54 deletions(-)

diff --git a/arch/arm/src/stm32l4/README.txt b/arch/arm/src/stm32l4/README.txt
index 59f2eb28d9..d777d3bc8f 100644
--- a/arch/arm/src/stm32l4/README.txt
+++ b/arch/arm/src/stm32l4/README.txt
@@ -1,5 +1,5 @@
 This is a port of NuttX to the STM32L4 Family
-Used development board is the Nucleo L476RG
+Used development board is the Nucleo L476RG, STM32L4VGDiscovery
 
 The status is HIGHLY EXPERIMENTAL.
 
@@ -16,22 +16,23 @@ IRQs     : OK
 GPIO     : OK
 EXTI     : OK, to be tested.
 HSI      : OK
-HSE      : To be tested
+HSE      : OK
 PLL      : Works @ 80 MHz
-MSI      : TODO
-LSE      : works, but TODO autotrim of MSI, etc
+MSI      : OK
+LSE      : OK
 RCC      : All registers defined, peripherals enabled, basic clock working
 SYSCTL   : All registers defined
 USART    : Working in normal mode (no DMA, to be tested, code is written)
 DMA      : works; at least tested with QSPI
-SRAM2    : Should work with enough MM regions
+SRAM2    : OK; can be included in MM region or left separate for special app purposes
 FIREWALL : Code written, to be tested, requires support from ldscript
 SPI      : Code written, to be tested, including DMA
 I2C      : Registers defined
 RTC      : works
 QSPI     : works in polling, interrupt, DMA, and also memory-mapped modes
 CAN      : TODO
-OTGFS    : TODO
+OTGFS    : dev implemented, tested, outstanding issue with CDCACM (ACM_SET_LINE_CODING, but otherwise works);
+         : host implemented, only build smoke-tested (i.e. builds, but no functional testing yet)
 Timers   : TODO
 PM       : TODO, PWR registers defined
 FSMC     : TODO
diff --git a/arch/arm/src/stm32l4/stm32l4_otgfsdev.c b/arch/arm/src/stm32l4/stm32l4_otgfsdev.c
index 3ad74b74a1..23d155e2cf 100644
--- a/arch/arm/src/stm32l4/stm32l4_otgfsdev.c
+++ b/arch/arm/src/stm32l4/stm32l4_otgfsdev.c
@@ -117,10 +117,62 @@
 #  define CONFIG_USBDEV_EP5_TXFIFO_SIZE 128
 #endif
 
-#if (CONFIG_USBDEV_RXFIFO_SIZE + CONFIG_USBDEV_EP0_TXFIFO_SIZE +\
-     CONFIG_USBDEV_EP1_TXFIFO_SIZE + CONFIG_USBDEV_EP2_TXFIFO_SIZE +\
-     CONFIG_USBDEV_EP3_TXFIFO_SIZE + CONFIG_USBDEV_EP4_TXFIFO_SIZE +\
-     CONFIG_USBDEV_EP5_TXFIFO_SIZE ) > 1280
+/* Number of endpoints */
+
+#define STM32_NENDPOINTS             (6)          /* ep0-5 x 2 for IN and OUT */
+
+/* Adjust actual number of endpoints based upon size; 0 means 'not available',
+ * and we expect that the first 0-length endpoint implies that all others
+ * after are unused as well (irrespective of what their size is set to be).
+ */
+
+#if CONFIG_USBDEV_EP1_TXFIFO_SIZE == 0
+#  undef STM32_NENDPOINTS
+#  define STM32_NENDPOINTS 1
+#  undef CONFIG_USBDEV_EP2_TXFIFO_SIZE
+#  define CONFIG_USBDEV_EP2_TXFIFO_SIZE 0
+#  undef CONFIG_USBDEV_EP3_TXFIFO_SIZE
+#  define CONFIG_USBDEV_EP3_TXFIFO_SIZE 0
+#  undef CONFIG_USBDEV_EP4_TXFIFO_SIZE
+#  define CONFIG_USBDEV_EP4_TXFIFO_SIZE 0
+#  undef CONFIG_USBDEV_EP5_TXFIFO_SIZE
+#  define CONFIG_USBDEV_EP5_TXFIFO_SIZE 0
+#elif CONFIG_USBDEV_EP2_TXFIFO_SIZE == 0
+#  undef STM32_NENDPOINTS
+#  define STM32_NENDPOINTS 2
+#  undef CONFIG_USBDEV_EP3_TXFIFO_SIZE
+#  define CONFIG_USBDEV_EP3_TXFIFO_SIZE 0
+#  undef CONFIG_USBDEV_EP4_TXFIFO_SIZE
+#  define CONFIG_USBDEV_EP4_TXFIFO_SIZE 0
+#  undef CONFIG_USBDEV_EP5_TXFIFO_SIZE
+#  define CONFIG_USBDEV_EP5_TXFIFO_SIZE 0
+#elif CONFIG_USBDEV_EP3_TXFIFO_SIZE == 0
+#  undef STM32_NENDPOINTS
+#  define STM32_NENDPOINTS 3
+#  undef CONFIG_USBDEV_EP4_TXFIFO_SIZE
+#  define CONFIG_USBDEV_EP4_TXFIFO_SIZE 0
+#  undef CONFIG_USBDEV_EP5_TXFIFO_SIZE
+#  define CONFIG_USBDEV_EP5_TXFIFO_SIZE 0
+#elif CONFIG_USBDEV_EP4_TXFIFO_SIZE == 0
+#  undef STM32_NENDPOINTS
+#  define STM32_NENDPOINTS 4
+#  undef CONFIG_USBDEV_EP5_TXFIFO_SIZE
+#  define CONFIG_USBDEV_EP5_TXFIFO_SIZE 0
+#elif CONFIG_USBDEV_EP5_TXFIFO_SIZE == 0
+#  undef STM32_NENDPOINTS
+#  define STM32_NENDPOINTS 5
+#endif
+
+/* Sanity check on allocations specified. */
+
+#if (CONFIG_USBDEV_RXFIFO_SIZE +\
+     CONFIG_USBDEV_EP0_TXFIFO_SIZE +\
+     CONFIG_USBDEV_EP1_TXFIFO_SIZE +\
+     CONFIG_USBDEV_EP2_TXFIFO_SIZE +\
+     CONFIG_USBDEV_EP3_TXFIFO_SIZE +\
+     CONFIG_USBDEV_EP4_TXFIFO_SIZE +\
+     CONFIG_USBDEV_EP5_TXFIFO_SIZE +\
+     0 ) > 1280
 #  error "FIFO allocations exceed FIFO memory size"
 #endif
 
@@ -141,35 +193,35 @@
 #define STM32_EP1_TXFIFO_BYTES ((CONFIG_USBDEV_EP1_TXFIFO_SIZE + 3) & ~3)
 #define STM32_EP1_TXFIFO_WORDS ((CONFIG_USBDEV_EP1_TXFIFO_SIZE + 3) >> 2)
 
-#if STM32_EP1_TXFIFO_WORDS < 16
+#if STM32_EP1_TXFIFO_BYTES != 0 && STM32_EP1_TXFIFO_WORDS < 16
 #  error "CONFIG_USBDEV_EP1_TXFIFO_SIZE is out of range"
 #endif
 
 #define STM32_EP2_TXFIFO_BYTES ((CONFIG_USBDEV_EP2_TXFIFO_SIZE + 3) & ~3)
 #define STM32_EP2_TXFIFO_WORDS ((CONFIG_USBDEV_EP2_TXFIFO_SIZE + 3) >> 2)
 
-#if STM32_EP2_TXFIFO_WORDS < 16
+#if STM32_EP2_TXFIFO_BYTES != 0 && STM32_EP2_TXFIFO_WORDS < 16
 #  error "CONFIG_USBDEV_EP2_TXFIFO_SIZE is out of range"
 #endif
 
 #define STM32_EP3_TXFIFO_BYTES ((CONFIG_USBDEV_EP3_TXFIFO_SIZE + 3) & ~3)
 #define STM32_EP3_TXFIFO_WORDS ((CONFIG_USBDEV_EP3_TXFIFO_SIZE + 3) >> 2)
 
-#if STM32_EP3_TXFIFO_WORDS < 16
+#if STM32_EP3_TXFIFO_BYTES != 0 && STM32_EP3_TXFIFO_WORDS < 16
 #  error "CONFIG_USBDEV_EP3_TXFIFO_SIZE is out of range"
 #endif
 
 #define STM32_EP4_TXFIFO_BYTES ((CONFIG_USBDEV_EP4_TXFIFO_SIZE + 3) & ~3)
 #define STM32_EP4_TXFIFO_WORDS ((CONFIG_USBDEV_EP4_TXFIFO_SIZE + 3) >> 2)
 
-#if STM32_EP4_TXFIFO_WORDS < 16
+#if STM32_EP4_TXFIFO_BYTES != 0 && STM32_EP4_TXFIFO_WORDS < 16
 #  error "CONFIG_USBDEV_EP4_TXFIFO_SIZE is out of range"
 #endif
 
 #define STM32_EP5_TXFIFO_BYTES ((CONFIG_USBDEV_EP5_TXFIFO_SIZE + 3) & ~3)
 #define STM32_EP5_TXFIFO_WORDS ((CONFIG_USBDEV_EP5_TXFIFO_SIZE + 3) >> 2)
 
-#if STM32_EP5_TXFIFO_WORDS < 16
+#if STM32_EP5_TXFIFO_BYTES != 0 && STM32_EP5_TXFIFO_WORDS < 16
 #  error "CONFIG_USBDEV_EP5_TXFIFO_SIZE is out of range"
 #endif
 
@@ -259,10 +311,20 @@
 #define STM32_TRACEINTID_SETUPDONE          (90 + 3)
 #define STM32_TRACEINTID_SETUPRECVD         (90 + 4)
 
-/* Endpoints ******************************************************************/
+/* CONFIG_USB_DUMPBUFFER will dump the contents of buffers to the console. */
 
-/* Number of endpoints */
-#define STM32_NENDPOINTS             (6)          /* ep0-5 x 2 for IN and OUT */
+#define CONFIG_USB_DUMPBUFFER
+
+#if !defined(CONFIG_DEBUG_INFO) || !defined(CONFIG_DEBUG_USB)
+#  undef CONFIG_USB_DUMPBUFFER
+#endif
+#ifdef CONFIG_USB_DUMPBUFFER
+#  define usb_dumpbuffer(t,b,l) lib_dumpbuffer(t,b,l)
+#else
+#  define usb_dumpbuffer(t,b,l)
+#endif
+
+/* Endpoints ******************************************************************/
 
 /* Odd physical endpoint numbers are IN; even are OUT */
 
@@ -273,8 +335,11 @@
 
 #define EP0                          (0)
 
-/* The set of all endpoints available to the class implementation (1-3) */
-#define STM32_EP_AVAILABLE           (0x3e)       /* All available endpoints */
+/* The set of all endpoints available to the class implementation (1-n).
+ * This is a bitmap, and the first endpoint (0) is reserved.
+ */
+
+#define STM32_EP_AVAILABLE           (((1 << STM32_NENDPOINTS) - 1) & ~1)
 
 /* Maximum packet sizes for full speed endpoints */
 
@@ -496,7 +561,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_USB)
 static uint32_t    stm32_getreg(uint32_t addr);
 static void        stm32_putreg(uint32_t val, uint32_t addr);
 #else
@@ -816,7 +881,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_USB)
 static uint32_t stm32_getreg(uint32_t addr)
 {
   static uint32_t prevaddr = 0;
@@ -879,7 +944,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_USB)
 static void stm32_putreg(uint32_t val, uint32_t addr)
 {
   /* Show the register value being written */
@@ -1054,6 +1119,8 @@ static void stm32_txfifo_write(FAR struct stm32_ep_s *privep,
   int nwords;
   int i;
 
+  usb_dumpbuffer(">>>",buf,nbytes);
+
   /* Convert the number of bytes to words */
 
   nwords = (nbytes + 3) >> 2;
@@ -1442,6 +1509,8 @@ static void stm32_rxfifo_read(FAR struct stm32_ep_s *privep,
       *dest++ = data.b[2];
       *dest++ = data.b[3];
     }
+
+  usb_dumpbuffer("<<<",dest-len,len);
 }
 
 /****************************************************************************
@@ -1472,6 +1541,8 @@ static void stm32_rxfifo_discard(FAR struct stm32_ep_s *privep, int len)
           volatile uint32_t data = stm32_getreg(regaddr);
           (void)data;
         }
+
+      uinfo("<<< discarding %d\n",len);
     }
 }
 
@@ -2106,7 +2177,7 @@ static inline void stm32_ep0out_testmode(FAR struct stm32_usbdev_s *priv,
  * Name: stm32_ep0out_stdrequest
  *
  * Description:
- *   Handle a stanard request on EP0.  Pick off the things of interest to the
+ *   Handle a standard request on EP0.  Pick off the things of interest to the
  *   USB device controller driver; pass what is left to the class driver.
  *
  ****************************************************************************/
@@ -2321,6 +2392,8 @@ static inline void stm32_ep0out_stdrequest(struct stm32_usbdev_s *priv,
 
             stm32_setaddress(priv, (uint16_t)priv->ctrlreq.value[0]);
             stm32_ep0in_transmitzlp(priv);
+
+            uinfo("USB_REQ_SETADDRESS %02x\n",(uint16_t)priv->ctrlreq.value[0]);
           }
         else
           {
@@ -4209,7 +4282,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_USB
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -4249,7 +4322,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_USB
   if (!ep)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -4282,7 +4355,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_USB
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -4354,7 +4427,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_USB
   if (!req || !req->callback || !req->buf || !ep)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -4366,7 +4439,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_USB
   if (!priv->driver)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_NOTCONFIGURED), priv->usbdev.speed);
@@ -4443,7 +4516,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_USB
   if (!ep || !req)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -4901,7 +4974,7 @@ static int stm32_selfpowered(struct usbdev_s *dev, bool selfpowered)
 
   usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_USB
   if (!dev)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
@@ -5248,47 +5321,59 @@ static void stm32_hwinitialize(FAR struct stm32_usbdev_s *priv)
 
   stm32_putreg(STM32_RXFIFO_WORDS, STM32_OTGFS_GRXFSIZ);
 
+#if STM32_NENDPOINTS > 0
   /* EP0 TX */
 
   address = STM32_RXFIFO_WORDS;
   regval  = (address << OTGFS_DIEPTXF0_TX0FD_SHIFT) |
             (STM32_EP0_TXFIFO_WORDS << OTGFS_DIEPTXF0_TX0FSA_SHIFT);
   stm32_putreg(regval, STM32_OTGFS_DIEPTXF0);
+#endif
 
+#if STM32_NENDPOINTS > 1
   /* EP1 TX */
 
   address += STM32_EP0_TXFIFO_WORDS;
   regval   = (address << OTGFS_DIEPTXF_INEPTXSA_SHIFT) |
              (STM32_EP1_TXFIFO_WORDS << OTGFS_DIEPTXF_INEPTXFD_SHIFT);
   stm32_putreg(regval, STM32_OTGFS_DIEPTXF1);
+#endif
 
+#if STM32_NENDPOINTS > 2
   /* EP2 TX */
 
   address += STM32_EP1_TXFIFO_WORDS;
   regval   = (address << OTGFS_DIEPTXF_INEPTXSA_SHIFT) |
              (STM32_EP2_TXFIFO_WORDS << OTGFS_DIEPTXF_INEPTXFD_SHIFT);
   stm32_putreg(regval, STM32_OTGFS_DIEPTXF2);
+#endif
 
+#if STM32_NENDPOINTS > 3
   /* EP3 TX */
 
   address += STM32_EP2_TXFIFO_WORDS;
   regval   = (address << OTGFS_DIEPTXF_INEPTXSA_SHIFT) |
              (STM32_EP3_TXFIFO_WORDS << OTGFS_DIEPTXF_INEPTXFD_SHIFT);
   stm32_putreg(regval, STM32_OTGFS_DIEPTXF3);
+#endif
 
+#if STM32_NENDPOINTS > 4
   /* EP4 TX */
 
   address += STM32_EP3_TXFIFO_WORDS;
   regval   = (address << OTGFS_DIEPTXF_INEPTXSA_SHIFT) |
              (STM32_EP4_TXFIFO_WORDS << OTGFS_DIEPTXF_INEPTXFD_SHIFT);
   stm32_putreg(regval, STM32_OTGFS_DIEPTXF4);
+#endif
 
+#if STM32_NENDPOINTS > 5
   /* EP5 TX */
 
   address += STM32_EP4_TXFIFO_WORDS;
   regval   = (address << OTGFS_DIEPTXF_INEPTXSA_SHIFT) |
              (STM32_EP5_TXFIFO_WORDS << OTGFS_DIEPTXF_INEPTXFD_SHIFT);
   stm32_putreg(regval, STM32_OTGFS_DIEPTXF5);
+#endif
 
 
   /* Flush the FIFOs */
@@ -5583,7 +5668,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
 
   usbtrace(TRACE_DEVREGISTER, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_USB
   if (!driver || !driver->ops->bind || !driver->ops->unbind ||
       !driver->ops->disconnect || !driver->ops->setup)
     {
@@ -5654,7 +5739,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
 
   usbtrace(TRACE_DEVUNREGISTER, 0);
 
-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_DEBUG_USB
   if (driver != priv->driver)
     {
       usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
diff --git a/arch/arm/src/stm32l4/stm32l4_otgfshost.c b/arch/arm/src/stm32l4/stm32l4_otgfshost.c
index 352db80f7b..ebb07b6943 100644
--- a/arch/arm/src/stm32l4/stm32l4_otgfshost.c
+++ b/arch/arm/src/stm32l4/stm32l4_otgfshost.c
@@ -1285,7 +1285,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;
     }
 
@@ -1295,7 +1295,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;
     }
@@ -1347,7 +1347,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;
     }
 
@@ -1857,7 +1857,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;
         }
 
@@ -1888,7 +1888,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;
             }
         }
@@ -1933,7 +1933,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;
     }
 
@@ -1991,7 +1991,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;
     }
 
@@ -2000,7 +2000,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 */
@@ -2126,7 +2126,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;
         }
 
@@ -2154,7 +2154,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;
             }
 
@@ -2219,7 +2219,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;
     }
 
@@ -2277,7 +2277,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;
     }
 
@@ -2286,7 +2286,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 */
@@ -2371,7 +2371,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);
+  uinfo("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending);
 
   /* Check for a pending ACK response received/transmitted (ACK) interrupt */
 
@@ -2632,7 +2632,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);
+  uinfo("HCINTMSK%d: %08x pending: %08x\n", chidx, regval, pending);
 
   /* Check for a pending ACK response received/transmitted (ACK) interrupt */
 
@@ -2950,7 +2950,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);
+  uinfo("GRXSTS: %08x\n", grxsts);
 
   /* Isolate the channel number/index in the status word */
 
@@ -3103,7 +3103,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",
+  uinfo("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);
@@ -3191,7 +3191,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",
+  uinfo("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);
@@ -3866,7 +3866,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;
@@ -3912,7 +3912,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);
     }
 
@@ -4728,7 +4728,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");
+  uinfo("Hub port %d connected: %s\n", hport->port, connected ? "YES" : "NO");
 
   /* Report the connection event */
 
-- 
GitLab


From 4284546a87ed28cf0d2a295d59ae411fdaf63d94 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Thu, 7 Jul 2016 15:46:17 -0600
Subject: [PATCH 166/229] STM32F476-Disco:  Back DEBUG settings out of
 defconfig.

---
 configs/stm32l476vg-disco/nsh/defconfig | 117 +-----------------------
 1 file changed, 2 insertions(+), 115 deletions(-)

diff --git a/configs/stm32l476vg-disco/nsh/defconfig b/configs/stm32l476vg-disco/nsh/defconfig
index d377a00ef1..1a01f116f1 100644
--- a/configs/stm32l476vg-disco/nsh/defconfig
+++ b/configs/stm32l476vg-disco/nsh/defconfig
@@ -43,47 +43,6 @@ CONFIG_RAW_BINARY=y
 # Debug Options
 #
 CONFIG_DEBUG_ALERT=y
-CONFIG_DEBUG_FEATURES=y
-
-#
-# Debug SYSLOG Output Controls
-#
-# CONFIG_DEBUG_ERROR is not set
-# CONFIG_DEBUG_ASSERTIONS is not set
-
-#
-# Subsystem Debug Options
-#
-# CONFIG_DEBUG_BINFMT is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_DEBUG_GRAPHICS is not set
-# CONFIG_DEBUG_LIB is not set
-# CONFIG_DEBUG_MM is not set
-# CONFIG_DEBUG_SCHED is not set
-
-#
-# OS Function Debug Options
-#
-# CONFIG_DEBUG_DMA is not set
-# CONFIG_DEBUG_IRQ is not set
-
-#
-# Driver Debug Options
-#
-# CONFIG_DEBUG_LEDS is not set
-# CONFIG_DEBUG_GPIO is not set
-# CONFIG_DEBUG_RTC is not set
-# CONFIG_DEBUG_SPI is not set
-CONFIG_DEBUG_USB=y
-CONFIG_ARCH_HAVE_STACKCHECK=y
-# CONFIG_STACK_COLORATION is not set
-CONFIG_ARCH_HAVE_HEAPCHECK=y
-# CONFIG_HEAP_COLORATION is not set
-CONFIG_DEBUG_SYMBOLS=y
-CONFIG_ARCH_HAVE_CUSTOMOPT=y
-CONFIG_DEBUG_NOOPT=y
-# CONFIG_DEBUG_CUSTOMOPT is not set
-# CONFIG_DEBUG_FULLOPT is not set
 
 #
 # System Type
@@ -229,7 +188,6 @@ CONFIG_STM32L4_DMA2=y
 #
 # AHB2 Peripherals
 #
-CONFIG_STM32L4_OTGFS=y
 # CONFIG_STM32L4_ADC1 is not set
 # CONFIG_STM32L4_ADC2 is not set
 # CONFIG_STM32L4_ADC3 is not set
@@ -343,7 +301,6 @@ CONFIG_ARCH_HAVE_RESET=y
 # CONFIG_ARCH_USE_MPU is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_USBDUMP=y
 # CONFIG_ENDIAN_BIG is not set
 # CONFIG_ARCH_IDLE_CUSTOM is not set
 # CONFIG_ARCH_HAVE_RAMFUNCS is not set
@@ -408,7 +365,6 @@ CONFIG_LIB_BOARDCTL=y
 # CONFIG_BOARDCTL_RESET is not set
 CONFIG_BOARDCTL_UNIQUEID=y
 CONFIG_BOARDCTL_UNIQUEID_SIZE=12
-CONFIG_BOARDCTL_USBDEVCTRL=y
 # CONFIG_BOARDCTL_TSCTEST is not set
 # CONFIG_BOARDCTL_ADCTEST is not set
 # CONFIG_BOARDCTL_PWMTEST is not set
@@ -630,7 +586,6 @@ CONFIG_N25QXXX_SECTOR512=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
-CONFIG_SERIAL_REMOVABLE=y
 CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
@@ -678,52 +633,6 @@ CONFIG_USART2_2STOP=0
 # CONFIG_USART2_IFLOWCONTROL is not set
 # CONFIG_USART2_OFLOWCONTROL is not set
 # CONFIG_USART2_DMA is not set
-CONFIG_USBDEV=y
-
-#
-# USB Device Controller Driver Options
-#
-# CONFIG_USBDEV_ISOCHRONOUS is not set
-# CONFIG_USBDEV_DUALSPEED is not set
-CONFIG_USBDEV_SELFPOWERED=y
-# CONFIG_USBDEV_BUSPOWERED is not set
-CONFIG_USBDEV_MAXPOWER=100
-# CONFIG_USBDEV_DMA is not set
-# CONFIG_ARCH_USBDEV_STALLQUEUE is not set
-CONFIG_USBDEV_TRACE=y
-CONFIG_USBDEV_TRACE_NRECORDS=128
-CONFIG_USBDEV_TRACE_STRINGS=y
-CONFIG_USBDEV_TRACE_INITIALIDSET=y
-
-#
-# USB Device Class Driver Options
-#
-# CONFIG_USBDEV_COMPOSITE is not set
-# CONFIG_PL2303 is not set
-CONFIG_CDCACM=y
-# CONFIG_CDCACM_CONSOLE is not set
-CONFIG_CDCACM_EP0MAXPACKET=64
-CONFIG_CDCACM_EPINTIN=1
-CONFIG_CDCACM_EPINTIN_FSSIZE=64
-CONFIG_CDCACM_EPINTIN_HSSIZE=64
-CONFIG_CDCACM_EPBULKOUT=3
-CONFIG_CDCACM_EPBULKOUT_FSSIZE=64
-CONFIG_CDCACM_EPBULKOUT_HSSIZE=512
-CONFIG_CDCACM_EPBULKIN=2
-CONFIG_CDCACM_EPBULKIN_FSSIZE=64
-CONFIG_CDCACM_EPBULKIN_HSSIZE=512
-CONFIG_CDCACM_NRDREQS=4
-CONFIG_CDCACM_NWRREQS=4
-CONFIG_CDCACM_BULKIN_REQLEN=96
-CONFIG_CDCACM_RXBUFSIZE=257
-CONFIG_CDCACM_TXBUFSIZE=193
-CONFIG_CDCACM_VENDORID=0x0525
-CONFIG_CDCACM_PRODUCTID=0xa4a7
-CONFIG_CDCACM_VENDORSTR="NuttX"
-CONFIG_CDCACM_PRODUCTSTR="CDC/ACM Serial"
-# CONFIG_USBMSC is not set
-# CONFIG_USBHOST is not set
-# CONFIG_DRIVERS_WIRELESS is not set
 
 #
 # System Logging
@@ -798,7 +707,7 @@ CONFIG_FS_PROCFS_REGISTER=y
 # Memory Management
 #
 # CONFIG_MM_SMALL is not set
-CONFIG_MM_REGIONS=2
+CONFIG_MM_REGIONS=1
 # CONFIG_ARCH_HAVE_HEAP2 is not set
 # CONFIG_GRAN is not set
 
@@ -972,23 +881,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
 # CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_UNIONFS is not set
-CONFIG_EXAMPLES_USBSERIAL=y
-CONFIG_EXAMPLES_USBSERIAL_BUFSIZE=512
-CONFIG_EXAMPLES_USBSERIAL_TRACEINIT=y
-CONFIG_EXAMPLES_USBSERIAL_TRACECLASS=y
-CONFIG_EXAMPLES_USBSERIAL_TRACETRANSFERS=y
-CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=y
-CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=y
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
-CONFIG_EXAMPLES_USBSERIAL2=y
-CONFIG_EXAMPLES_USBSERIAL2_BUFSIZE=512
-CONFIG_EXAMPLES_USBSERIAL2_BUFSIZE=512
-CONFIG_EXAMPLES_USBSERIAL2_TRACEINIT=y
-CONFIG_EXAMPLES_USBSERIAL2_TRACECLASS=y
-CONFIG_EXAMPLES_USBSERIAL2_TRACETRANSFERS=y
-CONFIG_EXAMPLES_USBSERIAL2_TRACECONTROLLER=y
-CONFIG_EXAMPLES_USBSERIAL2_TRACEINTERRUPTS=y
 
 #
 # File System Utilities
@@ -1044,7 +938,7 @@ CONFIG_NSH_LINELEN=64
 # CONFIG_NSH_DISABLE_SEMICOLON is not set
 # CONFIG_NSH_CMDPARMS is not set
 CONFIG_NSH_MAXARGUMENTS=6
-CONFIG_NSH_ARGCAT=y
+# CONFIG_NSH_ARGCAT is not set
 CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLEBG is not set
 CONFIG_NSH_BUILTIN_APPS=y
@@ -1137,12 +1031,6 @@ CONFIG_NSH_CONSOLE=y
 #
 # USB Device Trace Support
 #
-CONFIG_NSH_USBDEV_TRACE=y
-CONFIG_NSH_USBDEV_TRACEINIT=y
-CONFIG_NSH_USBDEV_TRACECLASS=y
-CONFIG_NSH_USBDEV_TRACETRANSFERS=y
-CONFIG_NSH_USBDEV_TRACECONTROLLER=y
-CONFIG_NSH_USBDEV_TRACEINTERRUPTS=y
 CONFIG_NSH_ARCHINIT=y
 # CONFIG_NSH_LOGIN is not set
 # CONFIG_NSH_CONSOLE_LOGIN is not set
@@ -1179,4 +1067,3 @@ CONFIG_READLINE_ECHO=y
 # CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_USBMONITOR is not set
 # CONFIG_SYSTEM_ZMODEM is not set
-CONFIG_SYSTEM_DISCOTEST=y
-- 
GitLab


From 6f9a536ae8e75c77c658e9e937292798c1e1c7a2 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Thu, 7 Jul 2016 15:58:26 -0600
Subject: [PATCH 167/229] Disable DEBUG features be default in all
 configurations

---
 configs/nucleo-l476rg/nsh/defconfig       |  47 ++------
 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/shenzhou/thttpd/defconfig         |  55 +++------
 configs/sim/configdata/defconfig          | 129 ++++++++++++---------
 configs/sim/cxxtest/defconfig             | 122 ++++++++++---------
 configs/sim/mount/defconfig               | 125 +++++++++++---------
 configs/sim/mtdpart/defconfig             | 129 ++++++++++++---------
 configs/sim/mtdrwb/defconfig              | 130 ++++++++++++---------
 configs/sim/nx/defconfig                  | 123 +++++++++++---------
 configs/sim/nx11/defconfig                | 123 +++++++++++---------
 configs/sim/ostest/defconfig              | 106 +++++++++--------
 configs/sim/touchscreen/defconfig         | 123 +++++++++++---------
 configs/sim/traveler/defconfig            | 135 ++++++++++++----------
 configs/stm32f429i-disco/ltdc/defconfig   |   2 +-
 configs/stm32f4discovery/rgbled/defconfig |  50 +++-----
 configs/teensy-lc/nsh/defconfig           |  46 +++-----
 configs/u-blox-c027/nsh/defconfig         |  50 ++------
 20 files changed, 794 insertions(+), 709 deletions(-)

diff --git a/configs/nucleo-l476rg/nsh/defconfig b/configs/nucleo-l476rg/nsh/defconfig
index 968758596e..a63bb883ce 100644
--- a/configs/nucleo-l476rg/nsh/defconfig
+++ b/configs/nucleo-l476rg/nsh/defconfig
@@ -43,37 +43,7 @@ CONFIG_RAW_BINARY=y
 # Debug Options
 #
 CONFIG_DEBUG_ALERT=y
-CONFIG_DEBUG_FEATURES=y
-
-#
-# Debug SYSLOG Output Controls
-#
-# CONFIG_DEBUG_ERROR is not set
-# CONFIG_DEBUG_ASSERTIONS is not set
-
-#
-# Subsystem Debug Options
-#
-CONFIG_DEBUG_BINFMT=y
-CONFIG_DEBUG_FS=y
-CONFIG_DEBUG_GRAPHICS=y
-CONFIG_DEBUG_LIB=y
-# CONFIG_DEBUG_MM is not set
-# CONFIG_DEBUG_SCHED is not set
-
-#
-# OS Function Debug Options
-#
-# CONFIG_DEBUG_DMA is not set
-# CONFIG_DEBUG_IRQ is not set
-
-#
-# Driver Debug Options
-#
-CONFIG_DEBUG_LEDS=y
-CONFIG_DEBUG_GPIO=y
-# CONFIG_DEBUG_RTC is not set
-CONFIG_DEBUG_SPI=y
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
@@ -161,7 +131,6 @@ CONFIG_ARCH_HAVE_DPFPU=y
 # CONFIG_ARCH_HAVE_TRUSTZONE is not set
 CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
-# CONFIG_DEBUG_HARDFAULT is not set
 
 #
 # ARMV7M Configuration Options
@@ -381,11 +350,11 @@ CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_HAVE_BUTTONS=y
 # CONFIG_ARCH_BUTTONS is not set
 CONFIG_ARCH_HAVE_IRQBUTTONS=y
-CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Board-Specific Options
 #
+# CONFIG_BOARD_CRASHDUMP is not set
 CONFIG_LIB_BOARDCTL=y
 # CONFIG_BOARDCTL_RESET is not set
 # CONFIG_BOARDCTL_UNIQUEID is not set
@@ -545,7 +514,12 @@ CONFIG_RTC_IOCTL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
 
 #
 # LCD Driver Support
@@ -601,7 +575,6 @@ CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
 # CONFIG_SERIAL_DMA is not set
-# CONFIG_SERIAL_TIOCSERGSTRUCT is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_USART2_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -621,6 +594,7 @@ CONFIG_USART2_2STOP=0
 # CONFIG_USART2_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
+# CONFIG_HAVE_USBTRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
 #
@@ -635,6 +609,7 @@ CONFIG_SYSLOG_SERIAL_CONSOLE=y
 CONFIG_SYSLOG_CONSOLE=y
 # CONFIG_SYSLOG_NONE is not set
 # CONFIG_SYSLOG_FILE is not set
+# CONFIG_SYSLOG_CHARDEV is not set
 
 #
 # Networking Support
@@ -747,6 +722,7 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -952,6 +928,7 @@ CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Configure Command Options
@@ -992,7 +969,7 @@ CONFIG_NSH_ARCHINIT=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_LIB_HEX2BIN is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/rgmp/arm/nsh/defconfig b/configs/rgmp/arm/nsh/defconfig
index c6466fabca..bfe4d8a902 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_FEATURES=y
+# CONFIG_DEBUG_FEATURES is not set
 # 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 ddda0c478c..391c42a3a8 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_FEATURES=y
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_DEBUG_INFO=y
diff --git a/configs/rgmp/x86/helloxx/defconfig b/configs/rgmp/x86/helloxx/defconfig
index b581016e8c..932f82d216 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_FEATURES=y
+# CONFIG_DEBUG_FEATURES is not set
 # 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 4df54001cb..d0d2597120 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_FEATURES=y
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_INFO is not set
diff --git a/configs/shenzhou/thttpd/defconfig b/configs/shenzhou/thttpd/defconfig
index 64cb41b517..4c36758aa3 100644
--- a/configs/shenzhou/thttpd/defconfig
+++ b/configs/shenzhou/thttpd/defconfig
@@ -43,37 +43,7 @@ CONFIG_INTELHEX_BINARY=y
 # Debug Options
 #
 CONFIG_DEBUG_ALERT=y
-CONFIG_DEBUG_FEATURES=y
-
-#
-# Debug SYSLOG Output Controls
-#
-# CONFIG_DEBUG_ERROR is not set
-# CONFIG_DEBUG_ASSERTIONS is not set
-
-#
-# Subsystem Debug Options
-#
-# CONFIG_DEBUG_BINFMT is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_DEBUG_GRAPHICS is not set
-# CONFIG_DEBUG_LIB is not set
-# CONFIG_DEBUG_MM is not set
-# CONFIG_DEBUG_NET is not set
-# CONFIG_DEBUG_SCHED is not set
-
-#
-# OS Function Debug Options
-#
-# CONFIG_DEBUG_IRQ is not set
-
-#
-# Driver Debug Options
-#
-# CONFIG_DEBUG_LEDS is not set
-# CONFIG_DEBUG_GPIO is not set
-# CONFIG_DEBUG_RTC is not set
-# CONFIG_DEBUG_SPI is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
@@ -160,7 +130,6 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARCH_HAVE_TRUSTZONE is not set
 CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
-# CONFIG_DEBUG_HARDFAULT is not set
 
 #
 # ARMV7M Configuration Options
@@ -448,6 +417,8 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 #
 # Timer Configuration
 #
+# CONFIG_STM32_ONESHOT is not set
+# CONFIG_STM32_FREERUN is not set
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
 # CONFIG_STM32_TIM4_CAP is not set
@@ -597,11 +568,11 @@ CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_HAVE_BUTTONS=y
 # CONFIG_ARCH_BUTTONS is not set
 CONFIG_ARCH_HAVE_IRQBUTTONS=y
-CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Board-Specific Options
 #
+# CONFIG_BOARD_CRASHDUMP is not set
 CONFIG_LIB_BOARDCTL=y
 # CONFIG_BOARDCTL_RESET is not set
 # CONFIG_BOARDCTL_UNIQUEID is not set
@@ -624,6 +595,8 @@ CONFIG_DISABLE_OS_API=y
 #
 # Clocks and Timers
 #
+CONFIG_ARCH_HAVE_TICKLESS=y
+# CONFIG_SCHED_TICKLESS is not set
 CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
@@ -758,7 +731,12 @@ CONFIG_RTC=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
 
 #
 # LCD Driver Support
@@ -824,7 +802,6 @@ CONFIG_TELNET_TXBUFFER_SIZE=256
 # CONFIG_NETDEV_MULTINIC is not set
 # CONFIG_ARCH_HAVE_NETDEV_STATISTICS is not set
 # CONFIG_NETDEV_LATEINIT is not set
-# CONFIG_NET_DUMPPACKET is not set
 
 #
 # External Ethernet MAC Device Support
@@ -855,7 +832,6 @@ CONFIG_TELNET_TXBUFFER_SIZE=256
 # CONFIG_ETH0_PHY_LAN8740A is not set
 # CONFIG_ETH0_PHY_LAN8742A is not set
 CONFIG_ETH0_PHY_DM9161=y
-# CONFIG_NETDEV_PHY_DEBUG is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
@@ -894,7 +870,6 @@ CONFIG_SERIAL_NPOLLWAITERS=2
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
 # CONFIG_SERIAL_DMA is not set
-# CONFIG_SERIAL_TIOCSERGSTRUCT is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_USART2_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -914,6 +889,7 @@ CONFIG_USART2_2STOP=0
 # CONFIG_USART2_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
+# CONFIG_HAVE_USBTRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
 #
@@ -928,6 +904,7 @@ CONFIG_SYSLOG_SERIAL_CONSOLE=y
 CONFIG_SYSLOG_CONSOLE=y
 # CONFIG_SYSLOG_NONE is not set
 # CONFIG_SYSLOG_FILE is not set
+# CONFIG_SYSLOG_CHARDEV is not set
 
 #
 # Networking Support
@@ -1034,7 +1011,6 @@ CONFIG_NET_IOB=y
 CONFIG_IOB_NBUFFERS=24
 CONFIG_IOB_BUFSIZE=196
 CONFIG_IOB_NCHAINS=8
-# CONFIG_IOB_DEBUG is not set
 # CONFIG_NET_ARCH_INCR32 is not set
 # CONFIG_NET_ARCH_CHKSUM is not set
 CONFIG_NET_STATISTICS=y
@@ -1167,6 +1143,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 # CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -1423,6 +1400,7 @@ CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Configure Command Options
@@ -1451,7 +1429,6 @@ CONFIG_NSH_ARCHINIT=y
 #
 CONFIG_NSH_NETINIT=y
 # CONFIG_NSH_NETINIT_THREAD is not set
-# CONFIG_NSH_NETINIT_DEBUG is not set
 
 #
 # IP Address Configuration
@@ -1499,7 +1476,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_LIB_HEX2BIN is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/sim/configdata/defconfig b/configs/sim/configdata/defconfig
index 7b5ffd275e..be8693b48e 100644
--- a/configs/sim/configdata/defconfig
+++ b/configs/sim/configdata/defconfig
@@ -37,36 +37,15 @@ CONFIG_BUILD_FLAT=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
-CONFIG_DEBUG_FEATURES=y
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-# CONFIG_DEBUG_INFO is not set
-
-#
-# Subsystem Debug Options
-#
-# CONFIG_DEBUG_AUDIO is not set
-# CONFIG_DEBUG_BINFMT is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_DEBUG_GRAPHICS is not set
-# CONFIG_DEBUG_LIB is not set
-# CONFIG_DEBUG_MM is not set
-# CONFIG_DEBUG_SCHED is not set
-
-#
-# OS Function Debug Options
-#
-# CONFIG_DEBUG_IRQ is not set
-
-#
-# Driver Debug Options
-#
-# CONFIG_DEBUG_ANALOG is not set
-# CONFIG_DEBUG_GPIO is not set
+# CONFIG_DEBUG_ALERT 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
 # CONFIG_ARCH_HAVE_CUSTOMOPT is not set
 CONFIG_DEBUG_NOOPT=y
@@ -96,6 +75,8 @@ CONFIG_HOST_X86_64=y
 CONFIG_SIM_X8664_SYSTEMV=y
 # CONFIG_SIM_X8664_MICROSOFT is not set
 # CONFIG_SIM_WALLTIME is not set
+CONFIG_SIM_NET_HOST_ROUTE=y
+# CONFIG_SIM_NET_BRIDGE is not set
 # CONFIG_SIM_FRAMEBUFFER is not set
 # CONFIG_SIM_SPIFLASH is not set
 
@@ -110,6 +91,7 @@ CONFIG_SIM_X8664_SYSTEMV=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+CONFIG_ARCH_HAVE_MULTICPU=y
 # CONFIG_ARCH_HAVE_VFORK is not set
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
@@ -165,6 +147,7 @@ CONFIG_ARCH_BOARD="sim"
 #
 # Board-Specific Options
 #
+# CONFIG_BOARD_CRASHDUMP is not set
 # CONFIG_LIB_BOARDCTL is not set
 
 #
@@ -233,9 +216,10 @@ CONFIG_NAME_MAX=32
 # CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 
 #
@@ -281,8 +265,27 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
+# CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 CONFIG_MTD=y
 
 #
@@ -309,12 +312,15 @@ CONFIG_RAMMTD_FLASHSIM=y
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT25 is not set
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
+# CONFIG_MTD_N25QXXX is not set
 # CONFIG_MTD_SMART is not set
 # CONFIG_MTD_RAMTRON is not set
 # CONFIG_MTD_SST25 is not set
 # CONFIG_MTD_SST25XX is not set
+# CONFIG_MTD_SST26 is not set
 # CONFIG_MTD_SST39FV is not set
 # CONFIG_MTD_W25 is not set
 # CONFIG_EEPROM is not set
@@ -325,6 +331,8 @@ CONFIG_RAMMTD_FLASHSIM=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -348,10 +356,6 @@ CONFIG_SERIAL=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 # CONFIG_MCU_SERIAL is not set
 # CONFIG_STANDARD_SERIAL is not set
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -360,17 +364,22 @@ CONFIG_SERIAL=y
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
+# CONFIG_HAVE_USBTRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+# CONFIG_SYSLOG_CHARDEV is not set
 
 #
 # Networking Support
@@ -402,7 +411,9 @@ CONFIG_FS_FAT=y
 # CONFIG_FAT_LCNAMES is not set
 # CONFIG_FAT_LFN is not set
 # CONFIG_FS_FATTIME is not set
+# CONFIG_FAT_FORCE_INDIRECT is not set
 # CONFIG_FAT_DMAMEMORY is not set
+# CONFIG_FAT_DIRECT_RETRY is not set
 CONFIG_FS_NXFFS=y
 # CONFIG_NXFFS_SCAN_VOLUME is not set
 CONFIG_NXFFS_PREALLOCATED=y
@@ -417,11 +428,6 @@ CONFIG_NXFFS_TAILTHRESHOLD=8192
 # CONFIG_FS_UNIONFS is not set
 # CONFIG_FS_HOSTFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -440,6 +446,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -485,14 +495,18 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 # CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -511,6 +525,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Examples
 #
+# CONFIG_EXAMPLES_CHAT is not set
 CONFIG_EXAMPLES_CONFIGDATA=y
 # CONFIG_EXAMPLES_CONFIGDATA_ARCHINIT is not set
 CONFIG_EXAMPLES_CONFIGDATA_NEBLOCKS=4
@@ -524,10 +539,10 @@ CONFIG_EXAMPLES_CONFIGDATA_SILENT=y
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -536,7 +551,6 @@ CONFIG_EXAMPLES_CONFIGDATA_SILENT=y
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 CONFIG_EXAMPLES_NXFFS=y
 # CONFIG_EXAMPLES_NXFFS_ARCHINIT is not set
 CONFIG_EXAMPLES_NXFFS_NEBLOCKS=32
@@ -550,13 +564,15 @@ CONFIG_EXAMPLES_NXFFS_NLOOPS=100
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -564,18 +580,26 @@ CONFIG_EXAMPLES_NXFFS_NLOOPS=100
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
+# CONFIG_FSUTILS_FLASH_ERASEALL is not set
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -588,8 +612,8 @@ CONFIG_EXAMPLES_NXFFS_NLOOPS=100
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -600,6 +624,7 @@ CONFIG_EXAMPLES_NXFFS_NLOOPS=100
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -621,16 +646,16 @@ CONFIG_PLATFORM_CONFIGDATA=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_LIB_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sim/cxxtest/defconfig b/configs/sim/cxxtest/defconfig
index 11b482a728..aadd8c7966 100644
--- a/configs/sim/cxxtest/defconfig
+++ b/configs/sim/cxxtest/defconfig
@@ -37,36 +37,15 @@ CONFIG_BUILD_FLAT=y
 # CONFIG_ARCH_MATH_H is not set
 CONFIG_ARCH_FLOAT_H=y
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
-CONFIG_DEBUG_FEATURES=y
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-CONFIG_DEBUG_INFO=y
-
-#
-# Subsystem Debug Options
-#
-# CONFIG_DEBUG_AUDIO is not set
-# CONFIG_DEBUG_BINFMT is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_DEBUG_GRAPHICS is not set
-# CONFIG_DEBUG_LIB is not set
-# CONFIG_DEBUG_MM is not set
-# CONFIG_DEBUG_SCHED is not set
-
-#
-# OS Function Debug Options
-#
-# CONFIG_DEBUG_IRQ is not set
-
-#
-# Driver Debug Options
-#
-# CONFIG_DEBUG_ANALOG is not set
-# CONFIG_DEBUG_GPIO is not set
+# CONFIG_DEBUG_ALERT 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
 # CONFIG_ARCH_HAVE_CUSTOMOPT is not set
 # CONFIG_DEBUG_NOOPT is not set
@@ -96,6 +75,8 @@ CONFIG_HOST_X86_64=y
 CONFIG_SIM_X8664_SYSTEMV=y
 # CONFIG_SIM_X8664_MICROSOFT is not set
 # CONFIG_SIM_WALLTIME is not set
+CONFIG_SIM_NET_HOST_ROUTE=y
+# CONFIG_SIM_NET_BRIDGE is not set
 # CONFIG_SIM_FRAMEBUFFER is not set
 # CONFIG_SIM_SPIFLASH is not set
 
@@ -110,6 +91,7 @@ CONFIG_SIM_X8664_SYSTEMV=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+CONFIG_ARCH_HAVE_MULTICPU=y
 # CONFIG_ARCH_HAVE_VFORK is not set
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
@@ -165,6 +147,7 @@ CONFIG_ARCH_BOARD="sim"
 #
 # Board-Specific Options
 #
+# CONFIG_BOARD_CRASHDUMP is not set
 # CONFIG_LIB_BOARDCTL is not set
 
 #
@@ -254,9 +237,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=32
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -305,8 +289,27 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
+# CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -316,6 +319,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -339,10 +344,6 @@ CONFIG_SERIAL=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 # CONFIG_MCU_SERIAL is not set
 # CONFIG_STANDARD_SERIAL is not set
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -351,17 +352,22 @@ CONFIG_SERIAL=y
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
+# CONFIG_HAVE_USBTRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+# CONFIG_SYSLOG_CHARDEV is not set
 
 #
 # Networking Support
@@ -399,11 +405,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_UNIONFS is not set
 # CONFIG_FS_HOSTFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -422,6 +423,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -465,13 +470,17 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -500,6 +509,7 @@ CONFIG_UCLIBCXX_HAVE_LIBSUPCXX=y
 #
 # Examples
 #
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 CONFIG_EXAMPLES_CXXTEST=y
@@ -509,10 +519,10 @@ CONFIG_EXAMPLES_CXXTEST=y
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
 # CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -521,18 +531,19 @@ CONFIG_EXAMPLES_CXXTEST=y
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -540,18 +551,24 @@ CONFIG_EXAMPLES_CXXTEST=y
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -563,8 +580,8 @@ CONFIG_EXAMPLES_CXXTEST=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -575,6 +592,7 @@ CONFIG_EXAMPLES_CXXTEST=y
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -596,16 +614,16 @@ CONFIG_EXAMPLES_CXXTEST=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_LIB_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sim/mount/defconfig b/configs/sim/mount/defconfig
index e9031cd22e..0b32395be5 100644
--- a/configs/sim/mount/defconfig
+++ b/configs/sim/mount/defconfig
@@ -37,36 +37,15 @@ CONFIG_BUILD_FLAT=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
-CONFIG_DEBUG_FEATURES=y
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-CONFIG_DEBUG_INFO=y
-
-#
-# Subsystem Debug Options
-#
-# CONFIG_DEBUG_AUDIO is not set
-# CONFIG_DEBUG_BINFMT is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_DEBUG_GRAPHICS is not set
-# CONFIG_DEBUG_LIB is not set
-# CONFIG_DEBUG_MM is not set
-# CONFIG_DEBUG_SCHED is not set
-
-#
-# OS Function Debug Options
-#
-# CONFIG_DEBUG_IRQ is not set
-
-#
-# Driver Debug Options
-#
-# CONFIG_DEBUG_ANALOG is not set
-# CONFIG_DEBUG_GPIO is not set
+# CONFIG_DEBUG_ALERT 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
 # CONFIG_ARCH_HAVE_CUSTOMOPT is not set
 # CONFIG_DEBUG_NOOPT is not set
@@ -96,6 +75,8 @@ CONFIG_HOST_X86_64=y
 CONFIG_SIM_X8664_SYSTEMV=y
 # CONFIG_SIM_X8664_MICROSOFT is not set
 # CONFIG_SIM_WALLTIME is not set
+CONFIG_SIM_NET_HOST_ROUTE=y
+# CONFIG_SIM_NET_BRIDGE is not set
 # CONFIG_SIM_FRAMEBUFFER is not set
 # CONFIG_SIM_SPIFLASH is not set
 
@@ -110,6 +91,7 @@ CONFIG_SIM_X8664_SYSTEMV=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+CONFIG_ARCH_HAVE_MULTICPU=y
 # CONFIG_ARCH_HAVE_VFORK is not set
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
@@ -165,6 +147,7 @@ CONFIG_ARCH_BOARD="sim"
 #
 # Board-Specific Options
 #
+# CONFIG_BOARD_CRASHDUMP is not set
 # CONFIG_LIB_BOARDCTL is not set
 
 #
@@ -253,9 +236,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=32
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -304,8 +288,27 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
+# CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -315,6 +318,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -338,10 +343,6 @@ CONFIG_SERIAL=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 # CONFIG_MCU_SERIAL is not set
 # CONFIG_STANDARD_SERIAL is not set
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -350,17 +351,22 @@ CONFIG_SERIAL=y
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
+# CONFIG_HAVE_USBTRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+# CONFIG_SYSLOG_CHARDEV is not set
 
 #
 # Networking Support
@@ -393,7 +399,9 @@ CONFIG_FS_FAT=y
 # CONFIG_FAT_LCNAMES is not set
 # CONFIG_FAT_LFN is not set
 # CONFIG_FS_FATTIME is not set
+# CONFIG_FAT_FORCE_INDIRECT is not set
 # CONFIG_FAT_DMAMEMORY is not set
+# CONFIG_FAT_DIRECT_RETRY is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
 # CONFIG_FS_TMPFS is not set
@@ -402,11 +410,6 @@ CONFIG_FS_FAT=y
 # CONFIG_FS_UNIONFS is not set
 # CONFIG_FS_HOSTFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -425,6 +428,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -470,14 +477,18 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 # CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -496,6 +507,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Examples
 #
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -504,10 +516,10 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -518,18 +530,19 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -537,18 +550,25 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -561,8 +581,8 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -573,6 +593,7 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -594,16 +615,16 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_LIB_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sim/mtdpart/defconfig b/configs/sim/mtdpart/defconfig
index 74c851f7f2..c18f3d9a54 100644
--- a/configs/sim/mtdpart/defconfig
+++ b/configs/sim/mtdpart/defconfig
@@ -37,36 +37,15 @@ CONFIG_BUILD_FLAT=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
-CONFIG_DEBUG_FEATURES=y
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-# CONFIG_DEBUG_INFO is not set
-
-#
-# Subsystem Debug Options
-#
-# CONFIG_DEBUG_AUDIO is not set
-# CONFIG_DEBUG_BINFMT is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_DEBUG_GRAPHICS is not set
-# CONFIG_DEBUG_LIB is not set
-# CONFIG_DEBUG_MM is not set
-# CONFIG_DEBUG_SCHED is not set
-
-#
-# OS Function Debug Options
-#
-# CONFIG_DEBUG_IRQ is not set
-
-#
-# Driver Debug Options
-#
-# CONFIG_DEBUG_ANALOG is not set
-# CONFIG_DEBUG_GPIO is not set
+# CONFIG_DEBUG_ALERT 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
 # CONFIG_ARCH_HAVE_CUSTOMOPT is not set
 CONFIG_DEBUG_NOOPT=y
@@ -96,6 +75,8 @@ CONFIG_SIM_M32=y
 CONFIG_SIM_X8664_SYSTEMV=y
 # CONFIG_SIM_X8664_MICROSOFT is not set
 # CONFIG_SIM_WALLTIME is not set
+CONFIG_SIM_NET_HOST_ROUTE=y
+# CONFIG_SIM_NET_BRIDGE is not set
 # CONFIG_SIM_FRAMEBUFFER is not set
 # CONFIG_SIM_SPIFLASH is not set
 
@@ -110,6 +91,7 @@ CONFIG_SIM_X8664_SYSTEMV=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+CONFIG_ARCH_HAVE_MULTICPU=y
 # CONFIG_ARCH_HAVE_VFORK is not set
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
@@ -165,6 +147,7 @@ CONFIG_ARCH_BOARD="sim"
 #
 # Board-Specific Options
 #
+# CONFIG_BOARD_CRASHDUMP is not set
 # CONFIG_LIB_BOARDCTL is not set
 
 #
@@ -233,9 +216,10 @@ CONFIG_NAME_MAX=32
 # CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 
 #
@@ -281,8 +265,27 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
+# CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 CONFIG_MTD=y
 
 #
@@ -307,12 +310,15 @@ CONFIG_RAMMTD_FLASHSIM=y
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT25 is not set
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
+# CONFIG_MTD_N25QXXX is not set
 # CONFIG_MTD_SMART is not set
 # CONFIG_MTD_RAMTRON is not set
 # CONFIG_MTD_SST25 is not set
 # CONFIG_MTD_SST25XX is not set
+# CONFIG_MTD_SST26 is not set
 # CONFIG_MTD_SST39FV is not set
 # CONFIG_MTD_W25 is not set
 # CONFIG_EEPROM is not set
@@ -323,6 +329,8 @@ CONFIG_RAMMTD_FLASHSIM=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -346,10 +354,6 @@ CONFIG_SERIAL=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 # CONFIG_MCU_SERIAL is not set
 # CONFIG_STANDARD_SERIAL is not set
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -358,17 +362,22 @@ CONFIG_SERIAL=y
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
+# CONFIG_HAVE_USBTRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+# CONFIG_SYSLOG_CHARDEV is not set
 
 #
 # Networking Support
@@ -400,7 +409,9 @@ CONFIG_FS_FAT=y
 # CONFIG_FAT_LCNAMES is not set
 # CONFIG_FAT_LFN is not set
 # CONFIG_FS_FATTIME is not set
+# CONFIG_FAT_FORCE_INDIRECT is not set
 # CONFIG_FAT_DMAMEMORY is not set
+# CONFIG_FAT_DIRECT_RETRY is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
 # CONFIG_FS_TMPFS is not set
@@ -409,11 +420,6 @@ CONFIG_FS_FAT=y
 # CONFIG_FS_UNIONFS is not set
 # CONFIG_FS_HOSTFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -432,6 +438,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -477,14 +487,18 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 # CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -503,6 +517,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Examples
 #
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -511,10 +526,10 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -527,18 +542,19 @@ CONFIG_EXAMPLES_MTDPART_NPARTITIONS=3
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -546,18 +562,26 @@ CONFIG_EXAMPLES_MTDPART_NPARTITIONS=3
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
+# CONFIG_FSUTILS_FLASH_ERASEALL is not set
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -570,8 +594,8 @@ CONFIG_EXAMPLES_MTDPART_NPARTITIONS=3
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -582,6 +606,7 @@ CONFIG_EXAMPLES_MTDPART_NPARTITIONS=3
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -603,16 +628,16 @@ CONFIG_EXAMPLES_MTDPART_NPARTITIONS=3
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_LIB_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sim/mtdrwb/defconfig b/configs/sim/mtdrwb/defconfig
index 6e56c95229..e6eed37e74 100644
--- a/configs/sim/mtdrwb/defconfig
+++ b/configs/sim/mtdrwb/defconfig
@@ -37,36 +37,15 @@ CONFIG_BUILD_FLAT=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
-CONFIG_DEBUG_FEATURES=y
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-# CONFIG_DEBUG_INFO is not set
-
-#
-# Subsystem Debug Options
-#
-# CONFIG_DEBUG_AUDIO is not set
-# CONFIG_DEBUG_BINFMT is not set
-CONFIG_DEBUG_FS=y
-# CONFIG_DEBUG_GRAPHICS is not set
-# CONFIG_DEBUG_LIB is not set
-# CONFIG_DEBUG_MM is not set
-# CONFIG_DEBUG_SCHED is not set
-
-#
-# OS Function Debug Options
-#
-# CONFIG_DEBUG_IRQ is not set
-
-#
-# Driver Debug Options
-#
-# CONFIG_DEBUG_ANALOG is not set
-# CONFIG_DEBUG_GPIO is not set
+# CONFIG_DEBUG_ALERT 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
 # CONFIG_ARCH_HAVE_CUSTOMOPT is not set
 CONFIG_DEBUG_NOOPT=y
@@ -96,6 +75,8 @@ CONFIG_SIM_M32=y
 CONFIG_SIM_X8664_SYSTEMV=y
 # CONFIG_SIM_X8664_MICROSOFT is not set
 # CONFIG_SIM_WALLTIME is not set
+CONFIG_SIM_NET_HOST_ROUTE=y
+# CONFIG_SIM_NET_BRIDGE is not set
 # CONFIG_SIM_FRAMEBUFFER is not set
 # CONFIG_SIM_SPIFLASH is not set
 
@@ -110,6 +91,7 @@ CONFIG_SIM_X8664_SYSTEMV=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+CONFIG_ARCH_HAVE_MULTICPU=y
 # CONFIG_ARCH_HAVE_VFORK is not set
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
@@ -165,6 +147,7 @@ CONFIG_ARCH_BOARD="sim"
 #
 # Board-Specific Options
 #
+# CONFIG_BOARD_CRASHDUMP is not set
 # CONFIG_LIB_BOARDCTL is not set
 
 #
@@ -239,6 +222,7 @@ CONFIG_NAME_MAX=32
 # CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
+# CONFIG_SIG_EVTHREAD is not set
 
 #
 # Signal Numbers
@@ -248,9 +232,10 @@ CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
 CONFIG_SIG_SIGCONDTIMEDOUT=16
 CONFIG_SIG_SIGWORK=17
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 CONFIG_SCHED_WORKQUEUE=y
 CONFIG_SCHED_HPWORK=y
@@ -306,8 +291,27 @@ CONFIG_DRVR_INVALIDATE=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
+# CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 CONFIG_MTD=y
 
 #
@@ -338,12 +342,15 @@ CONFIG_RAMMTD_FLASHSIM=y
 # CONFIG_MTD_AT24XX is not set
 # CONFIG_MTD_AT25 is not set
 # CONFIG_MTD_AT45DB is not set
+# CONFIG_MTD_IS25XP is not set
 # CONFIG_MTD_M25P is not set
 # CONFIG_MTD_S25FL1 is not set
+# CONFIG_MTD_N25QXXX is not set
 # CONFIG_MTD_SMART is not set
 # CONFIG_MTD_RAMTRON is not set
 # CONFIG_MTD_SST25 is not set
 # CONFIG_MTD_SST25XX is not set
+# CONFIG_MTD_SST26 is not set
 # CONFIG_MTD_SST39FV is not set
 # CONFIG_MTD_W25 is not set
 # CONFIG_EEPROM is not set
@@ -354,6 +361,8 @@ CONFIG_RAMMTD_FLASHSIM=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -377,10 +386,6 @@ CONFIG_SERIAL=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 # CONFIG_MCU_SERIAL is not set
 # CONFIG_STANDARD_SERIAL is not set
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -389,17 +394,22 @@ CONFIG_SERIAL=y
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
+# CONFIG_HAVE_USBTRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+# CONFIG_SYSLOG_CHARDEV is not set
 
 #
 # Networking Support
@@ -431,7 +441,9 @@ CONFIG_FS_FAT=y
 # CONFIG_FAT_LCNAMES is not set
 # CONFIG_FAT_LFN is not set
 # CONFIG_FS_FATTIME is not set
+# CONFIG_FAT_FORCE_INDIRECT is not set
 # CONFIG_FAT_DMAMEMORY is not set
+# CONFIG_FAT_DIRECT_RETRY is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
 # CONFIG_FS_TMPFS is not set
@@ -440,11 +452,6 @@ CONFIG_FS_FAT=y
 # CONFIG_FS_UNIONFS is not set
 # CONFIG_FS_HOSTFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -463,6 +470,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -508,14 +519,18 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 # CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -534,6 +549,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Examples
 #
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -542,10 +558,10 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -559,18 +575,19 @@ CONFIG_EXAMPLES_MTDRWB_NEBLOCKS=32
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -578,18 +595,26 @@ CONFIG_EXAMPLES_MTDRWB_NEBLOCKS=32
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
+# CONFIG_FSUTILS_FLASH_ERASEALL is not set
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -602,8 +627,8 @@ CONFIG_EXAMPLES_MTDRWB_NEBLOCKS=32
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -614,6 +639,7 @@ CONFIG_EXAMPLES_MTDRWB_NEBLOCKS=32
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -635,16 +661,16 @@ CONFIG_EXAMPLES_MTDRWB_NEBLOCKS=32
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_LIB_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sim/nx/defconfig b/configs/sim/nx/defconfig
index 8c2777349d..864c8f4a36 100644
--- a/configs/sim/nx/defconfig
+++ b/configs/sim/nx/defconfig
@@ -37,36 +37,15 @@ CONFIG_BUILD_FLAT=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
-CONFIG_DEBUG_FEATURES=y
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-CONFIG_DEBUG_INFO=y
-
-#
-# Subsystem Debug Options
-#
-# CONFIG_DEBUG_AUDIO is not set
-# CONFIG_DEBUG_BINFMT is not set
-# CONFIG_DEBUG_FS is not set
-CONFIG_DEBUG_GRAPHICS=y
-# CONFIG_DEBUG_LIB is not set
-# CONFIG_DEBUG_MM is not set
-# CONFIG_DEBUG_SCHED is not set
-
-#
-# OS Function Debug Options
-#
-# CONFIG_DEBUG_IRQ is not set
-
-#
-# Driver Debug Options
-#
-# CONFIG_DEBUG_ANALOG is not set
-# CONFIG_DEBUG_GPIO is not set
+# CONFIG_DEBUG_ALERT 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
 # CONFIG_ARCH_HAVE_CUSTOMOPT is not set
 # CONFIG_DEBUG_NOOPT is not set
@@ -96,6 +75,8 @@ CONFIG_HOST_X86_64=y
 CONFIG_SIM_X8664_SYSTEMV=y
 # CONFIG_SIM_X8664_MICROSOFT is not set
 # CONFIG_SIM_WALLTIME is not set
+CONFIG_SIM_NET_HOST_ROUTE=y
+# CONFIG_SIM_NET_BRIDGE is not set
 CONFIG_SIM_FRAMEBUFFER=y
 # CONFIG_SIM_X11FB is not set
 CONFIG_SIM_FBHEIGHT=240
@@ -114,6 +95,7 @@ CONFIG_SIM_FBBPP=8
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+CONFIG_ARCH_HAVE_MULTICPU=y
 # CONFIG_ARCH_HAVE_VFORK is not set
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
@@ -169,6 +151,7 @@ CONFIG_ARCH_BOARD="sim"
 #
 # Board-Specific Options
 #
+# CONFIG_BOARD_CRASHDUMP is not set
 # CONFIG_LIB_BOARDCTL is not set
 
 #
@@ -257,9 +240,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=32
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -308,8 +292,27 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
+# CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -319,6 +322,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -342,10 +347,6 @@ CONFIG_SERIAL=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 # CONFIG_MCU_SERIAL is not set
 # CONFIG_STANDARD_SERIAL is not set
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -354,17 +355,22 @@ CONFIG_SERIAL=y
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
+# CONFIG_HAVE_USBTRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+# CONFIG_SYSLOG_CHARDEV is not set
 
 #
 # Networking Support
@@ -395,11 +401,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -407,6 +408,7 @@ CONFIG_NX=y
 CONFIG_NX_NPLANES=1
 CONFIG_NX_BGCOLOR=0x0
 # CONFIG_NX_WRITEONLY is not set
+# CONFIG_NX_UPDATE is not set
 
 #
 # Supported Pixel Depths
@@ -502,6 +504,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -542,13 +548,17 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -567,6 +577,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Examples
 #
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -574,10 +585,10 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -593,18 +604,19 @@ CONFIG_EXAMPLES_NX_DEFAULT_FONT=y
 CONFIG_EXAMPLES_NX_BPP=8
 # CONFIG_EXAMPLES_NX_RAWWINDOWS is not set
 CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -612,18 +624,24 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -635,8 +653,8 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -647,6 +665,7 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -668,16 +687,16 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_LIB_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sim/nx11/defconfig b/configs/sim/nx11/defconfig
index b43102e8d6..dc84431de8 100644
--- a/configs/sim/nx11/defconfig
+++ b/configs/sim/nx11/defconfig
@@ -37,36 +37,15 @@ CONFIG_BUILD_FLAT=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
-CONFIG_DEBUG_FEATURES=y
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-CONFIG_DEBUG_INFO=y
-
-#
-# Subsystem Debug Options
-#
-# CONFIG_DEBUG_AUDIO is not set
-# CONFIG_DEBUG_BINFMT is not set
-# CONFIG_DEBUG_FS is not set
-CONFIG_DEBUG_GRAPHICS=y
-# CONFIG_DEBUG_LIB is not set
-# CONFIG_DEBUG_MM is not set
-# CONFIG_DEBUG_SCHED is not set
-
-#
-# OS Function Debug Options
-#
-# CONFIG_DEBUG_IRQ is not set
-
-#
-# Driver Debug Options
-#
-# CONFIG_DEBUG_ANALOG is not set
-# CONFIG_DEBUG_GPIO is not set
+# CONFIG_DEBUG_ALERT 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
 # CONFIG_ARCH_HAVE_CUSTOMOPT is not set
 # CONFIG_DEBUG_NOOPT is not set
@@ -96,6 +75,8 @@ CONFIG_HOST_X86_64=y
 CONFIG_SIM_X8664_SYSTEMV=y
 # CONFIG_SIM_X8664_MICROSOFT is not set
 # CONFIG_SIM_WALLTIME is not set
+CONFIG_SIM_NET_HOST_ROUTE=y
+# CONFIG_SIM_NET_BRIDGE is not set
 CONFIG_SIM_FRAMEBUFFER=y
 CONFIG_SIM_X11FB=y
 # CONFIG_SIM_X11NOSHM is not set
@@ -115,6 +96,7 @@ CONFIG_SIM_FBBPP=32
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+CONFIG_ARCH_HAVE_MULTICPU=y
 # CONFIG_ARCH_HAVE_VFORK is not set
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
@@ -170,6 +152,7 @@ CONFIG_ARCH_BOARD="sim"
 #
 # Board-Specific Options
 #
+# CONFIG_BOARD_CRASHDUMP is not set
 # CONFIG_LIB_BOARDCTL is not set
 
 #
@@ -258,9 +241,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=32
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -309,8 +293,27 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
+# CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -320,6 +323,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -343,10 +348,6 @@ CONFIG_SERIAL=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 # CONFIG_MCU_SERIAL is not set
 # CONFIG_STANDARD_SERIAL is not set
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -355,17 +356,22 @@ CONFIG_SERIAL=y
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
+# CONFIG_HAVE_USBTRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+# CONFIG_SYSLOG_CHARDEV is not set
 
 #
 # Networking Support
@@ -396,11 +402,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -409,6 +410,7 @@ CONFIG_NX_NPLANES=1
 CONFIG_NX_BGCOLOR=0x0
 # CONFIG_NX_ANTIALIASING is not set
 # CONFIG_NX_WRITEONLY is not set
+# CONFIG_NX_UPDATE is not set
 
 #
 # Supported Pixel Depths
@@ -504,6 +506,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -544,13 +550,17 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -569,6 +579,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Examples
 #
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -576,10 +587,10 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -595,18 +606,19 @@ CONFIG_EXAMPLES_NX_DEFAULT_FONT=y
 CONFIG_EXAMPLES_NX_BPP=32
 # CONFIG_EXAMPLES_NX_RAWWINDOWS is not set
 CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -614,18 +626,24 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -637,8 +655,8 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -649,6 +667,7 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -670,16 +689,16 @@ CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_LIB_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sim/ostest/defconfig b/configs/sim/ostest/defconfig
index e96b5b2232..5bae44782f 100644
--- a/configs/sim/ostest/defconfig
+++ b/configs/sim/ostest/defconfig
@@ -42,32 +42,10 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-CONFIG_DEBUG_FEATURES=y
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-CONFIG_DEBUG_INFO=y
-
-#
-# Subsystem Debug Options
-#
-# CONFIG_DEBUG_AUDIO is not set
-# CONFIG_DEBUG_BINFMT is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_DEBUG_GRAPHICS is not set
-# CONFIG_DEBUG_LIB is not set
-# CONFIG_DEBUG_MM is not set
-# CONFIG_DEBUG_SCHED is not set
-
-#
-# OS Function Debug Options
-#
-# CONFIG_DEBUG_IRQ is not set
-
-#
-# Driver Debug Options
-#
-# CONFIG_DEBUG_ANALOG is not set
-# CONFIG_DEBUG_GPIO is not set
+# CONFIG_DEBUG_ALERT 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
 # CONFIG_ARCH_HAVE_CUSTOMOPT is not set
 CONFIG_DEBUG_NOOPT=y
@@ -97,6 +75,8 @@ CONFIG_HOST_X86_64=y
 CONFIG_SIM_X8664_SYSTEMV=y
 # CONFIG_SIM_X8664_MICROSOFT is not set
 # CONFIG_SIM_WALLTIME is not set
+CONFIG_SIM_NET_HOST_ROUTE=y
+# CONFIG_SIM_NET_BRIDGE is not set
 # CONFIG_SIM_FRAMEBUFFER is not set
 # CONFIG_SIM_SPIFLASH is not set
 
@@ -167,6 +147,7 @@ CONFIG_ARCH_BOARD="sim"
 #
 # Board-Specific Options
 #
+# CONFIG_BOARD_CRASHDUMP is not set
 # CONFIG_LIB_BOARDCTL is not set
 
 #
@@ -309,13 +290,25 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
 #
+# CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -327,6 +320,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -350,10 +345,6 @@ CONFIG_SERIAL=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 # CONFIG_MCU_SERIAL is not set
 # CONFIG_STANDARD_SERIAL is not set
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -362,17 +353,22 @@ CONFIG_SERIAL=y
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
+# CONFIG_HAVE_USBTRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+# CONFIG_SYSLOG_CHARDEV is not set
 
 #
 # Networking Support
@@ -411,11 +407,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_UNIONFS is not set
 # CONFIG_FS_HOSTFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -434,6 +425,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -477,13 +472,17 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -510,10 +509,10 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -522,11 +521,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 CONFIG_EXAMPLES_OSTEST=y
 CONFIG_EXAMPLES_OSTEST_LOOPS=100
@@ -538,8 +537,9 @@ CONFIG_EXAMPLES_OSTEST_WAITRESULT=y
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -547,20 +547,25 @@ CONFIG_EXAMPLES_OSTEST_WAITRESULT=y
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
 # CONFIG_FSUTILS_INIFILE is not set
 
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
 #
 # Graphics Support
 #
@@ -571,8 +576,8 @@ CONFIG_EXAMPLES_OSTEST_WAITRESULT=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -583,6 +588,7 @@ CONFIG_EXAMPLES_OSTEST_WAITRESULT=y
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -604,16 +610,16 @@ CONFIG_EXAMPLES_OSTEST_WAITRESULT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_LIB_HEX2BIN is not set
+# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sim/touchscreen/defconfig b/configs/sim/touchscreen/defconfig
index 7be0481745..bba44976d6 100644
--- a/configs/sim/touchscreen/defconfig
+++ b/configs/sim/touchscreen/defconfig
@@ -37,37 +37,15 @@ CONFIG_BUILD_FLAT=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
-CONFIG_DEBUG_FEATURES=y
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-CONFIG_DEBUG_INFO=y
-
-#
-# Subsystem Debug Options
-#
-# CONFIG_DEBUG_AUDIO is not set
-# CONFIG_DEBUG_BINFMT is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_DEBUG_GRAPHICS is not set
-# CONFIG_DEBUG_LIB is not set
-# CONFIG_DEBUG_MM is not set
-# CONFIG_DEBUG_SCHED is not set
-
-#
-# OS Function Debug Options
-#
-# CONFIG_DEBUG_IRQ is not set
-
-#
-# Driver Debug Options
-#
-# CONFIG_DEBUG_INPUT is not set
-# CONFIG_DEBUG_ANALOG is not set
-# CONFIG_DEBUG_GPIO is not set
+# CONFIG_DEBUG_ALERT 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
 # CONFIG_ARCH_HAVE_CUSTOMOPT is not set
 # CONFIG_DEBUG_NOOPT is not set
@@ -97,6 +75,8 @@ CONFIG_HOST_X86_64=y
 CONFIG_SIM_X8664_SYSTEMV=y
 # CONFIG_SIM_X8664_MICROSOFT is not set
 # CONFIG_SIM_WALLTIME is not set
+CONFIG_SIM_NET_HOST_ROUTE=y
+# CONFIG_SIM_NET_BRIDGE is not set
 CONFIG_SIM_FRAMEBUFFER=y
 CONFIG_SIM_X11FB=y
 # CONFIG_SIM_X11NOSHM is not set
@@ -120,6 +100,7 @@ CONFIG_SIM_TOUCHSCREEN=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+CONFIG_ARCH_HAVE_MULTICPU=y
 # CONFIG_ARCH_HAVE_VFORK is not set
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
@@ -176,6 +157,7 @@ CONFIG_ARCH_BOARD="sim"
 # Board-Specific Options
 #
 CONFIG_EXAMPLES_TOUCHSCREEN_BGCOLOR=0x007b68ee
+# CONFIG_BOARD_CRASHDUMP is not set
 CONFIG_LIB_BOARDCTL=y
 # CONFIG_BOARDCTL_POWEROFF is not set
 # CONFIG_BOARDCTL_UNIQUEID is not set
@@ -271,9 +253,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=32
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -331,8 +314,27 @@ CONFIG_INPUT=y
 # CONFIG_BUTTONS is not set
 # CONFIG_DJOYSTICK is not set
 # CONFIG_AJOYSTICK is not set
+
+#
+# IO Expander/GPIO Support
+#
+# CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -342,6 +344,8 @@ CONFIG_INPUT=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -365,10 +369,6 @@ CONFIG_SERIAL=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 # CONFIG_MCU_SERIAL is not set
 # CONFIG_STANDARD_SERIAL is not set
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -377,17 +377,22 @@ CONFIG_SERIAL=y
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
+# CONFIG_HAVE_USBTRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+# CONFIG_SYSLOG_CHARDEV is not set
 
 #
 # Networking Support
@@ -418,11 +423,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -431,6 +431,7 @@ CONFIG_NX_NPLANES=1
 CONFIG_NX_BGCOLOR=0x0
 # CONFIG_NX_ANTIALIASING is not set
 # CONFIG_NX_WRITEONLY is not set
+# CONFIG_NX_UPDATE is not set
 
 #
 # Supported Pixel Depths
@@ -526,6 +527,10 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -566,13 +571,17 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -591,6 +600,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Examples
 #
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -598,10 +608,10 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -610,18 +620,19 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -629,6 +640,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
@@ -638,14 +650,20 @@ CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0"
 CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES=25
 # CONFIG_EXAMPLES_TOUCHSCREEN_MOUSE is not set
 CONFIG_EXAMPLES_TOUCHSCREEN_ARCHINIT=y
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -657,8 +675,8 @@ CONFIG_EXAMPLES_TOUCHSCREEN_ARCHINIT=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -669,6 +687,7 @@ CONFIG_EXAMPLES_TOUCHSCREEN_ARCHINIT=y
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -690,16 +709,16 @@ CONFIG_EXAMPLES_TOUCHSCREEN_ARCHINIT=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_LIB_HEX2BIN is not set
-# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/sim/traveler/defconfig b/configs/sim/traveler/defconfig
index b38a951a5e..8e930e22fe 100644
--- a/configs/sim/traveler/defconfig
+++ b/configs/sim/traveler/defconfig
@@ -37,37 +37,15 @@ CONFIG_BUILD_FLAT=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
-CONFIG_DEBUG_FEATURES=y
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-CONFIG_DEBUG_INFO=y
-
-#
-# Subsystem Debug Options
-#
-# CONFIG_DEBUG_AUDIO is not set
-# CONFIG_DEBUG_BINFMT is not set
-# CONFIG_DEBUG_FS is not set
-CONFIG_DEBUG_GRAPHICS=y
-# CONFIG_DEBUG_LIB is not set
-# CONFIG_DEBUG_MM is not set
-# CONFIG_DEBUG_SCHED is not set
-
-#
-# OS Function Debug Options
-#
-# CONFIG_DEBUG_IRQ is not set
-
-#
-# Driver Debug Options
-#
-# CONFIG_DEBUG_INPUT is not set
-# CONFIG_DEBUG_ANALOG is not set
-# CONFIG_DEBUG_GPIO is not set
+# CONFIG_DEBUG_ALERT 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
 # CONFIG_ARCH_HAVE_CUSTOMOPT is not set
 # CONFIG_DEBUG_NOOPT is not set
@@ -97,6 +75,8 @@ CONFIG_HOST_X86_64=y
 CONFIG_SIM_X8664_SYSTEMV=y
 # CONFIG_SIM_X8664_MICROSOFT is not set
 # CONFIG_SIM_WALLTIME is not set
+CONFIG_SIM_NET_HOST_ROUTE=y
+# CONFIG_SIM_NET_BRIDGE is not set
 CONFIG_SIM_FRAMEBUFFER=y
 CONFIG_SIM_X11FB=y
 # CONFIG_SIM_X11NOSHM is not set
@@ -119,6 +99,7 @@ CONFIG_SIM_AJOYSTICK=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+CONFIG_ARCH_HAVE_MULTICPU=y
 # CONFIG_ARCH_HAVE_VFORK is not set
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
@@ -174,6 +155,7 @@ CONFIG_ARCH_BOARD="sim"
 #
 # Board-Specific Options
 #
+# CONFIG_BOARD_CRASHDUMP is not set
 # CONFIG_LIB_BOARDCTL is not set
 
 #
@@ -206,6 +188,8 @@ CONFIG_PREALLOC_TIMERS=8
 #
 # Tasks and Scheduling
 #
+# CONFIG_SPINLOCK is not set
+# CONFIG_SMP is not set
 # CONFIG_INIT_NONE is not set
 CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
@@ -263,9 +247,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=32
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
 
 #
-# Work Queue Support
+# Work queue support
 #
 # CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_SCHED_HPWORK is not set
@@ -323,8 +308,27 @@ CONFIG_INPUT=y
 # CONFIG_BUTTONS is not set
 # CONFIG_DJOYSTICK is not set
 CONFIG_AJOYSTICK=y
+
+#
+# IO Expander/GPIO Support
+#
+# CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
 # CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
@@ -334,6 +338,8 @@ CONFIG_AJOYSTICK=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 # CONFIG_UART0_SERIALDRIVER is not set
@@ -357,10 +363,6 @@ CONFIG_SERIAL=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 # CONFIG_MCU_SERIAL is not set
 # CONFIG_STANDARD_SERIAL is not set
 # CONFIG_SERIAL_IFLOWCONTROL is not set
@@ -369,17 +371,22 @@ CONFIG_SERIAL=y
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
+# CONFIG_HAVE_USBTRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+# CONFIG_SYSLOG_CHARDEV is not set
 
 #
 # Networking Support
@@ -417,11 +424,6 @@ CONFIG_FS_ROMFS=y
 # CONFIG_FS_UNIONFS is not set
 # CONFIG_FS_HOSTFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -440,6 +442,11 @@ CONFIG_MM_REGIONS=1
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+# CONFIG_WIRELESS is not set
+
 #
 # Binary Loader
 #
@@ -480,14 +487,18 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 # CONFIG_NETDB_HOSTFILE is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -507,6 +518,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # Examples
 #
 # CONFIG_EXAMPLES_AJOYSTICK is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -514,10 +526,10 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -526,18 +538,19 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
@@ -546,20 +559,29 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_UNIONFS is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
+CONFIG_FSUTILS_INIFILE=y
+CONFIG_FSUTILS_INIFILE_MAXLINE=256
+CONFIG_FSUTILS_INIFILE_DEBUGLEVEL=0
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
@@ -567,10 +589,6 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_TIFF is not set
 CONFIG_GRAPHICS_TRAVELER=y
 
-#
-# Traveler game
-#
-
 #
 # Color configuration
 #
@@ -601,8 +619,8 @@ CONFIG_GRAPHICS_TRAVELER_DEBUG_LEVEL=0
 #
 # CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -613,6 +631,7 @@ CONFIG_GRAPHICS_TRAVELER_DEBUG_LEVEL=0
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -634,18 +653,16 @@ CONFIG_GRAPHICS_TRAVELER_DEBUG_LEVEL=0
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_LIB_HEX2BIN is not set
-CONFIG_FSUTILS_INIFILE=y
-CONFIG_FSUTILS_INIFILE_MAXLINE=256
-CONFIG_FSUTILS_INIFILE_DEBUGLEVEL=0
+# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm32f429i-disco/ltdc/defconfig b/configs/stm32f429i-disco/ltdc/defconfig
index ac7f9e336f..25fc3c3188 100644
--- a/configs/stm32f429i-disco/ltdc/defconfig
+++ b/configs/stm32f429i-disco/ltdc/defconfig
@@ -43,7 +43,7 @@ CONFIG_RAW_BINARY=y
 # Debug Options
 #
 CONFIG_DEBUG_ALERT=y
-CONFIG_DEBUG_FEATURES=y
+# CONFIG_DEBUG_FEATURES is not set
 
 #
 # Debug SYSLOG Output Controls
diff --git a/configs/stm32f4discovery/rgbled/defconfig b/configs/stm32f4discovery/rgbled/defconfig
index 10e9ac486d..be01e5261c 100644
--- a/configs/stm32f4discovery/rgbled/defconfig
+++ b/configs/stm32f4discovery/rgbled/defconfig
@@ -43,36 +43,7 @@ CONFIG_RAW_BINARY=y
 # Debug Options
 #
 CONFIG_DEBUG_ALERT=y
-CONFIG_DEBUG_FEATURES=y
-
-#
-# Debug SYSLOG Output Controls
-#
-# CONFIG_DEBUG_ERROR is not set
-# CONFIG_DEBUG_ASSERTIONS is not set
-
-#
-# Subsystem Debug Options
-#
-# CONFIG_DEBUG_BINFMT is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_DEBUG_GRAPHICS is not set
-# CONFIG_DEBUG_LIB is not set
-# CONFIG_DEBUG_MM is not set
-# CONFIG_DEBUG_SCHED is not set
-
-#
-# OS Function Debug Options
-#
-# CONFIG_DEBUG_IRQ is not set
-
-#
-# Driver Debug Options
-#
-# CONFIG_DEBUG_LEDS is not set
-# CONFIG_DEBUG_GPIO is not set
-# CONFIG_DEBUG_PWM is not set
-# CONFIG_DEBUG_SPI is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
@@ -160,7 +131,6 @@ CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARCH_HAVE_TRUSTZONE is not set
 CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
-# CONFIG_DEBUG_HARDFAULT is not set
 
 #
 # ARMV7M Configuration Options
@@ -465,6 +435,8 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 #
 # Timer Configuration
 #
+# CONFIG_STM32_ONESHOT is not set
+# CONFIG_STM32_FREERUN is not set
 CONFIG_STM32_TIM1_PWM=y
 CONFIG_STM32_TIM1_MODE=0
 CONFIG_STM32_TIM1_CHANNEL=1
@@ -611,12 +583,12 @@ CONFIG_ARCH_HAVE_BUTTONS=y
 CONFIG_ARCH_BUTTONS=y
 CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # CONFIG_ARCH_IRQBUTTONS is not set
-CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Board-Specific Options
 #
 # CONFIG_STM32F4DISBB is not set
+# CONFIG_BOARD_CRASHDUMP is not set
 # CONFIG_LIB_BOARDCTL is not set
 
 #
@@ -632,6 +604,8 @@ CONFIG_DISABLE_OS_API=y
 #
 # Clocks and Timers
 #
+CONFIG_ARCH_HAVE_TICKLESS=y
+# CONFIG_SCHED_TICKLESS is not set
 CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
@@ -766,7 +740,12 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
 
 #
 # LCD Driver Support
@@ -822,7 +801,6 @@ CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
 # CONFIG_SERIAL_DMA is not set
-# CONFIG_SERIAL_TIOCSERGSTRUCT is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_USART2_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -842,6 +820,7 @@ CONFIG_USART2_2STOP=0
 # CONFIG_USART2_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
+# CONFIG_HAVE_USBTRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
 #
@@ -856,6 +835,7 @@ CONFIG_SYSLOG_SERIAL_CONSOLE=y
 CONFIG_SYSLOG_CONSOLE=y
 # CONFIG_SYSLOG_NONE is not set
 # CONFIG_SYSLOG_FILE is not set
+# CONFIG_SYSLOG_CHARDEV is not set
 
 #
 # Networking Support
@@ -977,6 +957,7 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -1173,6 +1154,7 @@ CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Configure Command Options
@@ -1214,7 +1196,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_LIB_HEX2BIN is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/teensy-lc/nsh/defconfig b/configs/teensy-lc/nsh/defconfig
index 9954cea330..cab0683d92 100644
--- a/configs/teensy-lc/nsh/defconfig
+++ b/configs/teensy-lc/nsh/defconfig
@@ -43,36 +43,7 @@ CONFIG_INTELHEX_BINARY=y
 # Debug Options
 #
 CONFIG_DEBUG_ALERT=y
-CONFIG_DEBUG_FEATURES=y
-
-#
-# Debug SYSLOG Output Controls
-#
-# CONFIG_DEBUG_ERROR is not set
-# CONFIG_DEBUG_ASSERTIONS is not set
-
-#
-# Subsystem Debug Options
-#
-# CONFIG_DEBUG_BINFMT is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_DEBUG_GRAPHICS is not set
-# CONFIG_DEBUG_LIB is not set
-# CONFIG_DEBUG_MM is not set
-# CONFIG_DEBUG_SCHED is not set
-
-#
-# OS Function Debug Options
-#
-# CONFIG_DEBUG_IRQ is not set
-
-#
-# Driver Debug Options
-#
-# CONFIG_DEBUG_LEDS is not set
-# CONFIG_DEBUG_GPIO is not set
-# CONFIG_DEBUG_PWM is not set
-# CONFIG_DEBUG_SPI is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 CONFIG_STACK_COLORATION=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
@@ -293,11 +264,11 @@ CONFIG_ARCH_BOARD="teensy-lc"
 #
 CONFIG_ARCH_HAVE_LEDS=y
 CONFIG_ARCH_LEDS=y
-CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Board-Specific Options
 #
+# CONFIG_BOARD_CRASHDUMP is not set
 CONFIG_LIB_BOARDCTL=y
 # CONFIG_BOARDCTL_RESET is not set
 # CONFIG_BOARDCTL_UNIQUEID is not set
@@ -446,7 +417,12 @@ CONFIG_SPI_EXCHANGE=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
 
 #
 # LCD Driver Support
@@ -502,7 +478,6 @@ CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
 # CONFIG_SERIAL_DMA is not set
-# CONFIG_SERIAL_TIOCSERGSTRUCT is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -522,6 +497,7 @@ CONFIG_UART0_2STOP=0
 # CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
+# CONFIG_HAVE_USBTRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
 #
@@ -536,6 +512,7 @@ CONFIG_SYSLOG_SERIAL_CONSOLE=y
 CONFIG_SYSLOG_CONSOLE=y
 # CONFIG_SYSLOG_NONE is not set
 # CONFIG_SYSLOG_FILE is not set
+# CONFIG_SYSLOG_CHARDEV is not set
 
 #
 # Networking Support
@@ -638,6 +615,7 @@ CONFIG_ARCH_HAVE_TLS=y
 # CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -814,6 +792,7 @@ CONFIG_NSH_DISABLE_MOUNT=y
 # CONFIG_NSH_DISABLE_MV is not set
 # CONFIG_NSH_DISABLE_MW is not set
 # CONFIG_NSH_DISABLE_PS is not set
+# CONFIG_NSH_DISABLE_PSSTACKUSAGE is not set
 CONFIG_NSH_DISABLE_PUT=y
 # CONFIG_NSH_DISABLE_PWD is not set
 CONFIG_NSH_DISABLE_RM=y
@@ -829,6 +808,7 @@ CONFIG_NSH_DISABLE_UNAME=y
 # CONFIG_NSH_DISABLE_USLEEP is not set
 CONFIG_NSH_DISABLE_WGET=y
 # CONFIG_NSH_DISABLE_XD is not set
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Configure Command Options
@@ -866,7 +846,7 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_LIB_HEX2BIN is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/configs/u-blox-c027/nsh/defconfig b/configs/u-blox-c027/nsh/defconfig
index 1070431c04..644c1fc7b1 100644
--- a/configs/u-blox-c027/nsh/defconfig
+++ b/configs/u-blox-c027/nsh/defconfig
@@ -43,35 +43,7 @@ CONFIG_RAW_BINARY=y
 # Debug Options
 #
 CONFIG_DEBUG_ALERT=y
-CONFIG_DEBUG_FEATURES=y
-
-#
-# Debug SYSLOG Output Controls
-#
-# CONFIG_DEBUG_ERROR is not set
-# CONFIG_DEBUG_ASSERTIONS is not set
-
-#
-# Subsystem Debug Options
-#
-# CONFIG_DEBUG_BINFMT is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_DEBUG_GRAPHICS is not set
-# CONFIG_DEBUG_LIB is not set
-# CONFIG_DEBUG_MM is not set
-# CONFIG_DEBUG_NET is not set
-# CONFIG_DEBUG_SCHED is not set
-
-#
-# OS Function Debug Options
-#
-# CONFIG_DEBUG_IRQ is not set
-
-#
-# Driver Debug Options
-#
-# CONFIG_DEBUG_LEDS is not set
-CONFIG_DEBUG_GPIO=y
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
@@ -157,7 +129,6 @@ CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARCH_HAVE_TRUSTZONE is not set
 CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
-# CONFIG_DEBUG_HARDFAULT is not set
 
 #
 # ARMV7M Configuration Options
@@ -340,11 +311,11 @@ CONFIG_ARCH_BOARD="u-blox-c027"
 #
 CONFIG_ARCH_HAVE_LEDS=y
 CONFIG_ARCH_LEDS=y
-CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Board-Specific Options
 #
+# CONFIG_BOARD_CRASHDUMP is not set
 CONFIG_LIB_BOARDCTL=y
 # CONFIG_BOARDCTL_RESET is not set
 # CONFIG_BOARDCTL_UNIQUEID is not set
@@ -496,7 +467,12 @@ CONFIG_DEV_ZERO=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
 
 #
 # LCD Driver Support
@@ -530,7 +506,6 @@ CONFIG_NETDEV_MULTINIC=y
 CONFIG_ARCH_HAVE_NETDEV_STATISTICS=y
 # CONFIG_NETDEV_STATISTICS is not set
 CONFIG_NETDEV_LATEINIT=y
-# CONFIG_NET_DUMPPACKET is not set
 
 #
 # External Ethernet MAC Device Support
@@ -571,7 +546,6 @@ CONFIG_ETH1_PHY_NONE=y
 # CONFIG_ETH1_PHY_DP83848C is not set
 # CONFIG_ETH1_PHY_LAN8720 is not set
 # CONFIG_ETH1_PHY_DM9161 is not set
-# CONFIG_NETDEV_PHY_DEBUG is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
@@ -611,7 +585,6 @@ CONFIG_SERIAL_IFLOWCONTROL=y
 CONFIG_SERIAL_OFLOWCONTROL=y
 # CONFIG_SERIAL_DMA is not set
 # CONFIG_SERIAL_IFLOWCONTROL_WATERMARKS is not set
-# CONFIG_SERIAL_TIOCSERGSTRUCT is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_UART1_SERIAL_CONSOLE is not set
@@ -673,6 +646,7 @@ CONFIG_UART3_2STOP=0
 # CONFIG_UART3_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
+# CONFIG_HAVE_USBTRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
 #
@@ -687,6 +661,7 @@ CONFIG_SYSLOG_SERIAL_CONSOLE=y
 CONFIG_SYSLOG_CONSOLE=y
 # CONFIG_SYSLOG_NONE is not set
 # CONFIG_SYSLOG_FILE is not set
+# CONFIG_SYSLOG_CHARDEV is not set
 
 #
 # Networking Support
@@ -755,7 +730,6 @@ CONFIG_NET_MAX_LISTENPORTS=8
 CONFIG_NET_TCP_READAHEAD=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_TCP_NWRBCHAINS=8
-# CONFIG_NET_TCP_WRBUFFER_DEBUG is not set
 CONFIG_NET_TCP_RECVDELAY=0
 CONFIG_NET_TCPBACKLOG=y
 # CONFIG_NET_SENDFILE is not set
@@ -800,7 +774,6 @@ CONFIG_IOB_NBUFFERS=24
 CONFIG_IOB_BUFSIZE=196
 CONFIG_IOB_NCHAINS=8
 CONFIG_IOB_THROTTLE=8
-# CONFIG_IOB_DEBUG is not set
 # CONFIG_NET_ARCH_INCR32 is not set
 # CONFIG_NET_ARCH_CHKSUM is not set
 CONFIG_NET_STATISTICS=y
@@ -941,6 +914,7 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 # CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -1159,6 +1133,7 @@ CONFIG_NSH_BUILTIN_APPS=y
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Configure Command Options
@@ -1190,7 +1165,6 @@ CONFIG_NSH_NETINIT=y
 CONFIG_NSH_NETINIT_THREAD=y
 CONFIG_NSH_NETINIT_THREAD_STACKSIZE=1568
 CONFIG_NSH_NETINIT_THREAD_PRIORITY=80
-# CONFIG_NSH_NETINIT_DEBUG is not set
 
 #
 # IP Address Configuration
@@ -1244,7 +1218,7 @@ CONFIG_SYSTEM_CLE=y
 CONFIG_SYSTEM_CLE_DEBUGLEVEL=0
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_LIB_HEX2BIN is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
-- 
GitLab


From aa31b4eae95e43a2cd3026e351deaa4e407077ca Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Thu, 7 Jul 2016 16:01:32 -0600
Subject: [PATCH 168/229] Disable DEBUG features be default in all
 configurations

---
 configs/ez80f910200kitg/ostest/defconfig   | 109 +++---
 configs/ez80f910200zco/dhcpd/defconfig     | 121 ++++---
 configs/ez80f910200zco/httpd/defconfig     | 117 +++---
 configs/ez80f910200zco/nettest/defconfig   | 115 +++---
 configs/ez80f910200zco/nsh/defconfig       |  70 ++--
 configs/ez80f910200zco/poll/defconfig      | 115 +++---
 configs/z16f2800100zcog/nsh/defconfig      | 333 ++++++++---------
 configs/z16f2800100zcog/ostest/defconfig   | 395 ++++++++++++---------
 configs/z16f2800100zcog/pashello/defconfig |   2 +-
 configs/z8encore000zco/ostest/defconfig    | 107 +++---
 configs/z8f64200100kit/ostest/defconfig    | 107 +++---
 11 files changed, 824 insertions(+), 767 deletions(-)

diff --git a/configs/ez80f910200kitg/ostest/defconfig b/configs/ez80f910200kitg/ostest/defconfig
index 555cbad837..05d2ec3e5e 100644
--- a/configs/ez80f910200kitg/ostest/defconfig
+++ b/configs/ez80f910200kitg/ostest/defconfig
@@ -46,33 +46,10 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-CONFIG_DEBUG_FEATURES=y
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-# CONFIG_DEBUG_INFO is not set
-
-#
-# Subsystem Debug Options
-#
-# CONFIG_DEBUG_AUDIO is not set
-# CONFIG_DEBUG_BINFMT is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_DEBUG_GRAPHICS is not set
-# CONFIG_DEBUG_LIB is not set
-# CONFIG_DEBUG_MM is not set
-# CONFIG_DEBUG_SCHED is not set
-
-#
-# OS Function Debug Options
-#
-# CONFIG_DEBUG_IRQ is not set
-
-#
-# Driver Debug Options
-#
-# CONFIG_DEBUG_LEDS is not set
-# CONFIG_DEBUG_ANALOG is not set
-# CONFIG_DEBUG_GPIO is not set
+# CONFIG_DEBUG_ALERT 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
 # CONFIG_ARCH_HAVE_CUSTOMOPT is not set
 # CONFIG_DEBUG_NOOPT is not set
@@ -158,6 +135,8 @@ CONFIG_EZ80_UART0=y
 # CONFIG_EZ80_UART2 is not set
 # CONFIG_EZ80_EMAC is not set
 CONFIG_EZ80_TOOLCHAIN_ZDSII=y
+# CONFIG_EZ80_ZDSII_V511 is not set
+CONFIG_EZ80_ZDSII_V521=y
 # CONFIG_ARCH_TIMERHOOK is not set
 
 #
@@ -171,6 +150,7 @@ CONFIG_EZ80_TOOLCHAIN_ZDSII=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 # CONFIG_ARCH_HAVE_VFORK is not set
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
@@ -229,6 +209,7 @@ CONFIG_ARCH_HAVE_LEDS=y
 #
 # Board-Specific Options
 #
+# CONFIG_BOARD_CRASHDUMP is not set
 # CONFIG_LIB_BOARDCTL is not set
 
 #
@@ -354,14 +335,26 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
 #
 # CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
@@ -380,6 +373,8 @@ CONFIG_MMCSD_HAVECARDDETECT=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -403,15 +398,10 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
 # CONFIG_SERIAL_DMA is not set
-# CONFIG_SERIAL_TIOCSERGSTRUCT is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -431,17 +421,22 @@ CONFIG_UART0_2STOP=0
 # CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
+# CONFIG_HAVE_USBTRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+# CONFIG_SYSLOG_CHARDEV is not set
 
 #
 # Networking Support
@@ -471,11 +466,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -496,6 +486,10 @@ CONFIG_HEAP2_SIZE=0
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -536,13 +530,16 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+# CONFIG_ARCH_HAVE_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -569,10 +566,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_LEDS is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -581,11 +579,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 CONFIG_EXAMPLES_OSTEST=y
 CONFIG_EXAMPLES_OSTEST_LOOPS=1
@@ -596,8 +594,9 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -605,20 +604,25 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
 # CONFIG_FSUTILS_INIFILE is not set
 
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
 #
 # Graphics Support
 #
@@ -629,8 +633,8 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -641,6 +645,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -662,16 +667,16 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_LIB_HEX2BIN is not set
+# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/ez80f910200zco/dhcpd/defconfig b/configs/ez80f910200zco/dhcpd/defconfig
index fd28494460..9655c84a0b 100644
--- a/configs/ez80f910200zco/dhcpd/defconfig
+++ b/configs/ez80f910200zco/dhcpd/defconfig
@@ -46,34 +46,10 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-CONFIG_DEBUG_FEATURES=y
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-# CONFIG_DEBUG_INFO is not set
-
-#
-# Subsystem Debug Options
-#
-# CONFIG_DEBUG_AUDIO is not set
-# CONFIG_DEBUG_BINFMT is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_DEBUG_GRAPHICS is not set
-# CONFIG_DEBUG_LIB is not set
-# CONFIG_DEBUG_MM is not set
-# CONFIG_DEBUG_NET is not set
-# CONFIG_DEBUG_SCHED is not set
-
-#
-# OS Function Debug Options
-#
-# CONFIG_DEBUG_IRQ is not set
-
-#
-# Driver Debug Options
-#
-# CONFIG_DEBUG_LEDS is not set
-# CONFIG_DEBUG_ANALOG is not set
-# CONFIG_DEBUG_GPIO is not set
+# CONFIG_DEBUG_ALERT 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
 # CONFIG_ARCH_HAVE_CUSTOMOPT is not set
 # CONFIG_DEBUG_NOOPT is not set
@@ -159,6 +135,8 @@ CONFIG_EZ80_UART0=y
 # CONFIG_EZ80_UART2 is not set
 CONFIG_EZ80_EMAC=y
 CONFIG_EZ80_TOOLCHAIN_ZDSII=y
+# CONFIG_EZ80_ZDSII_V511 is not set
+CONFIG_EZ80_ZDSII_V521=y
 CONFIG_EZ80_FIAD=0x1f
 CONFIG_EZ80_PHYCONFIG=1
 CONFIG_EZ80_RAMADDR=0xf7c000
@@ -181,6 +159,7 @@ CONFIG_ARCH_TIMERHOOK=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 # CONFIG_ARCH_HAVE_VFORK is not set
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
@@ -241,6 +220,7 @@ CONFIG_ARCH_HAVE_BUTTONS=y
 #
 # Board-Specific Options
 #
+# CONFIG_BOARD_CRASHDUMP is not set
 # CONFIG_LIB_BOARDCTL is not set
 
 #
@@ -366,14 +346,26 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
 #
 # CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -387,7 +379,6 @@ CONFIG_NETDEVICES=y
 # CONFIG_NETDEV_MULTINIC is not set
 CONFIG_ARCH_HAVE_NETDEV_STATISTICS=y
 # CONFIG_NETDEV_LATEINIT is not set
-# CONFIG_NET_DUMPPACKET is not set
 
 #
 # External Ethernet MAC Device Support
@@ -418,7 +409,6 @@ CONFIG_ETH0_PHY_AM79C874=y
 # CONFIG_ETH0_PHY_LAN8740A is not set
 # CONFIG_ETH0_PHY_LAN8742A is not set
 # CONFIG_ETH0_PHY_DM9161 is not set
-# CONFIG_NETDEV_PHY_DEBUG is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
@@ -426,6 +416,8 @@ CONFIG_ETH0_PHY_AM79C874=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -449,15 +441,10 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
 # CONFIG_SERIAL_DMA is not set
-# CONFIG_SERIAL_TIOCSERGSTRUCT is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -477,17 +464,22 @@ CONFIG_UART0_2STOP=0
 # CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
+# CONFIG_HAVE_USBTRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+# CONFIG_SYSLOG_CHARDEV is not set
 
 #
 # Networking Support
@@ -576,7 +568,6 @@ CONFIG_NET_ARPTAB_SIZE=16
 CONFIG_NET_ARP_MAXAGE=120
 # CONFIG_NET_ARP_IPIN is not set
 # CONFIG_NET_ARP_SEND is not set
-# CONFIG_NET_ARP_DUMP is not set
 
 #
 # Network I/O Buffer Support
@@ -585,7 +576,6 @@ CONFIG_NET_IOB=y
 CONFIG_IOB_NBUFFERS=8
 CONFIG_IOB_BUFSIZE=196
 CONFIG_IOB_NCHAINS=8
-# CONFIG_IOB_DEBUG is not set
 # CONFIG_NET_ARCH_INCR32 is not set
 # CONFIG_NET_ARCH_CHKSUM is not set
 # CONFIG_NET_STATISTICS is not set
@@ -617,11 +607,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -642,6 +627,10 @@ CONFIG_HEAP2_SIZE=0
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -682,14 +671,17 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+# CONFIG_ARCH_HAVE_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 # CONFIG_NETDB_DNSCLIENT is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -716,14 +708,15 @@ CONFIG_EXAMPLES_DHCPD_NOMAC=y
 CONFIG_EXAMPLES_DHCPD_IPADDR=0x0a000001
 CONFIG_EXAMPLES_DHCPD_DRIPADDR=0x0a000001
 CONFIG_EXAMPLES_DHCPD_NETMASK=0xffffff00
+# CONFIG_EXAMPLES_DISCOVER is not set
 # CONFIG_EXAMPLES_ELF is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -732,18 +725,19 @@ CONFIG_EXAMPLES_DHCPD_NETMASK=0xffffff00
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -751,23 +745,27 @@ CONFIG_EXAMPLES_DHCPD_NETMASK=0xffffff00
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UDPBLASTER is not set
-# CONFIG_EXAMPLES_DISCOVER is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
 # CONFIG_FSUTILS_INIFILE is not set
 
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
 #
 # Graphics Support
 #
@@ -778,8 +776,8 @@ CONFIG_EXAMPLES_DHCPD_NETMASK=0xffffff00
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -804,14 +802,15 @@ CONFIG_NETUTILS_DHCPD_NETMASK=0xffffff00
 CONFIG_NETUTILS_DHCPD_DNSIP=0x08080808
 CONFIG_NETUTILS_DHCPD_OFFERTIME=3600
 CONFIG_NETUTILS_DHCPD_DECLINETIME=3600
+# CONFIG_NETUTILS_DISCOVER is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_TFTPC is not set
 CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_NTPCLIENT is not set
-# CONFIG_NETUTILS_DISCOVER is not set
 # CONFIG_NETUTILS_PPPD is not set
+# CONFIG_NETUTILS_SMTP is not set
+# CONFIG_NETUTILS_TFTPC is not set
 
 #
 # NSH Library
@@ -830,16 +829,16 @@ CONFIG_NETUTILS_NETLIB=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_LIB_HEX2BIN is not set
+# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/ez80f910200zco/httpd/defconfig b/configs/ez80f910200zco/httpd/defconfig
index 9f7bb65145..5304e13743 100644
--- a/configs/ez80f910200zco/httpd/defconfig
+++ b/configs/ez80f910200zco/httpd/defconfig
@@ -46,34 +46,10 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-CONFIG_DEBUG_FEATURES=y
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-# CONFIG_DEBUG_INFO is not set
-
-#
-# Subsystem Debug Options
-#
-# CONFIG_DEBUG_AUDIO is not set
-# CONFIG_DEBUG_BINFMT is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_DEBUG_GRAPHICS is not set
-# CONFIG_DEBUG_LIB is not set
-# CONFIG_DEBUG_MM is not set
-# CONFIG_DEBUG_NET is not set
-# CONFIG_DEBUG_SCHED is not set
-
-#
-# OS Function Debug Options
-#
-# CONFIG_DEBUG_IRQ is not set
-
-#
-# Driver Debug Options
-#
-# CONFIG_DEBUG_LEDS is not set
-# CONFIG_DEBUG_ANALOG is not set
-# CONFIG_DEBUG_GPIO is not set
+# CONFIG_DEBUG_ALERT 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
 # CONFIG_ARCH_HAVE_CUSTOMOPT is not set
 # CONFIG_DEBUG_NOOPT is not set
@@ -159,6 +135,8 @@ CONFIG_EZ80_UART0=y
 # CONFIG_EZ80_UART2 is not set
 CONFIG_EZ80_EMAC=y
 CONFIG_EZ80_TOOLCHAIN_ZDSII=y
+# CONFIG_EZ80_ZDSII_V511 is not set
+CONFIG_EZ80_ZDSII_V521=y
 CONFIG_EZ80_FIAD=0x1f
 CONFIG_EZ80_PHYCONFIG=1
 CONFIG_EZ80_RAMADDR=0xf7c000
@@ -181,6 +159,7 @@ CONFIG_ARCH_TIMERHOOK=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 # CONFIG_ARCH_HAVE_VFORK is not set
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
@@ -241,6 +220,7 @@ CONFIG_ARCH_HAVE_BUTTONS=y
 #
 # Board-Specific Options
 #
+# CONFIG_BOARD_CRASHDUMP is not set
 # CONFIG_LIB_BOARDCTL is not set
 
 #
@@ -373,14 +353,26 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
 #
 # CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -396,7 +388,6 @@ CONFIG_NETDEVICES=y
 CONFIG_ARCH_HAVE_NETDEV_STATISTICS=y
 # CONFIG_NETDEV_STATISTICS is not set
 # CONFIG_NETDEV_LATEINIT is not set
-# CONFIG_NET_DUMPPACKET is not set
 
 #
 # External Ethernet MAC Device Support
@@ -427,7 +418,6 @@ CONFIG_ETH0_PHY_AM79C874=y
 # CONFIG_ETH0_PHY_LAN8740A is not set
 # CONFIG_ETH0_PHY_LAN8742A is not set
 # CONFIG_ETH0_PHY_DM9161 is not set
-# CONFIG_NETDEV_PHY_DEBUG is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
@@ -435,6 +425,8 @@ CONFIG_ETH0_PHY_AM79C874=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -458,15 +450,10 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
 # CONFIG_SERIAL_DMA is not set
-# CONFIG_SERIAL_TIOCSERGSTRUCT is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -486,17 +473,22 @@ CONFIG_UART0_2STOP=0
 # CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
+# CONFIG_HAVE_USBTRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+# CONFIG_SYSLOG_CHARDEV is not set
 
 #
 # Networking Support
@@ -590,7 +582,6 @@ CONFIG_NET_ARPTAB_SIZE=16
 CONFIG_NET_ARP_MAXAGE=120
 # CONFIG_NET_ARP_IPIN is not set
 # CONFIG_NET_ARP_SEND is not set
-# CONFIG_NET_ARP_DUMP is not set
 
 #
 # Network I/O Buffer Support
@@ -599,7 +590,6 @@ CONFIG_NET_IOB=y
 CONFIG_IOB_NBUFFERS=24
 CONFIG_IOB_BUFSIZE=196
 CONFIG_IOB_NCHAINS=8
-# CONFIG_IOB_DEBUG is not set
 # CONFIG_NET_ARCH_INCR32 is not set
 # CONFIG_NET_ARCH_CHKSUM is not set
 CONFIG_NET_STATISTICS=y
@@ -631,11 +621,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -656,6 +641,10 @@ CONFIG_HEAP2_SIZE=0
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -696,13 +685,16 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+# CONFIG_ARCH_HAVE_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -729,10 +721,10 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -742,18 +734,19 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -761,18 +754,18 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
+# CONFIG_EXAMPLES_USBTERM is not set
+# CONFIG_EXAMPLES_WATCHDOG is not set
 CONFIG_EXAMPLES_WEBSERVER=y
 CONFIG_EXAMPLES_WEBSERVER_IPADDR=0x0a000002
 CONFIG_EXAMPLES_WEBSERVER_DRIPADDR=0x0a000001
 CONFIG_EXAMPLES_WEBSERVER_NETMASK=0xffffff00
 CONFIG_EXAMPLES_WEBSERVER_NOMAC=y
-# CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBTERM is not set
-# CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WGET is not set
 
 #
@@ -780,6 +773,11 @@ CONFIG_EXAMPLES_WEBSERVER_NOMAC=y
 #
 # CONFIG_FSUTILS_INIFILE is not set
 
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
 #
 # Graphics Support
 #
@@ -790,8 +788,8 @@ CONFIG_EXAMPLES_WEBSERVER_NOMAC=y
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -802,11 +800,12 @@ CONFIG_EXAMPLES_WEBSERVER_NOMAC=y
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TELNETD is not set
-CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 CONFIG_NETUTILS_WEBSERVER=y
 # CONFIG_NETUTILS_HTTPD_SINGLECONNECT is not set
@@ -839,16 +838,16 @@ CONFIG_NETUTILS_HTTPD_KEEPALIVE_DISABLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_LIB_HEX2BIN is not set
+# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/ez80f910200zco/nettest/defconfig b/configs/ez80f910200zco/nettest/defconfig
index a1f8e711fc..d6aa5b20ed 100644
--- a/configs/ez80f910200zco/nettest/defconfig
+++ b/configs/ez80f910200zco/nettest/defconfig
@@ -46,34 +46,10 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-CONFIG_DEBUG_FEATURES=y
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-# CONFIG_DEBUG_INFO is not set
-
-#
-# Subsystem Debug Options
-#
-# CONFIG_DEBUG_AUDIO is not set
-# CONFIG_DEBUG_BINFMT is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_DEBUG_GRAPHICS is not set
-# CONFIG_DEBUG_LIB is not set
-# CONFIG_DEBUG_MM is not set
-# CONFIG_DEBUG_NET is not set
-# CONFIG_DEBUG_SCHED is not set
-
-#
-# OS Function Debug Options
-#
-# CONFIG_DEBUG_IRQ is not set
-
-#
-# Driver Debug Options
-#
-# CONFIG_DEBUG_LEDS is not set
-# CONFIG_DEBUG_ANALOG is not set
-# CONFIG_DEBUG_GPIO is not set
+# CONFIG_DEBUG_ALERT 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
 # CONFIG_ARCH_HAVE_CUSTOMOPT is not set
 # CONFIG_DEBUG_NOOPT is not set
@@ -159,6 +135,8 @@ CONFIG_EZ80_UART0=y
 # CONFIG_EZ80_UART2 is not set
 CONFIG_EZ80_EMAC=y
 CONFIG_EZ80_TOOLCHAIN_ZDSII=y
+# CONFIG_EZ80_ZDSII_V511 is not set
+CONFIG_EZ80_ZDSII_V521=y
 CONFIG_EZ80_FIAD=0x1f
 CONFIG_EZ80_PHYCONFIG=1
 CONFIG_EZ80_RAMADDR=0xf7c000
@@ -181,6 +159,7 @@ CONFIG_ARCH_TIMERHOOK=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 # CONFIG_ARCH_HAVE_VFORK is not set
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
@@ -241,6 +220,7 @@ CONFIG_ARCH_HAVE_BUTTONS=y
 #
 # Board-Specific Options
 #
+# CONFIG_BOARD_CRASHDUMP is not set
 # CONFIG_LIB_BOARDCTL is not set
 
 #
@@ -366,14 +346,26 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
 #
 # CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -388,7 +380,6 @@ CONFIG_NETDEVICES=y
 # CONFIG_NETDEV_MULTINIC is not set
 CONFIG_ARCH_HAVE_NETDEV_STATISTICS=y
 # CONFIG_NETDEV_LATEINIT is not set
-# CONFIG_NET_DUMPPACKET is not set
 
 #
 # External Ethernet MAC Device Support
@@ -419,7 +410,6 @@ CONFIG_ETH0_PHY_AM79C874=y
 # CONFIG_ETH0_PHY_LAN8740A is not set
 # CONFIG_ETH0_PHY_LAN8742A is not set
 # CONFIG_ETH0_PHY_DM9161 is not set
-# CONFIG_NETDEV_PHY_DEBUG is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
@@ -427,6 +417,8 @@ CONFIG_ETH0_PHY_AM79C874=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -450,15 +442,10 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
 # CONFIG_SERIAL_DMA is not set
-# CONFIG_SERIAL_TIOCSERGSTRUCT is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -478,17 +465,22 @@ CONFIG_UART0_2STOP=0
 # CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
+# CONFIG_HAVE_USBTRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+# CONFIG_SYSLOG_CHARDEV is not set
 
 #
 # Networking Support
@@ -582,7 +574,6 @@ CONFIG_NET_ARPTAB_SIZE=16
 CONFIG_NET_ARP_MAXAGE=120
 # CONFIG_NET_ARP_IPIN is not set
 # CONFIG_NET_ARP_SEND is not set
-# CONFIG_NET_ARP_DUMP is not set
 
 #
 # Network I/O Buffer Support
@@ -591,7 +582,6 @@ CONFIG_NET_IOB=y
 CONFIG_IOB_NBUFFERS=24
 CONFIG_IOB_BUFSIZE=196
 CONFIG_IOB_NCHAINS=8
-# CONFIG_IOB_DEBUG is not set
 # CONFIG_NET_ARCH_INCR32 is not set
 # CONFIG_NET_ARCH_CHKSUM is not set
 # CONFIG_NET_STATISTICS is not set
@@ -623,11 +613,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -648,6 +633,10 @@ CONFIG_HEAP2_SIZE=0
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -688,13 +677,16 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+# CONFIG_ARCH_HAVE_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -721,10 +713,10 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -747,18 +739,19 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -766,14 +759,14 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_WGET is not set
 
 #
@@ -781,6 +774,11 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 #
 # CONFIG_FSUTILS_INIFILE is not set
 
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
 #
 # Graphics Support
 #
@@ -791,8 +789,8 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -803,11 +801,12 @@ CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TELNETD is not set
-CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
@@ -829,16 +828,16 @@ CONFIG_NETUTILS_NETLIB=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_LIB_HEX2BIN is not set
+# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/ez80f910200zco/nsh/defconfig b/configs/ez80f910200zco/nsh/defconfig
index 92bc839c27..c6893e00a1 100644
--- a/configs/ez80f910200zco/nsh/defconfig
+++ b/configs/ez80f910200zco/nsh/defconfig
@@ -46,33 +46,10 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-CONFIG_DEBUG_FEATURES=y
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-# CONFIG_DEBUG_INFO is not set
-
-#
-# Subsystem Debug Options
-#
-# CONFIG_DEBUG_BINFMT is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_DEBUG_GRAPHICS is not set
-# CONFIG_DEBUG_LIB is not set
-# CONFIG_DEBUG_MM is not set
-# CONFIG_DEBUG_NET is not set
-# CONFIG_DEBUG_SCHED is not set
-
-#
-# OS Function Debug Options
-#
-# CONFIG_DEBUG_IRQ is not set
-
-#
-# Driver Debug Options
-#
-# CONFIG_DEBUG_LEDS is not set
-# CONFIG_DEBUG_ANALOG is not set
-# CONFIG_DEBUG_GPIO is not set
+# CONFIG_DEBUG_ALERT 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
 # CONFIG_ARCH_HAVE_CUSTOMOPT is not set
 # CONFIG_DEBUG_NOOPT is not set
@@ -239,11 +216,11 @@ CONFIG_ARCH_HAVE_LEDS=y
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_HAVE_BUTTONS=y
 # CONFIG_ARCH_BUTTONS is not set
-CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Board-Specific Options
 #
+# CONFIG_BOARD_CRASHDUMP is not set
 # CONFIG_LIB_BOARDCTL is not set
 
 #
@@ -376,7 +353,12 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
 
 #
 # LCD Driver Support
@@ -390,6 +372,7 @@ CONFIG_DEV_NULL=y
 # CONFIG_USERLED is not set
 # CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -407,7 +390,6 @@ CONFIG_TELNET_TXBUFFER_SIZE=256
 CONFIG_ARCH_HAVE_NETDEV_STATISTICS=y
 # CONFIG_NETDEV_STATISTICS is not set
 # CONFIG_NETDEV_LATEINIT is not set
-# CONFIG_NET_DUMPPACKET is not set
 
 #
 # External Ethernet MAC Device Support
@@ -438,7 +420,6 @@ CONFIG_ETH0_PHY_AM79C874=y
 # CONFIG_ETH0_PHY_LAN8740A is not set
 # CONFIG_ETH0_PHY_LAN8742A is not set
 # CONFIG_ETH0_PHY_DM9161 is not set
-# CONFIG_NETDEV_PHY_DEBUG is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
@@ -446,6 +427,8 @@ CONFIG_ETH0_PHY_AM79C874=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -474,7 +457,6 @@ CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
 # CONFIG_SERIAL_DMA is not set
-# CONFIG_SERIAL_TIOCSERGSTRUCT is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -494,17 +476,22 @@ CONFIG_UART0_2STOP=0
 # CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
+# CONFIG_HAVE_USBTRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+# CONFIG_SYSLOG_CHARDEV is not set
 
 #
 # Networking Support
@@ -603,7 +590,6 @@ CONFIG_NET_ARPTAB_SIZE=16
 CONFIG_NET_ARP_MAXAGE=120
 # CONFIG_NET_ARP_IPIN is not set
 # CONFIG_NET_ARP_SEND is not set
-# CONFIG_NET_ARP_DUMP is not set
 
 #
 # Network I/O Buffer Support
@@ -612,7 +598,6 @@ CONFIG_NET_IOB=y
 CONFIG_IOB_NBUFFERS=24
 CONFIG_IOB_BUFSIZE=196
 CONFIG_IOB_NCHAINS=8
-# CONFIG_IOB_DEBUG is not set
 # CONFIG_NET_ARCH_INCR32 is not set
 # CONFIG_NET_ARCH_CHKSUM is not set
 CONFIG_NET_STATISTICS=y
@@ -651,11 +636,6 @@ CONFIG_NET_HOSTNAME=""
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -736,8 +716,10 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -933,6 +915,7 @@ CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Configure Command Options
@@ -960,7 +943,6 @@ CONFIG_NSH_CONSOLE=y
 #
 CONFIG_NSH_NETINIT=y
 # CONFIG_NSH_NETINIT_THREAD is not set
-# CONFIG_NSH_NETINIT_DEBUG is not set
 
 #
 # IP Address Configuration
@@ -1007,7 +989,7 @@ CONFIG_NSH_IOBUFFER_SIZE=512
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-# CONFIG_LIB_HEX2BIN is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_NETDB is not set
diff --git a/configs/ez80f910200zco/poll/defconfig b/configs/ez80f910200zco/poll/defconfig
index f3bc5693e0..1c2faa9bce 100644
--- a/configs/ez80f910200zco/poll/defconfig
+++ b/configs/ez80f910200zco/poll/defconfig
@@ -46,34 +46,10 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-CONFIG_DEBUG_FEATURES=y
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-# CONFIG_DEBUG_INFO is not set
-
-#
-# Subsystem Debug Options
-#
-# CONFIG_DEBUG_AUDIO is not set
-# CONFIG_DEBUG_BINFMT is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_DEBUG_GRAPHICS is not set
-# CONFIG_DEBUG_LIB is not set
-# CONFIG_DEBUG_MM is not set
-# CONFIG_DEBUG_NET is not set
-# CONFIG_DEBUG_SCHED is not set
-
-#
-# OS Function Debug Options
-#
-# CONFIG_DEBUG_IRQ is not set
-
-#
-# Driver Debug Options
-#
-# CONFIG_DEBUG_LEDS is not set
-# CONFIG_DEBUG_ANALOG is not set
-# CONFIG_DEBUG_GPIO is not set
+# CONFIG_DEBUG_ALERT 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
 # CONFIG_ARCH_HAVE_CUSTOMOPT is not set
 # CONFIG_DEBUG_NOOPT is not set
@@ -159,6 +135,8 @@ CONFIG_EZ80_UART0=y
 # CONFIG_EZ80_UART2 is not set
 CONFIG_EZ80_EMAC=y
 CONFIG_EZ80_TOOLCHAIN_ZDSII=y
+# CONFIG_EZ80_ZDSII_V511 is not set
+CONFIG_EZ80_ZDSII_V521=y
 CONFIG_EZ80_FIAD=0x1f
 CONFIG_EZ80_PHYCONFIG=1
 CONFIG_EZ80_RAMADDR=0xf7c000
@@ -181,6 +159,7 @@ CONFIG_ARCH_TIMERHOOK=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 # CONFIG_ARCH_HAVE_VFORK is not set
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
@@ -241,6 +220,7 @@ CONFIG_ARCH_HAVE_BUTTONS=y
 #
 # Board-Specific Options
 #
+# CONFIG_BOARD_CRASHDUMP is not set
 # CONFIG_LIB_BOARDCTL is not set
 
 #
@@ -373,14 +353,26 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
 #
 # CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -395,7 +387,6 @@ CONFIG_NETDEVICES=y
 # CONFIG_NETDEV_MULTINIC is not set
 CONFIG_ARCH_HAVE_NETDEV_STATISTICS=y
 # CONFIG_NETDEV_LATEINIT is not set
-# CONFIG_NET_DUMPPACKET is not set
 
 #
 # External Ethernet MAC Device Support
@@ -426,7 +417,6 @@ CONFIG_ETH0_PHY_AM79C874=y
 # CONFIG_ETH0_PHY_LAN8740A is not set
 # CONFIG_ETH0_PHY_LAN8742A is not set
 # CONFIG_ETH0_PHY_DM9161 is not set
-# CONFIG_NETDEV_PHY_DEBUG is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
@@ -434,6 +424,8 @@ CONFIG_ETH0_PHY_AM79C874=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -457,15 +449,10 @@ CONFIG_UART0_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
 # CONFIG_SERIAL_DMA is not set
-# CONFIG_SERIAL_TIOCSERGSTRUCT is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -485,17 +472,22 @@ CONFIG_UART0_2STOP=0
 # CONFIG_UART0_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
+# CONFIG_HAVE_USBTRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+# CONFIG_SYSLOG_CHARDEV is not set
 
 #
 # Networking Support
@@ -589,7 +581,6 @@ CONFIG_NET_ARPTAB_SIZE=16
 CONFIG_NET_ARP_MAXAGE=120
 # CONFIG_NET_ARP_IPIN is not set
 # CONFIG_NET_ARP_SEND is not set
-# CONFIG_NET_ARP_DUMP is not set
 
 #
 # Network I/O Buffer Support
@@ -598,7 +589,6 @@ CONFIG_NET_IOB=y
 CONFIG_IOB_NBUFFERS=24
 CONFIG_IOB_BUFSIZE=196
 CONFIG_IOB_NCHAINS=8
-# CONFIG_IOB_DEBUG is not set
 # CONFIG_NET_ARCH_INCR32 is not set
 # CONFIG_NET_ARCH_CHKSUM is not set
 # CONFIG_NET_STATISTICS is not set
@@ -630,11 +620,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -655,6 +640,10 @@ CONFIG_HEAP2_SIZE=0
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -695,13 +684,16 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+# CONFIG_ARCH_HAVE_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -728,10 +720,10 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -741,11 +733,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PCA9635 is not set
@@ -755,8 +747,9 @@ CONFIG_EXAMPLES_POLL_NOMAC=y
 CONFIG_EXAMPLES_POLL_IPADDR=0x0a000002
 CONFIG_EXAMPLES_POLL_DRIPADDR=0x0a000001
 CONFIG_EXAMPLES_POLL_NETMASK=0xffffff00
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -764,14 +757,14 @@ CONFIG_EXAMPLES_POLL_NETMASK=0xffffff00
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_WGET is not set
 # CONFIG_EXAMPLES_XMLRPC is not set
 
@@ -780,6 +773,11 @@ CONFIG_EXAMPLES_POLL_NETMASK=0xffffff00
 #
 # CONFIG_FSUTILS_INIFILE is not set
 
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
 #
 # Graphics Support
 #
@@ -790,8 +788,8 @@ CONFIG_EXAMPLES_POLL_NETMASK=0xffffff00
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -803,12 +801,13 @@ CONFIG_EXAMPLES_POLL_NETMASK=0xffffff00
 #
 # CONFIG_NETUTILS_CHAT is not set
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
+CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TELNETD is not set
-CONFIG_NETUTILS_NETLIB=y
 # CONFIG_NETUTILS_WEBCLIENT is not set
 # CONFIG_NETUTILS_WEBSERVER is not set
 # CONFIG_NETUTILS_XMLRPC is not set
@@ -830,16 +829,16 @@ CONFIG_NETUTILS_NETLIB=y
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_LIB_HEX2BIN is not set
+# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/z16f2800100zcog/nsh/defconfig b/configs/z16f2800100zcog/nsh/defconfig
index 3066f732cb..78c315af00 100644
--- a/configs/z16f2800100zcog/nsh/defconfig
+++ b/configs/z16f2800100zcog/nsh/defconfig
@@ -21,6 +21,7 @@ CONFIG_WINDOWS_CYGWIN=y
 # Build Configuration
 #
 # CONFIG_APPS_DIR="../apps"
+CONFIG_BUILD_FLAT=y
 # CONFIG_BUILD_2PASS is not set
 
 #
@@ -40,33 +41,15 @@ CONFIG_WINDOWS_CYGWIN=y
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
-CONFIG_DEBUG_FEATURES=y
+# CONFIG_DEBUG_ALERT 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_INFO is not set
-
-#
-# Subsystem Debug Options
-#
-# CONFIG_DEBUG_MM is not set
-# CONFIG_DEBUG_SCHED is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_DEBUG_LIB is not set
-# CONFIG_DEBUG_BINFMT is not set
-# CONFIG_DEBUG_GRAPHICS is not set
-# CONFIG_DEBUG_IRQ is not set
-
-#
-# Driver Debug Options
-#
-# CONFIG_DEBUG_LEDS is not set
-# CONFIG_DEBUG_ANALOG is not set
-# CONFIG_DEBUG_GPIO is not set
-# CONFIG_DEBUG_AUDIO is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 # CONFIG_ARCH_HAVE_CUSTOMOPT is not set
 # CONFIG_DEBUG_NOOPT is not set
@@ -119,10 +102,18 @@ CONFIG_Z16F_UART1=y
 # CONFIG_ARCH_VECNOTIRQ is not set
 # CONFIG_ARCH_DMA is not set
 CONFIG_ARCH_HAVE_IRQPRIO=y
-# CONFIG_ARCH_ADDRENV is not set
+# CONFIG_ARCH_L2CACHE is not set
+# CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
+# CONFIG_ARCH_HAVE_ADDRENV is not set
+# CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 # CONFIG_ARCH_HAVE_VFORK is not set
 # CONFIG_ARCH_HAVE_MMU is not set
+# CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
+# CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+# CONFIG_ARCH_HAVE_RESET is not set
 # CONFIG_ARCH_IRQPRIO is not set
 # CONFIG_ARCH_STACKDUMP is not set
 CONFIG_ENDIAN_BIG=y
@@ -170,11 +161,12 @@ CONFIG_ARCH_BOARD="z16f2800100zcog"
 #
 CONFIG_ARCH_HAVE_LEDS=y
 CONFIG_ARCH_LEDS=y
-CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Board-Specific Options
 #
+# CONFIG_BOARD_CRASHDUMP is not set
+# CONFIG_LIB_BOARDCTL is not set
 
 #
 # RTOS Features
@@ -204,8 +196,12 @@ CONFIG_PREALLOC_TIMERS=4
 #
 # Tasks and Scheduling
 #
+# CONFIG_INIT_NONE is not set
+CONFIG_INIT_ENTRYPOINT=y
+# CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_MAX_TASKS=16
 # CONFIG_SCHED_HAVE_PARENT is not set
@@ -256,6 +252,14 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
+
+#
+# Work queue support
+#
+# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_SCHED_HPWORK is not set
+# CONFIG_SCHED_LPWORK is not set
 
 #
 # Stack and heap information
@@ -264,6 +268,7 @@ CONFIG_IDLETHREAD_STACKSIZE=1024
 CONFIG_USERMAIN_STACKSIZE=2048
 CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=1536
+# CONFIG_LIB_SYSCALL is not set
 
 #
 # Device Drivers
@@ -272,25 +277,57 @@ CONFIG_DISABLE_POLL=y
 CONFIG_DEV_NULL=y
 # CONFIG_DEV_ZERO is not set
 # CONFIG_DEV_LOOP is not set
+
+#
+# Buffering
+#
+# CONFIG_DRVR_WRITEBUFFER is not set
+# CONFIG_DRVR_READAHEAD is not set
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 # CONFIG_SPI is not set
 # CONFIG_I2S is not set
+
+#
+# Timer Driver Support
+#
+# CONFIG_TIMER is not set
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
-# CONFIG_TIMER is not set
 # CONFIG_ANALOG is not set
 # CONFIG_AUDIO_DEVICES is not set
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
+# CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
+# CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
@@ -298,6 +335,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -320,15 +359,16 @@ CONFIG_UART1_SERIALDRIVER=y
 # CONFIG_USART6_SERIALDRIVER is not set
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
+# CONFIG_OTHER_UART_SERIALDRIVER is not set
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
-# CONFIG_SERIAL_TIOCSERGSTRUCT is not set
+# CONFIG_SERIAL_IFLOWCONTROL is not set
+# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
+# CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_UART1_SERIAL_CONSOLE is not set
+# CONFIG_OTHER_SERIAL_CONSOLE is not set
 # CONFIG_NO_SERIAL_CONSOLE is not set
 
 #
@@ -342,6 +382,7 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 
 #
 # UART1 Configuration
@@ -354,20 +395,25 @@ CONFIG_UART1_PARITY=0
 CONFIG_UART1_2STOP=0
 # CONFIG_UART1_IFLOWCONTROL is not set
 # CONFIG_UART1_OFLOWCONTROL is not set
-# CONFIG_SERIAL_IFLOWCONTROL is not set
-# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_UART1_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
+# CONFIG_HAVE_USBTRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+# CONFIG_SYSLOG_CHARDEV is not set
 
 #
 # Networking Support
@@ -376,6 +422,11 @@ CONFIG_UART1_2STOP=0
 # CONFIG_ARCH_HAVE_PHY is not set
 # CONFIG_NET is not set
 
+#
+# Crypto API
+#
+# CONFIG_CRYPTO is not set
+
 #
 # File Systems
 #
@@ -384,21 +435,21 @@ CONFIG_UART1_2STOP=0
 # File system configuration
 #
 # CONFIG_DISABLE_MOUNTPOINT is not set
+# CONFIG_FS_AUTOMOUNTER is not set
 # CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
 # CONFIG_FS_READABLE is not set
 # CONFIG_FS_WRITABLE is not set
+# CONFIG_FS_NAMED_SEMAPHORES is not set
+CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_RAMMAP is not set
 # CONFIG_FS_FAT is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_BINFS is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
-
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -421,7 +472,11 @@ CONFIG_HEAP2_SIZE=0
 # CONFIG_AUDIO is not set
 
 #
-# Binary Formats
+# Wireless Support
+#
+
+#
+# Binary Loader
 #
 # CONFIG_BINFMT_DISABLE is not set
 # CONFIG_BINFMT_EXEPATH is not set
@@ -446,6 +501,7 @@ CONFIG_LIB_HOMEDIR="/"
 CONFIG_NOPRINTF_FIELDWIDTH=y
 # CONFIG_LIBC_FLOATINGPOINT is not set
 CONFIG_LIBC_LONG_LONG=y
+# CONFIG_LIBC_IOCTL_VARIADIC is not set
 CONFIG_LIB_RAND_ORDER=1
 # CONFIG_EOL_IS_CR is not set
 # CONFIG_EOL_IS_LF is not set
@@ -457,16 +513,21 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
 # CONFIG_LIBC_STRERROR is not set
 # CONFIG_LIBC_PERROR_STDOUT is not set
 CONFIG_ARCH_LOWPUTC=y
+# CONFIG_LIBC_LOCALTIME is not set
+# CONFIG_TIME_EXTENDED is not set
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+# CONFIG_ARCH_HAVE_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
-# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -483,11 +544,14 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 
+#
+# CAN Utilities
+#
+
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
@@ -495,11 +559,11 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -507,91 +571,106 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
-# CONFIG_EXAMPLES_PASHELLO is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
-# CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_UDP is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
 #
 # CONFIG_TIFF is not set
+# CONFIG_GRAPHICS_TRAVELER is not set
 
 #
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_MICROPYTHON is not set
 # CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
-# CONFIG_NETUTILS_DHCPD is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
-# CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_TFTPC is not set
-# CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_NETLIB is not set
-# CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
-# FreeModBus
+# NSH Library
 #
-# CONFIG_MODBUS is not set
+CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
 
 #
-# NSH Library
+# Command Line Configuration
 #
-CONFIG_NSH_LIBRARY=y
 CONFIG_NSH_READLINE=y
 # CONFIG_NSH_CLE is not set
+CONFIG_NSH_LINELEN=80
+# CONFIG_NSH_DISABLE_SEMICOLON is not set
+# CONFIG_NSH_CMDPARMS is not set
+CONFIG_NSH_MAXARGUMENTS=6
+# CONFIG_NSH_ARGCAT is not set
+CONFIG_NSH_NESTDEPTH=3
+# CONFIG_NSH_DISABLEBG is not set
 CONFIG_NSH_BUILTIN_APPS=y
 
 #
 # Disable Individual commands
 #
 # CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
 # CONFIG_NSH_DISABLE_CMP is not set
+CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_DD is not set
 # CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
 # CONFIG_NSH_DISABLE_ECHO is not set
 # CONFIG_NSH_DISABLE_EXEC is not set
 # CONFIG_NSH_DISABLE_EXIT is not set
@@ -600,8 +679,10 @@ CONFIG_NSH_BUILTIN_APPS=y
 # CONFIG_NSH_DISABLE_HELP is not set
 # CONFIG_NSH_DISABLE_HEXDUMP is not set
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 # CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -609,6 +690,7 @@ CONFIG_NSH_BUILTIN_APPS=y
 # CONFIG_NSH_DISABLE_MKRD is not set
 # CONFIG_NSH_DISABLE_MH is not set
 # CONFIG_NSH_DISABLE_MOUNT is not set
+# CONFIG_NSH_DISABLE_MV is not set
 # CONFIG_NSH_DISABLE_MW is not set
 # CONFIG_NSH_DISABLE_PS is not set
 # CONFIG_NSH_DISABLE_PUT is not set
@@ -618,12 +700,15 @@ CONFIG_NSH_BUILTIN_APPS=y
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 # CONFIG_NSH_DISABLE_WGET is not set
 # CONFIG_NSH_DISABLE_XD is not set
+CONFIG_NSH_MMCSDMINOR=0
 
 #
 # Configure Command Options
@@ -632,23 +717,22 @@ CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CODECS_BUFSIZE=128
 # CONFIG_NSH_CMDOPT_HEXDUMP is not set
 CONFIG_NSH_FILEIOSIZE=512
-CONFIG_NSH_LINELEN=80
-# CONFIG_NSH_DISABLE_SEMICOLON is not set
-# CONFIG_NSH_CMDPARMS is not set
-CONFIG_NSH_MAXARGUMENTS=6
-# CONFIG_NSH_ARGCAT is not set
-CONFIG_NSH_NESTDEPTH=3
+
+#
+# Scripting Support
+#
 # CONFIG_NSH_DISABLESCRIPT is not set
 # CONFIG_NSH_DISABLE_ITEF is not set
 # CONFIG_NSH_DISABLE_LOOPS is not set
-# CONFIG_NSH_DISABLEBG is not set
-CONFIG_NSH_CONSOLE=y
 
 #
-# USB Trace Support
+# Console Configuration
 #
+CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
 
 #
 # NxWidgets/NxWM
@@ -662,94 +746,19 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-
-#
-# Custom Free Memory Command
-#
-# CONFIG_SYSTEM_FREE is not set
-
-#
-# EMACS-like Command Line Editor
-#
 # CONFIG_SYSTEM_CLE is not set
-
-#
-# FLASH Program Installation
-#
+# CONFIG_SYSTEM_CUTERM is not set
+# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
-
-#
-# FLASH Erase-all Command
-#
-
-#
-# I2C tool
-#
-
-#
-# INI File Parser
-#
-# CONFIG_FSUTILS_INIFILE is not set
-
-#
-# NxPlayer media player library / command Line
-#
-# CONFIG_SYSTEM_NXPLAYER is not set
-
-#
-# RAM test
-#
 # CONFIG_SYSTEM_RAMTEST is not set
-
-#
-# readline()
-#
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
-
-#
-# Power Off
-#
-# CONFIG_SYSTEM_POWEROFF is not set
-
-#
-# RAMTRON
-#
-
-#
-# SD Card
-#
-
-#
-# Sysinfo
-#
-
-#
-# VI Work-Alike Editor
-#
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
+# CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
 # CONFIG_SYSTEM_VI is not set
-
-#
-# Stack Monitor
-#
-
-#
-# USB CDC/ACM Device Commands
-#
-
-#
-# USB Composite Device Commands
-#
-
-#
-# USB Mass Storage Device Commands
-#
-
-#
-# USB Monitor
-#
-
-#
-# Zmodem Commands
-#
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/z16f2800100zcog/ostest/defconfig b/configs/z16f2800100zcog/ostest/defconfig
index 9f93e39aef..be9dc28597 100644
--- a/configs/z16f2800100zcog/ostest/defconfig
+++ b/configs/z16f2800100zcog/ostest/defconfig
@@ -7,6 +7,7 @@
 # Build Setup
 #
 # CONFIG_EXPERIMENTAL is not set
+# CONFIG_DEFAULT_SMALL is not set
 # CONFIG_HOST_LINUX is not set
 # CONFIG_HOST_OSX is not set
 CONFIG_HOST_WINDOWS=y
@@ -20,6 +21,7 @@ CONFIG_WINDOWS_CYGWIN=y
 # Build Configuration
 #
 # CONFIG_APPS_DIR="../apps"
+CONFIG_BUILD_FLAT=y
 # CONFIG_BUILD_2PASS is not set
 
 #
@@ -29,43 +31,29 @@ CONFIG_WINDOWS_CYGWIN=y
 # CONFIG_INTELHEX_BINARY is not set
 # CONFIG_MOTOROLA_SREC is not set
 # CONFIG_RAW_BINARY is not set
+# CONFIG_UBOOT_UIMAGE is not set
 
 #
 # Customize Header Files
 #
+# CONFIG_ARCH_STDINT_H is not set
 # CONFIG_ARCH_STDBOOL_H is not set
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
 # CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
 
 #
 # Debug Options
 #
-CONFIG_DEBUG_FEATURES=y
+# CONFIG_DEBUG_ALERT 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_INFO is not set
-
-#
-# Subsystem Debug Options
-#
-# CONFIG_DEBUG_MM is not set
-# CONFIG_DEBUG_SCHED is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_DEBUG_LIB is not set
-# CONFIG_DEBUG_BINFMT is not set
-# CONFIG_DEBUG_GRAPHICS is not set
-# CONFIG_DEBUG_IRQ is not set
-
-#
-# Driver Debug Options
-#
-# CONFIG_DEBUG_LEDS is not set
-# CONFIG_DEBUG_ANALOG is not set
-# CONFIG_DEBUG_GPIO is not set
-# CONFIG_DEBUG_AUDIO is not set
 # CONFIG_DEBUG_SYMBOLS is not set
+# CONFIG_ARCH_HAVE_CUSTOMOPT is not set
 # CONFIG_DEBUG_NOOPT is not set
+CONFIG_DEBUG_FULLOPT=y
 
 #
 # System Type
@@ -99,6 +87,11 @@ CONFIG_ARCH_CHIP_Z16F=y
 #
 # Z16F Configuration Options
 #
+
+#
+# Z16F Peripheral Selection
+#
+# CONFIG_Z16F_ESPI is not set
 CONFIG_Z16F_UART0=y
 CONFIG_Z16F_UART1=y
 
@@ -109,11 +102,22 @@ CONFIG_Z16F_UART1=y
 # CONFIG_ARCH_VECNOTIRQ is not set
 # CONFIG_ARCH_DMA is not set
 CONFIG_ARCH_HAVE_IRQPRIO=y
-# CONFIG_ARCH_ADDRENV is not set
+# CONFIG_ARCH_L2CACHE is not set
+# CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
+# CONFIG_ARCH_HAVE_ADDRENV is not set
+# CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 # CONFIG_ARCH_HAVE_VFORK is not set
+# CONFIG_ARCH_HAVE_MMU is not set
+# CONFIG_ARCH_HAVE_MPU is not set
+# CONFIG_ARCH_NAND_HWECC is not set
+# CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+# CONFIG_ARCH_HAVE_RESET is not set
 # CONFIG_ARCH_IRQPRIO is not set
 # CONFIG_ARCH_STACKDUMP is not set
 CONFIG_ENDIAN_BIG=y
+# CONFIG_ARCH_IDLE_CUSTOM is not set
 # CONFIG_ARCH_HAVE_RAMFUNCS is not set
 # CONFIG_ARCH_HAVE_RAMVECTORS is not set
 
@@ -143,6 +147,7 @@ CONFIG_BOOT_RUNFROMFLASH=y
 #
 CONFIG_RAM_START=0x0
 CONFIG_RAM_SIZE=65536
+# CONFIG_ARCH_HAVE_SDRAM is not set
 
 #
 # Board Selection
@@ -160,38 +165,79 @@ CONFIG_ARCH_LEDS=y
 #
 # Board-Specific Options
 #
+# CONFIG_BOARD_CRASHDUMP is not set
+# CONFIG_LIB_BOARDCTL is not set
 
 #
 # RTOS Features
 #
-# CONFIG_BOARD_INITIALIZE is not set
+CONFIG_DISABLE_OS_API=y
+# CONFIG_DISABLE_POSIX_TIMERS is not set
+# CONFIG_DISABLE_PTHREAD is not set
+# CONFIG_DISABLE_SIGNALS is not set
+# CONFIG_DISABLE_MQUEUE is not set
+# CONFIG_DISABLE_ENVIRON is not set
+
+#
+# Clocks and Timers
+#
 CONFIG_USEC_PER_TICK=10000
 # CONFIG_SYSTEM_TIME64 is not set
-CONFIG_RR_INTERVAL=200
-# CONFIG_SCHED_INSTRUMENTATION is not set
-CONFIG_TASK_NAME_SIZE=0
-# CONFIG_SCHED_HAVE_PARENT is not set
+# CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
 CONFIG_START_YEAR=2012
 CONFIG_START_MONTH=11
 CONFIG_START_DAY=29
-CONFIG_DEV_CONSOLE=y
+CONFIG_MAX_WDOGPARMS=2
+CONFIG_PREALLOC_WDOGS=4
+CONFIG_WDOG_INTRESERVE=0
+CONFIG_PREALLOC_TIMERS=4
+
+#
+# Tasks and Scheduling
+#
+# CONFIG_INIT_NONE is not set
+CONFIG_INIT_ENTRYPOINT=y
+# CONFIG_INIT_FILEPATH is not set
+CONFIG_USER_ENTRYPOINT="ostest_main"
+CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
+CONFIG_TASK_NAME_SIZE=0
+CONFIG_MAX_TASKS=16
+# CONFIG_SCHED_HAVE_PARENT is not set
+# CONFIG_SCHED_WAITPID is not set
+
+#
+# Pthread Options
+#
 # CONFIG_MUTEX_TYPES is not set
-# CONFIG_PRIORITY_INHERITANCE is not set
+CONFIG_NPTHREAD_KEYS=4
+
+#
+# Performance Monitoring
+#
+# CONFIG_SCHED_CPULOAD is not set
+# CONFIG_SCHED_INSTRUMENTATION is not set
+
+#
+# Files and I/O
+#
+CONFIG_DEV_CONSOLE=y
 # CONFIG_FDCLONE_DISABLE is not set
 # CONFIG_FDCLONE_STDIO is not set
 CONFIG_SDCLONE_DISABLE=y
-# CONFIG_SCHED_WAITPID is not set
+CONFIG_NFILE_DESCRIPTORS=8
+CONFIG_NFILE_STREAMS=8
+CONFIG_NAME_MAX=32
+# CONFIG_PRIORITY_INHERITANCE is not set
+
+#
+# RTOS hooks
+#
+# CONFIG_BOARD_INITIALIZE is not set
 # CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
-CONFIG_USER_ENTRYPOINT="ostest_main"
-CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_POSIX_TIMERS is not set
-# CONFIG_DISABLE_PTHREAD is not set
-# CONFIG_DISABLE_SIGNALS is not set
-# CONFIG_DISABLE_MQUEUE is not set
-# CONFIG_DISABLE_ENVIRON is not set
 
 #
 # Signal Numbers
@@ -202,19 +248,18 @@ CONFIG_SIG_SIGALARM=3
 CONFIG_SIG_SIGCONDTIMEDOUT=16
 
 #
-# Sizes of configurable things (0 disables)
+# POSIX Message Queue Options
 #
-CONFIG_MAX_TASKS=16
-CONFIG_NPTHREAD_KEYS=4
-CONFIG_NFILE_DESCRIPTORS=8
-CONFIG_NFILE_STREAMS=8
-CONFIG_NAME_MAX=32
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
-CONFIG_MAX_WDOGPARMS=2
-CONFIG_PREALLOC_WDOGS=4
-CONFIG_WDOG_INTRESERVE=0
-CONFIG_PREALLOC_TIMERS=4
+# CONFIG_MODULE is not set
+
+#
+# Work queue support
+#
+# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_SCHED_HPWORK is not set
+# CONFIG_SCHED_LPWORK is not set
 
 #
 # Stack and heap information
@@ -223,6 +268,7 @@ CONFIG_IDLETHREAD_STACKSIZE=4096
 CONFIG_USERMAIN_STACKSIZE=4096
 CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=4096
+# CONFIG_LIB_SYSCALL is not set
 
 #
 # Device Drivers
@@ -231,14 +277,26 @@ CONFIG_DISABLE_POLL=y
 CONFIG_DEV_NULL=y
 # CONFIG_DEV_ZERO is not set
 # CONFIG_DEV_LOOP is not set
+
+#
+# Buffering
+#
+# CONFIG_DRVR_WRITEBUFFER is not set
+# CONFIG_DRVR_READAHEAD is not set
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 # CONFIG_SPI is not set
 # CONFIG_I2S is not set
+
+#
+# Timer Driver Support
+#
+# CONFIG_TIMER is not set
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_ANALOG is not set
@@ -246,9 +304,30 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
+# CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
 # CONFIG_MTD is not set
+# CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
@@ -256,17 +335,39 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
+# CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
 CONFIG_UART1_SERIALDRIVER=y
-
-#
-# USART Configuration
-#
+# CONFIG_UART2_SERIALDRIVER is not set
+# CONFIG_UART3_SERIALDRIVER is not set
+# CONFIG_UART4_SERIALDRIVER is not set
+# CONFIG_UART5_SERIALDRIVER is not set
+# CONFIG_UART6_SERIALDRIVER is not set
+# CONFIG_UART7_SERIALDRIVER is not set
+# CONFIG_UART8_SERIALDRIVER is not set
+# CONFIG_SCI0_SERIALDRIVER is not set
+# CONFIG_SCI1_SERIALDRIVER is not set
+# CONFIG_USART0_SERIALDRIVER is not set
+# CONFIG_USART1_SERIALDRIVER is not set
+# CONFIG_USART2_SERIALDRIVER is not set
+# CONFIG_USART3_SERIALDRIVER is not set
+# CONFIG_USART4_SERIALDRIVER is not set
+# CONFIG_USART5_SERIALDRIVER is not set
+# CONFIG_USART6_SERIALDRIVER is not set
+# CONFIG_USART7_SERIALDRIVER is not set
+# CONFIG_USART8_SERIALDRIVER is not set
+# CONFIG_OTHER_UART_SERIALDRIVER is not set
 CONFIG_MCU_SERIAL=y
-# CONFIG_SERIAL_TIOCSERGSTRUCT is not set
+# CONFIG_SERIAL_IFLOWCONTROL is not set
+# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
+# CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_UART1_SERIAL_CONSOLE is not set
+# CONFIG_OTHER_SERIAL_CONSOLE is not set
 # CONFIG_NO_SERIAL_CONSOLE is not set
 
 #
@@ -280,6 +381,7 @@ CONFIG_UART0_PARITY=0
 CONFIG_UART0_2STOP=0
 # CONFIG_UART0_IFLOWCONTROL is not set
 # CONFIG_UART0_OFLOWCONTROL is not set
+# CONFIG_UART0_DMA is not set
 
 #
 # UART1 Configuration
@@ -292,20 +394,25 @@ CONFIG_UART1_PARITY=0
 CONFIG_UART1_2STOP=0
 # CONFIG_UART1_IFLOWCONTROL is not set
 # CONFIG_UART1_OFLOWCONTROL is not set
-# CONFIG_SERIAL_IFLOWCONTROL is not set
-# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_UART1_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
+# CONFIG_HAVE_USBTRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+# CONFIG_SYSLOG_CHARDEV is not set
 
 #
 # Networking Support
@@ -314,6 +421,11 @@ CONFIG_UART1_2STOP=0
 # CONFIG_ARCH_HAVE_PHY is not set
 # CONFIG_NET is not set
 
+#
+# Crypto API
+#
+# CONFIG_CRYPTO is not set
+
 #
 # File Systems
 #
@@ -322,19 +434,20 @@ CONFIG_UART1_2STOP=0
 # File system configuration
 #
 # CONFIG_DISABLE_MOUNTPOINT is not set
+# CONFIG_FS_AUTOMOUNTER is not set
+# CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
 # CONFIG_FS_READABLE is not set
 # CONFIG_FS_WRITABLE is not set
+# CONFIG_FS_NAMED_SEMAPHORES is not set
+CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_RAMMAP is not set
 # CONFIG_FS_FAT is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
-
+# CONFIG_FS_UNIONFS is not set
 
 #
 # Graphics Support
@@ -357,7 +470,11 @@ CONFIG_HEAP2_SIZE=0
 # CONFIG_AUDIO is not set
 
 #
-# Binary Formats
+# Wireless Support
+#
+
+#
+# Binary Loader
 #
 # CONFIG_BINFMT_DISABLE is not set
 # CONFIG_BINFMT_EXEPATH is not set
@@ -382,6 +499,7 @@ CONFIG_LIB_HOMEDIR="/"
 CONFIG_NOPRINTF_FIELDWIDTH=y
 # CONFIG_LIBC_FLOATINGPOINT is not set
 CONFIG_LIBC_LONG_LONG=y
+# CONFIG_LIBC_IOCTL_VARIADIC is not set
 CONFIG_LIB_RAND_ORDER=1
 # CONFIG_EOL_IS_CR is not set
 # CONFIG_EOL_IS_LF is not set
@@ -393,16 +511,21 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
 # CONFIG_LIBC_STRERROR is not set
 # CONFIG_LIBC_PERROR_STDOUT is not set
 CONFIG_ARCH_LOWPUTC=y
+# CONFIG_LIBC_LOCALTIME is not set
+# CONFIG_TIME_EXTENDED is not set
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+# CONFIG_ARCH_HAVE_TLS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
-# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -415,26 +538,25 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
+# CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
-# CONFIG_EXAMPLES_LCDRW is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -442,12 +564,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 CONFIG_EXAMPLES_OSTEST=y
 CONFIG_EXAMPLES_OSTEST_LOOPS=1
@@ -455,64 +576,64 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=8
 CONFIG_EXAMPLES_OSTEST_RR_RANGE=10000
 CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
-# CONFIG_EXAMPLES_PASHELLO is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
-# CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
+# CONFIG_EXAMPLES_SERIALBLASTER is not set
+# CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_UDP is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
 
 #
 # Graphics Support
 #
 # CONFIG_TIFF is not set
+# CONFIG_GRAPHICS_TRAVELER is not set
 
 #
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_MICROPYTHON is not set
 # CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Network Utilities
+# FreeModBus
 #
+# CONFIG_MODBUS is not set
 
 #
-# Networking Utilities
+# Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
-# CONFIG_NETUTILS_DHCPC is not set
-# CONFIG_NETUTILS_DHCPD is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
-# CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETDB_DNSCLIENT is not set
 # CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_TELNETD is not set
-# CONFIG_NETUTILS_TFTPC is not set
-# CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_NETLIB is not set
-# CONFIG_NETUTILS_WEBCLIENT is not set
-
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
 
 #
 # NSH Library
@@ -529,80 +650,18 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_PLATFORM_CONFIGDATA is not set
 
 #
-# System NSH Add-Ons
-#
-
-#
-# USB CDC/ACM Device Commands
-#
-
-#
-# USB Composite Device Commands
-#
-
-#
-# Custom Free Memory Command
+# System Libraries and NSH Add-Ons
 #
+# CONFIG_SYSTEM_CLE is not set
+# CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_FREE is not set
-
-#
-# I2C tool
-#
-
-#
-# FLASH Program Installation
-#
+# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_INSTALL is not set
-
-#
-# FLASH Erase-all Command
-#
-
-#
-# NxPlayer media player library / command Line
-#
-# CONFIG_SYSTEM_NXPLAYER is not set
-
-#
-# RAM test
-#
 # CONFIG_SYSTEM_RAMTEST is not set
-
-#
-# readline()
-#
+# CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
-
-#
-# Power Off
-#
-# CONFIG_SYSTEM_POWEROFF is not set
-
-#
-# RAMTRON
-#
-
-#
-# SD Card
-#
-
-#
-# Sysinfo
-#
-
-#
-# USB Monitor
-#
-
-#
-# Stack Monitor
-#
-
-#
-# USB Mass Storage Device Commands
-#
-
-#
-# Zmodem Commands
-#
+# CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/z16f2800100zcog/pashello/defconfig b/configs/z16f2800100zcog/pashello/defconfig
index f542918378..cc0ad6952d 100644
--- a/configs/z16f2800100zcog/pashello/defconfig
+++ b/configs/z16f2800100zcog/pashello/defconfig
@@ -41,7 +41,7 @@ CONFIG_WINDOWS_CYGWIN=y
 #
 # Debug Options
 #
-CONFIG_DEBUG_FEATURES=y
+# CONFIG_DEBUG_FEATURES is not set
 # CONFIG_DEBUG_INFO is not set
 
 
diff --git a/configs/z8encore000zco/ostest/defconfig b/configs/z8encore000zco/ostest/defconfig
index 9f47341e90..19532ebf97 100644
--- a/configs/z8encore000zco/ostest/defconfig
+++ b/configs/z8encore000zco/ostest/defconfig
@@ -46,33 +46,10 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-CONFIG_DEBUG_FEATURES=y
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-# CONFIG_DEBUG_INFO is not set
-
-#
-# Subsystem Debug Options
-#
-# CONFIG_DEBUG_AUDIO is not set
-# CONFIG_DEBUG_BINFMT is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_DEBUG_GRAPHICS is not set
-# CONFIG_DEBUG_LIB is not set
-# CONFIG_DEBUG_MM is not set
-# CONFIG_DEBUG_SCHED is not set
-
-#
-# OS Function Debug Options
-#
-# CONFIG_DEBUG_IRQ is not set
-
-#
-# Driver Debug Options
-#
-# CONFIG_DEBUG_LEDS is not set
-# CONFIG_DEBUG_ANALOG is not set
-# CONFIG_DEBUG_GPIO is not set
+# CONFIG_DEBUG_ALERT 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
 # CONFIG_ARCH_HAVE_CUSTOMOPT is not set
 # CONFIG_DEBUG_NOOPT is not set
@@ -167,6 +144,7 @@ CONFIG_Z8_ZDSII_V522=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 # CONFIG_ARCH_HAVE_VFORK is not set
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
@@ -224,6 +202,7 @@ CONFIG_ARCH_HAVE_LEDS=y
 #
 # Board-Specific Options
 #
+# CONFIG_BOARD_CRASHDUMP is not set
 # CONFIG_LIB_BOARDCTL is not set
 
 #
@@ -339,14 +318,26 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
 #
 # CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -358,6 +349,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -381,15 +374,10 @@ CONFIG_UART1_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
 # CONFIG_SERIAL_DMA is not set
-# CONFIG_SERIAL_TIOCSERGSTRUCT is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_UART1_SERIAL_CONSOLE is not set
@@ -423,17 +411,22 @@ CONFIG_UART1_2STOP=0
 # CONFIG_UART1_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
+# CONFIG_HAVE_USBTRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+# CONFIG_SYSLOG_CHARDEV is not set
 
 #
 # Networking Support
@@ -463,11 +456,6 @@ CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -488,6 +476,10 @@ CONFIG_HEAP2_SIZE=0
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -528,13 +520,16 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+# CONFIG_ARCH_HAVE_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -561,10 +556,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_LEDS is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -573,11 +569,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 CONFIG_EXAMPLES_OSTEST=y
 CONFIG_EXAMPLES_OSTEST_LOOPS=1
@@ -588,8 +584,9 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -597,20 +594,25 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
 # CONFIG_FSUTILS_INIFILE is not set
 
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
 #
 # Graphics Support
 #
@@ -621,8 +623,8 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -633,6 +635,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -654,16 +657,16 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_LIB_HEX2BIN is not set
+# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/z8f64200100kit/ostest/defconfig b/configs/z8f64200100kit/ostest/defconfig
index 1373c7e857..cec4ac76ed 100644
--- a/configs/z8f64200100kit/ostest/defconfig
+++ b/configs/z8f64200100kit/ostest/defconfig
@@ -46,33 +46,10 @@ CONFIG_BUILD_FLAT=y
 #
 # Debug Options
 #
-CONFIG_DEBUG_FEATURES=y
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-# CONFIG_DEBUG_INFO is not set
-
-#
-# Subsystem Debug Options
-#
-# CONFIG_DEBUG_AUDIO is not set
-# CONFIG_DEBUG_BINFMT is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_DEBUG_GRAPHICS is not set
-# CONFIG_DEBUG_LIB is not set
-# CONFIG_DEBUG_MM is not set
-# CONFIG_DEBUG_SCHED is not set
-
-#
-# OS Function Debug Options
-#
-# CONFIG_DEBUG_IRQ is not set
-
-#
-# Driver Debug Options
-#
-# CONFIG_DEBUG_LEDS is not set
-# CONFIG_DEBUG_ANALOG is not set
-# CONFIG_DEBUG_GPIO is not set
+# CONFIG_DEBUG_ALERT 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
 # CONFIG_ARCH_HAVE_CUSTOMOPT is not set
 # CONFIG_DEBUG_NOOPT is not set
@@ -167,6 +144,7 @@ CONFIG_Z8_ZDSII_V522=y
 # CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
 # CONFIG_ARCH_HAVE_ADDRENV is not set
 # CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
 # CONFIG_ARCH_HAVE_VFORK is not set
 # CONFIG_ARCH_HAVE_MMU is not set
 # CONFIG_ARCH_HAVE_MPU is not set
@@ -224,6 +202,7 @@ CONFIG_ARCH_HAVE_LEDS=y
 #
 # Board-Specific Options
 #
+# CONFIG_BOARD_CRASHDUMP is not set
 # CONFIG_LIB_BOARDCTL is not set
 
 #
@@ -339,14 +318,26 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
 # CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
+
+#
+# LCD Driver Support
+#
 # CONFIG_LCD is not set
+# CONFIG_SLCD is not set
 
 #
 # LED Support
 #
 # CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
 # CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MODEM is not set
 # CONFIG_MTD is not set
@@ -358,6 +349,8 @@ CONFIG_DEV_NULL=y
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
 # CONFIG_16550_UART is not set
 # CONFIG_UART_SERIALDRIVER is not set
 CONFIG_UART0_SERIALDRIVER=y
@@ -381,16 +374,11 @@ CONFIG_UART1_SERIALDRIVER=y
 # CONFIG_USART7_SERIALDRIVER is not set
 # CONFIG_USART8_SERIALDRIVER is not set
 # CONFIG_OTHER_UART_SERIALDRIVER is not set
-
-#
-# USART Configuration
-#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
 # CONFIG_SERIAL_DMA is not set
-# CONFIG_SERIAL_TIOCSERGSTRUCT is not set
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_UART1_SERIAL_CONSOLE is not set
@@ -424,17 +412,22 @@ CONFIG_UART1_2STOP=0
 # CONFIG_UART1_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
+# CONFIG_HAVE_USBTRACE is not set
 # CONFIG_DRIVERS_WIRELESS is not set
 
-#
-# System Logging Device Options
-#
-
 #
 # System Logging
 #
+# CONFIG_ARCH_SYSLOG is not set
 # CONFIG_RAMLOG is not set
-# CONFIG_CONSOLE_SYSLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+# CONFIG_SYSLOG_CHARDEV is not set
 
 #
 # Networking Support
@@ -464,11 +457,6 @@ CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y
 # CONFIG_FS_PROCFS is not set
 # CONFIG_FS_UNIONFS is not set
 
-#
-# System Logging
-#
-# CONFIG_SYSLOG_TIMESTAMP is not set
-
 #
 # Graphics Support
 #
@@ -489,6 +477,10 @@ CONFIG_HEAP2_SIZE=0
 #
 # CONFIG_AUDIO is not set
 
+#
+# Wireless Support
+#
+
 #
 # Binary Loader
 #
@@ -529,13 +521,16 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+# CONFIG_ARCH_HAVE_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
+# CONFIG_LIB_CRC64_FAST is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
 
 #
 # Basic CXX Support
@@ -562,10 +557,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_LEDS is not set
 # CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
@@ -574,11 +570,11 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_EXAMPLES_NSH is not set
 # CONFIG_EXAMPLES_NULL is not set
 # CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 CONFIG_EXAMPLES_OSTEST=y
 CONFIG_EXAMPLES_OSTEST_LOOPS=1
@@ -589,8 +585,9 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
@@ -598,20 +595,25 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_WEBSERVER is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
 
 #
 # File System Utilities
 #
 # CONFIG_FSUTILS_INIFILE is not set
 
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
 #
 # Graphics Support
 #
@@ -622,8 +624,8 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
 # CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
 # FreeModBus
@@ -634,6 +636,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 # Network Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
@@ -655,16 +658,16 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
 #
 # System Libraries and NSH Add-Ons
 #
-# CONFIG_SYSTEM_FREE is not set
 # CONFIG_SYSTEM_CLE is not set
 # CONFIG_SYSTEM_CUTERM is not set
-# CONFIG_SYSTEM_INSTALL is not set
-# CONFIG_LIB_HEX2BIN is not set
+# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
 # CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
 # CONFIG_SYSTEM_RAMTEST is not set
 # CONFIG_READLINE_HAVE_EXTMATCH is not set
 # CONFIG_SYSTEM_READLINE is not set
 # CONFIG_SYSTEM_SUDOKU is not set
-# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
 # CONFIG_SYSTEM_ZMODEM is not set
-- 
GitLab


From 1a2ee220bbdeea2afb30ef06205ee68f3291ad85 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Thu, 7 Jul 2016 16:03:10 -0600
Subject: [PATCH 169/229] CONFIG_APPS_DIR should not be defined in any base
 configuration

---
 configs/avr32dev1/nsh/defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/avr32dev1/nsh/defconfig b/configs/avr32dev1/nsh/defconfig
index 2b4bbaf59f..caac23498a 100644
--- a/configs/avr32dev1/nsh/defconfig
+++ b/configs/avr32dev1/nsh/defconfig
@@ -20,7 +20,7 @@ CONFIG_WINDOWS_CYGWIN=y
 #
 # Build Configuration
 #
-CONFIG_APPS_DIR="../apps"
+# CONFIG_APPS_DIR="../apps"
 # CONFIG_BUILD_2PASS is not set
 
 #
-- 
GitLab


From da2d172ff12e3226f70ee64b1c37f80fb574a48e Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Thu, 7 Jul 2016 16:21:11 -0600
Subject: [PATCH 170/229] Update README

---
 configs/stm32l476vg-disco/README.txt | 318 ++++++---------------------
 1 file changed, 70 insertions(+), 248 deletions(-)

diff --git a/configs/stm32l476vg-disco/README.txt b/configs/stm32l476vg-disco/README.txt
index e8355e79bc..7f6113b518 100644
--- a/configs/stm32l476vg-disco/README.txt
+++ b/configs/stm32l476vg-disco/README.txt
@@ -43,11 +43,7 @@ Board features:
 Contents
 ========
 
-  - Development Environment
-  - GNU Toolchain Options
-  - IDEs
-  - NuttX EABI "buildroot" Toolchain
-  - NXFLAT Toolchain
+  - mbed
   - Hardware
     - Button
     - LED
@@ -57,230 +53,6 @@ Contents
   - Shields
   - Configurations
 
-Development Environment
-=======================
-
-  Either Linux or Cygwin on Windows can be used for the development environment.
-  The source has been built only using the GNU toolchain (see below).  Other
-  toolchains will likely cause problems.
-
-GNU Toolchain Options
-=====================
-
-  Toolchain Configurations
-  ------------------------
-  The NuttX make system has been modified to support the following different
-  toolchain options.
-
-    1. The CodeSourcery GNU toolchain,
-    2. The Atollic Toolchain,
-    3. The devkitARM GNU toolchain,
-    4. Raisonance GNU toolchain, or
-    5. The NuttX buildroot Toolchain (see below).
-
-  All testing has been conducted using the CodeSourcery toolchain for Linux.
-  To use the Atollic, devkitARM, Raisonance GNU, or NuttX buildroot toolchain,
-  you simply need to add one of the following configuration options to your
-  .config (or defconfig) file:
-
-    CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=n  : CodeSourcery under Windows
-    CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y  : CodeSourcery under Linux
-    CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC=y        : The Atollic toolchain under Windows
-    CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM=n      : devkitARM under Windows
-    CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE=y     : Raisonance RIDE7 under Windows
-    CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=n      : NuttX buildroot under Linux or Cygwin (default)
-
-  If you change the default toolchain, then you may also have to modify the PATH in
-  the setenv.h file if your make cannot find the tools.
-
-  NOTE: There are several limitations to using a Windows based toolchain in a
-  Cygwin environment.  The three biggest are:
-
-  1. The Windows toolchain cannot follow Cygwin paths.  Path conversions are
-     performed automatically in the Cygwin makefiles using the 'cygpath' utility
-     but you might easily find some new path problems.  If so, check out 'cygpath -w'
-
-  2. Windows toolchains cannot follow Cygwin symbolic links.  Many symbolic links
-     are used in Nuttx (e.g., include/arch).  The make system works around these
-     problems for the Windows tools by copying directories instead of linking them.
-     But this can also cause some confusion for you:  For example, you may edit
-     a file in a "linked" directory and find that your changes had no effect.
-     That is because you are building the copy of the file in the "fake" symbolic
-     directory.  If you use a Windows toolchain, you should get in the habit of
-     making like this:
-
-       V=1 make clean_context all 2>&1 |tee mout
-
-     An alias in your .bashrc file might make that less painful.
-
-  3. Dependencies are not made when using Windows versions of the GCC.  This is
-     because the dependencies are generated using Windows pathes which do not
-     work with the Cygwin make.
-
-       MKDEP = $(TOPDIR)/tools/mknulldeps.sh
-
-  The Atollic "Pro" and "Lite" Toolchain
-  --------------------------------------
-  One problem that I had with the Atollic toolchains is that the provide a gcc.exe
-  and g++.exe in the same bin/ file as their ARM binaries.  If the Atollic bin/ path
-  appears in your PATH variable before /usr/bin, then you will get the wrong gcc
-  when you try to build host executables.  This will cause to strange, uninterpretable
-  errors build some host binaries in tools/ when you first make.
-
-  Also, the Atollic toolchains are the only toolchains that have built-in support for
-  the FPU in these configurations.  If you plan to use the Cortex-M4 FPU, you will
-  need to use the Atollic toolchain for now.  See the FPU section below for more
-  information.
-
-  The Atollic "Lite" Toolchain
-  ----------------------------
-  The free, "Lite" version of the Atollic toolchain does not support C++ nor
-  does it support ar, nm, objdump, or objdcopy. If you use the Atollic "Lite"
-  toolchain, you will have to set:
-
-    CONFIG_HAVE_CXX=n
-
-  In order to compile successfully.  Otherwise, you will get errors like:
-
-    "C++ Compiler only available in TrueSTUDIO Professional"
-
-  The make may then fail in some of the post link processing because of some of
-  the other missing tools.  The Make.defs file replaces the ar and nm with
-  the default system x86 tool versions and these seem to work okay.  Disable all
-  of the following to avoid using objcopy:
-
-    CONFIG_RRLOAD_BINARY=n
-    CONFIG_INTELHEX_BINARY=n
-    CONFIG_MOTOROLA_SREC=n
-    CONFIG_RAW_BINARY=n
-
-  devkitARM
-  ---------
-  The devkitARM toolchain includes a version of MSYS make.  Make sure that the
-  the paths to Cygwin's /bin and /usr/bin directories appear BEFORE the devkitARM
-  path or will get the wrong version of make.
-
-IDEs
-====
-
-  NuttX is built using command-line make.  It can be used with an IDE, but some
-  effort will be required to create the project.
-
-  Makefile Build
-  --------------
-  Under Eclipse, it is pretty easy to set up an "empty makefile project" and
-  simply use the NuttX makefile to build the system.  That is almost for free
-  under Linux.  Under Windows, you will need to set up the "Cygwin GCC" empty
-  makefile project in order to work with Windows (Google for "Eclipse Cygwin" -
-  there is a lot of help on the internet).
-
-  Using Sourcery CodeBench from http://www.mentor.com/embedded-software/sourcery-tools/sourcery-codebench/overview
-    Download and install the latest version (as of this writting it was
-    sourceryg++-2013.05-64-arm-none-eabi)
-
-   Import the  project from git.
-     File->import->Git-URI, then import a Exiting code as a Makefile progject
-     from the working directory the git clone was done to.
-
-   Select the Sourcery CodeBench for ARM EABI. N.B. You must do one command line
-     build, before the make will work in CodeBench.
-
-  Native Build
-  ------------
-  Here are a few tips before you start that effort:
-
-  1) Select the toolchain that you will be using in your .config file
-  2) Start the NuttX build at least one time from the Cygwin command line
-     before trying to create your project.  This is necessary to create
-     certain auto-generated files and directories that will be needed.
-  3) Set up include pathes:  You will need include/, arch/arm/src/stm32,
-     arch/arm/src/common, arch/arm/src/armv7-m, and sched/.
-  4) All assembly files need to have the definition option -D __ASSEMBLY__
-     on the command line.
-
-  Startup files will probably cause you some headaches.  The NuttX startup file
-  is arch/arm/src/stm32/stm32_vectors.S.  With RIDE, I have to build NuttX
-  one time from the Cygwin command line in order to obtain the pre-built
-  startup object needed by RIDE.
-
-NuttX EABI "buildroot" Toolchain
-================================
-
-  A GNU GCC-based toolchain is assumed.  The files */setenv.sh should
-  be modified to point to the correct path to the Cortex-M3 GCC toolchain (if
-  different from the default in your PATH variable).
-
-  If you have no Cortex-M3 toolchain, one can be downloaded from the NuttX
-  Bitbucket download site (https://bitbucket.org/nuttx/buildroot/downloads/).
-  This GNU toolchain builds and executes in the Linux or Cygwin environment.
-
-  1. You must have already configured Nuttx in /nuttx.
-
-     $ (cd tools; ./configure.sh nucleo-f4x1re/f401-nsh)
-     $ make qconfig
-     $ V=1 make context all 2>&1 | tee mout
-
-     Use the f411-nsh configuration if you have the Nucleo-F411RE board.
-
-  2. Download the latest buildroot package into 
-
-  3. unpack the buildroot tarball.  The resulting directory may
-     have versioning information on it like buildroot-x.y.z.  If so,
-     rename /buildroot-x.y.z to /buildroot.
-
-  4. cd /buildroot
-
-  5. cp configs/cortexm3-eabi-defconfig-4.6.3 .config
-
-  6. make oldconfig
-
-  7. make
-
-  8. Edit setenv.h, if necessary, so that the PATH variable includes
-     the path to the newly built binaries.
-
-  See the file configs/README.txt in the buildroot source tree.  That has more
-  details PLUS some special instructions that you will need to follow if you are
-  building a Cortex-M3 toolchain for Cygwin under Windows.
-
-  NOTE:  Unfortunately, the 4.6.3 EABI toolchain is not compatible with the
-  the NXFLAT tools.  See the top-level TODO file (under "Binary loaders") for
-  more information about this problem. If you plan to use NXFLAT, please do not
-  use the GCC 4.6.3 EABI toolchain; instead use the GCC 4.3.3 EABI toolchain.
-
-NXFLAT Toolchain
-================
-
-  If you are *not* using the NuttX buildroot toolchain and you want to use
-  the NXFLAT tools, then you will still have to build a portion of the buildroot
-  tools -- just the NXFLAT tools.  The buildroot with the NXFLAT tools can
-  be downloaded from the NuttX Bitbucket download site
-  (https://bitbucket.org/nuttx/nuttx/downloads/).
-
-  This GNU toolchain builds and executes in the Linux or Cygwin environment.
-
-  1. You must have already configured Nuttx in /nuttx.
-
-     cd tools
-     ./configure.sh lpcxpresso-lpc1768/
-
-  2. Download the latest buildroot package into 
-
-  3. unpack the buildroot tarball.  The resulting directory may
-     have versioning information on it like buildroot-x.y.z.  If so,
-     rename /buildroot-x.y.z to /buildroot.
-
-  4. cd /buildroot
-
-  5. cp configs/cortexm3-defconfig-nxflat .config
-
-  6. make oldconfig
-
-  7. make
-
-  8. Edit setenv.h, if necessary, so that the PATH variable includes
-     the path to the newly builtNXFLAT binaries.
-
 mbed
 ====
 
@@ -568,8 +340,8 @@ Shields
 Configurations
 ==============
 
-  f401-nsh:
-  ---------
+  nsh:
+  ---
     Configures the NuttShell (nsh) located at apps/examples/nsh for the
     Nucleo-F401RE board.  The Configuration enables the serial interfaces
     on UART2.  Support for builtin applications is enabled, but in the base
@@ -586,26 +358,76 @@ Configurations
        b. Execute 'make menuconfig' in nuttx/ in order to start the
           reconfiguration process.
 
-    2. By default, this configuration uses the CodeSourcery toolchain
+    2. By default, this configuration uses the Generic ARM EABI toolchain
        for Linux.  That can easily be reconfigured, of course.
 
-       CONFIG_HOST_LINUX=y                     : Builds under Linux
-       CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y : CodeSourcery for Linux
+       CONFIG_HOST_LINUX=y                 : Builds under Linux
+       CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y : Generic EABI toolchain for Linux
 
     3. Although the default console is USART2 (which would correspond to
        the Virtual COM port) I have done all testing with the console
        device configured for USART1 (see instruction above under "Serial
-       Consoles).  I have been using a TTL-to-RS-232 converter connected
-       as shown below:
-
-       Nucleo CN10 STM32F4x1RE
-       ----------- ------------
-       Pin 21 PA9  USART1_RX   *Warning you make need to reverse RX/TX on
-       Pin 33 PA10 USART1_TX    some RS-232 converters
-       Pin 20 GND
-       Pin 8  U5V
-
-  f411-nsh
-  --------
-    This configuration is the same as the f401-nsh configuration, except
-    that it is configured to support the Nucleo-F411RE.
+       Consoles).  I have been using a TTL-to-RS-232 converter.
+
+    4. This example has been used to verify the OTGFS functionality.  USB is
+       not enabled in the default configuration but can be enabled with the
+       following settings:
+
+         CONFIG_STM32L4_OTGFS=y
+
+         CONFIG_USBDEV=y
+         CONFIG_USBDEV_SELFPOWERED=y
+
+     These will enable the USB CDC/ACM serial device
+
+         CONFIG_CDCACM=y
+         CONFIG_CDCACM_EP0MAXPACKET=64
+         CONFIG_CDCACM_EPINTIN=1
+         CONFIG_CDCACM_EPINTIN_FSSIZE=64
+         CONFIG_CDCACM_EPINTIN_HSSIZE=64
+         CONFIG_CDCACM_EPBULKOUT=3
+         CONFIG_CDCACM_EPBULKOUT_FSSIZE=64
+         CONFIG_CDCACM_EPBULKOUT_HSSIZE=512
+         CONFIG_CDCACM_EPBULKIN=2
+         CONFIG_CDCACM_EPBULKIN_FSSIZE=64
+         CONFIG_CDCACM_EPBULKIN_HSSIZE=512
+         CONFIG_CDCACM_NRDREQS=4
+         CONFIG_CDCACM_NWRREQS=4
+         CONFIG_CDCACM_BULKIN_REQLEN=96
+         CONFIG_CDCACM_RXBUFSIZE=257
+         CONFIG_CDCACM_TXBUFSIZE=193
+         CONFIG_CDCACM_VENDORID=0x0525
+         CONFIG_CDCACM_PRODUCTID=0xa4a7
+         CONFIG_CDCACM_VENDORSTR="NuttX"
+         CONFIG_CDCACM_PRODUCTSTR="CDC/ACM Serial"
+
+         CONFIG_SERIAL_REMOVABLE=y
+
+    These will enable the USB serial example at apps/examples/usbserial
+
+         CONFIG_BOARDCTL_USBDEVCTRL=y
+
+         CONFIG_EXAMPLES_USBSERIAL=y
+         CONFIG_EXAMPLES_USBSERIAL_BUFSIZE=512
+         CONFIG_EXAMPLES_USBSERIAL_TRACEINIT=y
+         CONFIG_EXAMPLES_USBSERIAL_TRACECLASS=y
+         CONFIG_EXAMPLES_USBSERIAL_TRACETRANSFERS=y
+         CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=y
+         CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=y
+
+    Optional USB debug features:
+
+         CONFIG_DEBUG_FEATURES=y
+         CONFIG_DEBUG_USB=y
+         CONFIG_ARCH_USBDUMP=y
+         CONFIG_USBDEV_TRACE=y
+         CONFIG_USBDEV_TRACE_NRECORDS=128
+         CONFIG_USBDEV_TRACE_STRINGS=y
+         CONFIG_USBDEV_TRACE_INITIALIDSET=y
+
+         CONFIG_NSH_USBDEV_TRACE=y
+         CONFIG_NSH_USBDEV_TRACEINIT=y
+         CONFIG_NSH_USBDEV_TRACECLASS=y
+         CONFIG_NSH_USBDEV_TRACETRANSFERS=y
+         CONFIG_NSH_USBDEV_TRACECONTROLLER=y
+         CONFIG_NSH_USBDEV_TRACEINTERRUPTS=y
-- 
GitLab


From 2279206f5f4b3fdf43f9772613ea76723b282a8f Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Thu, 7 Jul 2016 17:11:44 -0600
Subject: [PATCH 171/229] Remove carriage returns from header file

---
 include/nuttx/1wire.h | 332 +++++++++++++++++++++---------------------
 1 file changed, 166 insertions(+), 166 deletions(-)

diff --git a/include/nuttx/1wire.h b/include/nuttx/1wire.h
index 2879d03089..49786a32aa 100644
--- a/include/nuttx/1wire.h
+++ b/include/nuttx/1wire.h
@@ -1,166 +1,166 @@
-/****************************************************************************
- * include/nuttx/1wire.h
- *
- *   Copyright (C) 2016 Aleksandr Vyhovanec. All rights reserved.
- *   Author: Aleksandr Vyhovanec 
- *
- * 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_1WIRE_H
-#define __INCLUDE_NUTTX_1WIRE_H
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include 
-
-#include 
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: ONEWIRE_RESET
- *
- * Description:
- *   Reset pulse and presence detect. Each write operational will be an 'atomic'
- *   operation in the sense that any other 1-Wire actions will be serialized
- *   and pend until this write completes.
- *
- * Input Parameters:
- *   dev    - Device-specific state data
- *
- * Returned Value:
- *   0: success, <0: A negated errno
- *
- ****************************************************************************/
-
-#define ONEWIRE_RESET(d) ((d)->ops->reset(d))
-
-/****************************************************************************
- * Name: ONEWIRE_WRITE
- *
- * Description:
- *   Send a block of data on 1-Wire. Each write operational will be an 'atomic'
- *   operation in the sense that any other 1-Wire actions will be serialized
- *   and pend until this write completes.
- *
- * Input Parameters:
- *   dev    - Device-specific state data
- *   buffer - A pointer to the read-only buffer of data to be written to device
- *   buflen - The number of bytes to send from the buffer
- *
- * Returned Value:
- *   0: success, <0: A negated errno
- *
- ****************************************************************************/
-
-#define ONEWIRE_WRITE(d,b,l) ((d)->ops->write(d,b,l))
-
-/****************************************************************************
- * Name: ONEWIRE_READ
- *
- * Description:
- *   Receive a block of data from 1-Wire. Each read operational will be an 'atomic'
- *   operation in the sense that any other 1-Wire actions will be serialized
- *   and pend until this read completes.
- *
- * Input Parameters:
- *   dev    - Device-specific state data
- *   buffer - A pointer to a buffer of data to receive the data from the device
- *   buflen - The requested number of bytes to be read
- *
- * Returned Value:
- *   0: success, <0: A negated errno
- *
- ****************************************************************************/
-
-#define ONEWIRE_READ(d,b,l) ((d)->ops->read(d,b,l))
-
-/****************************************************************************
- * Name: ONEWIRE_EXCHANGE
- *
- * Description:
- *   Reset pulse and presence detect, send a block of data and receive a block
- *   of data from 1-Wir. Each write operational will be an 'atomic'
- *   operation in the sense that any other 1-Wire actions will be serialized
- *   and pend until this write completes.
- *
- * Input Parameters:
- *   dev      - Device-specific state data
- *   reset    - Reset pulse and presence detect
- *   txbuffer - A pointer to the read-only buffer of data to be written to device
- *   txbuflen - The number of bytes to send from the buffer
- *   rxbuffer - A pointer to a buffer of data to receive the data from the device
- *   rxbuflen - The requested number of bytes to be read
- *
- * Returned Value:
- *   0: success, <0: A negated errno
- *
- ****************************************************************************/
-
-#define ONEWIRE_EXCHANGE(d,r,tx,tl,rx,rl) ((d)->ops->exchange(d,r,tx,tl,rx,rl))
-
-/****************************************************************************
- * Public Types
- ****************************************************************************/
-
-/* The 1-Wire vtable */
-
-struct onewire_dev_s;
-struct onewire_ops_s
-{
-  int    (*reset)(FAR struct onewire_dev_s *dev);
-  int    (*write)(FAR struct onewire_dev_s *dev, FAR const uint8_t *buffer,
-           int buflen);
-  int    (*read)(FAR struct onewire_dev_s *dev, FAR uint8_t *buffer,
-           int buflen);
-  int    (*exchange)(FAR struct onewire_dev_s *dev, bool reset,
-                     FAR const uint8_t *txbuffer, int txbuflen,
-                     FAR uint8_t *rxbuffer, int rxbuflen);
-};
-
-/* 1-Wire private data. This structure only defines the initial fields of the
- * structure visible to the 1-Wire client. The specific implementation may
- * add additional, device specific fields after the vtable.
- */
-
-struct onewire_dev_s
-{
-  const struct onewire_ops_s *ops; /* 1-Wire vtable */
-};
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-#endif /* __INCLUDE_NUTTX_1WIRE_H */
+/****************************************************************************
+ * include/nuttx/1wire.h
+ *
+ *   Copyright (C) 2016 Aleksandr Vyhovanec. All rights reserved.
+ *   Author: Aleksandr Vyhovanec 
+ *
+ * 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_1WIRE_H
+#define __INCLUDE_NUTTX_1WIRE_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include 
+
+#include 
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: ONEWIRE_RESET
+ *
+ * Description:
+ *   Reset pulse and presence detect. Each write operational will be an 'atomic'
+ *   operation in the sense that any other 1-Wire actions will be serialized
+ *   and pend until this write completes.
+ *
+ * Input Parameters:
+ *   dev    - Device-specific state data
+ *
+ * Returned Value:
+ *   0: success, <0: A negated errno
+ *
+ ****************************************************************************/
+
+#define ONEWIRE_RESET(d) ((d)->ops->reset(d))
+
+/****************************************************************************
+ * Name: ONEWIRE_WRITE
+ *
+ * Description:
+ *   Send a block of data on 1-Wire. Each write operational will be an 'atomic'
+ *   operation in the sense that any other 1-Wire actions will be serialized
+ *   and pend until this write completes.
+ *
+ * Input Parameters:
+ *   dev    - Device-specific state data
+ *   buffer - A pointer to the read-only buffer of data to be written to device
+ *   buflen - The number of bytes to send from the buffer
+ *
+ * Returned Value:
+ *   0: success, <0: A negated errno
+ *
+ ****************************************************************************/
+
+#define ONEWIRE_WRITE(d,b,l) ((d)->ops->write(d,b,l))
+
+/****************************************************************************
+ * Name: ONEWIRE_READ
+ *
+ * Description:
+ *   Receive a block of data from 1-Wire. Each read operational will be an 'atomic'
+ *   operation in the sense that any other 1-Wire actions will be serialized
+ *   and pend until this read completes.
+ *
+ * Input Parameters:
+ *   dev    - Device-specific state data
+ *   buffer - A pointer to a buffer of data to receive the data from the device
+ *   buflen - The requested number of bytes to be read
+ *
+ * Returned Value:
+ *   0: success, <0: A negated errno
+ *
+ ****************************************************************************/
+
+#define ONEWIRE_READ(d,b,l) ((d)->ops->read(d,b,l))
+
+/****************************************************************************
+ * Name: ONEWIRE_EXCHANGE
+ *
+ * Description:
+ *   Reset pulse and presence detect, send a block of data and receive a block
+ *   of data from 1-Wir. Each write operational will be an 'atomic'
+ *   operation in the sense that any other 1-Wire actions will be serialized
+ *   and pend until this write completes.
+ *
+ * Input Parameters:
+ *   dev      - Device-specific state data
+ *   reset    - Reset pulse and presence detect
+ *   txbuffer - A pointer to the read-only buffer of data to be written to device
+ *   txbuflen - The number of bytes to send from the buffer
+ *   rxbuffer - A pointer to a buffer of data to receive the data from the device
+ *   rxbuflen - The requested number of bytes to be read
+ *
+ * Returned Value:
+ *   0: success, <0: A negated errno
+ *
+ ****************************************************************************/
+
+#define ONEWIRE_EXCHANGE(d,r,tx,tl,rx,rl) ((d)->ops->exchange(d,r,tx,tl,rx,rl))
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/* The 1-Wire vtable */
+
+struct onewire_dev_s;
+struct onewire_ops_s
+{
+  int    (*reset)(FAR struct onewire_dev_s *dev);
+  int    (*write)(FAR struct onewire_dev_s *dev, FAR const uint8_t *buffer,
+           int buflen);
+  int    (*read)(FAR struct onewire_dev_s *dev, FAR uint8_t *buffer,
+           int buflen);
+  int    (*exchange)(FAR struct onewire_dev_s *dev, bool reset,
+                     FAR const uint8_t *txbuffer, int txbuflen,
+                     FAR uint8_t *rxbuffer, int rxbuflen);
+};
+
+/* 1-Wire private data. This structure only defines the initial fields of the
+ * structure visible to the 1-Wire client. The specific implementation may
+ * add additional, device specific fields after the vtable.
+ */
+
+struct onewire_dev_s
+{
+  const struct onewire_ops_s *ops; /* 1-Wire vtable */
+};
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+#endif /* __INCLUDE_NUTTX_1WIRE_H */
-- 
GitLab


From f8d3a872ee91d384450a9c73cb65d5d06cec31a9 Mon Sep 17 00:00:00 2001
From: David Sidrane 
Date: Thu, 7 Jul 2016 15:49:21 -1000
Subject: [PATCH 172/229] FIxed STM32F& DMA stm32_dmacapable

---
 arch/arm/src/stm32f7/stm32_dma.c | 17 +++++++++++------
 arch/arm/src/stm32f7/stm32_dma.h |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/arch/arm/src/stm32f7/stm32_dma.c b/arch/arm/src/stm32f7/stm32_dma.c
index adfee405cc..7c959f84ae 100644
--- a/arch/arm/src/stm32f7/stm32_dma.c
+++ b/arch/arm/src/stm32f7/stm32_dma.c
@@ -609,7 +609,7 @@ void stm32_dmasetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr,
   dmainfo("paddr: %08x maddr: %08x ntransfers: %d scr: %08x\n",
           paddr, maddr, ntransfers, scr);
 
-#ifdef CONFIG_STM32_DMACAPABLE
+#ifdef CONFIG_STM32F7_DMACAPABLE
   DEBUGASSERT(stm32_dmacapable(maddr, ntransfers, scr));
 #endif
 
@@ -865,7 +865,7 @@ size_t stm32_dmaresidual(DMA_HANDLE handle)
  *
  ****************************************************************************/
 
-#ifdef CONFIG_STM32_DMACAPABLE
+#ifdef CONFIG_STM32F7_DMACAPABLE
 bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr)
 {
   uint32_t transfer_size, burst_length;
@@ -965,17 +965,22 @@ bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr)
       case STM32_FSMC_BANK3:
       case STM32_FSMC_BANK4:
       case STM32_SRAM_BASE:
+
         /* All RAM is supported */
 
         break;
 
       case STM32_CODE_BASE:
-        /* Everything except the CCM ram is supported */
 
-        if (maddr >= STM32_CCMRAM_BASE &&
-            (maddr - STM32_CCMRAM_BASE) < 65536)
+        /* Everything except the ITCM ram is supported per the manual
+         *  The ITCM bus is not accessible on AHBS. So the DMA data transfer
+         *  to/from ITCM RAM is not supported.
+         */
+
+        if (maddr >= STM32_INSTRAM_BASE &&
+            (maddr - STM32_INSTRAM_BASE) < 0x3fff)
           {
-            dmainfo("stm32_dmacapable: transfer targets CCMRAM\n");
+            dmainfo("stm32_dmacapable: transfer targets ITCM RAM\n");
             return false;
           }
         break;
diff --git a/arch/arm/src/stm32f7/stm32_dma.h b/arch/arm/src/stm32f7/stm32_dma.h
index 70b5173467..b25cb84e7d 100644
--- a/arch/arm/src/stm32f7/stm32_dma.h
+++ b/arch/arm/src/stm32f7/stm32_dma.h
@@ -246,7 +246,7 @@ size_t stm32_dmaresidual(DMA_HANDLE handle);
  *
  ****************************************************************************/
 
-#ifdef CONFIG_STM32_DMACAPABLE
+#ifdef CONFIG_STM32F7_DMACAPABLE
 bool stm32_dmacapable(uintptr_t maddr, uint32_t count, uint32_t ccr);
 #else
 #  define stm32_dmacapable(maddr, count, ccr) (true)
-- 
GitLab


From deb3e8143c38686fa5041204bf1e129d44ce4105 Mon Sep 17 00:00:00 2001
From: David Sidrane 
Date: Thu, 7 Jul 2016 15:49:47 -1000
Subject: [PATCH 173/229] STM32F7 - DMA working on SDMMC

---
 arch/arm/src/stm32f7/stm32_sdmmc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/src/stm32f7/stm32_sdmmc.c b/arch/arm/src/stm32f7/stm32_sdmmc.c
index e05523e46b..3e6aff9620 100644
--- a/arch/arm/src/stm32f7/stm32_sdmmc.c
+++ b/arch/arm/src/stm32f7/stm32_sdmmc.c
@@ -2848,7 +2848,7 @@ static int stm32_dmapreflight(FAR struct sdio_dev_s *dev,
   /* DMA must be possible to the buffer */
 
   if (!stm32_dmacapable((uintptr_t)buffer, (buflen + 3) >> 2,
-                        STM32_SDMMC_RXDMA32_CONFIG | priv->dmapri))
+                        SDMMC_RXDMA32_CONFIG | priv->dmapri))
     {
       return -EFAULT;
     }
@@ -3012,6 +3012,7 @@ static int stm32_dmasendsetup(FAR struct sdio_dev_s *dev,
   stm32_dmasetup(priv->dma, priv->base + STM32_SDMMC_FIFO_OFFSET, (uint32_t)buffer,
                  (buflen + 3) >> 2, SDMMC_TXDMA32_CONFIG | priv->dmapri);
 
+  sdmmc_modifyreg32(priv, STM32_SDMMC_DCTRL_OFFSET, 0, STM32_SDMMC_DCTRL_DMAEN);
   stm32_sample(priv, SAMPLENDX_BEFORE_ENABLE);
 
   /* Start the DMA */
-- 
GitLab


From 06036a5841f2523fea5ad666b629e2945befa938 Mon Sep 17 00:00:00 2001
From: David Sidrane 
Date: Fri, 8 Jul 2016 01:56:37 +0000
Subject: [PATCH 174/229] stm32_serial.c edited online with Bitbucket

---
 arch/arm/src/stm32f7/stm32_serial.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/src/stm32f7/stm32_serial.c b/arch/arm/src/stm32f7/stm32_serial.c
index 5b57549a8e..1f5445ac71 100644
--- a/arch/arm/src/stm32f7/stm32_serial.c
+++ b/arch/arm/src/stm32f7/stm32_serial.c
@@ -290,7 +290,7 @@ struct up_dev_s
   bool              rxenable;  /* DMA-based reception en/disable */
   uint16_t          rxdmain;   /* Next byte in the DMA where hardware will write */
   uint16_t          rxdmaout;  /* Next byte in the DMA buffer to be read */
-  VAR char * const  rxfifo;    /* Receive DMA buffer */
+  char      *const  rxfifo;    /* Receive DMA buffer */
 #endif
 
 #ifdef HAVE_RS485
-- 
GitLab


From 3e83599382016100e2253ce56d0a4cb92f36ec5b Mon Sep 17 00:00:00 2001
From: Matthias Renner 
Date: Fri, 8 Jul 2016 10:49:46 +0200
Subject: [PATCH 175/229] add configuration files for canard

---
 configs/stm32f4discovery/canard/Make.defs |  113 ++
 configs/stm32f4discovery/canard/defconfig | 1259 +++++++++++++++++++++
 configs/stm32f4discovery/canard/setenv.sh |   80 ++
 3 files changed, 1452 insertions(+)
 create mode 100644 configs/stm32f4discovery/canard/Make.defs
 create mode 100644 configs/stm32f4discovery/canard/defconfig
 create mode 100755 configs/stm32f4discovery/canard/setenv.sh

diff --git a/configs/stm32f4discovery/canard/Make.defs b/configs/stm32f4discovery/canard/Make.defs
new file mode 100644
index 0000000000..4f959a460c
--- /dev/null
+++ b/configs/stm32f4discovery/canard/Make.defs
@@ -0,0 +1,113 @@
+############################################################################
+# configs/stm32f4discovery/canard/Make.defs
+#
+#   Copyright (C) 2012 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.
+#
+############################################################################
+
+include ${TOPDIR}/.config
+include ${TOPDIR}/tools/Config.mk
+include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
+
+LDSCRIPT = ld.script
+
+ifeq ($(WINTOOL),y)
+  # Windows-native toolchains
+  DIRLINK = $(TOPDIR)/tools/copydir.sh
+  DIRUNLINK = $(TOPDIR)/tools/unlink.sh
+  MKDEP = $(TOPDIR)/tools/mkwindeps.sh
+  ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
+  ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
+  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
+else
+  # Linux/Cygwin-native toolchain
+  MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
+  ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
+  ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
+  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
+endif
+
+CC = $(CROSSDEV)gcc
+CXX = $(CROSSDEV)g++
+CPP = $(CROSSDEV)gcc -E
+LD = $(CROSSDEV)ld
+AR = $(ARCROSSDEV)ar rcs
+NM = $(ARCROSSDEV)nm
+OBJCOPY = $(CROSSDEV)objcopy
+OBJDUMP = $(CROSSDEV)objdump
+
+ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
+ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
+
+ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
+  ARCHOPTIMIZATION = -g
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
+endif
+
+ARCHCFLAGS = -fno-builtin
+ARCHCXXFLAGS = -fno-builtin -fno-exceptions -fno-rtti
+ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
+ARCHWARNINGSXX = -Wall -Wshadow -Wundef
+ARCHDEFINES =
+ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
+
+CFLAGS = $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
+CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
+CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
+AFLAGS = $(CFLAGS) -D__ASSEMBLY__
+
+NXFLATLDFLAGS1 = -r -d -warn-common
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
+LDNXFLATFLAGS = -e main -s 2048
+
+ASMEXT = .S
+OBJEXT = .o
+LIBEXT = .a
+EXEEXT =
+
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
+  LDFLAGS += -nostartfiles -nodefaultlibs
+endif
+ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
+  LDFLAGS += -g
+endif
+
+
+HOSTCC = gcc
+HOSTINCLUDES = -I.
+HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe
+HOSTLDFLAGS =
+
diff --git a/configs/stm32f4discovery/canard/defconfig b/configs/stm32f4discovery/canard/defconfig
new file mode 100644
index 0000000000..0e7382e11b
--- /dev/null
+++ b/configs/stm32f4discovery/canard/defconfig
@@ -0,0 +1,1259 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Nuttx/ Configuration
+#
+
+#
+# Build Setup
+#
+# CONFIG_EXPERIMENTAL is not set
+# CONFIG_DEFAULT_SMALL is not set
+CONFIG_HOST_LINUX=y
+# CONFIG_HOST_OSX is not set
+# CONFIG_HOST_WINDOWS is not set
+# CONFIG_HOST_OTHER is not set
+
+#
+# Build Configuration
+#
+CONFIG_APPS_DIR="../apps"
+CONFIG_BUILD_FLAT=y
+# CONFIG_BUILD_2PASS is not set
+
+#
+# Binary Output Formats
+#
+# CONFIG_RRLOAD_BINARY is not set
+CONFIG_INTELHEX_BINARY=y
+# CONFIG_MOTOROLA_SREC is not set
+CONFIG_RAW_BINARY=y
+# CONFIG_UBOOT_UIMAGE is not set
+
+#
+# Customize Header Files
+#
+# CONFIG_ARCH_STDINT_H is not set
+# CONFIG_ARCH_STDBOOL_H is not set
+# CONFIG_ARCH_MATH_H is not set
+# CONFIG_ARCH_FLOAT_H is not set
+# CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
+
+#
+# Debug Options
+#
+CONFIG_DEBUG_ALERT=y
+CONFIG_DEBUG_FEATURES=y
+
+#
+# Debug SYSLOG Output Controls
+#
+# CONFIG_DEBUG_ERROR is not set
+# CONFIG_DEBUG_ASSERTIONS is not set
+
+#
+# Subsystem Debug Options
+#
+# CONFIG_DEBUG_BINFMT is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_DEBUG_GRAPHICS is not set
+# CONFIG_DEBUG_LIB is not set
+# CONFIG_DEBUG_MM is not set
+# CONFIG_DEBUG_SCHED is not set
+
+#
+# OS Function Debug Options
+#
+# CONFIG_DEBUG_IRQ is not set
+
+#
+# Driver Debug Options
+#
+# CONFIG_DEBUG_LEDS is not set
+# CONFIG_DEBUG_CAN is not set
+# CONFIG_DEBUG_GPIO is not set
+# CONFIG_DEBUG_SPI is not set
+CONFIG_ARCH_HAVE_STACKCHECK=y
+# CONFIG_STACK_COLORATION is not set
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# CONFIG_HEAP_COLORATION is not set
+# CONFIG_DEBUG_SYMBOLS is not set
+CONFIG_ARCH_HAVE_CUSTOMOPT=y
+# CONFIG_DEBUG_NOOPT is not set
+# CONFIG_DEBUG_CUSTOMOPT is not set
+CONFIG_DEBUG_FULLOPT=y
+
+#
+# System Type
+#
+CONFIG_ARCH_ARM=y
+# CONFIG_ARCH_AVR is not set
+# CONFIG_ARCH_HC is not set
+# CONFIG_ARCH_MIPS is not set
+# CONFIG_ARCH_RGMP is not set
+# CONFIG_ARCH_SH is not set
+# CONFIG_ARCH_SIM is not set
+# CONFIG_ARCH_X86 is not set
+# CONFIG_ARCH_Z16 is not set
+# CONFIG_ARCH_Z80 is not set
+CONFIG_ARCH="arm"
+
+#
+# ARM Options
+#
+# CONFIG_ARCH_CHIP_A1X is not set
+# CONFIG_ARCH_CHIP_C5471 is not set
+# CONFIG_ARCH_CHIP_CALYPSO is not set
+# CONFIG_ARCH_CHIP_DM320 is not set
+# CONFIG_ARCH_CHIP_EFM32 is not set
+# CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
+# CONFIG_ARCH_CHIP_KINETIS is not set
+# CONFIG_ARCH_CHIP_KL is not set
+# CONFIG_ARCH_CHIP_LM is not set
+# CONFIG_ARCH_CHIP_TIVA is not set
+# CONFIG_ARCH_CHIP_LPC11XX is not set
+# CONFIG_ARCH_CHIP_LPC17XX is not set
+# CONFIG_ARCH_CHIP_LPC214X is not set
+# CONFIG_ARCH_CHIP_LPC2378 is not set
+# CONFIG_ARCH_CHIP_LPC31XX is not set
+# CONFIG_ARCH_CHIP_LPC43XX is not set
+# CONFIG_ARCH_CHIP_NUC1XX is not set
+# CONFIG_ARCH_CHIP_SAMA5 is not set
+# CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
+# CONFIG_ARCH_CHIP_SAM34 is not set
+# CONFIG_ARCH_CHIP_SAMV7 is not set
+CONFIG_ARCH_CHIP_STM32=y
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
+# CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
+# CONFIG_ARCH_ARM7TDMI is not set
+# CONFIG_ARCH_ARM926EJS is not set
+# CONFIG_ARCH_ARM920T is not set
+# CONFIG_ARCH_CORTEXM0 is not set
+# CONFIG_ARCH_CORTEXM3 is not set
+CONFIG_ARCH_CORTEXM4=y
+# CONFIG_ARCH_CORTEXM7 is not set
+# CONFIG_ARCH_CORTEXA5 is not set
+# CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
+CONFIG_ARCH_FAMILY="armv7-m"
+CONFIG_ARCH_CHIP="stm32"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
+# CONFIG_ARMV7M_USEBASEPRI is not set
+CONFIG_ARCH_HAVE_CMNVECTOR=y
+# CONFIG_ARMV7M_CMNVECTOR is not set
+# CONFIG_ARMV7M_LAZYFPU is not set
+CONFIG_ARCH_HAVE_FPU=y
+# CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_FPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
+# CONFIG_ARM_MPU is not set
+# CONFIG_DEBUG_HARDFAULT is not set
+
+#
+# ARMV7M Configuration Options
+#
+# CONFIG_ARMV7M_HAVE_ICACHE is not set
+# CONFIG_ARMV7M_HAVE_DCACHE is not set
+# CONFIG_ARMV7M_HAVE_ITCM is not set
+# CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARL is not set
+# CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
+# CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
+# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
+CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y
+CONFIG_ARMV7M_HAVE_STACKCHECK=y
+# CONFIG_ARMV7M_STACKCHECK is not set
+# CONFIG_ARMV7M_ITMSYSLOG is not set
+# CONFIG_SERIAL_TERMIOS is not set
+CONFIG_CAN_EXTID=y
+CONFIG_CAN1_BAUD=500000
+CONFIG_CAN_TSEG1=6
+CONFIG_CAN_TSEG2=7
+# CONFIG_CAN_LOOPBACK is not set
+
+#
+# STM32 Configuration Options
+#
+# CONFIG_ARCH_CHIP_STM32L151C6 is not set
+# CONFIG_ARCH_CHIP_STM32L151C8 is not set
+# CONFIG_ARCH_CHIP_STM32L151CB is not set
+# CONFIG_ARCH_CHIP_STM32L151R6 is not set
+# CONFIG_ARCH_CHIP_STM32L151R8 is not set
+# CONFIG_ARCH_CHIP_STM32L151RB is not set
+# CONFIG_ARCH_CHIP_STM32L151V6 is not set
+# CONFIG_ARCH_CHIP_STM32L151V8 is not set
+# CONFIG_ARCH_CHIP_STM32L151VB is not set
+# CONFIG_ARCH_CHIP_STM32L152C6 is not set
+# CONFIG_ARCH_CHIP_STM32L152C8 is not set
+# CONFIG_ARCH_CHIP_STM32L152CB is not set
+# CONFIG_ARCH_CHIP_STM32L152R6 is not set
+# CONFIG_ARCH_CHIP_STM32L152R8 is not set
+# CONFIG_ARCH_CHIP_STM32L152RB is not set
+# CONFIG_ARCH_CHIP_STM32L152V6 is not set
+# CONFIG_ARCH_CHIP_STM32L152V8 is not set
+# CONFIG_ARCH_CHIP_STM32L152VB is not set
+# CONFIG_ARCH_CHIP_STM32L162ZD is not set
+# CONFIG_ARCH_CHIP_STM32L162VE is not set
+# CONFIG_ARCH_CHIP_STM32F100C8 is not set
+# CONFIG_ARCH_CHIP_STM32F100CB is not set
+# CONFIG_ARCH_CHIP_STM32F100R8 is not set
+# CONFIG_ARCH_CHIP_STM32F100RB is not set
+# CONFIG_ARCH_CHIP_STM32F100RC is not set
+# CONFIG_ARCH_CHIP_STM32F100RD is not set
+# CONFIG_ARCH_CHIP_STM32F100RE is not set
+# CONFIG_ARCH_CHIP_STM32F100V8 is not set
+# CONFIG_ARCH_CHIP_STM32F100VB is not set
+# CONFIG_ARCH_CHIP_STM32F100VC is not set
+# CONFIG_ARCH_CHIP_STM32F100VD is not set
+# CONFIG_ARCH_CHIP_STM32F100VE is not set
+# CONFIG_ARCH_CHIP_STM32F102CB is not set
+# CONFIG_ARCH_CHIP_STM32F103T8 is not set
+# CONFIG_ARCH_CHIP_STM32F103TB is not set
+# CONFIG_ARCH_CHIP_STM32F103C4 is not set
+# CONFIG_ARCH_CHIP_STM32F103C8 is not set
+# CONFIG_ARCH_CHIP_STM32F103CB is not set
+# CONFIG_ARCH_CHIP_STM32F103R8 is not set
+# CONFIG_ARCH_CHIP_STM32F103RB is not set
+# CONFIG_ARCH_CHIP_STM32F103RC is not set
+# CONFIG_ARCH_CHIP_STM32F103RD is not set
+# CONFIG_ARCH_CHIP_STM32F103RE is not set
+# CONFIG_ARCH_CHIP_STM32F103RG is not set
+# CONFIG_ARCH_CHIP_STM32F103V8 is not set
+# CONFIG_ARCH_CHIP_STM32F103VB is not set
+# CONFIG_ARCH_CHIP_STM32F103VC is not set
+# CONFIG_ARCH_CHIP_STM32F103VE is not set
+# CONFIG_ARCH_CHIP_STM32F103ZE is not set
+# CONFIG_ARCH_CHIP_STM32F105VB is not set
+# CONFIG_ARCH_CHIP_STM32F105RB is not set
+# CONFIG_ARCH_CHIP_STM32F107VC is not set
+# CONFIG_ARCH_CHIP_STM32F205RG is not set
+# CONFIG_ARCH_CHIP_STM32F207IG is not set
+# CONFIG_ARCH_CHIP_STM32F207ZE is not set
+# CONFIG_ARCH_CHIP_STM32F302K6 is not set
+# CONFIG_ARCH_CHIP_STM32F302K8 is not set
+# CONFIG_ARCH_CHIP_STM32F302CB is not set
+# CONFIG_ARCH_CHIP_STM32F302CC is not set
+# CONFIG_ARCH_CHIP_STM32F302RB is not set
+# CONFIG_ARCH_CHIP_STM32F302RC is not set
+# CONFIG_ARCH_CHIP_STM32F302VB is not set
+# CONFIG_ARCH_CHIP_STM32F302VC is not set
+# CONFIG_ARCH_CHIP_STM32F303K6 is not set
+# CONFIG_ARCH_CHIP_STM32F303K8 is not set
+# CONFIG_ARCH_CHIP_STM32F303C6 is not set
+# CONFIG_ARCH_CHIP_STM32F303C8 is not set
+# CONFIG_ARCH_CHIP_STM32F303CB is not set
+# CONFIG_ARCH_CHIP_STM32F303CC is not set
+# CONFIG_ARCH_CHIP_STM32F303RB is not set
+# CONFIG_ARCH_CHIP_STM32F303RC is not set
+# CONFIG_ARCH_CHIP_STM32F303RD is not set
+# CONFIG_ARCH_CHIP_STM32F303RE is not set
+# CONFIG_ARCH_CHIP_STM32F303VB is not set
+# CONFIG_ARCH_CHIP_STM32F303VC is not set
+# CONFIG_ARCH_CHIP_STM32F372C8 is not set
+# CONFIG_ARCH_CHIP_STM32F372R8 is not set
+# CONFIG_ARCH_CHIP_STM32F372V8 is not set
+# CONFIG_ARCH_CHIP_STM32F372CB is not set
+# CONFIG_ARCH_CHIP_STM32F372RB is not set
+# CONFIG_ARCH_CHIP_STM32F372VB is not set
+# CONFIG_ARCH_CHIP_STM32F372CC is not set
+# CONFIG_ARCH_CHIP_STM32F372RC is not set
+# CONFIG_ARCH_CHIP_STM32F372VC is not set
+# CONFIG_ARCH_CHIP_STM32F373C8 is not set
+# CONFIG_ARCH_CHIP_STM32F373R8 is not set
+# CONFIG_ARCH_CHIP_STM32F373V8 is not set
+# CONFIG_ARCH_CHIP_STM32F373CB is not set
+# CONFIG_ARCH_CHIP_STM32F373RB is not set
+# CONFIG_ARCH_CHIP_STM32F373VB is not set
+# CONFIG_ARCH_CHIP_STM32F373CC is not set
+# CONFIG_ARCH_CHIP_STM32F373RC is not set
+# CONFIG_ARCH_CHIP_STM32F373VC is not set
+# CONFIG_ARCH_CHIP_STM32F401RE is not set
+# CONFIG_ARCH_CHIP_STM32F411RE is not set
+# CONFIG_ARCH_CHIP_STM32F411VE is not set
+# CONFIG_ARCH_CHIP_STM32F405RG is not set
+# CONFIG_ARCH_CHIP_STM32F405VG is not set
+# CONFIG_ARCH_CHIP_STM32F405ZG is not set
+# CONFIG_ARCH_CHIP_STM32F407VE is not set
+CONFIG_ARCH_CHIP_STM32F407VG=y
+# CONFIG_ARCH_CHIP_STM32F407ZE is not set
+# CONFIG_ARCH_CHIP_STM32F407ZG is not set
+# CONFIG_ARCH_CHIP_STM32F407IE is not set
+# CONFIG_ARCH_CHIP_STM32F407IG is not set
+# CONFIG_ARCH_CHIP_STM32F427V is not set
+# CONFIG_ARCH_CHIP_STM32F427Z is not set
+# CONFIG_ARCH_CHIP_STM32F427I is not set
+# CONFIG_ARCH_CHIP_STM32F429V is not set
+# CONFIG_ARCH_CHIP_STM32F429Z is not set
+# CONFIG_ARCH_CHIP_STM32F429I is not set
+# CONFIG_ARCH_CHIP_STM32F429B is not set
+# CONFIG_ARCH_CHIP_STM32F429N is not set
+# CONFIG_ARCH_CHIP_STM32F446M is not set
+# CONFIG_ARCH_CHIP_STM32F446R is not set
+# CONFIG_ARCH_CHIP_STM32F446V is not set
+# CONFIG_ARCH_CHIP_STM32F446Z is not set
+# CONFIG_ARCH_CHIP_STM32F469A is not set
+# CONFIG_ARCH_CHIP_STM32F469I is not set
+# CONFIG_ARCH_CHIP_STM32F469B is not set
+# CONFIG_ARCH_CHIP_STM32F469N is not set
+CONFIG_STM32_FLASH_CONFIG_DEFAULT=y
+# CONFIG_STM32_FLASH_CONFIG_4 is not set
+# CONFIG_STM32_FLASH_CONFIG_6 is not set
+# CONFIG_STM32_FLASH_CONFIG_8 is not set
+# CONFIG_STM32_FLASH_CONFIG_B is not set
+# CONFIG_STM32_FLASH_CONFIG_C is not set
+# CONFIG_STM32_FLASH_CONFIG_D is not set
+# CONFIG_STM32_FLASH_CONFIG_E is not set
+# CONFIG_STM32_FLASH_CONFIG_F is not set
+# CONFIG_STM32_FLASH_CONFIG_G is not set
+# CONFIG_STM32_FLASH_CONFIG_I is not set
+# CONFIG_STM32_STM32L15XX is not set
+# CONFIG_STM32_ENERGYLITE is not set
+# CONFIG_STM32_STM32F10XX is not set
+# CONFIG_STM32_VALUELINE is not set
+# CONFIG_STM32_CONNECTIVITYLINE is not set
+# CONFIG_STM32_PERFORMANCELINE is not set
+# CONFIG_STM32_USBACCESSLINE is not set
+# CONFIG_STM32_HIGHDENSITY is not set
+# CONFIG_STM32_MEDIUMDENSITY is not set
+# CONFIG_STM32_LOWDENSITY is not set
+# CONFIG_STM32_STM32F20XX is not set
+# CONFIG_STM32_STM32F205 is not set
+# CONFIG_STM32_STM32F207 is not set
+# CONFIG_STM32_STM32F30XX is not set
+# CONFIG_STM32_STM32F302 is not set
+# CONFIG_STM32_STM32F303 is not set
+# CONFIG_STM32_STM32F37XX is not set
+CONFIG_STM32_STM32F40XX=y
+# CONFIG_STM32_STM32F401 is not set
+# CONFIG_STM32_STM32F411 is not set
+# CONFIG_STM32_STM32F405 is not set
+CONFIG_STM32_STM32F407=y
+# CONFIG_STM32_STM32F427 is not set
+# CONFIG_STM32_STM32F429 is not set
+# CONFIG_STM32_STM32F446 is not set
+# CONFIG_STM32_STM32F469 is not set
+# CONFIG_STM32_DFU is not set
+
+#
+# STM32 Peripheral Support
+#
+CONFIG_STM32_HAVE_CCM=y
+# CONFIG_STM32_HAVE_USBDEV is not set
+CONFIG_STM32_HAVE_OTGFS=y
+CONFIG_STM32_HAVE_FSMC=y
+# CONFIG_STM32_HAVE_LTDC is not set
+CONFIG_STM32_HAVE_USART3=y
+CONFIG_STM32_HAVE_UART4=y
+CONFIG_STM32_HAVE_UART5=y
+CONFIG_STM32_HAVE_USART6=y
+# CONFIG_STM32_HAVE_UART7 is not set
+# CONFIG_STM32_HAVE_UART8 is not set
+CONFIG_STM32_HAVE_TIM1=y
+CONFIG_STM32_HAVE_TIM2=y
+CONFIG_STM32_HAVE_TIM3=y
+CONFIG_STM32_HAVE_TIM4=y
+CONFIG_STM32_HAVE_TIM5=y
+CONFIG_STM32_HAVE_TIM6=y
+CONFIG_STM32_HAVE_TIM7=y
+CONFIG_STM32_HAVE_TIM8=y
+CONFIG_STM32_HAVE_TIM9=y
+CONFIG_STM32_HAVE_TIM10=y
+CONFIG_STM32_HAVE_TIM11=y
+CONFIG_STM32_HAVE_TIM12=y
+CONFIG_STM32_HAVE_TIM13=y
+CONFIG_STM32_HAVE_TIM14=y
+# CONFIG_STM32_HAVE_TIM15 is not set
+# CONFIG_STM32_HAVE_TIM16 is not set
+# CONFIG_STM32_HAVE_TIM17 is not set
+CONFIG_STM32_HAVE_ADC2=y
+CONFIG_STM32_HAVE_ADC3=y
+# CONFIG_STM32_HAVE_ADC4 is not set
+# CONFIG_STM32_HAVE_ADC1_DMA is not set
+# CONFIG_STM32_HAVE_ADC2_DMA is not set
+# CONFIG_STM32_HAVE_ADC3_DMA is not set
+# CONFIG_STM32_HAVE_ADC4_DMA is not set
+CONFIG_STM32_HAVE_CAN1=y
+CONFIG_STM32_HAVE_CAN2=y
+CONFIG_STM32_HAVE_DAC1=y
+CONFIG_STM32_HAVE_DAC2=y
+CONFIG_STM32_HAVE_RNG=y
+CONFIG_STM32_HAVE_ETHMAC=y
+CONFIG_STM32_HAVE_I2C2=y
+CONFIG_STM32_HAVE_I2C3=y
+CONFIG_STM32_HAVE_SPI2=y
+CONFIG_STM32_HAVE_SPI3=y
+# CONFIG_STM32_HAVE_SPI4 is not set
+# CONFIG_STM32_HAVE_SPI5 is not set
+# CONFIG_STM32_HAVE_SPI6 is not set
+# CONFIG_STM32_HAVE_SAIPLL is not set
+# CONFIG_STM32_HAVE_I2SPLL is not set
+# CONFIG_STM32_ADC1 is not set
+# CONFIG_STM32_ADC2 is not set
+# CONFIG_STM32_ADC3 is not set
+# CONFIG_STM32_BKPSRAM is not set
+CONFIG_STM32_CAN1=y
+# CONFIG_STM32_CAN2 is not set
+# CONFIG_STM32_CCMDATARAM is not set
+# CONFIG_STM32_CRC is not set
+# CONFIG_STM32_CRYP is not set
+# CONFIG_STM32_DMA1 is not set
+# CONFIG_STM32_DMA2 is not set
+# CONFIG_STM32_DAC1 is not set
+# CONFIG_STM32_DAC2 is not set
+# CONFIG_STM32_DCMI is not set
+# CONFIG_STM32_ETHMAC is not set
+# CONFIG_STM32_FSMC is not set
+# CONFIG_STM32_HASH is not set
+# CONFIG_STM32_I2C1 is not set
+# CONFIG_STM32_I2C2 is not set
+# CONFIG_STM32_I2C3 is not set
+CONFIG_STM32_OTGFS=y
+# CONFIG_STM32_OTGHS is not set
+CONFIG_STM32_PWR=y
+# CONFIG_STM32_RNG is not set
+# CONFIG_STM32_SDIO is not set
+CONFIG_STM32_SPI1=y
+# CONFIG_STM32_SPI2 is not set
+# CONFIG_STM32_SPI3 is not set
+CONFIG_STM32_SYSCFG=y
+# CONFIG_STM32_TIM1 is not set
+# CONFIG_STM32_TIM2 is not set
+# CONFIG_STM32_TIM3 is not set
+# CONFIG_STM32_TIM4 is not set
+# CONFIG_STM32_TIM5 is not set
+# CONFIG_STM32_TIM6 is not set
+# CONFIG_STM32_TIM7 is not set
+# CONFIG_STM32_TIM8 is not set
+# CONFIG_STM32_TIM9 is not set
+# CONFIG_STM32_TIM10 is not set
+# CONFIG_STM32_TIM11 is not set
+# CONFIG_STM32_TIM12 is not set
+# CONFIG_STM32_TIM13 is not set
+# CONFIG_STM32_TIM14 is not set
+# CONFIG_STM32_USART1 is not set
+CONFIG_STM32_USART2=y
+# CONFIG_STM32_USART3 is not set
+# CONFIG_STM32_UART4 is not set
+# CONFIG_STM32_UART5 is not set
+# CONFIG_STM32_USART6 is not set
+# CONFIG_STM32_IWDG is not set
+# CONFIG_STM32_WWDG is not set
+CONFIG_STM32_SPI=y
+CONFIG_STM32_CAN=y
+# CONFIG_STM32_NOEXT_VECTORS is not set
+
+#
+# Alternate Pin Mapping
+#
+# CONFIG_STM32_FLASH_PREFETCH is not set
+# CONFIG_STM32_JTAG_DISABLE is not set
+# CONFIG_STM32_JTAG_FULL_ENABLE is not set
+# CONFIG_STM32_JTAG_NOJNTRST_ENABLE is not set
+CONFIG_STM32_JTAG_SW_ENABLE=y
+# CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG is not set
+# CONFIG_STM32_FORCEPOWER is not set
+# CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
+# CONFIG_STM32_CCMEXCLUDE is not set
+
+#
+# Timer Configuration
+#
+# CONFIG_STM32_TIM1_CAP is not set
+# CONFIG_STM32_TIM2_CAP is not set
+# CONFIG_STM32_TIM3_CAP is not set
+# CONFIG_STM32_TIM4_CAP is not set
+# CONFIG_STM32_TIM5_CAP is not set
+# CONFIG_STM32_TIM8_CAP is not set
+# CONFIG_STM32_TIM9_CAP is not set
+# CONFIG_STM32_TIM10_CAP is not set
+# CONFIG_STM32_TIM11_CAP is not set
+# CONFIG_STM32_TIM12_CAP is not set
+# CONFIG_STM32_TIM13_CAP is not set
+# CONFIG_STM32_TIM14_CAP is not set
+CONFIG_STM32_USART=y
+CONFIG_STM32_SERIALDRIVER=y
+
+#
+# U[S]ART Configuration
+#
+
+#
+# U[S]ART Device Configuration
+#
+CONFIG_STM32_USART2_SERIALDRIVER=y
+# CONFIG_STM32_USART2_1WIREDRIVER is not set
+# CONFIG_USART2_RS485 is not set
+
+#
+# Serial Driver Configuration
+#
+# CONFIG_SERIAL_DISABLE_REORDERING is not set
+# CONFIG_STM32_FLOWCONTROL_BROKEN is not set
+# CONFIG_STM32_USART_BREAKS is not set
+# CONFIG_STM32_USART_SINGLEWIRE is not set
+
+#
+# SPI Configuration
+#
+# CONFIG_STM32_SPI_INTERRUPTS is not set
+# CONFIG_STM32_SPI_DMA is not set
+# CONFIG_STM32_HAVE_RTC_COUNTER is not set
+# CONFIG_STM32_HAVE_RTC_SUBSECONDS is not set
+
+#
+# USB FS Host Configuration
+#
+
+#
+# USB HS Host Configuration
+#
+
+#
+# USB Host Debug Configuration
+#
+
+#
+# USB Device Configuration
+#
+
+#
+# CAN driver configuration
+#
+
+#
+# Architecture Options
+#
+# CONFIG_ARCH_NOINTC is not set
+# CONFIG_ARCH_VECNOTIRQ is not set
+# CONFIG_ARCH_DMA is not set
+CONFIG_ARCH_HAVE_IRQPRIO=y
+# CONFIG_ARCH_L2CACHE is not set
+# CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
+# CONFIG_ARCH_HAVE_ADDRENV is not set
+# CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
+CONFIG_ARCH_HAVE_VFORK=y
+# CONFIG_ARCH_HAVE_MMU is not set
+CONFIG_ARCH_HAVE_MPU=y
+# CONFIG_ARCH_NAND_HWECC is not set
+# CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
+# CONFIG_ARCH_USE_MPU is not set
+# CONFIG_ARCH_IRQPRIO is not set
+CONFIG_ARCH_STACKDUMP=y
+# CONFIG_ENDIAN_BIG is not set
+# CONFIG_ARCH_IDLE_CUSTOM is not set
+# CONFIG_ARCH_HAVE_RAMFUNCS is not set
+CONFIG_ARCH_HAVE_RAMVECTORS=y
+# CONFIG_ARCH_RAMVECTORS is not set
+
+#
+# Board Settings
+#
+CONFIG_BOARD_LOOPSPERMSEC=16717
+# CONFIG_ARCH_CALIBRATION is not set
+
+#
+# Interrupt options
+#
+CONFIG_ARCH_HAVE_INTERRUPTSTACK=y
+CONFIG_ARCH_INTERRUPTSTACK=0
+CONFIG_ARCH_HAVE_HIPRI_INTERRUPT=y
+# CONFIG_ARCH_HIPRI_INTERRUPT is not set
+
+#
+# Boot options
+#
+# CONFIG_BOOT_RUNFROMEXTSRAM is not set
+CONFIG_BOOT_RUNFROMFLASH=y
+# CONFIG_BOOT_RUNFROMISRAM is not set
+# CONFIG_BOOT_RUNFROMSDRAM is not set
+# CONFIG_BOOT_COPYTORAM is not set
+
+#
+# Boot Memory Configuration
+#
+CONFIG_RAM_START=0x20000000
+CONFIG_RAM_SIZE=114688
+# CONFIG_ARCH_HAVE_SDRAM is not set
+
+#
+# Board Selection
+#
+CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y
+# CONFIG_ARCH_BOARD_MIKROE_STM32F4 is not set
+# CONFIG_ARCH_BOARD_CUSTOM is not set
+CONFIG_ARCH_BOARD="stm32f4discovery"
+
+#
+# Common Board Options
+#
+CONFIG_ARCH_HAVE_LEDS=y
+CONFIG_ARCH_LEDS=y
+CONFIG_ARCH_HAVE_BUTTONS=y
+CONFIG_ARCH_BUTTONS=y
+CONFIG_ARCH_HAVE_IRQBUTTONS=y
+# CONFIG_ARCH_IRQBUTTONS is not set
+
+#
+# Board-Specific Options
+#
+# CONFIG_STM32F4DISBB is not set
+# CONFIG_BOARD_CRASHDUMP is not set
+CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_RESET is not set
+# CONFIG_BOARDCTL_UNIQUEID is not set
+# CONFIG_BOARDCTL_TSCTEST is not set
+# CONFIG_BOARDCTL_ADCTEST is not set
+# CONFIG_BOARDCTL_PWMTEST is not set
+CONFIG_BOARDCTL_CANINIT=y
+# CONFIG_BOARDCTL_GRAPHICS is not set
+# CONFIG_BOARDCTL_IOCTL is not set
+
+#
+# RTOS Features
+#
+CONFIG_DISABLE_OS_API=y
+# CONFIG_DISABLE_POSIX_TIMERS is not set
+# CONFIG_DISABLE_PTHREAD is not set
+# CONFIG_DISABLE_SIGNALS is not set
+# CONFIG_DISABLE_MQUEUE is not set
+# CONFIG_DISABLE_ENVIRON is not set
+
+#
+# Clocks and Timers
+#
+CONFIG_USEC_PER_TICK=10000
+CONFIG_SYSTEM_TIME64=y
+CONFIG_CLOCK_MONOTONIC=y
+# CONFIG_JULIAN_TIME is not set
+CONFIG_START_YEAR=2011
+CONFIG_START_MONTH=12
+CONFIG_START_DAY=6
+CONFIG_MAX_WDOGPARMS=2
+CONFIG_PREALLOC_WDOGS=16
+CONFIG_WDOG_INTRESERVE=4
+CONFIG_PREALLOC_TIMERS=4
+
+#
+# Tasks and Scheduling
+#
+# CONFIG_INIT_NONE is not set
+CONFIG_INIT_ENTRYPOINT=y
+# CONFIG_INIT_FILEPATH is not set
+CONFIG_USER_ENTRYPOINT="nsh_main"
+CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
+CONFIG_TASK_NAME_SIZE=31
+CONFIG_MAX_TASKS=16
+# CONFIG_SCHED_HAVE_PARENT is not set
+CONFIG_SCHED_WAITPID=y
+
+#
+# Pthread Options
+#
+# CONFIG_MUTEX_TYPES is not set
+CONFIG_NPTHREAD_KEYS=4
+
+#
+# Performance Monitoring
+#
+# CONFIG_SCHED_CPULOAD is not set
+# CONFIG_SCHED_INSTRUMENTATION is not set
+
+#
+# Files and I/O
+#
+CONFIG_DEV_CONSOLE=y
+# CONFIG_FDCLONE_DISABLE is not set
+# CONFIG_FDCLONE_STDIO is not set
+CONFIG_SDCLONE_DISABLE=y
+CONFIG_NFILE_DESCRIPTORS=8
+CONFIG_NFILE_STREAMS=8
+CONFIG_NAME_MAX=32
+# CONFIG_PRIORITY_INHERITANCE is not set
+
+#
+# RTOS hooks
+#
+# CONFIG_BOARD_INITIALIZE is not set
+# CONFIG_SCHED_STARTHOOK is not set
+# CONFIG_SCHED_ATEXIT is not set
+# CONFIG_SCHED_ONEXIT is not set
+
+#
+# Signal Numbers
+#
+CONFIG_SIG_SIGUSR1=1
+CONFIG_SIG_SIGUSR2=2
+CONFIG_SIG_SIGALARM=3
+CONFIG_SIG_SIGCONDTIMEDOUT=16
+
+#
+# POSIX Message Queue Options
+#
+CONFIG_PREALLOC_MQ_MSGS=4
+CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
+
+#
+# Work queue support
+#
+# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_SCHED_HPWORK is not set
+# CONFIG_SCHED_LPWORK is not set
+
+#
+# Stack and heap information
+#
+CONFIG_IDLETHREAD_STACKSIZE=1024
+CONFIG_USERMAIN_STACKSIZE=2048
+CONFIG_PTHREAD_STACK_MIN=256
+CONFIG_PTHREAD_STACK_DEFAULT=2048
+# CONFIG_LIB_SYSCALL is not set
+
+#
+# Device Drivers
+#
+# CONFIG_DISABLE_POLL is not set
+CONFIG_DEV_NULL=y
+# CONFIG_DEV_ZERO is not set
+# CONFIG_DEV_LOOP is not set
+
+#
+# Buffering
+#
+# CONFIG_DRVR_WRITEBUFFER is not set
+# CONFIG_DRVR_READAHEAD is not set
+# CONFIG_RAMDISK is not set
+CONFIG_CAN=y
+# CONFIG_ARCH_HAVE_CAN_ERRORS is not set
+# CONFIG_CAN_FD is not set
+CONFIG_CAN_FIFOSIZE=8
+CONFIG_CAN_NPENDINGRTR=4
+# CONFIG_CAN_TXREADY is not set
+CONFIG_CAN_NPOLLWAITERS=2
+# CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
+# CONFIG_PWM is not set
+CONFIG_ARCH_HAVE_I2CRESET=y
+# CONFIG_I2C is not set
+CONFIG_SPI=y
+# CONFIG_SPI_SLAVE is not set
+CONFIG_SPI_EXCHANGE=y
+# CONFIG_SPI_CMDDATA is not set
+# CONFIG_SPI_CALLBACK is not set
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_HWFEATURES is not set
+# CONFIG_SPI_CRCGENERATION is not set
+# CONFIG_SPI_CS_CONTROL is not set
+# CONFIG_SPI_CS_DELAY_CONTROL is not set
+# CONFIG_I2S is not set
+
+#
+# Timer Driver Support
+#
+# CONFIG_TIMER is not set
+# CONFIG_RTC is not set
+# CONFIG_WATCHDOG is not set
+# CONFIG_ANALOG is not set
+# CONFIG_AUDIO_DEVICES is not set
+# CONFIG_VIDEO_DEVICES is not set
+# CONFIG_BCH is not set
+# CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
+# CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
+
+#
+# LCD Driver Support
+#
+# CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
+# CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
+# CONFIG_MTD is not set
+# CONFIG_EEPROM is not set
+# CONFIG_PIPES is not set
+# CONFIG_PM is not set
+# CONFIG_POWER is not set
+# CONFIG_SENSORS is not set
+# CONFIG_SERCOMM_CONSOLE is not set
+CONFIG_SERIAL=y
+# CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
+# CONFIG_16550_UART is not set
+# CONFIG_UART_SERIALDRIVER is not set
+# CONFIG_UART0_SERIALDRIVER is not set
+# CONFIG_UART1_SERIALDRIVER is not set
+# CONFIG_UART2_SERIALDRIVER is not set
+# CONFIG_UART3_SERIALDRIVER is not set
+# CONFIG_UART4_SERIALDRIVER is not set
+# CONFIG_UART5_SERIALDRIVER is not set
+# CONFIG_UART6_SERIALDRIVER is not set
+# CONFIG_UART7_SERIALDRIVER is not set
+# CONFIG_UART8_SERIALDRIVER is not set
+# CONFIG_SCI0_SERIALDRIVER is not set
+# CONFIG_SCI1_SERIALDRIVER is not set
+# CONFIG_USART0_SERIALDRIVER is not set
+# CONFIG_USART1_SERIALDRIVER is not set
+CONFIG_USART2_SERIALDRIVER=y
+# CONFIG_USART3_SERIALDRIVER is not set
+# CONFIG_USART4_SERIALDRIVER is not set
+# CONFIG_USART5_SERIALDRIVER is not set
+# CONFIG_USART6_SERIALDRIVER is not set
+# CONFIG_USART7_SERIALDRIVER is not set
+# CONFIG_USART8_SERIALDRIVER is not set
+# CONFIG_OTHER_UART_SERIALDRIVER is not set
+CONFIG_MCU_SERIAL=y
+CONFIG_STANDARD_SERIAL=y
+CONFIG_SERIAL_NPOLLWAITERS=2
+# CONFIG_SERIAL_IFLOWCONTROL is not set
+# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
+# CONFIG_SERIAL_TIOCSERGSTRUCT is not set
+CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
+CONFIG_USART2_SERIAL_CONSOLE=y
+# CONFIG_OTHER_SERIAL_CONSOLE is not set
+# CONFIG_NO_SERIAL_CONSOLE is not set
+
+#
+# USART2 Configuration
+#
+CONFIG_USART2_RXBUFSIZE=128
+CONFIG_USART2_TXBUFSIZE=128
+CONFIG_USART2_BAUD=115200
+CONFIG_USART2_BITS=8
+CONFIG_USART2_PARITY=0
+CONFIG_USART2_2STOP=0
+# CONFIG_USART2_IFLOWCONTROL is not set
+# CONFIG_USART2_OFLOWCONTROL is not set
+# CONFIG_USART2_DMA is not set
+# CONFIG_USBDEV is not set
+# CONFIG_USBHOST is not set
+# CONFIG_HAVE_USBTRACE is not set
+# CONFIG_DRIVERS_WIRELESS is not set
+
+#
+# System Logging
+#
+# CONFIG_ARCH_SYSLOG is not set
+# CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+# CONFIG_SYSLOG_CHARDEV is not set
+
+#
+# Networking Support
+#
+# CONFIG_ARCH_HAVE_NET is not set
+# CONFIG_ARCH_HAVE_PHY is not set
+# CONFIG_NET is not set
+
+#
+# Crypto API
+#
+# CONFIG_CRYPTO is not set
+
+#
+# File Systems
+#
+
+#
+# File system configuration
+#
+# CONFIG_DISABLE_MOUNTPOINT is not set
+# CONFIG_FS_AUTOMOUNTER is not set
+# CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
+CONFIG_FS_READABLE=y
+# CONFIG_FS_WRITABLE is not set
+# CONFIG_FS_NAMED_SEMAPHORES is not set
+CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
+# CONFIG_FS_RAMMAP is not set
+# CONFIG_FS_FAT is not set
+# CONFIG_FS_NXFFS is not set
+# CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
+# CONFIG_FS_SMARTFS is not set
+# CONFIG_FS_BINFS is not set
+CONFIG_FS_PROCFS=y
+# CONFIG_FS_PROCFS_REGISTER is not set
+
+#
+# Exclude individual procfs entries
+#
+# CONFIG_FS_PROCFS_EXCLUDE_PROCESS is not set
+# CONFIG_FS_PROCFS_EXCLUDE_UPTIME is not set
+# CONFIG_FS_PROCFS_EXCLUDE_MOUNTS is not set
+# CONFIG_FS_UNIONFS is not set
+
+#
+# Graphics Support
+#
+# CONFIG_NX is not set
+
+#
+# Memory Management
+#
+# CONFIG_MM_SMALL is not set
+CONFIG_MM_REGIONS=2
+# CONFIG_ARCH_HAVE_HEAP2 is not set
+# CONFIG_GRAN is not set
+
+#
+# Audio Support
+#
+# CONFIG_AUDIO is not set
+
+#
+# Wireless Support
+#
+
+#
+# Binary Loader
+#
+# CONFIG_BINFMT_DISABLE is not set
+# CONFIG_BINFMT_EXEPATH is not set
+# CONFIG_NXFLAT is not set
+# CONFIG_ELF is not set
+CONFIG_BUILTIN=y
+# CONFIG_PIC is not set
+# CONFIG_SYMTAB_ORDEREDBYNAME is not set
+
+#
+# Library Routines
+#
+
+#
+# Standard C Library Options
+#
+CONFIG_STDIO_BUFFER_SIZE=64
+CONFIG_STDIO_LINEBUFFER=y
+CONFIG_NUNGET_CHARS=2
+CONFIG_LIB_HOMEDIR="/"
+# CONFIG_LIBM is not set
+# CONFIG_NOPRINTF_FIELDWIDTH is not set
+# CONFIG_LIBC_FLOATINGPOINT is not set
+CONFIG_LIBC_LONG_LONG=y
+# CONFIG_LIBC_IOCTL_VARIADIC is not set
+CONFIG_LIB_RAND_ORDER=1
+# CONFIG_EOL_IS_CR is not set
+# CONFIG_EOL_IS_LF is not set
+# CONFIG_EOL_IS_BOTH_CRLF is not set
+CONFIG_EOL_IS_EITHER_CRLF=y
+# CONFIG_LIBC_EXECFUNCS is not set
+CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
+CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
+# CONFIG_LIBC_STRERROR is not set
+# CONFIG_LIBC_PERROR_STDOUT is not set
+CONFIG_ARCH_LOWPUTC=y
+# CONFIG_LIBC_LOCALTIME is not set
+# CONFIG_TIME_EXTENDED is not set
+CONFIG_LIB_SENDFILE_BUFSIZE=512
+# CONFIG_ARCH_ROMGETC is not set
+# CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+# CONFIG_LIBC_NETDB is not set
+# CONFIG_NETDB_HOSTFILE is not set
+
+#
+# Non-standard Library Support
+#
+# CONFIG_LIB_CRC64_FAST is not set
+# CONFIG_LIB_KBDCODEC is not set
+# CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
+
+#
+# Basic CXX Support
+#
+# CONFIG_C99_BOOL8 is not set
+CONFIG_HAVE_CXX=y
+CONFIG_HAVE_CXXINITIALIZE=y
+# CONFIG_CXX_NEWLONG is not set
+
+#
+# uClibc++ Standard C++ Library
+#
+# CONFIG_UCLIBCXX is not set
+
+#
+# Application Configuration
+#
+
+#
+# Built-In Applications
+#
+CONFIG_BUILTIN_PROXY_STACKSIZE=1024
+
+#
+# CAN Utilities
+#
+# CONFIG_CANUTILS_CANLIB is not set
+CONFIG_CANUTILS_LIBCANARD=y
+CONFIG_LIBCANARD_URL="https://github.com/UAVCAN/libcanard/archive"
+CONFIG_LIBCANARD_VERSION="b28bf6ac337e55d49037fd9904d4b951760c4690"
+
+#
+# Examples
+#
+# CONFIG_EXAMPLES_BUTTONS is not set
+CONFIG_EXAMPLES_LIBCANARD=y
+CONFIG_EXAMPLES_LIBCANARD_DEVPATH="/dev/can0"
+CONFIG_EXAMPLES_LIBCANARD_NODE_ID=1
+CONFIG_EXAMPLES_LIBCANARD_APP_NODE_NAME="org.uavcan.libcanard.nuttx.demo"
+CONFIG_EXAMPLES_LIBCANARD_NODE_MEM_POOL_SIZE=1024
+CONFIG_EXAMPLES_LIBCANARD_DAEMON_PRIORITY=100
+CONFIG_EXAMPLES_LIBCANARD_STACKSIZE=2048
+# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CHAT is not set
+# CONFIG_EXAMPLES_CONFIGDATA is not set
+# CONFIG_EXAMPLES_CPUHOG is not set
+# CONFIG_EXAMPLES_CXXTEST is not set
+# CONFIG_EXAMPLES_DHCPD is not set
+# CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FTPC is not set
+# CONFIG_EXAMPLES_FTPD is not set
+# CONFIG_EXAMPLES_HELLO is not set
+# CONFIG_EXAMPLES_HELLOXX is not set
+# CONFIG_EXAMPLES_HIDKBD is not set
+# CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
+# CONFIG_EXAMPLES_MM is not set
+# CONFIG_EXAMPLES_MODBUS is not set
+# CONFIG_EXAMPLES_MOUNT is not set
+# CONFIG_EXAMPLES_NRF24L01TERM is not set
+CONFIG_EXAMPLES_NSH=y
+CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
+# CONFIG_EXAMPLES_NULL is not set
+# CONFIG_EXAMPLES_NXFFS is not set
+# CONFIG_EXAMPLES_NXHELLO is not set
+# CONFIG_EXAMPLES_NXIMAGE is not set
+# CONFIG_EXAMPLES_NX is not set
+# CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
+# CONFIG_EXAMPLES_NXTEXT is not set
+# CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
+# CONFIG_EXAMPLES_PIPE is not set
+# CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
+# CONFIG_EXAMPLES_RGMP is not set
+# CONFIG_EXAMPLES_SENDMAIL is not set
+# CONFIG_EXAMPLES_SERIALBLASTER is not set
+# CONFIG_EXAMPLES_SERIALRX is not set
+# CONFIG_EXAMPLES_SERLOOP is not set
+# CONFIG_EXAMPLES_SLCD is not set
+# CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
+# CONFIG_EXAMPLES_SMP is not set
+# CONFIG_EXAMPLES_TCPECHO is not set
+# CONFIG_EXAMPLES_TELNETD is not set
+# CONFIG_EXAMPLES_TIFF is not set
+# CONFIG_EXAMPLES_TOUCHSCREEN is not set
+# CONFIG_EXAMPLES_USBSERIAL is not set
+# CONFIG_EXAMPLES_USBTERM is not set
+# CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
+#
+# Graphics Support
+#
+# CONFIG_TIFF is not set
+# CONFIG_GRAPHICS_TRAVELER is not set
+
+#
+# Interpreters
+#
+# CONFIG_INTERPRETERS_BAS is not set
+# CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
+
+#
+# FreeModBus
+#
+# CONFIG_MODBUS is not set
+
+#
+# Network Utilities
+#
+# CONFIG_NETUTILS_CHAT is not set
+# CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_ESP8266 is not set
+# CONFIG_NETUTILS_FTPC is not set
+# CONFIG_NETUTILS_JSON is not set
+# CONFIG_NETUTILS_SMTP is not set
+
+#
+# NSH Library
+#
+CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
+
+#
+# Command Line Configuration
+#
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
+CONFIG_NSH_LINELEN=64
+# CONFIG_NSH_DISABLE_SEMICOLON is not set
+# CONFIG_NSH_CMDPARMS is not set
+CONFIG_NSH_MAXARGUMENTS=6
+# CONFIG_NSH_ARGCAT is not set
+CONFIG_NSH_NESTDEPTH=3
+# CONFIG_NSH_DISABLEBG is not set
+CONFIG_NSH_BUILTIN_APPS=y
+
+#
+# Disable Individual commands
+#
+# CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
+# CONFIG_NSH_DISABLE_CAT is not set
+# CONFIG_NSH_DISABLE_CD is not set
+# CONFIG_NSH_DISABLE_CP is not set
+# CONFIG_NSH_DISABLE_CMP is not set
+CONFIG_NSH_DISABLE_DATE=y
+# CONFIG_NSH_DISABLE_DD is not set
+# CONFIG_NSH_DISABLE_DF is not set
+# CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
+# CONFIG_NSH_DISABLE_ECHO is not set
+# CONFIG_NSH_DISABLE_EXEC is not set
+# CONFIG_NSH_DISABLE_EXIT is not set
+# CONFIG_NSH_DISABLE_FREE is not set
+# CONFIG_NSH_DISABLE_GET is not set
+# CONFIG_NSH_DISABLE_HELP is not set
+# CONFIG_NSH_DISABLE_HEXDUMP is not set
+# CONFIG_NSH_DISABLE_IFCONFIG is not set
+# CONFIG_NSH_DISABLE_IFUPDOWN is not set
+# CONFIG_NSH_DISABLE_KILL is not set
+# CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
+# CONFIG_NSH_DISABLE_LS is not set
+# CONFIG_NSH_DISABLE_MB is not set
+# CONFIG_NSH_DISABLE_MKDIR is not set
+# CONFIG_NSH_DISABLE_MKFIFO is not set
+# CONFIG_NSH_DISABLE_MKRD is not set
+# CONFIG_NSH_DISABLE_MH is not set
+# CONFIG_NSH_DISABLE_MOUNT is not set
+# CONFIG_NSH_DISABLE_MV is not set
+# CONFIG_NSH_DISABLE_MW is not set
+# CONFIG_NSH_DISABLE_PS is not set
+# CONFIG_NSH_DISABLE_PUT is not set
+# CONFIG_NSH_DISABLE_PWD is not set
+# CONFIG_NSH_DISABLE_RM is not set
+# CONFIG_NSH_DISABLE_RMDIR is not set
+# CONFIG_NSH_DISABLE_SET is not set
+# CONFIG_NSH_DISABLE_SH is not set
+# CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
+# CONFIG_NSH_DISABLE_TEST is not set
+# CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
+# CONFIG_NSH_DISABLE_UNSET is not set
+# CONFIG_NSH_DISABLE_USLEEP is not set
+# CONFIG_NSH_DISABLE_WGET is not set
+# CONFIG_NSH_DISABLE_XD is not set
+CONFIG_NSH_MMCSDMINOR=0
+
+#
+# Configure Command Options
+#
+# CONFIG_NSH_CMDOPT_DF_H is not set
+CONFIG_NSH_CODECS_BUFSIZE=128
+# CONFIG_NSH_CMDOPT_HEXDUMP is not set
+CONFIG_NSH_PROC_MOUNTPOINT="/proc"
+CONFIG_NSH_FILEIOSIZE=512
+
+#
+# Scripting Support
+#
+# CONFIG_NSH_DISABLESCRIPT is not set
+# CONFIG_NSH_DISABLE_ITEF is not set
+# CONFIG_NSH_DISABLE_LOOPS is not set
+
+#
+# Console Configuration
+#
+CONFIG_NSH_CONSOLE=y
+# CONFIG_NSH_ALTCONDEV is not set
+# CONFIG_NSH_ARCHINIT is not set
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
+
+#
+# NxWidgets/NxWM
+#
+
+#
+# Platform-specific Support
+#
+# CONFIG_PLATFORM_CONFIGDATA is not set
+
+#
+# System Libraries and NSH Add-Ons
+#
+# CONFIG_SYSTEM_CLE is not set
+# CONFIG_SYSTEM_CUTERM is not set
+# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_RAMTEST is not set
+CONFIG_READLINE_HAVE_EXTMATCH=y
+CONFIG_SYSTEM_READLINE=y
+CONFIG_READLINE_ECHO=y
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
+# CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
+# CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/stm32f4discovery/canard/setenv.sh b/configs/stm32f4discovery/canard/setenv.sh
new file mode 100755
index 0000000000..d67e6fdc7d
--- /dev/null
+++ b/configs/stm32f4discovery/canard/setenv.sh
@@ -0,0 +1,80 @@
+#!/bin/bash
+# configs/stm32f4discovery/nsh/setenv.sh
+#
+#   Copyright (C) 2011-2012 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.
+#
+
+if [ "$_" = "$0" ] ; then
+  echo "You must source this script, not run it!" 1>&2
+  exit 1
+fi
+
+WD=`pwd`
+if [ ! -x "setenv.sh" ]; then
+  echo "This script must be executed from the top-level NuttX build directory"
+  exit 1
+fi
+
+if [ -z "${PATH_ORIG}" ]; then
+  export PATH_ORIG="${PATH}"
+fi
+
+# This is the Cygwin path to the location where I installed the RIDE
+# toolchain under windows.  You will also have to edit this if you install
+# the RIDE toolchain in any other location
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
+
+# This is the Cygwin path to the location where I installed the CodeSourcery
+# toolchain under windows.  You will also have to edit this if you install
+# the CodeSourcery toolchain in any other location
+export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin"
+#export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin"
+
+# This is the location where I installed the ARM "GNU Tools for ARM Embedded Processors"
+# You can this free toolchain here https://launchpad.net/gcc-arm-embedded
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/GNU Tools ARM Embedded/4.9 2015q2/bin"
+
+# These are the Cygwin paths to the locations where I installed the Atollic
+# toolchain under windows.  You will also have to edit this if you install
+# the Atollic toolchain in any other location.  /usr/bin is added before
+# the Atollic bin path because there is are binaries named gcc.exe and g++.exe
+# at those locations as well.
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
+
+# This is the Cygwin path to the location where I build the buildroot
+# toolchain.
+#export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+
+# Add the path to the toolchain to the PATH variable
+export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
+
+echo "PATH : ${PATH}"
-- 
GitLab


From 5d3cdff16bb37c440c3e804d146697b12f9e7397 Mon Sep 17 00:00:00 2001
From: Frank Benkert 
Date: Fri, 8 Jul 2016 06:32:58 -0600
Subject: [PATCH 176/229] drivers/pipes/Kconfig:  Add missing configuration for
 pipe ring buffer size.

---
 drivers/pipes/Kconfig | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/pipes/Kconfig b/drivers/pipes/Kconfig
index f72f3c094c..64a3fb720b 100644
--- a/drivers/pipes/Kconfig
+++ b/drivers/pipes/Kconfig
@@ -2,3 +2,9 @@
 # For a description of the syntax of this configuration file,
 # see the file kconfig-language.txt in the NuttX tools repository.
 #
+
+config DEV_PIPE_SIZE
+	int "Pipe Size"
+	default 1024
+	---help---
+		Sets the size of the pipe ringbuffer in bytes.
-- 
GitLab


From 7473d3f859db16968b82cc76edbdc0ce97a221ac Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Fri, 8 Jul 2016 06:39:25 -0600
Subject: [PATCH 177/229] Trivial changes from review of PR

---
 arch/arm/src/stm32f7/stm32_dma.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/src/stm32f7/stm32_dma.c b/arch/arm/src/stm32f7/stm32_dma.c
index 7c959f84ae..a695a07adf 100644
--- a/arch/arm/src/stm32f7/stm32_dma.c
+++ b/arch/arm/src/stm32f7/stm32_dma.c
@@ -986,13 +986,14 @@ bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr)
         break;
 
       default:
+
         /* Everything else is unsupported by DMA */
 
         dmainfo("stm32_dmacapable: transfer targets unknown/unsupported region\n");
         return false;
     }
 
-    dmainfo("stm32_dmacapable: transfer OK\n");
+  dmainfo("stm32_dmacapable: transfer OK\n");
   return true;
 }
 #endif
-- 
GitLab


From 7c096f31d44f939e596361ffb6978a4b43a9c3f7 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Fri, 8 Jul 2016 08:11:45 -0600
Subject: [PATCH 178/229] Trivial updates from review of last PR

---
 configs/stm32f4discovery/canard/Make.defs |  2 +-
 configs/stm32f4discovery/canard/defconfig | 43 +++++------------------
 configs/stm32f4discovery/canard/setenv.sh |  4 +--
 configs/stm32f4discovery/src/stm32_can.c  |  3 +-
 4 files changed, 13 insertions(+), 39 deletions(-)

diff --git a/configs/stm32f4discovery/canard/Make.defs b/configs/stm32f4discovery/canard/Make.defs
index 4f959a460c..1f8f43ca28 100644
--- a/configs/stm32f4discovery/canard/Make.defs
+++ b/configs/stm32f4discovery/canard/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/stm32f4discovery/canard/Make.defs
 #
-#   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2016 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt 
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/configs/stm32f4discovery/canard/defconfig b/configs/stm32f4discovery/canard/defconfig
index 0e7382e11b..0c49de3a10 100644
--- a/configs/stm32f4discovery/canard/defconfig
+++ b/configs/stm32f4discovery/canard/defconfig
@@ -16,7 +16,7 @@ CONFIG_HOST_LINUX=y
 #
 # Build Configuration
 #
-CONFIG_APPS_DIR="../apps"
+# CONFIG_APPS_DIR="../apps"
 CONFIG_BUILD_FLAT=y
 # CONFIG_BUILD_2PASS is not set
 
@@ -43,36 +43,7 @@ CONFIG_RAW_BINARY=y
 # Debug Options
 #
 CONFIG_DEBUG_ALERT=y
-CONFIG_DEBUG_FEATURES=y
-
-#
-# Debug SYSLOG Output Controls
-#
-# CONFIG_DEBUG_ERROR is not set
-# CONFIG_DEBUG_ASSERTIONS is not set
-
-#
-# Subsystem Debug Options
-#
-# CONFIG_DEBUG_BINFMT is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_DEBUG_GRAPHICS is not set
-# CONFIG_DEBUG_LIB is not set
-# CONFIG_DEBUG_MM is not set
-# CONFIG_DEBUG_SCHED is not set
-
-#
-# OS Function Debug Options
-#
-# CONFIG_DEBUG_IRQ is not set
-
-#
-# Driver Debug Options
-#
-# CONFIG_DEBUG_LEDS is not set
-# CONFIG_DEBUG_CAN is not set
-# CONFIG_DEBUG_GPIO is not set
-# CONFIG_DEBUG_SPI is not set
+# CONFIG_DEBUG_FEATURES is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_STACK_COLORATION is not set
 CONFIG_ARCH_HAVE_HEAPCHECK=y
@@ -160,7 +131,6 @@ CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARCH_HAVE_TRUSTZONE is not set
 CONFIG_ARM_HAVE_MPU_UNIFIED=y
 # CONFIG_ARM_MPU is not set
-# CONFIG_DEBUG_HARDFAULT is not set
 
 #
 # ARMV7M Configuration Options
@@ -471,6 +441,8 @@ CONFIG_STM32_JTAG_SW_ENABLE=y
 #
 # Timer Configuration
 #
+# CONFIG_STM32_ONESHOT is not set
+# CONFIG_STM32_FREERUN is not set
 # CONFIG_STM32_TIM1_CAP is not set
 # CONFIG_STM32_TIM2_CAP is not set
 # CONFIG_STM32_TIM3_CAP is not set
@@ -637,6 +609,8 @@ CONFIG_DISABLE_OS_API=y
 #
 # Clocks and Timers
 #
+CONFIG_ARCH_HAVE_TICKLESS=y
+# CONFIG_SCHED_TICKLESS is not set
 CONFIG_USEC_PER_TICK=10000
 CONFIG_SYSTEM_TIME64=y
 CONFIG_CLOCK_MONOTONIC=y
@@ -837,7 +811,6 @@ CONFIG_SERIAL_NPOLLWAITERS=2
 # CONFIG_SERIAL_IFLOWCONTROL is not set
 # CONFIG_SERIAL_OFLOWCONTROL is not set
 # CONFIG_SERIAL_DMA is not set
-# CONFIG_SERIAL_TIOCSERGSTRUCT is not set
 CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y
 CONFIG_USART2_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -1030,6 +1003,7 @@ CONFIG_LIBCANARD_VERSION="b28bf6ac337e55d49037fd9904d4b951760c4690"
 # Examples
 #
 # CONFIG_EXAMPLES_BUTTONS is not set
+# CONFIG_EXAMPLES_CAN is not set
 CONFIG_EXAMPLES_LIBCANARD=y
 CONFIG_EXAMPLES_LIBCANARD_DEVPATH="/dev/can0"
 CONFIG_EXAMPLES_LIBCANARD_NODE_ID=1
@@ -1037,7 +1011,6 @@ CONFIG_EXAMPLES_LIBCANARD_APP_NODE_NAME="org.uavcan.libcanard.nuttx.demo"
 CONFIG_EXAMPLES_LIBCANARD_NODE_MEM_POOL_SIZE=1024
 CONFIG_EXAMPLES_LIBCANARD_DAEMON_PRIORITY=100
 CONFIG_EXAMPLES_LIBCANARD_STACKSIZE=2048
-# CONFIG_EXAMPLES_CAN is not set
 # CONFIG_EXAMPLES_CHAT is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CPUHOG is not set
@@ -1060,10 +1033,10 @@ CONFIG_EXAMPLES_LIBCANARD_STACKSIZE=2048
 CONFIG_EXAMPLES_NSH=y
 CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NULL is not set
+# CONFIG_EXAMPLES_NX is not set
 # CONFIG_EXAMPLES_NXFFS is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
-# CONFIG_EXAMPLES_NX is not set
 # CONFIG_EXAMPLES_NXLINES is not set
 # CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
diff --git a/configs/stm32f4discovery/canard/setenv.sh b/configs/stm32f4discovery/canard/setenv.sh
index d67e6fdc7d..ed2adcd4ff 100755
--- a/configs/stm32f4discovery/canard/setenv.sh
+++ b/configs/stm32f4discovery/canard/setenv.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-# configs/stm32f4discovery/nsh/setenv.sh
+# configs/stm32f4discovery/canard/setenv.sh
 #
-#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2016 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt 
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/configs/stm32f4discovery/src/stm32_can.c b/configs/stm32f4discovery/src/stm32_can.c
index ffd0af45cd..bbc0f3e093 100644
--- a/configs/stm32f4discovery/src/stm32_can.c
+++ b/configs/stm32f4discovery/src/stm32_can.c
@@ -1,7 +1,7 @@
 /************************************************************************************
  * configs/stm32f4discovery/src/stm32_can.c
  *
- *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -57,6 +57,7 @@
 /************************************************************************************
  * Pre-processor Definitions
  ************************************************************************************/
+
 /* Configuration ********************************************************************/
 
 #if defined(CONFIG_STM32_CAN1) && defined(CONFIG_STM32_CAN2)
-- 
GitLab


From 7b370f3f354859aa89900d5c8b349a1fdc145dd7 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Fri, 8 Jul 2016 12:43:08 -0600
Subject: [PATCH 179/229] Update ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index 116684e053..06eba68671 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -12267,3 +12267,31 @@
 	  significant corrections (LEDs, buttons, README, etc) and extensions
 	  and updates to match more recent BSPs (2016-07-01).
 	* libc/signal: Add raise() (2016-07-04).
+	* drivers/syslog: Add a SYSLOG character device that can be used to re-
+	  direct output to the SYSLOG (2016-07-05).
+	* net/netdev: Break out internal interface psock_ioctl() (2016-07-06).
+	* configs/stm32f4disovery: add can driver for stm32f4discovery.  From
+	  Matthias Renner (2016-07-06).
+	* configs/freedom-k64f: Increase MCU clock to 120MHz (2016-07-06).
+	* arch/arm/src/stm32:  Add support for Tickless mode (two timer
+	  implementation).  From Max Neklyudov (2016-07-06).
+	* drivers/usbdev: cdcacm_unbind leaks write request objects.  This
+	  arises due to freeing the bulk IN endpoint before the loop that
+	  frees the requests via cdcasm_freereq.  That function checks the
+	  parameters and skips the freeing if either is NULL.  Freeing the bulk
+	  IN enpoint will cause the first param to be NULL, thereby bypassing
+	  the free operation.  To fix, I moved the release of the bulk IN
+	  endpoint until after to loop (much as was the case for the OUT and
+	  read requests, which did not exhibit the problem).  From ziggurat29
+	  (2016-07-07).
+	* arch/arm/src/stm32l4: Update usb dev/host controller drivers to
+	  reflect new(ish) logging standards; augment device enpoint and fifo
+	  allocation #defines to do more sanity checking, and be automatically
+	  adaptive to size changes.  Update README.txt to reflect current status
+	  of the implementation.  From ziggurat29 (2016-07-07).
+	* arch/arm/src/stm32f7: Fixed STM32F7 DMA stm32_dmacapable.  DMA working
+	  on SDMMC.  From David Sidrane (2016-07-07).
+	* configs/stm32f4discovery:  add configuration files for canard.  From
+	  Matthias Renner (2016-07-08).
+	* drivers/pipe: Add missing configuration for pipe ring buffer size.
+	  From Frank Benkert (2016-07-08).
-- 
GitLab


From 106f87d9ed4f671c164bfba7fc7cee405868e23c Mon Sep 17 00:00:00 2001
From: ziggurat29 
Date: Fri, 8 Jul 2016 16:37:44 -0500
Subject: [PATCH 180/229] fix incorrect clock setup for LPTIM1

---
 arch/arm/src/stm32l4/stm32l4x6xx_rcc.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/src/stm32l4/stm32l4x6xx_rcc.c b/arch/arm/src/stm32l4/stm32l4x6xx_rcc.c
index b97fd002dc..8f6aa209b0 100644
--- a/arch/arm/src/stm32l4/stm32l4x6xx_rcc.c
+++ b/arch/arm/src/stm32l4/stm32l4x6xx_rcc.c
@@ -407,18 +407,18 @@ static inline void rcc_enableapb1(void)
   regval |= RCC_APB1ENR1_OPAMPEN;
 #endif
 
+#ifdef CONFIG_STM32L4_LPTIM1
+  /* Low power timer 1 clock enable */
+
+  regval |= RCC_APB1ENR1_LPTIM1EN;
+#endif
+
   putreg32(regval, STM32L4_RCC_APB1ENR1);   /* Enable peripherals */
 
  /* Second APB1 register */
 
   regval = getreg32(STM32L4_RCC_APB1ENR2);
 
-#ifdef CONFIG_STM32L4_LPTIM1
-  /* Low power timer 1 clock enable */
-
-  regval |= RCC_APB1ENR2_LPTIM1EN;
-#endif
-
 #ifdef CONFIG_STM32L4_LPUART1
   /* Low power uart clock enable */
 
-- 
GitLab


From 4bcb4c32211a8c6ad576f98a0f66df70c6499fff Mon Sep 17 00:00:00 2001
From: ziggurat29 
Date: Fri, 8 Jul 2016 16:39:55 -0500
Subject: [PATCH 181/229] define timer clock frequencies on STM32L4-based
 boards

---
 configs/nucleo-l476rg/include/nucleo-l476rg.h | 19 +++++++++++++++++++
 .../include/stm32l476vg-disco-clocking.h      | 19 +++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/configs/nucleo-l476rg/include/nucleo-l476rg.h b/configs/nucleo-l476rg/include/nucleo-l476rg.h
index e661f5965f..4f233b4f16 100644
--- a/configs/nucleo-l476rg/include/nucleo-l476rg.h
+++ b/configs/nucleo-l476rg/include/nucleo-l476rg.h
@@ -463,6 +463,25 @@
 
 #endif
 
+/* Timer Frequencies, if APBx is set to 1, frequency is same to APBx
+ * otherwise frequency is 2xAPBx.
+ * Note: TIM1,8,15,16,17 are on APB2, others on APB1
+ */
+
+#define BOARD_TIM1_FREQUENCY    STM32L4_HCLK_FREQUENCY
+#define BOARD_TIM2_FREQUENCY    (STM32L4_HCLK_FREQUENCY / 2)
+#define BOARD_TIM3_FREQUENCY    (STM32L4_HCLK_FREQUENCY / 2)
+#define BOARD_TIM4_FREQUENCY    (STM32L4_HCLK_FREQUENCY / 2)
+#define BOARD_TIM5_FREQUENCY    (STM32L4_HCLK_FREQUENCY / 2)
+#define BOARD_TIM6_FREQUENCY    (STM32L4_HCLK_FREQUENCY / 2)
+#define BOARD_TIM7_FREQUENCY    (STM32L4_HCLK_FREQUENCY / 2)
+#define BOARD_TIM8_FREQUENCY    STM32L4_HCLK_FREQUENCY
+#define BOARD_TIM15_FREQUENCY   STM32L4_HCLK_FREQUENCY
+#define BOARD_TIM16_FREQUENCY   STM32L4_HCLK_FREQUENCY
+#define BOARD_TIM17_FREQUENCY   STM32L4_HCLK_FREQUENCY
+#define BOARD_LPTIM1_FREQUENCY  (STM32L4_HCLK_FREQUENCY / 2)
+#define BOARD_LPTIM2_FREQUENCY  (STM32L4_HCLK_FREQUENCY / 2)
+
 /************************************************************************************
  * Public Data
  ************************************************************************************/
diff --git a/configs/stm32l476vg-disco/include/stm32l476vg-disco-clocking.h b/configs/stm32l476vg-disco/include/stm32l476vg-disco-clocking.h
index 7db8d8603e..9ceef6c2b2 100644
--- a/configs/stm32l476vg-disco/include/stm32l476vg-disco-clocking.h
+++ b/configs/stm32l476vg-disco/include/stm32l476vg-disco-clocking.h
@@ -348,6 +348,25 @@
 
 #endif
 
+/* Timer Frequencies, if APBx is set to 1, frequency is same to APBx
+ * otherwise frequency is 2xAPBx.
+ * Note: TIM1,8,15,16,17 are on APB2, others on APB1
+ */
+
+#define BOARD_TIM1_FREQUENCY    STM32L4_HCLK_FREQUENCY
+#define BOARD_TIM2_FREQUENCY    (STM32L4_HCLK_FREQUENCY / 2)
+#define BOARD_TIM3_FREQUENCY    (STM32L4_HCLK_FREQUENCY / 2)
+#define BOARD_TIM4_FREQUENCY    (STM32L4_HCLK_FREQUENCY / 2)
+#define BOARD_TIM5_FREQUENCY    (STM32L4_HCLK_FREQUENCY / 2)
+#define BOARD_TIM6_FREQUENCY    (STM32L4_HCLK_FREQUENCY / 2)
+#define BOARD_TIM7_FREQUENCY    (STM32L4_HCLK_FREQUENCY / 2)
+#define BOARD_TIM8_FREQUENCY    STM32L4_HCLK_FREQUENCY
+#define BOARD_TIM15_FREQUENCY   STM32L4_HCLK_FREQUENCY
+#define BOARD_TIM16_FREQUENCY   STM32L4_HCLK_FREQUENCY
+#define BOARD_TIM17_FREQUENCY   STM32L4_HCLK_FREQUENCY
+#define BOARD_LPTIM1_FREQUENCY  (STM32L4_HCLK_FREQUENCY / 2)
+#define BOARD_LPTIM2_FREQUENCY  (STM32L4_HCLK_FREQUENCY / 2)
+
 /************************************************************************************
  * Public Data
  ************************************************************************************/
-- 
GitLab


From 0207f6699aa7b7a98a4a51d307f1ee43abbbba2c Mon Sep 17 00:00:00 2001
From: ziggurat29 
Date: Fri, 8 Jul 2016 17:26:40 -0500
Subject: [PATCH 182/229] port and bit definitions for the various timers on
 the STM32L4.  whew.

---
 arch/arm/src/stm32l4/chip/stm32l4_tim.h | 1121 +++++++++++++++++++++++
 1 file changed, 1121 insertions(+)
 create mode 100644 arch/arm/src/stm32l4/chip/stm32l4_tim.h

diff --git a/arch/arm/src/stm32l4/chip/stm32l4_tim.h b/arch/arm/src/stm32l4/chip/stm32l4_tim.h
new file mode 100644
index 0000000000..23ff67ad4f
--- /dev/null
+++ b/arch/arm/src/stm32l4/chip/stm32l4_tim.h
@@ -0,0 +1,1121 @@
+/****************************************************************************************************
+ * arch/arm/src/stm32l4/chip/stm32l4_tim.h
+ *
+ *   Copyright (C) 2009, 2011-2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt 
+ *           dev@ziggurat29.com
+ *
+ * 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_STM32L4_CHIP_STM32L4_TIM_H
+#define __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_TIM_H
+
+/****************************************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************************************/
+
+/* Register Offsets *********************************************************************************/
+
+/* Basic Timers - TIM6 and TIM7 */
+
+#define STM32L4_BTIM_CR1_OFFSET     0x0000  /* Control register 1 (16-bit) */
+#define STM32L4_BTIM_CR2_OFFSET     0x0004  /* Control register 2 (16-bit) */
+#define STM32L4_BTIM_DIER_OFFSET    0x000c  /* DMA/Interrupt enable register (16-bit) */
+#define STM32L4_BTIM_SR_OFFSET      0x0010  /* Status register (16-bit) */
+#define STM32L4_BTIM_EGR_OFFSET     0x0014  /* Event generation register (16-bit) */
+#define STM32L4_BTIM_CNT_OFFSET     0x0024  /* Counter (16-bit) */
+#define STM32L4_BTIM_PSC_OFFSET     0x0028  /* Prescaler (16-bit) */
+#define STM32L4_BTIM_ARR_OFFSET     0x002c  /* Auto-reload register (16-bit) */
+
+/* 16-/32-bit General Timers with DMA: TIM2, TM3, TIM4, and TIM5
+ * TIM3 and 4 are 16-bit
+ * TIM2 and 5 are 32-bit
+ */
+
+#define STM32L4_GTIM_CR1_OFFSET     0x0000  /* Control register 1 (16-bit) */
+#define STM32L4_GTIM_CR2_OFFSET     0x0004  /* Control register 2 (16-bit, TIM2-5 only) */
+#define STM32L4_GTIM_SMCR_OFFSET    0x0008  /* Slave mode control register (16-bit, TIM2-5 only) */
+#define STM32L4_GTIM_DIER_OFFSET    0x000c  /* DMA/Interrupt enable register (16-bit) */
+#define STM32L4_GTIM_SR_OFFSET      0x0010  /* Status register (16-bit) */
+#define STM32L4_GTIM_EGR_OFFSET     0x0014  /* Event generation register (16-bit) */
+#define STM32L4_GTIM_CCMR1_OFFSET   0x0018  /* Capture/compare mode register 1 (16-bit) */
+#define STM32L4_GTIM_CCMR2_OFFSET   0x001c  /* Capture/compare mode register 2 (16-bit, TIM2-5 only) */
+#define STM32L4_GTIM_CCER_OFFSET    0x0020  /* Capture/compare enable register (16-bit) */
+#define STM32L4_GTIM_CNT_OFFSET     0x0024  /* Counter (16-bit* or 32-bit STM3240 TIM2 and 5 only) */
+#define STM32L4_GTIM_PSC_OFFSET     0x0028  /* Prescaler (16-bit) */
+#define STM32L4_GTIM_ARR_OFFSET     0x002c  /* Auto-reload register (16-bit) */
+#define STM32L4_GTIM_CCR1_OFFSET    0x0034  /* Capture/compare register 1 (16-bit or 32-bit STM3240 TIM2/5 only) */
+#define STM32L4_GTIM_CCR2_OFFSET    0x0038  /* Capture/compare register 2 (16-bit TIM2-5 only or 32-bit STM32 F4 TIM2/5 or STM2 F3 TIM15 only) */
+#define STM32L4_GTIM_CCR3_OFFSET    0x003c  /* Capture/compare register 3 (16-bit TIM2-5 only or 32-bit STM32 F4 TIM2/5 only) */
+#define STM32L4_GTIM_CCR4_OFFSET    0x0040  /* Capture/compare register 4 (16-bit TIM2-5 only or 32-bit STM32 F4 TIM2/5 only) */
+#define STM32L4_GTIM_DCR_OFFSET     0x0048  /* DMA control register (16-bit, TIM2-5 only) */
+#define STM32L4_GTIM_DMAR_OFFSET    0x004c  /* DMA address for burst mode (16-bit, TIM2-5 only) */
+#define STM32L4_GTIM_OR1_OFFSET     0x0050  /* Option register 1 */
+#define STM32L4_GTIM_OR2_OFFSET     0x0060  /* Option register 2 */
+
+/* TIM15, 16, and 17 only.
+ */
+
+#define STM32L4_GTIM_RCR_OFFSET     0x0030  /* Repetition counter register (TIM16/TIM17) */
+#define STM32L4_GTIM_BDTR_OFFSET    0x0044  /* Break and dead-time register (TIM16/TIM17) */
+
+/* Advanced Timers - TIM1 and TIM8 */
+
+#define STM32L4_ATIM_CR1_OFFSET     0x0000  /* Control register 1 (16-bit) */
+#define STM32L4_ATIM_CR2_OFFSET     0x0004  /* Control register 2 (16-bit*) */
+#define STM32L4_ATIM_SMCR_OFFSET    0x0008  /* Slave mode control register (16-bit) */
+#define STM32L4_ATIM_DIER_OFFSET    0x000c  /* DMA/Interrupt enable register (16-bit) */
+#define STM32L4_ATIM_SR_OFFSET      0x0010  /* Status register (16-bit*) */
+#define STM32L4_ATIM_EGR_OFFSET     0x0014  /* Event generation register (16-bit) */
+#define STM32L4_ATIM_CCMR1_OFFSET   0x0018  /* Capture/compare mode register 1 (16-bit*) */
+#define STM32L4_ATIM_CCMR2_OFFSET   0x001c  /* Capture/compare mode register 2 (16-bit*) */
+#define STM32L4_ATIM_CCER_OFFSET    0x0020  /* Capture/compare enable register (16-bit*) */
+#define STM32L4_ATIM_CNT_OFFSET     0x0024  /* Counter (16-bit) */
+#define STM32L4_ATIM_PSC_OFFSET     0x0028  /* Prescaler (16-bit) */
+#define STM32L4_ATIM_ARR_OFFSET     0x002c  /* Auto-reload register (16-bit) */
+#define STM32L4_ATIM_RCR_OFFSET     0x0030  /* Repetition counter register (16-bit) */
+#define STM32L4_ATIM_CCR1_OFFSET    0x0034  /* Capture/compare register 1 (16-bit) */
+#define STM32L4_ATIM_CCR2_OFFSET    0x0038  /* Capture/compare register 2 (16-bit) */
+#define STM32L4_ATIM_CCR3_OFFSET    0x003c  /* Capture/compare register 3 (16-bit) */
+#define STM32L4_ATIM_CCR4_OFFSET    0x0040  /* Capture/compare register 4 (16-bit) */
+#define STM32L4_ATIM_BDTR_OFFSET    0x0044  /* Break and dead-time register (16-bit*) */
+#define STM32L4_ATIM_DCR_OFFSET     0x0048  /* DMA control register (16-bit) */
+#define STM32L4_ATIM_DMAR_OFFSET    0x004c  /* DMA address for burst mode (16-bit) */
+#define STM32L4_ATIM_OR1_OFFSET     0x0050  /* Timer option register 1 */
+#define STM32L4_ATIM_CCMR3_OFFSET   0x0054  /* Capture/compare mode register 3 (32-bit) */
+#define STM32L4_ATIM_CCR5_OFFSET    0x0058  /* Capture/compare register 4 (16-bit) */
+#define STM32L4_ATIM_CCR6_OFFSET    0x005c  /* Capture/compare register 4 (32-bit) */
+#define STM32L4_ATIM_OR2_OFFSET     0x0050  /* Timer option register 2 */
+#define STM32L4_ATIM_OR3_OFFSET     0x0050  /* Timer option register 3 */
+
+/* Low-Power Timers - LPTIM1 and LPTIM2 */
+
+#define STM32L4_LPTIM_ISR_OFFSET    0x0000  /* Interrupt and Status register */
+#define STM32L4_LPTIM_ICR_OFFSET    0x0004  /* Interrupt clear register */
+#define STM32L4_LPTIM_IER_OFFSET    0x0008  /* Interrupt enable register */
+#define STM32L4_LPTIM_CFGR_OFFSET   0x000c  /* Configuration register */
+#define STM32L4_LPTIM_CR_OFFSET     0x0010  /* Control register */
+#define STM32L4_LPTIM_CMP_OFFSET    0x0014  /* Compare register */
+#define STM32L4_LPTIM_ARR_OFFSET    0x0018  /* Auto-reloud register (16-bit) */
+#define STM32L4_LPTIM_CNT_OFFSET    0x001c  /* Counter (16-bit) */
+#define STM32L4_LPTIM_OR_OFFSET     0x001c  /* Options Register */
+
+/* Register Addresses *******************************************************************************/
+
+/* Advanced Timers - TIM1 and TIM8 */
+
+#define STM32L4_TIM1_CR1            (STM32L4_TIM1_BASE+STM32L4_ATIM_CR1_OFFSET)
+#define STM32L4_TIM1_CR2            (STM32L4_TIM1_BASE+STM32L4_ATIM_CR2_OFFSET)
+#define STM32L4_TIM1_SMCR           (STM32L4_TIM1_BASE+STM32L4_ATIM_SMCR_OFFSET)
+#define STM32L4_TIM1_DIER           (STM32L4_TIM1_BASE+STM32L4_ATIM_DIER_OFFSET)
+#define STM32L4_TIM1_SR             (STM32L4_TIM1_BASE+STM32L4_ATIM_SR_OFFSET)
+#define STM32L4_TIM1_EGR            (STM32L4_TIM1_BASE+STM32L4_ATIM_EGR_OFFSET)
+#define STM32L4_TIM1_CCMR1          (STM32L4_TIM1_BASE+STM32L4_ATIM_CCMR1_OFFSET)
+#define STM32L4_TIM1_CCMR2          (STM32L4_TIM1_BASE+STM32L4_ATIM_CCMR2_OFFSET)
+#define STM32L4_TIM1_CCER           (STM32L4_TIM1_BASE+STM32L4_ATIM_CCER_OFFSET)
+#define STM32L4_TIM1_CNT            (STM32L4_TIM1_BASE+STM32L4_ATIM_CNT_OFFSET)
+#define STM32L4_TIM1_PSC            (STM32L4_TIM1_BASE+STM32L4_ATIM_PSC_OFFSET)
+#define STM32L4_TIM1_ARR            (STM32L4_TIM1_BASE+STM32L4_ATIM_ARR_OFFSET)
+#define STM32L4_TIM1_RCR            (STM32L4_TIM1_BASE+STM32L4_ATIM_RCR_OFFSET)
+#define STM32L4_TIM1_CCR1           (STM32L4_TIM1_BASE+STM32L4_ATIM_CCR1_OFFSET)
+#define STM32L4_TIM1_CCR2           (STM32L4_TIM1_BASE+STM32L4_ATIM_CCR2_OFFSET)
+#define STM32L4_TIM1_CCR3           (STM32L4_TIM1_BASE+STM32L4_ATIM_CCR3_OFFSET)
+#define STM32L4_TIM1_CCR4           (STM32L4_TIM1_BASE+STM32L4_ATIM_CCR4_OFFSET)
+#define STM32L4_TIM1_BDTR           (STM32L4_TIM1_BASE+STM32L4_ATIM_BDTR_OFFSET)
+#define STM32L4_TIM1_DCR            (STM32L4_TIM1_BASE+STM32L4_ATIM_DCR_OFFSET)
+#define STM32L4_TIM1_DMAR           (STM32L4_TIM1_BASE+STM32L4_ATIM_DMAR_OFFSET)
+#define STM32L4_TIM1_OR1            (STM32L4_TIM1_BASE+STM32L4_ATIM_OR1_OFFSET)
+#define STM32L4_TIM1_CCMR3          (STM32L4_TIM1_BASE+STM32L4_ATIM_CCMR3_OFFSET)
+#define STM32L4_TIM1_CCR5           (STM32L4_TIM1_BASE+STM32L4_ATIM_CCR5_OFFSET)
+#define STM32L4_TIM1_CCR6           (STM32L4_TIM1_BASE+STM32L4_ATIM_CCR6_OFFSET)
+#define STM32L4_TIM1_OR2            (STM32L4_TIM1_BASE+STM32L4_ATIM_OR2_OFFSET)
+#define STM32L4_TIM1_OR3            (STM32L4_TIM1_BASE+STM32L4_ATIM_OR3_OFFSET)
+
+#define STM32L4_TIM8_CR1            (STM32L4_TIM8_BASE+STM32L4_ATIM_CR1_OFFSET)
+#define STM32L4_TIM8_CR2            (STM32L4_TIM8_BASE+STM32L4_ATIM_CR2_OFFSET)
+#define STM32L4_TIM8_SMCR           (STM32L4_TIM8_BASE+STM32L4_ATIM_SMCR_OFFSET)
+#define STM32L4_TIM8_DIER           (STM32L4_TIM8_BASE+STM32L4_ATIM_DIER_OFFSET)
+#define STM32L4_TIM8_SR             (STM32L4_TIM8_BASE+STM32L4_ATIM_SR_OFFSET)
+#define STM32L4_TIM8_EGR            (STM32L4_TIM8_BASE+STM32L4_ATIM_EGR_OFFSET)
+#define STM32L4_TIM8_CCMR1          (STM32L4_TIM8_BASE+STM32L4_ATIM_CCMR1_OFFSET)
+#define STM32L4_TIM8_CCMR2          (STM32L4_TIM8_BASE+STM32L4_ATIM_CCMR2_OFFSET)
+#define STM32L4_TIM8_CCER           (STM32L4_TIM8_BASE+STM32L4_ATIM_CCER_OFFSET)
+#define STM32L4_TIM8_CNT            (STM32L4_TIM8_BASE+STM32L4_ATIM_CNT_OFFSET)
+#define STM32L4_TIM8_PSC            (STM32L4_TIM8_BASE+STM32L4_ATIM_PSC_OFFSET)
+#define STM32L4_TIM8_ARR            (STM32L4_TIM8_BASE+STM32L4_ATIM_ARR_OFFSET)
+#define STM32L4_TIM8_RCR            (STM32L4_TIM8_BASE+STM32L4_ATIM_RCR_OFFSET)
+#define STM32L4_TIM8_CCR1           (STM32L4_TIM8_BASE+STM32L4_ATIM_CCR1_OFFSET)
+#define STM32L4_TIM8_CCR2           (STM32L4_TIM8_BASE+STM32L4_ATIM_CCR2_OFFSET)
+#define STM32L4_TIM8_CCR3           (STM32L4_TIM8_BASE+STM32L4_ATIM_CCR3_OFFSET)
+#define STM32L4_TIM8_CCR4           (STM32L4_TIM8_BASE+STM32L4_ATIM_CCR4_OFFSET)
+#define STM32L4_TIM8_BDTR           (STM32L4_TIM8_BASE+STM32L4_ATIM_BDTR_OFFSET)
+#define STM32L4_TIM8_DCR            (STM32L4_TIM8_BASE+STM32L4_ATIM_DCR_OFFSET)
+#define STM32L4_TIM8_DMAR           (STM32L4_TIM8_BASE+STM32L4_ATIM_DMAR_OFFSET)
+#define STM32L4_TIM8_OR1            (STM32L4_TIM8_BASE+STM32L4_ATIM_OR1_OFFSET)
+#define STM32L4_TIM8_CCMR3          (STM32L4_TIM8_BASE+STM32L4_ATIM_CCMR3_OFFSET)
+#define STM32L4_TIM8_CCR5           (STM32L4_TIM8_BASE+STM32L4_ATIM_CCR5_OFFSET)
+#define STM32L4_TIM8_CCR6           (STM32L4_TIM8_BASE+STM32L4_ATIM_CCR6_OFFSET)
+#define STM32L4_TIM8_OR2            (STM32L4_TIM8_BASE+STM32L4_ATIM_OR2_OFFSET)
+#define STM32L4_TIM8_OR3            (STM32L4_TIM8_BASE+STM32L4_ATIM_OR3_OFFSET)
+
+/* 16-/32-bit General Timers - TIM2, TIM3, TIM4, and TIM5 with DMA.
+ * TIM3 and 4 are 16-bit.
+ * TIM2 and 5 are 32-bit
+ */
+
+#define STM32L4_TIM2_CR1            (STM32L4_TIM2_BASE+STM32L4_GTIM_CR1_OFFSET)
+#define STM32L4_TIM2_CR2            (STM32L4_TIM2_BASE+STM32L4_GTIM_CR2_OFFSET)
+#define STM32L4_TIM2_SMCR           (STM32L4_TIM2_BASE+STM32L4_GTIM_SMCR_OFFSET)
+#define STM32L4_TIM2_DIER           (STM32L4_TIM2_BASE+STM32L4_GTIM_DIER_OFFSET)
+#define STM32L4_TIM2_SR             (STM32L4_TIM2_BASE+STM32L4_GTIM_SR_OFFSET)
+#define STM32L4_TIM2_EGR            (STM32L4_TIM2_BASE+STM32L4_GTIM_EGR_OFFSET)
+#define STM32L4_TIM2_CCMR1          (STM32L4_TIM2_BASE+STM32L4_GTIM_CCMR1_OFFSET)
+#define STM32L4_TIM2_CCMR2          (STM32L4_TIM2_BASE+STM32L4_GTIM_CCMR2_OFFSET)
+#define STM32L4_TIM2_CCER           (STM32L4_TIM2_BASE+STM32L4_GTIM_CCER_OFFSET)
+#define STM32L4_TIM2_CNT            (STM32L4_TIM2_BASE+STM32L4_GTIM_CNT_OFFSET)
+#define STM32L4_TIM2_PSC            (STM32L4_TIM2_BASE+STM32L4_GTIM_PSC_OFFSET)
+#define STM32L4_TIM2_ARR            (STM32L4_TIM2_BASE+STM32L4_GTIM_ARR_OFFSET)
+#define STM32L4_TIM2_CCR1           (STM32L4_TIM2_BASE+STM32L4_GTIM_CCR1_OFFSET)
+#define STM32L4_TIM2_CCR2           (STM32L4_TIM2_BASE+STM32L4_GTIM_CCR2_OFFSET)
+#define STM32L4_TIM2_CCR3           (STM32L4_TIM2_BASE+STM32L4_GTIM_CCR3_OFFSET)
+#define STM32L4_TIM2_CCR4           (STM32L4_TIM2_BASE+STM32L4_GTIM_CCR4_OFFSET)
+#define STM32L4_TIM2_DCR            (STM32L4_TIM2_BASE+STM32L4_GTIM_DCR_OFFSET)
+#define STM32L4_TIM2_DMAR           (STM32L4_TIM2_BASE+STM32L4_GTIM_DMAR_OFFSET)
+#define STM32L4_TIM2_OR             (STM32L4_TIM2_BASE+STM32L4_GTIM_OR_OFFSET)
+
+#define STM32L4_TIM3_CR1            (STM32L4_TIM3_BASE+STM32L4_GTIM_CR1_OFFSET)
+#define STM32L4_TIM3_CR2            (STM32L4_TIM3_BASE+STM32L4_GTIM_CR2_OFFSET)
+#define STM32L4_TIM3_SMCR           (STM32L4_TIM3_BASE+STM32L4_GTIM_SMCR_OFFSET)
+#define STM32L4_TIM3_DIER           (STM32L4_TIM3_BASE+STM32L4_GTIM_DIER_OFFSET)
+#define STM32L4_TIM3_SR             (STM32L4_TIM3_BASE+STM32L4_GTIM_SR_OFFSET)
+#define STM32L4_TIM3_EGR            (STM32L4_TIM3_BASE+STM32L4_GTIM_EGR_OFFSET)
+#define STM32L4_TIM3_CCMR1          (STM32L4_TIM3_BASE+STM32L4_GTIM_CCMR1_OFFSET)
+#define STM32L4_TIM3_CCMR2          (STM32L4_TIM3_BASE+STM32L4_GTIM_CCMR2_OFFSET)
+#define STM32L4_TIM3_CCER           (STM32L4_TIM3_BASE+STM32L4_GTIM_CCER_OFFSET)
+#define STM32L4_TIM3_CNT            (STM32L4_TIM3_BASE+STM32L4_GTIM_CNT_OFFSET)
+#define STM32L4_TIM3_PSC            (STM32L4_TIM3_BASE+STM32L4_GTIM_PSC_OFFSET)
+#define STM32L4_TIM3_ARR            (STM32L4_TIM3_BASE+STM32L4_GTIM_ARR_OFFSET)
+#define STM32L4_TIM3_CCR1           (STM32L4_TIM3_BASE+STM32L4_GTIM_CCR1_OFFSET)
+#define STM32L4_TIM3_CCR2           (STM32L4_TIM3_BASE+STM32L4_GTIM_CCR2_OFFSET)
+#define STM32L4_TIM3_CCR3           (STM32L4_TIM3_BASE+STM32L4_GTIM_CCR3_OFFSET)
+#define STM32L4_TIM3_CCR4           (STM32L4_TIM3_BASE+STM32L4_GTIM_CCR4_OFFSET)
+#define STM32L4_TIM3_DCR            (STM32L4_TIM3_BASE+STM32L4_GTIM_DCR_OFFSET)
+#define STM32L4_TIM3_DMAR           (STM32L4_TIM3_BASE+STM32L4_GTIM_DMAR_OFFSET)
+
+#define STM32L4_TIM4_CR1            (STM32L4_TIM4_BASE+STM32L4_GTIM_CR1_OFFSET)
+#define STM32L4_TIM4_CR2            (STM32L4_TIM4_BASE+STM32L4_GTIM_CR2_OFFSET)
+#define STM32L4_TIM4_SMCR           (STM32L4_TIM4_BASE+STM32L4_GTIM_SMCR_OFFSET)
+#define STM32L4_TIM4_DIER           (STM32L4_TIM4_BASE+STM32L4_GTIM_DIER_OFFSET)
+#define STM32L4_TIM4_SR             (STM32L4_TIM4_BASE+STM32L4_GTIM_SR_OFFSET)
+#define STM32L4_TIM4_EGR            (STM32L4_TIM4_BASE+STM32L4_GTIM_EGR_OFFSET)
+#define STM32L4_TIM4_CCMR1          (STM32L4_TIM4_BASE+STM32L4_GTIM_CCMR1_OFFSET)
+#define STM32L4_TIM4_CCMR2          (STM32L4_TIM4_BASE+STM32L4_GTIM_CCMR2_OFFSET)
+#define STM32L4_TIM4_CCER           (STM32L4_TIM4_BASE+STM32L4_GTIM_CCER_OFFSET)
+#define STM32L4_TIM4_CNT            (STM32L4_TIM4_BASE+STM32L4_GTIM_CNT_OFFSET)
+#define STM32L4_TIM4_PSC            (STM32L4_TIM4_BASE+STM32L4_GTIM_PSC_OFFSET)
+#define STM32L4_TIM4_ARR            (STM32L4_TIM4_BASE+STM32L4_GTIM_ARR_OFFSET)
+#define STM32L4_TIM4_CCR1           (STM32L4_TIM4_BASE+STM32L4_GTIM_CCR1_OFFSET)
+#define STM32L4_TIM4_CCR2           (STM32L4_TIM4_BASE+STM32L4_GTIM_CCR2_OFFSET)
+#define STM32L4_TIM4_CCR3           (STM32L4_TIM4_BASE+STM32L4_GTIM_CCR3_OFFSET)
+#define STM32L4_TIM4_CCR4           (STM32L4_TIM4_BASE+STM32L4_GTIM_CCR4_OFFSET)
+#define STM32L4_TIM4_DCR            (STM32L4_TIM4_BASE+STM32L4_GTIM_DCR_OFFSET)
+#define STM32L4_TIM4_DMAR           (STM32L4_TIM4_BASE+STM32L4_GTIM_DMAR_OFFSET)
+
+#define STM32L4_TIM5_CR1            (STM32L4_TIM5_BASE+STM32L4_GTIM_CR1_OFFSET)
+#define STM32L4_TIM5_CR2            (STM32L4_TIM5_BASE+STM32L4_GTIM_CR2_OFFSET)
+#define STM32L4_TIM5_SMCR           (STM32L4_TIM5_BASE+STM32L4_GTIM_SMCR_OFFSET)
+#define STM32L4_TIM5_DIER           (STM32L4_TIM5_BASE+STM32L4_GTIM_DIER_OFFSET)
+#define STM32L4_TIM5_SR             (STM32L4_TIM5_BASE+STM32L4_GTIM_SR_OFFSET)
+#define STM32L4_TIM5_EGR            (STM32L4_TIM5_BASE+STM32L4_GTIM_EGR_OFFSET)
+#define STM32L4_TIM5_CCMR1          (STM32L4_TIM5_BASE+STM32L4_GTIM_CCMR1_OFFSET)
+#define STM32L4_TIM5_CCMR2          (STM32L4_TIM5_BASE+STM32L4_GTIM_CCMR2_OFFSET)
+#define STM32L4_TIM5_CCER           (STM32L4_TIM5_BASE+STM32L4_GTIM_CCER_OFFSET)
+#define STM32L4_TIM5_CNT            (STM32L4_TIM5_BASE+STM32L4_GTIM_CNT_OFFSET)
+#define STM32L4_TIM5_PSC            (STM32L4_TIM5_BASE+STM32L4_GTIM_PSC_OFFSET)
+#define STM32L4_TIM5_ARR            (STM32L4_TIM5_BASE+STM32L4_GTIM_ARR_OFFSET)
+#define STM32L4_TIM5_CCR1           (STM32L4_TIM5_BASE+STM32L4_GTIM_CCR1_OFFSET)
+#define STM32L4_TIM5_CCR2           (STM32L4_TIM5_BASE+STM32L4_GTIM_CCR2_OFFSET)
+#define STM32L4_TIM5_CCR3           (STM32L4_TIM5_BASE+STM32L4_GTIM_CCR3_OFFSET)
+#define STM32L4_TIM5_CCR4           (STM32L4_TIM5_BASE+STM32L4_GTIM_CCR4_OFFSET)
+#define STM32L4_TIM5_DCR            (STM32L4_TIM5_BASE+STM32L4_GTIM_DCR_OFFSET)
+#define STM32L4_TIM5_DMAR           (STM32L4_TIM5_BASE+STM32L4_GTIM_DMAR_OFFSET)
+#define STM32L4_TIM5_OR             (STM32L4_TIM5_BASE+STM32L4_GTIM_OR_OFFSET)
+
+#define STM32L4_TIM15_CR1           (STM32L4_TIM15_BASE+STM32L4_GTIM_CR1_OFFSET)
+#define STM32L4_TIM15_CR2           (STM32L4_TIM15_BASE+STM32L4_GTIM_CR2_OFFSET)
+#define STM32L4_TIM15_SMCR          (STM32L4_TIM15_BASE+STM32L4_GTIM_SMCR_OFFSET)
+#define STM32L4_TIM15_DIER          (STM32L4_TIM15_BASE+STM32L4_GTIM_DIER_OFFSET)
+#define STM32L4_TIM15_SR            (STM32L4_TIM15_BASE+STM32L4_GTIM_SR_OFFSET)
+#define STM32L4_TIM15_EGR           (STM32L4_TIM15_BASE+STM32L4_GTIM_EGR_OFFSET)
+#define STM32L4_TIM15_CCMR1         (STM32L4_TIM15_BASE+STM32L4_GTIM_CCMR1_OFFSET)
+#define STM32L4_TIM15_CCER          (STM32L4_TIM15_BASE+STM32L4_GTIM_CCER_OFFSET)
+#define STM32L4_TIM15_CNT           (STM32L4_TIM15_BASE+STM32L4_GTIM_CNT_OFFSET)
+#define STM32L4_TIM15_PSC           (STM32L4_TIM15_BASE+STM32L4_GTIM_PSC_OFFSET)
+#define STM32L4_TIM15_ARR           (STM32L4_TIM15_BASE+STM32L4_GTIM_ARR_OFFSET)
+#define STM32L4_TIM15_RCR           (STM32L4_TIM15_BASE+STM32L4_GTIM_RCR_OFFSET)
+#define STM32L4_TIM15_CCR1          (STM32L4_TIM15_BASE+STM32L4_GTIM_CCR1_OFFSET)
+#define STM32L4_TIM15_CCR2          (STM32L4_TIM15_BASE+STM32L4_GTIM_CCR2_OFFSET)
+#define STM32L4_TIM15_BDTR          (STM32L4_TIM15_BASE+STM32L4_GTIM_BDTR_OFFSET)
+#define STM32L4_TIM15_DCR           (STM32L4_TIM15_BASE+STM32L4_GTIM_DCR_OFFSET)
+#define STM32L4_TIM15_DMAR          (STM32L4_TIM15_BASE+STM32L4_GTIM_DMAR_OFFSET)
+
+#define STM32L4_TIM16_CR1           (STM32L4_TIM16_BASE+STM32L4_GTIM_CR1_OFFSET)
+#define STM32L4_TIM16_CR2           (STM32L4_TIM16_BASE+STM32L4_GTIM_CR2_OFFSET)
+#define STM32L4_TIM16_DIER          (STM32L4_TIM16_BASE+STM32L4_GTIM_DIER_OFFSET)
+#define STM32L4_TIM16_SR            (STM32L4_TIM16_BASE+STM32L4_GTIM_SR_OFFSET)
+#define STM32L4_TIM16_EGR           (STM32L4_TIM16_BASE+STM32L4_GTIM_EGR_OFFSET)
+#define STM32L4_TIM16_CCMR1         (STM32L4_TIM16_BASE+STM32L4_GTIM_CCMR1_OFFSET)
+#define STM32L4_TIM16_CCMR2         (STM32L4_TIM16_BASE+STM32L4_GTIM_CCMR2_OFFSET)
+#define STM32L4_TIM16_CCER          (STM32L4_TIM16_BASE+STM32L4_GTIM_CCER_OFFSET)
+#define STM32L4_TIM16_CNT           (STM32L4_TIM16_BASE+STM32L4_GTIM_CNT_OFFSET)
+#define STM32L4_TIM16_PSC           (STM32L4_TIM16_BASE+STM32L4_GTIM_PSC_OFFSET)
+#define STM32L4_TIM16_ARR           (STM32L4_TIM16_BASE+STM32L4_GTIM_ARR_OFFSET)
+#define STM32L4_TIM16_RCR           (STM32L4_TIM16_BASE+STM32L4_GTIM_RCR_OFFSET)
+#define STM32L4_TIM16_CCR1          (STM32L4_TIM16_BASE+STM32L4_GTIM_CCR1_OFFSET)
+#define STM32L4_TIM16_BDTR          (STM32L4_TIM16_BASE+STM32L4_GTIM_BDTR_OFFSET)
+#define STM32L4_TIM16_DCR           (STM32L4_TIM16_BASE+STM32L4_GTIM_DCR_OFFSET)
+#define STM32L4_TIM16_DMAR          (STM32L4_TIM16_BASE+STM32L4_GTIM_DMAR_OFFSET)
+#define STM32L4_TIM16_OR            (STM32L4_TIM16_BASE+STM32L4_GTIM_OR_OFFSET)
+
+#define STM32L4_TIM17_CR1           (STM32L4_TIM17_BASE+STM32L4_GTIM_CR1_OFFSET)
+#define STM32L4_TIM17_CR2           (STM32L4_TIM17_BASE+STM32L4_GTIM_CR2_OFFSET)
+#define STM32L4_TIM17_DIER          (STM32L4_TIM17_BASE+STM32L4_GTIM_DIER_OFFSET)
+#define STM32L4_TIM17_SR            (STM32L4_TIM17_BASE+STM32L4_GTIM_SR_OFFSET)
+#define STM32L4_TIM17_EGR           (STM32L4_TIM17_BASE+STM32L4_GTIM_EGR_OFFSET)
+#define STM32L4_TIM17_CCMR1         (STM32L4_TIM17_BASE+STM32L4_GTIM_CCMR1_OFFSET)
+#define STM32L4_TIM17_CCMR2         (STM32L4_TIM17_BASE+STM32L4_GTIM_CCMR2_OFFSET)
+#define STM32L4_TIM17_CCER          (STM32L4_TIM17_BASE+STM32L4_GTIM_CCER_OFFSET)
+#define STM32L4_TIM17_CNT           (STM32L4_TIM17_BASE+STM32L4_GTIM_CNT_OFFSET)
+#define STM32L4_TIM17_PSC           (STM32L4_TIM17_BASE+STM32L4_GTIM_PSC_OFFSET)
+#define STM32L4_TIM17_ARR           (STM32L4_TIM17_BASE+STM32L4_GTIM_ARR_OFFSET)
+#define STM32L4_TIM17_RCR           (STM32L4_TIM17_BASE+STM32L4_GTIM_RCR_OFFSET)
+#define STM32L4_TIM17_CCR1          (STM32L4_TIM17_BASE+STM32L4_GTIM_CCR1_OFFSET)
+#define STM32L4_TIM17_BDTR          (STM32L4_TIM17_BASE+STM32L4_GTIM_BDTR_OFFSET)
+#define STM32L4_TIM17_DCR           (STM32L4_TIM17_BASE+STM32L4_GTIM_DCR_OFFSET)
+#define STM32L4_TIM17_DMAR          (STM32L4_TIM17_BASE+STM32L4_GTIM_DMAR_OFFSET)
+
+/* Basic Timers - TIM6 and TIM7 */
+
+#define STM32L4_TIM6_CR1            (STM32L4_TIM6_BASE+STM32L4_BTIM_CR1_OFFSET)
+#define STM32L4_TIM6_CR2            (STM32L4_TIM6_BASE+STM32L4_BTIM_CR2_OFFSET)
+#define STM32L4_TIM6_DIER           (STM32L4_TIM6_BASE+STM32L4_BTIM_DIER_OFFSET)
+#define STM32L4_TIM6_SR             (STM32L4_TIM6_BASE+STM32L4_BTIM_SR_OFFSET)
+#define STM32L4_TIM6_EGR            (STM32L4_TIM6_BASE+STM32L4_BTIM_EGR_OFFSET)
+#define STM32L4_TIM6_CNT            (STM32L4_TIM6_BASE+STM32L4_BTIM_CNT_OFFSET)
+#define STM32L4_TIM6_PSC            (STM32L4_TIM6_BASE+STM32L4_BTIM_PSC_OFFSET)
+#define STM32L4_TIM6_ARR            (STM32L4_TIM6_BASE+STM32L4_BTIM_ARR_OFFSET)
+
+#define STM32L4_TIM7_CR1            (STM32L4_TIM7_BASE+STM32L4_BTIM_CR1_OFFSET)
+#define STM32L4_TIM7_CR2            (STM32L4_TIM7_BASE+STM32L4_BTIM_CR2_OFFSET)
+#define STM32L4_TIM7_DIER           (STM32L4_TIM7_BASE+STM32L4_BTIM_DIER_OFFSET)
+#define STM32L4_TIM7_SR             (STM32L4_TIM7_BASE+STM32L4_BTIM_SR_OFFSET)
+#define STM32L4_TIM7_EGR            (STM32L4_TIM7_BASE+STM32L4_BTIM_EGR_OFFSET)
+#define STM32L4_TIM7_CNT            (STM32L4_TIM7_BASE+STM32L4_BTIM_CNT_OFFSET)
+#define STM32L4_TIM7_PSC            (STM32L4_TIM7_BASE+STM32L4_BTIM_PSC_OFFSET)
+#define STM32L4_TIM7_ARR            (STM32L4_TIM7_BASE+STM32L4_BTIM_ARR_OFFSET)
+
+/* Register Bitfield Definitions ********************************************************************/
+
+/* Control register 1 */
+
+#define ATIM_CR1_CEN                (1 << 0)  /* Bit 0: Counter enable */
+#define ATIM_CR1_UDIS               (1 << 1)  /* Bit 1: Update disable */
+#define ATIM_CR1_URS                (1 << 2)  /* Bit 2: Update request source */
+#define ATIM_CR1_OPM                (1 << 3)  /* Bit 3: One pulse mode */
+#define ATIM_CR1_DIR                (1 << 4)  /* Bit 4: Direction */
+#define ATIM_CR1_CMS_SHIFT          (5)       /* Bits 6-5: Center-aligned mode selection */
+#define ATIM_CR1_CMS_MASK           (3 << ATIM_CR1_CMS_SHIFT)
+#  define ATIM_CR1_EDGE             (0 << ATIM_CR1_CMS_SHIFT) /* 00: Edge-aligned mode */
+#  define ATIM_CR1_CENTER1          (1 << ATIM_CR1_CMS_SHIFT) /* 01: Center-aligned mode 1 */
+#  define ATIM_CR1_CENTER2          (2 << ATIM_CR1_CMS_SHIFT) /* 10: Center-aligned mode 2 */
+#  define ATIM_CR1_CENTER3          (3 << ATIM_CR1_CMS_SHIFT) /* 11: Center-aligned mode 3 */
+#define ATIM_CR1_ARPE               (1 << 7)  /* Bit 7: Auto-reload preload enable */
+#define ATIM_CR1_CKD_SHIFT          (8)       /* Bits 9-8: Clock division */
+#define ATIM_CR1_CKD_MASK           (3 << ATIM_CR1_CKD_SHIFT)
+#  define ATIM_CR1_TCKINT           (0 << ATIM_CR1_CKD_SHIFT) /* 00: tDTS=tCK_INT */
+#  define ATIM_CR1_2TCKINT          (1 << ATIM_CR1_CKD_SHIFT) /* 01: tDTS=2*tCK_INT */
+#  define ATIM_CR1_4TCKINT          (2 << ATIM_CR1_CKD_SHIFT) /* 10: tDTS=4*tCK_INT */
+#define ATIM_CR1_UIFREMAP           (1 << 11) /* Bit 11: UIF status bit remapping */
+
+/* Control register 2 */
+
+#define ATIM_CR2_CCPC               (1 << 0)  /* Bit 0:  Capture/Compare Preloaded Control */
+#define ATIM_CR2_CCUS               (1 << 2)  /* Bit 2:  Capture/Compare Control Update Selection */
+#define ATIM_CR2_CCDS               (1 << 3)  /* Bit 3:  Capture/Compare DMA Selection */
+#define ATIM_CR2_MMS_SHIFT          (4)       /* Bits 6-4: Master Mode Selection */
+#define ATIM_CR2_MMS_MASK           (7 << ATIM_CR2_MMS_SHIFT)
+#  define ATIM_CR2_MMS_RESET        (0 << ATIM_CR2_MMS_SHIFT) /* 000: Reset - TIMx_EGR UG bit is TRGO */
+#  define ATIM_CR2_MMS_ENABLE       (1 << ATIM_CR2_MMS_SHIFT) /* 001: Enable - CNT_EN is TRGO */
+#  define ATIM_CR2_MMS_UPDATE       (2 << ATIM_CR2_MMS_SHIFT) /* 010: Update event is TRGO */
+#  define ATIM_CR2_MMS_COMPP        (3 << ATIM_CR2_MMS_SHIFT) /* 010: Compare Pulse - CC1IF flag */
+#  define ATIM_CR2_MMS_OC1REF       (4 << ATIM_CR2_MMS_SHIFT) /* 100: Compare OC1REF is TRGO */
+#  define ATIM_CR2_MMS_OC2REF       (5 << ATIM_CR2_MMS_SHIFT) /* 101: Compare OC2REF is TRGO */
+#  define ATIM_CR2_MMS_OC3REF       (6 << ATIM_CR2_MMS_SHIFT) /* 110: Compare OC3REF is TRGO */
+#  define ATIM_CR2_MMS_OC4REF       (7 << ATIM_CR2_MMS_SHIFT) /* 111: Compare OC4REF is TRGO */
+#define ATIM_CR2_TI1S               (1 << 7)  /* Bit 7: TI1 Selection */
+#define ATIM_CR2_OIS1               (1 << 8)  /* Bit 8:  Output Idle state 1 (OC1 output) */
+#define ATIM_CR2_OIS1N              (1 << 9)  /* Bit 9:  Output Idle state 1 (OC1N output) */
+#define ATIM_CR2_OIS2               (1 << 10) /* Bit 10: Output Idle state 2 (OC2 output) */
+#define ATIM_CR2_OIS2N              (1 << 11) /* Bit 11: Output Idle state 2 (OC2N output) */
+#define ATIM_CR2_OIS3               (1 << 12) /* Bit 12: Output Idle state 3 (OC3 output) */
+#define ATIM_CR2_OIS3N              (1 << 13) /* Bit 13: Output Idle state 3 (OC3N output) */
+#define ATIM_CR2_OIS4               (1 << 14) /* Bit 14: Output Idle state 4 (OC4 output) */
+#define ATIM_CR2_OIS5               (1 << 16) /* Bit 16: OOutput Idle state 5 (OC5 output) */
+#define ATIM_CR2_OIS6               (1 << 18) /* Bit 18: Output Idle state 6 (OC6 output) */
+#define ATIM_CR2_MMS2_SHIFT         (20)      /* Bits 20-23: Master Mode Selection 2 */
+#define ATIM_CR2_MMS2_MASK          (15 << ATIM_CR2_MMS2_SHIFT)
+#  define ATIM_CR2_MMS2_RESET       (0 << ATIM_CR2_MMS2_SHIFT)  /* 0000: Reset - TIMx_EGR UG bit is TRG9 */
+#  define ATIM_CR2_MMS2_ENABLE      (1 << ATIM_CR2_MMS2_SHIFT)  /* 0001: Enable - CNT_EN is TRGO2 */
+#  define ATIM_CR2_MMS2_UPDATE      (2 << ATIM_CR2_MMS2_SHIFT)  /* 0010: Update event is TRGH0*/
+#  define ATIM_CR2_MMS2_COMPP       (3 << ATIM_CR2_MMS2_SHIFT)  /* 0010: Compare Pulse - CC1IF flag */
+#  define ATIM_CR2_MMS2_OC1REF      (4 << ATIM_CR2_MMS2_SHIFT)  /* 0100: Compare OC1REF is TRGO2 */
+#  define ATIM_CR2_MMS2_OC2REF      (5 << ATIM_CR2_MMS2_SHIFT)  /* 0101: Compare OC2REF is TRGO2 */
+#  define ATIM_CR2_MMS2_OC3REF      (6 << ATIM_CR2_MMS2_SHIFT)  /* 0110: Compare OC3REF is TRGO2 */
+#  define ATIM_CR2_MMS2_OC4REF      (7 << ATIM_CR2_MMS2_SHIFT)  /* 0111: Compare OC4REF is TRGO2 */
+#  define ATIM_CR2_MMS2_OC5REF      (8 << ATIM_CR2_MMS2_SHIFT)  /* 1000: Compare OC5REF is TRGO2 */
+#  define ATIM_CR2_MMS2_OC6REF      (9 << ATIM_CR2_MMS2_SHIFT)  /* 1001: Compare OC6REF is TRGO2 */
+#  define ATIM_CR2_MMS2_CMPOC4      (10 << ATIM_CR2_MMS2_SHIFT) /* 1010: Compare pulse - OC4REF edge is TRGO2 */
+#  define ATIM_CR2_MMS2_CMPOC6      (11 << ATIM_CR2_MMS2_SHIFT) /* 1011: Compare pulse - OC6REF edge is TRGO2 */
+#  define ATIM_CR2_MMS2_CMPOC4R6R   (12 << ATIM_CR2_MMS2_SHIFT) /* 1100: Compare pulse - OC4REF/OC6REF rising */
+#  define ATIM_CR2_MMS2_CMPOC4R6F   (13 << ATIM_CR2_MMS2_SHIFT) /* 1101: Compare pulse - OC4REF rising/OC6REF falling */
+#  define ATIM_CR2_MMS2_CMPOC5R6R   (14 << ATIM_CR2_MMS2_SHIFT) /* 1110: Compare pulse - OC5REF/OC6REF rising */
+#  define ATIM_CR2_MMS2_CMPOC5R6F   (15 << ATIM_CR2_MMS2_SHIFT) /* 1111: Compare pulse - OC5REF rising/OC6REF falling */
+
+/* Slave mode control register */
+
+#define ATIM_SMCR_SMS_SHIFT       (0)       /* Bits 0-2: Slave mode selection */
+#define ATIM_SMCR_SMS_MASK        (7 << ATIM_SMCR_SMS_SHIFT)
+#  define ATIM_SMCR_DISAB         (0 << ATIM_SMCR_SMS_SHIFT) /* 000: Slave mode disabled */
+#  define ATIM_SMCR_ENCMD1        (1 << ATIM_SMCR_SMS_SHIFT) /* 001: Encoder mode 1 */
+#  define ATIM_SMCR_ENCMD2        (2 << ATIM_SMCR_SMS_SHIFT) /* 010: Encoder mode 2 */
+#  define ATIM_SMCR_ENCMD3        (3 << ATIM_SMCR_SMS_SHIFT) /* 011: Encoder mode 3 */
+#  define ATIM_SMCR_RESET         (4 << ATIM_SMCR_SMS_SHIFT) /* 100: Reset Mode */
+#  define ATIM_SMCR_GATED         (5 << ATIM_SMCR_SMS_SHIFT) /* 101: Gated Mode */
+#  define ATIM_SMCR_TRIGGER       (6 << ATIM_SMCR_SMS_SHIFT) /* 110: Trigger Mode */
+#  define ATIM_SMCR_EXTCLK1       (7 << ATIM_SMCR_SMS_SHIFT) /* 111: External Clock Mode 1 */
+#define ATIM_SMCR_OCCS            (1 << 3)  /* Bit 3: OCREF clear selection */
+#define ATIM_SMCR_TS_SHIFT        (4)       /* Bits 4-6: Trigger selection */
+#define ATIM_SMCR_TS_MASK         (7 << ATIM_SMCR_TS_SHIFT)
+#  define ATIM_SMCR_ITR0          (0 << ATIM_SMCR_TS_SHIFT) /* 000: Internal trigger 0 (ITR0) */
+#  define ATIM_SMCR_ITR1          (1 << ATIM_SMCR_TS_SHIFT) /* 001: Internal trigger 1 (ITR1) */
+#  define ATIM_SMCR_ITR2          (2 << ATIM_SMCR_TS_SHIFT) /* 010: Internal trigger 2 (ITR2) */
+#  define ATIM_SMCR_ITR3          (3 << ATIM_SMCR_TS_SHIFT) /* 011: Internal trigger 3 (ITR3) */
+#  define ATIM_SMCR_T1FED         (4 << ATIM_SMCR_TS_SHIFT) /* 100: TI1 Edge Detector (TI1F_ED) */
+#  define ATIM_SMCR_TI1FP1        (5 << ATIM_SMCR_TS_SHIFT) /* 101: Filtered Timer Input 1 (TI1FP1) */
+#  define ATIM_SMCR_T12FP2        (6 << ATIM_SMCR_TS_SHIFT) /* 110: Filtered Timer Input 2 (TI2FP2) */
+#  define ATIM_SMCR_ETRF          (7 << ATIM_SMCR_TS_SHIFT) /* 111: External Trigger input (ETRF) */
+#define ATIM_SMCR_MSM             (1 << 7)  /* Bit 7: Master/slave mode */
+#define ATIM_SMCR_ETF_SHIFT       (8)       /* Bits 8-11: External trigger filter */
+#define ATIM_SMCR_ETF_MASK        (0x0f << ATIM_SMCR_ETF_SHIFT)
+#  define ATIM_SMCR_NOFILT        (0 << ATIM_SMCR_ETF_SHIFT) /* 0000: No filter, sampling is done at fDTS */
+#  define ATIM_SMCR_FCKINT2       (1 << ATIM_SMCR_ETF_SHIFT) /* 0001: fSAMPLING=fCK_INT, N=2 */
+#  define ATIM_SMCR_FCKINT4       (2 << ATIM_SMCR_ETF_SHIFT) /* 0010: fSAMPLING=fCK_INT, N=4 */
+#  define ATIM_SMCR_FCKINT8       (3 << ATIM_SMCR_ETF_SHIFT) /* 0011: fSAMPLING=fCK_INT, N=8 */
+#  define ATIM_SMCR_FDTSd26       (4 << ATIM_SMCR_ETF_SHIFT) /* 0100: fSAMPLING=fDTS/2, N=6 */
+#  define ATIM_SMCR_FDTSd28       (5 << ATIM_SMCR_ETF_SHIFT) /* 0101: fSAMPLING=fDTS/2, N=8 */
+#  define ATIM_SMCR_FDTSd46       (6 << ATIM_SMCR_ETF_SHIFT) /* 0110: fSAMPLING=fDTS/4, N=6 */
+#  define ATIM_SMCR_FDTSd48       (7 << ATIM_SMCR_ETF_SHIFT) /* 0111: fSAMPLING=fDTS/4, N=8 */
+#  define ATIM_SMCR_FDTSd86       (8 << ATIM_SMCR_ETF_SHIFT) /* 1000: fSAMPLING=fDTS/8, N=6 */
+#  define ATIM_SMCR_FDTSd88       (9 << ATIM_SMCR_ETF_SHIFT) /* 1001: fSAMPLING=fDTS/8, N=8 */
+#  define ATIM_SMCR_FDTSd165      (10 << ATIM_SMCR_ETF_SHIFT) /* 1010: fSAMPLING=fDTS/16, N=5 */
+#  define ATIM_SMCR_FDTSd166      (11 << ATIM_SMCR_ETF_SHIFT) /* 1011: fSAMPLING=fDTS/16, N=6 */
+#  define ATIM_SMCR_FDTSd168      (12 << ATIM_SMCR_ETF_SHIFT) /* 1100: fSAMPLING=fDTS/16, N=8 */
+#  define ATIM_SMCR_FDTSd325      (13 << ATIM_SMCR_ETF_SHIFT) /* 1101: fSAMPLING=fDTS/32, N=5 */
+#  define ATIM_SMCR_FDTSd326      (14 << ATIM_SMCR_ETF_SHIFT) /* 1110: fSAMPLING=fDTS/32, N=6 */
+#  define ATIM_SMCR_FDTSd328      (15 << ATIM_SMCR_ETF_SHIFT) /* 1111: fSAMPLING=fDTS/32, N=8 */
+#define ATIM_SMCR_ETPS_SHIFT      (12)      /* Bits 12-13: External trigger prescaler */
+#define ATIM_SMCR_ETPS_MASK       (3 << ATIM_SMCR_ETPS_SHIFT)
+#  define ATIM_SMCR_PSCOFF        (0 << ATIM_SMCR_ETPS_SHIFT) /* 00: Prescaler OFF */
+#  define ATIM_SMCR_ETRPd2        (1 << ATIM_SMCR_ETPS_SHIFT) /* 01: ETRP frequency divided by 2 */
+#  define ATIM_SMCR_ETRPd4        (2 << ATIM_SMCR_ETPS_SHIFT) /* 10: ETRP frequency divided by 4 */
+#  define ATIM_SMCR_ETRPd8        (3 << ATIM_SMCR_ETPS_SHIFT) /* 11: ETRP frequency divided by 8 */
+#define ATIM_SMCR_ECE             (1 << 14) /* Bit 14: External clock enable */
+#define ATIM_SMCR_ETP             (1 << 15) /* Bit 15: External trigger polarity */
+#define ATIM_SMCR_SMS             (1 << 16) /* Bit 16: Slave mode selection - bit 3 */
+
+/* DMA/Interrupt enable register */
+
+#define ATIM_DIER_UIE             (1 << 0)  /* Bit 0: Update interrupt enable */
+#define ATIM_DIER_CC1IE           (1 << 1)  /* Bit 1: Capture/Compare 1 interrupt enable */
+#define ATIM_DIER_CC2IE           (1 << 2)  /* Bit 2: Capture/Compare 2 interrupt enable */
+#define ATIM_DIER_CC3IE           (1 << 3)  /* Bit 3: Capture/Compare 3 interrupt enable */
+#define ATIM_DIER_CC4IE           (1 << 4)  /* Bit 4: Capture/Compare 4 interrupt enable */
+#define ATIM_DIER_COMIE           (1 << 5)  /* Bit 5: COM interrupt enable */
+#define ATIM_DIER_TIE             (1 << 6)  /* Bit 6: Trigger interrupt enable */
+#define ATIM_DIER_BIE             (1 << 7)  /* Bit 7: Break interrupt enable */
+#define ATIM_DIER_UDE             (1 << 8)  /* Bit 8: Update DMA request enable */
+#define ATIM_DIER_CC1DE           (1 << 9)  /* Bit 9: Capture/Compare 1 DMA request enable */
+#define ATIM_DIER_CC2DE           (1 << 10) /* Bit 10: Capture/Compare 2 DMA request enable */
+#define ATIM_DIER_CC3DE           (1 << 11) /* Bit 11: Capture/Compare 3 DMA request enable */
+#define ATIM_DIER_CC4DE           (1 << 12) /* Bit 12: Capture/Compare 4 DMA request enable */
+#define ATIM_DIER_COMDE           (1 << 13) /* Bit 13: COM DMA request enable */
+#define ATIM_DIER_TDE             (1 << 14) /* Bit 14: Trigger DMA request enable */
+
+/* Status register */
+
+#define ATIM_SR_UIF               (1 << 0)  /* Bit 0:  Update interrupt Flag */
+#define ATIM_SR_CC1IF             (1 << 1)  /* Bit 1:  Capture/Compare 1 interrupt Flag */
+#define ATIM_SR_CC2IF             (1 << 2)  /* Bit 2:  Capture/Compare 2 interrupt Flag */
+#define ATIM_SR_CC3IF             (1 << 3)  /* Bit 3:  Capture/Compare 3 interrupt Flag */
+#define ATIM_SR_CC4IF             (1 << 4)  /* Bit 4:  Capture/Compare 4 interrupt Flag */
+#define ATIM_SR_COMIF             (1 << 5)  /* Bit 5:  COM interrupt Flag */
+#define ATIM_SR_TIF               (1 << 6)  /* Bit 6:  Trigger interrupt Flag */
+#define ATIM_SR_BIF               (1 << 7)  /* Bit 7:  Break interrupt Flag */
+#define ATIM_SR_B2IF              (1 << 8)  /* Bit 8:  Break 2 interrupt Flag */
+#define ATIM_SR_CC1OF             (1 << 9)  /* Bit 9:  Capture/Compare 1 Overcapture Flag */
+#define ATIM_SR_CC2OF             (1 << 10) /* Bit 10: Capture/Compare 2 Overcapture Flag */
+#define ATIM_SR_CC3OF             (1 << 11) /* Bit 11: Capture/Compare 3 Overcapture Flag */
+#define ATIM_SR_CC4OF             (1 << 12) /* Bit 12: Capture/Compare 4 Overcapture Flag */
+#define ATIM_SR_SBIF              (1 << 13) /* Bit 13: System break interrupt Flag */
+#define ATIM_SR_CC5IF             (1 << 16) /* Bit 16: Compare 5 interrupt flag */
+#define ATIM_SR_CC6IF             (1 << 17) /* Bit 17: Compare 6 interrupt flag */
+
+/* Event generation register */
+
+#define ATIM_EGR_UG               (1 << 0)  /* Bit 0: Update Generation */
+#define ATIM_EGR_CC1G             (1 << 1)  /* Bit 1: Capture/Compare 1 Generation */
+#define ATIM_EGR_CC2G             (1 << 2)  /* Bit 2: Capture/Compare 2 Generation */
+#define ATIM_EGR_CC3G             (1 << 3)  /* Bit 3: Capture/Compare 3 Generation */
+#define ATIM_EGR_CC4G             (1 << 4)  /* Bit 4: Capture/Compare 4 Generation */
+#define ATIM_EGR_COMG             (1 << 5)  /* Bit 5: Capture/Compare Control Update Generation */
+#define ATIM_EGR_TG               (1 << 6)  /* Bit 6: Trigger Generation */
+#define ATIM_EGR_BG               (1 << 7)  /* Bit 7: Break Generation */
+#define ATIM_EGR_B2G              (1 << 8)  /* Bit 8: Break 2 Generation */
+
+/* Capture/compare mode register 1 -- Output compare mode */
+
+#define ATIM_CCMR1_CC1S_SHIFT     (0)       /* Bits 1-0: Capture/Compare 1 Selection */
+#define ATIM_CCMR1_CC1S_MASK      (3 << ATIM_CCMR1_CC1S_SHIFT)
+                                            /* (See common (unshifted) bit field definitions below) */
+#define ATIM_CCMR1_OC1FE          (1 << 2)  /* Bit 2: Output Compare 1 Fast enable */
+#define ATIM_CCMR1_OC1PE          (1 << 3)  /* Bit 3: Output Compare 1 Preload enable */
+#define ATIM_CCMR1_OC1M_SHIFT     (4)       /* Bits 6-4: Output Compare 1 Mode */
+#define ATIM_CCMR1_OC1M_MASK      (7 << ATIM_CCMR1_OC1M_SHIFT)
+                                            /* (See common (unshifted) bit field definitions below) */
+#define ATIM_CCMR1_OC1CE          (1 << 7)  /* Bit 7: Output Compare 1Clear Enable */
+#define ATIM_CCMR1_CC2S_SHIFT     (8)       /* Bits 8-9: Capture/Compare 2 Selection */
+#define ATIM_CCMR1_CC2S_MASK      (3 << ATIM_CCMR1_CC2S_SHIFT)
+                                            /* (See common (unshifted) bit field definitions below) */
+#define ATIM_CCMR1_OC2FE          (1 << 10) /* Bit 10: Output Compare 2 Fast enable */
+#define ATIM_CCMR1_OC2PE          (1 << 11) /* Bit 11: Output Compare 2 Preload enable */
+#define ATIM_CCMR1_OC2M_SHIFT     (12)      /* Bits 14-12: Output Compare 2 Mode */
+#define ATIM_CCMR1_OC2M_MASK      (7 << ATIM_CCMR1_OC2M_SHIFT)
+                                            /* (See common (unshifted) bit field definitions below) */
+#define ATIM_CCMR1_OC2CE          (1 << 15) /* Bit 15: Output Compare 2 Clear Enable */
+#define ATIM_CCMR1_OC1M           (1 << 16) /* Bit 16: Output Compare 1 mode - bit 3 */
+#define ATIM_CCMR1_OC2M           (1 << 24) /* Bit 24: Output Compare 2 mode - bit 3 */
+
+/* Common CCMR (unshifted) Capture/Compare Selection bit-field definitions */
+
+#define ATIM_CCMR_CCS_CCOUT       (0)       /* 00: CCx channel  output */
+#define ATIM_CCMR_CCS_CCIN1       (1)       /* 01: CCx channel input, ICx is TIx */
+#define ATIM_CCMR_CCS_CCIN2       (2)       /* 10: CCx channel input, ICx is TIy */
+#define ATIM_CCMR_CCS_CCINTRC     (3)       /* 11: CCx channel input, ICx is TRC */
+
+/* Common CCMR (unshifted) Compare Mode bit field definitions */
+
+#define ATIM_CCMR_MODE_FRZN       (0)       /* 000: Frozen */
+#define ATIM_CCMR_MODE_CHACT      (1)       /* 001: Channel x active on match */
+#define ATIM_CCMR_MODE_CHINACT    (2)       /* 010: Channel x inactive on match */
+#define ATIM_CCMR_MODE_OCREFTOG   (3)       /* 011: OCxREF toggle ATIM_CNT=ATIM_CCRx */
+#define ATIM_CCMR_MODE_OCREFLO    (4)       /* 100: OCxREF forced low */
+#define ATIM_CCMR_MODE_OCREFHI    (5)       /* 101: OCxREF forced high */
+#define ATIM_CCMR_MODE_PWM1       (6)       /* 110: PWM mode 1 */
+#define ATIM_CCMR_MODE_PWM2       (7)       /* 111: PWM mode 2 */
+#define ATIM_CCMR_MODE_COMBINED1  (12)      /* 1100: Combined PWM mode 1 */
+#define ATIM_CCMR_MODE_COMBINED2  (13)      /* 1101: Combined PWM mode 2 */
+#define ATIM_CCMR_MODE_ASYMMETRIC1 (14)     /* 1110: Asymmetric PWM mode 1 */
+#define ATIM_CCMR_MODE_ASYMMETRIC2 (15)     /* 1111: Asymmetric PWM mode 2 */
+
+/* Capture/compare mode register 1 -- Input capture mode */
+
+                                            /* Bits 1-0:(same as output compare mode) */
+#define ATIM_CCMR1_IC1PSC_SHIFT   (2)       /* Bits 3-2: Input Capture 1 Prescaler */
+#define ATIM_CCMR1_IC1PSC_MASK    (3 << ATIM_CCMR1_IC1PSC_SHIFT)
+                                            /* (See common (unshifted) bit field definitions below) */
+#define ATIM_CCMR1_IC1F_SHIFT     (4)       /* Bits 7-4: Input Capture 1 Filter */
+#define ATIM_CCMR1_IC1F_MASK      (0x0f << ATIM_CCMR1_IC1F_SHIFT)
+                                            /* (See common (unshifted) bit field definitions below) */
+                                            /* Bits 9:8 (same as output compare mode) */
+#define ATIM_CCMR1_IC2PSC_SHIFT   (10)      /* Bits 11:10: Input Capture 2 Prescaler */
+#define ATIM_CCMR1_IC2PSC_MASK    (3 << ATIM_CCMR1_IC2PSC_SHIFT)
+                                            /* (See common (unshifted) bit field definitions below) */
+#define ATIM_CCMR1_IC2F_SHIFT     (12)      /* Bits 15-12: Input Capture 2 Filter */
+#define ATIM_CCMR1_IC2F_MASK      (0x0f << ATIM_CCMR1_IC2F_SHIFT)
+                                            /* (See common (unshifted) bit field definitions below) */
+
+/* Common CCMR (unshifted) Input Capture Prescaler bit-field definitions */
+
+#define ATIM_CCMR_ICPSC_NOPSC     (0)       /* 00: no prescaler, capture each edge */
+#define ATIM_CCMR_ICPSC_EVENTS2   (1)       /* 01: capture once every 2 events */
+#define ATIM_CCMR_ICPSC_EVENTS4   (2)       /* 10: capture once every 4 events */
+#define ATIM_CCMR_ICPSC_EVENTS8   (3)       /* 11: capture once every 8 events */
+
+/* Common CCMR (unshifted) Input Capture Filter bit-field definitions */
+
+#define ATIM_CCMR_ICF_NOFILT      (0)       /* 0000: No filter, sampling at fDTS */
+#define ATIM_CCMR_ICF_FCKINT2     (1)       /* 0001: fSAMPLING=fCK_INT, N=2 */
+#define ATIM_CCMR_ICF_FCKINT4     (2)       /* 0010: fSAMPLING=fCK_INT, N=4 */
+#define ATIM_CCMR_ICF_FCKINT8     (3)       /* 0011: fSAMPLING=fCK_INT, N=8 */
+#define ATIM_CCMR_ICF_FDTSd26     (4)       /* 0100: fSAMPLING=fDTS/2, N=6 */
+#define ATIM_CCMR_ICF_FDTSd28     (5)       /* 0101: fSAMPLING=fDTS/2, N=8 */
+#define ATIM_CCMR_ICF_FDTSd46     (6)       /* 0110: fSAMPLING=fDTS/4, N=6 */
+#define ATIM_CCMR_ICF_FDTSd48     (7)       /* 0111: fSAMPLING=fDTS/4, N=8 */
+#define ATIM_CCMR_ICF_FDTSd86     (8)       /* 1000: fSAMPLING=fDTS/8, N=6 */
+#define ATIM_CCMR_ICF_FDTSd88     (9)       /* 1001: fSAMPLING=fDTS/8, N=8 */
+#define ATIM_CCMR_ICF_FDTSd165    (10)      /* 1010: fSAMPLING=fDTS/16, N=5 */
+#define ATIM_CCMR_ICF_FDTSd166    (11)      /* 1011: fSAMPLING=fDTS/16, N=6 */
+#define ATIM_CCMR_ICF_FDTSd168    (12)      /* 1100: fSAMPLING=fDTS/16, N=8 */
+#define ATIM_CCMR_ICF_FDTSd325    (13)      /* 1101: fSAMPLING=fDTS/32, N=5 */
+#define ATIM_CCMR_ICF_FDTSd326    (14)      /* 1110: fSAMPLING=fDTS/32, N=6 */
+#define ATIM_CCMR_ICF_FDTSd328    (15)      /* 1111: fSAMPLING=fDTS/32, N=8 */
+
+/* Capture/compare mode register 2 - Output Compare mode */
+
+#define ATIM_CCMR2_CC3S_SHIFT     (0)       /* Bits 1-0: Capture/Compare 3 Selection */
+#define ATIM_CCMR2_CC3S_MASK      (3 << ATIM_CCMR2_CC3S_SHIFT)
+                                            /* (See common (unshifted) bit field definitions above) */
+#define ATIM_CCMR2_OC3FE          (1 << 2)  /* Bit 2: Output Compare 3 Fast enable */
+#define ATIM_CCMR2_OC3PE          (1 << 3)  /* Bit 3: Output Compare 3 Preload enable */
+#define ATIM_CCMR2_OC3M_SHIFT     (4)       /* Bits 6-4: Output Compare 3 Mode */
+#define ATIM_CCMR2_OC3M_MASK      (7 << ATIM_CCMR2_OC3M_SHIFT)
+                                            /* (See common (unshifted) bit field definitions above) */
+#define ATIM_CCMR2_OC3CE          (1 << 7)  /* Bit 7: Output Compare 3 Clear Enable */
+#define ATIM_CCMR2_CC4S_SHIFT     (8)       /* Bits 9-8: Capture/Compare 4 Selection */
+#define ATIM_CCMR2_CC4S_MASK      (3 << ATIM_CCMR2_CC4S_SHIFT)
+                                            /* (See common (unshifted) bit field definitions above) */
+#define ATIM_CCMR2_OC4FE          (1 << 10) /* Bit 10: Output Compare 4 Fast enable */
+#define ATIM_CCMR2_OC4PE          (1 << 11) /* Bit 11: Output Compare 4 Preload enable */
+#define ATIM_CCMR2_OC4M_SHIFT     (12)      /* Bits 14-12: Output Compare 4 Mode */
+#define ATIM_CCMR2_OC4M_MASK      (7 << ATIM_CCMR2_OC4M_SHIFT)
+                                            /* (See common (unshifted) bit field definitions above) */
+#define ATIM_CCMR2_OC4CE          (1 << 15) /* Bit 15: Output Compare 4 Clear Enable */
+#define ATIM_CCMR2_OC3M           (1 << 16) /* Bit 16: Output Compare 3 mode - bit 3 */
+#define ATIM_CCMR2_OC4M           (1 << 24) /* Bit 24: Output Compare 4 mode - bit 3 */
+
+/* Capture/compare mode register 2 - Input Capture Mode */
+
+                                            /* Bits 1-0:(same as output compare mode) */
+#define ATIM_CCMR2_IC3PSC_SHIFT   (2)       /* Bits 3-2: Input Capture 3 Prescaler */
+#define ATIM_CCMR1_IC3PSC_MASK    (3 << ATIM_CCMR2_IC3PSC_SHIFT)
+                                            /* (See common (unshifted) bit field definitions above) */
+#define ATIM_CCMR2_IC3F_SHIFT     (4)       /* Bits 7-4: Input Capture 3 Filter */
+#define ATIM_CCMR2_IC3F_MASK      (0x0f << ATIM_CCMR2_IC3F_SHIFT)
+                                            /* (See common (unshifted) bit field definitions above) */
+                                            /* Bits 9:8 (same as output compare mode) */
+#define ATIM_CCMR2_IC4PSC_SHIFT   (10)      /* Bits 11:10: Input Capture 4 Prescaler */
+#define ATIM_CCMR2_IC4PSC_MASK    (3 << ATIM_CCMR2_IC4PSC_SHIFT)
+                                            /* (See common (unshifted) bit field definitions above) */
+#define ATIM_CCMR2_IC4F_SHIFT     (12)      /* Bits 15-12: Input Capture 4 Filter */
+#define ATIM_CCMR2_IC4F_MASK      (0x0f << ATIM_CCMR2_IC4F_SHIFT)
+                                            /* (See common (unshifted) bit field definitions above) */
+
+/* Capture/compare mode register 3 -- Output compare mode */
+
+#define ATIM_CCMR3_OC5FE          (1 << 2)  /* Bit 2: Output Compare 5 Fast enable */
+#define ATIM_CCMR3_OC5PE          (1 << 3)  /* Bit 3: Output Compare 5 Preload enable */
+#define ATIM_CCMR3_OC5M_SHIFT     (4)       /* Bits 6-4: Output Compare 5 Mode */
+#define ATIM_CCMR3_OC5M_MASK      (7 << ATIM_CCMR3_OC5M_SHIFT)
+                                              /* (See common (unshifted) bit field definitions below) */
+#define ATIM_CCMR3_OC5CE          (1 << 7)  /* Bit 7: Output Compare 5 Clear Enable */
+#define ATIM_CCMR3_OC6FE          (1 << 10) /* Bit 10: Output Compare 6 Fast enable */
+#define ATIM_CCMR3_OC6PE          (1 << 11) /* Bit 11: Output Compare 6 Preload enable */
+#define ATIM_CCMR3_OC6M_SHIFT     (12)      /* Bits 14-12: Output Compare 7 Mode */
+#define ATIM_CCMR3_OC6M_MASK      (7 << ATIM_CCMR3_OC6M_SHIFT)
+                                            /* (See common (unshifted) bit field definitions below) */
+#define ATIM_CCMR3_OC6CE          (1 << 15) /* Bit 15: Output Compare 7 Clear Enable */
+                               
+#define ATIM_CCMR3_OC5M           (1 << 16) /* Bit 16: Output Compare 5 mode - bit 3 */
+#define ATIM_CCMR3_OC6M           (1 << 24) /* Bit 24: Output Compare 6 mode - bit 3 */
+
+/* Capture/compare enable register */
+
+#define ATIM_CCER_CC1E            (1 << 0)  /* Bit 0: Capture/Compare 1 output enable */
+#define ATIM_CCER_CC1P            (1 << 1)  /* Bit 1: Capture/Compare 1 output Polarity */
+#define ATIM_CCER_CC1NE           (1 << 2)  /* Bit 2: Capture/Compare 1 Complementary output enable */
+#define ATIM_CCER_CC1NP           (1 << 3)  /* Bit 3: Capture/Compare 1 Complementary output polarity */
+#define ATIM_CCER_CC2E            (1 << 4)  /* Bit 4: Capture/Compare 2 output enable */
+#define ATIM_CCER_CC2P            (1 << 5)  /* Bit 5: Capture/Compare 2 output Polarity */
+#define ATIM_CCER_CC2NE           (1 << 6)  /* Bit 6: Capture/Compare 2 Complementary output enable */
+#define ATIM_CCER_CC2NP           (1 << 7)  /* Bit 7: Capture/Compare 2 Complementary output polarity */
+#define ATIM_CCER_CC3E            (1 << 8)  /* Bit 8: Capture/Compare 3 output enable */
+#define ATIM_CCER_CC3P            (1 << 9)  /* Bit 9: Capture/Compare 3 output Polarity */
+#define ATIM_CCER_CC3NE           (1 << 10) /* Bit 10: Capture/Compare 3 Complementary output enable */
+#define ATIM_CCER_CC3NP           (1 << 11) /* Bit 11: Capture/Compare 3 Complementary output polarity */
+#define ATIM_CCER_CC4E            (1 << 12) /* Bit 12: Capture/Compare 4 output enable */
+#define ATIM_CCER_CC4P            (1 << 13) /* Bit 13: Capture/Compare 4 output Polarity */
+#define ATIM_CCER_CC5E            (1 << 16) /* Bit 16: Capture/Compare 5 output enable */
+#define ATIM_CCER_CC5P            (1 << 17) /* Bit 17: Capture/Compare 5 output Polarity */
+#define ATIM_CCER_CC6E            (1 << 20) /* Bit 20: Capture/Compare 6 output enable */
+#define ATIM_CCER_CC6P            (1 << 21) /* Bit 21: Capture/Compare 6 output Polarity */
+
+/* 16-bit counter register */
+
+#define ATIM_CNT_SHIFT            (0)       /* Bits 0-15: Timer counter value */
+#define ATIM_CNT_MASK             (0xffff << ATIM_CNT_SHIFT)
+#define ATIM_CCER_UIFCPY          (1 << 31) /* Bit 31: UIF copy */
+
+/* Repetition counter register */
+
+#define ATIM_RCR_REP_SHIFT        (0)       /* Bits 0-15: Repetition Counter Value */
+#define ATIM_RCR_REP_MASK         (0xffff << ATIM_RCR_REP_SHIFT)
+#define ATIM_RCR_REP_MAX          32768     /* REVISIT */
+
+/* Capture/compare registers (CCR) */
+
+#define ATIM_CCR5_GC5C1           (1 << 29) /* Bit 29: Group Channel 5 and Channel 1 */
+#define ATIM_CCR5_GC5C2           (1 << 30) /* Bit 30: Group Channel 5 and Channel 2 */
+#define ATIM_CCR5_GC5C3           (1 << 31) /* Bit 31: Group Channel 5 and Channel 3 */
+
+#define ATIM_CCR_MASK             (0xffff)
+
+/* Break and dead-time register */
+
+#define ATIM_BDTR_DTG_SHIFT       (0)       /* Bits 7:0 [7:0]: Dead-Time Generator set-up */
+#define ATIM_BDTR_DTG_MASK        (0xff << ATIM_BDTR_DTG_SHIFT)
+#define ATIM_BDTR_LOCK_SHIFT      (8)       /* Bits 9:8 [1:0]: Lock Configuration */
+#define ATIM_BDTR_LOCK_MASK       (3 << ATIM_BDTR_LOCK_SHIFT)
+#  define ATIM_BDTR_LOCKOFF       (0 << ATIM_BDTR_LOCK_SHIFT) /* 00: LOCK OFF - No bit is write protected */
+#  define ATIM_BDTR_LOCK1         (1 << ATIM_BDTR_LOCK_SHIFT) /* 01: LOCK Level 1 protection */
+#  define ATIM_BDTR_LOCK2         (2 << ATIM_BDTR_LOCK_SHIFT) /* 10: LOCK Level 2 protection */
+#  define ATIM_BDTR_LOCK3         (3 << ATIM_BDTR_LOCK_SHIFT) /* 11: LOCK Level 3 protection */ */
+#define ATIM_BDTR_OSSI            (1 << 10) /* Bit 10: Off-State Selection for Idle mode */
+#define ATIM_BDTR_OSSR            (1 << 11) /* Bit 11: Off-State Selection for Run mode */
+#define ATIM_BDTR_BKE             (1 << 12) /* Bit 12: Break enable */
+#define ATIM_BDTR_BKP             (1 << 13) /* Bit 13: Break Polarity */
+#define ATIM_BDTR_AOE             (1 << 14) /* Bit 14: Automatic Output enable */
+#define ATIM_BDTR_MOE             (1 << 15) /* Bit 15: Main Output enable */
+#define ATIM_BDTR_BKF_SHIFT       (16)      /* Bits 16-19: Break filter */
+#define ATIM_BDTR_BKF_MASK        (15 << ATIM_BDTR_BKF_SHIFT)
+#  define ATIM_BDTR_BKF_NOFILT      (0 << ATIM_BDTR_BKF_SHIFT)   /* 0000: No filter, BRK acts asynchronously */
+#  define ATIM_BDTR_BKF_FCKINT2     (1 << ATIM_BDTR_BKF_SHIFT)   /* 0001: fSAMPLING=fCK_INT, N=2 */
+#  define ATIM_BDTR_BKF_FCKINT4     (2 << ATIM_BDTR_BKF_SHIFT)   /* 0010: fSAMPLING=fCK_INT, N=4 */
+#  define ATIM_BDTR_BKF_FCKINT8     (3 << ATIM_BDTR_BKF_SHIFT)   /* 0011: fSAMPLING=fCK_INT, N=8 */
+#  define ATIM_BDTR_BKF_FDTSd26     (4 << ATIM_BDTR_BKF_SHIFT)   /* 0100: fSAMPLING=fDTS/2, N=6 */
+#  define ATIM_BDTR_BKF_FDTSd28     (5 << ATIM_BDTR_BKF_SHIFT)   /* 0101: fSAMPLING=fDTS/2, N=8 */
+#  define ATIM_BDTR_BKF_FDTSd36     (6 << ATIM_BDTR_BKF_SHIFT)   /* 0110: fSAMPLING=fDTS/4, N=6 */
+#  define ATIM_BDTR_BKF_FDTSd38     (7 << ATIM_BDTR_BKF_SHIFT)   /* 0111: fSAMPLING=fDTS/4, N=8 */
+#  define ATIM_BDTR_BKF_FDTSd86     (8 << ATIM_BDTR_BKF_SHIFT)   /* 1000: fSAMPLING=fDTS/8, N=6 */
+#  define ATIM_BDTR_BKF_FDTSd88     (9 << ATIM_BDTR_BKF_SHIFT)   /* 1001: fSAMPLING=fDTS/8, N=8 */
+#  define ATIM_BDTR_BKF_FDTSd165    (10 << ATIM_BDTR_BKF_SHIFT)  /* 1010: fSAMPLING=fDTS/16, N=5 */
+#  define ATIM_BDTR_BKF_FDTSd166    (11 << ATIM_BDTR_BKF_SHIFT)  /* 1011: fSAMPLING=fDTS/16, N=6 */
+#  define ATIM_BDTR_BKF_FDTSd168    (12 << ATIM_BDTR_BKF_SHIFT)  /* 1100: fSAMPLING=fDTS/16, N=8 */
+#  define ATIM_BDTR_BKF_FDTSd325    (13 << ATIM_BDTR_BKF_SHIFT)  /* 1101: fSAMPLING=fDTS/32, N=5 */
+#  define ATIM_BDTR_BKF_FDTSd326    (14 << ATIM_BDTR_BKF_SHIFT)  /* 1110: fSAMPLING=fDTS/32, N=6 */
+#  define ATIM_BDTR_BKF_FDTSd328    (15 << ATIM_BDTR_BKF_SHIFT)  /* 1111: fSAMPLING=fDTS/32, N=8 */
+#define ATIM_BDTR_BK2F_SHIFT      (20)      /* Bits 20-23: Break 2 filter */
+#define ATIM_BDTR_BK2F_MASK       (15 << ATIM_BDTR_BK2F_SHIFT)
+#  define ATIM_BDTR_BK2F_NOFILT     (0 << ATIM_BDTR_BK2F_SHIFT)  /* 0000: No filter, BRK 2 acts asynchronously */
+#  define ATIM_BDTR_BK2F_FCKINT2    (1 << ATIM_BDTR_BK2F_SHIFT)  /* 0001: fSAMPLING=fCK_INT, N=2 */
+#  define ATIM_BDTR_BK2F_FCKINT4    (2 << ATIM_BDTR_BK2F_SHIFT)  /* 0010: fSAMPLING=fCK_INT, N=4 */
+#  define ATIM_BDTR_BK2F_FCKINT8    (3 << ATIM_BDTR_BK2F_SHIFT)  /* 0011: fSAMPLING=fCK_INT, N=8 */
+#  define ATIM_BDTR_BK2F_FDTSd26    (4 << ATIM_BDTR_BK2F_SHIFT)  /* 0100: fSAMPLING=fDTS/2, N=6 */
+#  define ATIM_BDTR_BK2F_FDTSd28    (5 << ATIM_BDTR_BK2F_SHIFT)  /* 0101: fSAMPLING=fDTS/2, N=8 */
+#  define ATIM_BDTR_BK2F_FDTSd36    (6 << ATIM_BDTR_BK2F_SHIFT)  /* 0110: fSAMPLING=fDTS/4, N=6 */
+#  define ATIM_BDTR_BK2F_FDTSd38    (7 << ATIM_BDTR_BK2F_SHIFT)  /* 0111: fSAMPLING=fDTS/4, N=8 */
+#  define ATIM_BDTR_BK2F_FDTSd86    (8 << ATIM_BDTR_BK2F_SHIFT)  /* 1000: fSAMPLING=fDTS/8, N=6 */
+#  define ATIM_BDTR_BK2F_FDTSd88    (9 << ATIM_BDTR_BK2F_SHIFT)  /* 1001: fSAMPLING=fDTS/8, N=8 */
+#  define ATIM_BDTR_BK2F_FDTSd165   (10 << ATIM_BDTR_BK2F_SHIFT) /* 1010: fSAMPLING=fDTS/16, N=5 */
+#  define ATIM_BDTR_BK2F_FDTSd166   (11 << ATIM_BDTR_BK2F_SHIFT) /* 1011: fSAMPLING=fDTS/16, N=6 */
+#  define ATIM_BDTR_BK2F_FDTSd168   (12 << ATIM_BDTR_BK2F_SHIFT) /* 1100: fSAMPLING=fDTS/16, N=8 */
+#  define ATIM_BDTR_BK2F_FDTSd325   (13 << ATIM_BDTR_BK2F_SHIFT) /* 1101: fSAMPLING=fDTS/32, N=5 */
+#  define ATIM_BDTR_BK2F_FDTSd326   (14 << ATIM_BDTR_BK2F_SHIFT) /* 1110: fSAMPLING=fDTS/32, N=6 */
+#  define ATIM_BDTR_BK2F_FDTSd328   (15 << ATIM_BDTR_BK2F_SHIFT) /* 1111: fSAMPLING=fDTS/32, N=8 */
+#define ATIM_BDTR_BK2E            (1 << 24) /* Bit 24: Break 2 enable */
+#define ATIM_BDTR_BK2P            (1 << 1525 /* Bit 25:Break 2 polarity */
+
+/* DMA control register */
+
+#define ATIM_DCR_DBA_SHIFT        (0)       /* Bits 4-0: DMA Base Address */
+#define ATIM_DCR_DBA_MASK         (0x1f << ATIM_DCR_DBA_SHIFT)
+#define ATIM_DCR_DBL_SHIFT        (8)       /* Bits 12-8: DMA Burst Length */
+#define ATIM_DCR_DBL_MASK         (0x1f << ATIM_DCR_DBL_SHIFT)
+#  define ATIM_DCR_DBL(n)         (((n)-1) << ATIM_DCR_DBL_SHIFT) /* n transfers, n = 1..18 */
+
+/* Control register 1 (TIM2-5) */
+
+#define GTIM_CR1_CEN              (1 << 0)  /* Bit 0: Counter enable */
+#define GTIM_CR1_UDIS             (1 << 1)  /* Bit 1: Update Disable */
+#define GTIM_CR1_URS              (1 << 2)  /* Bit 2: Update Request Source */
+#define GTIM_CR1_OPM              (1 << 3)  /* Bit 3: One Pulse Mode (TIM2-5, 9, and 12 only) */
+#define GTIM_CR1_DIR              (1 << 4)  /* Bit 4: Direction (TIM2-5 only) */
+#define GTIM_CR1_CMS_SHIFT        (5)       /* Bits 6-5: Center-aligned Mode Selection (TIM2-5 only) */
+#define GTIM_CR1_CMS_MASK         (3 << GTIM_CR1_CMS_SHIFT)
+#  define GTIM_CR1_EDGE           (0 << GTIM_CR1_CMS_SHIFT) /* 00: Edge-aligned mode.  */
+#  define GTIM_CR1_CENTER1        (1 << GTIM_CR1_CMS_SHIFT) /* 01: Center-aligned mode 1 */
+#  define GTIM_CR1_CENTER2        (2 << GTIM_CR1_CMS_SHIFT) /* 10: Center-aligned mode 2 */
+#  define GTIM_CR1_CENTER3        (3 << GTIM_CR1_CMS_SHIFT) /* 11: Center-aligned mode 3 */
+#define GTIM_CR1_ARPE             (1 << 7)  /* Bit 7: Auto-Reload Preload enable */
+#define GTIM_CR1_CKD_SHIFT        (8)       /* Bits 9-8: Clock Division */
+#define GTIM_CR1_CKD_MASK         (3 << GTIM_CR1_CKD_SHIFT)
+#  define GTIM_CR1_TCKINT         (0 << GTIM_CR1_CKD_SHIFT) /* 00: tDTS = tCK_INT */
+#  define GTIM_CR1_2TCKINT        (1 << GTIM_CR1_CKD_SHIFT) /* 01: tDTS = 2 x tCK_INT */
+#  define GTIM_CR1_4TCKINT        (2 << GTIM_CR1_CKD_SHIFT) /* 10: tDTS = 4 x tCK_INT */
+#define GTIM_CR1_UIFREMAP         (1 << 11) /* Bit 11: UIF status bit remapping */
+
+/* Control register 2 (TIM2-5, and TIM15-17 only) */
+
+#define GTIM_CR2_CCPC             (1 << 0)  /* Bit 0: Capture/compare preloaded control (TIM15-17 only) */
+#define GTIM_CR2_CCUS             (1 << 2)  /* Bit 2: Capture/compare control update selection (TIM15-17 only) */
+#define GTIM_CR2_CCDS             (1 << 3)  /* Bit 3: Capture/Compare DMA Selection (TIM2-5,1,&16 only) */
+#define GTIM_CR2_MMS_SHIFT        (4)       /* Bits 6-4: Master Mode Selection (not TIM16) */
+#define GTIM_CR2_MMS_MASK         (7 << GTIM_CR2_MMS_SHIFT)
+#  define GTIM_CR2_MMS_RESET      (0 << GTIM_CR2_MMS_SHIFT) /* 000: Reset */
+#  define GTIM_CR2_MMS_ENABLE     (1 << GTIM_CR2_MMS_SHIFT) /* 001: Enable */
+#  define GTIM_CR2_MMS_UPDATE     (2 << GTIM_CR2_MMS_SHIFT) /* 010: Update */
+#  define GTIM_CR2_MMS_COMPP      (3 << GTIM_CR2_MMS_SHIFT) /* 011: Compare Pulse */
+#  define GTIM_CR2_MMS_OC1REF     (4 << GTIM_CR2_MMS_SHIFT) /* 100: Compare - OC1REF signal is used as trigger output (TRGO) */
+#  define GTIM_CR2_MMS_OC2REF     (5 << GTIM_CR2_MMS_SHIFT) /* 101: Compare - OC2REF signal is used as trigger output (TRGO) */
+#  define GTIM_CR2_MMS_OC3REF     (6 << GTIM_CR2_MMS_SHIFT) /* 110: Compare - OC3REF signal is used as trigger output (TRGO, TIM2-5 and TIM15 only) */
+#  define GTIM_CR2_MMS_OC4REF     (7 << GTIM_CR2_MMS_SHIFT) /* 111: Compare - OC4REF signal is used as trigger output (TRGO, TIM2-5 and TIM15 only) */
+#define GTIM_CR2_TI1S             (1 << 7)  /* Bit 7: TI1 Selection (not TIM16) */
+#define GTIM_CR2_OIS1             (1 << 8)  /* Bit 8: COutput Idle state 1 (OC1 output) (TIM15-17 only) */
+#define GTIM_CR2_OIS1N            (1 << 9)  /* Bit 9: Output Idle state 1 (OC1N output) (TIM15-17 only) */
+#define GTIM_CR2_OIS2             (1 << 10) /* Bit 10: Output idle state 2 (OC2 output) (TIM15 only) */
+
+/* Slave mode control register (TIM2-5 and TIM15 only) */
+
+#define GTIM_SMCR_SMS_SHIFT       (0)       /* Bits 2-0: Slave Mode Selection */
+#define GTIM_SMCR_SMS_MASK        (7 << GTIM_SMCR_SMS_SHIFT)
+#  define GTIM_SMCR_DISAB         (0 << GTIM_SMCR_SMS_SHIFT) /* 000: Slave mode disabled */
+#  define GTIM_SMCR_ENCMD1        (1 << GTIM_SMCR_SMS_SHIFT) /* 001: Encoder mode 1 */
+#  define GTIM_SMCR_ENCMD2        (2 << GTIM_SMCR_SMS_SHIFT) /* 010: Encoder mode 2 */
+#  define GTIM_SMCR_ENCMD3        (3 << GTIM_SMCR_SMS_SHIFT) /* 011: Encoder mode 3 */
+#  define GTIM_SMCR_RESET         (4 << GTIM_SMCR_SMS_SHIFT) /* 100: Reset Mode  */
+#  define GTIM_SMCR_GATED         (5 << GTIM_SMCR_SMS_SHIFT) /* 101: Gated Mode  */
+#  define GTIM_SMCR_TRIGGER       (6 << GTIM_SMCR_SMS_SHIFT) /* 110: Trigger Mode */
+#  define GTIM_SMCR_EXTCLK1       (7 << GTIM_SMCR_SMS_SHIFT) /* 111: External Clock Mode 1 */
+#define GTIM_SMCR_TS_SHIFT        (4)       /* Bits 6-4: Trigger Selection */
+#define GTIM_SMCR_TS_MASK         (7 << GTIM_SMCR_TS_SHIFT)
+#  define GTIM_SMCR_ITR0          (0 << GTIM_SMCR_TS_SHIFT) /* 000: Internal Trigger 0 (ITR0). TIM1 */
+#  define GTIM_SMCR_ITR1          (1 << GTIM_SMCR_TS_SHIFT) /* 001: Internal Trigger 1 (ITR1). TIM2 */
+#  define GTIM_SMCR_ITR2          (2 << GTIM_SMCR_TS_SHIFT) /* 010: Internal Trigger 2 (ITR2). TIM3 */
+#  define GTIM_SMCR_ITR3          (3 << GTIM_SMCR_TS_SHIFT) /* 011: Internal Trigger 3 (ITR3). TIM4 */
+#  define GTIM_SMCR_TI1FED        (4 << GTIM_SMCR_TS_SHIFT) /* 100: TI1 Edge Detector (TI1F_ED) */
+#  define GTIM_SMCR_TI1FP1        (5 << GTIM_SMCR_TS_SHIFT) /* 101: Filtered Timer Input 1 (TI1FP1) */
+#  define GTIM_SMCR_TI2FP2        (6 << GTIM_SMCR_TS_SHIFT) /* 110: Filtered Timer Input 2 (TI2FP2) */
+#  define GTIM_SMCR_ETRF          (7 << GTIM_SMCR_TS_SHIFT) /* 111: External Trigger input (ETRF) */
+#define GTIM_SMCR_MSM             (1 << 7)  /* Bit 7: Master/Slave mode */
+#define GTIM_SMCR_ETF_SHIFT       (8)       /* Bits 11-8: External Trigger Filter (not TIM15) */
+#define GTIM_SMCR_ETF_MASK        (0x0f << GTIM_SMCR_ETF_SHIFT)
+#  define GTIM_SMCR_NOFILT        (0 << GTIM_SMCR_ETF_SHIFT)  /* 0000: No filter, sampling is done at fDTS */
+#  define GTIM_SMCR_FCKINT2       (1 << GTIM_SMCR_ETF_SHIFT)  /* 0001: fSAMPLING=fCK_INT, N=2 */
+#  define GTIM_SMCR_FCKINT4       (2 << GTIM_SMCR_ETF_SHIFT)  /* 0010: fSAMPLING=fCK_INT, N=4 */
+#  define GTIM_SMCR_FCKINT8       (3 << GTIM_SMCR_ETF_SHIFT)  /* 0011: fSAMPLING=fCK_INT, N=8 */
+#  define GTIM_SMCR_FDTSd26       (4 << GTIM_SMCR_ETF_SHIFT)  /* 0100: fSAMPLING=fDTS/2, N=6 */
+#  define GTIM_SMCR_FDTSd28       (5 << GTIM_SMCR_ETF_SHIFT)  /* 0101: fSAMPLING=fDTS/2, N=8 */
+#  define GTIM_SMCR_FDTSd36       (6 << GTIM_SMCR_ETF_SHIFT)  /* 0110: fSAMPLING=fDTS/4, N=6 */
+#  define GTIM_SMCR_FDTSd38       (7 << GTIM_SMCR_ETF_SHIFT)  /* 0111: fSAMPLING=fDTS/4, N=8 */
+#  define GTIM_SMCR_FDTSd86       (8 << GTIM_SMCR_ETF_SHIFT)  /* 1000: fSAMPLING=fDTS/8, N=6 */
+#  define GTIM_SMCR_FDTSd88       (9 << GTIM_SMCR_ETF_SHIFT)  /* 1001: fSAMPLING=fDTS/8, N=8 */
+#  define GTIM_SMCR_FDTSd165      (10 << GTIM_SMCR_ETF_SHIFT) /* 1010: fSAMPLING=fDTS/16, N=5 */
+#  define GTIM_SMCR_FDTSd166      (11 << GTIM_SMCR_ETF_SHIFT) /* 1011: fSAMPLING=fDTS/16, N=6 */
+#  define GTIM_SMCR_FDTSd168      (12 << GTIM_SMCR_ETF_SHIFT) /* 1100: fSAMPLING=fDTS/16, N=8 */
+#  define GTIM_SMCR_FDTSd325      (13 << GTIM_SMCR_ETF_SHIFT) /* 1101: fSAMPLING=fDTS/32, N=5 */
+#  define GTIM_SMCR_FDTSd326      (14 << GTIM_SMCR_ETF_SHIFT) /* 1110: fSAMPLING=fDTS/32, N=6 */
+#  define GTIM_SMCR_FDTSd328      (15 << GTIM_SMCR_ETF_SHIFT) /* 1111: fSAMPLING=fDTS/32, N=8 */
+#define GTIM_SMCR_ETPS_SHIFT      (12)      /* Bits 13-12: External Trigger Prescaler (not TIM15) */
+#define GTIM_SMCR_ETPS_MASK       (3 << GTIM_SMCR_ETPS_SHIFT)
+#  define GTIM_SMCR_PSCOFF        (0 << GTIM_SMCR_ETPS_SHIFT) /* 00: Prescaler OFF */
+#  define GTIM_SMCR_ETRPd2        (1 << GTIM_SMCR_ETPS_SHIFT) /* 01: ETRP frequency divided by 2 */
+#  define GTIM_SMCR_ETRPd4        (2 << GTIM_SMCR_ETPS_SHIFT) /* 10: ETRP frequency divided by 4 */
+#  define GTIM_SMCR_ETRPd8        (3 << GTIM_SMCR_ETPS_SHIFT) /* 11: ETRP frequency divided by 8 */
+#define GTIM_SMCR_ECE             (1 << 14) /* Bit 14: External Clock enable */
+#define GTIM_SMCR_ETP             (1 << 15) /* Bit 15: External Trigger Polarity */
+#define GTIM_SMCR_SMS             (1 << 16) /* Bit 16: Slave mode selection - bit 3 */
+
+/* DMA/Interrupt enable register (TIM2-5) */
+
+#define GTIM_DIER_UIE             (1 << 0)  /* Bit 0: Update interrupt enable */
+#define GTIM_DIER_CC1IE           (1 << 1)  /* Bit 1: Capture/Compare 1 interrupt enable */
+#define GTIM_DIER_CC2IE           (1 << 2)  /* Bit 2: Capture/Compare 2 interrupt enable (TIM2-5,9,12,&15 only) */
+#define GTIM_DIER_CC3IE           (1 << 3)  /* Bit 3: Capture/Compare 3 interrupt enable (TIM2-5 only) */
+#define GTIM_DIER_CC4IE           (1 << 4)  /* Bit 4: Capture/Compare 4 interrupt enable (TIM2-5 only) */
+#define GTIM_DIER_COMIE           (1 << 5)  /* Bit 5: COM interrupt enable (TIM15-17 only) */
+#define GTIM_DIER_TIE             (1 << 6)  /* Bit 6: Trigger interrupt enable (TIM2-5,9,&12 only) */
+#define GTIM_DIER_BIE             (1 << 7)  /* Bit 7: Break interrupt enable (TIM15-17 only) */
+#define GTIM_DIER_UDE             (1 << 8)  /* Bit 8: Update DMA request enable (TIM2-5&15-17 only) */
+#define GTIM_DIER_CC1DE           (1 << 9)  /* Bit 9: Capture/Compare 1 DMA request enable (TIM2-5&15-17 only) */
+#define GTIM_DIER_CC2DE           (1 << 10) /* Bit 10: Capture/Compare 2 DMA request enable (TIM2-5&15 only) */
+#define GTIM_DIER_CC3DE           (1 << 11) /* Bit 11: Capture/Compare 3 DMA request enable (TIM2-5 only) */
+#define GTIM_DIER_CC4DE           (1 << 12) /* Bit 12: Capture/Compare 4 DMA request enable (TIM2-5 only) */
+#define GTIM_DIER_COMDE           (1 << 13) /* Bit 13: COM DMA request enable (TIM15-17 only) */
+#define GTIM_DIER_TDE             (1 << 14) /* Bit 14: Trigger DMA request enable (TIM2-5&15-17 only) */
+
+/* Status register */
+
+#define GTIM_SR_UIF               (1 << 0)  /* Bit 0: Update interrupt flag */
+#define GTIM_SR_CC1IF             (1 << 1)  /* Bit 1: Capture/compare 1 interrupt flag */
+#define GTIM_SR_CC2IF             (1 << 2)  /* Bit 2: Capture/Compare 2 interrupt flag (TIM2-5,9,12,&15 only) */
+#define GTIM_SR_CC3IF             (1 << 3)  /* Bit 3: Capture/Compare 3 interrupt flag (TIM2-5 only) */
+#define GTIM_SR_CC4IF             (1 << 4)  /* Bit 4: Capture/Compare 4 interrupt flag (TIM2-5 only) */
+#define GTIM_SR_COMIF             (1 << 5)  /* Bit 5: COM interrupt flag (TIM15-17 only) */
+#define GTIM_SR_TIF               (1 << 6)  /* Bit 6: Trigger interrupt Flag (TIM2-5,9,12&15-17 only) */
+#define GTIM_SR_BIF               (1 << 7)  /* Bit 7: Break interrupt flag (TIM15-17 only) */
+#define GTIM_SR_CC1OF             (1 << 9)  /* Bit 9: Capture/Compare 1 Overcapture flag */
+#define GTIM_SR_CC2OF             (1 << 10) /* Bit 10: Capture/Compare 2 Overcapture flag (TIM2-5,9,12&15 only) */
+#define GTIM_SR_CC3OF             (1 << 11) /* Bit 11: Capture/Compare 3 Overcapture flag (TIM2-5 only) */
+#define GTIM_SR_CC4OF             (1 << 12) /* Bit 12: Capture/Compare 4 Overcapture flag (TIM2-5 only) */
+
+/* Event generation register (TIM2-5 and TIM9-14) */
+
+#define GTIM_EGR_UG               (1 << 0)  /* Bit 0: Update generation */
+#define GTIM_EGR_CC1G             (1 << 1)  /* Bit 1: Capture/compare 1 generation */
+#define GTIM_EGR_CC2G             (1 << 2)  /* Bit 2: Capture/compare 2 generation (TIM2-5,9,12,&15 only) */
+#define GTIM_EGR_CC3G             (1 << 3)  /* Bit 3: Capture/compare 3 generation (TIM2-5 only) */
+#define GTIM_EGR_CC4G             (1 << 4)  /* Bit 4: Capture/compare 4 generation (TIM2-5 only) */
+#define GTIM_EGR_COMIG            (1 << 5)  /* Bit 5: Capture/Compare control update generation (TIM15-17 only) */
+#define GTIM_EGR_TG               (1 << 6)  /* Bit 6: Trigger generation (TIM2-5,9,12&16-17 only) */
+#define GTIM_EGR_BG               (1 << 7)  /* Bit 7: Break generation (TIM15-17 only) */
+
+/* Capture/compare mode register 1 - Output compare mode (TIM2-5) */
+
+#define GTIM_CCMR1_CC1S_SHIFT     (0)       /* Bits 1-0: Capture/Compare 1 Selection */
+#define GTIM_CCMR1_CC1S_MASK      (3 << GTIM_CCMR1_CC1S_SHIFT)
+                                            /* (See common CCMR Capture/Compare Selection definitions below) */
+#define GTIM_CCMR1_OC1FE          (1 << 2)  /* Bit 2: Output Compare 1 Fast enable */
+#define GTIM_CCMR1_OC1PE          (1 << 3)  /* Bit 3: Output Compare 1 Preload enable */
+#define GTIM_CCMR1_OC1M_SHIFT     (4)       /* Bits 6-4: Output Compare 1 Mode */
+#define GTIM_CCMR1_OC1M_MASK      (7 << GTIM_CCMR1_OC1M_SHIFT)
+                                            /* (See common CCMR Output Compare Mode definitions below) */
+#define GTIM_CCMR1_OC1CE          (1 << 7)  /* Bit 7: Output Compare 1Clear Enable */
+#define GTIM_CCMR1_CC2S_SHIFT     (8)       /* Bits 9-8: Capture/Compare 2 Selection */
+#define GTIM_CCMR1_CC2S_MASK      (3 << GTIM_CCMR1_CC2S_SHIFT)
+                                            /* (See common CCMR Capture/Compare Selection definitions below) */
+#define GTIM_CCMR1_OC2FE          (1 << 10) /* Bit 10: Output Compare 2 Fast enable */
+#define GTIM_CCMR1_OC2PE          (1 << 11) /* Bit 11: Output Compare 2 Preload enable */
+#define GTIM_CCMR1_OC2M_SHIFT     (12)      /* Bits 14-12: Output Compare 2 Mode */
+#define GTIM_CCMR1_OC2M_MASK      (7 << GTIM_CCMR1_OC2M_SHIFT)
+                                            /* (See common CCMR Output Compare Mode definitions below) */
+#define GTIM_CCMR1_OC2CE          (1 << 15) /* Bit 15: Output Compare 2 Clear Enable */
+#define GTIM_CCMR1_OC1M           (1 << 16) /* Bit 16: Output Compare 1 mode - bit 3 */
+#define GTIM_CCMR1_OC2M           (1 << 24) /* Bit 24: Output Compare 2 mode - bit 3 */
+
+/* Common CCMR (unshifted) Capture/Compare Selection bit-field definitions */
+
+#define GTIM_CCMR_CCS_CCOUT       (0)       /* 00: CCx channel output */
+#define GTIM_CCMR_CCS_CCIN1       (1)       /* 01: CCx channel input, ICx is TIx */
+#define GTIM_CCMR_CCS_CCIN2       (2)       /* 10: CCx channel input, ICx is TIy */
+#define GTIM_CCMR_CCS_CCINTRC     (3)       /* 11: CCx channel input, ICx is TRC */
+
+/* Common CCMR (unshifted) Compare Mode bit field definitions */
+
+#define GTIM_CCMR_MODE_FRZN       (0)       /* 000: Frozen */
+#define GTIM_CCMR_MODE_CHACT      (1)       /* 001: Channel x active on match */
+#define GTIM_CCMR_MODE_CHINACT    (2)       /* 010: Channel x inactive on match */
+#define GTIM_CCMR_MODE_OCREFTOG   (3)       /* 011: OCxREF toggle ATIM_CNT=ATIM_CCRx */
+#define GTIM_CCMR_MODE_OCREFLO    (4)       /* 100: OCxREF forced low */
+#define GTIM_CCMR_MODE_OCREFHI    (5)       /* 101: OCxREF forced high */
+#define GTIM_CCMR_MODE_PWM1       (6)       /* 110: PWM mode 1 */
+#define GTIM_CCMR_MODE_PWM2       (7)       /* 111: PWM mode 2 */
+
+/* Capture/compare mode register 1 - Input capture mode (TIM2-5 and TIM9-14) */
+
+                                            /* Bits 1-0 (Same as Output Compare Mode) */
+#define GTIM_CCMR1_IC1PSC_SHIFT   (2)       /* Bits 3-2: Input Capture 1 Prescaler */
+#define GTIM_CCMR1_IC1PSC_MASK    (3 << GTIM_CCMR1_IC1PSC_SHIFT)
+                                            /* (See common CCMR Input Capture Prescaler definitions below) */
+#define GTIM_CCMR1_IC1F_SHIFT     (4)       /* Bits 7-4: Input Capture 1 Filter */
+#define GTIM_CCMR1_IC1F_MASK      (0x0f << GTIM_CCMR1_IC1F_SHIFT)
+                                            /* (See common CCMR Input Capture Filter definitions below) */
+                                            /* Bits 9-8: (Same as Output Compare Mode) */
+#define GTIM_CCMR1_IC2PSC_SHIFT   (10)      /* Bits 11-10: Input Capture 2 Prescaler */
+#define GTIM_CCMR1_IC2PSC_MASK    (3 << GTIM_CCMR1_IC2PSC_SHIFT)
+                                            /* (See common CCMR Input Capture Prescaler definitions below) */
+#define GTIM_CCMR1_IC2F_SHIFT     (12)      /* Bits 15-12: Input Capture 2 Filter */
+#define GTIM_CCMR1_IC2F_MASK      (0x0f << GTIM_CCMR1_IC2F_SHIFT)
+                                            /* (See common CCMR Input Capture Filter definitions below) */
+
+/* Common CCMR (unshifted) Input Capture Prescaler bit-field definitions */
+
+#define GTIM_CCMR_ICPSC_NOPSC     (0)       /* 00: no prescaler, capture each edge */
+#define GTIM_CCMR_ICPSC_EVENTS2   (1)       /* 01: capture once every 2 events */
+#define GTIM_CCMR_ICPSC_EVENTS4   (2)       /* 10: capture once every 4 events */
+#define GTIM_CCMR_ICPSC_EVENTS8   (3)       /* 11: capture once every 8 events */
+
+/* Common CCMR (unshifted) Input Capture Filter bit-field definitions */
+
+#define GTIM_CCMR_ICF_NOFILT      (0)       /* 0000: No filter, sampling at fDTS */
+#define GTIM_CCMR_ICF_FCKINT2     (1)       /* 0001: fSAMPLING=fCK_INT, N=2 */
+#define GTIM_CCMR_ICF_FCKINT4     (2)       /* 0010: fSAMPLING=fCK_INT, N=4 */
+#define GTIM_CCMR_ICF_FCKINT8     (3)       /* 0011: fSAMPLING=fCK_INT, N=8 */
+#define GTIM_CCMR_ICF_FDTSd26     (4)       /* 0100: fSAMPLING=fDTS/2, N=6 */
+#define GTIM_CCMR_ICF_FDTSd28     (5)       /* 0101: fSAMPLING=fDTS/2, N=8 */
+#define GTIM_CCMR_ICF_FDTSd46     (6)       /* 0110: fSAMPLING=fDTS/4, N=6 */
+#define GTIM_CCMR_ICF_FDTSd48     (7)       /* 0111: fSAMPLING=fDTS/4, N=8 */
+#define GTIM_CCMR_ICF_FDTSd86     (8)       /* 1000: fSAMPLING=fDTS/8, N=6 */
+#define GTIM_CCMR_ICF_FDTSd88     (9)       /* 1001: fSAMPLING=fDTS/8, N=8 */
+#define GTIM_CCMR_ICF_FDTSd165    (10)      /* 1010: fSAMPLING=fDTS/16, N=5 */
+#define GTIM_CCMR_ICF_FDTSd166    (11)      /* 1011: fSAMPLING=fDTS/16, N=6 */
+#define GTIM_CCMR_ICF_FDTSd168    (12)      /* 1100: fSAMPLING=fDTS/16, N=8 */
+#define GTIM_CCMR_ICF_FDTSd325    (13)      /* 1101: fSAMPLING=fDTS/32, N=5 */
+#define GTIM_CCMR_ICF_FDTSd326    (14)      /* 1110: fSAMPLING=fDTS/32, N=6 */
+#define GTIM_CCMR_ICF_FDTSd328    (15)      /* 1111: fSAMPLING=fDTS/32, N=8 */
+
+/* Capture/compare mode register 2 - Output Compare mode (TIM2-5 only) */
+
+#define GTIM_CCMR2_CC3S_SHIFT     (0)       /* Bits 1-0: Capture/Compare 3 Selection */
+#define GTIM_CCMR2_CC3S_MASK      (3 << GTIM_CCMR2_CC3S_SHIFT)
+                                            /* (See common CCMR Capture/Compare Selection definitions above) */
+#define GTIM_CCMR2_OC3FE          (1 << 2)  /* Bit 2: Output Compare 3 Fast enable */
+#define GTIM_CCMR2_OC3PE          (1 << 3)  /* Bit 3: Output Compare 3 Preload enable */
+#define GTIM_CCMR2_OC3M_SHIFT     (4)       /* Bits 6-4: Output Compare 3 Mode */
+#define GTIM_CCMR2_OC3M_MASK      (7 << GTIM_CCMR2_OC3M_SHIFT)
+                                            /* (See common CCMR Output Compare Mode definitions above) */
+#define GTIM_CCMR2_OC3CE          (1 << 7)  /* Bit 7: Output Compare 3 Clear Enable */
+#define GTIM_CCMR2_CC4S_SHIFT     (8)       /* Bits 9-8: Capture/Compare 4 Selection */
+#define GTIM_CCMR2_CC4S_MASK      (3 << GTIM_CCMR2_CC4S_SHIFT)
+                                            /* (See common CCMR Capture/Compare Selection definitions above) */
+#define GTIM_CCMR2_OC4FE          (1 << 10) /* Bit 10: Output Compare 4 Fast enable */
+#define GTIM_CCMR2_OC4PE          (1 << 11) /* Bit 11: Output Compare 4 Preload enable */
+#define GTIM_CCMR2_OC4M_SHIFT     (12)      /* Bits 14-12: Output Compare 4 Mode */
+#define GTIM_CCMR2_OC4M_MASK      (7 << GTIM_CCMR2_OC4M_SHIFT)
+                                            /* (See common CCMR Output Compare Mode definitions above) */
+#define GTIM_CCMR2_OC4CE          (1 << 15) /* Bit 15: Output Compare 4 Clear Enable */
+
+/* Capture/compare mode register 2 - Input capture mode (TIM2-5 only) */
+
+                                            /* Bits 1-0 (Same as Output Compare Mode) */
+#define GTIM_CCMR2_IC3PSC_SHIFT   (2)       /* Bits 3-2: Input Capture 3 Prescaler */
+#define GTIM_CCMR2_IC3PSC_MASK    (3 << GTIM_CCMR2_IC3PSC_SHIFT)
+                                            /* (See common CCMR Input Capture Prescaler definitions below) */
+#define GTIM_CCMR2_IC3F_SHIFT     (4)       /* Bits 7-4: Input Capture 3 Filter */
+#define GTIM_CCMR2_IC3F_MASK      (0x0f << GTIM_CCMR2_IC3F_SHIFT)
+                                            /* (See common CCMR Input Capture Filter definitions below) */
+                                            /* Bits 9-8: (Same as Output Compare Mode) */
+#define GTIM_CCMR2_IC4PSC_SHIFT   (10)      /* Bits 11-10: Input Capture 4 Prescaler */
+#define GTIM_CCMR2_IC4PSC_MASK    (3 << GTIM_CCMR2_IC4PSC_SHIFT)
+                                            /* (See common CCMR Input Capture Prescaler definitions below) */
+#define GTIM_CCMR2_IC4F_SHIFT     (12)      /* Bits 15-12: Input Capture 4 Filter */
+#define GTIM_CCMR2_IC4F_MASK      (0x0f << GTIM_CCMR2_IC4F_SHIFT)
+                                            /* (See common CCMR Input Capture Filter definitions below) */
+
+/* Capture/compare enable register (TIM1 and TIM8, TIM2-5) */
+
+#define GTIM_CCER_CC1E            (1 << 0)  /* Bit 0: Capture/Compare 1 output enable */
+#define GTIM_CCER_CC1P            (1 << 1)  /* Bit 1: Capture/Compare 1 output polarity */
+#define GTIM_CCER_CC1NE           (1 << 2)  /* Bit 2: Capture/Compare 1 complementary output enable (TIM1 and TIM8 only) */
+#define GTIM_CCER_CC1NP           (1 << 3)  /* Bit 3: Capture/Compare 1 output Polarity (F2,F3,F4 and TIM15-17) */
+#define GTIM_CCER_CC2E            (1 << 4)  /* Bit 4: Capture/Compare 2 output enable (TIM2-5,9&12 only) */
+#define GTIM_CCER_CC2P            (1 << 5)  /* Bit 5: Capture/Compare 2 output polarity (TIM2-5,9&12 only) */
+#define GTIM_CCER_CC2NE           (1 << 6)  /* Bit 6: Capture/Compare 2 complementary output enable (TIM1 and TIM8 only) */
+#define GTIM_CCER_CC2NP           (1 << 7)  /* Bit 7: Capture/Compare 2 output Polarity (F2,F3,F4 and TIM2-5,9,12&15 only) */
+#define GTIM_CCER_CC3E            (1 << 8)  /* Bit 8: Capture/Compare 3 output enable (TIM2-5 only) */
+#define GTIM_CCER_CC3P            (1 << 9)  /* Bit 9: Capture/Compare 3 output Polarity (TIM2-5 only) */
+#define GTIM_CCER_CC3NE           (1 << 10) /* Bit 10: Capture/Compare 3 complementary output enable (TIM1 and TIM8 only) */
+#define GTIM_CCER_CC3NP           (1 << 11) /* Bit 11: Capture/Compare 3 output Polarity (F2,F4 and TIM2-5 only) */
+#define GTIM_CCER_CC4E            (1 << 12) /* Bit 12: Capture/Compare 4 output enable (TIM2-5 only) */
+#define GTIM_CCER_CC4P            (1 << 13) /* Bit 13: Capture/Compare 4 output Polarity (TIM2-5 only) */
+#define GTIM_CCER_CC4NP           (1 << 15) /* Bit 15: Capture/Compare 4 output Polarity */
+
+/* 16-bit counter register */
+
+#define GTIM_CNT_SHIFT            (0)       /* Bits 0-15: Timer counter value */
+#define GTIM_CNT_MASK             (0xffff << ATIM_CNT_SHIFT)
+
+/* Repetition counter (TIM15-17 only) */
+
+#define GTIM_RCR_REP_SHIFT        (0)       /* Bits 0-7: Repetition Counter Value */
+#define GTIM_RCR_REP_MASK         (0xff << GTIM_RCR_REP_SHIFT)
+
+#define GTIM_RCR_REP_MAX          128
+
+/* Break and dead-time register (TIM15-17 only */
+
+#define GTIM_BDTR_DTG_SHIFT       (0)       /* Bits 7:0 [7:0]: Dead-Time Generator set-up */
+#define GTIM_BDTR_DTG_MASK        (0xff << GTIM_BDTR_DTG_SHIFT)
+#define GTIM_BDTR_LOCK_SHIFT      (8)       /* Bits 9:8 [1:0]: Lock Configuration */
+#define GTIM_BDTR_LOCK_MASK       (3 << GTIM_BDTR_LOCK_SHIFT)
+#  define GTIM_BDTR_LOCKOFF       (0 << GTIM_BDTR_LOCK_SHIFT) /* 00: LOCK OFF - No bit is write protected */
+#  define GTIM_BDTR_LOCK1         (1 << GTIM_BDTR_LOCK_SHIFT) /* 01: LOCK Level 1 protection */
+#  define GTIM_BDTR_LOCK2         (2 << GTIM_BDTR_LOCK_SHIFT) /* 10: LOCK Level 2 protection */
+#  define GTIM_BDTR_LOCK3         (3 << GTIM_BDTR_LOCK_SHIFT) /* 11: LOCK Level 3 protection */ */
+#define GTIM_BDTR_OSSI            (1 << 10) /* Bit 10: Off-State Selection for Idle mode */
+#define GTIM_BDTR_OSSR            (1 << 11) /* Bit 11: Off-State Selection for Run mode */
+#define GTIM_BDTR_BKE             (1 << 12) /* Bit 12: Break enable */
+#define GTIM_BDTR_BKP             (1 << 13) /* Bit 13: Break Polarity */
+#define GTIM_BDTR_AOE             (1 << 14) /* Bit 14: Automatic Output enable */
+#define GTIM_BDTR_MOE             (1 << 15) /* Bit 15: Main Output enable */
+#define GTIM_BDTR_BKF_SHIFT       (16)      /* Bits 16-19: Break filter */
+#define GTIM_BDTR_BKF_MASK        (15 << GTIM_BDTR_BKF_SHIFT)
+#  define GTIM_BDTR_BKF_NOFILT    (0 << GTIM_BDTR_BKF_SHIFT)   /* 0000: No filter, BRK acts asynchronously */
+#  define GTIM_BDTR_BKF_FCKINT2   (1 << GTIM_BDTR_BKF_SHIFT)   /* 0001: fSAMPLING=fCK_INT, N=2 */
+#  define GTIM_BDTR_BKF_FCKINT4   (2 << GTIM_BDTR_BKF_SHIFT)   /* 0010: fSAMPLING=fCK_INT, N=4 */
+#  define GTIM_BDTR_BKF_FCKINT8   (3 << GTIM_BDTR_BKF_SHIFT)   /* 0011: fSAMPLING=fCK_INT, N=8 */
+#  define GTIM_BDTR_BKF_FDTSd26   (4 << GTIM_BDTR_BKF_SHIFT)   /* 0100: fSAMPLING=fDTS/2, N=6 */
+#  define GTIM_BDTR_BKF_FDTSd28   (5 << GTIM_BDTR_BKF_SHIFT)   /* 0101: fSAMPLING=fDTS/2, N=8 */
+#  define GTIM_BDTR_BKF_FDTSd36   (6 << GTIM_BDTR_BKF_SHIFT)   /* 0110: fSAMPLING=fDTS/4, N=6 */
+#  define GTIM_BDTR_BKF_FDTSd38   (7 << GTIM_BDTR_BKF_SHIFT)   /* 0111: fSAMPLING=fDTS/4, N=8 */
+#  define GTIM_BDTR_BKF_FDTSd86   (8 << GTIM_BDTR_BKF_SHIFT)   /* 1000: fSAMPLING=fDTS/8, N=6 */
+#  define GTIM_BDTR_BKF_FDTSd88   (9 << GTIM_BDTR_BKF_SHIFT)   /* 1001: fSAMPLING=fDTS/8, N=8 */
+#  define GTIM_BDTR_BKF_FDTSd165  (10 << GTIM_BDTR_BKF_SHIFT)  /* 1010: fSAMPLING=fDTS/16, N=5 */
+#  define GTIM_BDTR_BKF_FDTSd166  (11 << GTIM_BDTR_BKF_SHIFT)  /* 1011: fSAMPLING=fDTS/16, N=6 */
+#  define GTIM_BDTR_BKF_FDTSd168  (12 << GTIM_BDTR_BKF_SHIFT)  /* 1100: fSAMPLING=fDTS/16, N=8 */
+#  define GTIM_BDTR_BKF_FDTSd325  (13 << GTIM_BDTR_BKF_SHIFT)  /* 1101: fSAMPLING=fDTS/32, N=5 */
+#  define GTIM_BDTR_BKF_FDTSd326  (14 << GTIM_BDTR_BKF_SHIFT)  /* 1110: fSAMPLING=fDTS/32, N=6 */
+#  define GTIM_BDTR_BKF_FDTSd328  (15 << GTIM_BDTR_BKF_SHIFT)  /* 1111: fSAMPLING=fDTS/32, N=8 */
+
+/* DMA control register */
+
+#define GTIM_DCR_DBA_SHIFT        (0)       /* Bits 4-0: DMA Base Address */
+#define GTIM_DCR_DBA_MASK         (0x1f << GTIM_DCR_DBA_SHIFT)
+#define GTIM_DCR_DBL_SHIFT        (8)       /* Bits 12-8: DMA Burst Length */
+#define GTIM_DCR_DBL_MASK         (0x1f << GTIM_DCR_DBL_SHIFT)
+
+/* Control register 1 */
+
+#define BTIM_CR1_CEN              (1 << 0)  /* Bit 0: Counter enable */
+#define BTIM_CR1_UDIS             (1 << 1)  /* Bit 1: Update Disable */
+#define BTIM_CR1_URS              (1 << 2)  /* Bit 2: Update Request Source */
+#define BTIM_CR1_OPM              (1 << 3)  /* Bit 3: One Pulse Mode */
+#define BTIM_CR1_ARPE             (1 << 7)  /* Bit 7: Auto-Reload Preload enable */
+
+/* Control register 2 */
+
+#define BTIM_CR2_MMS_SHIFT        (4)       /* Bits 6-4: Master Mode Selection */
+#define BTIM_CR2_MMS_MASK         (7 << BTIM_CR2_MMS_SHIFT)
+#  define BTIM_CR2_RESET          (0 << BTIM_CR2_MMS_SHIFT) /* 000: Reset */
+#  define BTIM_CR2_ENAB           (1 << BTIM_CR2_MMS_SHIFT) /* 001: Enable */
+#  define BTIM_CR2_UPDT           (2 << BTIM_CR2_MMS_SHIFT) /* 010: Update */
+
+/* DMA/Interrupt enable register */
+
+#define BTIM_DIER_UIE             (1 << 0)  /* Bit 0: Update interrupt enable */
+#define BTIM_DIER_UDE             (1 << 8)  /* Bit 8: Update DMA request enable */
+
+/* Status register */
+
+#define BTIM_SR_UIF               (1 << 0)  /* Bit 0: Update interrupt flag */
+
+/* Event generation register */
+
+#define BTIM_EGR_UG               (1 << 0)  /* Bit 0: Update generation */
+
+#endif /* __ARCH_ARM_SRC_STM32L4_CHIP_STM32L4_TIM_H */
-- 
GitLab


From af236d478445de457534a84b7de345359199eb53 Mon Sep 17 00:00:00 2001
From: ziggurat29 
Date: Fri, 8 Jul 2016 17:30:55 -0500
Subject: [PATCH 183/229] STM32L4: add support for tickless OS, and
 incidentally timers, pwm, oneshot, free-running....

---
 arch/arm/Kconfig                             |    1 +
 arch/arm/src/stm32l4/Kconfig                 | 2055 +++++++++++++++++-
 arch/arm/src/stm32l4/Make.defs               |   19 +
 arch/arm/src/stm32l4/stm32l4_freerun.c       |  297 +++
 arch/arm/src/stm32l4/stm32l4_freerun.h       |  159 ++
 arch/arm/src/stm32l4/stm32l4_oneshot.c       |  416 ++++
 arch/arm/src/stm32l4/stm32l4_oneshot.h       |  190 ++
 arch/arm/src/stm32l4/stm32l4_pwm.c           | 2052 +++++++++++++++++
 arch/arm/src/stm32l4/stm32l4_pwm.h           |  679 ++++++
 arch/arm/src/stm32l4/stm32l4_tickless.c      |  351 +++
 arch/arm/src/stm32l4/stm32l4_tim.c           | 1463 +++++++++++++
 arch/arm/src/stm32l4/stm32l4_tim.h           |  223 ++
 arch/arm/src/stm32l4/stm32l4_tim_lowerhalf.c |  668 ++++++
 13 files changed, 8465 insertions(+), 108 deletions(-)
 create mode 100644 arch/arm/src/stm32l4/stm32l4_freerun.c
 create mode 100644 arch/arm/src/stm32l4/stm32l4_freerun.h
 create mode 100644 arch/arm/src/stm32l4/stm32l4_oneshot.c
 create mode 100644 arch/arm/src/stm32l4/stm32l4_oneshot.h
 create mode 100644 arch/arm/src/stm32l4/stm32l4_pwm.c
 create mode 100644 arch/arm/src/stm32l4/stm32l4_pwm.h
 create mode 100644 arch/arm/src/stm32l4/stm32l4_tickless.c
 create mode 100644 arch/arm/src/stm32l4/stm32l4_tim.c
 create mode 100644 arch/arm/src/stm32l4/stm32l4_tim_lowerhalf.c

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 12af0d6056..8728230276 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -251,6 +251,7 @@ config ARCH_CHIP_STM32L4
 	select ARM_HAVE_MPU_UNIFIED
 	select ARCH_HAVE_I2CRESET
 	select ARCH_HAVE_HEAPCHECK
+	select ARCH_HAVE_TICKLESS
 	select ARMV7M_HAVE_STACKCHECK
 	---help---
 		STMicro STM32 architectures (ARM Cortex-M4).
diff --git a/arch/arm/src/stm32l4/Kconfig b/arch/arm/src/stm32l4/Kconfig
index 143230fa5b..66be03660c 100644
--- a/arch/arm/src/stm32l4/Kconfig
+++ b/arch/arm/src/stm32l4/Kconfig
@@ -69,7 +69,7 @@ config STM32L4_FLASH_1024KB
 
 endchoice # Embedded FLASH size
 
-comment "SRAM2 Options"
+comment "STM32L4 SRAM2 Options"
 
 config STM32L4_SRAM2_HEAP
 	bool "SRAM2 is used for heap"
@@ -97,6 +97,8 @@ config STM32L4_SRAM2_INIT
 		case, the board should handle the initialization itself at the appropriate
 		time.
 
+comment "STM32L4 Peripherals"
+
 menu "STM32L4 Peripheral Support"
 
 # These "hidden" settings determine is a peripheral option is available for the
@@ -630,161 +632,1998 @@ config STM32L4_SAI2PLL
 config STM32L4_USART
 	bool
 
-menu "U[S]ART Configuration"
-	depends on STM32L4_USART
+menu "Timer Configuration"
 
-config USART1_RS485
-	bool "RS-485 on USART1"
+if SCHED_TICKLESS
+
+config STM32L4_ONESHOT
+	bool
+	default y
+
+config STM32L4_FREERUN
+	bool
+	default y
+
+endif # SCHED_TICKLESS
+
+if !SCHED_TICKLESS
+
+config STM32L4_ONESHOT
+	bool "TIM one-shot wrapper"
 	default n
-	depends on STM32L4_USART1
 	---help---
-		Enable RS-485 interface on USART1. Your board config will have to
-		provide GPIO_USART1_RS485_DIR pin definition. Currently it cannot be
-		used with USART1_RXDMA.
+		Enable a wrapper around the low level timer/counter functions to
+		support one-shot timer.
 
-config USART1_RS485_DIR_POLARITY
-	int "USART1 RS-485 DIR pin polarity"
-	default 1
-	range 0 1
-	depends on USART1_RS485
+config STM32L4_FREERUN
+	bool "TIM free-running wrapper"
+	default n
 	---help---
-		Polarity of DIR pin for RS-485 on USART1. Set to state on DIR pin which
-		enables TX (0 - low / nTXEN, 1 - high / TXEN).
+		Enable a wrapper around the low level timer/counter functions to
+		support a free-running timer.
 
-config USART1_RXDMA
-	bool "USART1 Rx DMA"
+endif # !SCHED_TICKLESS
+
+config STM32L4_TICKLESS_ONESHOT
+	int "Tickless one-shot timer channel"
+	default 2
+	range 1 8
+	depends on STM32L4_ONESHOT
+	---help---
+		If the Tickless OS feature is enabled, then one clock must be
+		assigned to provide the one-shot timer needed by the OS.
+
+config STM32L4_TICKLESS_FREERUN
+	int "Tickless free-running timer channel"
+	default 5
+	range 1 8
+	depends on STM32L4_FREERUN
+	---help---
+		If the Tickless OS feature is enabled, then one clock must be
+		assigned to provide the free-running timer needed by the OS.
+
+config STM32L4_TIM1_PWM
+	bool "TIM1 PWM"
 	default n
-	depends on STM32L4_USART1 && ( STM32L4_DMA1 || STM32L4_DMA2 )
+	depends on STM32L4_TIM1
+	select ARCH_HAVE_PWM_PULSECOUNT
 	---help---
-		In high data rate usage, Rx DMA may eliminate Rx overrun errors
+		Reserve timer 1 for use by PWM
 
-config USART2_RS485
-	bool "RS-485 on USART2"
+		Timer devices may be used for different purposes.  One special purpose is
+		to generate modulated outputs for such things as motor control.  If STM32L4_TIM1
+		is defined then THIS following may also be defined to indicate that
+		the timer is intended to be used for pulsed output modulation.
+
+if STM32L4_TIM1_PWM
+
+config STM32L4_TIM1_MODE
+	int "TIM1 Mode"
+	default 0
+	range 0 4
+	---help---
+		Specifies the timer mode.
+
+if STM32L4_PWM_MULTICHAN
+
+config STM32L4_TIM1_CHANNEL1
+	bool "TIM1 Channel 1"
 	default n
-	depends on STM32L4_USART2
 	---help---
-		Enable RS-485 interface on USART2. Your board config will have to
-		provide GPIO_USART2_RS485_DIR pin definition. Currently it cannot be
-		used with USART2_RXDMA.
+		Enables channel 1.
 
-config USART2_RS485_DIR_POLARITY
-	int "USART2 RS-485 DIR pin polarity"
-	default 1
-	range 0 1
-	depends on USART2_RS485
+if STM32L4_TIM1_CHANNEL1
+
+config STM32L4_TIM1_CH1MODE
+	int "TIM1 Channel 1 Mode"
+	default 0
+	range 0 5 if STM32_STM32F30XX
+	range 0 1 if !STM32_STM32F30XX
 	---help---
-		Polarity of DIR pin for RS-485 on USART2. Set to state on DIR pin which
-		enables TX (0 - low / nTXEN, 1 - high / TXEN).
+		Specifies the channel mode.
 
-config USART2_RXDMA
-	bool "USART2 Rx DMA"
+config STM32L4_TIM1_CH1OUT
+	bool "TIM1 Channel 1 Output"
 	default n
-	depends on STM32L4_USART2 && STM32L4_DMA1
 	---help---
-		In high data rate usage, Rx DMA may eliminate Rx overrun errors
+		Enables channel 1 output.
 
-config USART3_RS485
-	bool "RS-485 on USART3"
+endif # STM32L4_TIM1_CHANNEL1
+
+config STM32L4_TIM1_CHANNEL2
+	bool "TIM1 Channel 2"
 	default n
-	depends on STM32L4_USART3
 	---help---
-		Enable RS-485 interface on USART3. Your board config will have to
-		provide GPIO_USART3_RS485_DIR pin definition. Currently it cannot be
-		used with USART3_RXDMA.
+		Enables channel 2.
 
-config USART3_RS485_DIR_POLARITY
-	int "USART3 RS-485 DIR pin polarity"
-	default 1
-	range 0 1
-	depends on USART3_RS485
+if STM32L4_TIM1_CHANNEL2
+
+config STM32L4_TIM1_CH2MODE
+	int "TIM1 Channel 2 Mode"
+	default 0
+	range 0 5 if STM32_STM32F30XX
+	range 0 1 if !STM32_STM32F30XX
 	---help---
-		Polarity of DIR pin for RS-485 on USART3. Set to state on DIR pin which
-		enables TX (0 - low / nTXEN, 1 - high / TXEN).
+		Specifies the channel mode.
 
-config USART3_RXDMA
-	bool "USART3 Rx DMA"
+config STM32L4_TIM1_CH2OUT
+	bool "TIM1 Channel 2 Output"
 	default n
-	depends on STM32L4_USART3 && STM32L4_DMA1
 	---help---
-		In high data rate usage, Rx DMA may eliminate Rx overrun errors
+		Enables channel 2 output.
 
-config UART4_RS485
-	bool "RS-485 on UART4"
+endif # STM32L4_TIM1_CHANNEL2
+
+config STM32L4_TIM1_CHANNEL3
+	bool "TIM1 Channel 3"
 	default n
-	depends on STM32L4_UART4
 	---help---
-		Enable RS-485 interface on UART4. Your board config will have to
-		provide GPIO_UART4_RS485_DIR pin definition. Currently it cannot be
-		used with UART4_RXDMA.
+		Enables channel 3.
 
-config UART4_RS485_DIR_POLARITY
-	int "UART4 RS-485 DIR pin polarity"
+if STM32L4_TIM1_CHANNEL3
+
+config STM32L4_TIM1_CH3MODE
+	int "TIM1 Channel 3 Mode"
+	default 0
+	range 0 5 if STM32_STM32F30XX
+	range 0 1 if !STM32_STM32F30XX
+	---help---
+		Specifies the channel mode.
+
+config STM32L4_TIM1_CH3OUT
+	bool "TIM1 Channel 3 Output"
+	default n
+	---help---
+		Enables channel 3 output.
+
+endif # STM32L4_TIM1_CHANNEL3
+
+config STM32L4_TIM1_CHANNEL4
+	bool "TIM1 Channel 4"
+	default n
+	---help---
+		Enables channel 4.
+
+if STM32L4_TIM1_CHANNEL4
+
+config STM32L4_TIM1_CH4MODE
+	int "TIM1 Channel 4 Mode"
+	default 0
+	range 0 5 if STM32_STM32F30XX
+	range 0 1 if !STM32_STM32F30XX
+	---help---
+		Specifies the channel mode.
+
+config STM32L4_TIM1_CH4OUT
+	bool "TIM1 Channel 4 Output"
+	default n
+	---help---
+		Enables channel 4 output.
+
+endif # STM32L4_TIM1_CHANNEL4
+
+endif # STM32L4_PWM_MULTICHAN
+
+if !STM32L4_PWM_MULTICHAN
+
+config STM32L4_TIM1_CHANNEL
+	int "TIM1 PWM Output Channel"
 	default 1
-	range 0 1
-	depends on UART4_RS485
+	range 1 4
 	---help---
-		Polarity of DIR pin for RS-485 on UART4. Set to state on DIR pin which
-		enables TX (0 - low / nTXEN, 1 - high / TXEN).
+		If TIM1 is enabled for PWM usage, you also need specifies the timer output
+		channel {1,..,4}
 
-config UART4_RXDMA
-	bool "UART4 Rx DMA"
+config STM32L4_TIM1_CHMODE
+	int "TIM1 Channel Mode"
+	default 0
+	range 0 5 if STM32_STM32F30XX
+	range 0 1 if !STM32_STM32F30XX
+	---help---
+		Specifies the channel mode.
+
+endif # !STM32L4_PWM_MULTICHAN
+
+endif # STM32L4_TIM1_PWM
+
+config STM32L4_TIM2_PWM
+	bool "TIM2 PWM"
 	default n
-	depends on STM32L4_UART4 && STM32L4_DMA2
+	depends on STM32L4_TIM2
+	select ARCH_HAVE_PWM_PULSECOUNT
 	---help---
-		In high data rate usage, Rx DMA may eliminate Rx overrun errors
+		Reserve timer 2 for use by PWM
 
-config UART5_RS485
-	bool "RS-485 on UART5"
+		Timer devices may be used for different purposes.  One special purpose is
+		to generate modulated outputs for such things as motor control.  If STM32L4_TIM2
+		is defined then THIS following may also be defined to indicate that
+		the timer is intended to be used for pulsed output modulation.
+
+if STM32L4_TIM2_PWM
+
+config STM32L4_TIM2_MODE
+	int "TIM2 Mode"
+	default 0
+	range 0 4
+	---help---
+		Specifies the timer mode.
+
+if STM32L4_PWM_MULTICHAN
+
+config STM32L4_TIM2_CHANNEL1
+	bool "TIM2 Channel 1"
 	default n
-	depends on STM32L4_UART5
 	---help---
-		Enable RS-485 interface on UART5. Your board config will have to
-		provide GPIO_UART5_RS485_DIR pin definition. Currently it cannot be
-		used with UART5_RXDMA.
+		Enables channel 1.
 
-config UART5_RS485_DIR_POLARITY
-	int "UART5 RS-485 DIR pin polarity"
+if STM32L4_TIM2_CHANNEL1
+
+config STM32L4_TIM2_CH1MODE
+	int "TIM2 Channel 1 Mode"
+	default 0
+	range 0 5 if STM32_STM32F30XX
+	range 0 1 if !STM32_STM32F30XX
+	---help---
+		Specifies the channel mode.
+
+config STM32L4_TIM2_CH1OUT
+	bool "TIM2 Channel 1 Output"
+	default n
+	---help---
+		Enables channel 1 output.
+
+endif # STM32L4_TIM2_CHANNEL1
+
+config STM32L4_TIM2_CHANNEL2
+	bool "TIM2 Channel 2"
+	default n
+	---help---
+		Enables channel 2.
+
+if STM32L4_TIM2_CHANNEL2
+
+config STM32L4_TIM2_CH2MODE
+	int "TIM2 Channel 2 Mode"
+	default 0
+	range 0 5 if STM32_STM32F30XX
+	range 0 1 if !STM32_STM32F30XX
+	---help---
+		Specifies the channel mode.
+
+config STM32L4_TIM2_CH2OUT
+	bool "TIM2 Channel 2 Output"
+	default n
+	---help---
+		Enables channel 2 output.
+
+endif # STM32L4_TIM2_CHANNEL2
+
+config STM32L4_TIM2_CHANNEL3
+	bool "TIM2 Channel 3"
+	default n
+	---help---
+		Enables channel 3.
+
+if STM32L4_TIM2_CHANNEL3
+
+config STM32L4_TIM2_CH3MODE
+	int "TIM2 Channel 3 Mode"
+	default 0
+	range 0 5 if STM32_STM32F30XX
+	range 0 1 if !STM32_STM32F30XX
+	---help---
+		Specifies the channel mode.
+
+config STM32L4_TIM2_CH3OUT
+	bool "TIM2 Channel 3 Output"
+	default n
+	---help---
+		Enables channel 3 output.
+
+endif # STM32L4_TIM2_CHANNEL3
+
+config STM32L4_TIM2_CHANNEL4
+	bool "TIM2 Channel 4"
+	default n
+	---help---
+		Enables channel 4.
+
+if STM32L4_TIM2_CHANNEL4
+
+config STM32L4_TIM2_CH4MODE
+	int "TIM2 Channel 4 Mode"
+	default 0
+	range 0 5 if STM32_STM32F30XX
+	range 0 1 if !STM32_STM32F30XX
+	---help---
+		Specifies the channel mode.
+
+config STM32L4_TIM2_CH4OUT
+	bool "TIM2 Channel 4 Output"
+	default n
+	---help---
+		Enables channel 4 output.
+
+endif # STM32L4_TIM2_CHANNEL4
+
+endif # STM32L4_PWM_MULTICHAN
+
+if !STM32L4_PWM_MULTICHAN
+
+config STM32L4_TIM2_CHANNEL
+	int "TIM2 PWM Output Channel"
 	default 1
-	range 0 1
-	depends on UART5_RS485
+	range 1 4
 	---help---
-		Polarity of DIR pin for RS-485 on UART5. Set to state on DIR pin which
-		enables TX (0 - low / nTXEN, 1 - high / TXEN).
+		If TIM2 is enabled for PWM usage, you also need specifies the timer output
+		channel {1,..,4}
 
-config UART5_RXDMA
-	bool "UART5 Rx DMA"
+config STM32L4_TIM2_CHMODE
+	int "TIM2 Channel Mode"
+	default 0
+	range 0 5 if STM32_STM32F30XX
+	range 0 1 if !STM32_STM32F30XX
+	---help---
+		Specifies the channel mode.
+
+endif # !STM32L4_PWM_MULTICHAN
+
+endif # STM32L4_TIM2_PWM
+
+config STM32L4_TIM3_PWM
+	bool "TIM3 PWM"
 	default n
-	depends on STM32L4_UART5 && STM32L4_DMA2
+	depends on STM32L4_TIM3
+	select ARCH_HAVE_PWM_PULSECOUNT
 	---help---
-		In high data rate usage, Rx DMA may eliminate Rx overrun errors
+		Reserve timer 3 for use by PWM
 
-config SERIAL_DISABLE_REORDERING
-	bool "Disable reordering of ttySx devices."
-	depends on STM32L4_USART1 || STM32L4_USART2 || STM32L4_USART3 || STM32L4_UART4 || STM32L4_UART5
+		Timer devices may be used for different purposes.  One special purpose is
+		to generate modulated outputs for such things as motor control.  If STM32L4_TIM3
+		is defined then THIS following may also be defined to indicate that
+		the timer is intended to be used for pulsed output modulation.
+
+if STM32L4_TIM3_PWM
+
+config STM32L4_TIM3_MODE
+	int "TIM3 Mode"
+	default 0
+	range 0 4
+	---help---
+		Specifies the timer mode.
+
+if STM32L4_PWM_MULTICHAN
+
+config STM32L4_TIM3_CHANNEL1
+	bool "TIM3 Channel 1"
 	default n
 	---help---
-		NuttX per default reorders the serial ports (/dev/ttySx) so that the
-		console is always on /dev/ttyS0. If more than one UART is in use this
-		can, however, have the side-effect that all port mappings
-		(hardware USART1 -> /dev/ttyS0) change if the console is moved to another
-		UART. This is in particular relevant if a project uses the USB console
-		in some configs and a serial console in other configs, but does not
-		want the side effect of having all serial port names change when just
-		the console is moved from serial to USB.
+		Enables channel 1.
 
-config STM32L4_FLOWCONTROL_BROKEN
-	bool "Use Software UART RTS flow control"
-	depends on STM32L4_USART
+if STM32L4_TIM3_CHANNEL1
+
+config STM32L4_TIM3_CH1MODE
+	int "TIM3 Channel 1 Mode"
+	default 0
+	range 0 5 if STM32_STM32F30XX
+	range 0 1 if !STM32_STM32F30XX
+	---help---
+		Specifies the channel mode.
+
+config STM32L4_TIM3_CH1OUT
+	bool "TIM3 Channel 1 Output"
 	default n
 	---help---
-		Enable UART RTS flow control using Software. Because STM
-		Current STM32 have broken HW based RTS behavior (they assert
-		nRTS after every byte received)  Enable this setting workaround
-		this issue by useing software based management of RTS
+		Enables channel 1 output.
 
-config STM32L4_USART_BREAKS
-	bool "Add TIOxSBRK to support sending Breaks"
-	depends on STM32_USART
+endif # STM32L4_TIM3_CHANNEL1
+
+config STM32L4_TIM3_CHANNEL2
+	bool "TIM3 Channel 2"
+	default n
+	---help---
+		Enables channel 2.
+
+if STM32L4_TIM3_CHANNEL2
+
+config STM32L4_TIM3_CH2MODE
+	int "TIM3 Channel 2 Mode"
+	default 0
+	range 0 5 if STM32_STM32F30XX
+	range 0 1 if !STM32_STM32F30XX
+	---help---
+		Specifies the channel mode.
+
+config STM32L4_TIM3_CH2OUT
+	bool "TIM3 Channel 2 Output"
+	default n
+	---help---
+		Enables channel 2 output.
+
+endif # STM32L4_TIM3_CHANNEL2
+
+config STM32L4_TIM3_CHANNEL3
+	bool "TIM3 Channel 3"
+	default n
+	---help---
+		Enables channel 3.
+
+if STM32L4_TIM3_CHANNEL3
+
+config STM32L4_TIM3_CH3MODE
+	int "TIM3 Channel 3 Mode"
+	default 0
+	range 0 5 if STM32_STM32F30XX
+	range 0 1 if !STM32_STM32F30XX
+	---help---
+		Specifies the channel mode.
+
+config STM32L4_TIM3_CH3OUT
+	bool "TIM3 Channel 3 Output"
+	default n
+	---help---
+		Enables channel 3 output.
+
+endif # STM32L4_TIM3_CHANNEL3
+
+config STM32L4_TIM3_CHANNEL4
+	bool "TIM3 Channel 4"
+	default n
+	---help---
+		Enables channel 4.
+
+if STM32L4_TIM3_CHANNEL4
+
+config STM32L4_TIM3_CH4MODE
+	int "TIM3 Channel 4 Mode"
+	default 0
+	range 0 5 if STM32_STM32F30XX
+	range 0 1 if !STM32_STM32F30XX
+	---help---
+		Specifies the channel mode.
+
+config STM32L4_TIM3_CH4OUT
+	bool "TIM3 Channel 4 Output"
+	default n
+	---help---
+		Enables channel 4 output.
+
+endif # STM32L4_TIM3_CHANNEL4
+
+endif # STM32L4_PWM_MULTICHAN
+
+if !STM32L4_PWM_MULTICHAN
+
+config STM32L4_TIM3_CHANNEL
+	int "TIM3 PWM Output Channel"
+	default 1
+	range 1 4
+	---help---
+		If TIM3 is enabled for PWM usage, you also need specifies the timer output
+		channel {1,..,4}
+
+config STM32L4_TIM3_CHMODE
+	int "TIM3 Channel Mode"
+	default 0
+	range 0 5 if STM32_STM32F30XX
+	range 0 1 if !STM32_STM32F30XX
+	---help---
+		Specifies the channel mode.
+
+endif # !STM32L4_PWM_MULTICHAN
+
+endif # STM32L4_TIM3_PWM
+
+config STM32L4_TIM4_PWM
+	bool "TIM4 PWM"
+	default n
+	depends on STM32L4_TIM4
+	select ARCH_HAVE_PWM_PULSECOUNT
+	---help---
+		Reserve timer 4 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 STM32L4_TIM4
+		is defined then THIS following may also be defined to indicate that
+		the timer is intended to be used for pulsed output modulation.
+
+if STM32L4_TIM4_PWM
+
+config STM32L4_TIM4_MODE
+	int "TIM4 Mode"
+	default 0
+	range 0 4
+	---help---
+		Specifies the timer mode.
+
+if STM32L4_PWM_MULTICHAN
+
+config STM32L4_TIM4_CHANNEL1
+	bool "TIM4 Channel 1"
+	default n
+	---help---
+		Enables channel 1.
+
+if STM32L4_TIM4_CHANNEL1
+
+config STM32L4_TIM4_CH1MODE
+	int "TIM4 Channel 1 Mode"
+	default 0
+	range 0 5 if STM32_STM32F30XX
+	range 0 1 if !STM32_STM32F30XX
+	---help---
+		Specifies the channel mode.
+
+config STM32L4_TIM4_CH1OUT
+	bool "TIM4 Channel 1 Output"
+	default n
+	---help---
+		Enables channel 1 output.
+
+endif # STM32L4_TIM4_CHANNEL1
+
+config STM32L4_TIM4_CHANNEL2
+	bool "TIM4 Channel 2"
+	default n
+	---help---
+		Enables channel 2.
+
+if STM32L4_TIM4_CHANNEL2
+
+config STM32L4_TIM4_CH2MODE
+	int "TIM4 Channel 2 Mode"
+	default 0
+	range 0 5 if STM32_STM32F30XX
+	range 0 1 if !STM32_STM32F30XX
+	---help---
+		Specifies the channel mode.
+
+config STM32L4_TIM4_CH2OUT
+	bool "TIM4 Channel 2 Output"
+	default n
+	---help---
+		Enables channel 2 output.
+
+endif # STM32L4_TIM4_CHANNEL2
+
+config STM32L4_TIM4_CHANNEL3
+	bool "TIM4 Channel 3"
+	default n
+	---help---
+		Enables channel 3.
+
+if STM32L4_TIM4_CHANNEL3
+
+config STM32L4_TIM4_CH3MODE
+	int "TIM4 Channel 3 Mode"
+	default 0
+	range 0 5 if STM32_STM32F30XX
+	range 0 1 if !STM32_STM32F30XX
+	---help---
+		Specifies the channel mode.
+
+config STM32L4_TIM4_CH3OUT
+	bool "TIM4 Channel 3 Output"
+	default n
+	---help---
+		Enables channel 3 output.
+
+endif # STM32L4_TIM4_CHANNEL3
+
+config STM32L4_TIM4_CHANNEL4
+	bool "TIM4 Channel 4"
+	default n
+	---help---
+		Enables channel 4.
+
+if STM32L4_TIM4_CHANNEL4
+
+config STM32L4_TIM4_CH4MODE
+	int "TIM4 Channel 4 Mode"
+	default 0
+	range 0 5 if STM32_STM32F30XX
+	range 0 1 if !STM32_STM32F30XX
+	---help---
+		Specifies the channel mode.
+
+config STM32L4_TIM4_CH4OUT
+	bool "TIM4 Channel 4 Output"
+	default n
+	---help---
+		Enables channel 4 output.
+
+endif # STM32L4_TIM4_CHANNEL4
+
+endif # STM32L4_PWM_MULTICHAN
+
+if !STM32L4_PWM_MULTICHAN
+
+config STM32L4_TIM4_CHANNEL
+	int "TIM4 PWM Output Channel"
+	default 1
+	range 1 4
+	---help---
+		If TIM4 is enabled for PWM usage, you also need specifies the timer output
+		channel {1,..,4}
+
+config STM32L4_TIM4_CHMODE
+	int "TIM4 Channel Mode"
+	default 0
+	range 0 5 if STM32_STM32F30XX
+	range 0 1 if !STM32_STM32F30XX
+	---help---
+		Specifies the channel mode.
+
+endif # !STM32L4_PWM_MULTICHAN
+
+endif # STM32L4_TIM4_PWM
+
+config STM32L4_TIM5_PWM
+	bool "TIM5 PWM"
+	default n
+	depends on STM32L4_TIM5
+	select ARCH_HAVE_PWM_PULSECOUNT
+	---help---
+		Reserve timer 5 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 STM32L4_TIM5
+		is defined then THIS following may also be defined to indicate that
+		the timer is intended to be used for pulsed output modulation.
+
+if STM32L4_TIM5_PWM
+
+config STM32L4_TIM5_MODE
+	int "TIM5 Mode"
+	default 0
+	range 0 4
+	---help---
+		Specifies the timer mode.
+
+if STM32L4_PWM_MULTICHAN
+
+config STM32L4_TIM5_CHANNEL1
+	bool "TIM5 Channel 1"
+	default n
+	---help---
+		Enables channel 1.
+
+if STM32L4_TIM5_CHANNEL1
+
+config STM32L4_TIM5_CH1MODE
+	int "TIM5 Channel 1 Mode"
+	default 0
+	range 0 5 if STM32_STM32F30XX
+	range 0 1 if !STM32_STM32F30XX
+	---help---
+		Specifies the channel mode.
+
+config STM32L4_TIM5_CH1OUT
+	bool "TIM5 Channel 1 Output"
+	default n
+	---help---
+		Enables channel 1 output.
+
+endif # STM32L4_TIM5_CHANNEL1
+
+config STM32L4_TIM5_CHANNEL2
+	bool "TIM5 Channel 2"
+	default n
+	---help---
+		Enables channel 2.
+
+if STM32L4_TIM5_CHANNEL2
+
+config STM32L4_TIM5_CH2MODE
+	int "TIM5 Channel 2 Mode"
+	default 0
+	range 0 5 if STM32_STM32F30XX
+	range 0 1 if !STM32_STM32F30XX
+	---help---
+		Specifies the channel mode.
+
+config STM32L4_TIM5_CH2OUT
+	bool "TIM5 Channel 2 Output"
+	default n
+	---help---
+		Enables channel 2 output.
+
+endif # STM32L4_TIM5_CHANNEL2
+
+config STM32L4_TIM5_CHANNEL3
+	bool "TIM5 Channel 3"
+	default n
+	---help---
+		Enables channel 3.
+
+if STM32L4_TIM5_CHANNEL3
+
+config STM32L4_TIM5_CH3MODE
+	int "TIM5 Channel 3 Mode"
+	default 0
+	range 0 5 if STM32_STM32F30XX
+	range 0 1 if !STM32_STM32F30XX
+	---help---
+		Specifies the channel mode.
+
+config STM32L4_TIM5_CH3OUT
+	bool "TIM5 Channel 3 Output"
+	default n
+	---help---
+		Enables channel 3 output.
+
+endif # STM32L4_TIM5_CHANNEL3
+
+config STM32L4_TIM5_CHANNEL4
+	bool "TIM5 Channel 4"
+	default n
+	---help---
+		Enables channel 4.
+
+if STM32L4_TIM5_CHANNEL4
+
+config STM32L4_TIM5_CH4MODE
+	int "TIM5 Channel 4 Mode"
+	default 0
+	range 0 5 if STM32_STM32F30XX
+	range 0 1 if !STM32_STM32F30XX
+	---help---
+		Specifies the channel mode.
+
+config STM32L4_TIM5_CH4OUT
+	bool "TIM5 Channel 4 Output"
+	default n
+	---help---
+		Enables channel 4 output.
+
+endif # STM32L4_TIM5_CHANNEL4
+
+endif # STM32L4_PWM_MULTICHAN
+
+if !STM32L4_PWM_MULTICHAN
+
+config STM32L4_TIM5_CHANNEL
+	int "TIM5 PWM Output Channel"
+	default 1
+	range 1 4
+	---help---
+		If TIM5 is enabled for PWM usage, you also need specifies the timer output
+		channel {1,..,4}
+
+config STM32L4_TIM5_CHMODE
+	int "TIM5 Channel Mode"
+	default 0
+	range 0 5 if STM32_STM32F30XX
+	range 0 1 if !STM32_STM32F30XX
+	---help---
+		Specifies the channel mode.
+
+endif # !STM32L4_PWM_MULTICHAN
+
+endif # STM32L4_TIM5_PWM
+
+config STM32L4_TIM8_PWM
+	bool "TIM8 PWM"
+	default n
+	depends on STM32L4_TIM8
+	select ARCH_HAVE_PWM_PULSECOUNT
+	---help---
+		Reserve timer 8 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 STM32L4_TIM8
+		is defined then THIS following may also be defined to indicate that
+		the timer is intended to be used for pulsed output modulation.
+
+if STM32L4_TIM8_PWM
+
+config STM32L4_TIM8_MODE
+	int "TIM8 Mode"
+	default 0
+	range 0 4
+	---help---
+		Specifies the timer mode.
+
+if STM32L4_PWM_MULTICHAN
+
+config STM32L4_TIM8_CHANNEL1
+	bool "TIM8 Channel 1"
+	default n
+	---help---
+		Enables channel 1.
+
+if STM32L4_TIM8_CHANNEL1
+
+config STM32L4_TIM8_CH1MODE
+	int "TIM8 Channel 1 Mode"
+	default 0
+	range 0 5 if STM32_STM32F30XX
+	range 0 1 if !STM32_STM32F30XX
+	---help---
+		Specifies the channel mode.
+
+config STM32L4_TIM8_CH1OUT
+	bool "TIM8 Channel 1 Output"
+	default n
+	---help---
+		Enables channel 1 output.
+
+endif # STM32L4_TIM8_CHANNEL1
+
+config STM32L4_TIM8_CHANNEL2
+	bool "TIM8 Channel 2"
+	default n
+	---help---
+		Enables channel 2.
+
+if STM32L4_TIM8_CHANNEL2
+
+config STM32L4_TIM8_CH2MODE
+	int "TIM8 Channel 2 Mode"
+	default 0
+	range 0 5 if STM32_STM32F30XX
+	range 0 1 if !STM32_STM32F30XX
+	---help---
+		Specifies the channel mode.
+
+config STM32L4_TIM8_CH2OUT
+	bool "TIM8 Channel 2 Output"
+	default n
+	---help---
+		Enables channel 2 output.
+
+endif # STM32L4_TIM8_CHANNEL2
+
+config STM32L4_TIM8_CHANNEL3
+	bool "TIM8 Channel 3"
+	default n
+	---help---
+		Enables channel 3.
+
+if STM32L4_TIM8_CHANNEL3
+
+config STM32L4_TIM8_CH3MODE
+	int "TIM8 Channel 3 Mode"
+	default 0
+	range 0 5 if STM32_STM32F30XX
+	range 0 1 if !STM32_STM32F30XX
+	---help---
+		Specifies the channel mode.
+
+config STM32L4_TIM8_CH3OUT
+	bool "TIM8 Channel 3 Output"
+	default n
+	---help---
+		Enables channel 3 output.
+
+endif # STM32L4_TIM8_CHANNEL3
+
+config STM32L4_TIM8_CHANNEL4
+	bool "TIM8 Channel 4"
+	default n
+	---help---
+		Enables channel 4.
+
+if STM32L4_TIM8_CHANNEL4
+
+config STM32L4_TIM8_CH4MODE
+	int "TIM8 Channel 4 Mode"
+	default 0
+	range 0 5 if STM32_STM32F30XX
+	range 0 1 if !STM32_STM32F30XX
+	---help---
+		Specifies the channel mode.
+
+config STM32L4_TIM8_CH4OUT
+	bool "TIM8 Channel 4 Output"
+	default n
+	---help---
+		Enables channel 4 output.
+
+endif # STM32L4_TIM8_CHANNEL4
+
+endif # STM32L4_PWM_MULTICHAN
+
+if !STM32L4_PWM_MULTICHAN
+
+config STM32L4_TIM8_CHANNEL
+	int "TIM8 PWM Output Channel"
+	default 1
+	range 1 4
+	---help---
+		If TIM8 is enabled for PWM usage, you also need specifies the timer output
+		channel {1,..,4}
+
+config STM32L4_TIM8_CHMODE
+	int "TIM8 Channel Mode"
+	default 0
+	range 0 5 if STM32_STM32F30XX
+	range 0 1 if !STM32_STM32F30XX
+	---help---
+		Specifies the channel mode.
+
+endif # !STM32L4_PWM_MULTICHAN
+
+endif # STM32L4_TIM8_PWM
+
+config STM32L4_TIM15_PWM
+	bool "TIM15 PWM"
+	default n
+	depends on STM32L4_TIM15
+	---help---
+		Reserve timer 15 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 STM32L4_TIM15
+		is defined then THIS following may also be defined to indicate that
+		the timer is intended to be used for pulsed output modulation.
+
+if STM32L4_TIM15_PWM
+
+if STM32L4_PWM_MULTICHAN
+
+config STM32L4_TIM15_CHANNEL1
+	bool "TIM15 Channel 1"
+	default n
+	---help---
+		Enables channel 1.
+
+if STM32L4_TIM15_CHANNEL1
+
+config STM32L4_TIM15_CH1MODE
+	int "TIM15 Channel 1 Mode"
+	default 0
+	range 0 3 if STM32_STM32F30XX
+	range 0 1 if !STM32_STM32F30XX
+	---help---
+		Specifies the channel mode.
+
+config STM32L4_TIM15_CH1OUT
+	bool "TIM15 Channel 1 Output"
+	default n
+	---help---
+		Enables channel 1 output.
+
+endif # STM32L4_TIM15_CHANNEL1
+
+config STM32L4_TIM15_CHANNEL2
+	bool "TIM15 Channel 2"
+	default n
+	---help---
+		Enables channel 2.
+
+if STM32L4_TIM15_CHANNEL2
+
+config STM32L4_TIM15_CH2MODE
+	int "TIM15 Channel 2 Mode"
+	default 0
+	range 0 3 if STM32_STM32F30XX
+	range 0 1 if !STM32_STM32F30XX
+	---help---
+		Specifies the channel mode.
+
+config STM32L4_TIM15_CH2OUT
+	bool "TIM15 Channel 2 Output"
+	default n
+	---help---
+		Enables channel 2 output.
+
+endif # STM32L4_TIM15_CHANNEL2
+
+endif # STM32L4_PWM_MULTICHAN
+
+if !STM32L4_PWM_MULTICHAN
+
+config STM32L4_TIM15_CHANNEL
+	int "TIM15 PWM Output Channel"
+	default 1
+	range 1 2
+	---help---
+		If TIM15 is enabled for PWM usage, you also need specifies the timer output
+		channel {1,2}
+
+config STM32L4_TIM15_CHMODE
+	int "TIM15 Channel Mode"
+	default 0
+	range 0 3 if STM32_STM32F30XX
+	range 0 1 if !STM32_STM32F30XX
+	---help---
+		Specifies the channel mode.
+
+endif # !STM32L4_PWM_MULTICHAN
+
+endif # STM32L4_TIM15_PWM
+
+config STM32L4_TIM16_PWM
+	bool "TIM16 PWM"
+	default n
+	depends on STM32L4_TIM16
+	---help---
+		Reserve timer 16 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 STM32L4_TIM16
+		is defined then THIS following may also be defined to indicate that
+		the timer is intended to be used for pulsed output modulation.
+
+if STM32L4_TIM16_PWM
+
+if STM32L4_PWM_MULTICHAN
+
+config STM32L4_TIM16_CHANNEL1
+	bool "TIM16 Channel 1"
+	default n
+	---help---
+		Enables channel 1.
+
+if STM32L4_TIM16_CHANNEL1
+
+config STM32L4_TIM16_CH1MODE
+	int "TIM16 Channel 1 Mode"
+	default 0
+	range 0 1
+	---help---
+		Specifies the channel mode.
+
+config STM32L4_TIM16_CH1OUT
+	bool "TIM16 Channel 1 Output"
+	default n
+	---help---
+		Enables channel 1 output.
+
+endif # STM32L4_TIM16_CHANNEL1
+
+endif # STM32L4_PWM_MULTICHAN
+
+if !STM32L4_PWM_MULTICHAN
+
+config STM32L4_TIM16_CHANNEL
+	int "TIM16 PWM Output Channel"
+	default 1
+	range 1 1
+	---help---
+		If TIM16 is enabled for PWM usage, you also need specifies the timer output
+		channel {1}
+
+config STM32L4_TIM16_CHMODE
+	int "TIM16 Channel Mode"
+	default 0
+	range 0 1
+	---help---
+		Specifies the channel mode.
+
+endif # !STM32L4_PWM_MULTICHAN
+
+endif # STM32L4_TIM16_PWM
+
+config STM32L4_TIM17_PWM
+	bool "TIM17 PWM"
+	default n
+	depends on STM32L4_TIM17
+	---help---
+		Reserve timer 17 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 STM32L4_TIM17
+		is defined then THIS following may also be defined to indicate that
+		the timer is intended to be used for pulsed output modulation.
+
+if STM32L4_TIM17_PWM
+
+if STM32L4_PWM_MULTICHAN
+
+config STM32L4_TIM17_CHANNEL1
+	bool "TIM17 Channel 1"
+	default n
+	---help---
+		Enables channel 1.
+
+if STM32L4_TIM17_CHANNEL1
+
+config STM32L4_TIM17_CH1MODE
+	int "TIM17 Channel 1 Mode"
+	default 0
+	range 0 1
+	---help---
+		Specifies the channel mode.
+
+config STM32L4_TIM17_CH1OUT
+	bool "TIM17 Channel 1 Output"
+	default n
+	---help---
+		Enables channel 1 output.
+
+endif # STM32L4_TIM17_CHANNEL1
+
+endif # STM32L4_PWM_MULTICHAN
+
+if !STM32L4_PWM_MULTICHAN
+
+config STM32L4_TIM17_CHANNEL
+	int "TIM17 PWM Output Channel"
+	default 1
+	range 1 1
+	---help---
+		If TIM17 is enabled for PWM usage, you also need specifies the timer output
+		channel {1}
+
+config STM32L4_TIM17_CHMODE
+	int "TIM17 Channel Mode"
+	default 0
+	range 0 1
+	---help---
+		Specifies the channel mode.
+
+endif # !STM32L4_PWM_MULTICHAN
+
+endif # STM32L4_TIM17_PWM
+
+config STM32L4_PWM_MULTICHAN
+	bool "PWM Multiple Output Channels"
+	default n
+	depends on STM32L4_TIM1_PWM || STM32L4_TIM2_PWM || STM32L4_TIM3_PWM || STM32L4_TIM4_PWM || STM32L4_TIM5_PWM || STM32L4_TIM8_PWM || STM32L4_TIM15_PWM || STM32L4_TIM16_PWM || STM32L4_TIM17_PWM
+	select ARCH_HAVE_PWM_MULTICHAN
+	---help---
+		Specifies that the PWM driver supports multiple output
+		channels per timer.
+
+config STM32L4_TIM1_ADC
+	bool "TIM1 ADC"
+	default n
+	depends on STM32L4_TIM1 && STM32L4_ADC
+	---help---
+		Reserve timer 1 for use by ADC
+
+		Timer devices may be used for different purposes.  If STM32L4_TIM1 is
+		defined then the following may also be defined to indicate that the
+		timer is intended to be used for ADC conversion. Note that ADC usage
+		requires two definition:  Not only do you have to assign the timer
+		for used by the ADC, but then you also have to configure which ADC
+		channel it is assigned to.
+
+choice
+	prompt "Select TIM1 ADC channel"
+	default STM32L4_TIM1_ADC1
+	depends on STM32L4_TIM1_ADC
+
+config STM32L4_TIM1_ADC1
+	bool "TIM1 ADC channel 1"
+	depends on STM32L4_ADC1
+	select HAVE_ADC1_TIMER
+	---help---
+		Reserve TIM1 to trigger ADC1
+
+config STM32L4_TIM1_ADC2
+	bool "TIM1 ADC channel 2"
+	depends on STM32L4_ADC2
+	select HAVE_ADC2_TIMER
+	---help---
+		Reserve TIM1 to trigger ADC2
+
+config STM32L4_TIM1_ADC3
+	bool "TIM1 ADC channel 3"
+	depends on STM32L4_ADC3
+	select HAVE_ADC3_TIMER
+	---help---
+		Reserve TIM1 to trigger ADC3
+
+endchoice
+
+config STM32L4_TIM2_ADC
+	bool "TIM2 ADC"
+	default n
+	depends on STM32L4_TIM2 && STM32L4_ADC
+	---help---
+		Reserve timer 1 for use by ADC
+
+		Timer devices may be used for different purposes.  If STM32L4_TIM2 is
+		defined then the following may also be defined to indicate that the
+		timer is intended to be used for ADC conversion. Note that ADC usage
+		requires two definition:  Not only do you have to assign the timer
+		for used by the ADC, but then you also have to configure which ADC
+		channel it is assigned to.
+
+choice
+	prompt "Select TIM2 ADC channel"
+	default STM32L4_TIM2_ADC1
+	depends on STM32L4_TIM2_ADC
+
+config STM32L4_TIM2_ADC1
+	bool "TIM2 ADC channel 1"
+	depends on STM32L4_ADC1
+	select HAVE_ADC1_TIMER
+	---help---
+		Reserve TIM2 to trigger ADC1
+
+config STM32L4_TIM2_ADC2
+	bool "TIM2 ADC channel 2"
+	depends on STM32L4_ADC2
+	select HAVE_ADC2_TIMER
+	---help---
+		Reserve TIM2 to trigger ADC2
+
+config STM32L4_TIM2_ADC3
+	bool "TIM2 ADC channel 3"
+	depends on STM32L4_ADC3
+	select HAVE_ADC3_TIMER
+	---help---
+		Reserve TIM2 to trigger ADC3
+
+endchoice
+
+config STM32L4_TIM3_ADC
+	bool "TIM3 ADC"
+	default n
+	depends on STM32L4_TIM3 && STM32L4_ADC
+	---help---
+		Reserve timer 1 for use by ADC
+
+		Timer devices may be used for different purposes.  If STM32L4_TIM3 is
+		defined then the following may also be defined to indicate that the
+		timer is intended to be used for ADC conversion. Note that ADC usage
+		requires two definition:  Not only do you have to assign the timer
+		for used by the ADC, but then you also have to configure which ADC
+		channel it is assigned to.
+
+choice
+	prompt "Select TIM3 ADC channel"
+	default STM32L4_TIM3_ADC1
+	depends on STM32L4_TIM3_ADC
+
+config STM32L4_TIM3_ADC1
+	bool "TIM3 ADC channel 1"
+	depends on STM32L4_ADC1
+	select HAVE_ADC1_TIMER
+	---help---
+		Reserve TIM3 to trigger ADC1
+
+config STM32L4_TIM3_ADC2
+	bool "TIM3 ADC channel 2"
+	depends on STM32L4_ADC2
+	select HAVE_ADC2_TIMER
+	---help---
+		Reserve TIM3 to trigger ADC2
+
+config STM32L4_TIM3_ADC3
+	bool "TIM3 ADC channel 3"
+	depends on STM32L4_ADC3
+	select HAVE_ADC3_TIMER
+	---help---
+		Reserve TIM3 to trigger ADC3
+
+endchoice
+
+config STM32L4_TIM4_ADC
+	bool "TIM4 ADC"
+	default n
+	depends on STM32L4_TIM4 && STM32L4_ADC
+	---help---
+		Reserve timer 1 for use by ADC
+
+		Timer devices may be used for different purposes.  If STM32L4_TIM4 is
+		defined then the following may also be defined to indicate that the
+		timer is intended to be used for ADC conversion. Note that ADC usage
+		requires two definition:  Not only do you have to assign the timer
+		for used by the ADC, but then you also have to configure which ADC
+		channel it is assigned to.
+
+choice
+	prompt "Select TIM4 ADC channel"
+	default STM32L4_TIM4_ADC1
+	depends on STM32L4_TIM4_ADC
+
+config STM32L4_TIM4_ADC1
+	bool "TIM4 ADC channel 1"
+	depends on STM32L4_ADC1
+	select HAVE_ADC1_TIMER
+	---help---
+		Reserve TIM4 to trigger ADC1
+
+config STM32L4_TIM4_ADC2
+	bool "TIM4 ADC channel 2"
+	depends on STM32L4_ADC2
+	select HAVE_ADC2_TIMER
+	---help---
+		Reserve TIM4 to trigger ADC2
+
+config STM32L4_TIM4_ADC3
+	bool "TIM4 ADC channel 3"
+	depends on STM32L4_ADC3
+	select HAVE_ADC3_TIMER
+	---help---
+		Reserve TIM4 to trigger ADC3
+
+endchoice
+
+config STM32L4_TIM5_ADC
+	bool "TIM5 ADC"
+	default n
+	depends on STM32L4_TIM5 && STM32L4_ADC
+	---help---
+		Reserve timer 1 for use by ADC
+
+		Timer devices may be used for different purposes.  If STM32L4_TIM5 is
+		defined then the following may also be defined to indicate that the
+		timer is intended to be used for ADC conversion. Note that ADC usage
+		requires two definition:  Not only do you have to assign the timer
+		for used by the ADC, but then you also have to configure which ADC
+		channel it is assigned to.
+
+choice
+	prompt "Select TIM5 ADC channel"
+	default STM32L4_TIM5_ADC1
+	depends on STM32L4_TIM5_ADC
+
+config STM32L4_TIM5_ADC1
+	bool "TIM5 ADC channel 1"
+	depends on STM32L4_ADC1
+	select HAVE_ADC1_TIMER
+	---help---
+		Reserve TIM5 to trigger ADC1
+
+config STM32L4_TIM5_ADC2
+	bool "TIM5 ADC channel 2"
+	depends on STM32L4_ADC2
+	select HAVE_ADC2_TIMER
+	---help---
+		Reserve TIM5 to trigger ADC2
+
+config STM32L4_TIM5_ADC3
+	bool "TIM5 ADC channel 3"
+	depends on STM32L4_ADC3
+	select HAVE_ADC3_TIMER
+	---help---
+		Reserve TIM5 to trigger ADC3
+
+endchoice
+
+config STM32L4_TIM8_ADC
+	bool "TIM8 ADC"
+	default n
+	depends on STM32L4_TIM8 && STM32L4_ADC
+	---help---
+		Reserve timer 1 for use by ADC
+
+		Timer devices may be used for different purposes.  If STM32L4_TIM8 is
+		defined then the following may also be defined to indicate that the
+		timer is intended to be used for ADC conversion. Note that ADC usage
+		requires two definition:  Not only do you have to assign the timer
+		for used by the ADC, but then you also have to configure which ADC
+		channel it is assigned to.
+
+choice
+	prompt "Select TIM8 ADC channel"
+	default STM32L4_TIM8_ADC1
+	depends on STM32L4_TIM8_ADC
+
+config STM32L4_TIM8_ADC1
+	bool "TIM8 ADC channel 1"
+	depends on STM32L4_ADC1
+	select HAVE_ADC1_TIMER
+	---help---
+		Reserve TIM8 to trigger ADC1
+
+config STM32L4_TIM8_ADC2
+	bool "TIM8 ADC channel 2"
+	depends on STM32L4_ADC2
+	select HAVE_ADC2_TIMER
+	---help---
+		Reserve TIM8 to trigger ADC2
+
+config STM32L4_TIM8_ADC3
+	bool "TIM8 ADC channel 3"
+	depends on STM32L4_ADC3
+	select HAVE_ADC3_TIMER
+	---help---
+		Reserve TIM8 to trigger ADC3
+
+endchoice
+
+config HAVE_ADC1_TIMER
+	bool
+
+config HAVE_ADC2_TIMER
+	bool
+
+config HAVE_ADC3_TIMER
+	bool
+
+config STM32L4_ADC1_SAMPLE_FREQUENCY
+	int "ADC1 Sampling Frequency"
+	default 100
+	depends on HAVE_ADC1_TIMER
+	---help---
+		ADC1 sampling frequency.  Default:  100Hz
+
+config STM32L4_ADC1_TIMTRIG
+	int "ADC1 Timer Trigger"
+	default 0
+	range 0 4
+	depends on HAVE_ADC1_TIMER
+	---help---
+		Values 0:CC1 1:CC2 2:CC3 3:CC4 4:TRGO
+
+config STM32L4_ADC2_SAMPLE_FREQUENCY
+	int "ADC2 Sampling Frequency"
+	default 100
+	depends on HAVE_ADC2_TIMER
+	---help---
+		ADC2 sampling frequency.  Default:  100Hz
+
+config STM32L4_ADC2_TIMTRIG
+	int "ADC2 Timer Trigger"
+	default 0
+	range 0 4
+	depends on HAVE_ADC2_TIMER
+	---help---
+		Values 0:CC1 1:CC2 2:CC3 3:CC4 4:TRGO
+
+config STM32L4_ADC3_SAMPLE_FREQUENCY
+	int "ADC3 Sampling Frequency"
+	default 100
+	depends on HAVE_ADC3_TIMER
+	---help---
+		ADC3 sampling frequency.  Default:  100Hz
+
+config STM32L4_ADC3_TIMTRIG
+	int "ADC3 Timer Trigger"
+	default 0
+	range 0 4
+	depends on HAVE_ADC3_TIMER
+	---help---
+		Values 0:CC1 1:CC2 2:CC3 3:CC4 4:TRGO
+
+config STM32L4_TIM1_DAC
+	bool "TIM1 DAC"
+	default n
+	depends on STM32L4_TIM1 && STM32L4_DAC
+	---help---
+		Reserve timer 1 for use by DAC
+
+		Timer devices may be used for different purposes.  If STM32L4_TIM1 is
+		defined then the following may also be defined to indicate that the
+		timer is intended to be used for DAC conversion. Note that DAC usage
+		requires two definition:  Not only do you have to assign the timer
+		for used by the DAC, but then you also have to configure which DAC
+		channel it is assigned to.
+
+choice
+	prompt "Select TIM1 DAC channel"
+	default STM32L4_TIM1_DAC1
+	depends on STM32L4_TIM1_DAC
+
+config STM32L4_TIM1_DAC1
+	bool "TIM1 DAC channel 1"
+	---help---
+		Reserve TIM1 to trigger DAC1
+
+config STM32L4_TIM1_DAC2
+	bool "TIM1 DAC channel 2"
+	---help---
+		Reserve TIM1 to trigger DAC2
+
+endchoice
+
+config STM32L4_TIM2_DAC
+	bool "TIM2 DAC"
+	default n
+	depends on STM32L4_TIM2 && STM32L4_DAC
+	---help---
+		Reserve timer 2 for use by DAC
+
+		Timer devices may be used for different purposes.  If STM32L4_TIM2 is
+		defined then the following may also be defined to indicate that the
+		timer is intended to be used for DAC conversion. Note that DAC usage
+		requires two definition:  Not only do you have to assign the timer
+		for used by the DAC, but then you also have to configure which DAC
+		channel it is assigned to.
+
+choice
+	prompt "Select TIM2 DAC channel"
+	default STM32L4_TIM2_DAC1
+	depends on STM32L4_TIM2_DAC
+
+config STM32L4_TIM2_DAC1
+	bool "TIM2 DAC channel 1"
+	---help---
+		Reserve TIM2 to trigger DAC1
+
+config STM32L4_TIM2_DAC2
+	bool "TIM2 DAC channel 2"
+	---help---
+		Reserve TIM2 to trigger DAC2
+
+endchoice
+
+config STM32L4_TIM3_DAC
+	bool "TIM3 DAC"
+	default n
+	depends on STM32L4_TIM3 && STM32L4_DAC
+	---help---
+		Reserve timer 3 for use by DAC
+
+		Timer devices may be used for different purposes.  If STM32L4_TIM3 is
+		defined then the following may also be defined to indicate that the
+		timer is intended to be used for DAC conversion. Note that DAC usage
+		requires two definition:  Not only do you have to assign the timer
+		for used by the DAC, but then you also have to configure which DAC
+		channel it is assigned to.
+
+choice
+	prompt "Select TIM3 DAC channel"
+	default STM32L4_TIM3_DAC1
+	depends on STM32L4_TIM3_DAC
+
+config STM32L4_TIM3_DAC1
+	bool "TIM3 DAC channel 1"
+	---help---
+		Reserve TIM3 to trigger DAC1
+
+config STM32L4_TIM3_DAC2
+	bool "TIM3 DAC channel 2"
+	---help---
+		Reserve TIM3 to trigger DAC2
+
+endchoice
+
+config STM32L4_TIM4_DAC
+	bool "TIM4 DAC"
+	default n
+	depends on STM32L4_TIM4 && STM32L4_DAC
+	---help---
+		Reserve timer 4 for use by DAC
+
+		Timer devices may be used for different purposes.  If STM32L4_TIM4 is
+		defined then the following may also be defined to indicate that the
+		timer is intended to be used for DAC conversion. Note that DAC usage
+		requires two definition:  Not only do you have to assign the timer
+		for used by the DAC, but then you also have to configure which DAC
+		channel it is assigned to.
+
+choice
+	prompt "Select TIM4 DAC channel"
+	default STM32L4_TIM4_DAC1
+	depends on STM32L4_TIM4_DAC
+
+config STM32L4_TIM4_DAC1
+	bool "TIM4 DAC channel 1"
+	---help---
+		Reserve TIM4 to trigger DAC1
+
+config STM32L4_TIM4_DAC2
+	bool "TIM4 DAC channel 2"
+	---help---
+		Reserve TIM4 to trigger DAC2
+
+endchoice
+
+config STM32L4_TIM5_DAC
+	bool "TIM5 DAC"
+	default n
+	depends on STM32L4_TIM5 && STM32L4_DAC
+	---help---
+		Reserve timer 5 for use by DAC
+
+		Timer devices may be used for different purposes.  If STM32L4_TIM5 is
+		defined then the following may also be defined to indicate that the
+		timer is intended to be used for DAC conversion. Note that DAC usage
+		requires two definition:  Not only do you have to assign the timer
+		for used by the DAC, but then you also have to configure which DAC
+		channel it is assigned to.
+
+choice
+	prompt "Select TIM5 DAC channel"
+	default STM32L4_TIM5_DAC1
+	depends on STM32L4_TIM5_DAC
+
+config STM32L4_TIM5_DAC1
+	bool "TIM5 DAC channel 1"
+	---help---
+		Reserve TIM5 to trigger DAC1
+
+config STM32L4_TIM5_DAC2
+	bool "TIM5 DAC channel 2"
+	---help---
+		Reserve TIM5 to trigger DAC2
+
+endchoice
+
+config STM32L4_TIM6_DAC
+	bool "TIM6 DAC"
+	default n
+	depends on STM32L4_TIM6 && STM32L4_DAC
+	---help---
+		Reserve timer 6 for use by DAC
+
+		Timer devices may be used for different purposes.  If STM32L4_TIM6 is
+		defined then the following may also be defined to indicate that the
+		timer is intended to be used for DAC conversion. Note that DAC usage
+		requires two definition:  Not only do you have to assign the timer
+		for used by the DAC, but then you also have to configure which DAC
+		channel it is assigned to.
+
+choice
+	prompt "Select TIM6 DAC channel"
+	default STM32L4_TIM6_DAC1
+	depends on STM32L4_TIM6_DAC
+
+config STM32L4_TIM6_DAC1
+	bool "TIM6 DAC channel 1"
+	---help---
+		Reserve TIM6 to trigger DAC1
+
+config STM32L4_TIM6_DAC2
+	bool "TIM6 DAC channel 2"
+	---help---
+		Reserve TIM6 to trigger DAC2
+
+endchoice
+
+config STM32L4_TIM7_DAC
+	bool "TIM7 DAC"
+	default n
+	depends on STM32L4_TIM7 && STM32L4_DAC
+	---help---
+		Reserve timer 7 for use by DAC
+
+		Timer devices may be used for different purposes.  If STM32L4_TIM7 is
+		defined then the following may also be defined to indicate that the
+		timer is intended to be used for DAC conversion. Note that DAC usage
+		requires two definition:  Not only do you have to assign the timer
+		for used by the DAC, but then you also have to configure which DAC
+		channel it is assigned to.
+
+choice
+	prompt "Select TIM7 DAC channel"
+	default STM32L4_TIM7_DAC1
+	depends on STM32L4_TIM7_DAC
+
+config STM32L4_TIM7_DAC1
+	bool "TIM7 DAC channel 1"
+	---help---
+		Reserve TIM7 to trigger DAC1
+
+config STM32L4_TIM7_DAC2
+	bool "TIM7 DAC channel 2"
+	---help---
+		Reserve TIM7 to trigger DAC2
+
+endchoice
+
+config STM32L4_TIM8_DAC
+	bool "TIM8 DAC"
+	default n
+	depends on STM32L4_TIM8 && STM32L4_DAC
+	---help---
+		Reserve timer 8 for use by DAC
+
+		Timer devices may be used for different purposes.  If STM32L4_TIM8 is
+		defined then the following may also be defined to indicate that the
+		timer is intended to be used for DAC conversion. Note that DAC usage
+		requires two definition:  Not only do you have to assign the timer
+		for used by the DAC, but then you also have to configure which DAC
+		channel it is assigned to.
+
+choice
+	prompt "Select TIM8 DAC channel"
+	default STM32L4_TIM8_DAC1
+	depends on STM32L4_TIM8_DAC
+
+config STM32L4_TIM8_DAC1
+	bool "TIM8 DAC channel 1"
+	---help---
+		Reserve TIM8 to trigger DAC1
+
+config STM32L4_TIM8_DAC2
+	bool "TIM8 DAC channel 2"
+	---help---
+		Reserve TIM8 to trigger DAC2
+
+endchoice
+
+config STM32L4_TIM1_CAP
+	bool "TIM1 Capture"
+	default n
+	depends on STM32L4_HAVE_TIM1
+	---help---
+		Reserve timer 1 for use by Capture
+
+		Timer devices may be used for different purposes.  One special purpose is
+		to capture input.
+
+config STM32L4_TIM2_CAP
+	bool "TIM2 Capture"
+	default n
+	depends on STM32L4_HAVE_TIM2
+	---help---
+		Reserve timer 2 for use by Capture
+
+		Timer devices may be used for different purposes.  One special purpose is
+		to capture input.
+
+config STM32L4_TIM3_CAP
+	bool "TIM3 Capture"
+	default n
+	depends on STM32L4_HAVE_TIM3
+	---help---
+		Reserve timer 3 for use by Capture
+
+		Timer devices may be used for different purposes.  One special purpose is
+		to capture input.
+
+config STM32L4_TIM4_CAP
+	bool "TIM4 Capture"
+	default n
+	depends on STM32L4_HAVE_TIM4
+	---help---
+		Reserve timer 4 for use by Capture
+
+		Timer devices may be used for different purposes.  One special purpose is
+		to capture input.
+
+config STM32L4_TIM5_CAP
+	bool "TIM5 Capture"
+	default n
+	depends on STM32L4_HAVE_TIM5
+	---help---
+		Reserve timer 5 for use by Capture
+
+		Timer devices may be used for different purposes.  One special purpose is
+		to capture input.
+
+config STM32L4_TIM8_CAP
+	bool "TIM8 Capture"
+	default n
+	depends on STM32L4_HAVE_TIM8
+	---help---
+		Reserve timer 8 for use by Capture
+
+		Timer devices may be used for different purposes.  One special purpose is
+		to capture input.
+
+endmenu # Timer Configuration
+
+menu "ADC Configuration"
+	depends on STM32L4_ADC
+
+config STM32L4_ADC1_DMA
+	bool "ADC1 DMA"
+	depends on STM32L4_ADC1 && STM32L4_HAVE_ADC1_DMA
+	default n
+	---help---
+		If DMA is selected, then the ADC may be configured to support
+		DMA transfer, which is necessary if multiple channels are read
+		or if very high trigger frequencies are used.
+
+config STM32L4_ADC2_DMA
+	bool "ADC2 DMA"
+	depends on STM32L4_ADC2 && STM32L4_HAVE_ADC2_DMA
+	default n
+	---help---
+		If DMA is selected, then the ADC may be configured to support
+		DMA transfer, which is necessary if multiple channels are read
+		or if very high trigger frequencies are used.
+
+config STM32L4_ADC3_DMA
+	bool "ADC3 DMA"
+	depends on STM32L4_ADC3 && STM32L4_HAVE_ADC3_DMA
+	default n
+	---help---
+		If DMA is selected, then the ADC may be configured to support
+		DMA transfer, which is necessary if multiple channels are read
+		or if very high trigger frequencies are used.
+
+endmenu
+
+menu "DAC Configuration"
+	depends on STM32L4_DAC1 || STM32L4_DAC2
+
+config STM32L4_DAC1_DMA
+	bool "DAC1 DMA"
+	depends on STM32L4_DAC1
+	default n
+	---help---
+		If DMA is selected, then a timer and output frequency must also be
+		provided to support the DMA transfer.  The DMA transfer could be
+		supported by and EXTI trigger, but this feature is not currently
+		supported by the driver.
+
+if STM32L4_DAC1_DMA
+
+config STM32L4_DAC1_TIMER
+	int "DAC1 timer"
+	range 2 8
+
+config STM32L4_DAC1_TIMER_FREQUENCY
+	int "DAC1 timer frequency"
+	default 0
+
+endif
+
+config STM32L4_DAC2_DMA
+	bool "DAC2 DMA"
+	depends on STM32L4_DAC2
+	default n
+	---help---
+		If DMA is selected, then a timer and output frequency must also be
+		provided to support the DMA transfer.  The DMA transfer could be
+		supported by and EXTI trigger, but this feature is not currently
+		supported by the driver.
+
+if STM32L4_DAC2_DMA
+
+config STM32L4_DAC2_TIMER
+	int "DAC2 timer"
+	default 0
+	range 2 8
+
+config STM32L4_DAC2_TIMER_FREQUENCY
+	int "DAC2 timer frequency"
+	default 0
+
+endif
+
+config STM32L4_DAC_DMA_BUFFER_SIZE
+	int "DAC DMA buffer size"
+	default 256
+
+endmenu
+
+menu "U[S]ART Configuration"
+	depends on STM32L4_USART
+
+config USART1_RS485
+	bool "RS-485 on USART1"
+	default n
+	depends on STM32L4_USART1
+	---help---
+		Enable RS-485 interface on USART1. Your board config will have to
+		provide GPIO_USART1_RS485_DIR pin definition. Currently it cannot be
+		used with USART1_RXDMA.
+
+config USART1_RS485_DIR_POLARITY
+	int "USART1 RS-485 DIR pin polarity"
+	default 1
+	range 0 1
+	depends on USART1_RS485
+	---help---
+		Polarity of DIR pin for RS-485 on USART1. Set to state on DIR pin which
+		enables TX (0 - low / nTXEN, 1 - high / TXEN).
+
+config USART1_RXDMA
+	bool "USART1 Rx DMA"
+	default n
+	depends on STM32L4_USART1 && ( STM32L4_DMA1 || STM32L4_DMA2 )
+	---help---
+		In high data rate usage, Rx DMA may eliminate Rx overrun errors
+
+config USART2_RS485
+	bool "RS-485 on USART2"
+	default n
+	depends on STM32L4_USART2
+	---help---
+		Enable RS-485 interface on USART2. Your board config will have to
+		provide GPIO_USART2_RS485_DIR pin definition. Currently it cannot be
+		used with USART2_RXDMA.
+
+config USART2_RS485_DIR_POLARITY
+	int "USART2 RS-485 DIR pin polarity"
+	default 1
+	range 0 1
+	depends on USART2_RS485
+	---help---
+		Polarity of DIR pin for RS-485 on USART2. Set to state on DIR pin which
+		enables TX (0 - low / nTXEN, 1 - high / TXEN).
+
+config USART2_RXDMA
+	bool "USART2 Rx DMA"
+	default n
+	depends on STM32L4_USART2 && STM32L4_DMA1
+	---help---
+		In high data rate usage, Rx DMA may eliminate Rx overrun errors
+
+config USART3_RS485
+	bool "RS-485 on USART3"
+	default n
+	depends on STM32L4_USART3
+	---help---
+		Enable RS-485 interface on USART3. Your board config will have to
+		provide GPIO_USART3_RS485_DIR pin definition. Currently it cannot be
+		used with USART3_RXDMA.
+
+config USART3_RS485_DIR_POLARITY
+	int "USART3 RS-485 DIR pin polarity"
+	default 1
+	range 0 1
+	depends on USART3_RS485
+	---help---
+		Polarity of DIR pin for RS-485 on USART3. Set to state on DIR pin which
+		enables TX (0 - low / nTXEN, 1 - high / TXEN).
+
+config USART3_RXDMA
+	bool "USART3 Rx DMA"
+	default n
+	depends on STM32L4_USART3 && STM32L4_DMA1
+	---help---
+		In high data rate usage, Rx DMA may eliminate Rx overrun errors
+
+config UART4_RS485
+	bool "RS-485 on UART4"
+	default n
+	depends on STM32L4_UART4
+	---help---
+		Enable RS-485 interface on UART4. Your board config will have to
+		provide GPIO_UART4_RS485_DIR pin definition. Currently it cannot be
+		used with UART4_RXDMA.
+
+config UART4_RS485_DIR_POLARITY
+	int "UART4 RS-485 DIR pin polarity"
+	default 1
+	range 0 1
+	depends on UART4_RS485
+	---help---
+		Polarity of DIR pin for RS-485 on UART4. Set to state on DIR pin which
+		enables TX (0 - low / nTXEN, 1 - high / TXEN).
+
+config UART4_RXDMA
+	bool "UART4 Rx DMA"
+	default n
+	depends on STM32L4_UART4 && STM32L4_DMA2
+	---help---
+		In high data rate usage, Rx DMA may eliminate Rx overrun errors
+
+config UART5_RS485
+	bool "RS-485 on UART5"
+	default n
+	depends on STM32L4_UART5
+	---help---
+		Enable RS-485 interface on UART5. Your board config will have to
+		provide GPIO_UART5_RS485_DIR pin definition. Currently it cannot be
+		used with UART5_RXDMA.
+
+config UART5_RS485_DIR_POLARITY
+	int "UART5 RS-485 DIR pin polarity"
+	default 1
+	range 0 1
+	depends on UART5_RS485
+	---help---
+		Polarity of DIR pin for RS-485 on UART5. Set to state on DIR pin which
+		enables TX (0 - low / nTXEN, 1 - high / TXEN).
+
+config UART5_RXDMA
+	bool "UART5 Rx DMA"
+	default n
+	depends on STM32L4_UART5 && STM32L4_DMA2
+	---help---
+		In high data rate usage, Rx DMA may eliminate Rx overrun errors
+
+config SERIAL_DISABLE_REORDERING
+	bool "Disable reordering of ttySx devices."
+	depends on STM32L4_USART1 || STM32L4_USART2 || STM32L4_USART3 || STM32L4_UART4 || STM32L4_UART5
+	default n
+	---help---
+		NuttX per default reorders the serial ports (/dev/ttySx) so that the
+		console is always on /dev/ttyS0. If more than one UART is in use this
+		can, however, have the side-effect that all port mappings
+		(hardware USART1 -> /dev/ttyS0) change if the console is moved to another
+		UART. This is in particular relevant if a project uses the USB console
+		in some configs and a serial console in other configs, but does not
+		want the side effect of having all serial port names change when just
+		the console is moved from serial to USB.
+
+config STM32L4_FLOWCONTROL_BROKEN
+	bool "Use Software UART RTS flow control"
+	depends on STM32L4_USART
+	default n
+	---help---
+		Enable UART RTS flow control using Software. Because STM
+		Current STM32 have broken HW based RTS behavior (they assert
+		nRTS after every byte received)  Enable this setting workaround
+		this issue by useing software based management of RTS
+
+config STM32L4_USART_BREAKS
+	bool "Add TIOxSBRK to support sending Breaks"
+	depends on STM32L4_USART
 	default n
 	---help---
 		Add TIOCxBRK routines to send a line break per the STM32 manual, the
@@ -793,7 +2632,7 @@ config STM32L4_USART_BREAKS
 
 config STM32L4_SERIALBRK_BSDCOMPAT
 	bool "Use GPIO To send Break"
-	depends on STM32_USART && STM32_USART_BREAKS
+	depends on STM32L4_USART && STM32L4_USART_BREAKS
 	default n
 	---help---
 		Enable using GPIO on the TX pin to send a BSD compatible break:
diff --git a/arch/arm/src/stm32l4/Make.defs b/arch/arm/src/stm32l4/Make.defs
index a47e7004b0..33a5e0a5ba 100644
--- a/arch/arm/src/stm32l4/Make.defs
+++ b/arch/arm/src/stm32l4/Make.defs
@@ -112,9 +112,24 @@ CHIP_CSRCS  = stm32l4_allocateheap.c stm32l4_exti_gpio.c stm32l4_gpio.c
 CHIP_CSRCS += stm32l4_idle.c stm32l4_irq.c stm32l4_lowputc.c stm32l4_rcc.c
 CHIP_CSRCS += stm32l4_serial.c stm32l4_start.c stm32l4_waste.c stm32l4_uid.c
 CHIP_CSRCS += stm32l4_spi.c stm32l4_i2c.c stm32l4_lse.c stm32l4_pwr.c
+CHIP_CSRCS += stm32l4_tim.c
+
+ifeq ($(CONFIG_TIMER),y)
+CHIP_CSRCS += stm32l4_tim_lowerhalf.c
+endif
 
 ifneq ($(CONFIG_SCHED_TICKLESS),y)
 CHIP_CSRCS += stm32l4_timerisr.c
+else
+CHIP_CSRCS += stm32l4_tickless.c
+endif
+
+ifeq ($(CONFIG_STM32L4_ONESHOT),y)
+CHIP_CSRCS += stm32l4_oneshot.c
+endif
+
+ifeq ($(CONFIG_STM32L4_FREERUN),y)
+CHIP_CSRCS += stm32l4_freerun.c
 endif
 
 ifeq ($(CONFIG_BUILD_PROTECTED),y)
@@ -176,6 +191,10 @@ ifeq ($(CONFIG_STM32L4_RNG),y)
 CHIP_CSRCS += stm32l4_rng.c
 endif
 
+ifeq ($(CONFIG_PWM),y)
+CHIP_CSRCS += stm32l4_pwm.c
+endif
+
 ifeq ($(CONFIG_STM32L4_QSPI),y)
 CHIP_CSRCS += stm32l4_qspi.c
 endif
diff --git a/arch/arm/src/stm32l4/stm32l4_freerun.c b/arch/arm/src/stm32l4/stm32l4_freerun.c
new file mode 100644
index 0000000000..74fc952ef0
--- /dev/null
+++ b/arch/arm/src/stm32l4/stm32l4_freerun.c
@@ -0,0 +1,297 @@
+/****************************************************************************
+ * arch/arm/src/stm32l4/stm32l4_freerun.c
+ *
+ *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt 
+ *           dev@ziggurat29.com
+ *
+ * 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 names NuttX nor Atmel 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 "stm32l4_freerun.h"
+
+#ifdef CONFIG_STM32L4_FREERUN
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static struct stm32l4_freerun_s *g_freerun;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stm32_freerun_handler
+ *
+ * Description:
+ *   Timer interrupt callback.  When the freerun timer counter overflows,
+ *   this interrupt will occur.  We will just increment an overflow count.
+ *
+ * Input Parameters:
+ *   tch - The handle that represents the timer state
+ *   arg - An opaque argument provided when the interrupt was registered
+ *   sr  - The value of the timer interrupt status register at the time
+ *         that the interrupt occurred.
+ *
+ * Returned Value:
+ *   None
+ *
+ ****************************************************************************/
+
+static int stm32_freerun_handler(int irq, void *context)
+{
+  struct stm32l4_freerun_s *freerun = g_freerun;
+
+  DEBUGASSERT(freerun != NULL && freerun->overflow < UINT32_MAX);
+  freerun->overflow++;
+
+  STM32L4_TIM_ACKINT(freerun->tch, 0);
+  return OK;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stm32l4_freerun_initialize
+ *
+ * Description:
+ *   Initialize the freerun timer wrapper
+ *
+ * Input Parameters:
+ *   freerun    Caller allocated instance of the freerun state structure
+ *   chan       Timer counter channel to be used.
+ *   resolution The required resolution of the timer in units of
+ *              microseconds.  NOTE that the range is restricted to the
+ *              range of uint16_t (excluding zero).
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned
+ *   on failure.
+ *
+ ****************************************************************************/
+
+int stm32l4_freerun_initialize(struct stm32l4_freerun_s *freerun, int chan,
+                             uint16_t resolution)
+{
+  uint32_t frequency;
+
+  tmrinfo("chan=%d resolution=%d usec\n", chan, resolution);
+  DEBUGASSERT(freerun != NULL && resolution > 0);
+
+  /* Get the TC frequency the corresponds to the requested resolution */
+
+  frequency = USEC_PER_SEC / (uint32_t)resolution;
+  freerun->frequency = frequency;
+
+  freerun->tch = stm32l4_tim_init(chan);
+  if (!freerun->tch)
+    {
+      tmrerr("ERROR: Failed to allocate TIM%d\n", chan);
+      return -EBUSY;
+    }
+
+  STM32L4_TIM_SETCLOCK(freerun->tch, frequency);
+
+  /* Initialize the remaining fields in the state structure and return
+   * success.
+   */
+
+  freerun->chan     = chan;
+  freerun->running  = false;
+  freerun->overflow = 0;
+
+  g_freerun = freerun;
+
+  /* Set up to receive the callback when the counter overflow occurs */
+
+  STM32L4_TIM_SETISR(freerun->tch, stm32_freerun_handler, 0);
+
+  /* Set timer period */
+
+  STM32L4_TIM_SETPERIOD(freerun->tch, UINT32_MAX);
+
+  /* Start the counter */
+
+  STM32L4_TIM_SETMODE(freerun->tch, STM32L4_TIM_MODE_UP);
+  STM32L4_TIM_ACKINT(freerun->tch, 0);
+  STM32L4_TIM_ENABLEINT(freerun->tch, 0);
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stm32l4_freerun_counter
+ *
+ * Description:
+ *   Read the counter register of the free-running timer.
+ *
+ * Input Parameters:
+ *   freerun Caller allocated instance of the freerun state structure.  This
+ *           structure must have been previously initialized via a call to
+ *           stm32_freerun_initialize();
+ *   ts      The location in which to return the time from the free-running
+ *           timer.
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned
+ *   on failure.
+ *
+ ****************************************************************************/
+
+int stm32l4_freerun_counter(struct stm32l4_freerun_s *freerun,
+                          struct timespec *ts)
+{
+  uint64_t usec;
+  uint32_t counter;
+  uint32_t verify;
+  uint32_t overflow;
+  uint32_t sec;
+  int pending;
+  irqstate_t flags;
+
+  DEBUGASSERT(freerun && freerun->tch && ts);
+
+  /* Temporarily disable the overflow counter.  NOTE that we have to be
+   * careful here because  stm32_tc_getpending() will reset the pending
+   * interrupt status.  If we do not handle the overflow here then, it will
+   * be lost.
+   */
+
+  flags    = enter_critical_section();
+
+  overflow = freerun->overflow;
+  counter  = STM32L4_TIM_GETCOUNTER(freerun->tch);
+  pending  = STM32L4_TIM_CHECKINT(freerun->tch, 0);
+  verify   = STM32L4_TIM_GETCOUNTER(freerun->tch);
+
+  /* If an interrupt was pending before we re-enabled interrupts,
+   * then the overflow needs to be incremented.
+   */
+
+  if (pending)
+    {
+      STM32L4_TIM_ACKINT(freerun->tch, 0);
+
+      /* Increment the overflow count and use the value of the
+       * guaranteed to be AFTER the overflow occurred.
+       */
+
+      overflow++;
+      counter = verify;
+
+      /* Update freerun overflow counter. */
+
+      freerun->overflow = overflow;
+    }
+
+  leave_critical_section(flags);
+
+  tmrinfo("counter=%lu (%lu) overflow=%lu, pending=%i\n",
+         (unsigned long)counter,  (unsigned long)verify,
+         (unsigned long)overflow, pending);
+  tmrinfo("frequency=%u\n", freerun->frequency);
+
+  /* Convert the whole thing to units of microseconds.
+   *
+   *   frequency = ticks / second
+   *   seconds   = ticks * frequency
+   *   usecs     = (ticks * USEC_PER_SEC) / frequency;
+   */
+
+  usec = ((((uint64_t)overflow << 32) + (uint64_t)counter) * USEC_PER_SEC) /
+         freerun->frequency;
+
+  /* And return the value of the timer */
+
+  sec         = (uint32_t)(usec / USEC_PER_SEC);
+  ts->tv_sec  = sec;
+  ts->tv_nsec = (usec - (sec * USEC_PER_SEC)) * NSEC_PER_USEC;
+
+  tmrinfo("usec=%llu ts=(%u, %lu)\n",
+          usec, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec);
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stm32l4_freerun_uninitialize
+ *
+ * Description:
+ *   Stop the free-running timer and release all resources that it uses.
+ *
+ * Input Parameters:
+ *   freerun Caller allocated instance of the freerun state structure.  This
+ *           structure must have been previously initialized via a call to
+ *           stm32_freerun_initialize();
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned
+ *   on failure.
+ *
+ ****************************************************************************/
+
+int stm32l4_freerun_uninitialize(struct stm32l4_freerun_s *freerun)
+{
+  DEBUGASSERT(freerun && freerun->tch);
+
+  /* Now we can disable the timer interrupt and disable the timer. */
+
+  STM32L4_TIM_DISABLEINT(freerun->tch, 0);
+  STM32L4_TIM_SETMODE(freerun->tch, STM32L4_TIM_MODE_DISABLED);
+  STM32L4_TIM_SETISR(freerun->tch, NULL, 0);
+
+  /* Free the timer */
+
+  stm32l4_tim_deinit(freerun->tch);
+  freerun->tch = NULL;
+
+  g_freerun = NULL;
+  return OK;
+}
+
+#endif /* CONFIG_STM32L4_FREERUN */
diff --git a/arch/arm/src/stm32l4/stm32l4_freerun.h b/arch/arm/src/stm32l4/stm32l4_freerun.h
new file mode 100644
index 0000000000..8b5e004d50
--- /dev/null
+++ b/arch/arm/src/stm32l4/stm32l4_freerun.h
@@ -0,0 +1,159 @@
+/****************************************************************************
+ * arch/arm/src/stm32l4/stm32l4_freerun.h
+ *
+ *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt 
+ *           dev@ziggurat29.com
+ *
+ * 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_STM32L4_FREERUN_H
+#define __ARCH_ARM_SRC_STM32L4_FREERUN_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include 
+
+#include 
+#include 
+#include 
+
+#include "stm32l4_tim.h"
+
+#ifdef CONFIG_STM32L4_FREERUN
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/* The freerun client must allocate an instance of this structure and called
+ * stm32_freerun_initialize() before using the freerun facilities.  The client
+ * should not access the contents of this structure directly since the
+ * contents are subject to change.
+ */
+
+struct stm32l4_freerun_s
+{
+  uint8_t chan;                    /* The timer/counter in use */
+  bool running;                    /* True: the timer is running */
+  uint32_t overflow;               /* Timer counter overflow */
+  FAR struct stm32l4_tim_dev_s *tch; /* Handle returned by stm32l4_tim_init() */
+  uint32_t frequency;
+};
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+#undef EXTERN
+#if defined(__cplusplus)
+#define EXTERN extern "C"
+extern "C"
+{
+#else
+#define EXTERN extern
+#endif
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stm32l4_freerun_initialize
+ *
+ * Description:
+ *   Initialize the freerun timer wrapper
+ *
+ * Input Parameters:
+ *   freerun    Caller allocated instance of the freerun state structure
+ *   chan       Timer counter channel to be used.
+ *   resolution The required resolution of the timer in units of
+ *              microseconds.  NOTE that the range is restricted to the
+ *              range of uint16_t (excluding zero).
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned
+ *   on failure.
+ *
+ ****************************************************************************/
+
+int stm32l4_freerun_initialize(struct stm32l4_freerun_s *freerun, int chan,
+                             uint16_t resolution);
+
+/****************************************************************************
+ * Name: stm32l4_freerun_counter
+ *
+ * Description:
+ *   Read the counter register of the free-running timer.
+ *
+ * Input Parameters:
+ *   freerun Caller allocated instance of the freerun state structure.  This
+ *           structure must have been previously initialized via a call to
+ *           stm32_freerun_initialize();
+ *   ts      The location in which to return the time remaining on the
+ *           oneshot timer.
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned
+ *   on failure.
+ *
+ ****************************************************************************/
+
+int stm32l4_freerun_counter(struct stm32l4_freerun_s *freerun,
+                          struct timespec *ts);
+
+/****************************************************************************
+ * Name: stm32l4_freerun_uninitialize
+ *
+ * Description:
+ *   Stop the free-running timer and release all resources that it uses.
+ *
+ * Input Parameters:
+ *   freerun Caller allocated instance of the freerun state structure.  This
+ *           structure must have been previously initialized via a call to
+ *           stm32_freerun_initialize();
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned
+ *   on failure.
+ *
+ ****************************************************************************/
+
+int stm32l4_freerun_uninitialize(struct stm32l4_freerun_s *freerun);
+
+#undef EXTERN
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CONFIG_STM32L4_FREERUN */
+#endif /* __ARCH_ARM_SRC_STM32L4_FREERUN_H */
diff --git a/arch/arm/src/stm32l4/stm32l4_oneshot.c b/arch/arm/src/stm32l4/stm32l4_oneshot.c
new file mode 100644
index 0000000000..3abb44e862
--- /dev/null
+++ b/arch/arm/src/stm32l4/stm32l4_oneshot.c
@@ -0,0 +1,416 @@
+/****************************************************************************
+ * arch/arm/src/stm32l4/stm32l4_oneshot.c
+ *
+ *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt 
+ *           dev@ziggurat29.com
+ *
+ * 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 names NuttX nor Atmel 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 "stm32l4_oneshot.h"
+
+#ifdef CONFIG_STM32L4_ONESHOT
+
+/****************************************************************************
+ * Private Date
+ ****************************************************************************/
+
+static struct stm32l4_oneshot_s *g_oneshot;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stm32_oneshot_handler
+ *
+ * Description:
+ *   Timer interrupt callback.  When the oneshot timer interrupt expires,
+ *   this function will be called.  It will forward the call to the next
+ *   level up.
+ *
+ * Input Parameters:
+ *   tch - The handle that represents the timer state
+ *   arg - An opaque argument provided when the interrupt was registered
+ *   sr  - The value of the timer interrupt status register at the time
+ *         that the interrupt occurred.
+ *
+ * Returned Value:
+ *   None
+ *
+ ****************************************************************************/
+
+static int stm32_oneshot_handler(int irq, void *context)
+{
+  struct stm32l4_oneshot_s *oneshot = g_oneshot;
+  oneshot_handler_t oneshot_handler;
+  void *oneshot_arg;
+
+  tmrinfo("Expired...\n");
+  DEBUGASSERT(oneshot != NULL && oneshot->handler);
+
+  /* The clock was stopped, but not disabled when the RC match occurred.
+   * Disable the TC now and disable any further interrupts.
+   */
+
+  STM32L4_TIM_SETMODE(oneshot->tch, STM32L4_TIM_MODE_DISABLED);
+  STM32L4_TIM_ACKINT(oneshot->tch, 0);
+  STM32L4_TIM_DISABLEINT(oneshot->tch, 0);
+
+  /* The timer is no longer running */
+
+  oneshot->running = false;
+
+  /* Forward the event, clearing out any vestiges */
+
+  oneshot_handler  = (oneshot_handler_t)oneshot->handler;
+  oneshot->handler = NULL;
+  oneshot_arg      = (void *)oneshot->arg;
+  oneshot->arg     = NULL;
+
+  oneshot_handler(oneshot_arg);
+  return OK;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stm32l4_oneshot_initialize
+ *
+ * Description:
+ *   Initialize the oneshot timer wrapper
+ *
+ * Input Parameters:
+ *   oneshot    Caller allocated instance of the oneshot state structure
+ *   chan       Timer counter channel to be used.
+ *   resolution The required resolution of the timer in units of
+ *              microseconds.  NOTE that the range is restricted to the
+ *              range of uint16_t (excluding zero).
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned
+ *   on failure.
+ *
+ ****************************************************************************/
+
+int stm32l4_oneshot_initialize(struct stm32l4_oneshot_s *oneshot, int chan,
+                           uint16_t resolution)
+{
+  uint32_t frequency;
+
+  tmrinfo("chan=%d resolution=%d usec\n", chan, resolution);
+  DEBUGASSERT(oneshot && resolution > 0);
+
+  /* Get the TC frequency the corresponds to the requested resolution */
+
+  frequency = USEC_PER_SEC / (uint32_t)resolution;
+  oneshot->frequency = frequency;
+
+  oneshot->tch = stm32l4_tim_init(chan);
+  if (!oneshot->tch)
+    {
+      tmrerr("ERROR: Failed to allocate TIM%d\n", chan);
+      return -EBUSY;
+    }
+
+  STM32L4_TIM_SETCLOCK(oneshot->tch, frequency);
+
+  /* Initialize the remaining fields in the state structure and return
+   * success.
+   */
+
+  oneshot->chan       = chan;
+  oneshot->running    = false;
+  oneshot->handler    = NULL;
+  oneshot->arg        = NULL;
+
+  g_oneshot           = oneshot;
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stm32_oneshot_max_delay
+ *
+ * Description:
+ *   Determine the maximum delay of the one-shot timer (in microseconds)
+ *
+ ****************************************************************************/
+
+int stm32l4_oneshot_max_delay(struct stm32l4_oneshot_s *oneshot, uint64_t *usec)
+{
+  DEBUGASSERT(oneshot != NULL && usec != NULL);
+
+  *usec = (uint64_t)(UINT32_MAX / oneshot->frequency) *
+          (uint64_t)USEC_PER_SEC;
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stm32l4_oneshot_start
+ *
+ * Description:
+ *   Start the oneshot timer
+ *
+ * Input Parameters:
+ *   oneshot Caller allocated instance of the oneshot state structure.  This
+ *           structure must have been previously initialized via a call to
+ *           stm32_oneshot_initialize();
+ *   handler The function to call when when the oneshot timer expires.
+ *   arg     An opaque argument that will accompany the callback.
+ *   ts      Provides the duration of the one shot timer.
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned
+ *   on failure.
+ *
+ ****************************************************************************/
+
+int stm32l4_oneshot_start(struct stm32l4_oneshot_s *oneshot,
+                        oneshot_handler_t handler, void *arg,
+                        const struct timespec *ts)
+{
+  uint64_t usec;
+  uint64_t period;
+  irqstate_t flags;
+
+  tmrinfo("handler=%p arg=%p, ts=(%lu, %lu)\n",
+         handler, arg, (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec);
+  DEBUGASSERT(oneshot && handler && ts);
+  DEBUGASSERT(oneshot->tch);
+
+  /* Was the oneshot already running? */
+
+  flags = enter_critical_section();
+  if (oneshot->running)
+    {
+      /* Yes.. then cancel it */
+
+      tmrinfo("Already running... cancelling\n");
+      (void)stm32l4_oneshot_cancel(oneshot, NULL);
+    }
+
+  /* Save the new handler and its argument */
+
+  oneshot->handler = handler;
+  oneshot->arg     = arg;
+
+  /* Express the delay in microseconds */
+
+  usec = (uint64_t)ts->tv_sec * USEC_PER_SEC +
+         (uint64_t)(ts->tv_nsec / NSEC_PER_USEC);
+
+  /* Get the timer counter frequency and determine the number of counts need
+   * to achieve the requested delay.
+   *
+   *   frequency = ticks / second
+   *   ticks     = seconds * frequency
+   *             = (usecs * frequency) / USEC_PER_SEC;
+   */
+
+  period = (usec * (uint64_t)oneshot->frequency) / USEC_PER_SEC;
+
+  tmrinfo("usec=%llu period=%08llx\n", usec, period);
+  DEBUGASSERT(period <= UINT32_MAX);
+
+  /* Set up to receive the callback when the interrupt occurs */
+
+  STM32L4_TIM_SETISR(oneshot->tch, stm32_oneshot_handler, 0);
+
+  /* Set timer period */
+
+  oneshot->period = (uint32_t)period;
+  STM32L4_TIM_SETPERIOD(oneshot->tch, (uint32_t)period);
+
+  /* Start the counter */
+
+  STM32L4_TIM_SETMODE(oneshot->tch, STM32L4_TIM_MODE_PULSE);
+
+  STM32L4_TIM_ACKINT(oneshot->tch, 0);
+  STM32L4_TIM_ENABLEINT(oneshot->tch, 0);
+
+  /* Enable interrupts.  We should get the callback when the interrupt
+   * occurs.
+   */
+
+  oneshot->running = true;
+  leave_critical_section(flags);
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stm32l4_oneshot_cancel
+ *
+ * Description:
+ *   Cancel the oneshot timer and return the time remaining on the timer.
+ *
+ *   NOTE: This function may execute at a high rate with no timer running (as
+ *   when pre-emption is enabled and disabled).
+ *
+ * Input Parameters:
+ *   oneshot Caller allocated instance of the oneshot state structure.  This
+ *           structure must have been previously initialized via a call to
+ *           stm32_oneshot_initialize();
+ *   ts      The location in which to return the time remaining on the
+ *           oneshot timer.  A time of zero is returned if the timer is
+ *           not running.  ts may be zero in which case the time remaining
+ *           is not returned.
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success.  A call to up_timer_cancel() when
+ *   the timer is not active should also return success; a negated errno
+ *   value is returned on any failure.
+ *
+ ****************************************************************************/
+
+int stm32l4_oneshot_cancel(struct stm32l4_oneshot_s *oneshot,
+                         struct timespec *ts)
+{
+  irqstate_t flags;
+  uint64_t usec;
+  uint64_t sec;
+  uint64_t nsec;
+  uint32_t count;
+  uint32_t period;
+
+  /* Was the timer running? */
+
+  flags = enter_critical_section();
+  if (!oneshot->running)
+    {
+      /* No.. Just return zero timer remaining and successful cancellation.
+       * This function may execute at a high rate with no timer running
+       * (as when pre-emption is enabled and disabled).
+       */
+
+      ts->tv_sec  = 0;
+      ts->tv_nsec = 0;
+      leave_critical_section(flags);
+      return OK;
+    }
+
+  /* Yes.. Get the timer counter and period registers and stop the counter.
+   * If the counter expires while we are doing this, the counter clock will
+   * be stopped, but the clock will not be disabled.
+   *
+   * The expected behavior is that the the counter register will freezes at
+   * a value equal to the RC register when the timer expires.  The counter
+   * should have values between 0 and RC in all other cased.
+   *
+   * REVISIT:  This does not appear to be the case.
+   */
+
+  tmrinfo("Cancelling...\n");
+
+  count  = STM32L4_TIM_GETCOUNTER(oneshot->tch);
+  period = oneshot->period;
+
+  /* Now we can disable the interrupt and stop the timer. */
+
+  STM32L4_TIM_DISABLEINT(oneshot->tch, 0);
+  STM32L4_TIM_SETMODE(oneshot->tch, STM32L4_TIM_MODE_DISABLED);
+
+  oneshot->running = false;
+  oneshot->handler = NULL;
+  oneshot->arg     = NULL;
+  leave_critical_section(flags);
+
+  /* Did the caller provide us with a location to return the time
+   * remaining?
+   */
+
+  if (ts)
+    {
+      /* Yes.. then calculate and return the time remaining on the
+       * oneshot timer.
+       */
+
+      tmrinfo("period=%lu count=%lu\n",
+             (unsigned long)period, (unsigned long)count);
+
+      /* REVISIT: I am not certain why the timer counter value sometimes
+       * exceeds RC.  Might be a bug, or perhaps the counter does not stop
+       * in all cases.
+       */
+
+      if (count >= period)
+        {
+          /* No time remaining (?) */
+
+          ts->tv_sec  = 0;
+          ts->tv_nsec = 0;
+        }
+      else
+        {
+          /* The total time remaining is the difference.  Convert the that
+           * to units of microseconds.
+           *
+           *   frequency = ticks / second
+           *   seconds   = ticks * frequency
+           *   usecs     = (ticks * USEC_PER_SEC) / frequency;
+           */
+
+          usec        = (((uint64_t)(period - count)) * USEC_PER_SEC) /
+                        oneshot->frequency;
+
+          /* Return the time remaining in the correct form */
+
+          sec         = usec / USEC_PER_SEC;
+          nsec        = ((usec) - (sec * USEC_PER_SEC)) * NSEC_PER_USEC;
+
+          ts->tv_sec  = (time_t)sec;
+          ts->tv_nsec = (unsigned long)nsec;
+        }
+
+      tmrinfo("remaining (%lu, %lu)\n",
+             (unsigned long)ts->tv_sec, (unsigned long)ts->tv_nsec);
+    }
+
+  return OK;
+}
+
+#endif /* CONFIG_STM32L4_ONESHOT */
diff --git a/arch/arm/src/stm32l4/stm32l4_oneshot.h b/arch/arm/src/stm32l4/stm32l4_oneshot.h
new file mode 100644
index 0000000000..6111706321
--- /dev/null
+++ b/arch/arm/src/stm32l4/stm32l4_oneshot.h
@@ -0,0 +1,190 @@
+/****************************************************************************
+ * arch/arm/src/stm32l4/stm32l4_oneshot.h
+ *
+ *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt 
+ *           dev@ziggurat29.com
+ *
+ * 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_STM32L4_ONESHOT_H
+#define __ARCH_ARM_SRC_STM32L4_ONESHOT_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include 
+
+#include 
+#include 
+
+#include "stm32l4_tim.h"
+
+#ifdef CONFIG_STM32L4_ONESHOT
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/* This describes the callback function that will be invoked when the oneshot
+ * timer expires.  The oneshot fires, the client will receive:
+ *
+ *   arg - The opaque argument provided when the interrupt was registered
+ */
+
+typedef void (*oneshot_handler_t)(void *arg);
+
+/* The oneshot client must allocate an instance of this structure and called
+ * stm32_oneshot_initialize() before using the oneshot facilities.  The client
+ * should not access the contents of this structure directly since the
+ * contents are subject to change.
+ */
+
+struct stm32l4_oneshot_s
+{
+  uint8_t chan;                       /* The timer/counter in use */
+  volatile bool running;              /* True: the timer is running */
+  FAR struct stm32l4_tim_dev_s *tch;  /* Pointer returned by
+                                       * stm32l4_tim_init() */
+  volatile oneshot_handler_t handler; /* Oneshot expiration callback */
+  volatile void *arg;                 /* The argument that will accompany
+                                       * the callback */
+  uint32_t frequency;
+  uint32_t period;
+};
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+#undef EXTERN
+#if defined(__cplusplus)
+#define EXTERN extern "C"
+extern "C"
+{
+#else
+#define EXTERN extern
+#endif
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stm32l4_oneshot_initialize
+ *
+ * Description:
+ *   Initialize the oneshot timer wrapper
+ *
+ * Input Parameters:
+ *   oneshot    Caller allocated instance of the oneshot state structure
+ *   chan       Timer counter channel to be used.
+ *   resolution The required resolution of the timer in units of
+ *              microseconds.  NOTE that the range is restricted to the
+ *              range of uint16_t (excluding zero).
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned
+ *   on failure.
+ *
+ ****************************************************************************/
+
+int stm32l4_oneshot_initialize(struct stm32l4_oneshot_s *oneshot, int chan,
+                             uint16_t resolution);
+
+/****************************************************************************
+ * Name: stm32l4_oneshot_max_delay
+ *
+ * Description:
+ *   Determine the maximum delay of the one-shot timer (in microseconds)
+ *
+ ****************************************************************************/
+
+int stm32l4_oneshot_max_delay(struct stm32l4_oneshot_s *oneshot, uint64_t *usec);
+
+/****************************************************************************
+ * Name: stm32l4_oneshot_start
+ *
+ * Description:
+ *   Start the oneshot timer
+ *
+ * Input Parameters:
+ *   oneshot Caller allocated instance of the oneshot state structure.  This
+ *           structure must have been previously initialized via a call to
+ *           stm32_oneshot_initialize();
+ *   handler The function to call when when the oneshot timer expires.
+ *   arg     An opaque argument that will accompany the callback.
+ *   ts      Provides the duration of the one shot timer.
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned
+ *   on failure.
+ *
+ ****************************************************************************/
+
+int stm32l4_oneshot_start(struct stm32l4_oneshot_s *oneshot,
+                        oneshot_handler_t handler, void *arg,
+                        const struct timespec *ts);
+
+/****************************************************************************
+ * Name: stm32l4_oneshot_cancel
+ *
+ * Description:
+ *   Cancel the oneshot timer and return the time remaining on the timer.
+ *
+ *   NOTE: This function may execute at a high rate with no timer running (as
+ *   when pre-emption is enabled and disabled).
+ *
+ * Input Parameters:
+ *   oneshot Caller allocated instance of the oneshot state structure.  This
+ *           structure must have been previously initialized via a call to
+ *           stm32_oneshot_initialize();
+ *   ts      The location in which to return the time remaining on the
+ *           oneshot timer.  A time of zero is returned if the timer is
+ *           not running.
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success.  A call to up_timer_cancel() when
+ *   the timer is not active should also return success; a negated errno
+ *   value is returned on any failure.
+ *
+ ****************************************************************************/
+
+int stm32l4_oneshot_cancel(struct stm32l4_oneshot_s *oneshot,
+                         struct timespec *ts);
+
+#undef EXTERN
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* CONFIG_STM32L4_ONESHOT */
+#endif /* __ARCH_ARM_SRC_STM32L4_ONESHOT_H */
diff --git a/arch/arm/src/stm32l4/stm32l4_pwm.c b/arch/arm/src/stm32l4/stm32l4_pwm.c
new file mode 100644
index 0000000000..b679da395c
--- /dev/null
+++ b/arch/arm/src/stm32l4/stm32l4_pwm.c
@@ -0,0 +1,2052 @@
+/****************************************************************************
+ * arch/arm/src/stm32l4/stm32l4_pwm.c
+ *
+ *   Copyright (C) 2011-2012, 2016 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2015 Omni Hoverboards Inc. All rights reserved.
+ *   Authors: Gregory Nutt 
+ *            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 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+
+#include "up_internal.h"
+#include "up_arch.h"
+
+#include "chip.h"
+#include "stm32l4_pwm.h"
+#include "stm32l4.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_STM32L4_TIM1_PWM)  || defined(CONFIG_STM32L4_TIM2_PWM)  || \
+    defined(CONFIG_STM32L4_TIM3_PWM)  || defined(CONFIG_STM32L4_TIM4_PWM)  || \
+    defined(CONFIG_STM32L4_TIM5_PWM)  || defined(CONFIG_STM32L4_TIM8_PWM)  || \
+    defined(CONFIG_STM32L4_TIM15_PWM) || defined(CONFIG_STM32L4_TIM16_PWM) || \
+    defined(CONFIG_STM32L4_TIM17_PWM)
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+/* PWM/Timer Definitions ****************************************************/
+/* The following definitions are used to identify the various time types */
+
+#define TIMTYPE_BASIC      0  /* Basic timers: TIM6,7 */
+#define TIMTYPE_GENERAL16  1  /* General 16-bit timers: TIM3,4 */
+#define TIMTYPE_COUNTUP16  2  /* General 16-bit count-up timers: TIM15-17 */
+#define TIMTYPE_GENERAL32  3  /* General 32-bit timers: TIM2,5 */
+#define TIMTYPE_ADVANCED   4  /* Advanced timers:  TIM1,8 */
+
+#define TIMTYPE_TIM1       TIMTYPE_ADVANCED
+#define TIMTYPE_TIM2       TIMTYPE_GENERAL32
+#define TIMTYPE_TIM3       TIMTYPE_GENERAL16
+#define TIMTYPE_TIM4       TIMTYPE_GENERAL16
+#define TIMTYPE_TIM5       TIMTYPE_GENERAL32
+#define TIMTYPE_TIM6       TIMTYPE_BASIC
+#define TIMTYPE_TIM7       TIMTYPE_BASIC
+#define TIMTYPE_TIM8       TIMTYPE_ADVANCED
+#define TIMTYPE_TIM15      TIMTYPE_COUNTUP16
+#define TIMTYPE_TIM16      TIMTYPE_COUNTUP16
+#define TIMTYPE_TIM17      TIMTYPE_COUNTUP16
+
+/* Debug ********************************************************************/
+
+#ifdef CONFIG_DEBUG_PWM_INFO
+#  define pwm_dumpgpio(p,m) stm32_dumpgpio(p,m)
+#else
+#  define pwm_dumpgpio(p,m)
+#endif
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+enum stm32_timmode_e
+{
+  STM32_TIMMODE_COUNTUP   = 0,
+  STM32_TIMMODE_COUNTDOWN = 1,
+  STM32_TIMMODE_CENTER1   = 2,
+  STM32_TIMMODE_CENTER2   = 3,
+  STM32_TIMMODE_CENTER3   = 4,
+};
+
+enum stm32_chanmode_e
+{
+  STM32_CHANMODE_PWM1        = 0,
+  STM32_CHANMODE_PWM2        = 1,
+  STM32_CHANMODE_COMBINED1   = 2,
+  STM32_CHANMODE_COMBINED2   = 3,
+  STM32_CHANMODE_ASYMMETRIC1 = 4,
+  STM32_CHANMODE_ASYMMETRIC2 = 5,
+};
+
+struct stm32_pwmchan_s
+{
+  uint8_t channel;                     /* Timer output channel: {1,..4} */
+  uint32_t pincfg;                     /* Output pin configuration */
+  enum stm32_chanmode_e mode;
+};
+
+/* This structure represents the state of one PWM timer */
+
+struct stm32_pwmtimer_s
+{
+  FAR const struct pwm_ops_s *ops;     /* PWM operations */
+  uint8_t timid;                       /* Timer ID {1,...,17} */
+  struct stm32_pwmchan_s channels[PWM_NCHANNELS];
+  uint8_t timtype;                     /* See the TIMTYPE_* definitions */
+  enum stm32_timmode_e mode;
+#ifdef CONFIG_PWM_PULSECOUNT
+  uint8_t irq;                         /* Timer update IRQ */
+  uint8_t prev;                        /* The previous value of the RCR (pre-loaded) */
+  uint8_t curr;                        /* The current value of the RCR (pre-loaded) */
+  uint32_t count;                      /* Remaining pluse count */
+#else
+  uint32_t frequency;                  /* Current frequency setting */
+#endif
+  uint32_t base;                       /* The base address of the timer */
+  uint32_t pclk;                       /* The frequency of the peripheral clock
+                                        * that drives the timer module. */
+#ifdef CONFIG_PWM_PULSECOUNT
+  FAR void *handle;                    /* Handle used for upper-half callback */
+#endif
+};
+
+/****************************************************************************
+ * Static Function Prototypes
+ ****************************************************************************/
+/* Register access */
+
+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);
+
+#ifdef CONFIG_DEBUG_PWM_INFO
+static void pwm_dumpregs(struct stm32_pwmtimer_s *priv, FAR const char *msg);
+#else
+#  define pwm_dumpregs(priv,msg)
+#endif
+
+/* Timer management */
+
+static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
+                     FAR const struct pwm_info_s *info);
+
+#if defined(CONFIG_PWM_PULSECOUNT) && (defined(CONFIG_STM32L4_TIM1_PWM) || defined(CONFIG_STM32L4_TIM8_PWM))
+static int pwm_interrupt(struct stm32_pwmtimer_s *priv);
+#if defined(CONFIG_STM32L4_TIM1_PWM)
+static int pwm_tim1interrupt(int irq, void *context);
+#endif
+#if defined(CONFIG_STM32L4_TIM8_PWM)
+static int pwm_tim8interrupt(int irq, void *context);
+#endif
+static uint8_t pwm_pulsecount(uint32_t count);
+#endif
+
+/* PWM driver methods */
+
+static int pwm_setup(FAR struct pwm_lowerhalf_s *dev);
+static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev);
+
+#ifdef CONFIG_PWM_PULSECOUNT
+static int pwm_start(FAR struct pwm_lowerhalf_s *dev,
+                     FAR const struct pwm_info_s *info,
+                     FAR void *handle);
+#else
+static int pwm_start(FAR struct pwm_lowerhalf_s *dev,
+                     FAR const struct pwm_info_s *info);
+#endif
+
+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_STM32L4_TIM1_PWM
+static struct stm32_pwmtimer_s g_pwm1dev =
+{
+  .ops         = &g_pwmops,
+  .timid       = 1,
+  .channels    =
+  {
+#ifdef CONFIG_STM32L4_TIM1_CHANNEL1
+    {
+      .channel = 1,
+      .pincfg  = PWM_TIM1_CH1CFG,
+      .mode    = CONFIG_STM32L4_TIM1_CH1MODE,
+    },
+#endif
+#ifdef CONFIG_STM32L4_TIM1_CHANNEL2
+    {
+      .channel = 2,
+      .pincfg  = PWM_TIM1_CH2CFG,
+      .mode    = CONFIG_STM32L4_TIM1_CH2MODE,
+    },
+#endif
+#ifdef CONFIG_STM32L4_TIM1_CHANNEL3
+    {
+      .channel = 3,
+      .pincfg  = PWM_TIM1_CH3CFG,
+      .mode    = CONFIG_STM32L4_TIM1_CH3MODE,
+    },
+#endif
+#ifdef CONFIG_STM32L4_TIM1_CHANNEL4
+    {
+      .channel = 4,
+      .pincfg  = PWM_TIM1_CH4CFG,
+      .mode    = CONFIG_STM32L4_TIM1_CH4MODE,
+    },
+#endif
+  },
+  .timtype     = TIMTYPE_TIM1,
+  .mode        = CONFIG_STM32L4_TIM1_MODE,
+#ifdef CONFIG_PWM_PULSECOUNT
+  .irq         = STM32L4_IRQ_TIM1UP,
+#endif
+  .base        = STM32L4_TIM1_BASE,
+  .pclk        = STM32L4_APB2_TIM1_CLKIN,
+};
+#endif
+
+#ifdef CONFIG_STM32L4_TIM2_PWM
+static struct stm32_pwmtimer_s g_pwm2dev =
+{
+  .ops         = &g_pwmops,
+  .timid       = 2,
+  .channels    =
+  {
+#ifdef CONFIG_STM32L4_TIM2_CHANNEL1
+    {
+      .channel = 1,
+      .pincfg  = PWM_TIM2_CH1CFG,
+      .mode    = CONFIG_STM32L4_TIM2_CH1MODE,
+    },
+#endif
+#ifdef CONFIG_STM32L4_TIM2_CHANNEL2
+    {
+      .channel = 2,
+      .pincfg  = PWM_TIM2_CH2CFG,
+      .mode    = CONFIG_STM32L4_TIM2_CH2MODE,
+    },
+#endif
+#ifdef CONFIG_STM32L4_TIM2_CHANNEL3
+    {
+      .channel = 3,
+      .pincfg  = PWM_TIM2_CH3CFG,
+      .mode    = CONFIG_STM32L4_TIM2_CH3MODE,
+    },
+#endif
+#ifdef CONFIG_STM32L4_TIM2_CHANNEL4
+    {
+      .channel = 4,
+      .pincfg  = PWM_TIM2_CH4CFG,
+      .mode    = CONFIG_STM32L4_TIM2_CH4MODE,
+    },
+#endif
+  },
+  .timtype     = TIMTYPE_TIM2,
+  .mode        = CONFIG_STM32L4_TIM2_MODE,
+#ifdef CONFIG_PWM_PULSECOUNT
+  .irq         = STM32L4_IRQ_TIM2,
+#endif
+  .base        = STM32L4_TIM2_BASE,
+  .pclk        = STM32L4_APB1_TIM2_CLKIN,
+};
+#endif
+
+#ifdef CONFIG_STM32L4_TIM3_PWM
+static struct stm32_pwmtimer_s g_pwm3dev =
+{
+  .ops         = &g_pwmops,
+  .timid       = 3,
+  .channels    =
+  {
+#ifdef CONFIG_STM32L4_TIM3_CHANNEL1
+    {
+      .channel = 1,
+      .pincfg  = PWM_TIM3_CH1CFG,
+      .mode    = CONFIG_STM32L4_TIM3_CH1MODE,
+    },
+#endif
+#ifdef CONFIG_STM32L4_TIM3_CHANNEL2
+    {
+      .channel = 2,
+      .pincfg  = PWM_TIM3_CH2CFG,
+      .mode    = CONFIG_STM32L4_TIM3_CH2MODE,
+    },
+#endif
+#ifdef CONFIG_STM32L4_TIM3_CHANNEL3
+    {
+      .channel = 3,
+      .pincfg  = PWM_TIM3_CH3CFG,
+      .mode    = CONFIG_STM32L4_TIM3_CH3MODE,
+    },
+#endif
+#ifdef CONFIG_STM32L4_TIM3_CHANNEL4
+    {
+      .channel = 4,
+      .pincfg  = PWM_TIM3_CH4CFG,
+      .mode    = CONFIG_STM32L4_TIM3_CH4MODE,
+    },
+#endif
+  },
+  .timtype     = TIMTYPE_TIM3,
+  .mode        = CONFIG_STM32L4_TIM3_MODE,
+#ifdef CONFIG_PWM_PULSECOUNT
+  .irq         = STM32L4_IRQ_TIM3,
+#endif
+  .base        = STM32L4_TIM3_BASE,
+  .pclk        = STM32L4_APB1_TIM3_CLKIN,
+};
+#endif
+
+#ifdef CONFIG_STM32L4_TIM4_PWM
+static struct stm32_pwmtimer_s g_pwm4dev =
+{
+  .ops         = &g_pwmops,
+  .timid       = 4,
+  .channels    =
+  {
+#ifdef CONFIG_STM32L4_TIM4_CHANNEL1
+    {
+      .channel = 1,
+      .pincfg  = PWM_TIM4_CH1CFG,
+      .mode    = CONFIG_STM32L4_TIM4_CH1MODE,
+    },
+#endif
+#ifdef CONFIG_STM32L4_TIM4_CHANNEL2
+    {
+      .channel = 2,
+      .pincfg  = PWM_TIM4_CH2CFG,
+      .mode    = CONFIG_STM32L4_TIM4_CH2MODE,
+    },
+#endif
+#ifdef CONFIG_STM32L4_TIM4_CHANNEL3
+    {
+      .channel = 3,
+      .pincfg  = PWM_TIM4_CH3CFG,
+      .mode    = CONFIG_STM32L4_TIM4_CH3MODE,
+    },
+#endif
+#ifdef CONFIG_STM32L4_TIM4_CHANNEL4
+    {
+      .channel = 4,
+      .pincfg  = PWM_TIM4_CH4CFG,
+      .mode    = CONFIG_STM32L4_TIM4_CH4MODE,
+    },
+#endif
+  },
+  .timtype     = TIMTYPE_TIM4,
+  .mode        = CONFIG_STM32L4_TIM4_MODE,
+#ifdef CONFIG_PWM_PULSECOUNT
+  .irq         = STM32L4_IRQ_TIM4,
+#endif
+  .base        = STM32L4_TIM4_BASE,
+  .pclk        = STM32L4_APB1_TIM4_CLKIN,
+};
+#endif
+
+#ifdef CONFIG_STM32L4_TIM5_PWM
+static struct stm32_pwmtimer_s g_pwm5dev =
+{
+  .ops         = &g_pwmops,
+  .timid       = 5,
+  .channels    =
+  {
+#ifdef CONFIG_STM32L4_TIM5_CHANNEL1
+    {
+      .channel = 1,
+      .pincfg  = PWM_TIM5_CH1CFG,
+      .mode    = CONFIG_STM32L4_TIM5_CH1MODE,
+    },
+#endif
+#ifdef CONFIG_STM32L4_TIM5_CHANNEL2
+    {
+      .channel = 2,
+      .pincfg  = PWM_TIM5_CH2CFG,
+      .mode    = CONFIG_STM32L4_TIM5_CH2MODE,
+    },
+#endif
+#ifdef CONFIG_STM32L4_TIM5_CHANNEL3
+    {
+      .channel = 3,
+      .pincfg  = PWM_TIM5_CH3CFG,
+      .mode    = CONFIG_STM32L4_TIM5_CH3MODE,
+    },
+#endif
+#ifdef CONFIG_STM32L4_TIM5_CHANNEL4
+    {
+      .channel = 4,
+      .pincfg  = PWM_TIM5_CH4CFG,
+      .mode    = CONFIG_STM32L4_TIM5_CH4MODE,
+    },
+#endif
+  },
+  .timtype     = TIMTYPE_TIM5,
+  .mode        = CONFIG_STM32L4_TIM5_MODE,
+#ifdef CONFIG_PWM_PULSECOUNT
+  .irq         = STM32L4_IRQ_TIM5,
+#endif
+  .base        = STM32L4_TIM5_BASE,
+  .pclk        = STM32L4_APB1_TIM5_CLKIN,
+};
+#endif
+
+#ifdef CONFIG_STM32L4_TIM8_PWM
+static struct stm32_pwmtimer_s g_pwm8dev =
+{
+  .ops         = &g_pwmops,
+  .timid       = 8,
+  .channels    =
+  {
+#ifdef CONFIG_STM32L4_TIM8_CHANNEL1
+    {
+      .channel = 1,
+      .pincfg  = PWM_TIM8_CH1CFG,
+      .mode    = CONFIG_STM32L4_TIM8_CH1MODE,
+    },
+#endif
+#ifdef CONFIG_STM32L4_TIM8_CHANNEL2
+    {
+      .channel = 2,
+      .pincfg  = PWM_TIM8_CH2CFG,
+      .mode    = CONFIG_STM32L4_TIM8_CH2MODE,
+    },
+#endif
+#ifdef CONFIG_STM32L4_TIM8_CHANNEL3
+    {
+      .channel = 3,
+      .pincfg  = PWM_TIM8_CH3CFG,
+      .mode    = CONFIG_STM32L4_TIM8_CH3MODE,
+    },
+#endif
+#ifdef CONFIG_STM32L4_TIM8_CHANNEL4
+    {
+      .channel = 4,
+      .pincfg  = PWM_TIM8_CH4CFG,
+      .mode    = CONFIG_STM32L4_TIM8_CH4MODE,
+    },
+#endif
+  },
+  .timtype     = TIMTYPE_TIM8,
+  .mode        = CONFIG_STM32L4_TIM8_MODE,
+#ifdef CONFIG_PWM_PULSECOUNT
+  .irq         = STM32L4_IRQ_TIM8UP,
+#endif
+  .base        = STM32L4_TIM8_BASE,
+  .pclk        = STM32L4_APB2_TIM8_CLKIN,
+};
+#endif
+
+#ifdef CONFIG_STM32L4_TIM15_PWM
+static struct stm32_pwmtimer_s g_pwm15dev =
+{
+  .ops         = &g_pwmops,
+  .timid       = 15,
+  .channels    =
+  {
+#ifdef CONFIG_STM32L4_TIM15_CHANNEL1
+    {
+      .channel = 1,
+      .pincfg  = PWM_TIM15_CH1CFG,
+      .mode    = CONFIG_STM32L4_TIM15_CH1MODE,
+    },
+#endif
+#ifdef CONFIG_STM32L4_TIM15_CHANNEL2
+    {
+      .channel = 2,
+      .pincfg  = PWM_TIM15_CH2CFG,
+      .mode    = CONFIG_STM32L4_TIM15_CH2MODE,
+    },
+#endif
+  },
+  .timtype     = TIMTYPE_TIM15,
+  .mode        = STM32L4_TIMMODE_COUNTUP,
+#ifdef CONFIG_PWM_PULSECOUNT
+  .irq         = STM32L4_IRQ_TIM15,
+#endif
+  .base        = STM32L4_TIM15_BASE,
+  .pclk        = STM32L4_APB1_TIM15_CLKIN,
+};
+#endif
+
+#ifdef CONFIG_STM32L4_TIM16_PWM
+static struct stm32_pwmtimer_s g_pwm16dev =
+{
+  .ops         = &g_pwmops,
+  .timid       = 16,
+  .channels    =
+  {
+#ifdef CONFIG_STM32L4_TIM16_CHANNEL1
+    {
+      .channel = 1,
+      .pincfg  = PWM_TIM16_CH1CFG,
+      .mode    = CONFIG_STM32L4_TIM16_CH1MODE,
+    },
+#endif
+  },
+  .timtype     = TIMTYPE_TIM16,
+  .mode        = STM32L4_TIMMODE_COUNTUP,
+#ifdef CONFIG_PWM_PULSECOUNT
+  .irq         = STM32L4_IRQ_TIM16,
+#endif
+  .base        = STM32L4_TIM16_BASE,
+  .pclk        = STM32L4_APB1_TIM16_CLKIN,
+};
+#endif
+
+#ifdef CONFIG_STM32L4_TIM17_PWM
+static struct stm32_pwmtimer_s g_pwm17dev =
+{
+  .ops         = &g_pwmops,
+  .timid       = 17,
+  .channels    =
+  {
+#ifdef CONFIG_STM32L4_TIM17_CHANNEL1
+    {
+      .channel = 1,
+      .pincfg  = PWM_TIM17_CH1CFG,
+      .mode    = CONFIG_STM32L4_TIM17_CH1MODE,
+    },
+#endif
+  },
+  .timtype     = TIMTYPE_TIM17,
+  .mode        = STM32L4_TIMMODE_COUNTUP,
+#ifdef CONFIG_PWM_PULSECOUNT
+  .irq         = STM32L4_IRQ_TIM17,
+#endif
+  .base        = STM32L4_TIM17_BASE,
+  .pclk        = STM32L4_APB1_TIM17_CLKIN,
+};
+#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 uint16_t pwm_getreg(struct stm32_pwmtimer_s *priv, int offset)
+{
+  return getreg16(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 stm32_pwmtimer_s *priv, int offset, uint16_t value)
+{
+  if (priv->timtype == TIMTYPE_GENERAL32 &&
+      (offset == STM32L4_GTIM_CNT_OFFSET ||
+       offset == STM32L4_GTIM_ARR_OFFSET ||
+       offset == STM32L4_GTIM_CCR1_OFFSET ||
+       offset == STM32L4_GTIM_CCR2_OFFSET ||
+       offset == STM32L4_GTIM_CCR3_OFFSET ||
+       offset == STM32L4_GTIM_CCR4_OFFSET))
+    {
+      /* a 32 bit access is required for a 32 bit register:
+       * if only a 16 bit write would be performed, then the
+       * upper 16 bits of the 32 bit register will be a copy of
+       * the lower 16 bits.
+       */
+
+      putreg32(value, priv->base + offset);
+    }
+  else
+    {
+      putreg16(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
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_DEBUG_PWM_INFO
+static void pwm_dumpregs(struct stm32_pwmtimer_s *priv, FAR const char *msg)
+{
+  pwminfo("%s:\n", msg);
+  pwminfo("  CR1: %04x CR2:  %04x SMCR:  %04x DIER:  %04x\n",
+          pwm_getreg(priv, STM32L4_GTIM_CR1_OFFSET),
+          pwm_getreg(priv, STM32L4_GTIM_CR2_OFFSET),
+          pwm_getreg(priv, STM32L4_GTIM_SMCR_OFFSET),
+          pwm_getreg(priv, STM32L4_GTIM_DIER_OFFSET));
+  pwminfo("   SR: %04x EGR:  %04x CCMR1: %04x CCMR2: %04x\n",
+          pwm_getreg(priv, STM32L4_GTIM_SR_OFFSET),
+          pwm_getreg(priv, STM32L4_GTIM_EGR_OFFSET),
+          pwm_getreg(priv, STM32L4_GTIM_CCMR1_OFFSET),
+          pwm_getreg(priv, STM32L4_GTIM_CCMR2_OFFSET));
+  pwminfo(" CCER: %04x CNT:  %04x PSC:   %04x ARR:   %04x\n",
+          pwm_getreg(priv, STM32L4_GTIM_CCER_OFFSET),
+          pwm_getreg(priv, STM32L4_GTIM_CNT_OFFSET),
+          pwm_getreg(priv, STM32L4_GTIM_PSC_OFFSET),
+          pwm_getreg(priv, STM32L4_GTIM_ARR_OFFSET));
+  pwminfo(" CCR1: %04x CCR2: %04x CCR3:  %04x CCR4:  %04x\n",
+          pwm_getreg(priv, STM32L4_GTIM_CCR1_OFFSET),
+          pwm_getreg(priv, STM32L4_GTIM_CCR2_OFFSET),
+          pwm_getreg(priv, STM32L4_GTIM_CCR3_OFFSET),
+          pwm_getreg(priv, STM32L4_GTIM_CCR4_OFFSET));
+#if defined(CONFIG_STM32L4_TIM1_PWM) || defined(CONFIG_STM32L4_TIM8_PWM)
+  if (priv->timtype == TIMTYPE_ADVANCED)
+    {
+      pwminfo("  RCR: %04x BDTR: %04x DCR:   %04x DMAR:  %04x\n",
+          pwm_getreg(priv, STM32L4_ATIM_RCR_OFFSET),
+          pwm_getreg(priv, STM32L4_ATIM_BDTR_OFFSET),
+          pwm_getreg(priv, STM32L4_ATIM_DCR_OFFSET),
+          pwm_getreg(priv, STM32L4_ATIM_DMAR_OFFSET));
+    }
+  else
+#endif
+    {
+      pwminfo("  DCR: %04x DMAR: %04x\n",
+          pwm_getreg(priv, STM32L4_GTIM_DCR_OFFSET),
+          pwm_getreg(priv, STM32L4_GTIM_DMAR_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 stm32_pwmtimer_s *priv,
+                     FAR const struct pwm_info_s *info)
+{
+#ifdef CONFIG_PWM_MULTICHAN
+  int      i;
+#endif
+
+  /* Calculated values */
+
+  uint32_t prescaler;
+  uint32_t timclk;
+  uint32_t reload;
+  uint32_t ccr;
+
+  /* Register contents */
+
+  uint16_t cr1;
+  uint16_t ccer;
+  uint16_t cr2;
+  uint32_t ccmr1;
+  uint32_t ccmr2;
+
+  /* New timer register bit settings */
+
+  uint16_t ccenable;
+  uint32_t ocmode1;
+  uint32_t ocmode2;
+
+  DEBUGASSERT(priv != NULL && info != NULL);
+
+#if defined(CONFIG_PWM_MULTICHAN)
+  pwminfo("TIM%u frequency: %u\n",
+          priv->timid, info->frequency);
+#elif defined(CONFIG_PWM_PULSECOUNT)
+  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
+  pwminfo("TIM%u channel: %u frequency: %u duty: %08x\n",
+          priv->timid, priv->channels[0].channel, info->frequency, info->duty);
+#endif
+
+  DEBUGASSERT(info->frequency > 0);
+#ifndef CONFIG_PWM_MULTICHAN
+  DEBUGASSERT(info->duty >= 0 && info->duty < uitoub16(100));
+#endif
+
+  /* Disable all interrupts and DMA requests, clear all pending status */
+
+#ifdef CONFIG_PWM_PULSECOUNT
+  pwm_putreg(priv, STM32L4_GTIM_DIER_OFFSET, 0);
+  pwm_putreg(priv, STM32L4_GTIM_SR_OFFSET, 0);
+#endif
+
+  /* Calculate optimal values for the timer prescaler and for the timer reload
+   * register.  If 'frequency' is the desired frequency, then
+   *
+   *   reload = timclk / frequency
+   *   timclk = pclk / presc
+   *
+   * Or,
+   *
+   *   reload = pclk / presc / frequency
+   *
+   * There are many solutions to this this, but the best solution will be the
+   * one that has the largest reload value and the smallest prescaler value.
+   * That is the solution that should give us the most accuracy in the timer
+   * control.  Subject to:
+   *
+   *   0 <= presc  <= 65536
+   *   1 <= reload <= 65535
+   *
+   * So presc = pclk / 65535 / frequency would be optimal.
+   *
+   * Example:
+   *
+   *  pclk      = 42 MHz
+   *  frequency = 100 Hz
+   *
+   *  prescaler = 42,000,000 / 65,535 / 100
+   *            = 6.4 (or 7 -- taking the ceiling always)
+   *  timclk    = 42,000,000 / 7
+   *            = 6,000,000
+   *  reload    = 6,000,000 / 100
+   *            = 60,000
+   */
+
+  prescaler = (priv->pclk / info->frequency + 65534) / 65535;
+  if (prescaler < 1)
+    {
+      prescaler = 1;
+    }
+  else if (prescaler > 65536)
+    {
+      prescaler = 65536;
+    }
+
+  timclk = priv->pclk / prescaler;
+
+  reload = timclk / info->frequency;
+  if (reload < 1)
+    {
+      reload = 1;
+    }
+  else if (reload > 65535)
+    {
+      reload = 65535;
+    }
+
+  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:
+   *
+   * 1,8   CKD[1:0] ARPE CMS[1:0] DIR OPM URS UDIS CEN
+   * 2-5   CKD[1:0] ARPE CMS      DIR OPM URS UDIS CEN
+   * 6-7            ARPE              OPM URS UDIS CEN
+   * 9-14  CKD[1:0] ARPE                  URS UDIS CEN
+   * 15-17 CKD[1:0] ARPE              OPM URS UDIS CEN
+   */
+
+  cr1 = pwm_getreg(priv, STM32L4_GTIM_CR1_OFFSET);
+
+  /* Disable the timer until we get it configured */
+
+  cr1 &= ~GTIM_CR1_CEN;
+
+  /* Set the counter mode for the advanced timers (1,8) and most general
+   * purpose timers (all 2-5, but not 9-17), i.e., all but TIMTYPE_COUNTUP16
+   * and TIMTYPE_BASIC
+   */
+
+#if defined(CONFIG_STM32L4_TIM1_PWM) || defined(CONFIG_STM32L4_TIM2_PWM) || \
+    defined(CONFIG_STM32L4_TIM3_PWM) || defined(CONFIG_STM32L4_TIM4_PWM) || \
+    defined(CONFIG_STM32L4_TIM5_PWM) || defined(CONFIG_STM32L4_TIM8_PWM)
+
+  if (priv->timtype != TIMTYPE_BASIC && priv->timtype != TIMTYPE_COUNTUP16)
+    {
+      /* Select the Counter Mode:
+       *
+       * GTIM_CR1_EDGE: The counter counts up or down depending on the
+       *   direction bit (DIR).
+       * GTIM_CR1_CENTER1, GTIM_CR1_CENTER2, GTIM_CR1_CENTER3: The counter
+       *   counts up then down.
+       * GTIM_CR1_DIR: 0: count up, 1: count down
+       */
+
+      cr1 &= ~(GTIM_CR1_DIR | GTIM_CR1_CMS_MASK);
+
+      switch (priv->mode)
+        {
+          case STM32_TIMMODE_COUNTUP:
+            cr1 |= GTIM_CR1_EDGE;
+            break;
+
+          case STM32_TIMMODE_COUNTDOWN:
+            cr1 |= GTIM_CR1_EDGE | GTIM_CR1_DIR;
+            break;
+
+          case STM32_TIMMODE_CENTER1:
+            cr1 |= GTIM_CR1_CENTER1;
+            break;
+
+          case STM32_TIMMODE_CENTER2:
+            cr1 |= GTIM_CR1_CENTER2;
+            break;
+
+          case STM32_TIMMODE_CENTER3:
+            cr1 |= GTIM_CR1_CENTER3;
+            break;
+
+          default:
+            pwmerr("ERROR: No such timer mode: %u\n", (unsigned int)priv->mode);
+            return -EINVAL;
+        }
+    }
+#endif
+
+  /* Set the clock division to zero for all (but the basic timers, but there
+   * should be no basic timers in this context
+   */
+
+  cr1 &= ~GTIM_CR1_CKD_MASK;
+  pwm_putreg(priv, STM32L4_GTIM_CR1_OFFSET, cr1);
+
+  /* Set the reload and prescaler values */
+
+  pwm_putreg(priv, STM32L4_GTIM_ARR_OFFSET, (uint16_t)reload);
+  pwm_putreg(priv, STM32L4_GTIM_PSC_OFFSET, (uint16_t)(prescaler - 1));
+
+  /* Set the advanced timer's repetition counter */
+
+#if defined(CONFIG_STM32L4_TIM1_PWM) || defined(CONFIG_STM32L4_TIM8_PWM)
+  if (priv->timtype == TIMTYPE_ADVANCED)
+    {
+      /* If a non-zero repetition count has been selected, then set the
+       * repitition counter to the count-1 (pwm_start() has already
+       * assured us that the count value is within range).
+       */
+
+#ifdef CONFIG_PWM_PULSECOUNT
+      if (info->count > 0)
+        {
+          /* Save the remaining count and the number of counts that will have
+           * elapsed on the first interrupt.
+           */
+
+          /* If the first interrupt occurs at the end end of the first
+           * repetition count, then the count will be the same as the RCR
+           * value.
+           */
+
+          priv->prev  = pwm_pulsecount(info->count);
+          pwm_putreg(priv, STM32L4_ATIM_RCR_OFFSET, (uint16_t)priv->prev - 1);
+
+          /* Generate an update event to reload the prescaler.  This should
+           * preload the RCR into active repetition counter.
+           */
+
+          pwm_putreg(priv, STM32L4_GTIM_EGR_OFFSET, ATIM_EGR_UG);
+
+          /* Now set the value of the RCR that will be loaded on the next
+           * update event.
+           */
+
+          priv->count = info->count;
+          priv->curr  = pwm_pulsecount(info->count - priv->prev);
+          pwm_putreg(priv, STM32L4_ATIM_RCR_OFFSET, (uint16_t)priv->curr - 1);
+        }
+
+      /* Otherwise, just clear the repetition counter */
+
+      else
+#endif
+        {
+          /* Set the repetition counter to zero */
+
+          pwm_putreg(priv, STM32L4_ATIM_RCR_OFFSET, 0);
+
+          /* Generate an update event to reload the prescaler */
+
+          pwm_putreg(priv, STM32L4_GTIM_EGR_OFFSET, ATIM_EGR_UG);
+        }
+    }
+  else
+#endif
+    {
+      /* Generate an update event to reload the prescaler (all timers) */
+
+      pwm_putreg(priv, STM32L4_GTIM_EGR_OFFSET, ATIM_EGR_UG);
+    }
+
+  /* Handle channel specific setup */
+
+  ccenable = 0;
+  ocmode1  = 0;
+  ocmode2  = 0;
+
+#ifdef CONFIG_PWM_MULTICHAN
+  for (i = 0; i < CONFIG_PWM_NCHANNELS; i++)
+#endif
+    {
+      ub16_t                duty;
+      uint32_t              chanmode;
+      bool                  ocmbit = false;
+      uint8_t               channel;
+#ifdef CONFIG_PWM_MULTICHAN
+      int                   j;
+#endif
+      enum stm32_chanmode_e mode;
+
+#ifdef CONFIG_PWM_MULTICHAN
+      duty = info->channels[i].duty;
+      channel = info->channels[i].channel;
+
+      /* A value of zero means to skip this channel */
+
+      if (channel == 0)
+        {
+          continue;
+        }
+
+      /* Find the channel */
+
+      for (j = 0; j < PWM_NCHANNELS; j++)
+        {
+          if (priv->channels[j].channel == channel)
+            {
+              mode = priv->channels[j].mode;
+              break;
+            }
+        }
+
+      if (j >= PWM_NCHANNELS)
+        {
+          pwmerr("ERROR: No such channel: %u\n", channel);
+          return -EINVAL;
+        }
+#else
+      duty = info->duty;
+      channel = priv->channels[0].channel;
+      mode = priv->channels[0].mode;
+#endif
+
+      /* Duty cycle:
+       *
+       * duty cycle = ccr / reload (fractional value)
+       */
+
+      ccr = b16toi(duty * reload + b16HALF);
+
+      pwminfo("ccr: %u\n", ccr);
+
+      switch (mode)
+        {
+          case STM32_CHANMODE_PWM1:
+            chanmode = ATIM_CCMR_MODE_PWM1;
+            break;
+
+          case STM32_CHANMODE_PWM2:
+            chanmode = ATIM_CCMR_MODE_PWM2;
+            break;
+
+          case STM32_CHANMODE_COMBINED1:
+            chanmode = ATIM_CCMR_MODE_COMBINED1;
+            ocmbit = true;
+            break;
+
+          case STM32_CHANMODE_COMBINED2:
+            chanmode = ATIM_CCMR_MODE_COMBINED2;
+            ocmbit = true;
+            break;
+
+          case STM32_CHANMODE_ASYMMETRIC1:
+            chanmode = ATIM_CCMR_MODE_ASYMMETRIC1;
+            ocmbit = true;
+            break;
+
+          case STM32_CHANMODE_ASYMMETRIC2:
+            chanmode = ATIM_CCMR_MODE_ASYMMETRIC2;
+            ocmbit = true;
+            break;
+
+          default:
+            pwmerr("ERROR: No such mode: %u\n", (unsigned int)mode);
+            return -EINVAL;
+        }
+
+      switch (channel)
+        {
+          case 1:  /* PWM Mode configuration: Channel 1 */
+            {
+              /* Select the CCER enable bit for this channel */
+
+              ccenable |= ATIM_CCER_CC1E;
+
+              /* Set the CCMR1 mode values (leave CCMR2 zero) */
+
+              ocmode1  |= (ATIM_CCMR_CCS_CCOUT << ATIM_CCMR1_CC1S_SHIFT) |
+                          (chanmode << ATIM_CCMR1_OC1M_SHIFT) |
+                          ATIM_CCMR1_OC1PE;
+
+              if (ocmbit)
+                {
+                  ocmode1 |= ATIM_CCMR1_OC1M;
+                }
+
+              /* Set the duty cycle by writing to the CCR register for this channel */
+
+              pwm_putreg(priv, STM32L4_GTIM_CCR1_OFFSET, (uint16_t)ccr);
+            }
+            break;
+
+          case 2:  /* PWM Mode configuration: Channel 2 */
+            {
+              /* Select the CCER enable bit for this channel */
+
+              ccenable |= ATIM_CCER_CC2E;
+
+              /* Set the CCMR1 mode values (leave CCMR2 zero) */
+
+              ocmode1  |= (ATIM_CCMR_CCS_CCOUT << ATIM_CCMR1_CC2S_SHIFT) |
+                          (chanmode << ATIM_CCMR1_OC2M_SHIFT) |
+                          ATIM_CCMR1_OC2PE;
+
+              if (ocmbit)
+                {
+                  ocmode1 |= ATIM_CCMR1_OC2M;
+                }
+
+              /* Set the duty cycle by writing to the CCR register for this channel */
+
+              pwm_putreg(priv, STM32L4_GTIM_CCR2_OFFSET, (uint16_t)ccr);
+            }
+            break;
+
+          case 3:  /* PWM Mode configuration: Channel 3 */
+            {
+              /* Select the CCER enable bit for this channel */
+
+              ccenable |= ATIM_CCER_CC3E;
+
+              /* Set the CCMR2 mode values (leave CCMR1 zero) */
+
+              ocmode2  |= (ATIM_CCMR_CCS_CCOUT << ATIM_CCMR2_CC3S_SHIFT) |
+                          (chanmode << ATIM_CCMR2_OC3M_SHIFT) |
+                          ATIM_CCMR2_OC3PE;
+
+              if (ocmbit)
+                {
+                  ocmode2 |= ATIM_CCMR2_OC3M;
+                }
+
+              /* Set the duty cycle by writing to the CCR register for this channel */
+
+              pwm_putreg(priv, STM32L4_GTIM_CCR3_OFFSET, (uint16_t)ccr);
+            }
+            break;
+
+          case 4:  /* PWM Mode configuration: Channel 4 */
+            {
+              /* Select the CCER enable bit for this channel */
+
+              ccenable |= ATIM_CCER_CC4E;
+
+              /* Set the CCMR2 mode values (leave CCMR1 zero) */
+
+              ocmode2  |= (ATIM_CCMR_CCS_CCOUT << ATIM_CCMR2_CC4S_SHIFT) |
+                          (chanmode << ATIM_CCMR2_OC4M_SHIFT) |
+                          ATIM_CCMR2_OC4PE;
+
+              if (ocmbit)
+                {
+                  ocmode2 |= ATIM_CCMR2_OC4M;
+                }
+
+              /* Set the duty cycle by writing to the CCR register for this channel */
+
+              pwm_putreg(priv, STM32L4_GTIM_CCR4_OFFSET, (uint16_t)ccr);
+            }
+            break;
+
+          default:
+            pwmerr("ERROR: No such channel: %u\n", channel);
+            return -EINVAL;
+        }
+    }
+
+  /* Disable the Channel by resetting the CCxE Bit in the CCER register */
+
+  ccer = pwm_getreg(priv, STM32L4_GTIM_CCER_OFFSET);
+  ccer &= ~ccenable;
+  pwm_putreg(priv, STM32L4_GTIM_CCER_OFFSET, ccer);
+
+  /* Fetch the CR2, CCMR1, and CCMR2 register (already have cr1 and ccer) */
+
+  cr2   = pwm_getreg(priv, STM32L4_GTIM_CR2_OFFSET);
+  ccmr1 = pwm_getreg(priv, STM32L4_GTIM_CCMR1_OFFSET);
+  ccmr2 = pwm_getreg(priv, STM32L4_GTIM_CCMR2_OFFSET);
+
+  /* Reset the Output Compare Mode Bits and set the select output compare mode */
+
+  ccmr1 &= ~(ATIM_CCMR1_CC1S_MASK | ATIM_CCMR1_OC1M_MASK | ATIM_CCMR1_OC1PE |
+             ATIM_CCMR1_CC2S_MASK | ATIM_CCMR1_OC2M_MASK | ATIM_CCMR1_OC2PE
+             | ATIM_CCMR1_OC1M | ATIM_CCMR1_OC2M
+             );
+  ccmr2 &= ~(ATIM_CCMR2_CC3S_MASK | ATIM_CCMR2_OC3M_MASK | ATIM_CCMR2_OC3PE |
+             ATIM_CCMR2_CC4S_MASK | ATIM_CCMR2_OC4M_MASK | ATIM_CCMR2_OC4PE
+             | ATIM_CCMR2_OC3M | ATIM_CCMR2_OC4M
+             );
+  ccmr1 |= ocmode1;
+  ccmr2 |= ocmode2;
+
+  /* Reset the output polarity level of all channels (selects high polarity)*/
+
+  ccer &= ~(ATIM_CCER_CC1P | ATIM_CCER_CC2P | ATIM_CCER_CC3P | ATIM_CCER_CC4P);
+
+  /* Enable the output state of the selected channels */
+
+  ccer &= ~(ATIM_CCER_CC1E | ATIM_CCER_CC2E | ATIM_CCER_CC3E | ATIM_CCER_CC4E);
+  ccer |= ccenable;
+
+  /* Some special setup for advanced timers */
+
+#if defined(CONFIG_STM32L4_TIM1_PWM) || defined(CONFIG_STM32L4_TIM8_PWM)
+  if (priv->timtype == TIMTYPE_ADVANCED)
+    {
+      uint16_t bdtr;
+
+      /* Reset output N polarity level, output N state, output compare state,
+       * output compare N idle state.
+       */
+
+      ccer &= ~(ATIM_CCER_CC1NE | ATIM_CCER_CC1NP | ATIM_CCER_CC2NE | ATIM_CCER_CC2NP |
+                ATIM_CCER_CC3NE | ATIM_CCER_CC3NP | ATIM_CCER_CC4NP);
+
+      /* Reset the output compare and output compare N IDLE State */
+
+      cr2 &= ~(ATIM_CR2_OIS1 | ATIM_CR2_OIS1N | ATIM_CR2_OIS2 | ATIM_CR2_OIS2N |
+               ATIM_CR2_OIS3 | ATIM_CR2_OIS3N | ATIM_CR2_OIS4);
+
+      /* Set the main output enable (MOE) bit and clear the OSSI and OSSR
+       * bits in the BDTR register.
+       */
+
+      bdtr  = pwm_getreg(priv, STM32L4_ATIM_BDTR_OFFSET);
+      bdtr &= ~(ATIM_BDTR_OSSI | ATIM_BDTR_OSSR);
+      bdtr |= ATIM_BDTR_MOE;
+      pwm_putreg(priv, STM32L4_ATIM_BDTR_OFFSET, bdtr);
+    }
+  else
+#endif
+    {
+      ccer &= ~(GTIM_CCER_CC1NP | GTIM_CCER_CC2NP | GTIM_CCER_CC3NP | ATIM_CCER_CC4NP);
+    }
+
+  /* Save the modified register values */
+
+  pwm_putreg(priv, STM32L4_GTIM_CR2_OFFSET, cr2);
+  putreg32(ccmr1, priv->base + STM32L4_GTIM_CCMR1_OFFSET);
+  putreg32(ccmr2, priv->base + STM32L4_GTIM_CCMR2_OFFSET);
+  pwm_putreg(priv, STM32L4_GTIM_CCER_OFFSET, ccer);
+
+  /* Set the ARR Preload Bit */
+
+  cr1 = pwm_getreg(priv, STM32L4_GTIM_CR1_OFFSET);
+  cr1 |= GTIM_CR1_ARPE;
+  pwm_putreg(priv, STM32L4_GTIM_CR1_OFFSET, cr1);
+
+  /* Setup update interrupt.  If info->count is > 0, then we can be
+   * assured that pwm_start() has already verified: (1) that this is an
+   * advanced timer, and that (2) the repetition count is within range.
+   */
+
+#ifdef CONFIG_PWM_PULSECOUNT
+  if (info->count > 0)
+    {
+      /* Clear all pending interrupts and enable the update interrupt. */
+
+      pwm_putreg(priv, STM32L4_GTIM_SR_OFFSET, 0);
+      pwm_putreg(priv, STM32L4_GTIM_DIER_OFFSET, ATIM_DIER_UIE);
+
+      /* Enable the timer */
+
+      cr1 |= GTIM_CR1_CEN;
+      pwm_putreg(priv, STM32L4_GTIM_CR1_OFFSET, cr1);
+
+      /* And enable timer interrupts at the NVIC */
+
+      up_enable_irq(priv->irq);
+    }
+  else
+#endif
+    {
+      /* Just enable the timer, leaving all interrupts disabled */
+
+      cr1 |= GTIM_CR1_CEN;
+      pwm_putreg(priv, STM32L4_GTIM_CR1_OFFSET, cr1);
+    }
+
+  pwm_dumpregs(priv, "After starting");
+  return OK;
+}
+
+#ifndef CONFIG_PWM_PULSECOUNT
+/****************************************************************************
+ * Name: pwm_update_duty
+ *
+ * Description:
+ *   Try to change only channel duty.
+ *
+ * Input parameters:
+ *   priv    - A reference to the lower half PWM driver state structure
+ *   channel - Channel to by updated
+ *   duty    - New duty.
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure
+ *
+ ****************************************************************************/
+
+static  int pwm_update_duty(FAR struct stm32_pwmtimer_s *priv, uint8_t channel,
+                            ub16_t duty)
+{
+  /* Register offset */
+
+  int ccr_offset;
+
+  /* Calculated values */
+
+  uint32_t reload;
+  uint32_t ccr;
+
+  DEBUGASSERT(priv != NULL);
+
+  pwminfo("TIM%u channel: %u duty: %08x\n",
+          priv->timid, channel, duty);
+
+#ifndef CONFIG_PWM_MULTICHAN
+  DEBUGASSERT(channel == priv->channels[0].channel);
+  DEBUGASSERT(duty >= 0 && duty < uitoub16(100));
+#endif
+
+  /* Get the reload values */
+
+  reload = pwm_getreg(priv, STM32L4_GTIM_ARR_OFFSET);
+
+  /* Duty cycle:
+   *
+   * duty cycle = ccr / reload (fractional value)
+   */
+
+  ccr = b16toi(duty * reload + b16HALF);
+
+  pwminfo("ccr: %u\n", ccr);
+
+  switch (channel)
+    {
+      case 1:  /* Register offset for Channel 1 */
+        ccr_offset = STM32L4_GTIM_CCR1_OFFSET;
+        break;
+
+      case 2:  /* Register offset for Channel 2 */
+        ccr_offset = STM32L4_GTIM_CCR2_OFFSET;
+        break;
+
+      case 3:  /* Register offset for Channel 3 */
+        ccr_offset = STM32L4_GTIM_CCR3_OFFSET;
+        break;
+
+      case 4:  /* Register offset for Channel 4 */
+        ccr_offset = STM32L4_GTIM_CCR4_OFFSET;
+        break;
+
+      default:
+        pwmerr("ERROR: No such channel: %u\n", channel);
+        return -EINVAL;
+    }
+
+  /* Set the duty cycle by writing to the CCR register for this channel */
+
+  pwm_putreg(priv, ccr_offset, (uint16_t)ccr);
+
+  return OK;
+}
+#endif
+
+/****************************************************************************
+ * Name: pwm_interrupt
+ *
+ * Description:
+ *   Handle timer interrupts.
+ *
+ * Input parameters:
+ *   priv - A reference to the lower half PWM driver state structure
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure
+ *
+ ****************************************************************************/
+
+#if defined(CONFIG_PWM_PULSECOUNT) && (defined(CONFIG_STM32_TIM1_PWM) || defined(CONFIG_STM32_TIM8_PWM))
+static int pwm_interrupt(struct stm32_pwmtimer_s *priv)
+{
+  uint16_t regval;
+
+  /* Verify that this is an update interrupt.  Nothing else is expected. */
+
+  regval = pwm_getreg(priv, STM32L4_ATIM_SR_OFFSET);
+  DEBUGASSERT((regval & ATIM_SR_UIF) != 0);
+
+  /* Clear the UIF interrupt bit */
+
+  pwm_putreg(priv, STM32L4_ATIM_SR_OFFSET, regval & ~ATIM_SR_UIF);
+
+  /* Calculate the new count by subtracting the number of pulses
+   * since the last interrupt.
+   */
+
+  if (priv->count <= priv->prev)
+    {
+      /* We are finished.  Turn off the mast output to stop the output as
+       * quickly as possible.
+       */
+
+      regval  = pwm_getreg(priv, STM32L4_ATIM_BDTR_OFFSET);
+      regval &= ~ATIM_BDTR_MOE;
+      pwm_putreg(priv, STM32L4_ATIM_BDTR_OFFSET, regval);
+
+      /* Disable first interrtups, stop and reset the timer */
+
+      (void)pwm_stop((FAR struct pwm_lowerhalf_s *)priv);
+
+      /* Then perform the callback into the upper half driver */
+
+      pwm_expired(priv->handle);
+
+      priv->handle = NULL;
+      priv->count  = 0;
+      priv->prev   = 0;
+      priv->curr   = 0;
+    }
+  else
+    {
+      /* Decrement the count of pulses remaining using the number of
+       * pulses generated since the last interrupt.
+       */
+
+      priv->count -= priv->prev;
+
+      /* Set up the next RCR.  Set 'prev' to the value of the RCR that
+       * was loaded when the update occurred (just before this interrupt)
+       * and set 'curr' to the current value of the RCR register (which
+       * will bet loaded on the next update event).
+       */
+
+      priv->prev = priv->curr;
+      priv->curr = pwm_pulsecount(priv->count - priv->prev);
+      pwm_putreg(priv, STM32L4_ATIM_RCR_OFFSET, (uint16_t)priv->curr - 1);
+    }
+
+  /* Now all of the time critical stuff is done so we can do some debug output */
+
+  pwminfo("Update interrupt SR: %04x prev: %u curr: %u count: %u\n",
+          regval, priv->prev, priv->curr, priv->count);
+
+  return OK;
+}
+#endif
+
+/****************************************************************************
+ * Name: pwm_tim1/8interrupt
+ *
+ * Description:
+ *   Handle timer 1 and 8 interrupts.
+ *
+ * Input parameters:
+ *   Standard NuttX interrupt inputs
+ *
+ * Returned Value:
+ *   Zero on success; a negated errno value on failure
+ *
+ ****************************************************************************/
+
+#if defined(CONFIG_PWM_PULSECOUNT) && defined(CONFIG_STM32_TIM1_PWM)
+static int pwm_tim1interrupt(int irq, void *context)
+{
+  return pwm_interrupt(&g_pwm1dev);
+}
+#endif
+
+#if defined(CONFIG_PWM_PULSECOUNT) && defined(CONFIG_STM32_TIM8_PWM)
+static int pwm_tim8interrupt(int irq, void *context)
+{
+  return pwm_interrupt(&g_pwm8dev);
+}
+#endif
+
+/****************************************************************************
+ * Name: pwm_pulsecount
+ *
+ * Description:
+ *   Pick an optimal pulse count to program the RCR.
+ *
+ * Input parameters:
+ *   count - The total count remaining
+ *
+ * Returned Value:
+ *   The recommended pulse count
+ *
+ ****************************************************************************/
+
+#if defined(CONFIG_PWM_PULSECOUNT) && (defined(CONFIG_STM32_TIM1_PWM) || defined(CONFIG_STM32_TIM8_PWM))
+static uint8_t pwm_pulsecount(uint32_t count)
+{
+  /* The the remaining pulse count is less than or equal to the maximum, the
+   * just return the count.
+   */
+
+  if (count <= ATIM_RCR_REP_MAX)
+    {
+      return count;
+    }
+
+  /* Otherwise, we have to be careful.  We do not want a small number of
+   * counts at the end because we might have trouble responding fast enough.
+   * If the remaining count is less than 150% of the maximum, then return
+   * half of the maximum.  In this case the final sequence will be between 64
+   * and 128.
+   */
+
+  else if (count < (3 * ATIM_RCR_REP_MAX / 2))
+    {
+      return (ATIM_RCR_REP_MAX + 1) >> 1;
+    }
+
+  /* Otherwise, return the maximum.  The final count will be 64 or more */
+
+  else
+    {
+      return ATIM_RCR_REP_MAX;
+    }
+}
+#endif
+
+/****************************************************************************
+ * Name: pwm_set_apb_clock
+ *
+ * Description:
+ *   Enable or disable APB clock for the timer peripheral
+ *
+ * Input parameters:
+ *   dev - A reference to the lower half PWM driver state structure
+ *   on  - Enable clock if 'on' is 'true' and disable if 'false'
+ *
+ ****************************************************************************/
+
+static void pwm_set_apb_clock(FAR struct stm32_pwmtimer_s *priv, bool on)
+{
+  uint32_t en_bit;
+  uint32_t regaddr;
+
+  /* Determine which timer to configure */
+
+  switch (priv->timid)
+    {
+#ifdef CONFIG_STM32L4_TIM1_PWM
+      case 1:
+        regaddr  = STM32L4_RCC_APB2ENR;
+        en_bit   = RCC_APB2ENR_TIM1EN;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM2_PWM
+      case 2:
+        regaddr  = STM32L4_RCC_APB1ENR;
+        en_bit   = RCC_APB1ENR_TIM2EN;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM3_PWM
+      case 3:
+        regaddr  = STM32L4_RCC_APB1ENR;
+        en_bit   = RCC_APB1ENR_TIM3EN;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM4_PWM
+      case 4:
+        regaddr  = STM32L4_RCC_APB1ENR;
+        en_bit   = RCC_APB1ENR_TIM4EN;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM5_PWM
+      case 5:
+        regaddr  = STM32L4_RCC_APB1ENR;
+        en_bit   = RCC_APB1ENR_TIM5EN;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM8_PWM
+      case 8:
+        regaddr  = STM32L4_RCC_APB2ENR;
+        en_bit   = RCC_APB2ENR_TIM8EN;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM15_PWM
+      case 15:
+        regaddr  = STM32L4_RCC_APB2ENR;
+        en_bit   = RCC_APB2ENR_TIM15EN;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM16_PWM
+      case 16:
+        regaddr  = STM32L4_RCC_APB2ENR;
+        en_bit   = RCC_APB2ENR_TIM16EN;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM17_PWM
+      case 17:
+        regaddr  = STM32L4_RCC_APB2ENR;
+        en_bit   = RCC_APB2ENR_TIM17EN;
+        break;
+#endif
+      default:
+        return;
+    }
+
+  /* Enable/disable APB 1/2 clock for timer */
+
+  if (on)
+    {
+      modifyreg32(regaddr, 0, en_bit);
+    }
+  else
+    {
+      modifyreg32(regaddr, en_bit, 0);
+    }
+}
+
+/****************************************************************************
+ * 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:
+ *   APB1 or 2 clocking for the GPIOs has already been configured by the RCC
+ *   logic at power up.
+ *
+ ****************************************************************************/
+
+static int pwm_setup(FAR struct pwm_lowerhalf_s *dev)
+{
+  FAR struct stm32_pwmtimer_s *priv = (FAR struct stm32_pwmtimer_s *)dev;
+  uint32_t pincfg;
+  int i;
+
+  pwminfo("TIM%u\n", priv->timid);
+  pwm_dumpregs(priv, "Initially");
+
+  /* Enable APB1/2 clocking for timer. */
+
+  pwm_set_apb_clock(priv, true);
+
+  /* Configure the PWM output pins, but do not start the timer yet */
+
+  for (i = 0; i < PWM_NCHANNELS; i++)
+    {
+      pincfg = priv->channels[i].pincfg;
+      if (pincfg == 0)
+        {
+          continue;
+        }
+
+      pwminfo("pincfg: %08x\n", pincfg);
+
+      stm32_configgpio(pincfg);
+      pwm_dumpgpio(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 stm32_pwmtimer_s *priv = (FAR struct stm32_pwmtimer_s *)dev;
+  uint32_t pincfg;
+  int i;
+
+  pwminfo("TIM%u\n", priv->timid);
+
+  /* Make sure that the output has been stopped */
+
+  pwm_stop(dev);
+
+  /* Disable APB1/2 clocking for timer. */
+
+  pwm_set_apb_clock(priv, false);
+
+  /* Then put the GPIO pins back to the default state */
+
+  for (i = 0; i < PWM_NCHANNELS; i++)
+    {
+      pincfg = priv->channels[i].pincfg;
+      if (pincfg == 0)
+        {
+          continue;
+        }
+
+      pwminfo("pincfg: %08x\n", pincfg);
+
+      pincfg &= (GPIO_PORT_MASK | GPIO_PIN_MASK);
+
+      pincfg |= GPIO_INPUT | GPIO_FLOAT;
+
+      stm32_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
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_PWM_PULSECOUNT
+static int pwm_start(FAR struct pwm_lowerhalf_s *dev,
+                     FAR const struct pwm_info_s *info,
+                     FAR void *handle)
+{
+  FAR struct stm32_pwmtimer_s *priv = (FAR struct stm32_pwmtimer_s *)dev;
+
+  /* Check if a pulsecount has been selected */
+
+  if (info->count > 0)
+    {
+      /* Only the advanced timers (TIM1,8 can support the pulse counting) */
+
+      if (priv->timtype != TIMTYPE_ADVANCED)
+        {
+          pwmerr("ERROR: TIM%u cannot support pulse count: %u\n",
+                 priv->timid, info->count);
+          return -EPERM;
+        }
+    }
+
+  /* Save the handle */
+
+  priv->handle = handle;
+
+  /* Start the time */
+
+  return pwm_timer(priv, info);
+}
+#else
+static int pwm_start(FAR struct pwm_lowerhalf_s *dev,
+                     FAR const struct pwm_info_s *info)
+{
+  int ret = OK;
+  FAR struct stm32_pwmtimer_s *priv = (FAR struct stm32_pwmtimer_s *)dev;
+
+#ifndef CONFIG_PWM_PULSECOUNT
+  /* if frequency has not changed we just update duty */
+
+  if (info->frequency == priv->frequency)
+    {
+#ifdef CONFIG_PWM_MULTICHAN
+      int i;
+
+      for (i = 0; ret == OK && i < CONFIG_PWM_NCHANNELS; i++)
+        {
+          ret = pwm_update_duty(priv,info->channels[i].channel,
+                                info->channels[i].duty);
+        }
+#else
+      ret = pwm_update_duty(priv,priv->channels[0].channel,info->duty);
+#endif
+    }
+  else
+#endif
+    {
+      ret = pwm_timer(priv, info);
+
+#ifndef CONFIG_PWM_PULSECOUNT
+      /* Save current frequency */
+
+      if (ret == OK)
+        {
+          priv->frequency = info->frequency;
+        }
+#endif
+    }
+
+  return ret;
+}
+#endif
+
+/****************************************************************************
+ * 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 stm32_pwmtimer_s *priv = (FAR struct stm32_pwmtimer_s *)dev;
+  uint32_t resetbit;
+  uint32_t regaddr;
+  uint32_t regval;
+  irqstate_t flags;
+
+  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.
+   */
+
+  flags = enter_critical_section();
+
+  /* Stopped so frequency is zero */
+
+  priv->frequency = 0;
+
+  /* Disable further interrupts and stop the timer */
+
+  pwm_putreg(priv, STM32L4_GTIM_DIER_OFFSET, 0);
+  pwm_putreg(priv, STM32L4_GTIM_SR_OFFSET, 0);
+
+  /* Determine which timer to reset */
+
+  switch (priv->timid)
+    {
+#ifdef CONFIG_STM32L4_TIM1_PWM
+      case 1:
+        regaddr  = STM32L4_RCC_APB2RSTR;
+        resetbit = RCC_APB2RSTR_TIM1RST;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM2_PWM
+      case 2:
+        regaddr  = STM32L4_RCC_APB1RSTR;
+        resetbit = RCC_APB1RSTR_TIM2RST;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM3_PWM
+      case 3:
+        regaddr  = STM32L4_RCC_APB1RSTR;
+        resetbit = RCC_APB1RSTR_TIM3RST;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM4_PWM
+      case 4:
+        regaddr  = STM32L4_RCC_APB1RSTR;
+        resetbit = RCC_APB1RSTR_TIM4RST;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM5_PWM
+      case 5:
+        regaddr  = STM32L4_RCC_APB1RSTR;
+        resetbit = RCC_APB1RSTR_TIM5RST;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM8_PWM
+      case 8:
+        regaddr  = STM32L4_RCC_APB2RSTR;
+        resetbit = RCC_APB2RSTR_TIM8RST;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM16_PWM
+      case 16:
+        regaddr  = STM32L4_RCC_APB2RSTR;
+        resetbit = RCC_APB2RSTR_TIM16RST;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM17_PWM
+      case 17:
+        regaddr  = STM32L4_RCC_APB2RSTR;
+        resetbit = RCC_APB2RSTR_TIM17RST;
+        break;
+#endif
+      default:
+        return -EINVAL;
+    }
+
+  /* Reset the timer - stopping the output and putting the timer back
+   * into a state where pwm_start() can be called.
+   */
+
+  regval  = getreg32(regaddr);
+  regval |= resetbit;
+  putreg32(regval, regaddr);
+
+  regval &= ~resetbit;
+  putreg32(regval, regaddr);
+  leave_critical_section(flags);
+
+  pwminfo("regaddr: %08x resetbit: %08x\n", regaddr, resetbit);
+  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_INFO
+  FAR struct stm32_pwmtimer_s *priv = (FAR struct stm32_pwmtimer_s *)dev;
+
+  /* There are no platform-specific ioctl commands */
+
+  pwminfo("TIM%u\n", priv->timid);
+#endif
+  return -ENOTTY;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stm32l4_pwminitialize
+ *
+ * Description:
+ *   Initialize one timer for use with the upper_level PWM driver.
+ *
+ * Input Parameters:
+ *   timer - A number identifying the timer use.  The number of valid timer
+ *     IDs varies with the STM32 MCU and MCU family but is somewhere in
+ *     the range of {1,..,17}.
+ *
+ * Returned Value:
+ *   On success, a pointer to the STM32 lower half PWM driver is returned.
+ *   NULL is returned on any failure.
+ *
+ ****************************************************************************/
+
+FAR struct pwm_lowerhalf_s *stm32l4_pwminitialize(int timer)
+{
+  FAR struct stm32_pwmtimer_s *lower;
+
+  pwminfo("TIM%u\n", timer);
+
+  switch (timer)
+    {
+#ifdef CONFIG_STM32L4_TIM1_PWM
+      case 1:
+        lower = &g_pwm1dev;
+
+        /* Attach but disable the TIM1 update interrupt */
+
+#ifdef CONFIG_PWM_PULSECOUNT
+        irq_attach(lower->irq, pwm_tim1interrupt);
+        up_disable_irq(lower->irq);
+#endif
+        break;
+#endif
+
+#ifdef CONFIG_STM32L4_TIM2_PWM
+      case 2:
+        lower = &g_pwm2dev;
+        break;
+#endif
+
+#ifdef CONFIG_STM32L4_TIM3_PWM
+      case 3:
+        lower = &g_pwm3dev;
+        break;
+#endif
+
+#ifdef CONFIG_STM32L4_TIM4_PWM
+      case 4:
+        lower = &g_pwm4dev;
+        break;
+#endif
+
+#ifdef CONFIG_STM32L4_TIM5_PWM
+      case 5:
+        lower = &g_pwm5dev;
+        break;
+#endif
+
+#ifdef CONFIG_STM32L4_TIM8_PWM
+      case 8:
+        lower = &g_pwm8dev;
+
+        /* Attach but disable the TIM8 update interrupt */
+
+#ifdef CONFIG_PWM_PULSECOUNT
+        irq_attach(lower->irq, pwm_tim8interrupt);
+        up_disable_irq(lower->irq);
+#endif
+        break;
+#endif
+
+#ifdef CONFIG_STM32L4_TIM15_PWM
+      case 15:
+        lower = &g_pwm15dev;
+        break;
+#endif
+
+#ifdef CONFIG_STM32L4_TIM16_PWM
+      case 16:
+        lower = &g_pwm16dev;
+        break;
+#endif
+
+#ifdef CONFIG_STM32L4_TIM17_PWM
+      case 17:
+        lower = &g_pwm17dev;
+        break;
+#endif
+
+      default:
+        pwmerr("ERROR: No such timer configured\n");
+        return NULL;
+    }
+
+  return (FAR struct pwm_lowerhalf_s *)lower;
+}
+
+#endif /* CONFIG_STM32L4_TIMn_PWM, n = 1,...,17 */
diff --git a/arch/arm/src/stm32l4/stm32l4_pwm.h b/arch/arm/src/stm32l4/stm32l4_pwm.h
new file mode 100644
index 0000000000..fff04e9e47
--- /dev/null
+++ b/arch/arm/src/stm32l4/stm32l4_pwm.h
@@ -0,0 +1,679 @@
+/************************************************************************************
+ * arch/arm/src/stm32l4/stm32l4_pwm.h
+ *
+ *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2015 Omni Hoverboards Inc. All rights reserved.
+ *   Authors: Gregory Nutt 
+ *            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 __ARCH_ARM_SRC_STM32L4_STM32L4_PWM_H
+#define __ARCH_ARM_SRC_STM32L4_STM32L4_PWM_H
+
+/* The STM32L4 does not have dedicated PWM hardware.  Rather, pulsed output control
+ * is a capability of the STM32L4 timers.  The logic in this file implements the
+ * lower half of the standard, NuttX PWM interface using the STM32L4 timers.  That
+ * interface is described in include/nuttx/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_STM32L4_TIMn
+ * is defined then the CONFIG_STM32L4_TIMn_PWM must also be defined to indicate that
+ * timer "n" is intended to be used for pulsed output signal generation.
+ */
+
+#ifndef CONFIG_STM32L4_TIM1
+#  undef CONFIG_STM32L4_TIM1_PWM
+#endif
+#ifndef CONFIG_STM32L4_TIM2
+#  undef CONFIG_STM32L4_TIM2_PWM
+#endif
+#ifndef CONFIG_STM32L4_TIM3
+#  undef CONFIG_STM32L4_TIM3_PWM
+#endif
+#ifndef CONFIG_STM32L4_TIM4
+#  undef CONFIG_STM32L4_TIM4_PWM
+#endif
+#ifndef CONFIG_STM32L4_TIM5
+#  undef CONFIG_STM32L4_TIM5_PWM
+#endif
+#ifndef CONFIG_STM32L4_TIM8
+#  undef CONFIG_STM32L4_TIM8_PWM
+#endif
+#ifndef CONFIG_STM32L4_TIM15
+#  undef CONFIG_STM32L4_TIM15_PWM
+#endif
+#ifndef CONFIG_STM32L4_TIM16
+#  undef CONFIG_STM32L4_TIM16_PWM
+#endif
+#ifndef CONFIG_STM32L4_TIM17
+#  undef CONFIG_STM32L4_TIM17_PWM
+#endif
+
+/* The basic timers (timer 6 and 7) are not capable of generating output pulses */
+
+#undef CONFIG_STM32L4_TIM6_PWM
+#undef CONFIG_STM32L4_TIM7_PWM
+
+/* Check if PWM support for any channel is enabled. */
+
+#if defined(CONFIG_STM32L4_TIM1_PWM)  || defined(CONFIG_STM32L4_TIM2_PWM)  || \
+    defined(CONFIG_STM32L4_TIM3_PWM)  || defined(CONFIG_STM32L4_TIM4_PWM)  || \
+    defined(CONFIG_STM32L4_TIM5_PWM)  || defined(CONFIG_STM32L4_TIM8_PWM)  || \
+    defined(CONFIG_STM32L4_TIM15_PWM) || defined(CONFIG_STM32L4_TIM16_PWM) || \
+    defined(CONFIG_STM32L4_TIM17_PWM)
+
+#include 
+#include "chip/stm32l4_tim.h"
+
+#ifdef CONFIG_PWM_MULTICHAN
+
+#ifdef CONFIG_STM32L4_TIM1_CHANNEL1
+#  ifdef CONFIG_STM32L4_TIM1_CH1OUT
+#    define PWM_TIM1_CH1CFG GPIO_TIM1_CH1OUT
+#  else
+#    define PWM_TIM1_CH1CFG 0
+#  endif
+#  define PWM_TIM1_CHANNEL1 1
+#else
+#  define PWM_TIM1_CHANNEL1 0
+#endif
+#ifdef CONFIG_STM32L4_TIM1_CHANNEL2
+#  ifdef CONFIG_STM32L4_TIM1_CH2OUT
+#    define PWM_TIM1_CH2CFG GPIO_TIM1_CH2OUT
+#  else
+#    define PWM_TIM1_CH2CFG 0
+#  endif
+#  define PWM_TIM1_CHANNEL2 1
+#else
+#  define PWM_TIM1_CHANNEL2 0
+#endif
+#ifdef CONFIG_STM32L4_TIM1_CHANNEL3
+#  ifdef CONFIG_STM32L4_TIM1_CH3OUT
+#    define PWM_TIM1_CH3CFG GPIO_TIM1_CH3OUT
+#  else
+#    define PWM_TIM1_CH3CFG 0
+#  endif
+#  define PWM_TIM1_CHANNEL3 1
+#else
+#  define PWM_TIM1_CHANNEL3 0
+#endif
+#ifdef CONFIG_STM32L4_TIM1_CHANNEL4
+#  ifdef CONFIG_STM32L4_TIM1_CH4OUT
+#    define PWM_TIM1_CH4CFG GPIO_TIM1_CH4OUT
+#  else
+#    define PWM_TIM1_CH4CFG 0
+#  endif
+#  define PWM_TIM1_CHANNEL4 1
+#else
+#  define PWM_TIM1_CHANNEL4 0
+#endif
+#define PWM_TIM1_NCHANNELS (PWM_TIM1_CHANNEL1 + PWM_TIM1_CHANNEL2 + \
+                            PWM_TIM1_CHANNEL3 + PWM_TIM1_CHANNEL4)
+
+#ifdef CONFIG_STM32L4_TIM2_CHANNEL1
+#  ifdef CONFIG_STM32L4_TIM2_CH1OUT
+#    define PWM_TIM2_CH1CFG GPIO_TIM2_CH1OUT
+#  else
+#    define PWM_TIM2_CH1CFG 0
+#  endif
+#  define PWM_TIM2_CHANNEL1 1
+#else
+#  define PWM_TIM2_CHANNEL1 0
+#endif
+#ifdef CONFIG_STM32L4_TIM2_CHANNEL2
+#  ifdef CONFIG_STM32L4_TIM2_CH2OUT
+#    define PWM_TIM2_CH2CFG GPIO_TIM2_CH2OUT
+#  else
+#    define PWM_TIM2_CH2CFG 0
+#  endif
+#  define PWM_TIM2_CHANNEL2 1
+#else
+#  define PWM_TIM2_CHANNEL2 0
+#endif
+#ifdef CONFIG_STM32L4_TIM2_CHANNEL3
+#  ifdef CONFIG_STM32L4_TIM2_CH3OUT
+#    define PWM_TIM2_CH3CFG GPIO_TIM2_CH3OUT
+#  else
+#    define PWM_TIM2_CH3CFG 0
+#  endif
+#  define PWM_TIM2_CHANNEL3 1
+#else
+#  define PWM_TIM2_CHANNEL3 0
+#endif
+#ifdef CONFIG_STM32L4_TIM2_CHANNEL4
+#  ifdef CONFIG_STM32L4_TIM2_CH4OUT
+#    define PWM_TIM2_CH4CFG GPIO_TIM2_CH4OUT
+#  else
+#    define PWM_TIM2_CH4CFG 0
+#  endif
+#  define PWM_TIM2_CHANNEL4 1
+#else
+#  define PWM_TIM2_CHANNEL4 0
+#endif
+#define PWM_TIM2_NCHANNELS (PWM_TIM2_CHANNEL1 + PWM_TIM2_CHANNEL2 + \
+                            PWM_TIM2_CHANNEL3 + PWM_TIM2_CHANNEL4)
+
+#ifdef CONFIG_STM32L4_TIM3_CHANNEL1
+#  ifdef CONFIG_STM32L4_TIM3_CH1OUT
+#    define PWM_TIM3_CH1CFG GPIO_TIM3_CH1OUT
+#  else
+#    define PWM_TIM3_CH1CFG 0
+#  endif
+#  define PWM_TIM3_CHANNEL1 1
+#else
+#  define PWM_TIM3_CHANNEL1 0
+#endif
+#ifdef CONFIG_STM32L4_TIM3_CHANNEL2
+#  ifdef CONFIG_STM32L4_TIM3_CH2OUT
+#    define PWM_TIM3_CH2CFG GPIO_TIM3_CH2OUT
+#  else
+#    define PWM_TIM3_CH2CFG 0
+#  endif
+#  define PWM_TIM3_CHANNEL2 1
+#else
+#  define PWM_TIM3_CHANNEL2 0
+#endif
+#ifdef CONFIG_STM32L4_TIM3_CHANNEL3
+#  ifdef CONFIG_STM32L4_TIM3_CH3OUT
+#    define PWM_TIM3_CH3CFG GPIO_TIM3_CH3OUT
+#  else
+#    define PWM_TIM3_CH3CFG 0
+#  endif
+#  define PWM_TIM3_CHANNEL3 1
+#else
+#  define PWM_TIM3_CHANNEL3 0
+#endif
+#ifdef CONFIG_STM32L4_TIM3_CHANNEL4
+#  ifdef CONFIG_STM32L4_TIM3_CH4OUT
+#    define PWM_TIM3_CH4CFG GPIO_TIM3_CH4OUT
+#  else
+#    define PWM_TIM3_CH4CFG 0
+#  endif
+#  define PWM_TIM3_CHANNEL4 1
+#else
+#  define PWM_TIM3_CHANNEL4 0
+#endif
+#define PWM_TIM3_NCHANNELS (PWM_TIM3_CHANNEL1 + PWM_TIM3_CHANNEL2 + \
+                            PWM_TIM3_CHANNEL3 + PWM_TIM3_CHANNEL4)
+
+#ifdef CONFIG_STM32L4_TIM4_CHANNEL1
+#  ifdef CONFIG_STM32L4_TIM4_CH1OUT
+#    define PWM_TIM4_CH1CFG GPIO_TIM4_CH1OUT
+#  else
+#    define PWM_TIM4_CH1CFG 0
+#  endif
+#  define PWM_TIM4_CHANNEL1 1
+#else
+#  define PWM_TIM4_CHANNEL1 0
+#endif
+#ifdef CONFIG_STM32L4_TIM4_CHANNEL2
+#  ifdef CONFIG_STM32L4_TIM4_CH2OUT
+#    define PWM_TIM4_CH2CFG GPIO_TIM4_CH2OUT
+#  else
+#    define PWM_TIM4_CH2CFG 0
+#  endif
+#  define PWM_TIM4_CHANNEL2 1
+#else
+#  define PWM_TIM4_CHANNEL2 0
+#endif
+#ifdef CONFIG_STM32L4_TIM4_CHANNEL3
+#  ifdef CONFIG_STM32L4_TIM4_CH3OUT
+#    define PWM_TIM4_CH3CFG GPIO_TIM4_CH3OUT
+#  else
+#    define PWM_TIM4_CH3CFG 0
+#  endif
+#  define PWM_TIM4_CHANNEL3 1
+#else
+#  define PWM_TIM4_CHANNEL3 0
+#endif
+#ifdef CONFIG_STM32L4_TIM4_CHANNEL4
+#  ifdef CONFIG_STM32L4_TIM4_CH4OUT
+#    define PWM_TIM4_CH4CFG GPIO_TIM4_CH4OUT
+#  else
+#    define PWM_TIM4_CH4CFG 0
+#  endif
+#  define PWM_TIM4_CHANNEL4 1
+#else
+#  define PWM_TIM4_CHANNEL4 0
+#endif
+#define PWM_TIM4_NCHANNELS (PWM_TIM4_CHANNEL1 + PWM_TIM4_CHANNEL2 + \
+                            PWM_TIM4_CHANNEL3 + PWM_TIM4_CHANNEL4)
+
+#ifdef CONFIG_STM32L4_TIM5_CHANNEL1
+#  ifdef CONFIG_STM32L4_TIM5_CH1OUT
+#    define PWM_TIM5_CH1CFG GPIO_TIM5_CH1OUT
+#  else
+#    define PWM_TIM5_CH1CFG 0
+#  endif
+#  define PWM_TIM5_CHANNEL1 1
+#else
+#  define PWM_TIM5_CHANNEL1 0
+#endif
+#ifdef CONFIG_STM32L4_TIM5_CHANNEL2
+#  ifdef CONFIG_STM32L4_TIM5_CH2OUT
+#    define PWM_TIM5_CH2CFG GPIO_TIM5_CH2OUT
+#  else
+#    define PWM_TIM5_CH2CFG 0
+#  endif
+#  define PWM_TIM5_CHANNEL2 1
+#else
+#  define PWM_TIM5_CHANNEL2 0
+#endif
+#ifdef CONFIG_STM32L4_TIM5_CHANNEL3
+#  ifdef CONFIG_STM32L4_TIM5_CH3OUT
+#    define PWM_TIM5_CH3CFG GPIO_TIM5_CH3OUT
+#  else
+#    define PWM_TIM5_CH3CFG 0
+#  endif
+#  define PWM_TIM5_CHANNEL3 1
+#else
+#  define PWM_TIM5_CHANNEL3 0
+#endif
+#ifdef CONFIG_STM32L4_TIM5_CHANNEL4
+#  ifdef CONFIG_STM32L4_TIM5_CH4OUT
+#    define PWM_TIM5_CH4CFG GPIO_TIM5_CH4OUT
+#  else
+#    define PWM_TIM5_CH4CFG 0
+#  endif
+#  define PWM_TIM5_CHANNEL4 1
+#else
+#  define PWM_TIM5_CHANNEL4 0
+#endif
+#define PWM_TIM5_NCHANNELS (PWM_TIM5_CHANNEL1 + PWM_TIM5_CHANNEL2 + \
+                            PWM_TIM5_CHANNEL3 + PWM_TIM5_CHANNEL4)
+
+#ifdef CONFIG_STM32L4_TIM8_CHANNEL1
+#  ifdef CONFIG_STM32L4_TIM8_CH1OUT
+#    define PWM_TIM8_CH1CFG GPIO_TIM8_CH1OUT
+#  else
+#    define PWM_TIM8_CH1CFG 0
+#  endif
+#  define PWM_TIM8_CHANNEL1 1
+#else
+#  define PWM_TIM8_CHANNEL1 0
+#endif
+#ifdef CONFIG_STM32L4_TIM8_CHANNEL2
+#  ifdef CONFIG_STM32L4_TIM8_CH2OUT
+#    define PWM_TIM8_CH2CFG GPIO_TIM8_CH2OUT
+#  else
+#    define PWM_TIM8_CH2CFG 0
+#  endif
+#  define PWM_TIM8_CHANNEL2 1
+#else
+#  define PWM_TIM8_CHANNEL2 0
+#endif
+#ifdef CONFIG_STM32L4_TIM8_CHANNEL3
+#  ifdef CONFIG_STM32L4_TIM8_CH3OUT
+#    define PWM_TIM8_CH3CFG GPIO_TIM8_CH3OUT
+#  else
+#    define PWM_TIM8_CH3CFG 0
+#  endif
+#  define PWM_TIM8_CHANNEL3 1
+#else
+#  define PWM_TIM8_CHANNEL3 0
+#endif
+#ifdef CONFIG_STM32L4_TIM8_CHANNEL4
+#  ifdef CONFIG_STM32L4_TIM8_CH4OUT
+#    define PWM_TIM8_CH4CFG GPIO_TIM8_CH4OUT
+#  else
+#    define PWM_TIM8_CH4CFG 0
+#  endif
+#  define PWM_TIM8_CHANNEL4 1
+#else
+#  define PWM_TIM8_CHANNEL4 0
+#endif
+#define PWM_TIM8_NCHANNELS (PWM_TIM8_CHANNEL1 + PWM_TIM8_CHANNEL2 + \
+                            PWM_TIM8_CHANNEL3 + PWM_TIM8_CHANNEL4)
+
+#ifdef CONFIG_STM32L4_TIM15_CHANNEL1
+#  ifdef CONFIG_STM32L4_TIM15_CH1OUT
+#    define PWM_TIM15_CH1CFG GPIO_TIM15_CH1OUT
+#  else
+#    define PWM_TIM15_CH1CFG 0
+#  endif
+#  define PWM_TIM15_CHANNEL1 1
+#else
+#  define PWM_TIM15_CHANNEL1 0
+#endif
+#ifdef CONFIG_STM32L4_TIM15_CHANNEL2
+#  ifdef CONFIG_STM32L4_TIM15_CH2OUT
+#    define PWM_TIM15_CH2CFG GPIO_TIM15_CH2OUT
+#  else
+#    define PWM_TIM15_CH2CFG 0
+#  endif
+#  define PWM_TIM15_CHANNEL2 1
+#else
+#  define PWM_TIM15_CHANNEL2 0
+#endif
+#define PWM_TIM15_NCHANNELS (PWM_TIM15_CHANNEL1 + PWM_TIM15_CHANNEL2)
+
+#ifdef CONFIG_STM32L4_TIM16_CHANNEL1
+#  ifdef CONFIG_STM32L4_TIM16_CH1OUT
+#    define PWM_TIM16_CH1CFG GPIO_TIM16_CH1OUT
+#  else
+#    define PWM_TIM16_CH1CFG 0
+#  endif
+#  define PWM_TIM16_CHANNEL1 1
+#else
+#  define PWM_TIM16_CHANNEL1 0
+#endif
+#define PWM_TIM16_NCHANNELS PWM_TIM16_CHANNEL1
+
+#ifdef CONFIG_STM32L4_TIM17_CHANNEL1
+#  ifdef CONFIG_STM32L4_TIM17_CH1OUT
+#    define PWM_TIM17_CH1CFG GPIO_TIM17_CH1OUT
+#  else
+#    define PWM_TIM17_CH1CFG 0
+#  endif
+#  define PWM_TIM17_CHANNEL1 1
+#else
+#  define PWM_TIM17_CHANNEL1 0
+#endif
+#define PWM_TIM17_NCHANNELS PWM_TIM17_CHANNEL1
+
+#define PWM_MAX(a, b) ((a) > (b) ? (a) : (b))
+
+#define PWM_NCHANNELS PWM_MAX(PWM_TIM1_NCHANNELS, \
+                      PWM_MAX(PWM_TIM2_NCHANNELS, \
+                      PWM_MAX(PWM_TIM3_NCHANNELS, \
+                      PWM_MAX(PWM_TIM4_NCHANNELS, \
+                      PWM_MAX(PWM_TIM5_NCHANNELS, \
+                      PWM_MAX(PWM_TIM8_NCHANNELS, \
+                      PWM_MAX(PWM_TIM15_NCHANNELS, \
+                      PWM_MAX(PWM_TIM16_NCHANNELS, \
+                              PWM_TIM17_NCHANNELS))))))))))))))
+
+#else
+
+/* For each timer that is enabled for PWM usage, we need the following additional
+ * configuration settings:
+ *
+ * CONFIG_STM32L4_TIMx_CHANNEL - Specifies the timer output channel {1,..,4}
+ * PWM_TIMx_CHn - One of the values defined in chip/stm32*_pinmap.h.  In the case
+ *   where there are multiple pin selections, the correct setting must be provided
+ *   in the arch/board/board.h file.
+ *
+ * NOTE: The STM32L4 timers are each capable of generating different signals on
+ * each of the four channels with different duty cycles.  That capability is
+ * not supported by this driver:  Only one output channel per timer.
+ */
+
+#ifdef CONFIG_STM32L4_TIM1_PWM
+#  if !defined(CONFIG_STM32L4_TIM1_CHANNEL)
+#    error "CONFIG_STM32L4_TIM1_CHANNEL must be provided"
+#  elif CONFIG_STM32L4_TIM1_CHANNEL == 1
+#    define CONFIG_STM32L4_TIM1_CHANNEL1 1
+#    define CONFIG_STM32L4_TIM1_CH1MODE  CONFIG_STM32L4_TIM1_CHMODE
+#    define PWM_TIM1_CH1CFG            GPIO_TIM1_CH1OUT
+#  elif CONFIG_STM32L4_TIM1_CHANNEL == 2
+#    define CONFIG_STM32L4_TIM1_CHANNEL2 1
+#    define CONFIG_STM32L4_TIM1_CH2MODE  CONFIG_STM32L4_TIM1_CHMODE
+#    define PWM_TIM1_CH2CFG            GPIO_TIM1_CH2OUT
+#  elif CONFIG_STM32L4_TIM1_CHANNEL == 3
+#    define CONFIG_STM32L4_TIM1_CHANNEL3 1
+#    define CONFIG_STM32L4_TIM1_CH3MODE  CONFIG_STM32L4_TIM1_CHMODE
+#    define PWM_TIM1_CH3CFG            GPIO_TIM1_CH3OUT
+#  elif CONFIG_STM32L4_TIM1_CHANNEL == 4
+#    define CONFIG_STM32L4_TIM1_CHANNEL4 1
+#    define CONFIG_STM32L4_TIM1_CH4MODE  CONFIG_STM32L4_TIM1_CHMODE
+#    define PWM_TIM1_CH4CFG            GPIO_TIM1_CH4OUT
+#  else
+#    error "Unsupported value of CONFIG_STM32L4_TIM1_CHANNEL"
+#  endif
+#endif
+
+#ifdef CONFIG_STM32L4_TIM2_PWM
+#  if !defined(CONFIG_STM32L4_TIM2_CHANNEL)
+#    error "CONFIG_STM32L4_TIM2_CHANNEL must be provided"
+#  elif CONFIG_STM32L4_TIM2_CHANNEL == 1
+#    define CONFIG_STM32L4_TIM2_CHANNEL1 1
+#    define CONFIG_STM32L4_TIM2_CH1MODE  CONFIG_STM32L4_TIM2_CHMODE
+#    define PWM_TIM2_CH1CFG            GPIO_TIM2_CH1OUT
+#  elif CONFIG_STM32L4_TIM2_CHANNEL == 2
+#    define CONFIG_STM32L4_TIM2_CHANNEL2 1
+#    define CONFIG_STM32L4_TIM2_CH2MODE  CONFIG_STM32L4_TIM2_CHMODE
+#    define PWM_TIM2_CH2CFG            GPIO_TIM2_CH2OUT
+#  elif CONFIG_STM32L4_TIM2_CHANNEL == 3
+#    define CONFIG_STM32L4_TIM2_CHANNEL3 1
+#    define CONFIG_STM32L4_TIM2_CH3MODE  CONFIG_STM32L4_TIM2_CHMODE
+#    define PWM_TIM2_CH3CFG            GPIO_TIM2_CH3OUT
+#  elif CONFIG_STM32L4_TIM2_CHANNEL == 4
+#    define CONFIG_STM32L4_TIM2_CHANNEL4 1
+#    define CONFIG_STM32L4_TIM2_CH4MODE  CONFIG_STM32L4_TIM2_CHMODE
+#    define PWM_TIM2_CH4CFG            GPIO_TIM2_CH4OUT
+#  else
+#    error "Unsupported value of CONFIG_STM32L4_TIM2_CHANNEL"
+#  endif
+#endif
+
+#ifdef CONFIG_STM32L4_TIM3_PWM
+#  if !defined(CONFIG_STM32L4_TIM3_CHANNEL)
+#    error "CONFIG_STM32L4_TIM3_CHANNEL must be provided"
+#  elif CONFIG_STM32L4_TIM3_CHANNEL == 1
+#    define CONFIG_STM32L4_TIM3_CHANNEL1 1
+#    define CONFIG_STM32L4_TIM3_CH1MODE  CONFIG_STM32L4_TIM3_CHMODE
+#    define PWM_TIM3_CH1CFG            GPIO_TIM3_CH1OUT
+#  elif CONFIG_STM32L4_TIM3_CHANNEL == 2
+#    define CONFIG_STM32L4_TIM3_CHANNEL2 1
+#    define CONFIG_STM32L4_TIM3_CH2MODE  CONFIG_STM32L4_TIM3_CHMODE
+#    define PWM_TIM3_CH2CFG            GPIO_TIM3_CH2OUT
+#  elif CONFIG_STM32L4_TIM3_CHANNEL == 3
+#    define CONFIG_STM32L4_TIM3_CHANNEL3 1
+#    define CONFIG_STM32L4_TIM3_CH3MODE  CONFIG_STM32L4_TIM3_CHMODE
+#    define PWM_TIM3_CH3CFG            GPIO_TIM3_CH3OUT
+#  elif CONFIG_STM32L4_TIM3_CHANNEL == 4
+#    define CONFIG_STM32L4_TIM3_CHANNEL4 1
+#    define CONFIG_STM32L4_TIM3_CH4MODE  CONFIG_STM32L4_TIM3_CHMODE
+#    define PWM_TIM3_CH4CFG            GPIO_TIM3_CH4OUT
+#  else
+#    error "Unsupported value of CONFIG_STM32L4_TIM3_CHANNEL"
+#  endif
+#endif
+
+#ifdef CONFIG_STM32L4_TIM4_PWM
+#  if !defined(CONFIG_STM32L4_TIM4_CHANNEL)
+#    error "CONFIG_STM32L4_TIM4_CHANNEL must be provided"
+#  elif CONFIG_STM32L4_TIM4_CHANNEL == 1
+#    define CONFIG_STM32L4_TIM4_CHANNEL1 1
+#    define CONFIG_STM32L4_TIM4_CH1MODE  CONFIG_STM32L4_TIM4_CHMODE
+#    define PWM_TIM4_CH1CFG            GPIO_TIM4_CH1OUT
+#  elif CONFIG_STM32L4_TIM4_CHANNEL == 2
+#    define CONFIG_STM32L4_TIM4_CHANNEL2 1
+#    define CONFIG_STM32L4_TIM4_CH2MODE  CONFIG_STM32L4_TIM4_CHMODE
+#    define PWM_TIM4_CH2CFG            GPIO_TIM4_CH2OUT
+#  elif CONFIG_STM32L4_TIM4_CHANNEL == 3
+#    define CONFIG_STM32L4_TIM4_CHANNEL3 1
+#    define CONFIG_STM32L4_TIM4_CH3MODE  CONFIG_STM32L4_TIM4_CHMODE
+#    define PWM_TIM4_CH3CFG            GPIO_TIM4_CH3OUT
+#  elif CONFIG_STM32L4_TIM4_CHANNEL == 4
+#    define CONFIG_STM32L4_TIM4_CHANNEL4 1
+#    define CONFIG_STM32L4_TIM4_CH4MODE  CONFIG_STM32L4_TIM4_CHMODE
+#    define PWM_TIM4_CH4CFG            GPIO_TIM4_CH4OUT
+#  else
+#    error "Unsupported value of CONFIG_STM32L4_TIM4_CHANNEL"
+#  endif
+#endif
+
+#ifdef CONFIG_STM32L4_TIM5_PWM
+#  if !defined(CONFIG_STM32L4_TIM5_CHANNEL)
+#    error "CONFIG_STM32L4_TIM5_CHANNEL must be provided"
+#  elif CONFIG_STM32L4_TIM5_CHANNEL == 1
+#    define CONFIG_STM32L4_TIM5_CHANNEL1 1
+#    define CONFIG_STM32L4_TIM5_CH1MODE  CONFIG_STM32L4_TIM5_CHMODE
+#    define PWM_TIM5_CH1CFG            GPIO_TIM5_CH1OUT
+#  elif CONFIG_STM32L4_TIM5_CHANNEL == 2
+#    define CONFIG_STM32L4_TIM5_CHANNEL2 1
+#    define CONFIG_STM32L4_TIM5_CH2MODE  CONFIG_STM32L4_TIM5_CHMODE
+#    define PWM_TIM5_CH2CFG            GPIO_TIM5_CH2OUT
+#  elif CONFIG_STM32L4_TIM5_CHANNEL == 3
+#    define CONFIG_STM32L4_TIM5_CHANNEL3 1
+#    define CONFIG_STM32L4_TIM5_CH3MODE  CONFIG_STM32L4_TIM5_CHMODE
+#    define PWM_TIM5_CH3CFG            GPIO_TIM5_CH3OUT
+#  elif CONFIG_STM32L4_TIM5_CHANNEL == 4
+#    define CONFIG_STM32L4_TIM5_CHANNEL4 1
+#    define CONFIG_STM32L4_TIM5_CH4MODE  CONFIG_STM32L4_TIM5_CHMODE
+#    define PWM_TIM5_CH4CFG            GPIO_TIM5_CH4OUT
+#  else
+#    error "Unsupported value of CONFIG_STM32L4_TIM5_CHANNEL"
+#  endif
+#endif
+
+#ifdef CONFIG_STM32L4_TIM8_PWM
+#  if !defined(CONFIG_STM32L4_TIM8_CHANNEL)
+#    error "CONFIG_STM32L4_TIM8_CHANNEL must be provided"
+#  elif CONFIG_STM32L4_TIM8_CHANNEL == 1
+#    define CONFIG_STM32L4_TIM8_CHANNEL1 1
+#    define CONFIG_STM32L4_TIM8_CH1MODE  CONFIG_STM32L4_TIM8_CHMODE
+#    define PWM_TIM8_CH1CFG            GPIO_TIM8_CH1OUT
+#  elif CONFIG_STM32L4_TIM8_CHANNEL == 2
+#    define CONFIG_STM32L4_TIM8_CHANNEL2 1
+#    define CONFIG_STM32L4_TIM8_CH2MODE  CONFIG_STM32L4_TIM8_CHMODE
+#    define PWM_TIM8_CH2CFG            GPIO_TIM8_CH2OUT
+#  elif CONFIG_STM32L4_TIM8_CHANNEL == 3
+#    define CONFIG_STM32L4_TIM8_CHANNEL3 1
+#    define CONFIG_STM32L4_TIM8_CH3MODE  CONFIG_STM32L4_TIM8_CHMODE
+#    define PWM_TIM8_CH3CFG            GPIO_TIM8_CH3OUT
+#  elif CONFIG_STM32L4_TIM8_CHANNEL == 4
+#    define CONFIG_STM32L4_TIM8_CHANNEL4 1
+#    define CONFIG_STM32L4_TIM8_CH4MODE  CONFIG_STM32L4_TIM8_CHMODE
+#    define PWM_TIM8_CH4CFG            GPIO_TIM8_CH4OUT
+#  else
+#    error "Unsupported value of CONFIG_STM32L4_TIM8_CHANNEL"
+#  endif
+#endif
+
+#ifdef CONFIG_STM32L4_TIM15_PWM
+#  if !defined(CONFIG_STM32L4_TIM15_CHANNEL)
+#    error "CONFIG_STM32L4_TIM15_CHANNEL must be provided"
+#  elif CONFIG_STM32L4_TIM15_CHANNEL == 1
+#    define CONFIG_STM32L4_TIM15_CHANNEL1 1
+#    define CONFIG_STM32L4_TIM15_CH1MODE  CONFIG_STM32L4_TIM15_CHMODE
+#    define PWM_TIM15_CH1CFG            GPIO_TIM15_CH1OUT
+#  elif CONFIG_STM32L4_TIM15_CHANNEL == 2
+#    define CONFIG_STM32L4_TIM15_CHANNEL2 1
+#    define CONFIG_STM32L4_TIM15_CH2MODE  CONFIG_STM32L4_TIM15_CHMODE
+#    define PWM_TIM15_CH2CFG            GPIO_TIM15_CH2OUT
+#  else
+#    error "Unsupported value of CONFIG_STM32L4_TIM15_CHANNEL"
+#  endif
+#endif
+
+#ifdef CONFIG_STM32L4_TIM16_PWM
+#  if !defined(CONFIG_STM32L4_TIM16_CHANNEL)
+#    error "CONFIG_STM32L4_TIM16_CHANNEL must be provided"
+#  elif CONFIG_STM32L4_TIM16_CHANNEL == 1
+#    define CONFIG_STM32L4_TIM16_CHANNEL1 1
+#    define CONFIG_STM32L4_TIM16_CH1MODE  CONFIG_STM32L4_TIM16_CHMODE
+#    define PWM_TIM16_CH1CFG            GPIO_TIM16_CH1OUT
+#  else
+#    error "Unsupported value of CONFIG_STM32L4_TIM16_CHANNEL"
+#  endif
+#endif
+
+#ifdef CONFIG_STM32L4_TIM17_PWM
+#  if !defined(CONFIG_STM32L4_TIM17_CHANNEL)
+#    error "CONFIG_STM32L4_TIM17_CHANNEL must be provided"
+#  elif CONFIG_STM32L4_TIM17_CHANNEL == 1
+#    define CONFIG_STM32L4_TIM17_CHANNEL1 1
+#    define CONFIG_STM32L4_TIM17_CH1MODE  CONFIG_STM32L4_TIM17_CHMODE
+#    define PWM_TIM17_CH1CFG            GPIO_TIM17_CH1OUT
+#  else
+#    error "Unsupported value of CONFIG_STM32L4_TIM17_CHANNEL"
+#  endif
+#endif
+
+#define PWM_NCHANNELS 1
+
+#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: stm32l4_pwminitialize
+ *
+ * Description:
+ *   Initialize one timer for use with the upper_level PWM driver.
+ *
+ * Input Parameters:
+ *   timer - A number identifying the timer use.  The number of valid timer
+ *     IDs varies with the STM32 MCU and MCU family but is somewhere in
+ *     the range of {1,..,17}.
+ *
+ * Returned Value:
+ *   On success, a pointer to the STM32 lower half PWM driver is returned.
+ *   NULL is returned on any failure.
+ *
+ ************************************************************************************/
+
+FAR struct pwm_lowerhalf_s *stm32l4_pwminitialize(int timer);
+
+#undef EXTERN
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* __ASSEMBLY__ */
+#endif /* CONFIG_STM32L4_TIMx_PWM */
+#endif /* __ARCH_ARM_SRC_STM32L4_STM32L4_PWM_H */
diff --git a/arch/arm/src/stm32l4/stm32l4_tickless.c b/arch/arm/src/stm32l4/stm32l4_tickless.c
new file mode 100644
index 0000000000..123e93459d
--- /dev/null
+++ b/arch/arm/src/stm32l4/stm32l4_tickless.c
@@ -0,0 +1,351 @@
+/****************************************************************************
+ * arch/arm/src/stm32l4/stm32l4_tickless.c
+ *
+ *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt 
+ *           dev@ziggurat29.com
+ *
+ * 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.
+ *
+ ****************************************************************************/
+/****************************************************************************
+ * Tickless OS Support.
+ *
+ * When CONFIG_SCHED_TICKLESS is enabled, all support for timer interrupts
+ * is suppressed and the platform specific code is expected to provide the
+ * following custom functions.
+ *
+ *   void up_timer_initialize(void): Initializes the timer facilities.
+ *     Called early in the initialization sequence (by up_intialize()).
+ *   int up_timer_gettime(FAR struct timespec *ts):  Returns the current
+ *     time from the platform specific time source.
+ *   int up_timer_cancel(void):  Cancels the interval timer.
+ *   int up_timer_start(FAR const struct timespec *ts): Start (or re-starts)
+ *     the interval timer.
+ *
+ * The RTOS will provide the following interfaces for use by the platform-
+ * specific interval timer implementation:
+ *
+ *   void sched_timer_expiration(void):  Called by the platform-specific
+ *     logic when the interval timer expires.
+ *
+ ****************************************************************************/
+/****************************************************************************
+ * STM32L4 Timer Usage
+ *
+ * This current implementation uses two timers:  A one-shot timer to provide
+ * the timed events and a free running timer to provide the current time.
+ * Since timers are a limited resource, that could be an issue on some
+ * systems.
+ *
+ * We could do the job with a single timer if we were to keep the single
+ * timer in a free-running at all times.  The STM32 timer/counters have
+ * 16-bit/32-bit counters with the capability to generate a compare interrupt
+ * when the timer matches a compare value but also to continue counting
+ * without stopping (giving another, different interrupt when the timer
+ * rolls over from 0xffffffff to zero).  So we could potentially just set
+ * the compare at the number of ticks you want PLUS the current value of
+ * timer.  Then you could have both with a single timer:  An interval timer
+ * and a free-running counter with the same timer!
+ *
+ * Patches are welcome!
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include 
+
+#include 
+#include 
+
+#include 
+#include 
+
+#include "stm32l4_oneshot.h"
+#include "stm32l4_freerun.h"
+
+#ifdef CONFIG_SCHED_TICKLESS
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#ifndef CONFIG_STM32L4_ONESHOT
+#  error CONFIG_STM32L4_ONESHOT must be selected for the Tickless OS option
+#endif
+
+#ifndef CONFIG_STM32L4_FREERUN
+#  error CONFIG_STM32L4_FREERUN must be selected for the Tickless OS option
+#endif
+
+#ifndef CONFIG_STM32L4_TICKLESS_FREERUN
+#  error CONFIG_STM32L4_TICKLESS_FREERUN must be selected for the Tickless OS option
+#endif
+
+#ifndef CONFIG_STM32L4_TICKLESS_ONESHOT
+#  error CONFIG_STM32L4_TICKLESS_ONESHOT must be selected for the Tickless OS option
+#endif
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct stm32_tickless_s
+{
+  struct stm32l4_oneshot_s oneshot;
+  struct stm32l4_freerun_s freerun;
+};
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static struct stm32_tickless_s g_tickless;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stm32_oneshot_handler
+ *
+ * Description:
+ *   Called when the one shot timer expires
+ *
+ * Input Parameters:
+ *   None
+ *
+ * Returned Value:
+ *   None
+ *
+ * Assumptions:
+ *   Called early in the initialization sequence before any special
+ *   concurrency protections are required.
+ *
+ ****************************************************************************/
+
+static void stm32_oneshot_handler(void *arg)
+{
+  tmrinfo("Expired...\n");
+  sched_timer_expiration();
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: up_timer_initialize
+ *
+ * Description:
+ *   Initializes all platform-specific timer facilities.  This function is
+ *   called early in the initialization sequence by up_intialize().
+ *   On return, the current up-time should be available from
+ *   up_timer_gettime() and the interval timer is ready for use (but not
+ *   actively timing.
+ *
+ *   Provided by platform-specific code and called from the architecture-
+ *   specific logic.
+ *
+ * Input Parameters:
+ *   None
+ *
+ * Returned Value:
+ *   None
+ *
+ * Assumptions:
+ *   Called early in the initialization sequence before any special
+ *   concurrency protections are required.
+ *
+ ****************************************************************************/
+
+void up_timer_initialize(void)
+{
+#ifdef CONFIG_SCHED_TICKLESS_LIMIT_MAX_SLEEP
+  uint64_t max_delay;
+#endif
+  int ret;
+
+  /* Initialize the one-shot timer */
+
+  ret = stm32l4_oneshot_initialize(&g_tickless.oneshot,
+                                 CONFIG_STM32L4_TICKLESS_ONESHOT,
+                                 CONFIG_USEC_PER_TICK);
+  if (ret < 0)
+    {
+      tmrerr("ERROR: stm32_oneshot_initialize failed\n");
+      PANIC();
+    }
+
+#ifdef CONFIG_SCHED_TICKLESS_LIMIT_MAX_SLEEP
+  /* Get the maximum delay of the one-shot timer in microseconds */
+
+  ret = stm32l4_oneshot_max_delay(&g_tickless.oneshot, &max_delay);
+  if (ret < 0)
+    {
+      tmrerr("ERROR: stm32_oneshot_max_delay failed\n");
+      PANIC();
+    }
+
+  /* Convert this to configured clock ticks for use by the OS timer logic */
+
+  max_delay /= CONFIG_USEC_PER_TICK;
+  if (max_delay > UINT32_MAX)
+    {
+      g_oneshot_maxticks = UINT32_MAX;
+    }
+  else
+    {
+      g_oneshot_maxticks = max_delay;
+    }
+#endif
+
+  /* Initialize the free-running timer */
+
+  ret = stm32l4_freerun_initialize(&g_tickless.freerun,
+                                 CONFIG_STM32L4_TICKLESS_FREERUN,
+                                 CONFIG_USEC_PER_TICK);
+  if (ret < 0)
+    {
+      tmrerr("ERROR: stm32_freerun_initialize failed\n");
+      PANIC();
+    }
+}
+
+/****************************************************************************
+ * Name: up_timer_gettime
+ *
+ * Description:
+ *   Return the elapsed time since power-up (or, more correctly, since
+ *   up_timer_initialize() was called).  This function is functionally
+ *   equivalent to:
+ *
+ *      int clock_gettime(clockid_t clockid, FAR struct timespec *ts);
+ *
+ *   when clockid is CLOCK_MONOTONIC.
+ *
+ *   This function provides the basis for reporting the current time and
+ *   also is used to eliminate error build-up from small errors in interval
+ *   time calculations.
+ *
+ *   Provided by platform-specific code and called from the RTOS base code.
+ *
+ * Input Parameters:
+ *   ts - Provides the location in which to return the up-time.
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned on
+ *   any failure.
+ *
+ * Assumptions:
+ *   Called from the the normal tasking context.  The implementation must
+ *   provide whatever mutual exclusion is necessary for correct operation.
+ *   This can include disabling interrupts in order to assure atomic register
+ *   operations.
+ *
+ ****************************************************************************/
+
+int up_timer_gettime(FAR struct timespec *ts)
+{
+  return stm32l4_freerun_counter(&g_tickless.freerun, ts);
+}
+
+/****************************************************************************
+ * Name: up_timer_cancel
+ *
+ * Description:
+ *   Cancel the interval timer and return the time remaining on the timer.
+ *   These two steps need to be as nearly atomic as possible.
+ *   sched_timer_expiration() will not be called unless the timer is
+ *   restarted with up_timer_start().
+ *
+ *   If, as a race condition, the timer has already expired when this
+ *   function is called, then that pending interrupt must be cleared so
+ *   that up_timer_start() and the remaining time of zero should be
+ *   returned.
+ *
+ *   NOTE: This function may execute at a high rate with no timer running (as
+ *   when pre-emption is enabled and disabled).
+ *
+ *   Provided by platform-specific code and called from the RTOS base code.
+ *
+ * Input Parameters:
+ *   ts - Location to return the remaining time.  Zero should be returned
+ *        if the timer is not active.  ts may be zero in which case the
+ *        time remaining is not returned.
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success.  A call to up_timer_cancel() when
+ *   the timer is not active should also return success; a negated errno
+ *   value is returned on any failure.
+ *
+ * Assumptions:
+ *   May be called from interrupt level handling or from the normal tasking
+ *   level.  Interrupts may need to be disabled internally to assure
+ *   non-reentrancy.
+ *
+ ****************************************************************************/
+
+int up_timer_cancel(FAR struct timespec *ts)
+{
+  return stm32l4_oneshot_cancel(&g_tickless.oneshot, ts);
+}
+
+/****************************************************************************
+ * Name: up_timer_start
+ *
+ * Description:
+ *   Start the interval timer.  sched_timer_expiration() will be
+ *   called at the completion of the timeout (unless up_timer_cancel
+ *   is called to stop the timing.
+ *
+ *   Provided by platform-specific code and called from the RTOS base code.
+ *
+ * Input Parameters:
+ *   ts - Provides the time interval until sched_timer_expiration() is
+ *        called.
+ *
+ * Returned Value:
+ *   Zero (OK) is returned on success; a negated errno value is returned on
+ *   any failure.
+ *
+ * Assumptions:
+ *   May be called from interrupt level handling or from the normal tasking
+ *   level.  Interrupts may need to be disabled internally to assure
+ *   non-reentrancy.
+ *
+ ****************************************************************************/
+
+int up_timer_start(FAR const struct timespec *ts)
+{
+  return stm32l4_oneshot_start(&g_tickless.oneshot, stm32_oneshot_handler, NULL, ts);
+}
+#endif /* CONFIG_SCHED_TICKLESS */
diff --git a/arch/arm/src/stm32l4/stm32l4_tim.c b/arch/arm/src/stm32l4/stm32l4_tim.c
new file mode 100644
index 0000000000..8d273fce1b
--- /dev/null
+++ b/arch/arm/src/stm32l4/stm32l4_tim.c
@@ -0,0 +1,1463 @@
+/************************************************************************************
+ * arm/arm/src/stm32l4/stm32l4_tim.c
+ *
+ *   Copyright (C) 2011 Uros Platise. All rights reserved.
+ *   Author: Uros Platise 
+ *
+ * With modifications and updates by:
+ *
+ *   Copyright (C) 2011-2012 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 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+#include "chip.h"
+#include "up_internal.h"
+#include "up_arch.h"
+
+#include "stm32l4.h"
+#include "stm32l4_gpio.h"
+#include "stm32l4_tim.h"
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+/* Configuration ********************************************************************/
+/* Timer devices may be used for different purposes.  Such special purposes include:
+ *
+ * - To generate modulated outputs for such things as motor control.  If CONFIG_STM32L4_TIMn
+ *   is defined then the CONFIG_STM32L4_TIMn_PWM may also be defined to indicate that
+ *   the timer is intended to be used for pulsed output modulation.
+ *
+ * - To control periodic ADC input sampling.  If CONFIG_STM32L4_TIMn is defined then
+ *   CONFIG_STM32L4_TIMn_ADC may also be defined to indicate that timer "n" is intended
+ *   to be used for that purpose.
+ *
+ * - To control periodic DAC outputs.  If CONFIG_STM32L4_TIMn is defined then
+ *   CONFIG_STM32L4_TIMn_DAC may also be defined to indicate that timer "n" is intended
+ *   to be used for that purpose.
+ *
+ * - To use a Quadrature Encoder.  If CONFIG_STM32L4_TIMn is defined then
+ *   CONFIG_STM32L4_TIMn_QE may also be defined to indicate that timer "n" is intended
+ *   to be used for that purpose.
+ *
+ * In any of these cases, the timer will not be used by this timer module.
+ */
+
+#if defined(CONFIG_STM32L4_TIM1_PWM) || defined (CONFIG_STM32L4_TIM1_ADC) || \
+    defined(CONFIG_STM32L4_TIM1_DAC) || defined(CONFIG_STM32L4_TIM1_QE)
+#  undef CONFIG_STM32L4_TIM1
+#endif
+#if defined(CONFIG_STM32L4_TIM2_PWM) || defined (CONFIG_STM32L4_TIM2_ADC) || \
+    defined(CONFIG_STM32L4_TIM2_DAC) || defined(CONFIG_STM32L4_TIM2_QE)
+#  undef CONFIG_STM32L4_TIM2
+#endif
+#if defined(CONFIG_STM32L4_TIM3_PWM) || defined (CONFIG_STM32L4_TIM3_ADC) || \
+    defined(CONFIG_STM32L4_TIM3_DAC) || defined(CONFIG_STM32L4_TIM3_QE)
+#  undef CONFIG_STM32L4_TIM3
+#endif
+#if defined(CONFIG_STM32L4_TIM4_PWM) || defined (CONFIG_STM32L4_TIM4_ADC) || \
+    defined(CONFIG_STM32L4_TIM4_DAC) || defined(CONFIG_STM32L4_TIM4_QE)
+#  undef CONFIG_STM32L4_TIM4
+#endif
+#if defined(CONFIG_STM32L4_TIM5_PWM) || defined (CONFIG_STM32L4_TIM5_ADC) || \
+    defined(CONFIG_STM32L4_TIM5_DAC) || defined(CONFIG_STM32L4_TIM5_QE)
+#  undef CONFIG_STM32L4_TIM5
+#endif
+#if defined(CONFIG_STM32L4_TIM6_PWM) || defined (CONFIG_STM32L4_TIM6_ADC) || \
+    defined(CONFIG_STM32L4_TIM6_DAC) || defined(CONFIG_STM32L4_TIM6_QE)
+#  undef CONFIG_STM32L4_TIM6
+#endif
+#if defined(CONFIG_STM32L4_TIM7_PWM) || defined (CONFIG_STM32L4_TIM7_ADC) || \
+    defined(CONFIG_STM32L4_TIM7_DAC) || defined(CONFIG_STM32L4_TIM7_QE)
+#  undef CONFIG_STM32L4_TIM7
+#endif
+#if defined(CONFIG_STM32L4_TIM8_PWM) || defined (CONFIG_STM32L4_TIM8_ADC) || \
+    defined(CONFIG_STM32L4_TIM8_DAC) || defined(CONFIG_STM32L4_TIM8_QE)
+#  undef CONFIG_STM32L4_TIM8
+#endif
+#if defined(CONFIG_STM32L4_TIM15_PWM) || defined (CONFIG_STM32L4_TIM15_ADC) || \
+    defined(CONFIG_STM32L4_TIM15_DAC) || defined(CONFIG_STM32L4_TIM15_QE)
+#  undef CONFIG_STM32L4_TIM15
+#endif
+#if defined(CONFIG_STM32L4_TIM16_PWM) || defined (CONFIG_STM32L4_TIM16_ADC) || \
+    defined(CONFIG_STM32L4_TIM16_DAC) || defined(CONFIG_STM32L4_TIM16_QE)
+#  undef CONFIG_STM32L4_TIM16
+#endif
+#if defined(CONFIG_STM32L4_TIM17_PWM) || defined (CONFIG_STM32L4_TIM17_ADC) || \
+    defined(CONFIG_STM32L4_TIM17_DAC) || defined(CONFIG_STM32L4_TIM17_QE)
+#  undef CONFIG_STM32L4_TIM17
+#endif
+
+#if defined(CONFIG_STM32L4_TIM1)
+#  if defined(GPIO_TIM1_CH1OUT) ||defined(GPIO_TIM1_CH2OUT)||\
+      defined(GPIO_TIM1_CH3OUT) ||defined(GPIO_TIM1_CH4OUT)
+#    define HAVE_TIM1_GPIOCONFIG 1
+#endif
+#endif
+
+#if defined(CONFIG_STM32L4_TIM2)
+#  if defined(GPIO_TIM2_CH1OUT) ||defined(GPIO_TIM2_CH2OUT)||\
+      defined(GPIO_TIM2_CH3OUT) ||defined(GPIO_TIM2_CH4OUT)
+#    define HAVE_TIM2_GPIOCONFIG 1
+#endif
+#endif
+
+#if defined(CONFIG_STM32L4_TIM3)
+#  if defined(GPIO_TIM3_CH1OUT) ||defined(GPIO_TIM3_CH2OUT)||\
+      defined(GPIO_TIM3_CH3OUT) ||defined(GPIO_TIM3_CH4OUT)
+#    define HAVE_TIM3_GPIOCONFIG 1
+#endif
+#endif
+
+#if defined(CONFIG_STM32L4_TIM4)
+#  if defined(GPIO_TIM4_CH1OUT) ||defined(GPIO_TIM4_CH2OUT)||\
+      defined(GPIO_TIM4_CH3OUT) ||defined(GPIO_TIM4_CH4OUT)
+#    define HAVE_TIM4_GPIOCONFIG 1
+#endif
+#endif
+
+#if defined(CONFIG_STM32L4_TIM5)
+#  if defined(GPIO_TIM5_CH1OUT) ||defined(GPIO_TIM5_CH2OUT)||\
+      defined(GPIO_TIM5_CH3OUT) ||defined(GPIO_TIM5_CH4OUT)
+#    define HAVE_TIM5_GPIOCONFIG 1
+#endif
+#endif
+
+#if defined(CONFIG_STM32L4_TIM8)
+#  if defined(GPIO_TIM8_CH1OUT) ||defined(GPIO_TIM8_CH2OUT)||\
+      defined(GPIO_TIM8_CH3OUT) ||defined(GPIO_TIM8_CH4OUT)
+#    define HAVE_TIM8_GPIOCONFIG 1
+#endif
+#endif
+
+#if defined(CONFIG_STM32L4_TIM15)
+#  if defined(GPIO_TIM15_CH1OUT) ||defined(GPIO_TIM15_CH2OUT)||\
+      defined(GPIO_TIM15_CH3OUT) ||defined(GPIO_TIM15_CH4OUT)
+#    define HAVE_TIM15_GPIOCONFIG 1
+#endif
+#endif
+
+#if defined(CONFIG_STM32L4_TIM16)
+#  if defined(GPIO_TIM16_CH1OUT) ||defined(GPIO_TIM16_CH2OUT)||\
+      defined(GPIO_TIM16_CH3OUT) ||defined(GPIO_TIM16_CH4OUT)
+#    define HAVE_TIM16_GPIOCONFIG 1
+#endif
+#endif
+
+#if defined(CONFIG_STM32L4_TIM17)
+#  if defined(GPIO_TIM17_CH1OUT) ||defined(GPIO_TIM17_CH2OUT)||\
+      defined(GPIO_TIM17_CH3OUT) ||defined(GPIO_TIM17_CH4OUT)
+#    define HAVE_TIM17_GPIOCONFIG 1
+#endif
+#endif
+
+/* This module then only compiles if there are enabled timers that are not intended for
+ * some other purpose.
+ */
+
+#if defined(CONFIG_STM32L4_TIM1)  || defined(CONFIG_STM32L4_TIM2)  || \
+    defined(CONFIG_STM32L4_TIM3)  || defined(CONFIG_STM32L4_TIM4)  || \
+    defined(CONFIG_STM32L4_TIM5)  || defined(CONFIG_STM32L4_TIM6)  || \
+    defined(CONFIG_STM32L4_TIM7)  || defined(CONFIG_STM32L4_TIM8)  || \
+    defined(CONFIG_STM32L4_TIM15) || defined(CONFIG_STM32L4_TIM16) || \
+    defined(CONFIG_STM32L4_TIM17)
+
+/************************************************************************************
+ * Private Types
+ ************************************************************************************/
+
+/* TIM Device Structure */
+
+struct stm32_tim_priv_s
+{
+  const struct stm32l4_tim_ops_s *ops;
+  stm32l4_tim_mode_t mode;
+  uint32_t base;                      /* TIMn base address */
+};
+
+/************************************************************************************
+ * Private Function prototypes
+ ************************************************************************************/
+
+/* Register helpers */
+
+static inline uint16_t stm32_getreg16(FAR struct stm32l4_tim_dev_s *dev,
+                                      uint8_t offset);
+static inline void stm32_putreg16(FAR struct stm32l4_tim_dev_s *dev, uint8_t offset,
+                                  uint16_t value);
+static inline void stm32_modifyreg16(FAR struct stm32l4_tim_dev_s *dev,
+                                     uint8_t offset, uint16_t clearbits,
+                                     uint16_t setbits);
+static inline uint32_t stm32_getreg32(FAR struct stm32l4_tim_dev_s *dev,
+                                      uint8_t offset);
+static inline void stm32_putreg32(FAR struct stm32l4_tim_dev_s *dev, uint8_t offset,
+                                  uint32_t value);
+
+/* Timer helpers */
+
+static void stm32_tim_reload_counter(FAR struct stm32l4_tim_dev_s *dev);
+static void stm32_tim_enable(FAR struct stm32l4_tim_dev_s *dev);
+static void stm32_tim_disable(FAR struct stm32l4_tim_dev_s *dev);
+static void stm32_tim_reset(FAR struct stm32l4_tim_dev_s *dev);
+#if defined(HAVE_TIM1_GPIOCONFIG)||defined(HAVE_TIM2_GPIOCONFIG)||\
+    defined(HAVE_TIM3_GPIOCONFIG)||defined(HAVE_TIM4_GPIOCONFIG)||\
+    defined(HAVE_TIM5_GPIOCONFIG)||defined(HAVE_TIM8_GPIOCONFIG)
+static void stm32_tim_gpioconfig(uint32_t cfg, stm32l4_tim_channel_t mode);
+#endif
+
+/* Timer methods */
+
+static int stm32_tim_setmode(FAR struct stm32l4_tim_dev_s *dev, stm32l4_tim_mode_t mode);
+static int stm32_tim_setclock(FAR struct stm32l4_tim_dev_s *dev, uint32_t freq);
+static void stm32_tim_setperiod(FAR struct stm32l4_tim_dev_s *dev,
+                                uint32_t period);
+static uint32_t stm32_tim_getcounter(FAR struct stm32l4_tim_dev_s *dev);
+static int stm32_tim_setchannel(FAR struct stm32l4_tim_dev_s *dev, uint8_t channel,
+                                stm32l4_tim_channel_t mode);
+static int stm32_tim_setcompare(FAR struct stm32l4_tim_dev_s *dev, uint8_t channel,
+                                uint32_t compare);
+static int stm32_tim_getcapture(FAR struct stm32l4_tim_dev_s *dev, uint8_t channel);
+static int stm32_tim_setisr(FAR struct stm32l4_tim_dev_s *dev,
+                            int (*handler)(int irq, void *context),
+                            int source);
+static void stm32_tim_enableint(FAR struct stm32l4_tim_dev_s *dev, int source);
+static void stm32_tim_disableint(FAR struct stm32l4_tim_dev_s *dev, int source);
+static void stm32_tim_ackint(FAR struct stm32l4_tim_dev_s *dev, int source);
+static int stm32_tim_checkint(FAR struct stm32l4_tim_dev_s *dev, int source);
+
+/************************************************************************************
+ * Private Data
+ ************************************************************************************/
+
+static const struct stm32l4_tim_ops_s stm32_tim_ops =
+{
+  .setmode    = stm32_tim_setmode,
+  .setclock   = stm32_tim_setclock,
+  .setperiod  = stm32_tim_setperiod,
+  .getcounter = stm32_tim_getcounter,
+  .setchannel = stm32_tim_setchannel,
+  .setcompare = stm32_tim_setcompare,
+  .getcapture = stm32_tim_getcapture,
+  .setisr     = stm32_tim_setisr,
+  .enableint  = stm32_tim_enableint,
+  .disableint = stm32_tim_disableint,
+  .ackint     = stm32_tim_ackint,
+  .checkint   = stm32_tim_checkint,
+};
+
+#ifdef CONFIG_STM32L4_TIM1
+struct stm32_tim_priv_s stm32_tim1_priv =
+{
+  .ops        = &stm32_tim_ops,
+  .mode       = STM32L4_TIM_MODE_UNUSED,
+  .base       = STM32L4_TIM1_BASE,
+};
+#endif
+#ifdef CONFIG_STM32L4_TIM2
+struct stm32_tim_priv_s stm32_tim2_priv =
+{
+  .ops        = &stm32_tim_ops,
+  .mode       = STM32L4_TIM_MODE_UNUSED,
+  .base       = STM32L4_TIM2_BASE,
+};
+#endif
+
+#ifdef CONFIG_STM32L4_TIM3
+struct stm32_tim_priv_s stm32_tim3_priv =
+{
+  .ops        = &stm32_tim_ops,
+  .mode       = STM32L4_TIM_MODE_UNUSED,
+  .base       = STM32L4_TIM3_BASE,
+};
+#endif
+
+#ifdef CONFIG_STM32L4_TIM4
+struct stm32_tim_priv_s stm32_tim4_priv =
+{
+  .ops        = &stm32_tim_ops,
+  .mode       = STM32L4_TIM_MODE_UNUSED,
+  .base       = STM32L4_TIM4_BASE,
+};
+#endif
+
+#ifdef CONFIG_STM32L4_TIM5
+struct stm32_tim_priv_s stm32_tim5_priv =
+{
+  .ops        = &stm32_tim_ops,
+  .mode       = STM32L4_TIM_MODE_UNUSED,
+  .base       = STM32L4_TIM5_BASE,
+};
+#endif
+
+#ifdef CONFIG_STM32L4_TIM6
+struct stm32_tim_priv_s stm32_tim6_priv =
+{
+  .ops        = &stm32_tim_ops,
+  .mode       = STM32L4_TIM_MODE_UNUSED,
+  .base       = STM32L4_TIM6_BASE,
+};
+#endif
+
+#ifdef CONFIG_STM32L4_TIM7
+struct stm32_tim_priv_s stm32_tim7_priv =
+{
+  .ops        = &stm32_tim_ops,
+  .mode       = STM32L4_TIM_MODE_UNUSED,
+  .base       = STM32L4_TIM7_BASE,
+};
+#endif
+
+#ifdef CONFIG_STM32L4_TIM8
+struct stm32_tim_priv_s stm32_tim8_priv =
+{
+  .ops        = &stm32_tim_ops,
+  .mode       = STM32L4_TIM_MODE_UNUSED,
+  .base       = STM32L4_TIM8_BASE,
+};
+#endif
+
+#ifdef CONFIG_STM32L4_TIM15
+struct stm32_tim_priv_s stm32_tim15_priv =
+{
+  .ops        = &stm32_tim_ops,
+  .mode       = STM32L4_TIM_MODE_UNUSED,
+  .base       = STM32L4_TIM15_BASE,
+};
+#endif
+
+#ifdef CONFIG_STM32L4_TIM16
+struct stm32_tim_priv_s stm32_tim16_priv =
+{
+  .ops        = &stm32_tim_ops,
+  .mode       = STM32L4_TIM_MODE_UNUSED,
+  .base       = STM32L4_TIM16_BASE,
+};
+#endif
+
+#ifdef CONFIG_STM32L4_TIM17
+struct stm32_tim_priv_s stm32_tim17_priv =
+{
+  .ops        = &stm32_tim_ops,
+  .mode       = STM32L4_TIM_MODE_UNUSED,
+  .base       = STM32L4_TIM17_BASE,
+};
+#endif
+
+/************************************************************************************
+ * Private Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Name: stm32_getreg16
+ *
+ * Description:
+ *   Get a 16-bit register value by offset
+ *
+ ************************************************************************************/
+
+static inline uint16_t stm32_getreg16(FAR struct stm32l4_tim_dev_s *dev,
+                                      uint8_t offset)
+{
+  return getreg16(((struct stm32_tim_priv_s *)dev)->base + offset);
+}
+
+/************************************************************************************
+ * Name: stm32_putreg16
+ *
+ * Description:
+ *   Put a 16-bit register value by offset
+ *
+ ************************************************************************************/
+
+static inline void stm32_putreg16(FAR struct stm32l4_tim_dev_s *dev, uint8_t offset,
+                                  uint16_t value)
+{
+  putreg16(value, ((struct stm32_tim_priv_s *)dev)->base + offset);
+}
+
+/************************************************************************************
+ * Name: stm32_modifyreg16
+ *
+ * Description:
+ *   Modify a 16-bit register value by offset
+ *
+ ************************************************************************************/
+
+static inline void stm32_modifyreg16(FAR struct stm32l4_tim_dev_s *dev,
+                                     uint8_t offset, uint16_t clearbits,
+                                     uint16_t setbits)
+{
+  modifyreg16(((struct stm32_tim_priv_s *)dev)->base + offset, clearbits, setbits);
+}
+
+/************************************************************************************
+ * Name: stm32_getreg32
+ *
+ * Description:
+ *   Get a 32-bit register value by offset.  This applies only for the STM32 F4
+ *   32-bit registers (CNT, ARR, CRR1-4) in the 32-bit timers TIM2-5.
+ *
+ ************************************************************************************/
+
+static inline uint32_t stm32_getreg32(FAR struct stm32l4_tim_dev_s *dev,
+                                      uint8_t offset)
+{
+  return getreg32(((struct stm32_tim_priv_s *)dev)->base + offset);
+}
+
+/************************************************************************************
+ * Name: stm32_putreg32
+ *
+ * Description:
+ *   Put a 32-bit register value by offset.  This applies only for the STM32 F4
+ *   32-bit registers (CNT, ARR, CRR1-4) in the 32-bit timers TIM2-5.
+ *
+ ************************************************************************************/
+
+static inline void stm32_putreg32(FAR struct stm32l4_tim_dev_s *dev, uint8_t offset,
+                                  uint32_t value)
+{
+  putreg32(value, ((struct stm32_tim_priv_s *)dev)->base + offset);
+}
+
+/************************************************************************************
+ * Name: stm32_tim_reload_counter
+ ************************************************************************************/
+
+static void stm32_tim_reload_counter(FAR struct stm32l4_tim_dev_s *dev)
+{
+  uint16_t val = stm32_getreg16(dev, STM32L4_BTIM_EGR_OFFSET);
+  val |= ATIM_EGR_UG;
+  stm32_putreg16(dev, STM32L4_BTIM_EGR_OFFSET, val);
+}
+
+/************************************************************************************
+ * Name: stm32_tim_enable
+ ************************************************************************************/
+
+static void stm32_tim_enable(FAR struct stm32l4_tim_dev_s *dev)
+{
+  uint16_t val = stm32_getreg16(dev, STM32L4_BTIM_CR1_OFFSET);
+  val |= ATIM_CR1_CEN;
+  stm32_tim_reload_counter(dev);
+  stm32_putreg16(dev, STM32L4_BTIM_CR1_OFFSET, val);
+}
+
+/************************************************************************************
+ * Name: stm32_tim_disable
+ ************************************************************************************/
+
+static void stm32_tim_disable(FAR struct stm32l4_tim_dev_s *dev)
+{
+  uint16_t val = stm32_getreg16(dev, STM32L4_BTIM_CR1_OFFSET);
+  val &= ~ATIM_CR1_CEN;
+  stm32_putreg16(dev, STM32L4_BTIM_CR1_OFFSET, val);
+}
+
+/************************************************************************************
+ * Name: stm32_tim_reset
+ *
+ * Description:
+ *   Reset timer into system default state, but do not affect output/input pins
+ *
+ ************************************************************************************/
+
+static void stm32_tim_reset(FAR struct stm32l4_tim_dev_s *dev)
+{
+  ((struct stm32_tim_priv_s *)dev)->mode = STM32L4_TIM_MODE_DISABLED;
+  stm32_tim_disable(dev);
+}
+
+/************************************************************************************
+ * Name: stm32_tim_gpioconfig
+ ************************************************************************************/
+
+#if defined(HAVE_TIM1_GPIOCONFIG)||defined(HAVE_TIM2_GPIOCONFIG)||\
+    defined(HAVE_TIM3_GPIOCONFIG)||defined(HAVE_TIM4_GPIOCONFIG)||\
+    defined(HAVE_TIM5_GPIOCONFIG)||defined(HAVE_TIM8_GPIOCONFIG)
+static void stm32_tim_gpioconfig(uint32_t cfg, stm32l4_tim_channel_t mode)
+{
+  /* TODO: Add support for input capture and bipolar dual outputs for TIM8 */
+
+  if (mode & STM32L4_TIM_CH_MODE_MASK)
+    {
+      stm32_configgpio(cfg);
+    }
+  else
+    {
+      stm32_unconfiggpio(cfg);
+    }
+}
+#endif
+
+/************************************************************************************
+ * Name: stm32_tim_setmode
+ ************************************************************************************/
+
+static int stm32_tim_setmode(FAR struct stm32l4_tim_dev_s *dev, stm32l4_tim_mode_t mode)
+{
+  uint16_t val = ATIM_CR1_CEN | ATIM_CR1_ARPE;
+
+  DEBUGASSERT(dev != NULL);
+
+  /* This function is not supported on basic timers. To enable or
+   * disable it, simply set its clock to valid frequency or zero.
+   */
+
+#if STM32L4_NBTIM > 0
+  if (((struct stm32_tim_priv_s *)dev)->base == STM32L4_TIM6_BASE
+#endif
+#if STM32L4_NBTIM > 1
+      ||  ((struct stm32_tim_priv_s *)dev)->base == STM32L4_TIM7_BASE
+#endif
+#if STM32L4_NBTIM > 0
+  )
+    {
+      return -EINVAL;
+    }
+#endif
+
+  /* Decode operational modes */
+
+  switch (mode & STM32L4_TIM_MODE_MASK)
+    {
+      case STM32L4_TIM_MODE_DISABLED:
+        val = 0;
+        break;
+
+      case STM32L4_TIM_MODE_DOWN:
+        val |= ATIM_CR1_DIR;
+
+      case STM32L4_TIM_MODE_UP:
+        break;
+
+      case STM32L4_TIM_MODE_UPDOWN:
+        val |= ATIM_CR1_CENTER1;
+        // Our default: Interrupts are generated on compare, when counting down
+        break;
+
+      case STM32L4_TIM_MODE_PULSE:
+        val |= ATIM_CR1_OPM;
+        break;
+
+      default:
+        return -EINVAL;
+    }
+
+  stm32_tim_reload_counter(dev);
+  stm32_putreg16(dev, STM32L4_BTIM_CR1_OFFSET, val);
+
+#if STM32L4_NATIM > 0
+  /* Advanced registers require Main Output Enable */
+
+    if (((struct stm32_tim_priv_s *)dev)->base == STM32L4_TIM1_BASE ||
+        ((struct stm32_tim_priv_s *)dev)->base == STM32L4_TIM8_BASE)
+      {
+        stm32_modifyreg16(dev, STM32L4_ATIM_BDTR_OFFSET, 0, ATIM_BDTR_MOE);
+      }
+#endif
+
+  return OK;
+}
+
+/************************************************************************************
+ * Name: stm32_tim_setclock
+ ************************************************************************************/
+
+static int stm32_tim_setclock(FAR struct stm32l4_tim_dev_s *dev, uint32_t freq)
+{
+  uint32_t freqin;
+  int prescaler;
+
+  DEBUGASSERT(dev != NULL);
+
+  /* Disable Timer? */
+
+  if (freq == 0)
+    {
+      stm32_tim_disable(dev);
+      return 0;
+    }
+
+  /* Get the input clock frequency for this timer.  These vary with
+   * different timer clock sources, MCU-specific timer configuration, and
+   * board-specific clock configuration.  The correct input clock frequency
+   * must be defined in the board.h header file.
+   */
+
+  switch (((struct stm32_tim_priv_s *)dev)->base)
+    {
+#ifdef CONFIG_STM32L4_TIM1
+      case STM32L4_TIM1_BASE:
+        freqin = BOARD_TIM1_FREQUENCY;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM2
+      case STM32L4_TIM2_BASE:
+        freqin = BOARD_TIM2_FREQUENCY;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM3
+      case STM32L4_TIM3_BASE:
+        freqin = BOARD_TIM3_FREQUENCY;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM4
+      case STM32L4_TIM4_BASE:
+        freqin = BOARD_TIM4_FREQUENCY;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM5
+      case STM32L4_TIM5_BASE:
+        freqin = BOARD_TIM5_FREQUENCY;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM6
+      case STM32L4_TIM6_BASE:
+        freqin = BOARD_TIM6_FREQUENCY;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM7
+      case STM32L4_TIM7_BASE:
+        freqin = BOARD_TIM7_FREQUENCY;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM8
+      case STM32L4_TIM8_BASE:
+        freqin = BOARD_TIM8_FREQUENCY;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM15
+      case STM32L4_TIM15_BASE:
+        freqin = BOARD_TIM15_FREQUENCY;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM16
+      case STM32L4_TIM16_BASE:
+        freqin = BOARD_TIM16_FREQUENCY;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM17
+      case STM32L4_TIM17_BASE:
+        freqin = BOARD_TIM17_FREQUENCY;
+        break;
+#endif
+
+      default:
+        return -EINVAL;
+    }
+
+  /* Select a pre-scaler value for this timer using the input clock
+   * frequency.
+   */
+
+  prescaler = freqin / freq;
+
+  /* We need to decrement value for '1', but only, if that will not to
+   * cause underflow.
+   */
+
+  if (prescaler > 0)
+    {
+      prescaler--;
+    }
+
+  /* Check for overflow as well. */
+
+  if (prescaler > 0xffff)
+    {
+      prescaler = 0xffff;
+    }
+
+  stm32_putreg16(dev, STM32L4_BTIM_PSC_OFFSET, prescaler);
+  stm32_tim_enable(dev);
+
+  return prescaler;
+}
+
+/************************************************************************************
+ * Name: stm32_tim_setperiod
+ ************************************************************************************/
+
+static void stm32_tim_setperiod(FAR struct stm32l4_tim_dev_s *dev,
+                                uint32_t period)
+{
+  DEBUGASSERT(dev != NULL);
+  stm32_putreg32(dev, STM32L4_BTIM_ARR_OFFSET, period);
+}
+
+/************************************************************************************
+ * Name: stm32_tim_getcounter
+ ************************************************************************************/
+
+static uint32_t stm32_tim_getcounter(FAR struct stm32l4_tim_dev_s *dev)
+{
+  DEBUGASSERT(dev != NULL);
+  return stm32_getreg32(dev, STM32L4_BTIM_CNT_OFFSET);
+}
+
+/************************************************************************************
+ * Name: stm32_tim_setchannel
+ ************************************************************************************/
+
+static int stm32_tim_setchannel(FAR struct stm32l4_tim_dev_s *dev, uint8_t channel,
+                                stm32l4_tim_channel_t mode)
+{
+  uint16_t ccmr_orig   = 0;
+  uint16_t ccmr_val    = 0;
+  uint16_t ccmr_mask   = 0xff;
+  uint16_t ccer_val    = stm32_getreg16(dev, STM32L4_GTIM_CCER_OFFSET);
+  uint8_t  ccmr_offset = STM32L4_GTIM_CCMR1_OFFSET;
+
+  DEBUGASSERT(dev != NULL);
+
+  /* Further we use range as 0..3; if channel=0 it will also overflow here */
+
+  if (--channel > 4)
+    {
+      return -EINVAL;
+    }
+
+  /* Assume that channel is disabled and polarity is active high */
+
+  ccer_val &= ~(3 << (channel << 2));
+
+  /* This function is not supported on basic timers. To enable or
+   * disable it, simply set its clock to valid frequency or zero.
+   */
+
+#if STM32L4_NBTIM > 0
+  if (((struct stm32_tim_priv_s *)dev)->base == STM32L4_TIM6_BASE
+#endif
+#if STM32L4_NBTIM > 1
+      || ((struct stm32_tim_priv_s *)dev)->base == STM32L4_TIM7_BASE
+#endif
+#if STM32L4_NBTIM > 0
+  )
+    {
+      return -EINVAL;
+    }
+#endif
+
+  /* Decode configuration */
+
+  switch (mode & STM32L4_TIM_CH_MODE_MASK)
+    {
+      case STM32L4_TIM_CH_DISABLED:
+        break;
+
+      case STM32L4_TIM_CH_OUTPWM:
+        ccmr_val  =  (ATIM_CCMR_MODE_PWM1 << ATIM_CCMR1_OC1M_SHIFT) + ATIM_CCMR1_OC1PE;
+        ccer_val |= ATIM_CCER_CC1E << (channel << 2);
+        break;
+
+      default:
+        return -EINVAL;
+    }
+
+  /* Set polarity */
+
+  if (mode & STM32L4_TIM_CH_POLARITY_NEG)
+    {
+      ccer_val |= ATIM_CCER_CC1P << (channel << 2);
+    }
+
+  /* Define its position (shift) and get register offset */
+
+  if (channel & 1)
+    {
+      ccmr_val  <<= 8;
+      ccmr_mask <<= 8;
+    }
+
+  if (channel > 1)
+    {
+      ccmr_offset = STM32L4_GTIM_CCMR2_OFFSET;
+    }
+
+  ccmr_orig  = stm32_getreg16(dev, ccmr_offset);
+  ccmr_orig &= ~ccmr_mask;
+  ccmr_orig |= ccmr_val;
+  stm32_putreg16(dev, ccmr_offset, ccmr_orig);
+  stm32_putreg16(dev, STM32L4_GTIM_CCER_OFFSET, ccer_val);
+
+  /* set GPIO */
+
+  switch (((struct stm32_tim_priv_s *)dev)->base)
+    {
+#ifdef CONFIG_STM32L4_TIM1
+      case STM32L4_TIM1_BASE:
+        switch (channel)
+          {
+#if defined(GPIO_TIM1_CH1OUT)
+            case 0:
+              stm32_tim_gpioconfig(GPIO_TIM1_CH1OUT, mode); break;
+#endif
+#if defined(GPIO_TIM1_CH2OUT)
+            case 1:
+              stm32_tim_gpioconfig(GPIO_TIM1_CH2OUT, mode); break;
+#endif
+#if defined(GPIO_TIM1_CH3OUT)
+            case 2:
+              stm32_tim_gpioconfig(GPIO_TIM1_CH3OUT, mode); break;
+#endif
+#if defined(GPIO_TIM1_CH4OUT)
+            case 3:
+              stm32_tim_gpioconfig(GPIO_TIM1_CH4OUT, mode); break;
+#endif
+            default:
+              return -EINVAL;
+          }
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM2
+      case STM32L4_TIM2_BASE:
+        switch (channel)
+          {
+#if defined(GPIO_TIM2_CH1OUT)
+            case 0:
+              stm32_tim_gpioconfig(GPIO_TIM2_CH1OUT, mode);
+              break;
+#endif
+#if defined(GPIO_TIM2_CH2OUT)
+            case 1:
+              stm32_tim_gpioconfig(GPIO_TIM2_CH2OUT, mode);
+              break;
+#endif
+#if defined(GPIO_TIM2_CH3OUT)
+            case 2:
+              stm32_tim_gpioconfig(GPIO_TIM2_CH3OUT, mode);
+              break;
+#endif
+#if defined(GPIO_TIM2_CH4OUT)
+            case 3:
+              stm32_tim_gpioconfig(GPIO_TIM2_CH4OUT, mode);
+              break;
+#endif
+            default:
+              return -EINVAL;
+          }
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM3
+      case STM32L4_TIM3_BASE:
+        switch (channel)
+          {
+#if defined(GPIO_TIM3_CH1OUT)
+            case 0:
+              stm32_tim_gpioconfig(GPIO_TIM3_CH1OUT, mode);
+              break;
+#endif
+#if defined(GPIO_TIM3_CH2OUT)
+            case 1:
+              stm32_tim_gpioconfig(GPIO_TIM3_CH2OUT, mode);
+              break;
+#endif
+#if defined(GPIO_TIM3_CH3OUT)
+            case 2:
+              stm32_tim_gpioconfig(GPIO_TIM3_CH3OUT, mode);
+              break;
+#endif
+#if defined(GPIO_TIM3_CH4OUT)
+            case 3:
+              stm32_tim_gpioconfig(GPIO_TIM3_CH4OUT, mode);
+              break;
+#endif
+            default:
+              return -EINVAL;
+          }
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM4
+      case STM32L4_TIM4_BASE:
+        switch (channel)
+          {
+#if defined(GPIO_TIM4_CH1OUT)
+            case 0:
+              stm32_tim_gpioconfig(GPIO_TIM4_CH1OUT, mode);
+              break;
+#endif
+#if defined(GPIO_TIM4_CH2OUT)
+            case 1:
+              stm32_tim_gpioconfig(GPIO_TIM4_CH2OUT, mode);
+              break;
+#endif
+#if defined(GPIO_TIM4_CH3OUT)
+            case 2:
+              stm32_tim_gpioconfig(GPIO_TIM4_CH3OUT, mode);
+              break;
+#endif
+#if defined(GPIO_TIM4_CH4OUT)
+            case 3:
+              stm32_tim_gpioconfig(GPIO_TIM4_CH4OUT, mode);
+              break;
+#endif
+            default:
+              return -EINVAL;
+          }
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM5
+      case STM32L4_TIM5_BASE:
+        switch (channel)
+          {
+#if defined(GPIO_TIM5_CH1OUT)
+            case 0:
+              stm32_tim_gpioconfig(GPIO_TIM5_CH1OUT, mode);
+              break;
+#endif
+#if defined(GPIO_TIM5_CH2OUT)
+            case 1:
+              stm32_tim_gpioconfig(GPIO_TIM5_CH2OUT, mode);
+              break;
+#endif
+#if defined(GPIO_TIM5_CH3OUT)
+            case 2:
+              stm32_tim_gpioconfig(GPIO_TIM5_CH3OUT, mode);
+              break;
+#endif
+#if defined(GPIO_TIM5_CH4OUT)
+            case 3:
+              stm32_tim_gpioconfig(GPIO_TIM5_CH4OUT, mode);
+              break;
+#endif
+            default:
+              return -EINVAL;
+          }
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM8
+      case STM32L4_TIM8_BASE:
+        switch (channel)
+          {
+#if defined(GPIO_TIM8_CH1OUT)
+            case 0:
+              stm32_tim_gpioconfig(GPIO_TIM8_CH1OUT, mode); break;
+#endif
+#if defined(GPIO_TIM8_CH2OUT)
+            case 1:
+              stm32_tim_gpioconfig(GPIO_TIM8_CH2OUT, mode); break;
+#endif
+#if defined(GPIO_TIM8_CH3OUT)
+            case 2:
+              stm32_tim_gpioconfig(GPIO_TIM8_CH3OUT, mode); break;
+#endif
+#if defined(GPIO_TIM8_CH4OUT)
+            case 3:
+              stm32_tim_gpioconfig(GPIO_TIM8_CH4OUT, mode); break;
+#endif
+            default:
+              return -EINVAL;
+          }
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM15
+      case STM32L4_TIM15_BASE:
+        switch (channel)
+          {
+#if defined(GPIO_TIM15_CH1OUT)
+            case 0:
+              stm32_tim_gpioconfig(GPIO_TIM15_CH1OUT, mode);
+              break;
+#endif
+#if defined(GPIO_TIM15_CH2OUT)
+            case 1:
+              stm32_tim_gpioconfig(GPIO_TIM15_CH2OUT, mode);
+              break;
+#endif
+#if defined(GPIO_TIM15_CH3OUT)
+            case 2:
+              stm32_tim_gpioconfig(GPIO_TIM15_CH3OUT, mode);
+              break;
+#endif
+#if defined(GPIO_TIM15_CH4OUT)
+            case 3:
+              stm32_tim_gpioconfig(GPIO_TIM15_CH4OUT, mode);
+              break;
+#endif
+            default:
+              return -EINVAL;
+          }
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM16
+      case STM32L4_TIM16_BASE:
+        switch (channel)
+          {
+#if defined(GPIO_TIM16_CH1OUT)
+            case 0:
+              stm32_tim_gpioconfig(GPIO_TIM16_CH1OUT, mode);
+              break;
+#endif
+#if defined(GPIO_TIM16_CH2OUT)
+            case 1:
+              stm32_tim_gpioconfig(GPIO_TIM16_CH2OUT, mode);
+              break;
+#endif
+#if defined(GPIO_TIM16_CH3OUT)
+            case 2:
+              stm32_tim_gpioconfig(GPIO_TIM16_CH3OUT, mode);
+              break;
+#endif
+#if defined(GPIO_TIM16_CH4OUT)
+            case 3:
+              stm32_tim_gpioconfig(GPIO_TIM16_CH4OUT, mode);
+              break;
+#endif
+            default:
+              return -EINVAL;
+          }
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM17
+      case STM32L4_TIM17_BASE:
+        switch (channel)
+          {
+#if defined(GPIO_TIM17_CH1OUT)
+            case 0:
+              stm32_tim_gpioconfig(GPIO_TIM17_CH1OUT, mode);
+              break;
+#endif
+#if defined(GPIO_TIM17_CH2OUT)
+            case 1:
+              stm32_tim_gpioconfig(GPIO_TIM17_CH2OUT, mode);
+              break;
+#endif
+#if defined(GPIO_TIM17_CH3OUT)
+            case 2:
+              stm32_tim_gpioconfig(GPIO_TIM17_CH3OUT, mode);
+              break;
+#endif
+#if defined(GPIO_TIM17_CH4OUT)
+            case 3:
+              stm32_tim_gpioconfig(GPIO_TIM17_CH4OUT, mode);
+              break;
+#endif
+            default:
+              return -EINVAL;
+          }
+        break;
+#endif
+      default:
+        return -EINVAL;
+    }
+
+  return OK;
+}
+
+/************************************************************************************
+ * Name: stm32_tim_setcompare
+ ************************************************************************************/
+
+static int stm32_tim_setcompare(FAR struct stm32l4_tim_dev_s *dev, uint8_t channel,
+                                uint32_t compare)
+{
+  DEBUGASSERT(dev != NULL);
+
+  switch (channel)
+    {
+      case 1:
+        stm32_putreg32(dev, STM32L4_GTIM_CCR1_OFFSET, compare);
+        break;
+      case 2:
+        stm32_putreg32(dev, STM32L4_GTIM_CCR2_OFFSET, compare);
+        break;
+      case 3:
+        stm32_putreg32(dev, STM32L4_GTIM_CCR3_OFFSET, compare);
+        break;
+      case 4:
+        stm32_putreg32(dev, STM32L4_GTIM_CCR4_OFFSET, compare);
+        break;
+      default:
+        return -EINVAL;
+    }
+  return OK;
+}
+
+/************************************************************************************
+ * Name: stm32_tim_getcapture
+ ************************************************************************************/
+
+static int stm32_tim_getcapture(FAR struct stm32l4_tim_dev_s *dev, uint8_t channel)
+{
+  DEBUGASSERT(dev != NULL);
+
+  switch (channel)
+    {
+      case 1:
+        return stm32_getreg32(dev, STM32L4_GTIM_CCR1_OFFSET);
+      case 2:
+        return stm32_getreg32(dev, STM32L4_GTIM_CCR2_OFFSET);
+      case 3:
+        return stm32_getreg32(dev, STM32L4_GTIM_CCR3_OFFSET);
+      case 4:
+        return stm32_getreg32(dev, STM32L4_GTIM_CCR4_OFFSET);
+    }
+
+  return -EINVAL;
+}
+
+/************************************************************************************
+ * Name: stm32_tim_setisr
+ ************************************************************************************/
+
+static int stm32_tim_setisr(FAR struct stm32l4_tim_dev_s *dev,
+                            int (*handler)(int irq, void *context),
+                            int source)
+{
+  int vectorno;
+
+  DEBUGASSERT(dev != NULL);
+  DEBUGASSERT(source == 0);
+
+  switch (((struct stm32_tim_priv_s *)dev)->base)
+    {
+#ifdef CONFIG_STM32L4_TIM1
+      case STM32L4_TIM1_BASE:
+        vectorno = STM32L4_IRQ_TIM1UP;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM2
+      case STM32L4_TIM2_BASE:
+        vectorno = STM32L4_IRQ_TIM2;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM3
+      case STM32L4_TIM3_BASE:
+        vectorno = STM32L4_IRQ_TIM3;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM4
+      case STM32L4_TIM4_BASE:
+        vectorno = STM32L4_IRQ_TIM4;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM5
+      case STM32L4_TIM5_BASE:
+        vectorno = STM32L4_IRQ_TIM5;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM6
+      case STM32L4_TIM6_BASE:
+        vectorno = STM32L4_IRQ_TIM6;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM7
+      case STM32L4_TIM7_BASE:
+        vectorno = STM32L4_IRQ_TIM7;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM8
+      case STM32L4_TIM8_BASE:
+        vectorno = STM32L4_IRQ_TIM8UP;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM15
+      case STM32L4_TIM15_BASE:
+        vectorno = STM32L4_IRQ_TIM15;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM16
+      case STM32L4_TIM16_BASE:
+        vectorno = STM32L4_IRQ_TIM16;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM17
+      case STM32L4_TIM17_BASE:
+        vectorno = STM32L4_IRQ_TIM17;
+        break;
+#endif
+
+      default:
+        return -EINVAL;
+    }
+
+  /* Disable interrupt when callback is removed */
+
+  if (!handler)
+    {
+      up_disable_irq(vectorno);
+      irq_detach(vectorno);
+      return OK;
+    }
+
+  /* Otherwise set callback and enable interrupt */
+
+  irq_attach(vectorno, handler);
+  up_enable_irq(vectorno);
+
+#ifdef CONFIG_ARCH_IRQPRIO
+  /* Set the interrupt priority */
+
+  up_prioritize_irq(vectorno, NVIC_SYSH_PRIORITY_DEFAULT);
+#endif
+
+  return OK;
+}
+
+/************************************************************************************
+ * Name: stm32_tim_enableint
+ ************************************************************************************/
+
+static void stm32_tim_enableint(FAR struct stm32l4_tim_dev_s *dev, int source)
+{
+  DEBUGASSERT(dev != NULL);
+  stm32_modifyreg16(dev, STM32L4_BTIM_DIER_OFFSET, 0, ATIM_DIER_UIE);
+}
+
+/************************************************************************************
+ * Name: stm32_tim_disableint
+ ************************************************************************************/
+
+static void stm32_tim_disableint(FAR struct stm32l4_tim_dev_s *dev, int source)
+{
+  DEBUGASSERT(dev != NULL);
+  stm32_modifyreg16(dev, STM32L4_BTIM_DIER_OFFSET, ATIM_DIER_UIE, 0);
+}
+
+/************************************************************************************
+ * Name: stm32_tim_ackint
+ ************************************************************************************/
+
+static void stm32_tim_ackint(FAR struct stm32l4_tim_dev_s *dev, int source)
+{
+  stm32_putreg16(dev, STM32L4_BTIM_SR_OFFSET, ~ATIM_SR_UIF);
+}
+
+/************************************************************************************
+ * Name: stm32_tim_checkint
+ ************************************************************************************/
+
+static int stm32_tim_checkint(FAR struct stm32l4_tim_dev_s *dev, int source)
+{
+  uint16_t regval = stm32_getreg16(dev, STM32L4_BTIM_SR_OFFSET);
+  return (regval & ATIM_SR_UIF) ? 1 : 0;
+}
+
+/************************************************************************************
+ * Pubic Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Name: stm32_tim_init
+ ************************************************************************************/
+
+FAR struct stm32l4_tim_dev_s *stm32l4_tim_init(int timer)
+{
+  struct stm32l4_tim_dev_s *dev = NULL;
+
+  /* Get structure and enable power */
+
+  switch (timer)
+    {
+#ifdef CONFIG_STM32L4_TIM1
+      case 1:
+        dev = (struct stm32l4_tim_dev_s *)&stm32_tim1_priv;
+        modifyreg32(STM32L4_RCC_APB2ENR, 0, RCC_APB2ENR_TIM1EN);
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM2
+      case 2:
+        dev = (struct stm32l4_tim_dev_s *)&stm32_tim2_priv;
+        modifyreg32(STM32L4_RCC_APB1ENR1, 0, RCC_APB1ENR1_TIM2EN);
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM3
+      case 3:
+        dev = (struct stm32l4_tim_dev_s *)&stm32_tim3_priv;
+        modifyreg32(STM32L4_RCC_APB1ENR1, 0, RCC_APB1ENR1_TIM3EN);
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM4
+      case 4:
+        dev = (struct stm32l4_tim_dev_s *)&stm32_tim4_priv;
+        modifyreg32(STM32L4_RCC_APB1ENR1, 0, RCC_APB1ENR1_TIM4EN);
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM5
+      case 5:
+        dev = (struct stm32l4_tim_dev_s *)&stm32_tim5_priv;
+        modifyreg32(STM32L4_RCC_APB1ENR1, 0, RCC_APB1ENR1_TIM5EN);
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM6
+      case 6:
+        dev = (struct stm32l4_tim_dev_s *)&stm32_tim6_priv;
+        modifyreg32(STM32L4_RCC_APB1ENR1, 0, RCC_APB1ENR1_TIM6EN);
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM7
+      case 7:
+        dev = (struct stm32l4_tim_dev_s *)&stm32_tim7_priv;
+        modifyreg32(STM32L4_RCC_APB1ENR1, 0, RCC_APB1ENR1_TIM7EN);
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM8
+      case 8:
+        dev = (struct stm32l4_tim_dev_s *)&stm32_tim8_priv;
+        modifyreg32(STM32L4_RCC_APB2ENR, 0, RCC_APB2ENR_TIM8EN);
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM15
+      case 15:
+        dev = (struct stm32l4_tim_dev_s *)&stm32_tim15_priv;
+        modifyreg32(STM32L4_RCC_APB2ENR, 0, RCC_APB2ENR_TIM15EN);
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM16
+      case 16:
+        dev = (struct stm32l4_tim_dev_s *)&stm32_tim16_priv;
+        modifyreg32(STM32L4_RCC_APB2ENR, 0, RCC_APB2ENR_TIM16EN);
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM17
+      case 17:
+        dev = (struct stm32l4_tim_dev_s *)&stm32_tim17_priv;
+        modifyreg32(STM32L4_RCC_APB2ENR, 0, RCC_APB2ENR_TIM17EN);
+        break;
+#endif
+      default:
+        return NULL;
+    }
+
+  /* Is device already allocated */
+
+  if (((struct stm32_tim_priv_s *)dev)->mode != STM32L4_TIM_MODE_UNUSED)
+    {
+      return NULL;
+    }
+
+  stm32_tim_reset(dev);
+
+  return dev;
+}
+
+/************************************************************************************
+ * Name: stm32l4_tim_deinit
+ *
+ * TODO: Detach interrupts, and close down all TIM Channels
+ *
+ ************************************************************************************/
+
+int stm32l4_tim_deinit(FAR struct stm32l4_tim_dev_s * dev)
+{
+  DEBUGASSERT(dev != NULL);
+
+  /* Disable power */
+
+  switch (((struct stm32_tim_priv_s *)dev)->base)
+    {
+#ifdef CONFIG_STM32L4_TIM1
+      case STM32L4_TIM1_BASE:
+        modifyreg32(STM32L4_RCC_APB2ENR, RCC_APB2ENR_TIM1EN, 0);
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM2
+      case STM32L4_TIM2_BASE:
+        modifyreg32(STM32L4_RCC_APB1ENR1, RCC_APB1ENR1_TIM2EN, 0);
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM3
+      case STM32L4_TIM3_BASE:
+        modifyreg32(STM32L4_RCC_APB1ENR1, RCC_APB1ENR1_TIM3EN, 0);
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM4
+      case STM32L4_TIM4_BASE:
+        modifyreg32(STM32L4_RCC_APB1ENR1, RCC_APB1ENR1_TIM4EN, 0);
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM5
+      case STM32L4_TIM5_BASE:
+        modifyreg32(STM32L4_RCC_APB1ENR1, RCC_APB1ENR1_TIM5EN, 0);
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM6
+      case STM32L4_TIM6_BASE:
+        modifyreg32(STM32L4_RCC_APB1ENR1, RCC_APB1ENR1_TIM6EN, 0);
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM7
+      case STM32L4_TIM7_BASE:
+        modifyreg32(STM32L4_RCC_APB1ENR1, RCC_APB1ENR1_TIM7EN, 0);
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM8
+      case STM32L4_TIM8_BASE:
+        modifyreg32(STM32L4_RCC_APB2ENR, RCC_APB2ENR_TIM8EN, 0);
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM15
+      case STM32L4_TIM15_BASE:
+        modifyreg32(STM32L4_RCC_APB2ENR, RCC_APB2ENR_TIM15EN, 0);
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM16
+      case STM32L4_TIM16_BASE:
+        modifyreg32(STM32L4_RCC_APB2ENR, RCC_APB2ENR_TIM16EN, 0);
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM17
+      case STM32L4_TIM17_BASE:
+        modifyreg32(STM32L4_RCC_APB2ENR, RCC_APB2ENR_TIM17EN, 0);
+        break;
+#endif
+      default:
+        return -EINVAL;
+    }
+
+  /* Mark it as free */
+
+  ((struct stm32_tim_priv_s *)dev)->mode = STM32L4_TIM_MODE_UNUSED;
+
+  return OK;
+}
+
+#endif /* defined(CONFIG_STM32L4_TIM1 || ... || TIM17) */
diff --git a/arch/arm/src/stm32l4/stm32l4_tim.h b/arch/arm/src/stm32l4/stm32l4_tim.h
index e69de29bb2..1601f1277e 100644
--- a/arch/arm/src/stm32l4/stm32l4_tim.h
+++ b/arch/arm/src/stm32l4/stm32l4_tim.h
@@ -0,0 +1,223 @@
+/************************************************************************************
+ * arch/arm/src/stm32l4/stm32l4_tim.h
+ *
+ *   Copyright (C) 2011 Uros Platise. All rights reserved.
+ *   Author: Uros Platise 
+ *
+ * With modifications and updates by:
+ *
+ *   Copyright (C) 2011-2012, 2016 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt 
+ *           dev@ziggurat29.com
+ *
+ * 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_STM32L4_STM32L4_TIM_H
+#define __ARCH_ARM_SRC_STM32L4_STM32L4_TIM_H
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include 
+
+#include "chip.h"
+#include "chip/stm32l4_tim.h"
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+/* Helpers **************************************************************************/
+
+#define STM32L4_TIM_SETMODE(d,mode)       ((d)->ops->setmode(d,mode))
+#define STM32L4_TIM_SETCLOCK(d,freq)      ((d)->ops->setclock(d,freq))
+#define STM32L4_TIM_SETPERIOD(d,period)   ((d)->ops->setperiod(d,period))
+#define STM32L4_TIM_GETCOUNTER(d)         ((d)->ops->getcounter(d))
+#define STM32L4_TIM_SETCHANNEL(d,ch,mode) ((d)->ops->setchannel(d,ch,mode))
+#define STM32L4_TIM_SETCOMPARE(d,ch,comp) ((d)->ops->setcompare(d,ch,comp))
+#define STM32L4_TIM_GETCAPTURE(d,ch)      ((d)->ops->getcapture(d,ch))
+#define STM32L4_TIM_SETISR(d,hnd,s)       ((d)->ops->setisr(d,hnd,s))
+#define STM32L4_TIM_ENABLEINT(d,s)        ((d)->ops->enableint(d,s))
+#define STM32L4_TIM_DISABLEINT(d,s)       ((d)->ops->disableint(d,s))
+#define STM32L4_TIM_ACKINT(d,s)           ((d)->ops->ackint(d,s))
+#define STM32L4_TIM_CHECKINT(d,s)         ((d)->ops->checkint(d,s))
+
+/************************************************************************************
+ * Public Types
+ ************************************************************************************/
+
+#ifndef __ASSEMBLY__
+
+#undef EXTERN
+#if defined(__cplusplus)
+#define EXTERN extern "C"
+extern "C"
+{
+#else
+#define EXTERN extern
+#endif
+
+/* TIM Device Structure */
+
+struct stm32l4_tim_dev_s
+{
+  struct stm32l4_tim_ops_s *ops;
+};
+
+/* TIM Modes of Operation */
+
+typedef enum
+{
+  STM32L4_TIM_MODE_UNUSED       = -1,
+
+  /* One of the following */
+
+  STM32L4_TIM_MODE_MASK         = 0x0310,
+  STM32L4_TIM_MODE_DISABLED     = 0x0000,
+  STM32L4_TIM_MODE_UP           = 0x0100,
+  STM32L4_TIM_MODE_DOWN         = 0x0110,
+  STM32L4_TIM_MODE_UPDOWN       = 0x0200,
+  STM32L4_TIM_MODE_PULSE        = 0x0300,
+
+  /* One of the following */
+
+  STM32L4_TIM_MODE_CK_INT       = 0x0000,
+//STM32L4_TIM_MODE_CK_INT_TRIG  = 0x0400,
+//STM32L4_TIM_MODE_CK_EXT       = 0x0800,
+//STM32L4_TIM_MODE_CK_EXT_TRIG  = 0x0C00,
+
+  /* Clock sources, OR'ed with CK_EXT */
+
+//STM32L4_TIM_MODE_CK_CHINVALID = 0x0000,
+//STM32L4_TIM_MODE_CK_CH1       = 0x0001,
+//STM32L4_TIM_MODE_CK_CH2       = 0x0002,
+//STM32L4_TIM_MODE_CK_CH3       = 0x0003,
+//STM32L4_TIM_MODE_CK_CH4       = 0x0004
+
+  /* Todo: external trigger block */
+
+} stm32l4_tim_mode_t;
+
+/* TIM Channel Modes */
+
+typedef enum
+{
+  STM32L4_TIM_CH_DISABLED       = 0x00,
+
+  /* Common configuration */
+
+  STM32L4_TIM_CH_POLARITY_POS   = 0x00,
+  STM32L4_TIM_CH_POLARITY_NEG   = 0x01,
+
+  /* MODES: */
+
+  STM32L4_TIM_CH_MODE_MASK      = 0x06,
+
+  /* Output Compare Modes */
+
+  STM32L4_TIM_CH_OUTPWM         = 0x04,     /** Enable standard PWM mode, active high when counter < compare */
+//STM32L4_TIM_CH_OUTCOMPARE     = 0x06,
+
+  // TODO other modes ... as PWM capture, ENCODER and Hall Sensor
+//STM32L4_TIM_CH_INCAPTURE      = 0x10,
+//STM32L4_TIM_CH_INPWM          = 0x20
+//STM32L4_TIM_CH_DRIVE_OC   -- open collector mode
+
+} stm32l4_tim_channel_t;
+
+/* TIM Operations */
+
+struct stm32l4_tim_ops_s
+{
+  /* Basic Timers */
+
+  int  (*setmode)(FAR struct stm32l4_tim_dev_s *dev, stm32l4_tim_mode_t mode);
+  int  (*setclock)(FAR struct stm32l4_tim_dev_s *dev, uint32_t freq);
+  void (*setperiod)(FAR struct stm32l4_tim_dev_s *dev, uint32_t period);
+  uint32_t (*getcounter)(FAR struct stm32l4_tim_dev_s *dev);
+
+  /* General and Advanced Timers Adds */
+
+  int  (*setchannel)(FAR struct stm32l4_tim_dev_s *dev, uint8_t channel,
+                     stm32l4_tim_channel_t mode);
+  int  (*setcompare)(FAR struct stm32l4_tim_dev_s *dev, uint8_t channel,
+                     uint32_t compare);
+  int  (*getcapture)(FAR struct stm32l4_tim_dev_s *dev, uint8_t channel);
+
+  /* Timer interrupts */
+
+  int  (*setisr)(FAR struct stm32l4_tim_dev_s *dev,
+                 int (*handler)(int irq, void *context), int source);
+  void (*enableint)(FAR struct stm32l4_tim_dev_s *dev, int source);
+  void (*disableint)(FAR struct stm32l4_tim_dev_s *dev, int source);
+  void (*ackint)(FAR struct stm32l4_tim_dev_s *dev, int source);
+  int  (*checkint)(FAR struct stm32l4_tim_dev_s *dev, int source);
+};
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+/* Power-up timer and get its structure */
+
+FAR struct stm32l4_tim_dev_s *stm32l4_tim_init(int timer);
+
+/* Power-down timer, mark it as unused */
+
+int stm32l4_tim_deinit(FAR struct stm32l4_tim_dev_s * dev);
+
+/****************************************************************************
+ * Name: stm32l4_timer_initialize
+ *
+ * Description:
+ *   Bind the configuration timer to a timer lower half instance and
+ *   register the timer drivers at 'devpath'
+ *
+ * Input Parameters:
+ *   devpath - The full path to the timer device. This should be of the form /dev/timer0
+ *   timer - the timer number.
+ *
+ * Returned Values:
+ *   Zero (OK) is returned on success; A negated errno value is returned
+ *   to indicate the nature of any failure.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_TIMER
+int stm32l4_timer_initialize(FAR const char *devpath, int timer);
+#endif
+
+#undef EXTERN
+#if defined(__cplusplus)
+}
+#endif
+
+#endif /* __ASSEMBLY__ */
+#endif /* __ARCH_ARM_SRC_STM32L4_STM32L4_TIM_H */
diff --git a/arch/arm/src/stm32l4/stm32l4_tim_lowerhalf.c b/arch/arm/src/stm32l4/stm32l4_tim_lowerhalf.c
new file mode 100644
index 0000000000..5a7639cb3a
--- /dev/null
+++ b/arch/arm/src/stm32l4/stm32l4_tim_lowerhalf.c
@@ -0,0 +1,668 @@
+/****************************************************************************
+ * arch/arm/src/stm32l4/stm32l4_tim_lowerhalf.c
+ *
+ *   Copyright (C) 2015 Wail Khemir. All rights reserved.
+ *   Copyright (C) 2015 Omni Hoverboards Inc. All rights reserved.
+ *   Authors: Wail Khemir 
+ *            Paul Alexander Patience 
+ *            dev@ziggurat29.com
+ *
+ * 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 "stm32l4_tim.h"
+
+#if defined(CONFIG_TIMER) && \
+    (defined(CONFIG_STM32L4_TIM1)  || defined(CONFIG_STM32L4_TIM2)  || \
+     defined(CONFIG_STM32L4_TIM3)  || defined(CONFIG_STM32L4_TIM4)  || \
+     defined(CONFIG_STM32L4_TIM5)  || defined(CONFIG_STM32L4_TIM6)  || \
+     defined(CONFIG_STM32L4_TIM7)  || defined(CONFIG_STM32L4_TIM8)  || \
+     defined(CONFIG_STM32L4_TIM15) || defined(CONFIG_STM32L4_TIM16) || \
+     defined(CONFIG_STM32L4_TIM17))
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define STM32L4_TIM1_RES   16
+#define STM32L4_TIM2_RES   32
+#define STM32L4_TIM3_RES   16
+#define STM32L4_TIM4_RES   16
+#define STM32L4_TIM5_RES   32
+#define STM32L4_TIM6_RES   16
+#define STM32L4_TIM7_RES   16
+#define STM32L4_TIM8_RES   16
+#define STM32L4_TIM15_RES  16
+#define STM32L4_TIM16_RES  16
+#define STM32L4_TIM17_RES  16
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+/* This structure provides the private representation of the "lower-half"
+ * driver state structure.  This structure must be cast-compatible with the
+ * timer_lowerhalf_s structure.
+ */
+
+struct stm32_lowerhalf_s
+{
+  FAR const struct timer_ops_s *ops;        /* Lower half operations */
+  FAR struct stm32l4_tim_dev_s *tim;        /* stm32 timer driver */
+  tccb_t                        usrhandler; /* Current user interrupt handler */
+  const xcpt_t                  timhandler; /* Current timer interrupt handler */
+  bool                          started;    /* True: Timer has been started */
+  const uint8_t                 resolution; /* Number of bits in the timer (16 or 32 bits) */
+};
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+/* Interrupt handling *******************************************************/
+
+#ifdef CONFIG_STM32L4_TIM1
+static int stm32_tim1_interrupt(int irq, FAR void *context);
+#endif
+#ifdef CONFIG_STM32L4_TIM2
+static int stm32_tim2_interrupt(int irq, FAR void *context);
+#endif
+#ifdef CONFIG_STM32L4_TIM3
+static int stm32_tim3_interrupt(int irq, FAR void *context);
+#endif
+#ifdef CONFIG_STM32L4_TIM4
+static int stm32_tim4_interrupt(int irq, FAR void *context);
+#endif
+#ifdef CONFIG_STM32L4_TIM5
+static int stm32_tim5_interrupt(int irq, FAR void *context);
+#endif
+#ifdef CONFIG_STM32L4_TIM6
+static int stm32_tim6_interrupt(int irq, FAR void *context);
+#endif
+#ifdef CONFIG_STM32L4_TIM7
+static int stm32_tim7_interrupt(int irq, FAR void *context);
+#endif
+#ifdef CONFIG_STM32L4_TIM8
+static int stm32_tim8_interrupt(int irq, FAR void *context);
+#endif
+#ifdef CONFIG_STM32L4_TIM15
+static int stm32_tim15_interrupt(int irq, FAR void *context);
+#endif
+#ifdef CONFIG_STM32L4_TIM16
+static int stm32_tim16_interrupt(int irq, FAR void *context);
+#endif
+#ifdef CONFIG_STM32L4_TIM17
+static int stm32_tim17_interrupt(int irq, FAR void *context);
+#endif
+
+static int stm32_timer_handler(FAR struct stm32_lowerhalf_s *lower);
+
+/* "Lower half" driver methods **********************************************/
+
+static int stm32_start(FAR struct timer_lowerhalf_s *lower);
+static int stm32_stop(FAR struct timer_lowerhalf_s *lower);
+static int stm32_settimeout(FAR struct timer_lowerhalf_s *lower,
+                            uint32_t timeout);
+static tccb_t stm32_sethandler(FAR struct timer_lowerhalf_s *lower,
+                               tccb_t handler);
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+/* "Lower half" driver methods */
+
+static const struct timer_ops_s g_timer_ops =
+{
+  .start      = stm32_start,
+  .stop       = stm32_stop,
+  .getstatus  = NULL,
+  .settimeout = stm32_settimeout,
+  .sethandler = stm32_sethandler,
+  .ioctl      = NULL,
+};
+
+#ifdef CONFIG_STM32L4_TIM1
+static struct stm32_lowerhalf_s g_tim1_lowerhalf =
+{
+  .ops        = &g_timer_ops,
+  .timhandler = stm32_tim1_interrupt,
+  .resolution = STM32L4_TIM1_RES,
+};
+#endif
+
+#ifdef CONFIG_STM32L4_TIM2
+static struct stm32_lowerhalf_s g_tim2_lowerhalf =
+{
+  .ops        = &g_timer_ops,
+  .timhandler = stm32_tim2_interrupt,
+  .resolution = STM32L4_TIM2_RES,
+};
+#endif
+
+#ifdef CONFIG_STM32L4_TIM3
+static struct stm32_lowerhalf_s g_tim3_lowerhalf =
+{
+  .ops        = &g_timer_ops,
+  .timhandler = stm32_tim3_interrupt,
+  .resolution = STM32L4_TIM3_RES,
+};
+#endif
+
+#ifdef CONFIG_STM32L4_TIM4
+static struct stm32_lowerhalf_s g_tim4_lowerhalf =
+{
+  .ops        = &g_timer_ops,
+  .timhandler = stm32_tim4_interrupt,
+  .resolution = STM32L4_TIM4_RES,
+};
+#endif
+
+#ifdef CONFIG_STM32L4_TIM5
+static struct stm32_lowerhalf_s g_tim5_lowerhalf =
+{
+  .ops        = &g_timer_ops,
+  .timhandler = stm32_tim5_interrupt,
+  .resolution = STM32L4_TIM5_RES,
+};
+#endif
+
+#ifdef CONFIG_STM32L4_TIM6
+static struct stm32_lowerhalf_s g_tim6_lowerhalf =
+{
+  .ops        = &g_timer_ops,
+  .timhandler = stm32_tim6_interrupt,
+  .resolution = STM32L4_TIM6_RES,
+};
+#endif
+
+#ifdef CONFIG_STM32L4_TIM7
+static struct stm32_lowerhalf_s g_tim7_lowerhalf =
+{
+  .ops        = &g_timer_ops,
+  .timhandler = stm32_tim7_interrupt,
+  .resolution = STM32L4_TIM7_RES,
+};
+#endif
+
+#ifdef CONFIG_STM32L4_TIM8
+static struct stm32_lowerhalf_s g_tim8_lowerhalf =
+{
+  .ops        = &g_timer_ops,
+  .timhandler = stm32_tim8_interrupt,
+  .resolution = STM32L4_TIM8_RES,
+};
+#endif
+
+#ifdef CONFIG_STM32L4_TIM15
+static struct stm32_lowerhalf_s g_tim15_lowerhalf =
+{
+  .ops        = &g_timer_ops,
+  .timhandler = stm32_tim15_interrupt,
+  .resolution = STM32L4_TIM15_RES,
+};
+#endif
+
+#ifdef CONFIG_STM32L4_TIM16
+static struct stm32_lowerhalf_s g_tim16_lowerhalf =
+{
+  .ops        = &g_timer_ops,
+  .timhandler = stm32_tim16_interrupt,
+  .resolution = STM32L4_TIM16_RES,
+};
+#endif
+
+#ifdef CONFIG_STM32L4_TIM17
+static struct stm32_lowerhalf_s g_tim17_lowerhalf =
+{
+  .ops        = &g_timer_ops,
+  .timhandler = stm32_tim17_interrupt,
+  .resolution = STM32L4_TIM17_RES,
+};
+#endif
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stm32_timN_interrupt, N=1..14
+ *
+ * Description:
+ *   Individual interrupt handlers for each timer
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_STM32L4_TIM1
+static int stm32_tim1_interrupt(int irq, FAR void *context)
+{
+  return stm32_timer_handler(&g_tim1_lowerhalf);
+}
+#endif
+
+#ifdef CONFIG_STM32L4_TIM2
+static int stm32_tim2_interrupt(int irq, FAR void *context)
+{
+  return stm32_timer_handler(&g_tim2_lowerhalf);
+}
+#endif
+
+#ifdef CONFIG_STM32L4_TIM3
+static int stm32_tim3_interrupt(int irq, FAR void *context)
+{
+  return stm32_timer_handler(&g_tim3_lowerhalf);
+}
+#endif
+
+#ifdef CONFIG_STM32L4_TIM4
+static int stm32_tim4_interrupt(int irq, FAR void *context)
+{
+  return stm32_timer_handler(&g_tim4_lowerhalf);
+}
+#endif
+
+#ifdef CONFIG_STM32L4_TIM5
+static int stm32_tim5_interrupt(int irq, FAR void *context)
+{
+  return stm32_timer_handler(&g_tim5_lowerhalf);
+}
+#endif
+
+#ifdef CONFIG_STM32L4_TIM6
+static int stm32_tim6_interrupt(int irq, FAR void *context)
+{
+  return stm32_timer_handler(&g_tim6_lowerhalf);
+}
+#endif
+
+#ifdef CONFIG_STM32L4_TIM7
+static int stm32_tim7_interrupt(int irq, FAR void *context)
+{
+  return stm32_timer_handler(&g_tim7_lowerhalf);
+}
+#endif
+
+#ifdef CONFIG_STM32L4_TIM8
+static int stm32_tim8_interrupt(int irq, FAR void *context)
+{
+  return stm32_timer_handler(&g_tim8_lowerhalf);
+}
+#endif
+
+#ifdef CONFIG_STM32L4_TIM15
+static int stm32_tim15_interrupt(int irq, FAR void *context)
+{
+  return stm32_timer_handler(&g_tim15_lowerhalf);
+}
+#endif
+
+#ifdef CONFIG_STM32L4_TIM16
+static int stm32_tim16_interrupt(int irq, FAR void *context)
+{
+  return stm32_timer_handler(&g_tim16_lowerhalf);
+}
+#endif
+
+#ifdef CONFIG_STM32L4_TIM17
+static int stm32_tim17_interrupt(int irq, FAR void *context)
+{
+  return stm32_timer_handler(&g_tim17_lowerhalf);
+}
+#endif
+
+/****************************************************************************
+ * Name: stm32_timer_handler
+ *
+ * Description:
+ *   timer interrupt handler
+ *
+ * Input Parameters:
+ *
+ * Returned Values:
+ *
+ ****************************************************************************/
+
+static int stm32_timer_handler(FAR struct stm32_lowerhalf_s *lower)
+{
+  uint32_t next_interval_us = 0;
+
+  STM32L4_TIM_ACKINT(lower->tim, 0);
+
+  if (lower->usrhandler(&next_interval_us))
+    {
+      if (next_interval_us > 0)
+        {
+          STM32L4_TIM_SETPERIOD(lower->tim, next_interval_us);
+        }
+    }
+  else
+    {
+      stm32_stop((struct timer_lowerhalf_s *)lower);
+    }
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stm32_start
+ *
+ * Description:
+ *   Start the timer, resetting the time to the current timeout,
+ *
+ * Input Parameters:
+ *   lower - A pointer the publicly visible representation of the "lower-half"
+ *           driver state structure.
+ *
+ * Returned Values:
+ *   Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int stm32_start(FAR struct timer_lowerhalf_s *lower)
+{
+  FAR struct stm32_lowerhalf_s *priv = (FAR struct stm32_lowerhalf_s *)lower;
+
+  if (!priv->started)
+    {
+      STM32L4_TIM_SETMODE(priv->tim, STM32L4_TIM_MODE_UP);
+
+      if (priv->usrhandler != NULL)
+        {
+          STM32L4_TIM_SETISR(priv->tim, priv->timhandler, 0);
+          STM32L4_TIM_ENABLEINT(priv->tim, 0);
+        }
+
+      priv->started = true;
+      return OK;
+    }
+
+  /* Return EBUSY to indicate that the timer was already running */
+
+  return -EBUSY;
+}
+
+/****************************************************************************
+ * Name: stm32_stop
+ *
+ * Description:
+ *   Stop the timer
+ *
+ * Input Parameters:
+ *   lower - A pointer the publicly visible representation of the "lower-half"
+ *           driver state structure.
+ *
+ * Returned Values:
+ *   Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int stm32_stop(struct timer_lowerhalf_s *lower)
+{
+  struct stm32_lowerhalf_s *priv = (struct stm32_lowerhalf_s *)lower;
+
+  if (priv->started)
+    {
+      STM32L4_TIM_SETMODE(priv->tim, STM32L4_TIM_MODE_DISABLED);
+      STM32L4_TIM_DISABLEINT(priv->tim, 0);
+      STM32L4_TIM_SETISR(priv->tim, 0, 0);
+      priv->started = false;
+      return OK;
+    }
+
+  /* Return ENODEV to indicate that the timer was not running */
+
+  return -ENODEV;
+}
+
+/****************************************************************************
+ * Name: stm32_settimeout
+ *
+ * Description:
+ *   Set a new timeout value (and reset the timer)
+ *
+ * Input Parameters:
+ *   lower   - A pointer the publicly visible representation of the "lower-half"
+ *             driver state structure.
+ *   timeout - The new timeout value in microseconds.
+ *
+ * Returned Values:
+ *   Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int stm32_settimeout(FAR struct timer_lowerhalf_s *lower, uint32_t timeout)
+{
+  FAR struct stm32_lowerhalf_s *priv = (FAR struct stm32_lowerhalf_s *)lower;
+  uint64_t maxtimeout;
+
+  if (priv->started)
+    {
+      return -EPERM;
+    }
+
+  maxtimeout = (1 << priv->resolution) - 1;
+  if (timeout > maxtimeout)
+    {
+      uint64_t freq = (maxtimeout * 1000000) / timeout;
+      STM32L4_TIM_SETCLOCK(priv->tim, freq);
+      STM32L4_TIM_SETPERIOD(priv->tim, maxtimeout);
+    }
+  else
+    {
+      STM32L4_TIM_SETCLOCK(priv->tim, 1000000);
+      STM32L4_TIM_SETPERIOD(priv->tim, timeout);
+    }
+
+  return OK;
+}
+
+/****************************************************************************
+ * Name: stm32_sethandler
+ *
+ * Description:
+ *   Call this user provided timeout handler.
+ *
+ * Input Parameters:
+ *   lower      - A pointer the publicly visible representation of the "lower-half"
+ *                driver state structure.
+ *   newhandler - The new timer expiration function pointer.  If this
+ *                function pointer is NULL, then the reset-on-expiration
+ *                behavior is restored,
+ *
+ * Returned Values:
+ *   The previous timer expiration function pointer or NULL is there was
+ *   no previous function pointer.
+ *
+ ****************************************************************************/
+
+static tccb_t stm32_sethandler(FAR struct timer_lowerhalf_s *lower,
+                               tccb_t newhandler)
+{
+  FAR struct stm32_lowerhalf_s *priv = (FAR struct stm32_lowerhalf_s *)lower;
+
+  irqstate_t flags = enter_critical_section();
+
+  /* Get the old handler return value */
+
+  tccb_t oldhandler = priv->usrhandler;
+
+  /* Save the new handler */
+
+  priv->usrhandler = newhandler;
+
+  if (newhandler != NULL && priv->started)
+    {
+      STM32L4_TIM_SETISR(priv->tim, priv->timhandler, 0);
+      STM32L4_TIM_ENABLEINT(priv->tim, 0);
+    }
+  else
+    {
+      STM32L4_TIM_DISABLEINT(priv->tim, 0);
+      STM32L4_TIM_SETISR(priv->tim, 0, 0);
+    }
+
+  leave_critical_section(flags);
+  return oldhandler;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: stm32l4_timer_initialize
+ *
+ * Description:
+ *   Bind the configuration timer to a timer lower half instance and
+ *   register the timer drivers at 'devpath'
+ *
+ * Input Parameters:
+ *   devpath - The full path to the timer device.  This should be of the
+ *     form /dev/timer0
+ *   timer - the timer's number.
+ *
+ * Returned Values:
+ *   Zero (OK) is returned on success; A negated errno value is returned
+ *   to indicate the nature of any failure.
+ *
+ ****************************************************************************/
+
+int stm32l4_timer_initialize(FAR const char *devpath, int timer)
+{
+  FAR struct stm32_lowerhalf_s *lower;
+
+  switch (timer)
+    {
+#ifdef CONFIG_STM32L4_TIM1
+      case 1:
+        lower = &g_tim1_lowerhalf;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM2
+      case 2:
+        lower = &g_tim2_lowerhalf;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM3
+      case 3:
+        lower = &g_tim3_lowerhalf;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM4
+      case 4:
+        lower = &g_tim4_lowerhalf;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM5
+      case 5:
+        lower = &g_tim5_lowerhalf;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM6
+      case 6:
+        lower = &g_tim6_lowerhalf;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM7
+      case 7:
+        lower = &g_tim7_lowerhalf;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM8
+      case 8:
+        lower = &g_tim8_lowerhalf;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM15
+      case 15:
+        lower = &g_tim15_lowerhalf;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM16
+      case 16:
+        lower = &g_tim16_lowerhalf;
+        break;
+#endif
+#ifdef CONFIG_STM32L4_TIM17
+      case 17:
+        lower = &g_tim17_lowerhalf;
+        break;
+#endif
+      default:
+        return -ENODEV;
+    }
+
+  /* Initialize the elements of lower half state structure */
+
+  lower->started    = false;
+  lower->usrhandler = NULL;
+  lower->tim        = stm32l4_tim_init(timer);
+
+  if (lower->tim == NULL)
+    {
+      return -EINVAL;
+    }
+
+  /* Register the timer driver as /dev/timerX.  The returned value from
+   * timer_register is a handle that could be used with timer_unregister().
+   * REVISIT: The returned handle is discard here.
+   */
+
+  FAR void *drvr = timer_register(devpath,
+                                  (FAR struct timer_lowerhalf_s *)lower);
+  if (drvr == NULL)
+    {
+      /* The actual cause of the failure may have been a failure to allocate
+       * perhaps a failure to register the timer driver (such as if the
+       * 'depath' were not unique).  We know here but we return EEXIST to
+       * indicate the failure (implying the non-unique devpath).
+       */
+
+      return -EEXIST;
+    }
+
+  return OK;
+}
+
+#endif /* CONFIG_TIMER */
-- 
GitLab


From 2938ab7c9783bfbfda3dcc4ba07844da86e2a560 Mon Sep 17 00:00:00 2001
From: ziggurat29 
Date: Fri, 8 Jul 2016 17:32:26 -0500
Subject: [PATCH 184/229] trivial; alter autoleds to indicate ISR entry/exit --
 makes tickless visibly obvious

---
 configs/nucleo-l476rg/include/board.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/nucleo-l476rg/include/board.h b/configs/nucleo-l476rg/include/board.h
index 32462f2477..f9ca1ada74 100644
--- a/configs/nucleo-l476rg/include/board.h
+++ b/configs/nucleo-l476rg/include/board.h
@@ -186,7 +186,7 @@
 #define LED_HEAPALLOCATE 0
 #define LED_IRQSENABLED  0
 #define LED_STACKCREATED 1
-#define LED_INIRQ        2
+#define LED_INIRQ        1
 #define LED_SIGNAL       2
 #define LED_ASSERTION    2
 #define LED_PANIC        1
-- 
GitLab


From ee55a0b9a322a32f4371aca6a8ef82d9bc054f29 Mon Sep 17 00:00:00 2001
From: ziggurat29 
Date: Fri, 8 Jul 2016 17:33:38 -0500
Subject: [PATCH 185/229] update README.txt to reflect new implementation
 status

---
 arch/arm/src/stm32l4/README.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/src/stm32l4/README.txt b/arch/arm/src/stm32l4/README.txt
index d777d3bc8f..4e1d31f6aa 100644
--- a/arch/arm/src/stm32l4/README.txt
+++ b/arch/arm/src/stm32l4/README.txt
@@ -33,7 +33,7 @@ QSPI     : works in polling, interrupt, DMA, and also memory-mapped modes
 CAN      : TODO
 OTGFS    : dev implemented, tested, outstanding issue with CDCACM (ACM_SET_LINE_CODING, but otherwise works);
          : host implemented, only build smoke-tested (i.e. builds, but no functional testing yet)
-Timers   : TODO
+Timers   : Implemented, with PWM oneshot and freerun, tickless OS support.  Limited testing (focused on tickless OS so far)
 PM       : TODO, PWR registers defined
 FSMC     : TODO
 AES      : TODO
-- 
GitLab


From 1925df8faad950c02386c7f086db209071326227 Mon Sep 17 00:00:00 2001
From: Sagitta Li 
Date: Sat, 9 Jul 2016 06:41:39 -0600
Subject: [PATCH 186/229] Fix some recently introduced errors

---
 fs/smartfs/smartfs_smart.c | 2 +-
 fs/vfs/fs_ioctl.c          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/smartfs/smartfs_smart.c b/fs/smartfs/smartfs_smart.c
index c276eeff30..c5390d4201 100644
--- a/fs/smartfs/smartfs_smart.c
+++ b/fs/smartfs/smartfs_smart.c
@@ -771,7 +771,7 @@ static ssize_t smartfs_write(FAR struct file *filep, const char *buffer,
           if (ret < 0)
             {
               ferr("ERROR: Error %d writing sector %d data\n", 
-                   et, sf->currsector);
+                   ret, sf->currsector);
               goto errout_with_semaphore;
             }
 
diff --git a/fs/vfs/fs_ioctl.c b/fs/vfs/fs_ioctl.c
index 97a5056a39..ef696a9898 100644
--- a/fs/vfs/fs_ioctl.c
+++ b/fs/vfs/fs_ioctl.c
@@ -76,7 +76,7 @@
 int file_ioctl(FAR struct file *filep, int req, unsigned long arg)
 {
   FAR struct inode *inode;
-  int ret;
+  int ret = OK;
 
   /* Is a driver registered? Does it support the ioctl method? */
 
@@ -93,7 +93,7 @@ int file_ioctl(FAR struct file *filep, int req, unsigned long arg)
         }
     }
 
-  return OK;
+  return ret;
 }
 #endif /* CONFIG_NFILE_DESCRIPTORS > 0 */
 
-- 
GitLab


From d89e062c06f790adcbec018db83442fa7b465f44 Mon Sep 17 00:00:00 2001
From: Wolfgang Reissnegger 
Date: Sat, 9 Jul 2016 06:50:32 -0600
Subject: [PATCH 187/229] SAM3/4 I2C: Fix reversed logic in twi_startmessage().

---
 arch/arm/src/sam34/sam_twi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/src/sam34/sam_twi.c b/arch/arm/src/sam34/sam_twi.c
index 6e4aae1427..74d0e7d6ed 100644
--- a/arch/arm/src/sam34/sam_twi.c
+++ b/arch/arm/src/sam34/sam_twi.c
@@ -666,7 +666,7 @@ static void twi_startwrite(struct twi_dev_s *priv, struct i2c_msg_s *msg)
 
 static void twi_startmessage(struct twi_dev_s *priv, struct i2c_msg_s *msg)
 {
-  if ((msg->flags & I2C_M_READ) == 0)
+  if ((msg->flags & I2C_M_READ) != 0)
     {
       twi_startread(priv, msg);
     }
-- 
GitLab


From 2689645b974ff6197ffccc3131e997aadfd46dfb Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sat, 9 Jul 2016 07:23:12 -0600
Subject: [PATCH 188/229] VFS ioctl() again.  Per comments from David Sidrane,
 file_ioctl() should not return success if the ioctl method is not supported. 
 It probably should return ENOTTY in that case.

---
 fs/vfs/fs_ioctl.c | 47 +++++++++++++++++++++++++++++++++++------------
 1 file changed, 35 insertions(+), 12 deletions(-)

diff --git a/fs/vfs/fs_ioctl.c b/fs/vfs/fs_ioctl.c
index ef696a9898..487643fb16 100644
--- a/fs/vfs/fs_ioctl.c
+++ b/fs/vfs/fs_ioctl.c
@@ -76,24 +76,42 @@
 int file_ioctl(FAR struct file *filep, int req, unsigned long arg)
 {
   FAR struct inode *inode;
-  int ret = OK;
+  int errcode;
+  int ret;
+
+  DEBUGASSERT(filep != NULL);
 
-  /* Is a driver registered? Does it support the ioctl method? */
+  /* Is a driver opened? */
 
   inode = filep->f_inode;
-  if (inode && inode->u.i_ops && inode->u.i_ops->ioctl)
+  if (!inode)
     {
-      /* Yes, then let it perform the ioctl */
+      errcode = EBADF;
+      goto errout;
+    }
 
-      ret = (int)inode->u.i_ops->ioctl(filep, req, arg);
-      if (ret < 0)
-        {
-          set_errno(-ret);
-          return ERROR;
-        }
+  /* Does the driver support the ioctl method? */
+
+  if (inode->u.i_ops == NULL || inode->u.i_ops->ioctl == NULL)
+    {
+      errcode = ENOTTY;
+      goto errout;
+    }
+
+  /* Yes on both accounts.  Let the driver perform the ioctl command */
+
+  ret = (int)inode->u.i_ops->ioctl(filep, req, arg);
+  if (ret < 0)
+    {
+      errcode = -ret;
+      goto errout;
     }
 
   return ret;
+
+errout:
+  set_errno(errcode);
+  return ERROR;
 }
 #endif /* CONFIG_NFILE_DESCRIPTORS > 0 */
 
@@ -162,12 +180,17 @@ int ioctl(int fd, int req, unsigned long arg)
   filep = fs_getfilep(fd);
   if (!filep)
     {
-      /* The errno value has already been set */
+      /* Apparently, the fd does not correspond to any open file.  In the
+       * case of errors, the errno value has already been set by
+       * fs_getfilep().
+       */
 
       return ERROR;
     }
 
-  /* Is a driver registered? Does it support the ioctl method? */
+  /* Perform the file ioctl.  If file_ioctl() fails, it will set the errno
+   * value appropriately.
+   */
 
   return file_ioctl(filep, req, arg);
 #else
-- 
GitLab


From 90917d9741660cb54a3a0903953bc6dde2eeb5e0 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Sat, 9 Jul 2016 13:24:13 -0600
Subject: [PATCH 189/229] COPYING: Remove sections that do not apply to files
 under nuttx/

---
 COPYING | 41 -----------------------------------------
 1 file changed, 41 deletions(-)

diff --git a/COPYING b/COPYING
index a8113ab027..2fcc3edc6a 100644
--- a/COPYING
+++ b/COPYING
@@ -225,44 +225,3 @@ drivers/video/ov2640
   content of those tables and still retain this BSD license.  I am guessing
   so, but I am not a copyright attorney so you should use this driver in
   products at your own risk.
-
-apps/netutils/pppd
-^^^^^^^^^^^^^^^^^^
-
-  This implementation of PPPD has a license that is mostly compatible the
-  NuttX 3-clause BSD license, but includes a fourth clause that required
-  acknowledgement of Mike Johnson/Mycal Labs if it is built into your
-  product:
-
-      Copyright (C) 2000, Mycal Labs www.mycal.com
-      Copyright (c) 2003, Mike Johnson, Mycal Labs, www.mycal.net
-      All rights reserved.
-
-    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. All advertising materials mentioning features or use of this software
-       must display the following acknowledgement:
-       This product includes software developed by Mike Johnson/Mycal Labs
-       www.mycal.net.
-    4. The name of the author may not be used to endorse or promote
-       products derived from this software without specific prior
-       written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-- 
GitLab


From 261358f1f5502138a0052792a7e1c922f81eadc4 Mon Sep 17 00:00:00 2001
From: David Alessio 
Date: Mon, 11 Jul 2016 07:02:50 -0600
Subject: [PATCH 190/229] This change should significantly improve the
 performance of single precision floating point math library functions. The
 vast majority of changes have to do with preventing the compiler from
 needlessly promoting floats to doubles, performing the calculation with
 doubles, only to demote the result to float. These changes only affect the
 math lib functions that return float.

---
 include/nuttx/math.h   |  8 ++++++++
 libc/libc.h            |  3 ++-
 libc/math/Make.defs    |  1 +
 libc/math/lib_acosf.c  |  2 +-
 libc/math/lib_acoshf.c |  2 +-
 libc/math/lib_asinf.c  |  4 ++--
 libc/math/lib_asinhf.c |  2 +-
 libc/math/lib_atan2f.c |  8 ++++----
 libc/math/lib_atanf.c  |  2 +-
 libc/math/lib_atanhf.c |  2 +-
 libc/math/lib_ceilf.c  |  4 ++--
 libc/math/lib_cosf.c   |  2 +-
 libc/math/lib_coshf.c  |  2 +-
 libc/math/lib_erff.c   | 16 ++++++++--------
 libc/math/lib_expf.c   |  8 ++++----
 libc/math/lib_floorf.c |  4 ++--
 libc/math/lib_frexpf.c |  2 +-
 libc/math/lib_ldexpf.c |  2 +-
 libc/math/lib_log10f.c |  2 +-
 libc/math/lib_log2f.c  |  2 +-
 libc/math/lib_logf.c   | 18 +++++++++---------
 libc/math/lib_modff.c  |  8 ++++----
 libc/math/lib_rintf.c  | 10 +++++-----
 libc/math/lib_sinf.c   | 20 ++++++++++----------
 libc/math/lib_sinhf.c  |  2 +-
 libc/math/lib_sqrtf.c  | 20 ++++++++++----------
 libc/math/lib_tanhf.c  |  2 +-
 27 files changed, 84 insertions(+), 74 deletions(-)

diff --git a/include/nuttx/math.h b/include/nuttx/math.h
index 6ee91eab7e..d6963a5013 100644
--- a/include/nuttx/math.h
+++ b/include/nuttx/math.h
@@ -93,10 +93,15 @@
 #define NAN         (0.0/0.0)
 #define HUGE_VAL    INFINITY
 
+#define INFINITY_F  (1.0F/0.0F)
+#define NAN_F       (0.0F/0.0F)
+
 #define isnan(x)    ((x) != (x))
 #define isinf(x)    (((x) == INFINITY) || ((x) == -INFINITY))
 #define isfinite(x) (!(isinf(x)) && (x != NAN))
 
+#define isinf_f(x)  (((x) == INFINITY_F) || ((x) == -INFINITY_F))
+
 /* Exponential and Logarithmic constants ************************************/
 
 #define M_E        2.7182818284590452353602874713526625
@@ -116,6 +121,9 @@
 #define M_2_PI     0.6366197723675813430755350534900574
 #define M_2_SQRTPI 1.1283791670955125738961589031215452
 
+#define M_PI_F     ((float)M_PI)
+#define M_PI_2_F   ((float)M_PI_2)
+
 /****************************************************************************
  * Public Function Prototypes
  ****************************************************************************/
diff --git a/libc/libc.h b/libc/libc.h
index 9cb1974fa9..9e947009f2 100644
--- a/libc/libc.h
+++ b/libc/libc.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * libc/libc.h
  *
- *   Copyright (C) 2007-2014 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2014, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt 
  *
  * Redistribution and use in source and binary forms, with or without
@@ -211,6 +211,7 @@ int lib_checkbase(int base, const char **pptr);
 /* Defined in lib_expi.c */
 
 #ifdef CONFIG_LIBM
+float  lib_expif(size_t n);
 double lib_expi(size_t n);
 #endif
 
diff --git a/libc/math/Make.defs b/libc/math/Make.defs
index cf25a1ec76..a2acc7a93a 100644
--- a/libc/math/Make.defs
+++ b/libc/math/Make.defs
@@ -59,6 +59,7 @@ CSRCS += lib_tanhl.c lib_asinhl.c lib_acoshl.c lib_atanhl.c lib_erfl.c lib_copys
 CSRCS += lib_truncl.c
 
 CSRCS += lib_libexpi.c lib_libsqrtapprox.c
+CSRCS += lib_libexpif.c
 
 # Add the floating point math directory to the build
 
diff --git a/libc/math/lib_acosf.c b/libc/math/lib_acosf.c
index 6719e54a67..12fe68da67 100644
--- a/libc/math/lib_acosf.c
+++ b/libc/math/lib_acosf.c
@@ -37,5 +37,5 @@
 
 float acosf(float x)
 {
-  return (M_PI_2 - asinf(x));
+  return (M_PI_2_F - asinf(x));
 }
diff --git a/libc/math/lib_acoshf.c b/libc/math/lib_acoshf.c
index a676d6a40e..4b42e968d7 100644
--- a/libc/math/lib_acoshf.c
+++ b/libc/math/lib_acoshf.c
@@ -48,5 +48,5 @@
 
 float acoshf(float x)
 {
-  return logf(x + sqrtf(x * x - 1));
+  return logf(x + sqrtf(x * x - 1.0F));
 }
diff --git a/libc/math/lib_asinf.c b/libc/math/lib_asinf.c
index e22d32fe79..ac17a53944 100644
--- a/libc/math/lib_asinf.c
+++ b/libc/math/lib_asinf.c
@@ -47,9 +47,9 @@ float asinf(float x)
       y_sin = sinf(y);
       y_cos = cosf(y);
 
-      if (y > M_PI_2 || y < -M_PI_2)
+      if (y > M_PI_2_F || y < -M_PI_2_F)
         {
-          y = fmodf(y, M_PI);
+          y = fmodf(y, M_PI_F);
         }
 
       if (y_sin + FLT_EPSILON >= x && y_sin - FLT_EPSILON <= x)
diff --git a/libc/math/lib_asinhf.c b/libc/math/lib_asinhf.c
index ba749a6569..4c26d038ea 100644
--- a/libc/math/lib_asinhf.c
+++ b/libc/math/lib_asinhf.c
@@ -48,5 +48,5 @@
 
 float asinhf(float x)
 {
-  return logf(x + sqrtf(x * x + 1));
+  return logf(x + sqrtf(x * x + 1.0F));
 }
diff --git a/libc/math/lib_atan2f.c b/libc/math/lib_atan2f.c
index 5d766df99d..c600161408 100644
--- a/libc/math/lib_atan2f.c
+++ b/libc/math/lib_atan2f.c
@@ -43,22 +43,22 @@ float atan2f(float y, float x)
     }
   else if (y >= 0 && x < 0)
     {
-      return atanf(y / x) + M_PI;
+      return atanf(y / x) + M_PI_F;
     }
   else if (y < 0)
     {
       if (x == 0)
         {
-          return -M_PI_2;
+          return -M_PI_2_F;
         }
       else /* Can only be x < 0 */
         {
-          return atanf(y / x) - M_PI;
+          return atanf(y / x) - M_PI_F;
         }
     }
   else if (y > 0 && x == 0)
     {
-      return M_PI_2;
+      return M_PI_2_F;
     }
   else /* if (y == 0 && x == 0) Undefined but returns normally 0 */
     {
diff --git a/libc/math/lib_atanf.c b/libc/math/lib_atanf.c
index c9835c6f24..aef149ed9e 100644
--- a/libc/math/lib_atanf.c
+++ b/libc/math/lib_atanf.c
@@ -39,5 +39,5 @@
 
 float atanf(float x)
 {
-  return asinf(x / sqrtf(x * x + 1));
+  return asinf(x / sqrtf(x * x + 1.0F));
 }
diff --git a/libc/math/lib_atanhf.c b/libc/math/lib_atanhf.c
index 60a6696f73..a54090f517 100644
--- a/libc/math/lib_atanhf.c
+++ b/libc/math/lib_atanhf.c
@@ -48,5 +48,5 @@
 
 float atanhf(float x)
 {
-  return 0.5 * logf((1 + x) / (1 - x));
+  return 0.5F * logf((1.0F + x) / (1.0F - x));
 }
diff --git a/libc/math/lib_ceilf.c b/libc/math/lib_ceilf.c
index 8378141abd..830f2a4769 100644
--- a/libc/math/lib_ceilf.c
+++ b/libc/math/lib_ceilf.c
@@ -38,9 +38,9 @@
 float ceilf(float x)
 {
   modff(x, &x);
-  if (x > 0.0)
+  if (x > 0.0F)
     {
-      x += 1.0;
+      x += 1.0F;
     }
 
   return x;
diff --git a/libc/math/lib_cosf.c b/libc/math/lib_cosf.c
index 55ba93c1c8..5532894b02 100644
--- a/libc/math/lib_cosf.c
+++ b/libc/math/lib_cosf.c
@@ -37,5 +37,5 @@
 
 float cosf(float x)
 {
-  return sinf(x + M_PI_2);
+  return sinf(x + M_PI_2_F);
 }
diff --git a/libc/math/lib_coshf.c b/libc/math/lib_coshf.c
index 7cb575822f..37b4bf8e0f 100644
--- a/libc/math/lib_coshf.c
+++ b/libc/math/lib_coshf.c
@@ -38,5 +38,5 @@
 float coshf(float x)
 {
   x = expf(x);
-  return ((x + (1.0 / x)) / 2.0);
+  return ((x + (1.0F / x)) / 2.0F);
 }
diff --git a/libc/math/lib_erff.c b/libc/math/lib_erff.c
index 75199c828c..364b7fe03c 100644
--- a/libc/math/lib_erff.c
+++ b/libc/math/lib_erff.c
@@ -57,14 +57,14 @@ float erff(float x)
   float t;
   float a1, a2, a3, a4, a5, p;
 
-  a1 =  0.254829592;
-  a2 = -0.284496736;
-  a3 =  1.421413741;
-  a4 = -1.453152027;
-  a5 =  1.061405429;
-  p  =  0.3275911;
+  a1 =  0.254829592F;
+  a2 = -0.284496736F;
+  a3 =  1.421413741F;
+  a4 = -1.453152027F;
+  a5 =  1.061405429F;
+  p  =  0.3275911F;
 
   sign = (x >= 0 ? 1 : -1);
-  t = 1.0/(1.0 + p*x);
-  return sign * (1.0 - (((((a5 * t + a4) * t) + a3) * t + a2) * t + a1) * t * expf(-x * x));
+  t = 1.0F/(1.0F + p*x);
+  return sign * (1.0F - (((((a5 * t + a4) * t) + a3) * t + a2) * t + a1) * t * expf(-x * x));
 }
diff --git a/libc/math/lib_expf.c b/libc/math/lib_expf.c
index 4ce5208607..3e3cb02ed9 100644
--- a/libc/math/lib_expf.c
+++ b/libc/math/lib_expf.c
@@ -89,8 +89,8 @@ float expf(float x)
 
   /* Perform Taylor series approximation with eleven terms */
 
-  value = 0.0;
-  x0 = 1.0;
+  value = 0.0F;
+  x0 = 1.0F;
   for (i = 0; i < 10; i++)
     {
       value += x0 * _flt_inv_fact[i];
@@ -99,11 +99,11 @@ float expf(float x)
 
   /* Multiply by exp of the integer component */
 
-  value *= lib_expi(int_part);
+  value *= lib_expif(int_part);
 
   if (invert)
     {
-      return (1.0 / value);
+      return (1.0F / value);
     }
   else
     {
diff --git a/libc/math/lib_floorf.c b/libc/math/lib_floorf.c
index 4a4ef1a4f7..d2fac02d2d 100644
--- a/libc/math/lib_floorf.c
+++ b/libc/math/lib_floorf.c
@@ -38,9 +38,9 @@
 float floorf(float x)
 {
   modff(x, &x);
-  if (x < 0.0)
+  if (x < 0.0F)
     {
-      x -= 1.0;
+      x -= 1.0F;
     }
 
   return x;
diff --git a/libc/math/lib_frexpf.c b/libc/math/lib_frexpf.c
index 6ec5aa7442..2f0421ccb9 100644
--- a/libc/math/lib_frexpf.c
+++ b/libc/math/lib_frexpf.c
@@ -38,5 +38,5 @@
 float frexpf(float x, int *exponent)
 {
   *exponent = (int)ceilf(log2f(x));
-  return x / ldexpf(1.0, *exponent);
+  return x / ldexpf(1.0F, *exponent);
 }
diff --git a/libc/math/lib_ldexpf.c b/libc/math/lib_ldexpf.c
index 12503438b8..d24d1384e7 100644
--- a/libc/math/lib_ldexpf.c
+++ b/libc/math/lib_ldexpf.c
@@ -37,5 +37,5 @@
 
 float ldexpf(float x, int n)
 {
-  return (x * powf(2.0, (float)n));
+  return (x * powf(2.0F, (float)n));
 }
diff --git a/libc/math/lib_log10f.c b/libc/math/lib_log10f.c
index f0ec9b0589..aa810a0127 100644
--- a/libc/math/lib_log10f.c
+++ b/libc/math/lib_log10f.c
@@ -37,5 +37,5 @@
 
 float log10f(float x)
 {
-  return (logf(x) / M_LN10);
+  return (logf(x) / (float)M_LN10);
 }
diff --git a/libc/math/lib_log2f.c b/libc/math/lib_log2f.c
index a2d351bb12..025b5de3b1 100644
--- a/libc/math/lib_log2f.c
+++ b/libc/math/lib_log2f.c
@@ -37,5 +37,5 @@
 
 float log2f(float x)
 {
-  return (logf(x) / M_LN2);
+  return (logf(x) / (float)M_LN2);
 }
diff --git a/libc/math/lib_logf.c b/libc/math/lib_logf.c
index 80eff85c3c..2d097d228e 100644
--- a/libc/math/lib_logf.c
+++ b/libc/math/lib_logf.c
@@ -40,8 +40,8 @@ float logf(float x)
 {
   float y, y_old, ey, epsilon;
 
-  y = 0.0;
-  y_old = 1.0;
+  y = 0.0F;
+  y_old = 1.0F;
   epsilon = FLT_EPSILON;
 
   while (y > y_old + epsilon || y < y_old - epsilon)
@@ -50,25 +50,25 @@ float logf(float x)
       ey = exp(y);
       y -= (ey - x) / ey;
 
-      if (y > 700.0)
+      if (y > 700.0F)
         {
-          y = 700.0;
+          y = 700.0F;
         }
 
-      if (y < -700.0)
+      if (y < -700.0F)
         {
-          y = -700.0;
+          y = -700.0F;
         }
 
-      epsilon = (fabs(y) > 1.0) ? fabs(y) * FLT_EPSILON : FLT_EPSILON;
+      epsilon = (fabsf(y) > 1.0F) ? fabsf(y) * FLT_EPSILON : FLT_EPSILON;
     }
 
-  if (y == 700.0)
+  if (y == 700.0F)
     {
       return INFINITY;
     }
 
-  if (y == -700.0)
+  if (y == -700.0F)
     {
       return INFINITY;
     }
diff --git a/libc/math/lib_modff.c b/libc/math/lib_modff.c
index ad07a4f70c..5934782b7b 100644
--- a/libc/math/lib_modff.c
+++ b/libc/math/lib_modff.c
@@ -37,14 +37,14 @@
 
 float modff(float x, float *iptr)
 {
-  if (fabsf(x) >= 8388608.0)
+  if (fabsf(x) >= 8388608.0F)
     {
       *iptr = x;
-      return 0.0;
+      return 0.0F;
     }
-  else if (fabs(x) < 1.0)
+  else if (fabsf(x) < 1.0F)
     {
-      *iptr = 0.0;
+      *iptr = 0.0F;
       return x;
     }
   else
diff --git a/libc/math/lib_rintf.c b/libc/math/lib_rintf.c
index ca733e3d79..9a3c06df28 100644
--- a/libc/math/lib_rintf.c
+++ b/libc/math/lib_rintf.c
@@ -105,15 +105,15 @@ float rintf(float x)
   linteger  = (long)x;
   fremainder = x - (float)linteger;
 
-  if (x < 0.0)
+  if (x < 0.0F)
     {
       /* fremainder should be in range 0 .. -1 */
 
-      if (fremainder == -0.5)
+      if (fremainder == -0.5F)
         {
           linteger = ((linteger + 1) & ~1);
         }
-      else if (fremainder < -0.5)
+      else if (fremainder < -0.5F)
         {
           linteger--;
         }
@@ -122,11 +122,11 @@ float rintf(float x)
     {
       /* fremainder should be in range 0 .. 1 */
 
-      if (fremainder == 0.5)
+      if (fremainder == 0.5F)
         {
           linteger = ((linteger + 1) & ~1);
         }
-      else if (fremainder > 0.5)
+      else if (fremainder > 0.5F)
         {
           linteger++;
         }
diff --git a/libc/math/lib_sinf.c b/libc/math/lib_sinf.c
index 5f17eb212b..b7be087b90 100644
--- a/libc/math/lib_sinf.c
+++ b/libc/math/lib_sinf.c
@@ -58,31 +58,31 @@ float sinf(float x)
 
   /* Move x to [-pi, pi) */
 
-  x = fmodf(x, 2 * M_PI);
-  if (x >= M_PI)
+  x = fmodf(x, 2 * M_PI_F);
+  if (x >= M_PI_F)
     {
-      x -= 2 * M_PI;
+      x -= 2 * M_PI_F;
     }
 
-  if (x < -M_PI)
+  if (x < -M_PI_F)
     {
-      x += 2 * M_PI;
+      x += 2 * M_PI_F;
     }
 
   /* Move x to [-pi/2, pi/2) */
 
-  if (x >= M_PI_2)
+  if (x >= M_PI_2_F)
     {
-      x = M_PI - x;
+      x = M_PI_F - x;
     }
 
-  if (x < -M_PI_2)
+  if (x < -M_PI_2_F)
     {
-      x = -M_PI - x;
+      x = -M_PI_F - x;
     }
 
   x_squared = x * x;
-  sin_x = 0.0;
+  sin_x = 0.0F;
 
   /* Perform Taylor series approximation for sin(x) with six terms */
 
diff --git a/libc/math/lib_sinhf.c b/libc/math/lib_sinhf.c
index 6b27f59508..baf353f34d 100644
--- a/libc/math/lib_sinhf.c
+++ b/libc/math/lib_sinhf.c
@@ -38,5 +38,5 @@
 float sinhf(float x)
 {
   x = expf(x);
-  return ((x - (1.0 / x)) / 2.0);
+  return ((x - (1.0F / x)) / 2.0F);
 }
diff --git a/libc/math/lib_sqrtf.c b/libc/math/lib_sqrtf.c
index e1a107eb8b..918c1c9568 100644
--- a/libc/math/lib_sqrtf.c
+++ b/libc/math/lib_sqrtf.c
@@ -47,25 +47,25 @@ float sqrtf(float x)
 
   /* Filter out invalid/trivial inputs */
 
-  if (x < 0.0)
+  if (x < 0.0F)
     {
       set_errno(EDOM);
-      return NAN;
+      return NAN_F;
     }
 
   if (isnan(x))
     {
-      return NAN;
+      return NAN_F;
     }
 
-  if (isinf(x))
+  if (isinf_f(x))
     {
-      return INFINITY;
+      return INFINITY_F;
     }
 
-  if (x == 0.0)
+  if (x == 0.0F)
     {
-      return 0.0;
+      return 0.0F;
     }
 
   /* Guess square root (using bit manipulation) */
@@ -76,9 +76,9 @@ float sqrtf(float x)
    * definitely optimal
    */
 
-  y = 0.5 * (y + x / y);
-  y = 0.5 * (y + x / y);
-  y = 0.5 * (y + x / y);
+  y = 0.5F * (y + x / y);
+  y = 0.5F * (y + x / y);
+  y = 0.5F * (y + x / y);
 
   return y;
 }
diff --git a/libc/math/lib_tanhf.c b/libc/math/lib_tanhf.c
index 70edb57ec4..ef56b133dc 100644
--- a/libc/math/lib_tanhf.c
+++ b/libc/math/lib_tanhf.c
@@ -38,7 +38,7 @@
 float tanhf(float x)
 {
   float x0 = expf(x);
-  float x1 = 1.0 / x0;
+  float x1 = 1.0F / x0;
 
   return ((x0 + x1) / (x0 - x1));
 }
-- 
GitLab


From 8a7dd94cfcdadb9ff632290e8e7a2841afa85912 Mon Sep 17 00:00:00 2001
From: David Alessio 
Date: Mon, 11 Jul 2016 07:08:27 -0600
Subject: [PATCH 191/229] Add FPU support for ostest for the STM32F4Discovery
 platform

---
 configs/stm32f4discovery/src/Makefile       |   4 +
 configs/stm32f4discovery/src/stm32_ostest.c | 111 ++++++++++++++++++++
 2 files changed, 115 insertions(+)
 create mode 100644 configs/stm32f4discovery/src/stm32_ostest.c

diff --git a/configs/stm32f4discovery/src/Makefile b/configs/stm32f4discovery/src/Makefile
index f1ee252997..060baf3eec 100644
--- a/configs/stm32f4discovery/src/Makefile
+++ b/configs/stm32f4discovery/src/Makefile
@@ -136,6 +136,10 @@ ifeq ($(CONFIG_LCD_UG2864HSWEG01),y)
 CSRCS += stm32_ug2864hsweg01.c
 endif
 
+ifeq ($(CONFIG_EXAMPLES_OSTEST),y)
+CSRCS += stm32_ostest.c
+endif
+
 ifeq ($(CONFIG_TIMER),y)
 CSRCS += stm32_timer.c
 endif
diff --git a/configs/stm32f4discovery/src/stm32_ostest.c b/configs/stm32f4discovery/src/stm32_ostest.c
new file mode 100644
index 0000000000..289db1b3ed
--- /dev/null
+++ b/configs/stm32f4discovery/src/stm32_ostest.c
@@ -0,0 +1,111 @@
+/************************************************************************************
+ * configs/stm32f4discovery/src/stm32_ostest.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 
+#include 
+#include 
+
+#include 
+#include 
+
+#include "up_arch.h"
+#include "up_internal.h"
+#include "stm32f4discovery.h"
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+/* Configuration ********************************************************************/
+
+#undef HAVE_FPU
+#if defined(CONFIG_ARCH_FPU) && !defined(CONFIG_EXAMPLES_OSTEST_FPUTESTDISABLE) && \
+    defined(CONFIG_EXAMPLES_OSTEST_FPUSIZE) && defined(CONFIG_SCHED_WAITPID) && \
+    !defined(CONFIG_DISABLE_SIGNALS)
+#    define HAVE_FPU 1
+#endif
+
+#ifdef HAVE_FPU
+
+#if CONFIG_EXAMPLES_OSTEST_FPUSIZE != (4*SW_FPU_REGS)
+#  error "CONFIG_EXAMPLES_OSTEST_FPUSIZE has the wrong size"
+#endif
+
+/************************************************************************************
+ * Private Data
+ ************************************************************************************/
+
+static uint32_t g_saveregs[XCPTCONTEXT_REGS];
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+/* Given an array of size CONFIG_EXAMPLES_OSTEST_FPUSIZE, this function will return
+ * the current FPU registers.
+ */
+
+void arch_getfpu(FAR uint32_t *fpusave)
+{
+  irqstate_t flags;
+
+  /* Take a snapshot of the thread context right now */
+
+  flags = enter_critical_section();
+  up_saveusercontext(g_saveregs);
+
+  /* Return only the floating register values */
+
+  memcpy(fpusave, &g_saveregs[REG_S0], (4*SW_FPU_REGS));
+  leave_critical_section(flags);
+}
+
+/* Given two arrays of size CONFIG_EXAMPLES_OSTEST_FPUSIZE this function
+ * will compare them and return true if they are identical.
+ */
+
+bool arch_cmpfpu(FAR const uint32_t *fpusave1, FAR const uint32_t *fpusave2)
+{
+  return memcmp(fpusave1, fpusave2, (4*SW_FPU_REGS)) == 0;
+}
+
+#endif /* HAVE_FPU */
-- 
GitLab


From bf3691ebf0f4428fe6ca898cc6fe28c0565ea499 Mon Sep 17 00:00:00 2001
From: Sebastien Lorquet 
Date: Mon, 11 Jul 2016 10:53:00 -0600
Subject: [PATCH 192/229] Remove the includes/apps link to apps/include.  It is
 no longer used.

---
 Makefile.unix | 13 +------------
 Makefile.win  | 16 +---------------
 2 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/Makefile.unix b/Makefile.unix
index 6c0c46b38c..a117f171fc 100644
--- a/Makefile.unix
+++ b/Makefile.unix
@@ -280,16 +280,6 @@ tools/cnvwindeps$(HOSTEXEEXT):
 # setting up symbolic links with 'generic' directory names to specific,
 # configured directories.
 #
-# Link the apps/include directory to include/apps
-
-include/apps: Make.defs
-ifneq ($(APPDIR),)
-	@echo "LN: include/apps to $(APPDIR)/include"
-	$(Q) if [ -d $(TOPDIR)/$(APPDIR)/include ]; then \
-		$(DIRLINK) $(TOPDIR)/$(APPDIR)/include include/apps; \
-	fi
-endif
-
 # Link the arch//include directory to include/arch
 
 include/arch: Make.defs
@@ -324,7 +314,7 @@ ifneq ($(CONFIG_ARCH_CHIP),)
 	$(Q) $(DIRLINK) $(TOPDIR)/$(ARCH_INC)/$(CONFIG_ARCH_CHIP) include/arch/chip
 endif
 
-dirlinks: include/arch include/arch/board include/arch/chip $(ARCH_SRC)/board $(ARCH_SRC)/chip include/apps
+dirlinks: include/arch include/arch/board include/arch/chip $(ARCH_SRC)/board $(ARCH_SRC)/chip
 
 # context
 #
@@ -354,7 +344,6 @@ clean_context:
 	$(Q) $(DIRUNLINK) include/arch
 	$(Q) $(DIRUNLINK) $(ARCH_SRC)/board
 	$(Q) $(DIRUNLINK) $(ARCH_SRC)/chip
-	$(Q) $(DIRUNLINK) include/apps
 
 # check_context
 #
diff --git a/Makefile.win b/Makefile.win
index 484e6a938d..1f30310525 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -275,19 +275,6 @@ tools\mkdeps$(HOSTEXEEXT):
 # setting up symbolic links with 'generic' directory names to specific,
 # configured directories.
 #
-# Link the apps\include directory to include\apps
-
-include\apps: Make.defs
-ifneq ($(APPDIR),)
-	@echo LN: include\apps $(APPDIR)\include
-ifeq ($(CONFIG_WINDOWS_MKLINK),y)
-	$(Q) /user:administrator mklink /d include\apps $(APPDIR)\include
-else
-	$(Q) xcopy $(APPDIR)\include include\apps /c /q /s /e /y /i
-	$(Q) echo FAKELNK > include\apps\.fakelnk
-endif
-endif
-
 # Link the arch\\include directory to include\arch
 
 include\arch: Make.defs
@@ -347,7 +334,7 @@ else
 endif
 endif
 
-dirlinks: include\arch include\arch\board include\arch\chip $(ARCH_SRC)\board $(ARCH_SRC)\chip include\apps
+dirlinks: include\arch include\arch\board include\arch\chip $(ARCH_SRC)\board $(ARCH_SRC)\chip
 
 # context
 #
@@ -374,7 +361,6 @@ clean_context:
 	$(call DELDIR, include\arch)
 	$(call DELDIR, $(ARCH_SRC)\board)
 	$(call DELDIR, $(ARCH_SRC)\chip)
-	$(call DELDIR, include\apps)
 
 # check_context
 #
-- 
GitLab


From 34a7b0ea8e532934b4fc209eb51e50120920dad1 Mon Sep 17 00:00:00 2001
From: Sebastien Lorquet 
Date: Mon, 11 Jul 2016 19:05:09 +0200
Subject: [PATCH 193/229] Renames stm32_ -> stm32l4_ on old files and
 rtcc/basic timers

---
 arch/arm/src/stm32l4/chip/stm32l4_pinmap.h   |   2 +-
 arch/arm/src/stm32l4/stm32l4.h               |   2 +-
 arch/arm/src/stm32l4/stm32l4_freerun.c       |  14 +-
 arch/arm/src/stm32l4/stm32l4_freerun.h       |   6 +-
 arch/arm/src/stm32l4/stm32l4_gpio.h          |   2 +-
 arch/arm/src/stm32l4/stm32l4_rcc.c           |   2 +-
 arch/arm/src/stm32l4/stm32l4_rtc_lowerhalf.c |   6 +-
 arch/arm/src/stm32l4/stm32l4_rtcc.c          |   2 +-
 arch/arm/src/stm32l4/stm32l4_serial.c        |   4 +-
 arch/arm/src/stm32l4/stm32l4_tim.c           | 406 +++++++++----------
 arch/arm/src/stm32l4/stm32l4_tim_lowerhalf.c | 164 ++++----
 11 files changed, 305 insertions(+), 305 deletions(-)

diff --git a/arch/arm/src/stm32l4/chip/stm32l4_pinmap.h b/arch/arm/src/stm32l4/chip/stm32l4_pinmap.h
index 16bbdec7ab..906e53dccb 100644
--- a/arch/arm/src/stm32l4/chip/stm32l4_pinmap.h
+++ b/arch/arm/src/stm32l4/chip/stm32l4_pinmap.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32l4/chip/stm32_pinmap.h
+ * arch/arm/src/stm32l4/chip/stm32l4_pinmap.h
  *
  *   Copyright (C) 2015 Sebastien Lorquet. All rights reserved.
  *   Author: Sebastien Lorquet 
diff --git a/arch/arm/src/stm32l4/stm32l4.h b/arch/arm/src/stm32l4/stm32l4.h
index b19fd62c43..fad620ad86 100644
--- a/arch/arm/src/stm32l4/stm32l4.h
+++ b/arch/arm/src/stm32l4/stm32l4.h
@@ -57,7 +57,7 @@
 
 #include "chip.h"
 #include "stm32l4_adc.h"
-//#include "stm32_bkp.h"
+//#include "stm32l4_bkp.h"
 #include "stm32l4_can.h"
 #include "stm32l4_dbgmcu.h"
 #include "stm32l4_dma.h"
diff --git a/arch/arm/src/stm32l4/stm32l4_freerun.c b/arch/arm/src/stm32l4/stm32l4_freerun.c
index 74fc952ef0..a11df0ba0e 100644
--- a/arch/arm/src/stm32l4/stm32l4_freerun.c
+++ b/arch/arm/src/stm32l4/stm32l4_freerun.c
@@ -1,4 +1,4 @@
-/****************************************************************************
+s/****************************************************************************
  * arch/arm/src/stm32l4/stm32l4_freerun.c
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
@@ -64,7 +64,7 @@ static struct stm32l4_freerun_s *g_freerun;
  ****************************************************************************/
 
 /****************************************************************************
- * Name: stm32_freerun_handler
+ * Name: stm32l4_freerun_handler
  *
  * Description:
  *   Timer interrupt callback.  When the freerun timer counter overflows,
@@ -81,7 +81,7 @@ static struct stm32l4_freerun_s *g_freerun;
  *
  ****************************************************************************/
 
-static int stm32_freerun_handler(int irq, void *context)
+static int stm32l4_freerun_handler(int irq, void *context)
 {
   struct stm32l4_freerun_s *freerun = g_freerun;
 
@@ -149,7 +149,7 @@ int stm32l4_freerun_initialize(struct stm32l4_freerun_s *freerun, int chan,
 
   /* Set up to receive the callback when the counter overflow occurs */
 
-  STM32L4_TIM_SETISR(freerun->tch, stm32_freerun_handler, 0);
+  STM32L4_TIM_SETISR(freerun->tch, stm32l4_freerun_handler, 0);
 
   /* Set timer period */
 
@@ -173,7 +173,7 @@ int stm32l4_freerun_initialize(struct stm32l4_freerun_s *freerun, int chan,
  * Input Parameters:
  *   freerun Caller allocated instance of the freerun state structure.  This
  *           structure must have been previously initialized via a call to
- *           stm32_freerun_initialize();
+ *           stm32l4_freerun_initialize();
  *   ts      The location in which to return the time from the free-running
  *           timer.
  *
@@ -197,7 +197,7 @@ int stm32l4_freerun_counter(struct stm32l4_freerun_s *freerun,
   DEBUGASSERT(freerun && freerun->tch && ts);
 
   /* Temporarily disable the overflow counter.  NOTE that we have to be
-   * careful here because  stm32_tc_getpending() will reset the pending
+   * careful here because  stm32l4_tc_getpending() will reset the pending
    * interrupt status.  If we do not handle the overflow here then, it will
    * be lost.
    */
@@ -267,7 +267,7 @@ int stm32l4_freerun_counter(struct stm32l4_freerun_s *freerun,
  * Input Parameters:
  *   freerun Caller allocated instance of the freerun state structure.  This
  *           structure must have been previously initialized via a call to
- *           stm32_freerun_initialize();
+ *           stm32l4_freerun_initialize();
  *
  * Returned Value:
  *   Zero (OK) is returned on success; a negated errno value is returned
diff --git a/arch/arm/src/stm32l4/stm32l4_freerun.h b/arch/arm/src/stm32l4/stm32l4_freerun.h
index 8b5e004d50..7d551978b4 100644
--- a/arch/arm/src/stm32l4/stm32l4_freerun.h
+++ b/arch/arm/src/stm32l4/stm32l4_freerun.h
@@ -56,7 +56,7 @@
  ****************************************************************************/
 
 /* The freerun client must allocate an instance of this structure and called
- * stm32_freerun_initialize() before using the freerun facilities.  The client
+ * stm32l4_freerun_initialize() before using the freerun facilities.  The client
  * should not access the contents of this structure directly since the
  * contents are subject to change.
  */
@@ -118,7 +118,7 @@ int stm32l4_freerun_initialize(struct stm32l4_freerun_s *freerun, int chan,
  * Input Parameters:
  *   freerun Caller allocated instance of the freerun state structure.  This
  *           structure must have been previously initialized via a call to
- *           stm32_freerun_initialize();
+ *           stm32l4_freerun_initialize();
  *   ts      The location in which to return the time remaining on the
  *           oneshot timer.
  *
@@ -140,7 +140,7 @@ int stm32l4_freerun_counter(struct stm32l4_freerun_s *freerun,
  * Input Parameters:
  *   freerun Caller allocated instance of the freerun state structure.  This
  *           structure must have been previously initialized via a call to
- *           stm32_freerun_initialize();
+ *           stm32l4_freerun_initialize();
  *
  * Returned Value:
  *   Zero (OK) is returned on success; a negated errno value is returned
diff --git a/arch/arm/src/stm32l4/stm32l4_gpio.h b/arch/arm/src/stm32l4/stm32l4_gpio.h
index 49f8c95fa5..04dbc5679b 100644
--- a/arch/arm/src/stm32l4/stm32l4_gpio.h
+++ b/arch/arm/src/stm32l4/stm32l4_gpio.h
@@ -268,7 +268,7 @@ EXTERN const uint32_t g_gpiobase[STM32L4_NPORTS];
  * Description:
  *   Configure a GPIO pin based on bit-encoded description of the pin.
  *   Once it is configured as Alternative (GPIO_ALT|GPIO_CNF_AFPP|...)
- *   function, it must be unconfigured with stm32_unconfiggpio() with
+ *   function, it must be unconfigured with stm32l4_unconfiggpio() with
  *   the same cfgset first before it can be set to non-alternative function.
  *
  * Returns:
diff --git a/arch/arm/src/stm32l4/stm32l4_rcc.c b/arch/arm/src/stm32l4/stm32l4_rcc.c
index 34e6052eef..599ed7c4cc 100644
--- a/arch/arm/src/stm32l4/stm32l4_rcc.c
+++ b/arch/arm/src/stm32l4/stm32l4_rcc.c
@@ -140,7 +140,7 @@ static inline void rcc_resetbkp(void)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: stm32_clockconfig
+ * Name: stm32l4_clockconfig
  *
  * Description:
  *   Called to establish the clock settings based on the values in board.h.
diff --git a/arch/arm/src/stm32l4/stm32l4_rtc_lowerhalf.c b/arch/arm/src/stm32l4/stm32l4_rtc_lowerhalf.c
index 558aa2533b..437faf54f1 100644
--- a/arch/arm/src/stm32l4/stm32l4_rtc_lowerhalf.c
+++ b/arch/arm/src/stm32l4/stm32l4_rtc_lowerhalf.c
@@ -57,7 +57,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-#define STM32_NALARMS 2
+#define STM32L4_NALARMS 2
 
 /****************************************************************************
  * Private Types
@@ -93,7 +93,7 @@ struct stm32l4_lowerhalf_s
 #ifdef CONFIG_RTC_ALARM
   /* Alarm callback information */
 
-  struct stm32l4_cbinfo_s cbinfo[STM32_NALARMS];
+  struct stm32l4_cbinfo_s cbinfo[STM32L4_NALARMS];
 #endif
 };
 
@@ -200,7 +200,7 @@ static void stm32l4_alarm_callback(FAR void *arg, unsigned int alarmid)
 #endif /* CONFIG_RTC_ALARM */
 
 /****************************************************************************
- * Name: stm32_rdtime
+ * Name: stm32l4_rdtime
  *
  * Description:
  *   Implements the rdtime() method of the RTC driver interface
diff --git a/arch/arm/src/stm32l4/stm32l4_rtcc.c b/arch/arm/src/stm32l4/stm32l4_rtcc.c
index 390e104d72..d15a8981b4 100644
--- a/arch/arm/src/stm32l4/stm32l4_rtcc.c
+++ b/arch/arm/src/stm32l4/stm32l4_rtcc.c
@@ -685,7 +685,7 @@ static int rtchw_check_alrbwf(void)
 #endif
 
 /************************************************************************************
- * Name: stm32_rtchw_set_alrmXr X is a or b
+ * Name: stm32l4_rtchw_set_alrmXr X is a or b
  *
  * Description:
  *   Set the alarm (A or B) hardware registers, using the required hardware access
diff --git a/arch/arm/src/stm32l4/stm32l4_serial.c b/arch/arm/src/stm32l4/stm32l4_serial.c
index f29a229992..aa21ada61d 100644
--- a/arch/arm/src/stm32l4/stm32l4_serial.c
+++ b/arch/arm/src/stm32l4/stm32l4_serial.c
@@ -1755,7 +1755,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
         /* Configure TX as a GPIO output pin and Send a break signal*/
 
         tx_break = GPIO_OUTPUT | (~(GPIO_MODE_MASK|GPIO_OUTPUT_SET) & priv->tx_gpio);
-        stm32_configgpio(tx_break);
+        stm32l4_configgpio(tx_break);
 
         leave_critical_section(flags);
       }
@@ -1769,7 +1769,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
 
         /* Configure TX back to U(S)ART */
 
-        stm32_configgpio(priv->tx_gpio);
+        stm32l4_configgpio(priv->tx_gpio);
 
         priv->ie &= ~USART_CR1_IE_BREAK_INPROGRESS;
 
diff --git a/arch/arm/src/stm32l4/stm32l4_tim.c b/arch/arm/src/stm32l4/stm32l4_tim.c
index 8d273fce1b..d4c560855c 100644
--- a/arch/arm/src/stm32l4/stm32l4_tim.c
+++ b/arch/arm/src/stm32l4/stm32l4_tim.c
@@ -215,7 +215,7 @@
 
 /* TIM Device Structure */
 
-struct stm32_tim_priv_s
+struct stm32l4_tim_priv_s
 {
   const struct stm32l4_tim_ops_s *ops;
   stm32l4_tim_mode_t mode;
@@ -228,163 +228,163 @@ struct stm32_tim_priv_s
 
 /* Register helpers */
 
-static inline uint16_t stm32_getreg16(FAR struct stm32l4_tim_dev_s *dev,
+static inline uint16_t stm32l4_getreg16(FAR struct stm32l4_tim_dev_s *dev,
                                       uint8_t offset);
-static inline void stm32_putreg16(FAR struct stm32l4_tim_dev_s *dev, uint8_t offset,
+static inline void stm32l4_putreg16(FAR struct stm32l4_tim_dev_s *dev, uint8_t offset,
                                   uint16_t value);
-static inline void stm32_modifyreg16(FAR struct stm32l4_tim_dev_s *dev,
+static inline void stm32l4_modifyreg16(FAR struct stm32l4_tim_dev_s *dev,
                                      uint8_t offset, uint16_t clearbits,
                                      uint16_t setbits);
-static inline uint32_t stm32_getreg32(FAR struct stm32l4_tim_dev_s *dev,
+static inline uint32_t stm32l4_getreg32(FAR struct stm32l4_tim_dev_s *dev,
                                       uint8_t offset);
-static inline void stm32_putreg32(FAR struct stm32l4_tim_dev_s *dev, uint8_t offset,
+static inline void stm32l4_putreg32(FAR struct stm32l4_tim_dev_s *dev, uint8_t offset,
                                   uint32_t value);
 
 /* Timer helpers */
 
-static void stm32_tim_reload_counter(FAR struct stm32l4_tim_dev_s *dev);
-static void stm32_tim_enable(FAR struct stm32l4_tim_dev_s *dev);
-static void stm32_tim_disable(FAR struct stm32l4_tim_dev_s *dev);
-static void stm32_tim_reset(FAR struct stm32l4_tim_dev_s *dev);
+static void stm32l4_tim_reload_counter(FAR struct stm32l4_tim_dev_s *dev);
+static void stm32l4_tim_enable(FAR struct stm32l4_tim_dev_s *dev);
+static void stm32l4_tim_disable(FAR struct stm32l4_tim_dev_s *dev);
+static void stm32l4_tim_reset(FAR struct stm32l4_tim_dev_s *dev);
 #if defined(HAVE_TIM1_GPIOCONFIG)||defined(HAVE_TIM2_GPIOCONFIG)||\
     defined(HAVE_TIM3_GPIOCONFIG)||defined(HAVE_TIM4_GPIOCONFIG)||\
     defined(HAVE_TIM5_GPIOCONFIG)||defined(HAVE_TIM8_GPIOCONFIG)
-static void stm32_tim_gpioconfig(uint32_t cfg, stm32l4_tim_channel_t mode);
+static void stm32l4_tim_gpioconfig(uint32_t cfg, stm32l4_tim_channel_t mode);
 #endif
 
 /* Timer methods */
 
-static int stm32_tim_setmode(FAR struct stm32l4_tim_dev_s *dev, stm32l4_tim_mode_t mode);
-static int stm32_tim_setclock(FAR struct stm32l4_tim_dev_s *dev, uint32_t freq);
-static void stm32_tim_setperiod(FAR struct stm32l4_tim_dev_s *dev,
+static int stm32l4_tim_setmode(FAR struct stm32l4_tim_dev_s *dev, stm32l4_tim_mode_t mode);
+static int stm32l4_tim_setclock(FAR struct stm32l4_tim_dev_s *dev, uint32_t freq);
+static void stm32l4_tim_setperiod(FAR struct stm32l4_tim_dev_s *dev,
                                 uint32_t period);
-static uint32_t stm32_tim_getcounter(FAR struct stm32l4_tim_dev_s *dev);
-static int stm32_tim_setchannel(FAR struct stm32l4_tim_dev_s *dev, uint8_t channel,
+static uint32_t stm32l4_tim_getcounter(FAR struct stm32l4_tim_dev_s *dev);
+static int stm32l4_tim_setchannel(FAR struct stm32l4_tim_dev_s *dev, uint8_t channel,
                                 stm32l4_tim_channel_t mode);
-static int stm32_tim_setcompare(FAR struct stm32l4_tim_dev_s *dev, uint8_t channel,
+static int stm32l4_tim_setcompare(FAR struct stm32l4_tim_dev_s *dev, uint8_t channel,
                                 uint32_t compare);
-static int stm32_tim_getcapture(FAR struct stm32l4_tim_dev_s *dev, uint8_t channel);
-static int stm32_tim_setisr(FAR struct stm32l4_tim_dev_s *dev,
+static int stm32l4_tim_getcapture(FAR struct stm32l4_tim_dev_s *dev, uint8_t channel);
+static int stm32l4_tim_setisr(FAR struct stm32l4_tim_dev_s *dev,
                             int (*handler)(int irq, void *context),
                             int source);
-static void stm32_tim_enableint(FAR struct stm32l4_tim_dev_s *dev, int source);
-static void stm32_tim_disableint(FAR struct stm32l4_tim_dev_s *dev, int source);
-static void stm32_tim_ackint(FAR struct stm32l4_tim_dev_s *dev, int source);
-static int stm32_tim_checkint(FAR struct stm32l4_tim_dev_s *dev, int source);
+static void stm32l4_tim_enableint(FAR struct stm32l4_tim_dev_s *dev, int source);
+static void stm32l4_tim_disableint(FAR struct stm32l4_tim_dev_s *dev, int source);
+static void stm32l4_tim_ackint(FAR struct stm32l4_tim_dev_s *dev, int source);
+static int stm32l4_tim_checkint(FAR struct stm32l4_tim_dev_s *dev, int source);
 
 /************************************************************************************
  * Private Data
  ************************************************************************************/
 
-static const struct stm32l4_tim_ops_s stm32_tim_ops =
+static const struct stm32l4_tim_ops_s stm32l4_tim_ops =
 {
-  .setmode    = stm32_tim_setmode,
-  .setclock   = stm32_tim_setclock,
-  .setperiod  = stm32_tim_setperiod,
-  .getcounter = stm32_tim_getcounter,
-  .setchannel = stm32_tim_setchannel,
-  .setcompare = stm32_tim_setcompare,
-  .getcapture = stm32_tim_getcapture,
-  .setisr     = stm32_tim_setisr,
-  .enableint  = stm32_tim_enableint,
-  .disableint = stm32_tim_disableint,
-  .ackint     = stm32_tim_ackint,
-  .checkint   = stm32_tim_checkint,
+  .setmode    = stm32l4_tim_setmode,
+  .setclock   = stm32l4_tim_setclock,
+  .setperiod  = stm32l4_tim_setperiod,
+  .getcounter = stm32l4_tim_getcounter,
+  .setchannel = stm32l4_tim_setchannel,
+  .setcompare = stm32l4_tim_setcompare,
+  .getcapture = stm32l4_tim_getcapture,
+  .setisr     = stm32l4_tim_setisr,
+  .enableint  = stm32l4_tim_enableint,
+  .disableint = stm32l4_tim_disableint,
+  .ackint     = stm32l4_tim_ackint,
+  .checkint   = stm32l4_tim_checkint,
 };
 
 #ifdef CONFIG_STM32L4_TIM1
-struct stm32_tim_priv_s stm32_tim1_priv =
+struct stm32l4_tim_priv_s stm32l4_tim1_priv =
 {
-  .ops        = &stm32_tim_ops,
+  .ops        = &stm32l4_tim_ops,
   .mode       = STM32L4_TIM_MODE_UNUSED,
   .base       = STM32L4_TIM1_BASE,
 };
 #endif
 #ifdef CONFIG_STM32L4_TIM2
-struct stm32_tim_priv_s stm32_tim2_priv =
+struct stm32l4_tim_priv_s stm32l4_tim2_priv =
 {
-  .ops        = &stm32_tim_ops,
+  .ops        = &stm32l4_tim_ops,
   .mode       = STM32L4_TIM_MODE_UNUSED,
   .base       = STM32L4_TIM2_BASE,
 };
 #endif
 
 #ifdef CONFIG_STM32L4_TIM3
-struct stm32_tim_priv_s stm32_tim3_priv =
+struct stm32l4_tim_priv_s stm32l4_tim3_priv =
 {
-  .ops        = &stm32_tim_ops,
+  .ops        = &stm32l4_tim_ops,
   .mode       = STM32L4_TIM_MODE_UNUSED,
   .base       = STM32L4_TIM3_BASE,
 };
 #endif
 
 #ifdef CONFIG_STM32L4_TIM4
-struct stm32_tim_priv_s stm32_tim4_priv =
+struct stm32l4_tim_priv_s stm32l4_tim4_priv =
 {
-  .ops        = &stm32_tim_ops,
+  .ops        = &stm32l4_tim_ops,
   .mode       = STM32L4_TIM_MODE_UNUSED,
   .base       = STM32L4_TIM4_BASE,
 };
 #endif
 
 #ifdef CONFIG_STM32L4_TIM5
-struct stm32_tim_priv_s stm32_tim5_priv =
+struct stm32l4_tim_priv_s stm32l4_tim5_priv =
 {
-  .ops        = &stm32_tim_ops,
+  .ops        = &stm32l4_tim_ops,
   .mode       = STM32L4_TIM_MODE_UNUSED,
   .base       = STM32L4_TIM5_BASE,
 };
 #endif
 
 #ifdef CONFIG_STM32L4_TIM6
-struct stm32_tim_priv_s stm32_tim6_priv =
+struct stm32l4_tim_priv_s stm32l4_tim6_priv =
 {
-  .ops        = &stm32_tim_ops,
+  .ops        = &stm32l4_tim_ops,
   .mode       = STM32L4_TIM_MODE_UNUSED,
   .base       = STM32L4_TIM6_BASE,
 };
 #endif
 
 #ifdef CONFIG_STM32L4_TIM7
-struct stm32_tim_priv_s stm32_tim7_priv =
+struct stm32l4_tim_priv_s stm32l4_tim7_priv =
 {
-  .ops        = &stm32_tim_ops,
+  .ops        = &stm32l4_tim_ops,
   .mode       = STM32L4_TIM_MODE_UNUSED,
   .base       = STM32L4_TIM7_BASE,
 };
 #endif
 
 #ifdef CONFIG_STM32L4_TIM8
-struct stm32_tim_priv_s stm32_tim8_priv =
+struct stm32l4_tim_priv_s stm32l4_tim8_priv =
 {
-  .ops        = &stm32_tim_ops,
+  .ops        = &stm32l4_tim_ops,
   .mode       = STM32L4_TIM_MODE_UNUSED,
   .base       = STM32L4_TIM8_BASE,
 };
 #endif
 
 #ifdef CONFIG_STM32L4_TIM15
-struct stm32_tim_priv_s stm32_tim15_priv =
+struct stm32l4_tim_priv_s stm32l4_tim15_priv =
 {
-  .ops        = &stm32_tim_ops,
+  .ops        = &stm32l4_tim_ops,
   .mode       = STM32L4_TIM_MODE_UNUSED,
   .base       = STM32L4_TIM15_BASE,
 };
 #endif
 
 #ifdef CONFIG_STM32L4_TIM16
-struct stm32_tim_priv_s stm32_tim16_priv =
+struct stm32l4_tim_priv_s stm32l4_tim16_priv =
 {
-  .ops        = &stm32_tim_ops,
+  .ops        = &stm32l4_tim_ops,
   .mode       = STM32L4_TIM_MODE_UNUSED,
   .base       = STM32L4_TIM16_BASE,
 };
 #endif
 
 #ifdef CONFIG_STM32L4_TIM17
-struct stm32_tim_priv_s stm32_tim17_priv =
+struct stm32l4_tim_priv_s stm32l4_tim17_priv =
 {
-  .ops        = &stm32_tim_ops,
+  .ops        = &stm32l4_tim_ops,
   .mode       = STM32L4_TIM_MODE_UNUSED,
   .base       = STM32L4_TIM17_BASE,
 };
@@ -395,50 +395,50 @@ struct stm32_tim_priv_s stm32_tim17_priv =
  ************************************************************************************/
 
 /************************************************************************************
- * Name: stm32_getreg16
+ * Name: stm32l4_getreg16
  *
  * Description:
  *   Get a 16-bit register value by offset
  *
  ************************************************************************************/
 
-static inline uint16_t stm32_getreg16(FAR struct stm32l4_tim_dev_s *dev,
+static inline uint16_t stm32l4_getreg16(FAR struct stm32l4_tim_dev_s *dev,
                                       uint8_t offset)
 {
-  return getreg16(((struct stm32_tim_priv_s *)dev)->base + offset);
+  return getreg16(((struct stm32l4_tim_priv_s *)dev)->base + offset);
 }
 
 /************************************************************************************
- * Name: stm32_putreg16
+ * Name: stm32l4_putreg16
  *
  * Description:
  *   Put a 16-bit register value by offset
  *
  ************************************************************************************/
 
-static inline void stm32_putreg16(FAR struct stm32l4_tim_dev_s *dev, uint8_t offset,
+static inline void stm32l4_putreg16(FAR struct stm32l4_tim_dev_s *dev, uint8_t offset,
                                   uint16_t value)
 {
-  putreg16(value, ((struct stm32_tim_priv_s *)dev)->base + offset);
+  putreg16(value, ((struct stm32l4_tim_priv_s *)dev)->base + offset);
 }
 
 /************************************************************************************
- * Name: stm32_modifyreg16
+ * Name: stm32l4_modifyreg16
  *
  * Description:
  *   Modify a 16-bit register value by offset
  *
  ************************************************************************************/
 
-static inline void stm32_modifyreg16(FAR struct stm32l4_tim_dev_s *dev,
+static inline void stm32l4_modifyreg16(FAR struct stm32l4_tim_dev_s *dev,
                                      uint8_t offset, uint16_t clearbits,
                                      uint16_t setbits)
 {
-  modifyreg16(((struct stm32_tim_priv_s *)dev)->base + offset, clearbits, setbits);
+  modifyreg16(((struct stm32l4_tim_priv_s *)dev)->base + offset, clearbits, setbits);
 }
 
 /************************************************************************************
- * Name: stm32_getreg32
+ * Name: stm32l4_getreg32
  *
  * Description:
  *   Get a 32-bit register value by offset.  This applies only for the STM32 F4
@@ -446,14 +446,14 @@ static inline void stm32_modifyreg16(FAR struct stm32l4_tim_dev_s *dev,
  *
  ************************************************************************************/
 
-static inline uint32_t stm32_getreg32(FAR struct stm32l4_tim_dev_s *dev,
+static inline uint32_t stm32l4_getreg32(FAR struct stm32l4_tim_dev_s *dev,
                                       uint8_t offset)
 {
-  return getreg32(((struct stm32_tim_priv_s *)dev)->base + offset);
+  return getreg32(((struct stm32l4_tim_priv_s *)dev)->base + offset);
 }
 
 /************************************************************************************
- * Name: stm32_putreg32
+ * Name: stm32l4_putreg32
  *
  * Description:
  *   Put a 32-bit register value by offset.  This applies only for the STM32 F4
@@ -461,87 +461,87 @@ static inline uint32_t stm32_getreg32(FAR struct stm32l4_tim_dev_s *dev,
  *
  ************************************************************************************/
 
-static inline void stm32_putreg32(FAR struct stm32l4_tim_dev_s *dev, uint8_t offset,
+static inline void stm32l4_putreg32(FAR struct stm32l4_tim_dev_s *dev, uint8_t offset,
                                   uint32_t value)
 {
-  putreg32(value, ((struct stm32_tim_priv_s *)dev)->base + offset);
+  putreg32(value, ((struct stm32l4_tim_priv_s *)dev)->base + offset);
 }
 
 /************************************************************************************
- * Name: stm32_tim_reload_counter
+ * Name: stm32l4_tim_reload_counter
  ************************************************************************************/
 
-static void stm32_tim_reload_counter(FAR struct stm32l4_tim_dev_s *dev)
+static void stm32l4_tim_reload_counter(FAR struct stm32l4_tim_dev_s *dev)
 {
-  uint16_t val = stm32_getreg16(dev, STM32L4_BTIM_EGR_OFFSET);
+  uint16_t val = stm32l4_getreg16(dev, STM32L4_BTIM_EGR_OFFSET);
   val |= ATIM_EGR_UG;
-  stm32_putreg16(dev, STM32L4_BTIM_EGR_OFFSET, val);
+  stm32l4_putreg16(dev, STM32L4_BTIM_EGR_OFFSET, val);
 }
 
 /************************************************************************************
- * Name: stm32_tim_enable
+ * Name: stm32l4_tim_enable
  ************************************************************************************/
 
-static void stm32_tim_enable(FAR struct stm32l4_tim_dev_s *dev)
+static void stm32l4_tim_enable(FAR struct stm32l4_tim_dev_s *dev)
 {
-  uint16_t val = stm32_getreg16(dev, STM32L4_BTIM_CR1_OFFSET);
+  uint16_t val = stm32l4_getreg16(dev, STM32L4_BTIM_CR1_OFFSET);
   val |= ATIM_CR1_CEN;
-  stm32_tim_reload_counter(dev);
-  stm32_putreg16(dev, STM32L4_BTIM_CR1_OFFSET, val);
+  stm32l4_tim_reload_counter(dev);
+  stm32l4_putreg16(dev, STM32L4_BTIM_CR1_OFFSET, val);
 }
 
 /************************************************************************************
- * Name: stm32_tim_disable
+ * Name: stm32l4_tim_disable
  ************************************************************************************/
 
-static void stm32_tim_disable(FAR struct stm32l4_tim_dev_s *dev)
+static void stm32l4_tim_disable(FAR struct stm32l4_tim_dev_s *dev)
 {
-  uint16_t val = stm32_getreg16(dev, STM32L4_BTIM_CR1_OFFSET);
+  uint16_t val = stm32l4_getreg16(dev, STM32L4_BTIM_CR1_OFFSET);
   val &= ~ATIM_CR1_CEN;
-  stm32_putreg16(dev, STM32L4_BTIM_CR1_OFFSET, val);
+  stm32l4_putreg16(dev, STM32L4_BTIM_CR1_OFFSET, val);
 }
 
 /************************************************************************************
- * Name: stm32_tim_reset
+ * Name: stm32l4_tim_reset
  *
  * Description:
  *   Reset timer into system default state, but do not affect output/input pins
  *
  ************************************************************************************/
 
-static void stm32_tim_reset(FAR struct stm32l4_tim_dev_s *dev)
+static void stm32l4_tim_reset(FAR struct stm32l4_tim_dev_s *dev)
 {
-  ((struct stm32_tim_priv_s *)dev)->mode = STM32L4_TIM_MODE_DISABLED;
-  stm32_tim_disable(dev);
+  ((struct stm32l4_tim_priv_s *)dev)->mode = STM32L4_TIM_MODE_DISABLED;
+  stm32l4_tim_disable(dev);
 }
 
 /************************************************************************************
- * Name: stm32_tim_gpioconfig
+ * Name: stm32l4_tim_gpioconfig
  ************************************************************************************/
 
 #if defined(HAVE_TIM1_GPIOCONFIG)||defined(HAVE_TIM2_GPIOCONFIG)||\
     defined(HAVE_TIM3_GPIOCONFIG)||defined(HAVE_TIM4_GPIOCONFIG)||\
     defined(HAVE_TIM5_GPIOCONFIG)||defined(HAVE_TIM8_GPIOCONFIG)
-static void stm32_tim_gpioconfig(uint32_t cfg, stm32l4_tim_channel_t mode)
+static void stm32l4_tim_gpioconfig(uint32_t cfg, stm32l4_tim_channel_t mode)
 {
   /* TODO: Add support for input capture and bipolar dual outputs for TIM8 */
 
   if (mode & STM32L4_TIM_CH_MODE_MASK)
     {
-      stm32_configgpio(cfg);
+      stm32l4_configgpio(cfg);
     }
   else
     {
-      stm32_unconfiggpio(cfg);
+      stm32l4_unconfiggpio(cfg);
     }
 }
 #endif
 
 /************************************************************************************
- * Name: stm32_tim_setmode
+ * Name: stm32l4_tim_setmode
  ************************************************************************************/
 
-static int stm32_tim_setmode(FAR struct stm32l4_tim_dev_s *dev, stm32l4_tim_mode_t mode)
+static int stm32l4_tim_setmode(FAR struct stm32l4_tim_dev_s *dev, stm32l4_tim_mode_t mode)
 {
   uint16_t val = ATIM_CR1_CEN | ATIM_CR1_ARPE;
 
@@ -552,10 +552,10 @@ static int stm32_tim_setmode(FAR struct stm32l4_tim_dev_s *dev, stm32l4_tim_mode
    */
 
 #if STM32L4_NBTIM > 0
-  if (((struct stm32_tim_priv_s *)dev)->base == STM32L4_TIM6_BASE
+  if (((struct stm32l4_tim_priv_s *)dev)->base == STM32L4_TIM6_BASE
 #endif
 #if STM32L4_NBTIM > 1
-      ||  ((struct stm32_tim_priv_s *)dev)->base == STM32L4_TIM7_BASE
+      ||  ((struct stm32l4_tim_priv_s *)dev)->base == STM32L4_TIM7_BASE
 #endif
 #if STM32L4_NBTIM > 0
   )
@@ -591,16 +591,16 @@ static int stm32_tim_setmode(FAR struct stm32l4_tim_dev_s *dev, stm32l4_tim_mode
         return -EINVAL;
     }
 
-  stm32_tim_reload_counter(dev);
-  stm32_putreg16(dev, STM32L4_BTIM_CR1_OFFSET, val);
+  stm32l4_tim_reload_counter(dev);
+  stm32l4_putreg16(dev, STM32L4_BTIM_CR1_OFFSET, val);
 
 #if STM32L4_NATIM > 0
   /* Advanced registers require Main Output Enable */
 
-    if (((struct stm32_tim_priv_s *)dev)->base == STM32L4_TIM1_BASE ||
-        ((struct stm32_tim_priv_s *)dev)->base == STM32L4_TIM8_BASE)
+    if (((struct stm32l4_tim_priv_s *)dev)->base == STM32L4_TIM1_BASE ||
+        ((struct stm32l4_tim_priv_s *)dev)->base == STM32L4_TIM8_BASE)
       {
-        stm32_modifyreg16(dev, STM32L4_ATIM_BDTR_OFFSET, 0, ATIM_BDTR_MOE);
+        stm32l4_modifyreg16(dev, STM32L4_ATIM_BDTR_OFFSET, 0, ATIM_BDTR_MOE);
       }
 #endif
 
@@ -608,10 +608,10 @@ static int stm32_tim_setmode(FAR struct stm32l4_tim_dev_s *dev, stm32l4_tim_mode
 }
 
 /************************************************************************************
- * Name: stm32_tim_setclock
+ * Name: stm32l4_tim_setclock
  ************************************************************************************/
 
-static int stm32_tim_setclock(FAR struct stm32l4_tim_dev_s *dev, uint32_t freq)
+static int stm32l4_tim_setclock(FAR struct stm32l4_tim_dev_s *dev, uint32_t freq)
 {
   uint32_t freqin;
   int prescaler;
@@ -622,7 +622,7 @@ static int stm32_tim_setclock(FAR struct stm32l4_tim_dev_s *dev, uint32_t freq)
 
   if (freq == 0)
     {
-      stm32_tim_disable(dev);
+      stm32l4_tim_disable(dev);
       return 0;
     }
 
@@ -632,7 +632,7 @@ static int stm32_tim_setclock(FAR struct stm32l4_tim_dev_s *dev, uint32_t freq)
    * must be defined in the board.h header file.
    */
 
-  switch (((struct stm32_tim_priv_s *)dev)->base)
+  switch (((struct stm32l4_tim_priv_s *)dev)->base)
     {
 #ifdef CONFIG_STM32L4_TIM1
       case STM32L4_TIM1_BASE:
@@ -716,44 +716,44 @@ static int stm32_tim_setclock(FAR struct stm32l4_tim_dev_s *dev, uint32_t freq)
       prescaler = 0xffff;
     }
 
-  stm32_putreg16(dev, STM32L4_BTIM_PSC_OFFSET, prescaler);
-  stm32_tim_enable(dev);
+  stm32l4_putreg16(dev, STM32L4_BTIM_PSC_OFFSET, prescaler);
+  stm32l4_tim_enable(dev);
 
   return prescaler;
 }
 
 /************************************************************************************
- * Name: stm32_tim_setperiod
+ * Name: stm32l4_tim_setperiod
  ************************************************************************************/
 
-static void stm32_tim_setperiod(FAR struct stm32l4_tim_dev_s *dev,
+static void stm32l4_tim_setperiod(FAR struct stm32l4_tim_dev_s *dev,
                                 uint32_t period)
 {
   DEBUGASSERT(dev != NULL);
-  stm32_putreg32(dev, STM32L4_BTIM_ARR_OFFSET, period);
+  stm32l4_putreg32(dev, STM32L4_BTIM_ARR_OFFSET, period);
 }
 
 /************************************************************************************
- * Name: stm32_tim_getcounter
+ * Name: stm32l4_tim_getcounter
  ************************************************************************************/
 
-static uint32_t stm32_tim_getcounter(FAR struct stm32l4_tim_dev_s *dev)
+static uint32_t stm32l4_tim_getcounter(FAR struct stm32l4_tim_dev_s *dev)
 {
   DEBUGASSERT(dev != NULL);
-  return stm32_getreg32(dev, STM32L4_BTIM_CNT_OFFSET);
+  return stm32l4_getreg32(dev, STM32L4_BTIM_CNT_OFFSET);
 }
 
 /************************************************************************************
- * Name: stm32_tim_setchannel
+ * Name: stm32l4_tim_setchannel
  ************************************************************************************/
 
-static int stm32_tim_setchannel(FAR struct stm32l4_tim_dev_s *dev, uint8_t channel,
+static int stm32l4_tim_setchannel(FAR struct stm32l4_tim_dev_s *dev, uint8_t channel,
                                 stm32l4_tim_channel_t mode)
 {
   uint16_t ccmr_orig   = 0;
   uint16_t ccmr_val    = 0;
   uint16_t ccmr_mask   = 0xff;
-  uint16_t ccer_val    = stm32_getreg16(dev, STM32L4_GTIM_CCER_OFFSET);
+  uint16_t ccer_val    = stm32l4_getreg16(dev, STM32L4_GTIM_CCER_OFFSET);
   uint8_t  ccmr_offset = STM32L4_GTIM_CCMR1_OFFSET;
 
   DEBUGASSERT(dev != NULL);
@@ -774,10 +774,10 @@ static int stm32_tim_setchannel(FAR struct stm32l4_tim_dev_s *dev, uint8_t chann
    */
 
 #if STM32L4_NBTIM > 0
-  if (((struct stm32_tim_priv_s *)dev)->base == STM32L4_TIM6_BASE
+  if (((struct stm32l4_tim_priv_s *)dev)->base == STM32L4_TIM6_BASE
 #endif
 #if STM32L4_NBTIM > 1
-      || ((struct stm32_tim_priv_s *)dev)->base == STM32L4_TIM7_BASE
+      || ((struct stm32l4_tim_priv_s *)dev)->base == STM32L4_TIM7_BASE
 #endif
 #if STM32L4_NBTIM > 0
   )
@@ -822,15 +822,15 @@ static int stm32_tim_setchannel(FAR struct stm32l4_tim_dev_s *dev, uint8_t chann
       ccmr_offset = STM32L4_GTIM_CCMR2_OFFSET;
     }
 
-  ccmr_orig  = stm32_getreg16(dev, ccmr_offset);
+  ccmr_orig  = stm32l4_getreg16(dev, ccmr_offset);
   ccmr_orig &= ~ccmr_mask;
   ccmr_orig |= ccmr_val;
-  stm32_putreg16(dev, ccmr_offset, ccmr_orig);
-  stm32_putreg16(dev, STM32L4_GTIM_CCER_OFFSET, ccer_val);
+  stm32l4_putreg16(dev, ccmr_offset, ccmr_orig);
+  stm32l4_putreg16(dev, STM32L4_GTIM_CCER_OFFSET, ccer_val);
 
   /* set GPIO */
 
-  switch (((struct stm32_tim_priv_s *)dev)->base)
+  switch (((struct stm32l4_tim_priv_s *)dev)->base)
     {
 #ifdef CONFIG_STM32L4_TIM1
       case STM32L4_TIM1_BASE:
@@ -838,19 +838,19 @@ static int stm32_tim_setchannel(FAR struct stm32l4_tim_dev_s *dev, uint8_t chann
           {
 #if defined(GPIO_TIM1_CH1OUT)
             case 0:
-              stm32_tim_gpioconfig(GPIO_TIM1_CH1OUT, mode); break;
+              stm32l4_tim_gpioconfig(GPIO_TIM1_CH1OUT, mode); break;
 #endif
 #if defined(GPIO_TIM1_CH2OUT)
             case 1:
-              stm32_tim_gpioconfig(GPIO_TIM1_CH2OUT, mode); break;
+              stm32l4_tim_gpioconfig(GPIO_TIM1_CH2OUT, mode); break;
 #endif
 #if defined(GPIO_TIM1_CH3OUT)
             case 2:
-              stm32_tim_gpioconfig(GPIO_TIM1_CH3OUT, mode); break;
+              stm32l4_tim_gpioconfig(GPIO_TIM1_CH3OUT, mode); break;
 #endif
 #if defined(GPIO_TIM1_CH4OUT)
             case 3:
-              stm32_tim_gpioconfig(GPIO_TIM1_CH4OUT, mode); break;
+              stm32l4_tim_gpioconfig(GPIO_TIM1_CH4OUT, mode); break;
 #endif
             default:
               return -EINVAL;
@@ -863,22 +863,22 @@ static int stm32_tim_setchannel(FAR struct stm32l4_tim_dev_s *dev, uint8_t chann
           {
 #if defined(GPIO_TIM2_CH1OUT)
             case 0:
-              stm32_tim_gpioconfig(GPIO_TIM2_CH1OUT, mode);
+              stm32l4_tim_gpioconfig(GPIO_TIM2_CH1OUT, mode);
               break;
 #endif
 #if defined(GPIO_TIM2_CH2OUT)
             case 1:
-              stm32_tim_gpioconfig(GPIO_TIM2_CH2OUT, mode);
+              stm32l4_tim_gpioconfig(GPIO_TIM2_CH2OUT, mode);
               break;
 #endif
 #if defined(GPIO_TIM2_CH3OUT)
             case 2:
-              stm32_tim_gpioconfig(GPIO_TIM2_CH3OUT, mode);
+              stm32l4_tim_gpioconfig(GPIO_TIM2_CH3OUT, mode);
               break;
 #endif
 #if defined(GPIO_TIM2_CH4OUT)
             case 3:
-              stm32_tim_gpioconfig(GPIO_TIM2_CH4OUT, mode);
+              stm32l4_tim_gpioconfig(GPIO_TIM2_CH4OUT, mode);
               break;
 #endif
             default:
@@ -892,22 +892,22 @@ static int stm32_tim_setchannel(FAR struct stm32l4_tim_dev_s *dev, uint8_t chann
           {
 #if defined(GPIO_TIM3_CH1OUT)
             case 0:
-              stm32_tim_gpioconfig(GPIO_TIM3_CH1OUT, mode);
+              stm32l4_tim_gpioconfig(GPIO_TIM3_CH1OUT, mode);
               break;
 #endif
 #if defined(GPIO_TIM3_CH2OUT)
             case 1:
-              stm32_tim_gpioconfig(GPIO_TIM3_CH2OUT, mode);
+              stm32l4_tim_gpioconfig(GPIO_TIM3_CH2OUT, mode);
               break;
 #endif
 #if defined(GPIO_TIM3_CH3OUT)
             case 2:
-              stm32_tim_gpioconfig(GPIO_TIM3_CH3OUT, mode);
+              stm32l4_tim_gpioconfig(GPIO_TIM3_CH3OUT, mode);
               break;
 #endif
 #if defined(GPIO_TIM3_CH4OUT)
             case 3:
-              stm32_tim_gpioconfig(GPIO_TIM3_CH4OUT, mode);
+              stm32l4_tim_gpioconfig(GPIO_TIM3_CH4OUT, mode);
               break;
 #endif
             default:
@@ -921,22 +921,22 @@ static int stm32_tim_setchannel(FAR struct stm32l4_tim_dev_s *dev, uint8_t chann
           {
 #if defined(GPIO_TIM4_CH1OUT)
             case 0:
-              stm32_tim_gpioconfig(GPIO_TIM4_CH1OUT, mode);
+              stm32l4_tim_gpioconfig(GPIO_TIM4_CH1OUT, mode);
               break;
 #endif
 #if defined(GPIO_TIM4_CH2OUT)
             case 1:
-              stm32_tim_gpioconfig(GPIO_TIM4_CH2OUT, mode);
+              stm32l4_tim_gpioconfig(GPIO_TIM4_CH2OUT, mode);
               break;
 #endif
 #if defined(GPIO_TIM4_CH3OUT)
             case 2:
-              stm32_tim_gpioconfig(GPIO_TIM4_CH3OUT, mode);
+              stm32l4_tim_gpioconfig(GPIO_TIM4_CH3OUT, mode);
               break;
 #endif
 #if defined(GPIO_TIM4_CH4OUT)
             case 3:
-              stm32_tim_gpioconfig(GPIO_TIM4_CH4OUT, mode);
+              stm32l4_tim_gpioconfig(GPIO_TIM4_CH4OUT, mode);
               break;
 #endif
             default:
@@ -950,22 +950,22 @@ static int stm32_tim_setchannel(FAR struct stm32l4_tim_dev_s *dev, uint8_t chann
           {
 #if defined(GPIO_TIM5_CH1OUT)
             case 0:
-              stm32_tim_gpioconfig(GPIO_TIM5_CH1OUT, mode);
+              stm32l4_tim_gpioconfig(GPIO_TIM5_CH1OUT, mode);
               break;
 #endif
 #if defined(GPIO_TIM5_CH2OUT)
             case 1:
-              stm32_tim_gpioconfig(GPIO_TIM5_CH2OUT, mode);
+              stm32l4_tim_gpioconfig(GPIO_TIM5_CH2OUT, mode);
               break;
 #endif
 #if defined(GPIO_TIM5_CH3OUT)
             case 2:
-              stm32_tim_gpioconfig(GPIO_TIM5_CH3OUT, mode);
+              stm32l4_tim_gpioconfig(GPIO_TIM5_CH3OUT, mode);
               break;
 #endif
 #if defined(GPIO_TIM5_CH4OUT)
             case 3:
-              stm32_tim_gpioconfig(GPIO_TIM5_CH4OUT, mode);
+              stm32l4_tim_gpioconfig(GPIO_TIM5_CH4OUT, mode);
               break;
 #endif
             default:
@@ -979,19 +979,19 @@ static int stm32_tim_setchannel(FAR struct stm32l4_tim_dev_s *dev, uint8_t chann
           {
 #if defined(GPIO_TIM8_CH1OUT)
             case 0:
-              stm32_tim_gpioconfig(GPIO_TIM8_CH1OUT, mode); break;
+              stm32l4_tim_gpioconfig(GPIO_TIM8_CH1OUT, mode); break;
 #endif
 #if defined(GPIO_TIM8_CH2OUT)
             case 1:
-              stm32_tim_gpioconfig(GPIO_TIM8_CH2OUT, mode); break;
+              stm32l4_tim_gpioconfig(GPIO_TIM8_CH2OUT, mode); break;
 #endif
 #if defined(GPIO_TIM8_CH3OUT)
             case 2:
-              stm32_tim_gpioconfig(GPIO_TIM8_CH3OUT, mode); break;
+              stm32l4_tim_gpioconfig(GPIO_TIM8_CH3OUT, mode); break;
 #endif
 #if defined(GPIO_TIM8_CH4OUT)
             case 3:
-              stm32_tim_gpioconfig(GPIO_TIM8_CH4OUT, mode); break;
+              stm32l4_tim_gpioconfig(GPIO_TIM8_CH4OUT, mode); break;
 #endif
             default:
               return -EINVAL;
@@ -1004,22 +1004,22 @@ static int stm32_tim_setchannel(FAR struct stm32l4_tim_dev_s *dev, uint8_t chann
           {
 #if defined(GPIO_TIM15_CH1OUT)
             case 0:
-              stm32_tim_gpioconfig(GPIO_TIM15_CH1OUT, mode);
+              stm32l4_tim_gpioconfig(GPIO_TIM15_CH1OUT, mode);
               break;
 #endif
 #if defined(GPIO_TIM15_CH2OUT)
             case 1:
-              stm32_tim_gpioconfig(GPIO_TIM15_CH2OUT, mode);
+              stm32l4_tim_gpioconfig(GPIO_TIM15_CH2OUT, mode);
               break;
 #endif
 #if defined(GPIO_TIM15_CH3OUT)
             case 2:
-              stm32_tim_gpioconfig(GPIO_TIM15_CH3OUT, mode);
+              stm32l4_tim_gpioconfig(GPIO_TIM15_CH3OUT, mode);
               break;
 #endif
 #if defined(GPIO_TIM15_CH4OUT)
             case 3:
-              stm32_tim_gpioconfig(GPIO_TIM15_CH4OUT, mode);
+              stm32l4_tim_gpioconfig(GPIO_TIM15_CH4OUT, mode);
               break;
 #endif
             default:
@@ -1033,22 +1033,22 @@ static int stm32_tim_setchannel(FAR struct stm32l4_tim_dev_s *dev, uint8_t chann
           {
 #if defined(GPIO_TIM16_CH1OUT)
             case 0:
-              stm32_tim_gpioconfig(GPIO_TIM16_CH1OUT, mode);
+              stm32l4_tim_gpioconfig(GPIO_TIM16_CH1OUT, mode);
               break;
 #endif
 #if defined(GPIO_TIM16_CH2OUT)
             case 1:
-              stm32_tim_gpioconfig(GPIO_TIM16_CH2OUT, mode);
+              stm32l4_tim_gpioconfig(GPIO_TIM16_CH2OUT, mode);
               break;
 #endif
 #if defined(GPIO_TIM16_CH3OUT)
             case 2:
-              stm32_tim_gpioconfig(GPIO_TIM16_CH3OUT, mode);
+              stm32l4_tim_gpioconfig(GPIO_TIM16_CH3OUT, mode);
               break;
 #endif
 #if defined(GPIO_TIM16_CH4OUT)
             case 3:
-              stm32_tim_gpioconfig(GPIO_TIM16_CH4OUT, mode);
+              stm32l4_tim_gpioconfig(GPIO_TIM16_CH4OUT, mode);
               break;
 #endif
             default:
@@ -1062,22 +1062,22 @@ static int stm32_tim_setchannel(FAR struct stm32l4_tim_dev_s *dev, uint8_t chann
           {
 #if defined(GPIO_TIM17_CH1OUT)
             case 0:
-              stm32_tim_gpioconfig(GPIO_TIM17_CH1OUT, mode);
+              stm32l4_tim_gpioconfig(GPIO_TIM17_CH1OUT, mode);
               break;
 #endif
 #if defined(GPIO_TIM17_CH2OUT)
             case 1:
-              stm32_tim_gpioconfig(GPIO_TIM17_CH2OUT, mode);
+              stm32l4_tim_gpioconfig(GPIO_TIM17_CH2OUT, mode);
               break;
 #endif
 #if defined(GPIO_TIM17_CH3OUT)
             case 2:
-              stm32_tim_gpioconfig(GPIO_TIM17_CH3OUT, mode);
+              stm32l4_tim_gpioconfig(GPIO_TIM17_CH3OUT, mode);
               break;
 #endif
 #if defined(GPIO_TIM17_CH4OUT)
             case 3:
-              stm32_tim_gpioconfig(GPIO_TIM17_CH4OUT, mode);
+              stm32l4_tim_gpioconfig(GPIO_TIM17_CH4OUT, mode);
               break;
 #endif
             default:
@@ -1093,10 +1093,10 @@ static int stm32_tim_setchannel(FAR struct stm32l4_tim_dev_s *dev, uint8_t chann
 }
 
 /************************************************************************************
- * Name: stm32_tim_setcompare
+ * Name: stm32l4_tim_setcompare
  ************************************************************************************/
 
-static int stm32_tim_setcompare(FAR struct stm32l4_tim_dev_s *dev, uint8_t channel,
+static int stm32l4_tim_setcompare(FAR struct stm32l4_tim_dev_s *dev, uint8_t channel,
                                 uint32_t compare)
 {
   DEBUGASSERT(dev != NULL);
@@ -1104,16 +1104,16 @@ static int stm32_tim_setcompare(FAR struct stm32l4_tim_dev_s *dev, uint8_t chann
   switch (channel)
     {
       case 1:
-        stm32_putreg32(dev, STM32L4_GTIM_CCR1_OFFSET, compare);
+        stm32l4_putreg32(dev, STM32L4_GTIM_CCR1_OFFSET, compare);
         break;
       case 2:
-        stm32_putreg32(dev, STM32L4_GTIM_CCR2_OFFSET, compare);
+        stm32l4_putreg32(dev, STM32L4_GTIM_CCR2_OFFSET, compare);
         break;
       case 3:
-        stm32_putreg32(dev, STM32L4_GTIM_CCR3_OFFSET, compare);
+        stm32l4_putreg32(dev, STM32L4_GTIM_CCR3_OFFSET, compare);
         break;
       case 4:
-        stm32_putreg32(dev, STM32L4_GTIM_CCR4_OFFSET, compare);
+        stm32l4_putreg32(dev, STM32L4_GTIM_CCR4_OFFSET, compare);
         break;
       default:
         return -EINVAL;
@@ -1122,33 +1122,33 @@ static int stm32_tim_setcompare(FAR struct stm32l4_tim_dev_s *dev, uint8_t chann
 }
 
 /************************************************************************************
- * Name: stm32_tim_getcapture
+ * Name: stm32l4_tim_getcapture
  ************************************************************************************/
 
-static int stm32_tim_getcapture(FAR struct stm32l4_tim_dev_s *dev, uint8_t channel)
+static int stm32l4_tim_getcapture(FAR struct stm32l4_tim_dev_s *dev, uint8_t channel)
 {
   DEBUGASSERT(dev != NULL);
 
   switch (channel)
     {
       case 1:
-        return stm32_getreg32(dev, STM32L4_GTIM_CCR1_OFFSET);
+        return stm32l4_getreg32(dev, STM32L4_GTIM_CCR1_OFFSET);
       case 2:
-        return stm32_getreg32(dev, STM32L4_GTIM_CCR2_OFFSET);
+        return stm32l4_getreg32(dev, STM32L4_GTIM_CCR2_OFFSET);
       case 3:
-        return stm32_getreg32(dev, STM32L4_GTIM_CCR3_OFFSET);
+        return stm32l4_getreg32(dev, STM32L4_GTIM_CCR3_OFFSET);
       case 4:
-        return stm32_getreg32(dev, STM32L4_GTIM_CCR4_OFFSET);
+        return stm32l4_getreg32(dev, STM32L4_GTIM_CCR4_OFFSET);
     }
 
   return -EINVAL;
 }
 
 /************************************************************************************
- * Name: stm32_tim_setisr
+ * Name: stm32l4_tim_setisr
  ************************************************************************************/
 
-static int stm32_tim_setisr(FAR struct stm32l4_tim_dev_s *dev,
+static int stm32l4_tim_setisr(FAR struct stm32l4_tim_dev_s *dev,
                             int (*handler)(int irq, void *context),
                             int source)
 {
@@ -1157,7 +1157,7 @@ static int stm32_tim_setisr(FAR struct stm32l4_tim_dev_s *dev,
   DEBUGASSERT(dev != NULL);
   DEBUGASSERT(source == 0);
 
-  switch (((struct stm32_tim_priv_s *)dev)->base)
+  switch (((struct stm32l4_tim_priv_s *)dev)->base)
     {
 #ifdef CONFIG_STM32L4_TIM1
       case STM32L4_TIM1_BASE:
@@ -1243,41 +1243,41 @@ static int stm32_tim_setisr(FAR struct stm32l4_tim_dev_s *dev,
 }
 
 /************************************************************************************
- * Name: stm32_tim_enableint
+ * Name: stm32l4_tim_enableint
  ************************************************************************************/
 
-static void stm32_tim_enableint(FAR struct stm32l4_tim_dev_s *dev, int source)
+static void stm32l4_tim_enableint(FAR struct stm32l4_tim_dev_s *dev, int source)
 {
   DEBUGASSERT(dev != NULL);
-  stm32_modifyreg16(dev, STM32L4_BTIM_DIER_OFFSET, 0, ATIM_DIER_UIE);
+  stm32l4_modifyreg16(dev, STM32L4_BTIM_DIER_OFFSET, 0, ATIM_DIER_UIE);
 }
 
 /************************************************************************************
- * Name: stm32_tim_disableint
+ * Name: stm32l4_tim_disableint
  ************************************************************************************/
 
-static void stm32_tim_disableint(FAR struct stm32l4_tim_dev_s *dev, int source)
+static void stm32l4_tim_disableint(FAR struct stm32l4_tim_dev_s *dev, int source)
 {
   DEBUGASSERT(dev != NULL);
-  stm32_modifyreg16(dev, STM32L4_BTIM_DIER_OFFSET, ATIM_DIER_UIE, 0);
+  stm32l4_modifyreg16(dev, STM32L4_BTIM_DIER_OFFSET, ATIM_DIER_UIE, 0);
 }
 
 /************************************************************************************
- * Name: stm32_tim_ackint
+ * Name: stm32l4_tim_ackint
  ************************************************************************************/
 
-static void stm32_tim_ackint(FAR struct stm32l4_tim_dev_s *dev, int source)
+static void stm32l4_tim_ackint(FAR struct stm32l4_tim_dev_s *dev, int source)
 {
-  stm32_putreg16(dev, STM32L4_BTIM_SR_OFFSET, ~ATIM_SR_UIF);
+  stm32l4_putreg16(dev, STM32L4_BTIM_SR_OFFSET, ~ATIM_SR_UIF);
 }
 
 /************************************************************************************
- * Name: stm32_tim_checkint
+ * Name: stm32l4_tim_checkint
  ************************************************************************************/
 
-static int stm32_tim_checkint(FAR struct stm32l4_tim_dev_s *dev, int source)
+static int stm32l4_tim_checkint(FAR struct stm32l4_tim_dev_s *dev, int source)
 {
-  uint16_t regval = stm32_getreg16(dev, STM32L4_BTIM_SR_OFFSET);
+  uint16_t regval = stm32l4_getreg16(dev, STM32L4_BTIM_SR_OFFSET);
   return (regval & ATIM_SR_UIF) ? 1 : 0;
 }
 
@@ -1286,7 +1286,7 @@ static int stm32_tim_checkint(FAR struct stm32l4_tim_dev_s *dev, int source)
  ************************************************************************************/
 
 /************************************************************************************
- * Name: stm32_tim_init
+ * Name: stm32l4_tim_init
  ************************************************************************************/
 
 FAR struct stm32l4_tim_dev_s *stm32l4_tim_init(int timer)
@@ -1299,67 +1299,67 @@ FAR struct stm32l4_tim_dev_s *stm32l4_tim_init(int timer)
     {
 #ifdef CONFIG_STM32L4_TIM1
       case 1:
-        dev = (struct stm32l4_tim_dev_s *)&stm32_tim1_priv;
+        dev = (struct stm32l4_tim_dev_s *)&stm32l4_tim1_priv;
         modifyreg32(STM32L4_RCC_APB2ENR, 0, RCC_APB2ENR_TIM1EN);
         break;
 #endif
 #ifdef CONFIG_STM32L4_TIM2
       case 2:
-        dev = (struct stm32l4_tim_dev_s *)&stm32_tim2_priv;
+        dev = (struct stm32l4_tim_dev_s *)&stm32l4_tim2_priv;
         modifyreg32(STM32L4_RCC_APB1ENR1, 0, RCC_APB1ENR1_TIM2EN);
         break;
 #endif
 #ifdef CONFIG_STM32L4_TIM3
       case 3:
-        dev = (struct stm32l4_tim_dev_s *)&stm32_tim3_priv;
+        dev = (struct stm32l4_tim_dev_s *)&stm32l4_tim3_priv;
         modifyreg32(STM32L4_RCC_APB1ENR1, 0, RCC_APB1ENR1_TIM3EN);
         break;
 #endif
 #ifdef CONFIG_STM32L4_TIM4
       case 4:
-        dev = (struct stm32l4_tim_dev_s *)&stm32_tim4_priv;
+        dev = (struct stm32l4_tim_dev_s *)&stm32l4_tim4_priv;
         modifyreg32(STM32L4_RCC_APB1ENR1, 0, RCC_APB1ENR1_TIM4EN);
         break;
 #endif
 #ifdef CONFIG_STM32L4_TIM5
       case 5:
-        dev = (struct stm32l4_tim_dev_s *)&stm32_tim5_priv;
+        dev = (struct stm32l4_tim_dev_s *)&stm32l4_tim5_priv;
         modifyreg32(STM32L4_RCC_APB1ENR1, 0, RCC_APB1ENR1_TIM5EN);
         break;
 #endif
 #ifdef CONFIG_STM32L4_TIM6
       case 6:
-        dev = (struct stm32l4_tim_dev_s *)&stm32_tim6_priv;
+        dev = (struct stm32l4_tim_dev_s *)&stm32l4_tim6_priv;
         modifyreg32(STM32L4_RCC_APB1ENR1, 0, RCC_APB1ENR1_TIM6EN);
         break;
 #endif
 #ifdef CONFIG_STM32L4_TIM7
       case 7:
-        dev = (struct stm32l4_tim_dev_s *)&stm32_tim7_priv;
+        dev = (struct stm32l4_tim_dev_s *)&stm32l4_tim7_priv;
         modifyreg32(STM32L4_RCC_APB1ENR1, 0, RCC_APB1ENR1_TIM7EN);
         break;
 #endif
 #ifdef CONFIG_STM32L4_TIM8
       case 8:
-        dev = (struct stm32l4_tim_dev_s *)&stm32_tim8_priv;
+        dev = (struct stm32l4_tim_dev_s *)&stm32l4_tim8_priv;
         modifyreg32(STM32L4_RCC_APB2ENR, 0, RCC_APB2ENR_TIM8EN);
         break;
 #endif
 #ifdef CONFIG_STM32L4_TIM15
       case 15:
-        dev = (struct stm32l4_tim_dev_s *)&stm32_tim15_priv;
+        dev = (struct stm32l4_tim_dev_s *)&stm32l4_tim15_priv;
         modifyreg32(STM32L4_RCC_APB2ENR, 0, RCC_APB2ENR_TIM15EN);
         break;
 #endif
 #ifdef CONFIG_STM32L4_TIM16
       case 16:
-        dev = (struct stm32l4_tim_dev_s *)&stm32_tim16_priv;
+        dev = (struct stm32l4_tim_dev_s *)&stm32l4_tim16_priv;
         modifyreg32(STM32L4_RCC_APB2ENR, 0, RCC_APB2ENR_TIM16EN);
         break;
 #endif
 #ifdef CONFIG_STM32L4_TIM17
       case 17:
-        dev = (struct stm32l4_tim_dev_s *)&stm32_tim17_priv;
+        dev = (struct stm32l4_tim_dev_s *)&stm32l4_tim17_priv;
         modifyreg32(STM32L4_RCC_APB2ENR, 0, RCC_APB2ENR_TIM17EN);
         break;
 #endif
@@ -1369,12 +1369,12 @@ FAR struct stm32l4_tim_dev_s *stm32l4_tim_init(int timer)
 
   /* Is device already allocated */
 
-  if (((struct stm32_tim_priv_s *)dev)->mode != STM32L4_TIM_MODE_UNUSED)
+  if (((struct stm32l4_tim_priv_s *)dev)->mode != STM32L4_TIM_MODE_UNUSED)
     {
       return NULL;
     }
 
-  stm32_tim_reset(dev);
+  stm32l4_tim_reset(dev);
 
   return dev;
 }
@@ -1392,7 +1392,7 @@ int stm32l4_tim_deinit(FAR struct stm32l4_tim_dev_s * dev)
 
   /* Disable power */
 
-  switch (((struct stm32_tim_priv_s *)dev)->base)
+  switch (((struct stm32l4_tim_priv_s *)dev)->base)
     {
 #ifdef CONFIG_STM32L4_TIM1
       case STM32L4_TIM1_BASE:
@@ -1455,7 +1455,7 @@ int stm32l4_tim_deinit(FAR struct stm32l4_tim_dev_s * dev)
 
   /* Mark it as free */
 
-  ((struct stm32_tim_priv_s *)dev)->mode = STM32L4_TIM_MODE_UNUSED;
+  ((struct stm32l4_tim_priv_s *)dev)->mode = STM32L4_TIM_MODE_UNUSED;
 
   return OK;
 }
diff --git a/arch/arm/src/stm32l4/stm32l4_tim_lowerhalf.c b/arch/arm/src/stm32l4/stm32l4_tim_lowerhalf.c
index 5a7639cb3a..7fff996234 100644
--- a/arch/arm/src/stm32l4/stm32l4_tim_lowerhalf.c
+++ b/arch/arm/src/stm32l4/stm32l4_tim_lowerhalf.c
@@ -87,7 +87,7 @@
  * timer_lowerhalf_s structure.
  */
 
-struct stm32_lowerhalf_s
+struct stm32l4_lowerhalf_s
 {
   FAR const struct timer_ops_s *ops;        /* Lower half operations */
   FAR struct stm32l4_tim_dev_s *tim;        /* stm32 timer driver */
@@ -104,48 +104,48 @@ struct stm32_lowerhalf_s
 /* Interrupt handling *******************************************************/
 
 #ifdef CONFIG_STM32L4_TIM1
-static int stm32_tim1_interrupt(int irq, FAR void *context);
+static int stm32l4_tim1_interrupt(int irq, FAR void *context);
 #endif
 #ifdef CONFIG_STM32L4_TIM2
-static int stm32_tim2_interrupt(int irq, FAR void *context);
+static int stm32l4_tim2_interrupt(int irq, FAR void *context);
 #endif
 #ifdef CONFIG_STM32L4_TIM3
-static int stm32_tim3_interrupt(int irq, FAR void *context);
+static int stm32l4_tim3_interrupt(int irq, FAR void *context);
 #endif
 #ifdef CONFIG_STM32L4_TIM4
-static int stm32_tim4_interrupt(int irq, FAR void *context);
+static int stm32l4_tim4_interrupt(int irq, FAR void *context);
 #endif
 #ifdef CONFIG_STM32L4_TIM5
-static int stm32_tim5_interrupt(int irq, FAR void *context);
+static int stm32l4_tim5_interrupt(int irq, FAR void *context);
 #endif
 #ifdef CONFIG_STM32L4_TIM6
-static int stm32_tim6_interrupt(int irq, FAR void *context);
+static int stm32l4_tim6_interrupt(int irq, FAR void *context);
 #endif
 #ifdef CONFIG_STM32L4_TIM7
-static int stm32_tim7_interrupt(int irq, FAR void *context);
+static int stm32l4_tim7_interrupt(int irq, FAR void *context);
 #endif
 #ifdef CONFIG_STM32L4_TIM8
-static int stm32_tim8_interrupt(int irq, FAR void *context);
+static int stm32l4_tim8_interrupt(int irq, FAR void *context);
 #endif
 #ifdef CONFIG_STM32L4_TIM15
-static int stm32_tim15_interrupt(int irq, FAR void *context);
+static int stm32l4_tim15_interrupt(int irq, FAR void *context);
 #endif
 #ifdef CONFIG_STM32L4_TIM16
-static int stm32_tim16_interrupt(int irq, FAR void *context);
+static int stm32l4_tim16_interrupt(int irq, FAR void *context);
 #endif
 #ifdef CONFIG_STM32L4_TIM17
-static int stm32_tim17_interrupt(int irq, FAR void *context);
+static int stm32l4_tim17_interrupt(int irq, FAR void *context);
 #endif
 
-static int stm32_timer_handler(FAR struct stm32_lowerhalf_s *lower);
+static int stm32l4_timer_handler(FAR struct stm32l4_lowerhalf_s *lower);
 
 /* "Lower half" driver methods **********************************************/
 
-static int stm32_start(FAR struct timer_lowerhalf_s *lower);
-static int stm32_stop(FAR struct timer_lowerhalf_s *lower);
-static int stm32_settimeout(FAR struct timer_lowerhalf_s *lower,
+static int stm32l4_start(FAR struct timer_lowerhalf_s *lower);
+static int stm32l4_stop(FAR struct timer_lowerhalf_s *lower);
+static int stm32l4_settimeout(FAR struct timer_lowerhalf_s *lower,
                             uint32_t timeout);
-static tccb_t stm32_sethandler(FAR struct timer_lowerhalf_s *lower,
+static tccb_t stm32l4_sethandler(FAR struct timer_lowerhalf_s *lower,
                                tccb_t handler);
 
 /****************************************************************************
@@ -155,109 +155,109 @@ static tccb_t stm32_sethandler(FAR struct timer_lowerhalf_s *lower,
 
 static const struct timer_ops_s g_timer_ops =
 {
-  .start      = stm32_start,
-  .stop       = stm32_stop,
+  .start      = stm32l4_start,
+  .stop       = stm32l4_stop,
   .getstatus  = NULL,
-  .settimeout = stm32_settimeout,
-  .sethandler = stm32_sethandler,
+  .settimeout = stm32l4_settimeout,
+  .sethandler = stm32l4_sethandler,
   .ioctl      = NULL,
 };
 
 #ifdef CONFIG_STM32L4_TIM1
-static struct stm32_lowerhalf_s g_tim1_lowerhalf =
+static struct stm32l4_lowerhalf_s g_tim1_lowerhalf =
 {
   .ops        = &g_timer_ops,
-  .timhandler = stm32_tim1_interrupt,
+  .timhandler = stm32l4_tim1_interrupt,
   .resolution = STM32L4_TIM1_RES,
 };
 #endif
 
 #ifdef CONFIG_STM32L4_TIM2
-static struct stm32_lowerhalf_s g_tim2_lowerhalf =
+static struct stm32l4_lowerhalf_s g_tim2_lowerhalf =
 {
   .ops        = &g_timer_ops,
-  .timhandler = stm32_tim2_interrupt,
+  .timhandler = stm32l4_tim2_interrupt,
   .resolution = STM32L4_TIM2_RES,
 };
 #endif
 
 #ifdef CONFIG_STM32L4_TIM3
-static struct stm32_lowerhalf_s g_tim3_lowerhalf =
+static struct stm32l4_lowerhalf_s g_tim3_lowerhalf =
 {
   .ops        = &g_timer_ops,
-  .timhandler = stm32_tim3_interrupt,
+  .timhandler = stm32l4_tim3_interrupt,
   .resolution = STM32L4_TIM3_RES,
 };
 #endif
 
 #ifdef CONFIG_STM32L4_TIM4
-static struct stm32_lowerhalf_s g_tim4_lowerhalf =
+static struct stm32l4_lowerhalf_s g_tim4_lowerhalf =
 {
   .ops        = &g_timer_ops,
-  .timhandler = stm32_tim4_interrupt,
+  .timhandler = stm32l4_tim4_interrupt,
   .resolution = STM32L4_TIM4_RES,
 };
 #endif
 
 #ifdef CONFIG_STM32L4_TIM5
-static struct stm32_lowerhalf_s g_tim5_lowerhalf =
+static struct stm32l4_lowerhalf_s g_tim5_lowerhalf =
 {
   .ops        = &g_timer_ops,
-  .timhandler = stm32_tim5_interrupt,
+  .timhandler = stm32l4_tim5_interrupt,
   .resolution = STM32L4_TIM5_RES,
 };
 #endif
 
 #ifdef CONFIG_STM32L4_TIM6
-static struct stm32_lowerhalf_s g_tim6_lowerhalf =
+static struct stm32l4_lowerhalf_s g_tim6_lowerhalf =
 {
   .ops        = &g_timer_ops,
-  .timhandler = stm32_tim6_interrupt,
+  .timhandler = stm32l4_tim6_interrupt,
   .resolution = STM32L4_TIM6_RES,
 };
 #endif
 
 #ifdef CONFIG_STM32L4_TIM7
-static struct stm32_lowerhalf_s g_tim7_lowerhalf =
+static struct stm32l4_lowerhalf_s g_tim7_lowerhalf =
 {
   .ops        = &g_timer_ops,
-  .timhandler = stm32_tim7_interrupt,
+  .timhandler = stm32l4_tim7_interrupt,
   .resolution = STM32L4_TIM7_RES,
 };
 #endif
 
 #ifdef CONFIG_STM32L4_TIM8
-static struct stm32_lowerhalf_s g_tim8_lowerhalf =
+static struct stm32l4_lowerhalf_s g_tim8_lowerhalf =
 {
   .ops        = &g_timer_ops,
-  .timhandler = stm32_tim8_interrupt,
+  .timhandler = stm32l4_tim8_interrupt,
   .resolution = STM32L4_TIM8_RES,
 };
 #endif
 
 #ifdef CONFIG_STM32L4_TIM15
-static struct stm32_lowerhalf_s g_tim15_lowerhalf =
+static struct stm32l4_lowerhalf_s g_tim15_lowerhalf =
 {
   .ops        = &g_timer_ops,
-  .timhandler = stm32_tim15_interrupt,
+  .timhandler = stm32l4_tim15_interrupt,
   .resolution = STM32L4_TIM15_RES,
 };
 #endif
 
 #ifdef CONFIG_STM32L4_TIM16
-static struct stm32_lowerhalf_s g_tim16_lowerhalf =
+static struct stm32l4_lowerhalf_s g_tim16_lowerhalf =
 {
   .ops        = &g_timer_ops,
-  .timhandler = stm32_tim16_interrupt,
+  .timhandler = stm32l4_tim16_interrupt,
   .resolution = STM32L4_TIM16_RES,
 };
 #endif
 
 #ifdef CONFIG_STM32L4_TIM17
-static struct stm32_lowerhalf_s g_tim17_lowerhalf =
+static struct stm32l4_lowerhalf_s g_tim17_lowerhalf =
 {
   .ops        = &g_timer_ops,
-  .timhandler = stm32_tim17_interrupt,
+  .timhandler = stm32l4_tim17_interrupt,
   .resolution = STM32L4_TIM17_RES,
 };
 #endif
@@ -267,7 +267,7 @@ static struct stm32_lowerhalf_s g_tim17_lowerhalf =
  ****************************************************************************/
 
 /****************************************************************************
- * Name: stm32_timN_interrupt, N=1..14
+ * Name: stm32l4_timN_interrupt, N=1..14
  *
  * Description:
  *   Individual interrupt handlers for each timer
@@ -275,84 +275,84 @@ static struct stm32_lowerhalf_s g_tim17_lowerhalf =
  ****************************************************************************/
 
 #ifdef CONFIG_STM32L4_TIM1
-static int stm32_tim1_interrupt(int irq, FAR void *context)
+static int stm32l4_tim1_interrupt(int irq, FAR void *context)
 {
-  return stm32_timer_handler(&g_tim1_lowerhalf);
+  return stm32l4_timer_handler(&g_tim1_lowerhalf);
 }
 #endif
 
 #ifdef CONFIG_STM32L4_TIM2
-static int stm32_tim2_interrupt(int irq, FAR void *context)
+static int stm32l4_tim2_interrupt(int irq, FAR void *context)
 {
-  return stm32_timer_handler(&g_tim2_lowerhalf);
+  return stm32l4_timer_handler(&g_tim2_lowerhalf);
 }
 #endif
 
 #ifdef CONFIG_STM32L4_TIM3
-static int stm32_tim3_interrupt(int irq, FAR void *context)
+static int stm32l4_tim3_interrupt(int irq, FAR void *context)
 {
-  return stm32_timer_handler(&g_tim3_lowerhalf);
+  return stm32l4_timer_handler(&g_tim3_lowerhalf);
 }
 #endif
 
 #ifdef CONFIG_STM32L4_TIM4
-static int stm32_tim4_interrupt(int irq, FAR void *context)
+static int stm32l4_tim4_interrupt(int irq, FAR void *context)
 {
-  return stm32_timer_handler(&g_tim4_lowerhalf);
+  return stm32l4_timer_handler(&g_tim4_lowerhalf);
 }
 #endif
 
 #ifdef CONFIG_STM32L4_TIM5
-static int stm32_tim5_interrupt(int irq, FAR void *context)
+static int stm32l4_tim5_interrupt(int irq, FAR void *context)
 {
-  return stm32_timer_handler(&g_tim5_lowerhalf);
+  return stm32l4_timer_handler(&g_tim5_lowerhalf);
 }
 #endif
 
 #ifdef CONFIG_STM32L4_TIM6
-static int stm32_tim6_interrupt(int irq, FAR void *context)
+static int stm32l4_tim6_interrupt(int irq, FAR void *context)
 {
-  return stm32_timer_handler(&g_tim6_lowerhalf);
+  return stm32l4_timer_handler(&g_tim6_lowerhalf);
 }
 #endif
 
 #ifdef CONFIG_STM32L4_TIM7
-static int stm32_tim7_interrupt(int irq, FAR void *context)
+static int stm32l4_tim7_interrupt(int irq, FAR void *context)
 {
-  return stm32_timer_handler(&g_tim7_lowerhalf);
+  return stm32l4_timer_handler(&g_tim7_lowerhalf);
 }
 #endif
 
 #ifdef CONFIG_STM32L4_TIM8
-static int stm32_tim8_interrupt(int irq, FAR void *context)
+static int stm32l4_tim8_interrupt(int irq, FAR void *context)
 {
-  return stm32_timer_handler(&g_tim8_lowerhalf);
+  return stm32l4_timer_handler(&g_tim8_lowerhalf);
 }
 #endif
 
 #ifdef CONFIG_STM32L4_TIM15
-static int stm32_tim15_interrupt(int irq, FAR void *context)
+static int stm32l4_tim15_interrupt(int irq, FAR void *context)
 {
-  return stm32_timer_handler(&g_tim15_lowerhalf);
+  return stm32l4_timer_handler(&g_tim15_lowerhalf);
 }
 #endif
 
 #ifdef CONFIG_STM32L4_TIM16
-static int stm32_tim16_interrupt(int irq, FAR void *context)
+static int stm32l4_tim16_interrupt(int irq, FAR void *context)
 {
-  return stm32_timer_handler(&g_tim16_lowerhalf);
+  return stm32l4_timer_handler(&g_tim16_lowerhalf);
 }
 #endif
 
 #ifdef CONFIG_STM32L4_TIM17
-static int stm32_tim17_interrupt(int irq, FAR void *context)
+static int stm32l4_tim17_interrupt(int irq, FAR void *context)
 {
-  return stm32_timer_handler(&g_tim17_lowerhalf);
+  return stm32l4_timer_handler(&g_tim17_lowerhalf);
 }
 #endif
 
 /****************************************************************************
- * Name: stm32_timer_handler
+ * Name: stm32l4_timer_handler
  *
  * Description:
  *   timer interrupt handler
@@ -363,7 +363,7 @@ static int stm32_tim17_interrupt(int irq, FAR void *context)
  *
  ****************************************************************************/
 
-static int stm32_timer_handler(FAR struct stm32_lowerhalf_s *lower)
+static int stm32l4_timer_handler(FAR struct stm32l4_lowerhalf_s *lower)
 {
   uint32_t next_interval_us = 0;
 
@@ -378,14 +378,14 @@ static int stm32_timer_handler(FAR struct stm32_lowerhalf_s *lower)
     }
   else
     {
-      stm32_stop((struct timer_lowerhalf_s *)lower);
+      stm32l4_stop((struct timer_lowerhalf_s *)lower);
     }
 
   return OK;
 }
 
 /****************************************************************************
- * Name: stm32_start
+ * Name: stm32l4_start
  *
  * Description:
  *   Start the timer, resetting the time to the current timeout,
@@ -399,9 +399,9 @@ static int stm32_timer_handler(FAR struct stm32_lowerhalf_s *lower)
  *
  ****************************************************************************/
 
-static int stm32_start(FAR struct timer_lowerhalf_s *lower)
+static int stm32l4_start(FAR struct timer_lowerhalf_s *lower)
 {
-  FAR struct stm32_lowerhalf_s *priv = (FAR struct stm32_lowerhalf_s *)lower;
+  FAR struct stm32l4_lowerhalf_s *priv = (FAR struct stm32l4_lowerhalf_s *)lower;
 
   if (!priv->started)
     {
@@ -423,7 +423,7 @@ static int stm32_start(FAR struct timer_lowerhalf_s *lower)
 }
 
 /****************************************************************************
- * Name: stm32_stop
+ * Name: stm32l4_stop
  *
  * Description:
  *   Stop the timer
@@ -437,9 +437,9 @@ static int stm32_start(FAR struct timer_lowerhalf_s *lower)
  *
  ****************************************************************************/
 
-static int stm32_stop(struct timer_lowerhalf_s *lower)
+static int stm32l4_stop(struct timer_lowerhalf_s *lower)
 {
-  struct stm32_lowerhalf_s *priv = (struct stm32_lowerhalf_s *)lower;
+  struct stm32l4_lowerhalf_s *priv = (struct stm32l4_lowerhalf_s *)lower;
 
   if (priv->started)
     {
@@ -456,7 +456,7 @@ static int stm32_stop(struct timer_lowerhalf_s *lower)
 }
 
 /****************************************************************************
- * Name: stm32_settimeout
+ * Name: stm32l4_settimeout
  *
  * Description:
  *   Set a new timeout value (and reset the timer)
@@ -471,9 +471,9 @@ static int stm32_stop(struct timer_lowerhalf_s *lower)
  *
  ****************************************************************************/
 
-static int stm32_settimeout(FAR struct timer_lowerhalf_s *lower, uint32_t timeout)
+static int stm32l4_settimeout(FAR struct timer_lowerhalf_s *lower, uint32_t timeout)
 {
-  FAR struct stm32_lowerhalf_s *priv = (FAR struct stm32_lowerhalf_s *)lower;
+  FAR struct stm32l4_lowerhalf_s *priv = (FAR struct stm32l4_lowerhalf_s *)lower;
   uint64_t maxtimeout;
 
   if (priv->started)
@@ -498,7 +498,7 @@ static int stm32_settimeout(FAR struct timer_lowerhalf_s *lower, uint32_t timeou
 }
 
 /****************************************************************************
- * Name: stm32_sethandler
+ * Name: stm32l4_sethandler
  *
  * Description:
  *   Call this user provided timeout handler.
@@ -516,10 +516,10 @@ static int stm32_settimeout(FAR struct timer_lowerhalf_s *lower, uint32_t timeou
  *
  ****************************************************************************/
 
-static tccb_t stm32_sethandler(FAR struct timer_lowerhalf_s *lower,
+static tccb_t stm32l4_sethandler(FAR struct timer_lowerhalf_s *lower,
                                tccb_t newhandler)
 {
-  FAR struct stm32_lowerhalf_s *priv = (FAR struct stm32_lowerhalf_s *)lower;
+  FAR struct stm32l4_lowerhalf_s *priv = (FAR struct stm32l4_lowerhalf_s *)lower;
 
   irqstate_t flags = enter_critical_section();
 
@@ -570,7 +570,7 @@ static tccb_t stm32_sethandler(FAR struct timer_lowerhalf_s *lower,
 
 int stm32l4_timer_initialize(FAR const char *devpath, int timer)
 {
-  FAR struct stm32_lowerhalf_s *lower;
+  FAR struct stm32l4_lowerhalf_s *lower;
 
   switch (timer)
     {
-- 
GitLab


From d347d7ce7e89d8950198efbda4ca14aff0ae7be4 Mon Sep 17 00:00:00 2001
From: Sebastien Lorquet 
Date: Mon, 11 Jul 2016 19:06:14 +0200
Subject: [PATCH 194/229] renames in oneshoot

---
 arch/arm/src/stm32l4/stm32l4_oneshot.c | 12 ++++++------
 arch/arm/src/stm32l4/stm32l4_oneshot.h |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/arm/src/stm32l4/stm32l4_oneshot.c b/arch/arm/src/stm32l4/stm32l4_oneshot.c
index 3abb44e862..221f023155 100644
--- a/arch/arm/src/stm32l4/stm32l4_oneshot.c
+++ b/arch/arm/src/stm32l4/stm32l4_oneshot.c
@@ -65,7 +65,7 @@ static struct stm32l4_oneshot_s *g_oneshot;
  ****************************************************************************/
 
 /****************************************************************************
- * Name: stm32_oneshot_handler
+ * Name: stm32l4_oneshot_handler
  *
  * Description:
  *   Timer interrupt callback.  When the oneshot timer interrupt expires,
@@ -83,7 +83,7 @@ static struct stm32l4_oneshot_s *g_oneshot;
  *
  ****************************************************************************/
 
-static int stm32_oneshot_handler(int irq, void *context)
+static int stm32l4_oneshot_handler(int irq, void *context)
 {
   struct stm32l4_oneshot_s *oneshot = g_oneshot;
   oneshot_handler_t oneshot_handler;
@@ -174,7 +174,7 @@ int stm32l4_oneshot_initialize(struct stm32l4_oneshot_s *oneshot, int chan,
 }
 
 /****************************************************************************
- * Name: stm32_oneshot_max_delay
+ * Name: stm32l4_oneshot_max_delay
  *
  * Description:
  *   Determine the maximum delay of the one-shot timer (in microseconds)
@@ -199,7 +199,7 @@ int stm32l4_oneshot_max_delay(struct stm32l4_oneshot_s *oneshot, uint64_t *usec)
  * Input Parameters:
  *   oneshot Caller allocated instance of the oneshot state structure.  This
  *           structure must have been previously initialized via a call to
- *           stm32_oneshot_initialize();
+ *           stm32l4_oneshot_initialize();
  *   handler The function to call when when the oneshot timer expires.
  *   arg     An opaque argument that will accompany the callback.
  *   ts      Provides the duration of the one shot timer.
@@ -259,7 +259,7 @@ int stm32l4_oneshot_start(struct stm32l4_oneshot_s *oneshot,
 
   /* Set up to receive the callback when the interrupt occurs */
 
-  STM32L4_TIM_SETISR(oneshot->tch, stm32_oneshot_handler, 0);
+  STM32L4_TIM_SETISR(oneshot->tch, stm32l4_oneshot_handler, 0);
 
   /* Set timer period */
 
@@ -294,7 +294,7 @@ int stm32l4_oneshot_start(struct stm32l4_oneshot_s *oneshot,
  * Input Parameters:
  *   oneshot Caller allocated instance of the oneshot state structure.  This
  *           structure must have been previously initialized via a call to
- *           stm32_oneshot_initialize();
+ *           stm32l4_oneshot_initialize();
  *   ts      The location in which to return the time remaining on the
  *           oneshot timer.  A time of zero is returned if the timer is
  *           not running.  ts may be zero in which case the time remaining
diff --git a/arch/arm/src/stm32l4/stm32l4_oneshot.h b/arch/arm/src/stm32l4/stm32l4_oneshot.h
index 6111706321..743652bf49 100644
--- a/arch/arm/src/stm32l4/stm32l4_oneshot.h
+++ b/arch/arm/src/stm32l4/stm32l4_oneshot.h
@@ -63,7 +63,7 @@
 typedef void (*oneshot_handler_t)(void *arg);
 
 /* The oneshot client must allocate an instance of this structure and called
- * stm32_oneshot_initialize() before using the oneshot facilities.  The client
+ * stm32l4_oneshot_initialize() before using the oneshot facilities.  The client
  * should not access the contents of this structure directly since the
  * contents are subject to change.
  */
@@ -139,7 +139,7 @@ int stm32l4_oneshot_max_delay(struct stm32l4_oneshot_s *oneshot, uint64_t *usec)
  * Input Parameters:
  *   oneshot Caller allocated instance of the oneshot state structure.  This
  *           structure must have been previously initialized via a call to
- *           stm32_oneshot_initialize();
+ *           stm32l4_oneshot_initialize();
  *   handler The function to call when when the oneshot timer expires.
  *   arg     An opaque argument that will accompany the callback.
  *   ts      Provides the duration of the one shot timer.
@@ -166,7 +166,7 @@ int stm32l4_oneshot_start(struct stm32l4_oneshot_s *oneshot,
  * Input Parameters:
  *   oneshot Caller allocated instance of the oneshot state structure.  This
  *           structure must have been previously initialized via a call to
- *           stm32_oneshot_initialize();
+ *           stm32l4_oneshot_initialize();
  *   ts      The location in which to return the time remaining on the
  *           oneshot timer.  A time of zero is returned if the timer is
  *           not running.
-- 
GitLab


From 5185a838ed9325a7665e50ff41f4d9294f3d0ac5 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 11 Jul 2016 11:12:08 -0600
Subject: [PATCH 195/229] Fix a broken file inclusion

---
 configs/teensy-3.x/src/k20_usbdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/teensy-3.x/src/k20_usbdev.c b/configs/teensy-3.x/src/k20_usbdev.c
index 5b59337889..2cf0d9d2e0 100644
--- a/configs/teensy-3.x/src/k20_usbdev.c
+++ b/configs/teensy-3.x/src/k20_usbdev.c
@@ -50,7 +50,7 @@
 #include "up_arch.h"
 #include "kinetis.h"
 #include "kinetis_usbotg.h"
-#include "kinetis_sim.h"
+#include "chip/kinetis_sim.h"
 #include "teensy-3x.h"
 
 /************************************************************************************
-- 
GitLab


From ce09af0da7e55241eace63303dbe346e605219db Mon Sep 17 00:00:00 2001
From: Sebastien Lorquet 
Date: Mon, 11 Jul 2016 19:13:06 +0200
Subject: [PATCH 196/229] Rename STM32L4 PWM routines. this WILL BREAK configs

---
 arch/arm/src/stm32l4/stm32l4_pwm.c | 387 +++++++++++++++--------------
 1 file changed, 195 insertions(+), 192 deletions(-)

diff --git a/arch/arm/src/stm32l4/stm32l4_pwm.c b/arch/arm/src/stm32l4/stm32l4_pwm.c
index b679da395c..b5cd35fb29 100644
--- a/arch/arm/src/stm32l4/stm32l4_pwm.c
+++ b/arch/arm/src/stm32l4/stm32l4_pwm.c
@@ -95,7 +95,7 @@
 /* Debug ********************************************************************/
 
 #ifdef CONFIG_DEBUG_PWM_INFO
-#  define pwm_dumpgpio(p,m) stm32_dumpgpio(p,m)
+#  define pwm_dumpgpio(p,m) stm32l4_dumpgpio(p,m)
 #else
 #  define pwm_dumpgpio(p,m)
 #endif
@@ -104,41 +104,41 @@
  * Private Types
  ****************************************************************************/
 
-enum stm32_timmode_e
+enum stm32l4_timmode_e
 {
-  STM32_TIMMODE_COUNTUP   = 0,
-  STM32_TIMMODE_COUNTDOWN = 1,
-  STM32_TIMMODE_CENTER1   = 2,
-  STM32_TIMMODE_CENTER2   = 3,
-  STM32_TIMMODE_CENTER3   = 4,
+  STM32L4_TIMMODE_COUNTUP   = 0,
+  STM32L4_TIMMODE_COUNTDOWN = 1,
+  STM32L4_TIMMODE_CENTER1   = 2,
+  STM32L4_TIMMODE_CENTER2   = 3,
+  STM32L4_TIMMODE_CENTER3   = 4,
 };
 
-enum stm32_chanmode_e
+enum stm32l4_chanmode_e
 {
-  STM32_CHANMODE_PWM1        = 0,
-  STM32_CHANMODE_PWM2        = 1,
-  STM32_CHANMODE_COMBINED1   = 2,
-  STM32_CHANMODE_COMBINED2   = 3,
-  STM32_CHANMODE_ASYMMETRIC1 = 4,
-  STM32_CHANMODE_ASYMMETRIC2 = 5,
+  STM32L4_CHANMODE_PWM1        = 0,
+  STM32L4_CHANMODE_PWM2        = 1,
+  STM32L4_CHANMODE_COMBINED1   = 2,
+  STM32L4_CHANMODE_COMBINED2   = 3,
+  STM32L4_CHANMODE_ASYMMETRIC1 = 4,
+  STM32L4_CHANMODE_ASYMMETRIC2 = 5,
 };
 
-struct stm32_pwmchan_s
+struct stm32l4_pwmchan_s
 {
   uint8_t channel;                     /* Timer output channel: {1,..4} */
   uint32_t pincfg;                     /* Output pin configuration */
-  enum stm32_chanmode_e mode;
+  enum stm32l4_chanmode_e mode;
 };
 
 /* This structure represents the state of one PWM timer */
 
-struct stm32_pwmtimer_s
+struct stm32l4_pwmtimer_s
 {
   FAR const struct pwm_ops_s *ops;     /* PWM operations */
   uint8_t timid;                       /* Timer ID {1,...,17} */
-  struct stm32_pwmchan_s channels[PWM_NCHANNELS];
+  struct stm32l4_pwmchan_s channels[PWM_NCHANNELS];
   uint8_t timtype;                     /* See the TIMTYPE_* definitions */
-  enum stm32_timmode_e mode;
+  enum stm32l4_timmode_e mode;
 #ifdef CONFIG_PWM_PULSECOUNT
   uint8_t irq;                         /* Timer update IRQ */
   uint8_t prev;                        /* The previous value of the RCR (pre-loaded) */
@@ -160,48 +160,48 @@ struct stm32_pwmtimer_s
  ****************************************************************************/
 /* Register access */
 
-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);
+static uint16_t stm32l4pwm_getreg(struct stm32l4_pwmtimer_s *priv, int offset);
+static void stm32l4pwm_putreg(struct stm32l4_pwmtimer_s *priv, int offset, uint16_t value);
 
 #ifdef CONFIG_DEBUG_PWM_INFO
-static void pwm_dumpregs(struct stm32_pwmtimer_s *priv, FAR const char *msg);
+static void stm32l4pwm_dumpregs(struct stm32l4_pwmtimer_s *priv, FAR const char *msg);
 #else
-#  define pwm_dumpregs(priv,msg)
+#  define stm32l4pwm_dumpregs(priv,msg)
 #endif
 
 /* Timer management */
 
-static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
-                     FAR const struct pwm_info_s *info);
+static int stm32l4pwm_timer(FAR struct stm32l4_pwmtimer_s *priv,
+                            FAR const struct pwm_info_s *info);
 
 #if defined(CONFIG_PWM_PULSECOUNT) && (defined(CONFIG_STM32L4_TIM1_PWM) || defined(CONFIG_STM32L4_TIM8_PWM))
-static int pwm_interrupt(struct stm32_pwmtimer_s *priv);
+static int stm32l4pwm_interrupt(struct stm32l4_pwmtimer_s *priv);
 #if defined(CONFIG_STM32L4_TIM1_PWM)
-static int pwm_tim1interrupt(int irq, void *context);
+static int stm32l4pwm_tim1interrupt(int irq, void *context);
 #endif
 #if defined(CONFIG_STM32L4_TIM8_PWM)
-static int pwm_tim8interrupt(int irq, void *context);
+static int stm32l4pwm_tim8interrupt(int irq, void *context);
 #endif
-static uint8_t pwm_pulsecount(uint32_t count);
+static uint8_t stm32l4pwm_pulsecount(uint32_t count);
 #endif
 
 /* 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 stm32l4pwm_setup(FAR struct pwm_lowerhalf_s *dev);
+static int stm32l4pwm_shutdown(FAR struct pwm_lowerhalf_s *dev);
 
 #ifdef CONFIG_PWM_PULSECOUNT
-static int pwm_start(FAR struct pwm_lowerhalf_s *dev,
-                     FAR const struct pwm_info_s *info,
-                     FAR void *handle);
+static int stm32l4pwm_start(FAR struct pwm_lowerhalf_s *dev,
+                            FAR const struct pwm_info_s *info,
+                            FAR void *handle);
 #else
-static int pwm_start(FAR struct pwm_lowerhalf_s *dev,
-                     FAR const struct pwm_info_s *info);
+static int stm32l4pwm_start(FAR struct pwm_lowerhalf_s *dev,
+                            FAR const struct pwm_info_s *info);
 #endif
 
-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);
+static int stm32l4pwm_stop(FAR struct pwm_lowerhalf_s *dev);
+static int stm32l4pwm_ioctl(FAR struct pwm_lowerhalf_s *dev,
+                            int cmd, unsigned long arg);
 
 /****************************************************************************
  * Private Data
@@ -210,15 +210,15 @@ static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev,
 
 static const struct pwm_ops_s g_pwmops =
 {
-  .setup       = pwm_setup,
-  .shutdown    = pwm_shutdown,
-  .start       = pwm_start,
-  .stop        = pwm_stop,
-  .ioctl       = pwm_ioctl,
+  .setup       = stm32l4pwm_setup,
+  .shutdown    = stm32l4pwm_shutdown,
+  .start       = stm32l4pwm_start,
+  .stop        = stm32l4pwm_stop,
+  .ioctl       = stm32l4pwm_ioctl,
 };
 
 #ifdef CONFIG_STM32L4_TIM1_PWM
-static struct stm32_pwmtimer_s g_pwm1dev =
+static struct stm32l4_pwmtimer_s g_pwm1dev =
 {
   .ops         = &g_pwmops,
   .timid       = 1,
@@ -264,7 +264,7 @@ static struct stm32_pwmtimer_s g_pwm1dev =
 #endif
 
 #ifdef CONFIG_STM32L4_TIM2_PWM
-static struct stm32_pwmtimer_s g_pwm2dev =
+static struct stm32l4_pwmtimer_s g_pwm2dev =
 {
   .ops         = &g_pwmops,
   .timid       = 2,
@@ -310,7 +310,7 @@ static struct stm32_pwmtimer_s g_pwm2dev =
 #endif
 
 #ifdef CONFIG_STM32L4_TIM3_PWM
-static struct stm32_pwmtimer_s g_pwm3dev =
+static struct stm32l4_pwmtimer_s g_pwm3dev =
 {
   .ops         = &g_pwmops,
   .timid       = 3,
@@ -356,7 +356,7 @@ static struct stm32_pwmtimer_s g_pwm3dev =
 #endif
 
 #ifdef CONFIG_STM32L4_TIM4_PWM
-static struct stm32_pwmtimer_s g_pwm4dev =
+static struct stm32l4_pwmtimer_s g_pwm4dev =
 {
   .ops         = &g_pwmops,
   .timid       = 4,
@@ -402,7 +402,7 @@ static struct stm32_pwmtimer_s g_pwm4dev =
 #endif
 
 #ifdef CONFIG_STM32L4_TIM5_PWM
-static struct stm32_pwmtimer_s g_pwm5dev =
+static struct stm32l4_pwmtimer_s g_pwm5dev =
 {
   .ops         = &g_pwmops,
   .timid       = 5,
@@ -448,7 +448,7 @@ static struct stm32_pwmtimer_s g_pwm5dev =
 #endif
 
 #ifdef CONFIG_STM32L4_TIM8_PWM
-static struct stm32_pwmtimer_s g_pwm8dev =
+static struct stm32l4_pwmtimer_s g_pwm8dev =
 {
   .ops         = &g_pwmops,
   .timid       = 8,
@@ -494,7 +494,7 @@ static struct stm32_pwmtimer_s g_pwm8dev =
 #endif
 
 #ifdef CONFIG_STM32L4_TIM15_PWM
-static struct stm32_pwmtimer_s g_pwm15dev =
+static struct stm32l4_pwmtimer_s g_pwm15dev =
 {
   .ops         = &g_pwmops,
   .timid       = 15,
@@ -526,7 +526,7 @@ static struct stm32_pwmtimer_s g_pwm15dev =
 #endif
 
 #ifdef CONFIG_STM32L4_TIM16_PWM
-static struct stm32_pwmtimer_s g_pwm16dev =
+static struct stm32l4_pwmtimer_s g_pwm16dev =
 {
   .ops         = &g_pwmops,
   .timid       = 16,
@@ -551,7 +551,7 @@ static struct stm32_pwmtimer_s g_pwm16dev =
 #endif
 
 #ifdef CONFIG_STM32L4_TIM17_PWM
-static struct stm32_pwmtimer_s g_pwm17dev =
+static struct stm32l4_pwmtimer_s g_pwm17dev =
 {
   .ops         = &g_pwmops,
   .timid       = 17,
@@ -580,7 +580,7 @@ static struct stm32_pwmtimer_s g_pwm17dev =
  ****************************************************************************/
 
 /****************************************************************************
- * Name: pwm_getreg
+ * Name: stm32l4pwm_getreg
  *
  * Description:
  *   Read the value of an PWM timer register.
@@ -594,13 +594,13 @@ static struct stm32_pwmtimer_s g_pwm17dev =
  *
  ****************************************************************************/
 
-static uint16_t pwm_getreg(struct stm32_pwmtimer_s *priv, int offset)
+static uint16_t stm32l4pwm_getreg(struct stm32l4_pwmtimer_s *priv, int offset)
 {
   return getreg16(priv->base + offset);
 }
 
 /****************************************************************************
- * Name: pwm_putreg
+ * Name: stm32l4pwm_putreg
  *
  * Description:
  *   Read the value of an PWM timer register.
@@ -614,7 +614,8 @@ 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)
+static void stm32l4pwm_putreg(struct stm32l4_pwmtimer_s *priv, int offset, 
+                              uint16_t value)
 {
   if (priv->timtype == TIMTYPE_GENERAL32 &&
       (offset == STM32L4_GTIM_CNT_OFFSET ||
@@ -639,7 +640,7 @@ static void pwm_putreg(struct stm32_pwmtimer_s *priv, int offset, uint16_t value
 }
 
 /****************************************************************************
- * Name: pwm_dumpregs
+ * Name: stm32l4pwm_dumpregs
  *
  * Description:
  *   Dump all timer registers.
@@ -653,50 +654,51 @@ static void pwm_putreg(struct stm32_pwmtimer_s *priv, int offset, uint16_t value
  ****************************************************************************/
 
 #ifdef CONFIG_DEBUG_PWM_INFO
-static void pwm_dumpregs(struct stm32_pwmtimer_s *priv, FAR const char *msg)
+static void stm32l4pwm_dumpregs(struct stm32l4_pwmtimer_s *priv,
+                                FAR const char *msg)
 {
   pwminfo("%s:\n", msg);
   pwminfo("  CR1: %04x CR2:  %04x SMCR:  %04x DIER:  %04x\n",
-          pwm_getreg(priv, STM32L4_GTIM_CR1_OFFSET),
-          pwm_getreg(priv, STM32L4_GTIM_CR2_OFFSET),
-          pwm_getreg(priv, STM32L4_GTIM_SMCR_OFFSET),
-          pwm_getreg(priv, STM32L4_GTIM_DIER_OFFSET));
+          stm32l4pwm_getreg(priv, STM32L4_GTIM_CR1_OFFSET),
+          stm32l4pwm_getreg(priv, STM32L4_GTIM_CR2_OFFSET),
+          stm32l4pwm_getreg(priv, STM32L4_GTIM_SMCR_OFFSET),
+          stm32l4pwm_getreg(priv, STM32L4_GTIM_DIER_OFFSET));
   pwminfo("   SR: %04x EGR:  %04x CCMR1: %04x CCMR2: %04x\n",
-          pwm_getreg(priv, STM32L4_GTIM_SR_OFFSET),
-          pwm_getreg(priv, STM32L4_GTIM_EGR_OFFSET),
-          pwm_getreg(priv, STM32L4_GTIM_CCMR1_OFFSET),
-          pwm_getreg(priv, STM32L4_GTIM_CCMR2_OFFSET));
+          stm32l4pwm_getreg(priv, STM32L4_GTIM_SR_OFFSET),
+          stm32l4pwm_getreg(priv, STM32L4_GTIM_EGR_OFFSET),
+          stm32l4pwm_getreg(priv, STM32L4_GTIM_CCMR1_OFFSET),
+          stm32l4pwm_getreg(priv, STM32L4_GTIM_CCMR2_OFFSET));
   pwminfo(" CCER: %04x CNT:  %04x PSC:   %04x ARR:   %04x\n",
-          pwm_getreg(priv, STM32L4_GTIM_CCER_OFFSET),
-          pwm_getreg(priv, STM32L4_GTIM_CNT_OFFSET),
-          pwm_getreg(priv, STM32L4_GTIM_PSC_OFFSET),
-          pwm_getreg(priv, STM32L4_GTIM_ARR_OFFSET));
+          stm32l4pwm_getreg(priv, STM32L4_GTIM_CCER_OFFSET),
+          stm32l4pwm_getreg(priv, STM32L4_GTIM_CNT_OFFSET),
+          stm32l4pwm_getreg(priv, STM32L4_GTIM_PSC_OFFSET),
+          stm32l4pwm_getreg(priv, STM32L4_GTIM_ARR_OFFSET));
   pwminfo(" CCR1: %04x CCR2: %04x CCR3:  %04x CCR4:  %04x\n",
-          pwm_getreg(priv, STM32L4_GTIM_CCR1_OFFSET),
-          pwm_getreg(priv, STM32L4_GTIM_CCR2_OFFSET),
-          pwm_getreg(priv, STM32L4_GTIM_CCR3_OFFSET),
-          pwm_getreg(priv, STM32L4_GTIM_CCR4_OFFSET));
+          stm32l4pwm_getreg(priv, STM32L4_GTIM_CCR1_OFFSET),
+          stm32l4pwm_getreg(priv, STM32L4_GTIM_CCR2_OFFSET),
+          stm32l4pwm_getreg(priv, STM32L4_GTIM_CCR3_OFFSET),
+          stm32l4pwm_getreg(priv, STM32L4_GTIM_CCR4_OFFSET));
 #if defined(CONFIG_STM32L4_TIM1_PWM) || defined(CONFIG_STM32L4_TIM8_PWM)
   if (priv->timtype == TIMTYPE_ADVANCED)
     {
       pwminfo("  RCR: %04x BDTR: %04x DCR:   %04x DMAR:  %04x\n",
-          pwm_getreg(priv, STM32L4_ATIM_RCR_OFFSET),
-          pwm_getreg(priv, STM32L4_ATIM_BDTR_OFFSET),
-          pwm_getreg(priv, STM32L4_ATIM_DCR_OFFSET),
-          pwm_getreg(priv, STM32L4_ATIM_DMAR_OFFSET));
+          stm32l4pwm_getreg(priv, STM32L4_ATIM_RCR_OFFSET),
+          stm32l4pwm_getreg(priv, STM32L4_ATIM_BDTR_OFFSET),
+          stm32l4pwm_getreg(priv, STM32L4_ATIM_DCR_OFFSET),
+          stm32l4pwm_getreg(priv, STM32L4_ATIM_DMAR_OFFSET));
     }
   else
 #endif
     {
       pwminfo("  DCR: %04x DMAR: %04x\n",
-          pwm_getreg(priv, STM32L4_GTIM_DCR_OFFSET),
-          pwm_getreg(priv, STM32L4_GTIM_DMAR_OFFSET));
+          stm32l4pwm_getreg(priv, STM32L4_GTIM_DCR_OFFSET),
+          stm32l4pwm_getreg(priv, STM32L4_GTIM_DMAR_OFFSET));
     }
 }
 #endif
 
 /****************************************************************************
- * Name: pwm_timer
+ * Name: stm32l4pwm_timer
  *
  * Description:
  *   (Re-)initialize the timer resources and start the pulsed output
@@ -710,8 +712,8 @@ static void pwm_dumpregs(struct stm32_pwmtimer_s *priv, FAR const char *msg)
  *
  ****************************************************************************/
 
-static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
-                     FAR const struct pwm_info_s *info)
+static int stm32l4pwm_timer(FAR struct stm32l4_pwmtimer_s *priv,
+                            FAR const struct pwm_info_s *info)
 {
 #ifdef CONFIG_PWM_MULTICHAN
   int      i;
@@ -760,8 +762,8 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
   /* Disable all interrupts and DMA requests, clear all pending status */
 
 #ifdef CONFIG_PWM_PULSECOUNT
-  pwm_putreg(priv, STM32L4_GTIM_DIER_OFFSET, 0);
-  pwm_putreg(priv, STM32L4_GTIM_SR_OFFSET, 0);
+  stm32l4pwm_putreg(priv, STM32L4_GTIM_DIER_OFFSET, 0);
+  stm32l4pwm_putreg(priv, STM32L4_GTIM_SR_OFFSET, 0);
 #endif
 
   /* Calculate optimal values for the timer prescaler and for the timer reload
@@ -831,7 +833,7 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
    * 15-17 CKD[1:0] ARPE              OPM URS UDIS CEN
    */
 
-  cr1 = pwm_getreg(priv, STM32L4_GTIM_CR1_OFFSET);
+  cr1 = stm32l4pwm_getreg(priv, STM32L4_GTIM_CR1_OFFSET);
 
   /* Disable the timer until we get it configured */
 
@@ -861,23 +863,23 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
 
       switch (priv->mode)
         {
-          case STM32_TIMMODE_COUNTUP:
+          case STM32L4_TIMMODE_COUNTUP:
             cr1 |= GTIM_CR1_EDGE;
             break;
 
-          case STM32_TIMMODE_COUNTDOWN:
+          case STM32L4_TIMMODE_COUNTDOWN:
             cr1 |= GTIM_CR1_EDGE | GTIM_CR1_DIR;
             break;
 
-          case STM32_TIMMODE_CENTER1:
+          case STM32L4_TIMMODE_CENTER1:
             cr1 |= GTIM_CR1_CENTER1;
             break;
 
-          case STM32_TIMMODE_CENTER2:
+          case STM32L4_TIMMODE_CENTER2:
             cr1 |= GTIM_CR1_CENTER2;
             break;
 
-          case STM32_TIMMODE_CENTER3:
+          case STM32L4_TIMMODE_CENTER3:
             cr1 |= GTIM_CR1_CENTER3;
             break;
 
@@ -893,12 +895,12 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
    */
 
   cr1 &= ~GTIM_CR1_CKD_MASK;
-  pwm_putreg(priv, STM32L4_GTIM_CR1_OFFSET, cr1);
+  stm32l4pwm_putreg(priv, STM32L4_GTIM_CR1_OFFSET, cr1);
 
   /* Set the reload and prescaler values */
 
-  pwm_putreg(priv, STM32L4_GTIM_ARR_OFFSET, (uint16_t)reload);
-  pwm_putreg(priv, STM32L4_GTIM_PSC_OFFSET, (uint16_t)(prescaler - 1));
+  stm32l4pwm_putreg(priv, STM32L4_GTIM_ARR_OFFSET, (uint16_t)reload);
+  stm32l4pwm_putreg(priv, STM32L4_GTIM_PSC_OFFSET, (uint16_t)(prescaler - 1));
 
   /* Set the advanced timer's repetition counter */
 
@@ -906,7 +908,7 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
   if (priv->timtype == TIMTYPE_ADVANCED)
     {
       /* If a non-zero repetition count has been selected, then set the
-       * repitition counter to the count-1 (pwm_start() has already
+       * repitition counter to the count-1 (stm32l4pwm_start() has already
        * assured us that the count value is within range).
        */
 
@@ -922,22 +924,22 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
            * value.
            */
 
-          priv->prev  = pwm_pulsecount(info->count);
-          pwm_putreg(priv, STM32L4_ATIM_RCR_OFFSET, (uint16_t)priv->prev - 1);
+          priv->prev  = stm32l4pwm_pulsecount(info->count);
+          stm32l4pwm_putreg(priv, STM32L4_ATIM_RCR_OFFSET, (uint16_t)priv->prev - 1);
 
           /* Generate an update event to reload the prescaler.  This should
            * preload the RCR into active repetition counter.
            */
 
-          pwm_putreg(priv, STM32L4_GTIM_EGR_OFFSET, ATIM_EGR_UG);
+          stm32l4pwm_putreg(priv, STM32L4_GTIM_EGR_OFFSET, ATIM_EGR_UG);
 
           /* Now set the value of the RCR that will be loaded on the next
            * update event.
            */
 
           priv->count = info->count;
-          priv->curr  = pwm_pulsecount(info->count - priv->prev);
-          pwm_putreg(priv, STM32L4_ATIM_RCR_OFFSET, (uint16_t)priv->curr - 1);
+          priv->curr  = stm32l4pwm_pulsecount(info->count - priv->prev);
+          stm32l4pwm_putreg(priv, STM32L4_ATIM_RCR_OFFSET, (uint16_t)priv->curr - 1);
         }
 
       /* Otherwise, just clear the repetition counter */
@@ -947,11 +949,11 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
         {
           /* Set the repetition counter to zero */
 
-          pwm_putreg(priv, STM32L4_ATIM_RCR_OFFSET, 0);
+          stm32l4pwm_putreg(priv, STM32L4_ATIM_RCR_OFFSET, 0);
 
           /* Generate an update event to reload the prescaler */
 
-          pwm_putreg(priv, STM32L4_GTIM_EGR_OFFSET, ATIM_EGR_UG);
+          stm32l4pwm_putreg(priv, STM32L4_GTIM_EGR_OFFSET, ATIM_EGR_UG);
         }
     }
   else
@@ -959,7 +961,7 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
     {
       /* Generate an update event to reload the prescaler (all timers) */
 
-      pwm_putreg(priv, STM32L4_GTIM_EGR_OFFSET, ATIM_EGR_UG);
+      stm32l4pwm_putreg(priv, STM32L4_GTIM_EGR_OFFSET, ATIM_EGR_UG);
     }
 
   /* Handle channel specific setup */
@@ -979,7 +981,7 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
 #ifdef CONFIG_PWM_MULTICHAN
       int                   j;
 #endif
-      enum stm32_chanmode_e mode;
+      enum stm32l4_chanmode_e mode;
 
 #ifdef CONFIG_PWM_MULTICHAN
       duty = info->channels[i].duty;
@@ -1025,30 +1027,30 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
 
       switch (mode)
         {
-          case STM32_CHANMODE_PWM1:
+          case STM32L4_CHANMODE_PWM1:
             chanmode = ATIM_CCMR_MODE_PWM1;
             break;
 
-          case STM32_CHANMODE_PWM2:
+          case STM32L4_CHANMODE_PWM2:
             chanmode = ATIM_CCMR_MODE_PWM2;
             break;
 
-          case STM32_CHANMODE_COMBINED1:
+          case STM32L4_CHANMODE_COMBINED1:
             chanmode = ATIM_CCMR_MODE_COMBINED1;
             ocmbit = true;
             break;
 
-          case STM32_CHANMODE_COMBINED2:
+          case STM32L4_CHANMODE_COMBINED2:
             chanmode = ATIM_CCMR_MODE_COMBINED2;
             ocmbit = true;
             break;
 
-          case STM32_CHANMODE_ASYMMETRIC1:
+          case STM32L4_CHANMODE_ASYMMETRIC1:
             chanmode = ATIM_CCMR_MODE_ASYMMETRIC1;
             ocmbit = true;
             break;
 
-          case STM32_CHANMODE_ASYMMETRIC2:
+          case STM32L4_CHANMODE_ASYMMETRIC2:
             chanmode = ATIM_CCMR_MODE_ASYMMETRIC2;
             ocmbit = true;
             break;
@@ -1079,7 +1081,7 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
 
               /* Set the duty cycle by writing to the CCR register for this channel */
 
-              pwm_putreg(priv, STM32L4_GTIM_CCR1_OFFSET, (uint16_t)ccr);
+              stm32l4pwm_putreg(priv, STM32L4_GTIM_CCR1_OFFSET, (uint16_t)ccr);
             }
             break;
 
@@ -1102,7 +1104,7 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
 
               /* Set the duty cycle by writing to the CCR register for this channel */
 
-              pwm_putreg(priv, STM32L4_GTIM_CCR2_OFFSET, (uint16_t)ccr);
+              stm32l4pwm_putreg(priv, STM32L4_GTIM_CCR2_OFFSET, (uint16_t)ccr);
             }
             break;
 
@@ -1125,7 +1127,7 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
 
               /* Set the duty cycle by writing to the CCR register for this channel */
 
-              pwm_putreg(priv, STM32L4_GTIM_CCR3_OFFSET, (uint16_t)ccr);
+              stm32l4pwm_putreg(priv, STM32L4_GTIM_CCR3_OFFSET, (uint16_t)ccr);
             }
             break;
 
@@ -1148,7 +1150,7 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
 
               /* Set the duty cycle by writing to the CCR register for this channel */
 
-              pwm_putreg(priv, STM32L4_GTIM_CCR4_OFFSET, (uint16_t)ccr);
+              stm32l4pwm_putreg(priv, STM32L4_GTIM_CCR4_OFFSET, (uint16_t)ccr);
             }
             break;
 
@@ -1160,15 +1162,15 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
 
   /* Disable the Channel by resetting the CCxE Bit in the CCER register */
 
-  ccer = pwm_getreg(priv, STM32L4_GTIM_CCER_OFFSET);
+  ccer = stm32l4pwm_getreg(priv, STM32L4_GTIM_CCER_OFFSET);
   ccer &= ~ccenable;
-  pwm_putreg(priv, STM32L4_GTIM_CCER_OFFSET, ccer);
+  stm32l4pwm_putreg(priv, STM32L4_GTIM_CCER_OFFSET, ccer);
 
   /* Fetch the CR2, CCMR1, and CCMR2 register (already have cr1 and ccer) */
 
-  cr2   = pwm_getreg(priv, STM32L4_GTIM_CR2_OFFSET);
-  ccmr1 = pwm_getreg(priv, STM32L4_GTIM_CCMR1_OFFSET);
-  ccmr2 = pwm_getreg(priv, STM32L4_GTIM_CCMR2_OFFSET);
+  cr2   = stm32l4pwm_getreg(priv, STM32L4_GTIM_CR2_OFFSET);
+  ccmr1 = stm32l4pwm_getreg(priv, STM32L4_GTIM_CCMR1_OFFSET);
+  ccmr2 = stm32l4pwm_getreg(priv, STM32L4_GTIM_CCMR2_OFFSET);
 
   /* Reset the Output Compare Mode Bits and set the select output compare mode */
 
@@ -1215,10 +1217,10 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
        * bits in the BDTR register.
        */
 
-      bdtr  = pwm_getreg(priv, STM32L4_ATIM_BDTR_OFFSET);
+      bdtr  = stm32l4pwm_getreg(priv, STM32L4_ATIM_BDTR_OFFSET);
       bdtr &= ~(ATIM_BDTR_OSSI | ATIM_BDTR_OSSR);
       bdtr |= ATIM_BDTR_MOE;
-      pwm_putreg(priv, STM32L4_ATIM_BDTR_OFFSET, bdtr);
+      stm32l4pwm_putreg(priv, STM32L4_ATIM_BDTR_OFFSET, bdtr);
     }
   else
 #endif
@@ -1228,19 +1230,19 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
 
   /* Save the modified register values */
 
-  pwm_putreg(priv, STM32L4_GTIM_CR2_OFFSET, cr2);
+  stm32l4pwm_putreg(priv, STM32L4_GTIM_CR2_OFFSET, cr2);
   putreg32(ccmr1, priv->base + STM32L4_GTIM_CCMR1_OFFSET);
   putreg32(ccmr2, priv->base + STM32L4_GTIM_CCMR2_OFFSET);
-  pwm_putreg(priv, STM32L4_GTIM_CCER_OFFSET, ccer);
+  stm32l4pwm_putreg(priv, STM32L4_GTIM_CCER_OFFSET, ccer);
 
   /* Set the ARR Preload Bit */
 
-  cr1 = pwm_getreg(priv, STM32L4_GTIM_CR1_OFFSET);
+  cr1 = stm32l4pwm_getreg(priv, STM32L4_GTIM_CR1_OFFSET);
   cr1 |= GTIM_CR1_ARPE;
-  pwm_putreg(priv, STM32L4_GTIM_CR1_OFFSET, cr1);
+  stm32l4pwm_putreg(priv, STM32L4_GTIM_CR1_OFFSET, cr1);
 
   /* Setup update interrupt.  If info->count is > 0, then we can be
-   * assured that pwm_start() has already verified: (1) that this is an
+   * assured that stm32l4pwm_start() has already verified: (1) that this is an
    * advanced timer, and that (2) the repetition count is within range.
    */
 
@@ -1249,13 +1251,13 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
     {
       /* Clear all pending interrupts and enable the update interrupt. */
 
-      pwm_putreg(priv, STM32L4_GTIM_SR_OFFSET, 0);
-      pwm_putreg(priv, STM32L4_GTIM_DIER_OFFSET, ATIM_DIER_UIE);
+      stm32l4pwm_putreg(priv, STM32L4_GTIM_SR_OFFSET, 0);
+      stm32l4pwm_putreg(priv, STM32L4_GTIM_DIER_OFFSET, ATIM_DIER_UIE);
 
       /* Enable the timer */
 
       cr1 |= GTIM_CR1_CEN;
-      pwm_putreg(priv, STM32L4_GTIM_CR1_OFFSET, cr1);
+      stm32l4pwm_putreg(priv, STM32L4_GTIM_CR1_OFFSET, cr1);
 
       /* And enable timer interrupts at the NVIC */
 
@@ -1267,16 +1269,16 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
       /* Just enable the timer, leaving all interrupts disabled */
 
       cr1 |= GTIM_CR1_CEN;
-      pwm_putreg(priv, STM32L4_GTIM_CR1_OFFSET, cr1);
+      stm32l4pwm_putreg(priv, STM32L4_GTIM_CR1_OFFSET, cr1);
     }
 
-  pwm_dumpregs(priv, "After starting");
+  stm32l4pwm_dumpregs(priv, "After starting");
   return OK;
 }
 
 #ifndef CONFIG_PWM_PULSECOUNT
 /****************************************************************************
- * Name: pwm_update_duty
+ * Name: stm32l4pwm_update_duty
  *
  * Description:
  *   Try to change only channel duty.
@@ -1291,8 +1293,8 @@ static int pwm_timer(FAR struct stm32_pwmtimer_s *priv,
  *
  ****************************************************************************/
 
-static  int pwm_update_duty(FAR struct stm32_pwmtimer_s *priv, uint8_t channel,
-                            ub16_t duty)
+static  int stm32l4pwm_update_duty(FAR struct stm32l4_pwmtimer_s *priv,
+                                   uint8_t channel, ub16_t duty)
 {
   /* Register offset */
 
@@ -1315,7 +1317,7 @@ static  int pwm_update_duty(FAR struct stm32_pwmtimer_s *priv, uint8_t channel,
 
   /* Get the reload values */
 
-  reload = pwm_getreg(priv, STM32L4_GTIM_ARR_OFFSET);
+  reload = stm32l4pwm_getreg(priv, STM32L4_GTIM_ARR_OFFSET);
 
   /* Duty cycle:
    *
@@ -1351,14 +1353,14 @@ static  int pwm_update_duty(FAR struct stm32_pwmtimer_s *priv, uint8_t channel,
 
   /* Set the duty cycle by writing to the CCR register for this channel */
 
-  pwm_putreg(priv, ccr_offset, (uint16_t)ccr);
+  stm32l4pwm_putreg(priv, ccr_offset, (uint16_t)ccr);
 
   return OK;
 }
 #endif
 
 /****************************************************************************
- * Name: pwm_interrupt
+ * Name: stm32l4pwm_interrupt
  *
  * Description:
  *   Handle timer interrupts.
@@ -1371,19 +1373,19 @@ static  int pwm_update_duty(FAR struct stm32_pwmtimer_s *priv, uint8_t channel,
  *
  ****************************************************************************/
 
-#if defined(CONFIG_PWM_PULSECOUNT) && (defined(CONFIG_STM32_TIM1_PWM) || defined(CONFIG_STM32_TIM8_PWM))
-static int pwm_interrupt(struct stm32_pwmtimer_s *priv)
+#if defined(CONFIG_PWM_PULSECOUNT) && (defined(CONFIG_STM32L4_TIM1_PWM) || defined(CONFIG_STM32L4_TIM8_PWM))
+static int stm32l4pwm_interrupt(struct stm32l4_pwmtimer_s *priv)
 {
   uint16_t regval;
 
   /* Verify that this is an update interrupt.  Nothing else is expected. */
 
-  regval = pwm_getreg(priv, STM32L4_ATIM_SR_OFFSET);
+  regval = stm32l4pwm_getreg(priv, STM32L4_ATIM_SR_OFFSET);
   DEBUGASSERT((regval & ATIM_SR_UIF) != 0);
 
   /* Clear the UIF interrupt bit */
 
-  pwm_putreg(priv, STM32L4_ATIM_SR_OFFSET, regval & ~ATIM_SR_UIF);
+  stm32l4pwm_putreg(priv, STM32L4_ATIM_SR_OFFSET, regval & ~ATIM_SR_UIF);
 
   /* Calculate the new count by subtracting the number of pulses
    * since the last interrupt.
@@ -1395,13 +1397,13 @@ static int pwm_interrupt(struct stm32_pwmtimer_s *priv)
        * quickly as possible.
        */
 
-      regval  = pwm_getreg(priv, STM32L4_ATIM_BDTR_OFFSET);
+      regval  = stm32l4pwm_getreg(priv, STM32L4_ATIM_BDTR_OFFSET);
       regval &= ~ATIM_BDTR_MOE;
-      pwm_putreg(priv, STM32L4_ATIM_BDTR_OFFSET, regval);
+      stm32l4pwm_putreg(priv, STM32L4_ATIM_BDTR_OFFSET, regval);
 
       /* Disable first interrtups, stop and reset the timer */
 
-      (void)pwm_stop((FAR struct pwm_lowerhalf_s *)priv);
+      (void)stm32l4pwm_stop((FAR struct pwm_lowerhalf_s *)priv);
 
       /* Then perform the callback into the upper half driver */
 
@@ -1427,8 +1429,8 @@ static int pwm_interrupt(struct stm32_pwmtimer_s *priv)
        */
 
       priv->prev = priv->curr;
-      priv->curr = pwm_pulsecount(priv->count - priv->prev);
-      pwm_putreg(priv, STM32L4_ATIM_RCR_OFFSET, (uint16_t)priv->curr - 1);
+      priv->curr = stm32l4pwm_pulsecount(priv->count - priv->prev);
+      stm32l4pwm_putreg(priv, STM32L4_ATIM_RCR_OFFSET, (uint16_t)priv->curr - 1);
     }
 
   /* Now all of the time critical stuff is done so we can do some debug output */
@@ -1454,22 +1456,22 @@ static int pwm_interrupt(struct stm32_pwmtimer_s *priv)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_PWM_PULSECOUNT) && defined(CONFIG_STM32_TIM1_PWM)
-static int pwm_tim1interrupt(int irq, void *context)
+#if defined(CONFIG_PWM_PULSECOUNT) && defined(CONFIG_STM32L4_TIM1_PWM)
+static int stm32l4pwm_tim1interrupt(int irq, void *context)
 {
-  return pwm_interrupt(&g_pwm1dev);
+  return stm32l4pwm_interrupt(&g_pwm1dev);
 }
 #endif
 
-#if defined(CONFIG_PWM_PULSECOUNT) && defined(CONFIG_STM32_TIM8_PWM)
-static int pwm_tim8interrupt(int irq, void *context)
+#if defined(CONFIG_PWM_PULSECOUNT) && defined(CONFIG_STM32L4_TIM8_PWM)
+static int stm32l4pwm_tim8interrupt(int irq, void *context)
 {
-  return pwm_interrupt(&g_pwm8dev);
+  return stm32l4pwm_interrupt(&g_pwm8dev);
 }
 #endif
 
 /****************************************************************************
- * Name: pwm_pulsecount
+ * Name: stm32l4pwm_pulsecount
  *
  * Description:
  *   Pick an optimal pulse count to program the RCR.
@@ -1482,8 +1484,8 @@ static int pwm_tim8interrupt(int irq, void *context)
  *
  ****************************************************************************/
 
-#if defined(CONFIG_PWM_PULSECOUNT) && (defined(CONFIG_STM32_TIM1_PWM) || defined(CONFIG_STM32_TIM8_PWM))
-static uint8_t pwm_pulsecount(uint32_t count)
+#if defined(CONFIG_PWM_PULSECOUNT) && (defined(CONFIG_STM32L4_TIM1_PWM) || defined(CONFIG_STM32L4_TIM8_PWM))
+static uint8_t stm32l4pwm_pulsecount(uint32_t count)
 {
   /* The the remaining pulse count is less than or equal to the maximum, the
    * just return the count.
@@ -1516,7 +1518,7 @@ static uint8_t pwm_pulsecount(uint32_t count)
 #endif
 
 /****************************************************************************
- * Name: pwm_set_apb_clock
+ * Name: stm32l4pwm_setapbclock
  *
  * Description:
  *   Enable or disable APB clock for the timer peripheral
@@ -1527,7 +1529,7 @@ static uint8_t pwm_pulsecount(uint32_t count)
  *
  ****************************************************************************/
 
-static void pwm_set_apb_clock(FAR struct stm32_pwmtimer_s *priv, bool on)
+static void stm32l4pwm_setapbclock(FAR struct stm32l4_pwmtimer_s *priv, bool on)
 {
   uint32_t en_bit;
   uint32_t regaddr;
@@ -1607,7 +1609,7 @@ static void pwm_set_apb_clock(FAR struct stm32_pwmtimer_s *priv, bool on)
 }
 
 /****************************************************************************
- * Name: pwm_setup
+ * Name: stm32l4pwm_setup
  *
  * Description:
  *   This method is called when the driver is opened.  The lower half driver
@@ -1626,18 +1628,18 @@ static void pwm_set_apb_clock(FAR struct stm32_pwmtimer_s *priv, bool on)
  *
  ****************************************************************************/
 
-static int pwm_setup(FAR struct pwm_lowerhalf_s *dev)
+static int stm32l4pwm_setup(FAR struct pwm_lowerhalf_s *dev)
 {
-  FAR struct stm32_pwmtimer_s *priv = (FAR struct stm32_pwmtimer_s *)dev;
+  FAR struct stm32l4_pwmtimer_s *priv = (FAR struct stm32l4_pwmtimer_s *)dev;
   uint32_t pincfg;
   int i;
 
   pwminfo("TIM%u\n", priv->timid);
-  pwm_dumpregs(priv, "Initially");
+  stm32l4pwm_dumpregs(priv, "Initially");
 
   /* Enable APB1/2 clocking for timer. */
 
-  pwm_set_apb_clock(priv, true);
+  stm32l4pwm_setapbclock(priv, true);
 
   /* Configure the PWM output pins, but do not start the timer yet */
 
@@ -1651,7 +1653,7 @@ static int pwm_setup(FAR struct pwm_lowerhalf_s *dev)
 
       pwminfo("pincfg: %08x\n", pincfg);
 
-      stm32_configgpio(pincfg);
+      stm32l4_configgpio(pincfg);
       pwm_dumpgpio(pincfg, "PWM setup");
     }
 
@@ -1659,7 +1661,7 @@ static int pwm_setup(FAR struct pwm_lowerhalf_s *dev)
 }
 
 /****************************************************************************
- * Name: pwm_shutdown
+ * Name: stm32l4pwm_shutdown
  *
  * Description:
  *   This method is called when the driver is closed.  The lower half driver
@@ -1674,9 +1676,9 @@ static int pwm_setup(FAR struct pwm_lowerhalf_s *dev)
  *
  ****************************************************************************/
 
-static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev)
+static int stm32l4pwm_shutdown(FAR struct pwm_lowerhalf_s *dev)
 {
-  FAR struct stm32_pwmtimer_s *priv = (FAR struct stm32_pwmtimer_s *)dev;
+  FAR struct stm32l4_pwmtimer_s *priv = (FAR struct stm32l4_pwmtimer_s *)dev;
   uint32_t pincfg;
   int i;
 
@@ -1684,11 +1686,11 @@ static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev)
 
   /* Make sure that the output has been stopped */
 
-  pwm_stop(dev);
+  stm32l4pwm_stop(dev);
 
   /* Disable APB1/2 clocking for timer. */
 
-  pwm_set_apb_clock(priv, false);
+  stm32l4pwm_setapbclock(priv, false);
 
   /* Then put the GPIO pins back to the default state */
 
@@ -1706,14 +1708,14 @@ static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev)
 
       pincfg |= GPIO_INPUT | GPIO_FLOAT;
 
-      stm32_configgpio(pincfg);
+      stm32l4_configgpio(pincfg);
     }
 
   return OK;
 }
 
 /****************************************************************************
- * Name: pwm_start
+ * Name: stm32l4pwm_start
  *
  * Description:
  *   (Re-)initialize the timer resources and start the pulsed output
@@ -1728,11 +1730,11 @@ static int pwm_shutdown(FAR struct pwm_lowerhalf_s *dev)
  ****************************************************************************/
 
 #ifdef CONFIG_PWM_PULSECOUNT
-static int pwm_start(FAR struct pwm_lowerhalf_s *dev,
+static int stm32l4pwm_start(FAR struct pwm_lowerhalf_s *dev,
                      FAR const struct pwm_info_s *info,
                      FAR void *handle)
 {
-  FAR struct stm32_pwmtimer_s *priv = (FAR struct stm32_pwmtimer_s *)dev;
+  FAR struct stm32l4_pwmtimer_s *priv = (FAR struct stm32l4_pwmtimer_s *)dev;
 
   /* Check if a pulsecount has been selected */
 
@@ -1754,14 +1756,14 @@ static int pwm_start(FAR struct pwm_lowerhalf_s *dev,
 
   /* Start the time */
 
-  return pwm_timer(priv, info);
+  return stm32l4pwm_timer(priv, info);
 }
 #else
-static int pwm_start(FAR struct pwm_lowerhalf_s *dev,
+static int stm32l4pwm_start(FAR struct pwm_lowerhalf_s *dev,
                      FAR const struct pwm_info_s *info)
 {
   int ret = OK;
-  FAR struct stm32_pwmtimer_s *priv = (FAR struct stm32_pwmtimer_s *)dev;
+  FAR struct stm32l4_pwmtimer_s *priv = (FAR struct stm32l4_pwmtimer_s *)dev;
 
 #ifndef CONFIG_PWM_PULSECOUNT
   /* if frequency has not changed we just update duty */
@@ -1773,17 +1775,17 @@ static int pwm_start(FAR struct pwm_lowerhalf_s *dev,
 
       for (i = 0; ret == OK && i < CONFIG_PWM_NCHANNELS; i++)
         {
-          ret = pwm_update_duty(priv,info->channels[i].channel,
+          ret = stm32l4pwm_update_duty(priv,info->channels[i].channel,
                                 info->channels[i].duty);
         }
 #else
-      ret = pwm_update_duty(priv,priv->channels[0].channel,info->duty);
+      ret = stm32l4pwm_update_duty(priv,priv->channels[0].channel,info->duty);
 #endif
     }
   else
 #endif
     {
-      ret = pwm_timer(priv, info);
+      ret = stm32l4pwm_timer(priv, info);
 
 #ifndef CONFIG_PWM_PULSECOUNT
       /* Save current frequency */
@@ -1800,7 +1802,7 @@ static int pwm_start(FAR struct pwm_lowerhalf_s *dev,
 #endif
 
 /****************************************************************************
- * Name: pwm_stop
+ * Name: stm32l4pwm_stop
  *
  * Description:
  *   Stop the pulsed output and reset the timer resources
@@ -1818,9 +1820,9 @@ static int pwm_start(FAR struct pwm_lowerhalf_s *dev,
  *
  ****************************************************************************/
 
-static int pwm_stop(FAR struct pwm_lowerhalf_s *dev)
+static int stm32l4pwm_stop(FAR struct pwm_lowerhalf_s *dev)
 {
-  FAR struct stm32_pwmtimer_s *priv = (FAR struct stm32_pwmtimer_s *)dev;
+  FAR struct stm32l4_pwmtimer_s *priv = (FAR struct stm32l4_pwmtimer_s *)dev;
   uint32_t resetbit;
   uint32_t regaddr;
   uint32_t regval;
@@ -1840,8 +1842,8 @@ static int pwm_stop(FAR struct pwm_lowerhalf_s *dev)
 
   /* Disable further interrupts and stop the timer */
 
-  pwm_putreg(priv, STM32L4_GTIM_DIER_OFFSET, 0);
-  pwm_putreg(priv, STM32L4_GTIM_SR_OFFSET, 0);
+  stm32l4pwm_putreg(priv, STM32L4_GTIM_DIER_OFFSET, 0);
+  stm32l4pwm_putreg(priv, STM32L4_GTIM_SR_OFFSET, 0);
 
   /* Determine which timer to reset */
 
@@ -1900,7 +1902,7 @@ static int pwm_stop(FAR struct pwm_lowerhalf_s *dev)
     }
 
   /* Reset the timer - stopping the output and putting the timer back
-   * into a state where pwm_start() can be called.
+   * into a state where stm32l4pwm_start() can be called.
    */
 
   regval  = getreg32(regaddr);
@@ -1912,12 +1914,12 @@ static int pwm_stop(FAR struct pwm_lowerhalf_s *dev)
   leave_critical_section(flags);
 
   pwminfo("regaddr: %08x resetbit: %08x\n", regaddr, resetbit);
-  pwm_dumpregs(priv, "After stop");
+  stm32l4pwm_dumpregs(priv, "After stop");
   return OK;
 }
 
 /****************************************************************************
- * Name: pwm_ioctl
+ * Name: stm32l4pwm_ioctl
  *
  * Description:
  *   Lower-half logic may support platform-specific ioctl commands
@@ -1932,10 +1934,11 @@ 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)
+static int stm32l4pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, int cmd, 
+                            unsigned long arg)
 {
 #ifdef CONFIG_DEBUG_PWM_INFO
-  FAR struct stm32_pwmtimer_s *priv = (FAR struct stm32_pwmtimer_s *)dev;
+  FAR struct stm32l4_pwmtimer_s *priv = (FAR struct stm32l4_pwmtimer_s *)dev;
 
   /* There are no platform-specific ioctl commands */
 
@@ -1967,7 +1970,7 @@ static int pwm_ioctl(FAR struct pwm_lowerhalf_s *dev, int cmd, unsigned long arg
 
 FAR struct pwm_lowerhalf_s *stm32l4_pwminitialize(int timer)
 {
-  FAR struct stm32_pwmtimer_s *lower;
+  FAR struct stm32l4_pwmtimer_s *lower;
 
   pwminfo("TIM%u\n", timer);
 
@@ -1980,7 +1983,7 @@ FAR struct pwm_lowerhalf_s *stm32l4_pwminitialize(int timer)
         /* Attach but disable the TIM1 update interrupt */
 
 #ifdef CONFIG_PWM_PULSECOUNT
-        irq_attach(lower->irq, pwm_tim1interrupt);
+        irq_attach(lower->irq, stm32l4pwm_tim1interrupt);
         up_disable_irq(lower->irq);
 #endif
         break;
@@ -2017,7 +2020,7 @@ FAR struct pwm_lowerhalf_s *stm32l4_pwminitialize(int timer)
         /* Attach but disable the TIM8 update interrupt */
 
 #ifdef CONFIG_PWM_PULSECOUNT
-        irq_attach(lower->irq, pwm_tim8interrupt);
+        irq_attach(lower->irq, stm32l4pwm_tim8interrupt);
         up_disable_irq(lower->irq);
 #endif
         break;
-- 
GitLab


From 67a95493550c3b42aac278737e4d4fb9a6e4b435 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 11 Jul 2016 11:19:58 -0600
Subject: [PATCH 197/229] TMPFS: Eliminate some warnings

---
 fs/tmpfs/fs_tmpfs.c | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/fs/tmpfs/fs_tmpfs.c b/fs/tmpfs/fs_tmpfs.c
index ee56d7189b..df265ff17b 100644
--- a/fs/tmpfs/fs_tmpfs.c
+++ b/fs/tmpfs/fs_tmpfs.c
@@ -924,8 +924,8 @@ static int tmpfs_find_object(FAR struct tmpfs_s *fs,
                              FAR struct tmpfs_object_s **object,
                              FAR struct tmpfs_directory_s **parent)
 {
-  FAR struct tmpfs_object_s *to;
-  FAR struct tmpfs_directory_s *tdo;
+  FAR struct tmpfs_object_s *to = NULL;
+  FAR struct tmpfs_directory_s *tdo = NULL;
   FAR struct tmpfs_directory_s *next_tdo;
   FAR char *segment;
   FAR char *next_segment;
@@ -1019,24 +1019,30 @@ static int tmpfs_find_object(FAR struct tmpfs_s *fs,
 
   if (parent)
     {
-      /* Get exclusive access to the parent and increment the reference
-       * count on the object.
-       */
+      if (tdo != NULL)
+        {
+          /* Get exclusive access to the parent and increment the reference
+           * count on the object.
+           */
 
-      tmpfs_lock_directory(tdo);
-      tdo->tdo_refs++;
+          tmpfs_lock_directory(tdo);
+          tdo->tdo_refs++;
+        }
 
       *parent = tdo;
     }
 
   if (object)
     {
-      /* Get exclusive access to the object and increment the reference
-       * count on the object.
-       */
+      if (to != NULL)
+        {
+          /* Get exclusive access to the object and increment the reference
+           * count on the object.
+           */
 
-      tmpfs_lock_object(to);
-      to->to_refs++;
+          tmpfs_lock_object(to);
+          to->to_refs++;
+        }
 
       *object = to;
     }
@@ -2086,7 +2092,7 @@ static int tmpfs_unlink(FAR struct inode *mountpt, FAR const char *relpath)
 {
   FAR struct tmpfs_s *fs;
   FAR struct tmpfs_directory_s *tdo;
-  FAR struct tmpfs_file_s *tfo;
+  FAR struct tmpfs_file_s *tfo = NULL;
   FAR const char *name;
   int ret;
 
@@ -2113,6 +2119,8 @@ static int tmpfs_unlink(FAR struct inode *mountpt, FAR const char *relpath)
       goto errout_with_lock;
     }
 
+  DEBUGASSERT(tfo != NULL);
+
   /* Get the file name from the relative path */
 
   name = strrchr(relpath, '/');
-- 
GitLab


From fb1855244e8e61eb0caeeacf40b91e6cde32fd28 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 11 Jul 2016 13:13:17 -0600
Subject: [PATCH 198/229] STM32 timer: Eliminate a warning

---
 arch/arm/src/stm32/stm32_tim.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/arch/arm/src/stm32/stm32_tim.c b/arch/arm/src/stm32/stm32_tim.c
index b001f10cd5..ff470b3065 100644
--- a/arch/arm/src/stm32/stm32_tim.c
+++ b/arch/arm/src/stm32/stm32_tim.c
@@ -158,9 +158,12 @@
 #  undef CONFIG_STM32_TIM17
 #endif
 
+#undef HAVE_TIM_GPIOCONFIG
 #if defined(CONFIG_STM32_TIM1)
 #  if defined(GPIO_TIM1_CH1OUT) ||defined(GPIO_TIM1_CH2OUT)||\
       defined(GPIO_TIM1_CH3OUT) ||defined(GPIO_TIM1_CH4OUT)
+#    undef  HAVE_TIM_GPIOCONFIG
+#    define HAVE_TIM_GPIOCONFIG  1
 #    define HAVE_TIM1_GPIOCONFIG 1
 #endif
 #endif
@@ -168,6 +171,8 @@
 #if defined(CONFIG_STM32_TIM2)
 #  if defined(GPIO_TIM2_CH1OUT) ||defined(GPIO_TIM2_CH2OUT)||\
       defined(GPIO_TIM2_CH3OUT) ||defined(GPIO_TIM2_CH4OUT)
+#    undef  HAVE_TIM_GPIOCONFIG
+#    define HAVE_TIM_GPIOCONFIG  1
 #    define HAVE_TIM2_GPIOCONFIG 1
 #endif
 #endif
@@ -175,6 +180,8 @@
 #if defined(CONFIG_STM32_TIM3)
 #  if defined(GPIO_TIM3_CH1OUT) ||defined(GPIO_TIM3_CH2OUT)||\
       defined(GPIO_TIM3_CH3OUT) ||defined(GPIO_TIM3_CH4OUT)
+#    undef  HAVE_TIM_GPIOCONFIG
+#    define HAVE_TIM_GPIOCONFIG  1
 #    define HAVE_TIM3_GPIOCONFIG 1
 #endif
 #endif
@@ -182,6 +189,8 @@
 #if defined(CONFIG_STM32_TIM4)
 #  if defined(GPIO_TIM4_CH1OUT) ||defined(GPIO_TIM4_CH2OUT)||\
       defined(GPIO_TIM4_CH3OUT) ||defined(GPIO_TIM4_CH4OUT)
+#    undef  HAVE_TIM_GPIOCONFIG
+#    define HAVE_TIM_GPIOCONFIG  1
 #    define HAVE_TIM4_GPIOCONFIG 1
 #endif
 #endif
@@ -189,6 +198,8 @@
 #if defined(CONFIG_STM32_TIM5)
 #  if defined(GPIO_TIM5_CH1OUT) ||defined(GPIO_TIM5_CH2OUT)||\
       defined(GPIO_TIM5_CH3OUT) ||defined(GPIO_TIM5_CH4OUT)
+#    undef  HAVE_TIM_GPIOCONFIG
+#    define HAVE_TIM_GPIOCONFIG  1
 #    define HAVE_TIM5_GPIOCONFIG 1
 #endif
 #endif
@@ -196,6 +207,8 @@
 #if defined(CONFIG_STM32_TIM8)
 #  if defined(GPIO_TIM8_CH1OUT) ||defined(GPIO_TIM8_CH2OUT)||\
       defined(GPIO_TIM8_CH3OUT) ||defined(GPIO_TIM8_CH4OUT)
+#    undef  HAVE_TIM_GPIOCONFIG
+#    define HAVE_TIM_GPIOCONFIG  1
 #    define HAVE_TIM8_GPIOCONFIG 1
 #endif
 #endif
@@ -314,7 +327,10 @@ static void stm32_tim_reload_counter(FAR struct stm32_tim_dev_s *dev);
 static void stm32_tim_enable(FAR struct stm32_tim_dev_s *dev);
 static void stm32_tim_disable(FAR struct stm32_tim_dev_s *dev);
 static void stm32_tim_reset(FAR struct stm32_tim_dev_s *dev);
+
+#ifdef HAVE_TIM_GPIOCONFIG
 static void stm32_tim_gpioconfig(uint32_t cfg, stm32_tim_channel_t mode);
+#endif
 
 /* Timer methods */
 
@@ -637,9 +653,7 @@ static void stm32_tim_reset(FAR struct stm32_tim_dev_s *dev)
  * Name: stm32_tim_gpioconfig
  ************************************************************************************/
 
-#if defined(HAVE_TIM1_GPIOCONFIG)||defined(HAVE_TIM2_GPIOCONFIG)||\
-    defined(HAVE_TIM3_GPIOCONFIG)||defined(HAVE_TIM4_GPIOCONFIG)||\
-    defined(HAVE_TIM5_GPIOCONFIG)||defined(HAVE_TIM8_GPIOCONFIG)
+#ifdef HAVE_TIM_GPIOCONFIG
 static void stm32_tim_gpioconfig(uint32_t cfg, stm32_tim_channel_t mode)
 {
   /* TODO: Add support for input capture and bipolar dual outputs for TIM8 */
-- 
GitLab


From 6a081e118d0529906d6bb942bbb11d886258bc60 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 11 Jul 2016 13:43:43 -0600
Subject: [PATCH 199/229] Add guess at missing lib_libexpif.c file

---
 libc/math/lib_libexpi.c  |  4 +-
 libc/math/lib_libexpif.c | 96 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 98 insertions(+), 2 deletions(-)
 create mode 100644 libc/math/lib_libexpif.c

diff --git a/libc/math/lib_libexpi.c b/libc/math/lib_libexpi.c
index c8f5793d39..c6f8341ae4 100644
--- a/libc/math/lib_libexpi.c
+++ b/libc/math/lib_libexpi.c
@@ -58,7 +58,7 @@
  * Private Data
  ****************************************************************************/
 
-static double _expi_square_tbl[11] =
+static double g_expi_square_tbl[11] =
 {
   M_E,                          /* e^1 */
   M_E2,                         /* e^2 */
@@ -94,7 +94,7 @@ double lib_expi(size_t n)
       if (n & (1 << i))
         {
           n   &= ~(1 << i);
-          val *= _expi_square_tbl[i];
+          val *= g_expi_square_tbl[i];
         }
     }
 
diff --git a/libc/math/lib_libexpif.c b/libc/math/lib_libexpif.c
new file mode 100644
index 0000000000..8d8509c723
--- /dev/null
+++ b/libc/math/lib_libexpif.c
@@ -0,0 +1,96 @@
+/****************************************************************************
+ * libc/math/lib_libexpif.c
+ *
+ * This file is a part of NuttX:
+ *
+ *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+ *   Ported by: Darcy Gong/Gregory Nutt
+ *
+ * It derives from the Rhombs OS math library by Nick Johnson which has
+ * a compatibile, MIT-style license:
+ *
+ * Copyright (C) 2009-2011 Nick Johnson 
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include 
+#include 
+
+#include 
+#include 
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define M_E2    (M_E * M_E)
+#define M_E4    (M_E2 * M_E2)
+#define M_E8    (M_E4 * M_E4)
+#define M_E16   (M_E8 * M_E8)
+#define M_E32   (M_E16 * M_E16)
+#define M_E64   (M_E32 * M_E32)
+#define M_E128  (M_E64 * M_E64)
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static float g_expif_square_tbl[11] =
+{
+  (float)M_E,                   /* e^1 */
+  (float)M_E2,                  /* e^2 */
+  (float)M_E4,                  /* e^4 */
+  (float)M_E8,                  /* e^8 */
+  (float)M_E16,                 /* e^16 */
+  (float)M_E32,                 /* e^32 */
+  (float)M_E64,                 /* e^64 */
+  (float)M_E128,                /* e^128 */
+};
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+float lib_expif(size_t n)
+{
+  size_t i;
+  float val;
+
+  if (n > 128)
+    {
+      return INFINITY_F;
+    }
+
+  val = 1.0F;
+
+  for (i = 0; n; i++)
+    {
+      if (n & (1 << i))
+        {
+          n   &= ~(1 << i);
+          val *= g_expif_square_tbl[i];
+        }
+    }
+
+  return val;
+}
-- 
GitLab


From 29eae1023255abe012d63680adfc3bdef2a32dde Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 11 Jul 2016 13:53:31 -0600
Subject: [PATCH 200/229] lib_expi/f():  Exponental table should be 'const'. 
 Dimension was wrong for float version.

---
 libc/math/lib_libexpi.c  | 4 ++--
 libc/math/lib_libexpif.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libc/math/lib_libexpi.c b/libc/math/lib_libexpi.c
index c6f8341ae4..cab07ca8fa 100644
--- a/libc/math/lib_libexpi.c
+++ b/libc/math/lib_libexpi.c
@@ -58,7 +58,7 @@
  * Private Data
  ****************************************************************************/
 
-static double g_expi_square_tbl[11] =
+static const double g_expi_square_tbl[11] =
 {
   M_E,                          /* e^1 */
   M_E2,                         /* e^2 */
@@ -91,7 +91,7 @@ double lib_expi(size_t n)
 
   for (i = 0; n; i++)
     {
-      if (n & (1 << i))
+      if ((n & (1 << i)) != 0)
         {
           n   &= ~(1 << i);
           val *= g_expi_square_tbl[i];
diff --git a/libc/math/lib_libexpif.c b/libc/math/lib_libexpif.c
index 8d8509c723..d1204d2127 100644
--- a/libc/math/lib_libexpif.c
+++ b/libc/math/lib_libexpif.c
@@ -55,7 +55,7 @@
  * Private Data
  ****************************************************************************/
 
-static float g_expif_square_tbl[11] =
+static const float g_expif_square_tbl[8] =
 {
   (float)M_E,                   /* e^1 */
   (float)M_E2,                  /* e^2 */
@@ -85,7 +85,7 @@ float lib_expif(size_t n)
 
   for (i = 0; n; i++)
     {
-      if (n & (1 << i))
+      if ((n & (1 << i)) != 0)
         {
           n   &= ~(1 << i);
           val *= g_expif_square_tbl[i];
-- 
GitLab


From f9d4b5020710061eb6af3ed35233d1b0fbb93438 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 11 Jul 2016 13:52:21 -0600
Subject: [PATCH 201/229] If there are no streams, let printf() fall back to
 use syslog() for output.

---
 libc/stdio/lib_printf.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/libc/stdio/lib_printf.c b/libc/stdio/lib_printf.c
index b760abb4bb..7c3e460b97 100644
--- a/libc/stdio/lib_printf.c
+++ b/libc/stdio/lib_printf.c
@@ -58,13 +58,8 @@ int printf(FAR const IPTR char *fmt, ...)
   va_start(ap, fmt);
 #if CONFIG_NFILE_STREAMS > 0
   ret = vfprintf(stdout, fmt, ap);
-#elif CONFIG_NFILE_DESCRIPTORS > 0
-  ret = vsyslog(LOG_INFO, fmt, ap);
 #else
-# ifdef CONFIG_CPP_HAVE_WARNING
-#   warning "printf has no data sink"
-# endif
-  ret = 0;
+  ret = vsyslog(LOG_INFO, fmt, ap);
 #endif
   va_end(ap);
 
-- 
GitLab


From dfe8596e53cc38236cb1d47562b407464676c8f6 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 11 Jul 2016 14:15:34 -0600
Subject: [PATCH 202/229] Cosmetic

---
 libc/math/lib_libexpi.c  | 39 +++++++++++++++++++--------------------
 libc/math/lib_libexpif.c | 32 ++++++++++++++++----------------
 2 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/libc/math/lib_libexpi.c b/libc/math/lib_libexpi.c
index cab07ca8fa..bcb5622130 100644
--- a/libc/math/lib_libexpi.c
+++ b/libc/math/lib_libexpi.c
@@ -43,13 +43,13 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-#define M_E2    (M_E * M_E)
-#define M_E4    (M_E2 * M_E2)
-#define M_E8    (M_E4 * M_E4)
-#define M_E16   (M_E8 * M_E8)
-#define M_E32   (M_E16 * M_E16)
-#define M_E64   (M_E32 * M_E32)
-#define M_E128  (M_E64 * M_E64)
+#define M_E2    (M_E    * M_E)
+#define M_E4    (M_E2   * M_E2)
+#define M_E8    (M_E4   * M_E4)
+#define M_E16   (M_E8   * M_E8)
+#define M_E32   (M_E16  * M_E16)
+#define M_E64   (M_E32  * M_E32)
+#define M_E128  (M_E64  * M_E64)
 #define M_E256  (M_E128 * M_E128)
 #define M_E512  (M_E256 * M_E256)
 #define M_E1024 (M_E512 * M_E512)
@@ -60,17 +60,17 @@
 
 static const double g_expi_square_tbl[11] =
 {
-  M_E,                          /* e^1 */
-  M_E2,                         /* e^2 */
-  M_E4,                         /* e^4 */
-  M_E8,                         /* e^8 */
-  M_E16,                        /* e^16 */
-  M_E32,                        /* e^32 */
-  M_E64,                        /* e^64 */
-  M_E128,                       /* e^128 */
-  M_E256,                       /* e^256 */
-  M_E512,                       /* e^512 */
-  M_E1024,                      /* e^1024 */
+  M_E,          /* e^1 */
+  M_E2,         /* e^2 */
+  M_E4,         /* e^4 */
+  M_E8,         /* e^8 */
+  M_E16,        /* e^16 */
+  M_E32,        /* e^32 */
+  M_E64,        /* e^64 */
+  M_E128,       /* e^128 */
+  M_E256,       /* e^256 */
+  M_E512,       /* e^512 */
+  M_E1024,      /* e^1024 */
 };
 
 /****************************************************************************
@@ -89,7 +89,7 @@ double lib_expi(size_t n)
 
   val = 1.0;
 
-  for (i = 0; n; i++)
+  for (i = 0; n != 0; i++)
     {
       if ((n & (1 << i)) != 0)
         {
@@ -100,4 +100,3 @@ double lib_expi(size_t n)
 
   return val;
 }
-
diff --git a/libc/math/lib_libexpif.c b/libc/math/lib_libexpif.c
index d1204d2127..88dd9dd61e 100644
--- a/libc/math/lib_libexpif.c
+++ b/libc/math/lib_libexpif.c
@@ -43,13 +43,13 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-#define M_E2    (M_E * M_E)
-#define M_E4    (M_E2 * M_E2)
-#define M_E8    (M_E4 * M_E4)
-#define M_E16   (M_E8 * M_E8)
-#define M_E32   (M_E16 * M_E16)
-#define M_E64   (M_E32 * M_E32)
-#define M_E128  (M_E64 * M_E64)
+#define M_E2     (M_E   * M_E)
+#define M_E4     (M_E2  * M_E2)
+#define M_E8     (M_E4  * M_E4)
+#define M_E16    (M_E8  * M_E8)
+#define M_E32    (M_E16 * M_E16)
+#define M_E64    (M_E32 * M_E32)
+#define M_E128   (M_E64 * M_E64)
 
 /****************************************************************************
  * Private Data
@@ -57,14 +57,14 @@
 
 static const float g_expif_square_tbl[8] =
 {
-  (float)M_E,                   /* e^1 */
-  (float)M_E2,                  /* e^2 */
-  (float)M_E4,                  /* e^4 */
-  (float)M_E8,                  /* e^8 */
-  (float)M_E16,                 /* e^16 */
-  (float)M_E32,                 /* e^32 */
-  (float)M_E64,                 /* e^64 */
-  (float)M_E128,                /* e^128 */
+  (float)M_E,    /* e^1 */
+  (float)M_E2,   /* e^2 */
+  (float)M_E4,   /* e^4 */
+  (float)M_E8,   /* e^8 */
+  (float)M_E16,  /* e^16 */
+  (float)M_E32,  /* e^32 */
+  (float)M_E64,  /* e^64 */
+  (float)M_E128, /* e^128 */
 };
 
 /****************************************************************************
@@ -83,7 +83,7 @@ float lib_expif(size_t n)
 
   val = 1.0F;
 
-  for (i = 0; n; i++)
+  for (i = 0; n != 0; i++)
     {
       if ((n & (1 << i)) != 0)
         {
-- 
GitLab


From 4dd020784a3ce36c618698293f912f299db76d81 Mon Sep 17 00:00:00 2001
From: Sebastien Lorquet 
Date: Mon, 11 Jul 2016 23:57:57 +0200
Subject: [PATCH 203/229] renames in tickless

---
 arch/arm/src/stm32l4/stm32l4_tickless.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/arm/src/stm32l4/stm32l4_tickless.c b/arch/arm/src/stm32l4/stm32l4_tickless.c
index 123e93459d..b14bef51e8 100644
--- a/arch/arm/src/stm32l4/stm32l4_tickless.c
+++ b/arch/arm/src/stm32l4/stm32l4_tickless.c
@@ -118,7 +118,7 @@
  * Private Types
  ****************************************************************************/
 
-struct stm32_tickless_s
+struct stm32l4_tickless_s
 {
   struct stm32l4_oneshot_s oneshot;
   struct stm32l4_freerun_s freerun;
@@ -128,14 +128,14 @@ struct stm32_tickless_s
  * Private Data
  ****************************************************************************/
 
-static struct stm32_tickless_s g_tickless;
+static struct stm32l4_tickless_s g_tickless;
 
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
 
 /****************************************************************************
- * Name: stm32_oneshot_handler
+ * Name: stm32l4_oneshot_handler
  *
  * Description:
  *   Called when the one shot timer expires
@@ -152,7 +152,7 @@ static struct stm32_tickless_s g_tickless;
  *
  ****************************************************************************/
 
-static void stm32_oneshot_handler(void *arg)
+static void stm32l4_oneshot_handler(void *arg)
 {
   tmrinfo("Expired...\n");
   sched_timer_expiration();
@@ -201,7 +201,7 @@ void up_timer_initialize(void)
                                  CONFIG_USEC_PER_TICK);
   if (ret < 0)
     {
-      tmrerr("ERROR: stm32_oneshot_initialize failed\n");
+      tmrerr("ERROR: stm32l4_oneshot_initialize failed\n");
       PANIC();
     }
 
@@ -211,7 +211,7 @@ void up_timer_initialize(void)
   ret = stm32l4_oneshot_max_delay(&g_tickless.oneshot, &max_delay);
   if (ret < 0)
     {
-      tmrerr("ERROR: stm32_oneshot_max_delay failed\n");
+      tmrerr("ERROR: stm32l4_oneshot_max_delay failed\n");
       PANIC();
     }
 
@@ -235,7 +235,7 @@ void up_timer_initialize(void)
                                  CONFIG_USEC_PER_TICK);
   if (ret < 0)
     {
-      tmrerr("ERROR: stm32_freerun_initialize failed\n");
+      tmrerr("ERROR: stm32l4_freerun_initialize failed\n");
       PANIC();
     }
 }
@@ -346,6 +346,6 @@ int up_timer_cancel(FAR struct timespec *ts)
 
 int up_timer_start(FAR const struct timespec *ts)
 {
-  return stm32l4_oneshot_start(&g_tickless.oneshot, stm32_oneshot_handler, NULL, ts);
+  return stm32l4_oneshot_start(&g_tickless.oneshot, stm32l4_oneshot_handler, NULL, ts);
 }
 #endif /* CONFIG_SCHED_TICKLESS */
-- 
GitLab


From 3a873a44ef2af469bdae46e3f1d5dc8e9ec1aad2 Mon Sep 17 00:00:00 2001
From: Sebastien Lorquet 
Date: Mon, 11 Jul 2016 23:59:24 +0200
Subject: [PATCH 204/229] renames in USB OTG

---
 arch/arm/src/stm32l4/stm32l4_otgfsdev.c  | 2008 +++++++++++-----------
 arch/arm/src/stm32l4/stm32l4_otgfshost.c | 1350 +++++++--------
 2 files changed, 1679 insertions(+), 1679 deletions(-)

diff --git a/arch/arm/src/stm32l4/stm32l4_otgfsdev.c b/arch/arm/src/stm32l4/stm32l4_otgfsdev.c
index 23d155e2cf..6d891282c9 100644
--- a/arch/arm/src/stm32l4/stm32l4_otgfsdev.c
+++ b/arch/arm/src/stm32l4/stm32l4_otgfsdev.c
@@ -119,7 +119,7 @@
 
 /* Number of endpoints */
 
-#define STM32_NENDPOINTS             (6)          /* ep0-5 x 2 for IN and OUT */
+#define STM32L4_NENDPOINTS             (6)          /* ep0-5 x 2 for IN and OUT */
 
 /* Adjust actual number of endpoints based upon size; 0 means 'not available',
  * and we expect that the first 0-length endpoint implies that all others
@@ -127,8 +127,8 @@
  */
 
 #if CONFIG_USBDEV_EP1_TXFIFO_SIZE == 0
-#  undef STM32_NENDPOINTS
-#  define STM32_NENDPOINTS 1
+#  undef STM32L4_NENDPOINTS
+#  define STM32L4_NENDPOINTS 1
 #  undef CONFIG_USBDEV_EP2_TXFIFO_SIZE
 #  define CONFIG_USBDEV_EP2_TXFIFO_SIZE 0
 #  undef CONFIG_USBDEV_EP3_TXFIFO_SIZE
@@ -138,8 +138,8 @@
 #  undef CONFIG_USBDEV_EP5_TXFIFO_SIZE
 #  define CONFIG_USBDEV_EP5_TXFIFO_SIZE 0
 #elif CONFIG_USBDEV_EP2_TXFIFO_SIZE == 0
-#  undef STM32_NENDPOINTS
-#  define STM32_NENDPOINTS 2
+#  undef STM32L4_NENDPOINTS
+#  define STM32L4_NENDPOINTS 2
 #  undef CONFIG_USBDEV_EP3_TXFIFO_SIZE
 #  define CONFIG_USBDEV_EP3_TXFIFO_SIZE 0
 #  undef CONFIG_USBDEV_EP4_TXFIFO_SIZE
@@ -147,20 +147,20 @@
 #  undef CONFIG_USBDEV_EP5_TXFIFO_SIZE
 #  define CONFIG_USBDEV_EP5_TXFIFO_SIZE 0
 #elif CONFIG_USBDEV_EP3_TXFIFO_SIZE == 0
-#  undef STM32_NENDPOINTS
-#  define STM32_NENDPOINTS 3
+#  undef STM32L4_NENDPOINTS
+#  define STM32L4_NENDPOINTS 3
 #  undef CONFIG_USBDEV_EP4_TXFIFO_SIZE
 #  define CONFIG_USBDEV_EP4_TXFIFO_SIZE 0
 #  undef CONFIG_USBDEV_EP5_TXFIFO_SIZE
 #  define CONFIG_USBDEV_EP5_TXFIFO_SIZE 0
 #elif CONFIG_USBDEV_EP4_TXFIFO_SIZE == 0
-#  undef STM32_NENDPOINTS
-#  define STM32_NENDPOINTS 4
+#  undef STM32L4_NENDPOINTS
+#  define STM32L4_NENDPOINTS 4
 #  undef CONFIG_USBDEV_EP5_TXFIFO_SIZE
 #  define CONFIG_USBDEV_EP5_TXFIFO_SIZE 0
 #elif CONFIG_USBDEV_EP5_TXFIFO_SIZE == 0
-#  undef STM32_NENDPOINTS
-#  define STM32_NENDPOINTS 5
+#  undef STM32L4_NENDPOINTS
+#  define STM32L4_NENDPOINTS 5
 #endif
 
 /* Sanity check on allocations specified. */
@@ -180,136 +180,136 @@
  * FIFO sizes must be provided in units of 32-bit words.
  */
 
-#define STM32_RXFIFO_BYTES     ((CONFIG_USBDEV_RXFIFO_SIZE + 3) & ~3)
-#define STM32_RXFIFO_WORDS     ((CONFIG_USBDEV_RXFIFO_SIZE + 3) >> 2)
+#define STM32L4_RXFIFO_BYTES     ((CONFIG_USBDEV_RXFIFO_SIZE + 3) & ~3)
+#define STM32L4_RXFIFO_WORDS     ((CONFIG_USBDEV_RXFIFO_SIZE + 3) >> 2)
 
-#define STM32_EP0_TXFIFO_BYTES ((CONFIG_USBDEV_EP0_TXFIFO_SIZE + 3) & ~3)
-#define STM32_EP0_TXFIFO_WORDS ((CONFIG_USBDEV_EP0_TXFIFO_SIZE + 3) >> 2)
+#define STM32L4_EP0_TXFIFO_BYTES ((CONFIG_USBDEV_EP0_TXFIFO_SIZE + 3) & ~3)
+#define STM32L4_EP0_TXFIFO_WORDS ((CONFIG_USBDEV_EP0_TXFIFO_SIZE + 3) >> 2)
 
-#if STM32_EP0_TXFIFO_WORDS < 16 || STM32_EP0_TXFIFO_WORDS > 256
+#if STM32L4_EP0_TXFIFO_WORDS < 16 || STM32L4_EP0_TXFIFO_WORDS > 256
 #  error "CONFIG_USBDEV_EP0_TXFIFO_SIZE is out of range"
 #endif
 
-#define STM32_EP1_TXFIFO_BYTES ((CONFIG_USBDEV_EP1_TXFIFO_SIZE + 3) & ~3)
-#define STM32_EP1_TXFIFO_WORDS ((CONFIG_USBDEV_EP1_TXFIFO_SIZE + 3) >> 2)
+#define STM32L4_EP1_TXFIFO_BYTES ((CONFIG_USBDEV_EP1_TXFIFO_SIZE + 3) & ~3)
+#define STM32L4_EP1_TXFIFO_WORDS ((CONFIG_USBDEV_EP1_TXFIFO_SIZE + 3) >> 2)
 
-#if STM32_EP1_TXFIFO_BYTES != 0 && STM32_EP1_TXFIFO_WORDS < 16
+#if STM32L4_EP1_TXFIFO_BYTES != 0 && STM32L4_EP1_TXFIFO_WORDS < 16
 #  error "CONFIG_USBDEV_EP1_TXFIFO_SIZE is out of range"
 #endif
 
-#define STM32_EP2_TXFIFO_BYTES ((CONFIG_USBDEV_EP2_TXFIFO_SIZE + 3) & ~3)
-#define STM32_EP2_TXFIFO_WORDS ((CONFIG_USBDEV_EP2_TXFIFO_SIZE + 3) >> 2)
+#define STM32L4_EP2_TXFIFO_BYTES ((CONFIG_USBDEV_EP2_TXFIFO_SIZE + 3) & ~3)
+#define STM32L4_EP2_TXFIFO_WORDS ((CONFIG_USBDEV_EP2_TXFIFO_SIZE + 3) >> 2)
 
-#if STM32_EP2_TXFIFO_BYTES != 0 && STM32_EP2_TXFIFO_WORDS < 16
+#if STM32L4_EP2_TXFIFO_BYTES != 0 && STM32L4_EP2_TXFIFO_WORDS < 16
 #  error "CONFIG_USBDEV_EP2_TXFIFO_SIZE is out of range"
 #endif
 
-#define STM32_EP3_TXFIFO_BYTES ((CONFIG_USBDEV_EP3_TXFIFO_SIZE + 3) & ~3)
-#define STM32_EP3_TXFIFO_WORDS ((CONFIG_USBDEV_EP3_TXFIFO_SIZE + 3) >> 2)
+#define STM32L4_EP3_TXFIFO_BYTES ((CONFIG_USBDEV_EP3_TXFIFO_SIZE + 3) & ~3)
+#define STM32L4_EP3_TXFIFO_WORDS ((CONFIG_USBDEV_EP3_TXFIFO_SIZE + 3) >> 2)
 
-#if STM32_EP3_TXFIFO_BYTES != 0 && STM32_EP3_TXFIFO_WORDS < 16
+#if STM32L4_EP3_TXFIFO_BYTES != 0 && STM32L4_EP3_TXFIFO_WORDS < 16
 #  error "CONFIG_USBDEV_EP3_TXFIFO_SIZE is out of range"
 #endif
 
-#define STM32_EP4_TXFIFO_BYTES ((CONFIG_USBDEV_EP4_TXFIFO_SIZE + 3) & ~3)
-#define STM32_EP4_TXFIFO_WORDS ((CONFIG_USBDEV_EP4_TXFIFO_SIZE + 3) >> 2)
+#define STM32L4_EP4_TXFIFO_BYTES ((CONFIG_USBDEV_EP4_TXFIFO_SIZE + 3) & ~3)
+#define STM32L4_EP4_TXFIFO_WORDS ((CONFIG_USBDEV_EP4_TXFIFO_SIZE + 3) >> 2)
 
-#if STM32_EP4_TXFIFO_BYTES != 0 && STM32_EP4_TXFIFO_WORDS < 16
+#if STM32L4_EP4_TXFIFO_BYTES != 0 && STM32L4_EP4_TXFIFO_WORDS < 16
 #  error "CONFIG_USBDEV_EP4_TXFIFO_SIZE is out of range"
 #endif
 
-#define STM32_EP5_TXFIFO_BYTES ((CONFIG_USBDEV_EP5_TXFIFO_SIZE + 3) & ~3)
-#define STM32_EP5_TXFIFO_WORDS ((CONFIG_USBDEV_EP5_TXFIFO_SIZE + 3) >> 2)
+#define STM32L4_EP5_TXFIFO_BYTES ((CONFIG_USBDEV_EP5_TXFIFO_SIZE + 3) & ~3)
+#define STM32L4_EP5_TXFIFO_WORDS ((CONFIG_USBDEV_EP5_TXFIFO_SIZE + 3) >> 2)
 
-#if STM32_EP5_TXFIFO_BYTES != 0 && STM32_EP5_TXFIFO_WORDS < 16
+#if STM32L4_EP5_TXFIFO_BYTES != 0 && STM32L4_EP5_TXFIFO_WORDS < 16
 #  error "CONFIG_USBDEV_EP5_TXFIFO_SIZE is out of range"
 #endif
 
 /* Debug ***********************************************************************/
 /* Trace error codes */
 
-#define STM32_TRACEERR_ALLOCFAIL            0x01
-#define STM32_TRACEERR_BADCLEARFEATURE      0x02
-#define STM32_TRACEERR_BADDEVGETSTATUS      0x03
-#define STM32_TRACEERR_BADEPNO              0x04
-#define STM32_TRACEERR_BADEPGETSTATUS       0x05
-#define STM32_TRACEERR_BADGETCONFIG         0x06
-#define STM32_TRACEERR_BADGETSETDESC        0x07
-#define STM32_TRACEERR_BADGETSTATUS         0x08
-#define STM32_TRACEERR_BADSETADDRESS        0x09
-#define STM32_TRACEERR_BADSETCONFIG         0x0a
-#define STM32_TRACEERR_BADSETFEATURE        0x0b
-#define STM32_TRACEERR_BADTESTMODE          0x0c
-#define STM32_TRACEERR_BINDFAILED           0x0d
-#define STM32_TRACEERR_DISPATCHSTALL        0x0e
-#define STM32_TRACEERR_DRIVER               0x0f
-#define STM32_TRACEERR_DRIVERREGISTERED     0x10
-#define STM32_TRACEERR_EP0NOSETUP           0x11
-#define STM32_TRACEERR_EP0SETUPSTALLED      0x12
-#define STM32_TRACEERR_EPINNULLPACKET       0x13
-#define STM32_TRACEERR_EPINUNEXPECTED       0x14
-#define STM32_TRACEERR_EPOUTNULLPACKET      0x15
-#define STM32_TRACEERR_EPOUTUNEXPECTED      0x16
-#define STM32_TRACEERR_INVALIDCTRLREQ       0x17
-#define STM32_TRACEERR_INVALIDPARMS         0x18
-#define STM32_TRACEERR_IRQREGISTRATION      0x19
-#define STM32_TRACEERR_NOEP                 0x1a
-#define STM32_TRACEERR_NOTCONFIGURED        0x1b
-#define STM32_TRACEERR_EPOUTQEMPTY          0x1c
-#define STM32_TRACEERR_EPINREQEMPTY         0x1d
-#define STM32_TRACEERR_NOOUTSETUP           0x1e
-#define STM32_TRACEERR_POLLTIMEOUT          0x1f
+#define STM32L4_TRACEERR_ALLOCFAIL            0x01
+#define STM32L4_TRACEERR_BADCLEARFEATURE      0x02
+#define STM32L4_TRACEERR_BADDEVGETSTATUS      0x03
+#define STM32L4_TRACEERR_BADEPNO              0x04
+#define STM32L4_TRACEERR_BADEPGETSTATUS       0x05
+#define STM32L4_TRACEERR_BADGETCONFIG         0x06
+#define STM32L4_TRACEERR_BADGETSETDESC        0x07
+#define STM32L4_TRACEERR_BADGETSTATUS         0x08
+#define STM32L4_TRACEERR_BADSETADDRESS        0x09
+#define STM32L4_TRACEERR_BADSETCONFIG         0x0a
+#define STM32L4_TRACEERR_BADSETFEATURE        0x0b
+#define STM32L4_TRACEERR_BADTESTMODE          0x0c
+#define STM32L4_TRACEERR_BINDFAILED           0x0d
+#define STM32L4_TRACEERR_DISPATCHSTALL        0x0e
+#define STM32L4_TRACEERR_DRIVER               0x0f
+#define STM32L4_TRACEERR_DRIVERREGISTERED     0x10
+#define STM32L4_TRACEERR_EP0NOSETUP           0x11
+#define STM32L4_TRACEERR_EP0SETUPSTALLED      0x12
+#define STM32L4_TRACEERR_EPINNULLPACKET       0x13
+#define STM32L4_TRACEERR_EPINUNEXPECTED       0x14
+#define STM32L4_TRACEERR_EPOUTNULLPACKET      0x15
+#define STM32L4_TRACEERR_EPOUTUNEXPECTED      0x16
+#define STM32L4_TRACEERR_INVALIDCTRLREQ       0x17
+#define STM32L4_TRACEERR_INVALIDPARMS         0x18
+#define STM32L4_TRACEERR_IRQREGISTRATION      0x19
+#define STM32L4_TRACEERR_NOEP                 0x1a
+#define STM32L4_TRACEERR_NOTCONFIGURED        0x1b
+#define STM32L4_TRACEERR_EPOUTQEMPTY          0x1c
+#define STM32L4_TRACEERR_EPINREQEMPTY         0x1d
+#define STM32L4_TRACEERR_NOOUTSETUP           0x1e
+#define STM32L4_TRACEERR_POLLTIMEOUT          0x1f
 
 /* Trace interrupt codes */
 
-#define STM32_TRACEINTID_USB                1       /* USB Interrupt entry/exit */
-#define STM32_TRACEINTID_INTPENDING         2       /* On each pass through the loop */
-
-#define STM32_TRACEINTID_EPOUT              (10 + 0) /* First level interrupt decode */
-#define STM32_TRACEINTID_EPIN               (10 + 1)
-#define STM32_TRACEINTID_MISMATCH           (10 + 2)
-#define STM32_TRACEINTID_WAKEUP             (10 + 3)
-#define STM32_TRACEINTID_SUSPEND            (10 + 4)
-#define STM32_TRACEINTID_SOF                (10 + 5)
-#define STM32_TRACEINTID_RXFIFO             (10 + 6)
-#define STM32_TRACEINTID_DEVRESET           (10 + 7)
-#define STM32_TRACEINTID_ENUMDNE            (10 + 8)
-#define STM32_TRACEINTID_IISOIXFR           (10 + 9)
-#define STM32_TRACEINTID_IISOOXFR           (10 + 10)
-#define STM32_TRACEINTID_SRQ                (10 + 11)
-#define STM32_TRACEINTID_OTG                (10 + 12)
-
-#define STM32_TRACEINTID_EPOUT_XFRC         (40 + 0) /* EPOUT second level decode */
-#define STM32_TRACEINTID_EPOUT_EPDISD       (40 + 1)
-#define STM32_TRACEINTID_EPOUT_SETUP        (40 + 2)
-#define STM32_TRACEINTID_DISPATCH           (40 + 3)
-
-#define STM32_TRACEINTID_GETSTATUS          (50 + 0) /* EPOUT third level decode */
-#define STM32_TRACEINTID_EPGETSTATUS        (50 + 1)
-#define STM32_TRACEINTID_DEVGETSTATUS       (50 + 2)
-#define STM32_TRACEINTID_IFGETSTATUS        (50 + 3)
-#define STM32_TRACEINTID_CLEARFEATURE       (50 + 4)
-#define STM32_TRACEINTID_SETFEATURE         (50 + 5)
-#define STM32_TRACEINTID_SETADDRESS         (50 + 6)
-#define STM32_TRACEINTID_GETSETDESC         (50 + 7)
-#define STM32_TRACEINTID_GETCONFIG          (50 + 8)
-#define STM32_TRACEINTID_SETCONFIG          (50 + 9)
-#define STM32_TRACEINTID_GETSETIF           (50 + 10)
-#define STM32_TRACEINTID_SYNCHFRAME         (50 + 11)
-
-#define STM32_TRACEINTID_EPIN_XFRC          (70 + 0) /* EPIN second level decode */
-#define STM32_TRACEINTID_EPIN_TOC           (70 + 1)
-#define STM32_TRACEINTID_EPIN_ITTXFE        (70 + 2)
-#define STM32_TRACEINTID_EPIN_EPDISD        (70 + 3)
-#define STM32_TRACEINTID_EPIN_TXFE          (70 + 4)
-
-#define STM32_TRACEINTID_EPIN_EMPWAIT       (80 + 0) /* EPIN second level decode */
-
-#define STM32_TRACEINTID_OUTNAK             (90 + 0) /* RXFLVL second level decode */
-#define STM32_TRACEINTID_OUTRECVD           (90 + 1)
-#define STM32_TRACEINTID_OUTDONE            (90 + 2)
-#define STM32_TRACEINTID_SETUPDONE          (90 + 3)
-#define STM32_TRACEINTID_SETUPRECVD         (90 + 4)
+#define STM32L4_TRACEINTID_USB                1       /* USB Interrupt entry/exit */
+#define STM32L4_TRACEINTID_INTPENDING         2       /* On each pass through the loop */
+
+#define STM32L4_TRACEINTID_EPOUT              (10 + 0) /* First level interrupt decode */
+#define STM32L4_TRACEINTID_EPIN               (10 + 1)
+#define STM32L4_TRACEINTID_MISMATCH           (10 + 2)
+#define STM32L4_TRACEINTID_WAKEUP             (10 + 3)
+#define STM32L4_TRACEINTID_SUSPEND            (10 + 4)
+#define STM32L4_TRACEINTID_SOF                (10 + 5)
+#define STM32L4_TRACEINTID_RXFIFO             (10 + 6)
+#define STM32L4_TRACEINTID_DEVRESET           (10 + 7)
+#define STM32L4_TRACEINTID_ENUMDNE            (10 + 8)
+#define STM32L4_TRACEINTID_IISOIXFR           (10 + 9)
+#define STM32L4_TRACEINTID_IISOOXFR           (10 + 10)
+#define STM32L4_TRACEINTID_SRQ                (10 + 11)
+#define STM32L4_TRACEINTID_OTG                (10 + 12)
+
+#define STM32L4_TRACEINTID_EPOUT_XFRC         (40 + 0) /* EPOUT second level decode */
+#define STM32L4_TRACEINTID_EPOUT_EPDISD       (40 + 1)
+#define STM32L4_TRACEINTID_EPOUT_SETUP        (40 + 2)
+#define STM32L4_TRACEINTID_DISPATCH           (40 + 3)
+
+#define STM32L4_TRACEINTID_GETSTATUS          (50 + 0) /* EPOUT third level decode */
+#define STM32L4_TRACEINTID_EPGETSTATUS        (50 + 1)
+#define STM32L4_TRACEINTID_DEVGETSTATUS       (50 + 2)
+#define STM32L4_TRACEINTID_IFGETSTATUS        (50 + 3)
+#define STM32L4_TRACEINTID_CLEARFEATURE       (50 + 4)
+#define STM32L4_TRACEINTID_SETFEATURE         (50 + 5)
+#define STM32L4_TRACEINTID_SETADDRESS         (50 + 6)
+#define STM32L4_TRACEINTID_GETSETDESC         (50 + 7)
+#define STM32L4_TRACEINTID_GETCONFIG          (50 + 8)
+#define STM32L4_TRACEINTID_SETCONFIG          (50 + 9)
+#define STM32L4_TRACEINTID_GETSETIF           (50 + 10)
+#define STM32L4_TRACEINTID_SYNCHFRAME         (50 + 11)
+
+#define STM32L4_TRACEINTID_EPIN_XFRC          (70 + 0) /* EPIN second level decode */
+#define STM32L4_TRACEINTID_EPIN_TOC           (70 + 1)
+#define STM32L4_TRACEINTID_EPIN_ITTXFE        (70 + 2)
+#define STM32L4_TRACEINTID_EPIN_EPDISD        (70 + 3)
+#define STM32L4_TRACEINTID_EPIN_TXFE          (70 + 4)
+
+#define STM32L4_TRACEINTID_EPIN_EMPWAIT       (80 + 0) /* EPIN second level decode */
+
+#define STM32L4_TRACEINTID_OUTNAK             (90 + 0) /* RXFLVL second level decode */
+#define STM32L4_TRACEINTID_OUTRECVD           (90 + 1)
+#define STM32L4_TRACEINTID_OUTDONE            (90 + 2)
+#define STM32L4_TRACEINTID_SETUPDONE          (90 + 3)
+#define STM32L4_TRACEINTID_SETUPRECVD         (90 + 4)
 
 /* CONFIG_USB_DUMPBUFFER will dump the contents of buffers to the console. */
 
@@ -328,8 +328,8 @@
 
 /* Odd physical endpoint numbers are IN; even are OUT */
 
-#define STM32_EPPHYIN2LOG(epphy)     ((uint8_t)(epphy)|USB_DIR_IN)
-#define STM32_EPPHYOUT2LOG(epphy)    ((uint8_t)(epphy)|USB_DIR_OUT)
+#define STM32L4_EPPHYIN2LOG(epphy)     ((uint8_t)(epphy)|USB_DIR_IN)
+#define STM32L4_EPPHYOUT2LOG(epphy)    ((uint8_t)(epphy)|USB_DIR_OUT)
 
 /* Endpoint 0 */
 
@@ -339,21 +339,21 @@
  * This is a bitmap, and the first endpoint (0) is reserved.
  */
 
-#define STM32_EP_AVAILABLE           (((1 << STM32_NENDPOINTS) - 1) & ~1)
+#define STM32L4_EP_AVAILABLE           (((1 << STM32L4_NENDPOINTS) - 1) & ~1)
 
 /* Maximum packet sizes for full speed endpoints */
 
-#define STM32_MAXPACKET              (64)         /* Max packet size (1-64) */
+#define STM32L4_MAXPACKET              (64)         /* Max packet size (1-64) */
 
 /* Delays **********************************************************************/
 
-#define STM32_READY_DELAY            200000
-#define STM32_FLUSH_DELAY            200000
+#define STM32L4_READY_DELAY            200000
+#define STM32L4_FLUSH_DELAY            200000
 
 /* Request queue operations ****************************************************/
 
-#define stm32_rqempty(ep)            ((ep)->head == NULL)
-#define stm32_rqpeek(ep)             ((ep)->head)
+#define stm32l4_rqempty(ep)            ((ep)->head == NULL)
+#define stm32l4_rqpeek(ep)             ((ep)->head)
 
 /* Standard stuff **************************************************************/
 
@@ -371,7 +371,7 @@
 
 /* Overall device state */
 
-enum stm32_devstate_e
+enum stm32l4_devstate_e
 {
   DEVSTATE_DEFAULT = 0,    /* Power-up, unconfigured state.  This state simply
                             * means that the device is not yet been given an
@@ -398,11 +398,11 @@ enum stm32_devstate_e
 
 /* Endpoint 0 states */
 
-enum stm32_ep0state_e
+enum stm32l4_ep0state_e
 {
   EP0STATE_IDLE = 0,       /* Idle State, leave on receiving a SETUP packet or
                             * epsubmit:
-                            *   SET:    In stm32_epin() and stm32_epout() when
+                            *   SET:    In stm32l4_epin() and stm32l4_epout() when
                             *           we revert from request processing to
                             *           SETUP processing.
                             *   TESTED: Never
@@ -410,51 +410,51 @@ enum stm32_ep0state_e
   EP0STATE_SETUP_OUT,      /* OUT SETUP packet received.  Waiting for the DATA
                             * OUT phase of SETUP Packet to complete before
                             * processing a SETUP command (without a USB request):
-                            *   SET:    Set in stm32_rxinterrupt() when SETUP OUT
+                            *   SET:    Set in stm32l4_rxinterrupt() when SETUP OUT
                             *           packet is received.
-                            *   TESTED: In stm32_ep0out_receive()
+                            *   TESTED: In stm32l4_ep0out_receive()
                             */
   EP0STATE_SETUP_READY,    /* IN SETUP packet received -OR- OUT SETUP packet and
                             * accompanying data have been received.  Processing
                             * of SETUP command will happen soon.
-                            *   SET:    (1) stm32_ep0out_receive() when the OUT
+                            *   SET:    (1) stm32l4_ep0out_receive() when the OUT
                             *           SETUP data phase completes, or (2)
-                            *           stm32_rxinterrupt() when an IN SETUP is
+                            *           stm32l4_rxinterrupt() when an IN SETUP is
                             *           packet received.
-                            *   TESTED: Tested in stm32_epout_interrupt() when
+                            *   TESTED: Tested in stm32l4_epout_interrupt() when
                             *           SETUP phase is done to see if the SETUP
                             *           command is ready to be processed.  Also
-                            *           tested in stm32_ep0out_setup() just to
+                            *           tested in stm32l4_ep0out_setup() just to
                             *           double-check that we have a SETUP request
                             *           and any accompanying data.
                             */
-  EP0STATE_SETUP_PROCESS,  /* SETUP Packet is being processed by stm32_ep0out_setup():
+  EP0STATE_SETUP_PROCESS,  /* SETUP Packet is being processed by stm32l4_ep0out_setup():
                             *   SET:    When SETUP packet received in EP0 OUT
                             *   TESTED: Never
                             */
   EP0STATE_SETUPRESPONSE,  /* Short SETUP response write (without a USB request):
                             *   SET:    When SETUP response is sent by
-                            *           stm32_ep0in_setupresponse()
+                            *           stm32l4_ep0in_setupresponse()
                             *   TESTED: Never
                             */
   EP0STATE_DATA_IN,        /* Waiting for data out stage (with a USB request):
-                            *   SET:    In stm32_epin_request() when a write
+                            *   SET:    In stm32l4_epin_request() when a write
                             *           request is processed on EP0.
-                            *   TESTED: In stm32_epin() to see if we should
+                            *   TESTED: In stm32l4_epin() to see if we should
                             *           revert to SETUP processing.
                             */
   EP0STATE_DATA_OUT        /* Waiting for data in phase to complete ( with a
                             * USB request)
-                            *   SET:    In stm32_epout_request() when a read
+                            *   SET:    In stm32l4_epout_request() when a read
                             *           request is processed on EP0.
-                            *   TESTED: In stm32_epout() to see if we should
+                            *   TESTED: In stm32l4_epout() to see if we should
                             *           revert to SETUP processing
                             */
 };
 
 /* Parsed control request */
 
-struct stm32_ctrlreq_s
+struct stm32l4_ctrlreq_s
 {
   uint8_t  type;
   uint8_t  req;
@@ -465,28 +465,28 @@ struct stm32_ctrlreq_s
 
 /* A container for a request so that the request may be retained in a list */
 
-struct stm32_req_s
+struct stm32l4_req_s
 {
   struct usbdev_req_s  req;           /* Standard USB request */
-  struct stm32_req_s  *flink;         /* Supports a singly linked list */
+  struct stm32l4_req_s  *flink;         /* Supports a singly linked list */
 };
 
 /* This is the internal representation of an endpoint */
 
-struct stm32_ep_s
+struct stm32l4_ep_s
 {
   /* Common endpoint fields.  This must be the first thing defined in the
    * structure so that it is possible to simply cast from struct usbdev_ep_s
-   * to struct stm32_ep_s.
+   * to struct stm32l4_ep_s.
    */
 
   struct usbdev_ep_s      ep;          /* Standard endpoint structure */
 
   /* STM32-specific fields */
 
-  struct stm32_usbdev_s *dev;          /* Reference to private driver data */
-  struct stm32_req_s    *head;         /* Request list for this endpoint */
-  struct stm32_req_s    *tail;
+  struct stm32l4_usbdev_s *dev;          /* Reference to private driver data */
+  struct stm32l4_req_s    *head;         /* Request list for this endpoint */
+  struct stm32l4_req_s    *tail;
   uint8_t                epphy;        /* Physical EP address */
   uint8_t                eptype:2;     /* Endpoint type */
   uint8_t                active:1;     /* 1: A request is being processed */
@@ -498,11 +498,11 @@ struct stm32_ep_s
 
 /* This structure retains the state of the USB device controller */
 
-struct stm32_usbdev_s
+struct stm32l4_usbdev_s
 {
   /* Common device fields.  This must be the first thing defined in the
    * structure so that it is possible to simply cast from struct usbdev_s
-   * to struct stm32_usbdev_s.
+   * to struct stm32l4_usbdev_s.
    */
 
   struct usbdev_s         usbdev;
@@ -520,8 +520,8 @@ struct stm32_usbdev_s
   uint8_t                 wakeup:1;      /* 1: Device remote wake-up */
   uint8_t                 dotest:1;      /* 1: Test mode selected */
 
-  uint8_t                 devstate:4;    /* See enum stm32_devstate_e */
-  uint8_t                 ep0state:4;    /* See enum stm32_ep0state_e */
+  uint8_t                 devstate:4;    /* See enum stm32l4_devstate_e */
+  uint8_t                 ep0state:4;    /* See enum stm32l4_ep0state_e */
   uint8_t                 testmode:4;    /* Selected test mode */
   uint8_t                 epavail[2];    /* Bitset of available OUT/IN endpoints */
 
@@ -551,8 +551,8 @@ struct stm32_usbdev_s
 
   /* The endpoint lists */
 
-  struct stm32_ep_s       epin[STM32_NENDPOINTS];
-  struct stm32_ep_s       epout[STM32_NENDPOINTS];
+  struct stm32l4_ep_s       epin[STM32L4_NENDPOINTS];
+  struct stm32l4_ep_s       epout[STM32L4_NENDPOINTS];
 };
 
 /****************************************************************************
@@ -561,180 +561,180 @@ struct stm32_usbdev_s
 
 /* Register operations ********************************************************/
 
-#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_USB)
-static uint32_t    stm32_getreg(uint32_t addr);
-static void        stm32_putreg(uint32_t val, uint32_t addr);
+#if defined(CONFIG_STM32L4_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_USB)
+static uint32_t    stm32l4_getreg(uint32_t addr);
+static void        stm32l4_putreg(uint32_t val, uint32_t addr);
 #else
-# define stm32_getreg(addr)     getreg32(addr)
-# define stm32_putreg(val,addr) putreg32(val,addr)
+# define stm32l4_getreg(addr)     getreg32(addr)
+# define stm32l4_putreg(val,addr) putreg32(val,addr)
 #endif
 
 /* Request queue operations ****************************************************/
 
-static FAR struct stm32_req_s *stm32_req_remfirst(FAR struct stm32_ep_s *privep);
-static bool       stm32_req_addlast(FAR struct stm32_ep_s *privep,
-                    FAR struct stm32_req_s *req);
+static FAR struct stm32l4_req_s *stm32l4_req_remfirst(FAR struct stm32l4_ep_s *privep);
+static bool       stm32l4_req_addlast(FAR struct stm32l4_ep_s *privep,
+                    FAR struct stm32l4_req_s *req);
 
 /* Low level data transfers and request operations *****************************/
 /* Special endpoint 0 data transfer logic */
 
-static void        stm32_ep0in_setupresponse(FAR struct stm32_usbdev_s *priv,
+static void        stm32l4_ep0in_setupresponse(FAR struct stm32l4_usbdev_s *priv,
                      FAR uint8_t *data, uint32_t nbytes);
-static inline void stm32_ep0in_transmitzlp(FAR struct stm32_usbdev_s *priv);
-static void        stm32_ep0in_activate(void);
+static inline void stm32l4_ep0in_transmitzlp(FAR struct stm32l4_usbdev_s *priv);
+static void        stm32l4_ep0in_activate(void);
 
-static void        stm32_ep0out_ctrlsetup(FAR struct stm32_usbdev_s *priv);
+static void        stm32l4_ep0out_ctrlsetup(FAR struct stm32l4_usbdev_s *priv);
 
 /* IN request and TxFIFO handling */
 
-static void        stm32_txfifo_write(FAR struct stm32_ep_s *privep,
+static void        stm32l4_txfifo_write(FAR struct stm32l4_ep_s *privep,
                      FAR uint8_t *buf, int nbytes);
-static void        stm32_epin_transfer(FAR struct stm32_ep_s *privep,
+static void        stm32l4_epin_transfer(FAR struct stm32l4_ep_s *privep,
                      FAR uint8_t *buf, int nbytes);
-static void        stm32_epin_request(FAR struct stm32_usbdev_s *priv,
-                     FAR struct stm32_ep_s *privep);
+static void        stm32l4_epin_request(FAR struct stm32l4_usbdev_s *priv,
+                     FAR struct stm32l4_ep_s *privep);
 
 /* OUT request and RxFIFO handling */
 
-static void        stm32_rxfifo_read(FAR struct stm32_ep_s *privep,
+static void        stm32l4_rxfifo_read(FAR struct stm32l4_ep_s *privep,
                      FAR uint8_t *dest, uint16_t len);
-static void        stm32_rxfifo_discard(FAR struct stm32_ep_s *privep, int len);
-static void        stm32_epout_complete(FAR struct stm32_usbdev_s *priv,
-                     FAR struct stm32_ep_s *privep);
-static inline void stm32_ep0out_receive(FAR struct stm32_ep_s *privep, int bcnt);
-static inline void stm32_epout_receive(FAR struct stm32_ep_s *privep, int bcnt);
-static void        stm32_epout_request(FAR struct stm32_usbdev_s *priv,
-                     FAR struct stm32_ep_s *privep);
+static void        stm32l4_rxfifo_discard(FAR struct stm32l4_ep_s *privep, int len);
+static void        stm32l4_epout_complete(FAR struct stm32l4_usbdev_s *priv,
+                     FAR struct stm32l4_ep_s *privep);
+static inline void stm32l4_ep0out_receive(FAR struct stm32l4_ep_s *privep, int bcnt);
+static inline void stm32l4_epout_receive(FAR struct stm32l4_ep_s *privep, int bcnt);
+static void        stm32l4_epout_request(FAR struct stm32l4_usbdev_s *priv,
+                     FAR struct stm32l4_ep_s *privep);
 
 /* General request handling */
 
-static void        stm32_ep_flush(FAR struct stm32_ep_s *privep);
-static void        stm32_req_complete(FAR struct stm32_ep_s *privep,
+static void        stm32l4_ep_flush(FAR struct stm32l4_ep_s *privep);
+static void        stm32l4_req_complete(FAR struct stm32l4_ep_s *privep,
                      int16_t result);
-static void        stm32_req_cancel(FAR struct stm32_ep_s *privep,
+static void        stm32l4_req_cancel(FAR struct stm32l4_ep_s *privep,
                      int16_t status);
 
 /* Interrupt handling **********************************************************/
 
-static struct      stm32_ep_s *stm32_ep_findbyaddr(struct stm32_usbdev_s *priv,
+static struct      stm32l4_ep_s *stm32l4_ep_findbyaddr(struct stm32l4_usbdev_s *priv,
                      uint16_t eplog);
-static int         stm32_req_dispatch(FAR struct stm32_usbdev_s *priv,
+static int         stm32l4_req_dispatch(FAR struct stm32l4_usbdev_s *priv,
                      FAR const struct usb_ctrlreq_s *ctrl);
-static void        stm32_usbreset(FAR struct stm32_usbdev_s *priv);
+static void        stm32l4_usbreset(FAR struct stm32l4_usbdev_s *priv);
 
 /* Second level OUT endpoint interrupt processing */
 
-static inline void stm32_ep0out_testmode(FAR struct stm32_usbdev_s *priv,
+static inline void stm32l4_ep0out_testmode(FAR struct stm32l4_usbdev_s *priv,
                      uint16_t index);
-static inline void stm32_ep0out_stdrequest(struct stm32_usbdev_s *priv,
-                     FAR struct stm32_ctrlreq_s *ctrlreq);
-static inline void stm32_ep0out_setup(struct stm32_usbdev_s *priv);
-static inline void stm32_epout(FAR struct stm32_usbdev_s *priv,
+static inline void stm32l4_ep0out_stdrequest(struct stm32l4_usbdev_s *priv,
+                     FAR struct stm32l4_ctrlreq_s *ctrlreq);
+static inline void stm32l4_ep0out_setup(struct stm32l4_usbdev_s *priv);
+static inline void stm32l4_epout(FAR struct stm32l4_usbdev_s *priv,
                      uint8_t epno);
-static inline void stm32_epout_interrupt(FAR struct stm32_usbdev_s *priv);
+static inline void stm32l4_epout_interrupt(FAR struct stm32l4_usbdev_s *priv);
 
 /* Second level IN endpoint interrupt processing */
 
-static inline void stm32_epin_runtestmode(FAR struct stm32_usbdev_s *priv);
-static inline void stm32_epin(FAR struct stm32_usbdev_s *priv, uint8_t epno);
-static inline void stm32_epin_txfifoempty(FAR struct stm32_usbdev_s *priv, int epno);
-static inline void stm32_epin_interrupt(FAR struct stm32_usbdev_s *priv);
+static inline void stm32l4_epin_runtestmode(FAR struct stm32l4_usbdev_s *priv);
+static inline void stm32l4_epin(FAR struct stm32l4_usbdev_s *priv, uint8_t epno);
+static inline void stm32l4_epin_txfifoempty(FAR struct stm32l4_usbdev_s *priv, int epno);
+static inline void stm32l4_epin_interrupt(FAR struct stm32l4_usbdev_s *priv);
 
 /* Other second level interrupt processing */
 
-static inline void stm32_resumeinterrupt(FAR struct stm32_usbdev_s *priv);
-static inline void stm32_suspendinterrupt(FAR struct stm32_usbdev_s *priv);
-static inline void stm32_rxinterrupt(FAR struct stm32_usbdev_s *priv);
-static inline void stm32_enuminterrupt(FAR struct stm32_usbdev_s *priv);
+static inline void stm32l4_resumeinterrupt(FAR struct stm32l4_usbdev_s *priv);
+static inline void stm32l4_suspendinterrupt(FAR struct stm32l4_usbdev_s *priv);
+static inline void stm32l4_rxinterrupt(FAR struct stm32l4_usbdev_s *priv);
+static inline void stm32l4_enuminterrupt(FAR struct stm32l4_usbdev_s *priv);
 #ifdef CONFIG_USBDEV_ISOCHRONOUS
-static inline void stm32_isocininterrupt(FAR struct stm32_usbdev_s *priv);
-static inline void stm32_isocoutinterrupt(FAR struct stm32_usbdev_s *priv);
+static inline void stm32l4_isocininterrupt(FAR struct stm32l4_usbdev_s *priv);
+static inline void stm32l4_isocoutinterrupt(FAR struct stm32l4_usbdev_s *priv);
 #endif
 #ifdef CONFIG_USBDEV_VBUSSENSING
-static inline void stm32_sessioninterrupt(FAR struct stm32_usbdev_s *priv);
-static inline void stm32_otginterrupt(FAR struct stm32_usbdev_s *priv);
+static inline void stm32l4_sessioninterrupt(FAR struct stm32l4_usbdev_s *priv);
+static inline void stm32l4_otginterrupt(FAR struct stm32l4_usbdev_s *priv);
 #endif
 
 /* First level interrupt processing */
 
-static int         stm32_usbinterrupt(int irq, FAR void *context);
+static int         stm32l4_usbinterrupt(int irq, FAR void *context);
 
 /* Endpoint operations *********************************************************/
 /* Global OUT NAK controls */
 
-static void        stm32_enablegonak(FAR struct stm32_ep_s *privep);
-static void        stm32_disablegonak(FAR struct stm32_ep_s *privep);
+static void        stm32l4_enablegonak(FAR struct stm32l4_ep_s *privep);
+static void        stm32l4_disablegonak(FAR struct stm32l4_ep_s *privep);
 
 /* Endpoint configuration */
 
-static int         stm32_epout_configure(FAR struct stm32_ep_s *privep,
+static int         stm32l4_epout_configure(FAR struct stm32l4_ep_s *privep,
                      uint8_t eptype, uint16_t maxpacket);
-static int         stm32_epin_configure(FAR struct stm32_ep_s *privep,
+static int         stm32l4_epin_configure(FAR struct stm32l4_ep_s *privep,
                      uint8_t eptype, uint16_t maxpacket);
-static int         stm32_ep_configure(FAR struct usbdev_ep_s *ep,
+static int         stm32l4_ep_configure(FAR struct usbdev_ep_s *ep,
                      FAR const struct usb_epdesc_s *desc, bool last);
-static void        stm32_ep0_configure(FAR struct stm32_usbdev_s *priv);
+static void        stm32l4_ep0_configure(FAR struct stm32l4_usbdev_s *priv);
 
 /* Endpoint disable */
 
-static void        stm32_epout_disable(FAR struct stm32_ep_s *privep);
-static void        stm32_epin_disable(FAR struct stm32_ep_s *privep);
-static int         stm32_ep_disable(FAR struct usbdev_ep_s *ep);
+static void        stm32l4_epout_disable(FAR struct stm32l4_ep_s *privep);
+static void        stm32l4_epin_disable(FAR struct stm32l4_ep_s *privep);
+static int         stm32l4_ep_disable(FAR struct usbdev_ep_s *ep);
 
 /* Endpoint request management */
 
-static FAR struct usbdev_req_s *stm32_ep_allocreq(FAR struct usbdev_ep_s *ep);
-static void        stm32_ep_freereq(FAR struct usbdev_ep_s *ep,
+static FAR struct usbdev_req_s *stm32l4_ep_allocreq(FAR struct usbdev_ep_s *ep);
+static void        stm32l4_ep_freereq(FAR struct usbdev_ep_s *ep,
                      FAR struct usbdev_req_s *);
 
 /* Endpoint buffer management */
 
 #ifdef CONFIG_USBDEV_DMA
-static void       *stm32_ep_allocbuffer(FAR struct usbdev_ep_s *ep, unsigned bytes);
-static void        stm32_ep_freebuffer(FAR struct usbdev_ep_s *ep, FAR void *buf);
+static void       *stm32l4_ep_allocbuffer(FAR struct usbdev_ep_s *ep, unsigned bytes);
+static void        stm32l4_ep_freebuffer(FAR struct usbdev_ep_s *ep, FAR void *buf);
 #endif
 
 /* Endpoint request submission */
 
-static int         stm32_ep_submit(FAR struct usbdev_ep_s *ep,
+static int         stm32l4_ep_submit(FAR struct usbdev_ep_s *ep,
                      struct usbdev_req_s *req);
 
 /* Endpoint request cancellation */
 
-static int         stm32_ep_cancel(FAR struct usbdev_ep_s *ep,
+static int         stm32l4_ep_cancel(FAR struct usbdev_ep_s *ep,
                      struct usbdev_req_s *req);
 
 /* Stall handling */
 
-static int         stm32_epout_setstall(FAR struct stm32_ep_s *privep);
-static int         stm32_epin_setstall(FAR struct stm32_ep_s *privep);
-static int         stm32_ep_setstall(FAR struct stm32_ep_s *privep);
-static int         stm32_ep_clrstall(FAR struct stm32_ep_s *privep);
-static int         stm32_ep_stall(FAR struct usbdev_ep_s *ep, bool resume);
-static void        stm32_ep0_stall(FAR struct stm32_usbdev_s *priv);
+static int         stm32l4_epout_setstall(FAR struct stm32l4_ep_s *privep);
+static int         stm32l4_epin_setstall(FAR struct stm32l4_ep_s *privep);
+static int         stm32l4_ep_setstall(FAR struct stm32l4_ep_s *privep);
+static int         stm32l4_ep_clrstall(FAR struct stm32l4_ep_s *privep);
+static int         stm32l4_ep_stall(FAR struct usbdev_ep_s *ep, bool resume);
+static void        stm32l4_ep0_stall(FAR struct stm32l4_usbdev_s *priv);
 
 /* Endpoint allocation */
 
-static FAR struct usbdev_ep_s *stm32_ep_alloc(FAR struct usbdev_s *dev,
+static FAR struct usbdev_ep_s *stm32l4_ep_alloc(FAR struct usbdev_s *dev,
                      uint8_t epno, bool in, uint8_t eptype);
-static void        stm32_ep_free(FAR struct usbdev_s *dev,
+static void        stm32l4_ep_free(FAR struct usbdev_s *dev,
                      FAR struct usbdev_ep_s *ep);
 
 /* USB device controller operations ********************************************/
 
-static int         stm32_getframe(struct usbdev_s *dev);
-static int         stm32_wakeup(struct usbdev_s *dev);
-static int         stm32_selfpowered(struct usbdev_s *dev, bool selfpowered);
-static int         stm32_pullup(struct usbdev_s *dev, bool enable);
-static void        stm32_setaddress(struct stm32_usbdev_s *priv,
+static int         stm32l4_getframe(struct usbdev_s *dev);
+static int         stm32l4_wakeup(struct usbdev_s *dev);
+static int         stm32l4_selfpowered(struct usbdev_s *dev, bool selfpowered);
+static int         stm32l4_pullup(struct usbdev_s *dev, bool enable);
+static void        stm32l4_setaddress(struct stm32l4_usbdev_s *priv,
                      uint16_t address);
-static int         stm32_txfifo_flush(uint32_t txfnum);
-static int         stm32_rxfifo_flush(void);
+static int         stm32l4_txfifo_flush(uint32_t txfnum);
+static int         stm32l4_rxfifo_flush(void);
 
 /* Initialization **************************************************************/
 
-static void        stm32_swinitialize(FAR struct stm32_usbdev_s *priv);
-static void        stm32_hwinitialize(FAR struct stm32_usbdev_s *priv);
+static void        stm32l4_swinitialize(FAR struct stm32l4_usbdev_s *priv);
+static void        stm32l4_hwinitialize(FAR struct stm32l4_usbdev_s *priv);
 
 /****************************************************************************
  * Private Data
@@ -743,31 +743,31 @@ static void        stm32_hwinitialize(FAR struct stm32_usbdev_s *priv);
  * be simply retained in a single global instance.
  */
 
-static struct stm32_usbdev_s g_otgfsdev;
+static struct stm32l4_usbdev_s g_otgfsdev;
 
 static const struct usbdev_epops_s g_epops =
 {
-  .configure   = stm32_ep_configure,
-  .disable     = stm32_ep_disable,
-  .allocreq    = stm32_ep_allocreq,
-  .freereq     = stm32_ep_freereq,
+  .configure   = stm32l4_ep_configure,
+  .disable     = stm32l4_ep_disable,
+  .allocreq    = stm32l4_ep_allocreq,
+  .freereq     = stm32l4_ep_freereq,
 #ifdef CONFIG_USBDEV_DMA
-  .allocbuffer = stm32_ep_allocbuffer,
-  .freebuffer  = stm32_ep_freebuffer,
+  .allocbuffer = stm32l4_ep_allocbuffer,
+  .freebuffer  = stm32l4_ep_freebuffer,
 #endif
-  .submit      = stm32_ep_submit,
-  .cancel      = stm32_ep_cancel,
-  .stall       = stm32_ep_stall,
+  .submit      = stm32l4_ep_submit,
+  .cancel      = stm32l4_ep_cancel,
+  .stall       = stm32l4_ep_stall,
 };
 
 static const struct usbdev_ops_s g_devops =
 {
-  .allocep     = stm32_ep_alloc,
-  .freeep      = stm32_ep_free,
-  .getframe    = stm32_getframe,
-  .wakeup      = stm32_wakeup,
-  .selfpowered = stm32_selfpowered,
-  .pullup      = stm32_pullup,
+  .allocep     = stm32l4_ep_alloc,
+  .freeep      = stm32l4_ep_free,
+  .getframe    = stm32l4_getframe,
+  .wakeup      = stm32l4_wakeup,
+  .selfpowered = stm32l4_selfpowered,
+  .pullup      = stm32l4_pullup,
 };
 
 /* Device error strings that may be enabled for more descriptive USB trace
@@ -777,37 +777,37 @@ static const struct usbdev_ops_s g_devops =
 #ifdef CONFIG_USBDEV_TRACE_STRINGS
 const struct trace_msg_t g_usb_trace_strings_deverror[] =
 {
-  TRACE_STR(STM32_TRACEERR_ALLOCFAIL       ),
-  TRACE_STR(STM32_TRACEERR_BADCLEARFEATURE ),
-  TRACE_STR(STM32_TRACEERR_BADDEVGETSTATUS ),
-  TRACE_STR(STM32_TRACEERR_BADEPNO         ),
-  TRACE_STR(STM32_TRACEERR_BADEPGETSTATUS  ),
-  TRACE_STR(STM32_TRACEERR_BADGETCONFIG    ),
-  TRACE_STR(STM32_TRACEERR_BADGETSETDESC   ),
-  TRACE_STR(STM32_TRACEERR_BADGETSTATUS    ),
-  TRACE_STR(STM32_TRACEERR_BADSETADDRESS   ),
-  TRACE_STR(STM32_TRACEERR_BADSETCONFIG    ),
-  TRACE_STR(STM32_TRACEERR_BADSETFEATURE   ),
-  TRACE_STR(STM32_TRACEERR_BADTESTMODE     ),
-  TRACE_STR(STM32_TRACEERR_BINDFAILED      ),
-  TRACE_STR(STM32_TRACEERR_DISPATCHSTALL   ),
-  TRACE_STR(STM32_TRACEERR_DRIVER          ),
-  TRACE_STR(STM32_TRACEERR_DRIVERREGISTERED),
-  TRACE_STR(STM32_TRACEERR_EP0NOSETUP      ),
-  TRACE_STR(STM32_TRACEERR_EP0SETUPSTALLED ),
-  TRACE_STR(STM32_TRACEERR_EPINNULLPACKET  ),
-  TRACE_STR(STM32_TRACEERR_EPINUNEXPECTED  ),
-  TRACE_STR(STM32_TRACEERR_EPOUTNULLPACKET ),
-  TRACE_STR(STM32_TRACEERR_EPOUTUNEXPECTED ),
-  TRACE_STR(STM32_TRACEERR_INVALIDCTRLREQ  ),
-  TRACE_STR(STM32_TRACEERR_INVALIDPARMS    ),
-  TRACE_STR(STM32_TRACEERR_IRQREGISTRATION ),
-  TRACE_STR(STM32_TRACEERR_NOEP            ),
-  TRACE_STR(STM32_TRACEERR_NOTCONFIGURED   ),
-  TRACE_STR(STM32_TRACEERR_EPOUTQEMPTY     ),
-  TRACE_STR(STM32_TRACEERR_EPINREQEMPTY    ),
-  TRACE_STR(STM32_TRACEERR_NOOUTSETUP      ),
-  TRACE_STR(STM32_TRACEERR_POLLTIMEOUT     ),
+  TRACE_STR(STM32L4_TRACEERR_ALLOCFAIL       ),
+  TRACE_STR(STM32L4_TRACEERR_BADCLEARFEATURE ),
+  TRACE_STR(STM32L4_TRACEERR_BADDEVGETSTATUS ),
+  TRACE_STR(STM32L4_TRACEERR_BADEPNO         ),
+  TRACE_STR(STM32L4_TRACEERR_BADEPGETSTATUS  ),
+  TRACE_STR(STM32L4_TRACEERR_BADGETCONFIG    ),
+  TRACE_STR(STM32L4_TRACEERR_BADGETSETDESC   ),
+  TRACE_STR(STM32L4_TRACEERR_BADGETSTATUS    ),
+  TRACE_STR(STM32L4_TRACEERR_BADSETADDRESS   ),
+  TRACE_STR(STM32L4_TRACEERR_BADSETCONFIG    ),
+  TRACE_STR(STM32L4_TRACEERR_BADSETFEATURE   ),
+  TRACE_STR(STM32L4_TRACEERR_BADTESTMODE     ),
+  TRACE_STR(STM32L4_TRACEERR_BINDFAILED      ),
+  TRACE_STR(STM32L4_TRACEERR_DISPATCHSTALL   ),
+  TRACE_STR(STM32L4_TRACEERR_DRIVER          ),
+  TRACE_STR(STM32L4_TRACEERR_DRIVERREGISTERED),
+  TRACE_STR(STM32L4_TRACEERR_EP0NOSETUP      ),
+  TRACE_STR(STM32L4_TRACEERR_EP0SETUPSTALLED ),
+  TRACE_STR(STM32L4_TRACEERR_EPINNULLPACKET  ),
+  TRACE_STR(STM32L4_TRACEERR_EPINUNEXPECTED  ),
+  TRACE_STR(STM32L4_TRACEERR_EPOUTNULLPACKET ),
+  TRACE_STR(STM32L4_TRACEERR_EPOUTUNEXPECTED ),
+  TRACE_STR(STM32L4_TRACEERR_INVALIDCTRLREQ  ),
+  TRACE_STR(STM32L4_TRACEERR_INVALIDPARMS    ),
+  TRACE_STR(STM32L4_TRACEERR_IRQREGISTRATION ),
+  TRACE_STR(STM32L4_TRACEERR_NOEP            ),
+  TRACE_STR(STM32L4_TRACEERR_NOTCONFIGURED   ),
+  TRACE_STR(STM32L4_TRACEERR_EPOUTQEMPTY     ),
+  TRACE_STR(STM32L4_TRACEERR_EPINREQEMPTY    ),
+  TRACE_STR(STM32L4_TRACEERR_NOOUTSETUP      ),
+  TRACE_STR(STM32L4_TRACEERR_POLLTIMEOUT     ),
   TRACE_STR_END
 };
 #endif
@@ -819,48 +819,48 @@ const struct trace_msg_t g_usb_trace_strings_deverror[] =
 #ifdef CONFIG_USBDEV_TRACE_STRINGS
 const struct trace_msg_t g_usb_trace_strings_intdecode[] =
 {
-  TRACE_STR(STM32_TRACEINTID_USB         ),
-  TRACE_STR(STM32_TRACEINTID_INTPENDING  ),
-  TRACE_STR(STM32_TRACEINTID_EPOUT       ),
-  TRACE_STR(STM32_TRACEINTID_EPIN        ),
-  TRACE_STR(STM32_TRACEINTID_MISMATCH    ),
-  TRACE_STR(STM32_TRACEINTID_WAKEUP      ),
-  TRACE_STR(STM32_TRACEINTID_SUSPEND     ),
-  TRACE_STR(STM32_TRACEINTID_SOF         ),
-  TRACE_STR(STM32_TRACEINTID_RXFIFO      ),
-  TRACE_STR(STM32_TRACEINTID_DEVRESET    ),
-  TRACE_STR(STM32_TRACEINTID_ENUMDNE     ),
-  TRACE_STR(STM32_TRACEINTID_IISOIXFR    ),
-  TRACE_STR(STM32_TRACEINTID_IISOOXFR    ),
-  TRACE_STR(STM32_TRACEINTID_SRQ         ),
-  TRACE_STR(STM32_TRACEINTID_OTG         ),
-  TRACE_STR(STM32_TRACEINTID_EPOUT_XFRC  ),
-  TRACE_STR(STM32_TRACEINTID_EPOUT_EPDISD),
-  TRACE_STR(STM32_TRACEINTID_EPOUT_SETUP ),
-  TRACE_STR(STM32_TRACEINTID_DISPATCH    ),
-  TRACE_STR(STM32_TRACEINTID_GETSTATUS   ),
-  TRACE_STR(STM32_TRACEINTID_EPGETSTATUS ),
-  TRACE_STR(STM32_TRACEINTID_DEVGETSTATUS),
-  TRACE_STR(STM32_TRACEINTID_IFGETSTATUS ),
-  TRACE_STR(STM32_TRACEINTID_CLEARFEATURE),
-  TRACE_STR(STM32_TRACEINTID_SETFEATURE  ),
-  TRACE_STR(STM32_TRACEINTID_SETADDRESS  ),
-  TRACE_STR(STM32_TRACEINTID_GETSETDESC  ),
-  TRACE_STR(STM32_TRACEINTID_GETCONFIG   ),
-  TRACE_STR(STM32_TRACEINTID_SETCONFIG   ),
-  TRACE_STR(STM32_TRACEINTID_GETSETIF    ),
-  TRACE_STR(STM32_TRACEINTID_SYNCHFRAME  ),
-  TRACE_STR(STM32_TRACEINTID_EPIN_XFRC   ),
-  TRACE_STR(STM32_TRACEINTID_EPIN_TOC    ),
-  TRACE_STR(STM32_TRACEINTID_EPIN_ITTXFE ),
-  TRACE_STR(STM32_TRACEINTID_EPIN_EPDISD ),
-  TRACE_STR(STM32_TRACEINTID_EPIN_TXFE   ),
-  TRACE_STR(STM32_TRACEINTID_EPIN_EMPWAIT),
-  TRACE_STR(STM32_TRACEINTID_OUTNAK      ),
-  TRACE_STR(STM32_TRACEINTID_OUTRECVD    ),
-  TRACE_STR(STM32_TRACEINTID_OUTDONE     ),
-  TRACE_STR(STM32_TRACEINTID_SETUPDONE   ),
-  TRACE_STR(STM32_TRACEINTID_SETUPRECVD  ),
+  TRACE_STR(STM32L4_TRACEINTID_USB         ),
+  TRACE_STR(STM32L4_TRACEINTID_INTPENDING  ),
+  TRACE_STR(STM32L4_TRACEINTID_EPOUT       ),
+  TRACE_STR(STM32L4_TRACEINTID_EPIN        ),
+  TRACE_STR(STM32L4_TRACEINTID_MISMATCH    ),
+  TRACE_STR(STM32L4_TRACEINTID_WAKEUP      ),
+  TRACE_STR(STM32L4_TRACEINTID_SUSPEND     ),
+  TRACE_STR(STM32L4_TRACEINTID_SOF         ),
+  TRACE_STR(STM32L4_TRACEINTID_RXFIFO      ),
+  TRACE_STR(STM32L4_TRACEINTID_DEVRESET    ),
+  TRACE_STR(STM32L4_TRACEINTID_ENUMDNE     ),
+  TRACE_STR(STM32L4_TRACEINTID_IISOIXFR    ),
+  TRACE_STR(STM32L4_TRACEINTID_IISOOXFR    ),
+  TRACE_STR(STM32L4_TRACEINTID_SRQ         ),
+  TRACE_STR(STM32L4_TRACEINTID_OTG         ),
+  TRACE_STR(STM32L4_TRACEINTID_EPOUT_XFRC  ),
+  TRACE_STR(STM32L4_TRACEINTID_EPOUT_EPDISD),
+  TRACE_STR(STM32L4_TRACEINTID_EPOUT_SETUP ),
+  TRACE_STR(STM32L4_TRACEINTID_DISPATCH    ),
+  TRACE_STR(STM32L4_TRACEINTID_GETSTATUS   ),
+  TRACE_STR(STM32L4_TRACEINTID_EPGETSTATUS ),
+  TRACE_STR(STM32L4_TRACEINTID_DEVGETSTATUS),
+  TRACE_STR(STM32L4_TRACEINTID_IFGETSTATUS ),
+  TRACE_STR(STM32L4_TRACEINTID_CLEARFEATURE),
+  TRACE_STR(STM32L4_TRACEINTID_SETFEATURE  ),
+  TRACE_STR(STM32L4_TRACEINTID_SETADDRESS  ),
+  TRACE_STR(STM32L4_TRACEINTID_GETSETDESC  ),
+  TRACE_STR(STM32L4_TRACEINTID_GETCONFIG   ),
+  TRACE_STR(STM32L4_TRACEINTID_SETCONFIG   ),
+  TRACE_STR(STM32L4_TRACEINTID_GETSETIF    ),
+  TRACE_STR(STM32L4_TRACEINTID_SYNCHFRAME  ),
+  TRACE_STR(STM32L4_TRACEINTID_EPIN_XFRC   ),
+  TRACE_STR(STM32L4_TRACEINTID_EPIN_TOC    ),
+  TRACE_STR(STM32L4_TRACEINTID_EPIN_ITTXFE ),
+  TRACE_STR(STM32L4_TRACEINTID_EPIN_EPDISD ),
+  TRACE_STR(STM32L4_TRACEINTID_EPIN_TXFE   ),
+  TRACE_STR(STM32L4_TRACEINTID_EPIN_EMPWAIT),
+  TRACE_STR(STM32L4_TRACEINTID_OUTNAK      ),
+  TRACE_STR(STM32L4_TRACEINTID_OUTRECVD    ),
+  TRACE_STR(STM32L4_TRACEINTID_OUTDONE     ),
+  TRACE_STR(STM32L4_TRACEINTID_SETUPDONE   ),
+  TRACE_STR(STM32L4_TRACEINTID_SETUPRECVD  ),
   TRACE_STR_END
 };
 #endif
@@ -874,15 +874,15 @@ const struct trace_msg_t g_usb_trace_strings_intdecode[] =
  ****************************************************************************/
 
 /****************************************************************************
- * Name: stm32_getreg
+ * Name: stm32l4_getreg
  *
  * Description:
  *   Get the contents of an STM32 register
  *
  ****************************************************************************/
 
-#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_USB)
-static uint32_t stm32_getreg(uint32_t addr)
+#if defined(CONFIG_STM32L4_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_USB)
+static uint32_t stm32l4_getreg(uint32_t addr)
 {
   static uint32_t prevaddr = 0;
   static uint32_t preval = 0;
@@ -937,15 +937,15 @@ static uint32_t stm32_getreg(uint32_t addr)
 #endif
 
 /****************************************************************************
- * Name: stm32_putreg
+ * Name: stm32l4_putreg
  *
  * Description:
  *   Set the contents of an STM32 register to a value
  *
  ****************************************************************************/
 
-#if defined(CONFIG_STM32_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_USB)
-static void stm32_putreg(uint32_t val, uint32_t addr)
+#if defined(CONFIG_STM32L4_USBDEV_REGDEBUG) && defined(CONFIG_DEBUG_USB)
+static void stm32l4_putreg(uint32_t val, uint32_t addr)
 {
   /* Show the register value being written */
 
@@ -958,16 +958,16 @@ static void stm32_putreg(uint32_t val, uint32_t addr)
 #endif
 
 /****************************************************************************
- * Name: stm32_req_remfirst
+ * Name: stm32l4_req_remfirst
  *
  * Description:
  *   Remove a request from the head of an endpoint request queue
  *
  ****************************************************************************/
 
-static FAR struct stm32_req_s *stm32_req_remfirst(FAR struct stm32_ep_s *privep)
+static FAR struct stm32l4_req_s *stm32l4_req_remfirst(FAR struct stm32l4_ep_s *privep)
 {
-  FAR struct stm32_req_s *ret = privep->head;
+  FAR struct stm32l4_req_s *ret = privep->head;
 
   if (ret)
     {
@@ -984,15 +984,15 @@ static FAR struct stm32_req_s *stm32_req_remfirst(FAR struct stm32_ep_s *privep)
 }
 
 /****************************************************************************
- * Name: stm32_req_addlast
+ * Name: stm32l4_req_addlast
  *
  * Description:
  *   Add a request to the end of an endpoint request queue
  *
  ****************************************************************************/
 
-static bool stm32_req_addlast(FAR struct stm32_ep_s *privep,
-                              FAR struct stm32_req_s *req)
+static bool stm32l4_req_addlast(FAR struct stm32l4_ep_s *privep,
+                              FAR struct stm32l4_req_s *req)
 {
   bool is_empty = !privep->head;
 
@@ -1011,49 +1011,49 @@ static bool stm32_req_addlast(FAR struct stm32_ep_s *privep,
 }
 
 /****************************************************************************
- * Name: stm32_ep0in_setupresponse
+ * Name: stm32l4_ep0in_setupresponse
  *
  * Description:
  *   Schedule a short transfer on Endpoint 0 (IN or OUT)
  *
  ****************************************************************************/
 
-static void stm32_ep0in_setupresponse(FAR struct stm32_usbdev_s *priv,
+static void stm32l4_ep0in_setupresponse(FAR struct stm32l4_usbdev_s *priv,
                                       FAR uint8_t *buf, uint32_t nbytes)
 {
-  stm32_epin_transfer(&priv->epin[EP0], buf, nbytes);
+  stm32l4_epin_transfer(&priv->epin[EP0], buf, nbytes);
   priv->ep0state = EP0STATE_SETUPRESPONSE;
-  stm32_ep0out_ctrlsetup(priv);
+  stm32l4_ep0out_ctrlsetup(priv);
 }
 
 /****************************************************************************
- * Name: stm32_ep0in_transmitzlp
+ * Name: stm32l4_ep0in_transmitzlp
  *
  * Description:
  *   Send a zero length packet (ZLP) on endpoint 0 IN
  *
  ****************************************************************************/
 
-static inline void stm32_ep0in_transmitzlp(FAR struct stm32_usbdev_s *priv)
+static inline void stm32l4_ep0in_transmitzlp(FAR struct stm32l4_usbdev_s *priv)
 {
-  stm32_ep0in_setupresponse(priv, NULL, 0);
+  stm32l4_ep0in_setupresponse(priv, NULL, 0);
 }
 
 /****************************************************************************
- * Name: stm32_ep0in_activate
+ * Name: stm32l4_ep0in_activate
  *
  * Description:
  *   Activate the endpoint 0 IN endpoint.
  *
  ****************************************************************************/
 
-static void stm32_ep0in_activate(void)
+static void stm32l4_ep0in_activate(void)
 {
   uint32_t regval;
 
   /* Set the max packet size  of the IN EP. */
 
-  regval  = stm32_getreg(STM32_OTGFS_DIEPCTL0);
+  regval  = stm32l4_getreg(STM32L4_OTGFS_DIEPCTL0);
   regval &= ~OTGFS_DIEPCTL0_MPSIZ_MASK;
 
 #if CONFIG_USBDEV_EP0_MAXSIZE == 8
@@ -1068,24 +1068,24 @@ static void stm32_ep0in_activate(void)
 #  error "Unsupported value of CONFIG_USBDEV_EP0_MAXSIZE"
 #endif
 
-  stm32_putreg(regval, STM32_OTGFS_DIEPCTL0);
+  stm32l4_putreg(regval, STM32L4_OTGFS_DIEPCTL0);
 
   /* Clear global IN NAK */
 
-  regval  = stm32_getreg(STM32_OTGFS_DCTL);
+  regval  = stm32l4_getreg(STM32L4_OTGFS_DCTL);
   regval |= OTGFS_DCTL_CGINAK;
-  stm32_putreg(regval, STM32_OTGFS_DCTL);
+  stm32l4_putreg(regval, STM32L4_OTGFS_DCTL);
 }
 
 /****************************************************************************
- * Name: stm32_ep0out_ctrlsetup
+ * Name: stm32l4_ep0out_ctrlsetup
  *
  * Description:
  *   Setup to receive a SETUP packet.
  *
  ****************************************************************************/
 
-static void stm32_ep0out_ctrlsetup(FAR struct stm32_usbdev_s *priv)
+static void stm32l4_ep0out_ctrlsetup(FAR struct stm32l4_usbdev_s *priv)
 {
   uint32_t regval;
 
@@ -1094,24 +1094,24 @@ static void stm32_ep0out_ctrlsetup(FAR struct stm32_usbdev_s *priv)
   regval = (USB_SIZEOF_CTRLREQ * 3 << OTGFS_DOEPTSIZ0_XFRSIZ_SHIFT) |
            (OTGFS_DOEPTSIZ0_PKTCNT) |
            (3 << OTGFS_DOEPTSIZ0_STUPCNT_SHIFT);
-  stm32_putreg(regval, STM32_OTGFS_DOEPTSIZ0);
+  stm32l4_putreg(regval, STM32L4_OTGFS_DOEPTSIZ0);
 
   /* Then clear NAKing and enable the transfer */
 
-  regval  = stm32_getreg(STM32_OTGFS_DOEPCTL0);
+  regval  = stm32l4_getreg(STM32L4_OTGFS_DOEPCTL0);
   regval |= (OTGFS_DOEPCTL0_CNAK | OTGFS_DOEPCTL0_EPENA);
-  stm32_putreg(regval, STM32_OTGFS_DOEPCTL0);
+  stm32l4_putreg(regval, STM32L4_OTGFS_DOEPCTL0);
 }
 
 /****************************************************************************
- * Name: stm32_txfifo_write
+ * Name: stm32l4_txfifo_write
  *
  * Description:
  *   Send data to the endpoint's TxFIFO.
  *
  ****************************************************************************/
 
-static void stm32_txfifo_write(FAR struct stm32_ep_s *privep,
+static void stm32l4_txfifo_write(FAR struct stm32l4_ep_s *privep,
                                FAR uint8_t *buf, int nbytes)
 {
   uint32_t regaddr;
@@ -1127,7 +1127,7 @@ static void stm32_txfifo_write(FAR struct stm32_ep_s *privep,
 
   /* Get the TxFIFO for this endpoint (same as the endpoint number) */
 
-  regaddr = STM32_OTGFS_DFIFO_DEP(privep->epphy);
+  regaddr = STM32L4_OTGFS_DFIFO_DEP(privep->epphy);
 
   /* Then transfer each word to the TxFIFO */
 
@@ -1144,19 +1144,19 @@ static void stm32_txfifo_write(FAR struct stm32_ep_s *privep,
 
       /* Then write the packet data to the TxFIFO */
 
-      stm32_putreg(regval, regaddr);
+      stm32l4_putreg(regval, regaddr);
     }
 }
 
 /****************************************************************************
- * Name: stm32_epin_transfer
+ * Name: stm32l4_epin_transfer
  *
  * Description:
  *   Start the Tx data transfer
  *
  ****************************************************************************/
 
-static void stm32_epin_transfer(FAR struct stm32_ep_s *privep,
+static void stm32l4_epin_transfer(FAR struct stm32l4_ep_s *privep,
                                 FAR uint8_t *buf, int nbytes)
 {
   uint32_t pktcnt;
@@ -1164,7 +1164,7 @@ static void stm32_epin_transfer(FAR struct stm32_ep_s *privep,
 
   /* Read the DIEPSIZx register */
 
-  regval = stm32_getreg(STM32_OTGFS_DIEPTSIZ(privep->epphy));
+  regval = stm32l4_getreg(STM32L4_OTGFS_DIEPTSIZ(privep->epphy));
 
   /* Clear the XFRSIZ, PKTCNT, and MCNT field of the DIEPSIZx register */
 
@@ -1207,11 +1207,11 @@ static void stm32_epin_transfer(FAR struct stm32_ep_s *privep,
 
   /* Save DIEPSIZx register value */
 
-  stm32_putreg(regval, STM32_OTGFS_DIEPTSIZ(privep->epphy));
+  stm32l4_putreg(regval, STM32L4_OTGFS_DIEPTSIZ(privep->epphy));
 
   /* Read the DIEPCTLx register */
 
-  regval = stm32_getreg(STM32_OTGFS_DIEPCTL(privep->epphy));
+  regval = stm32l4_getreg(STM32L4_OTGFS_DIEPCTL(privep->epphy));
 
   /* If this is an isochronous endpoint, then set the even/odd frame bit
    * the DIEPCTLx register.
@@ -1223,7 +1223,7 @@ static void stm32_epin_transfer(FAR struct stm32_ep_s *privep,
        * even/odd frame to match.
        */
 
-      uint32_t status = stm32_getreg(STM32_OTGFS_DSTS);
+      uint32_t status = stm32l4_getreg(STM32L4_OTGFS_DSTS);
       if ((status & OTGFS_DSTS_SOFFN0) == OTGFS_DSTS_SOFFN_EVEN)
         {
           regval |= OTGFS_DIEPCTL_SEVNFRM;
@@ -1238,28 +1238,28 @@ static void stm32_epin_transfer(FAR struct stm32_ep_s *privep,
 
   regval &= ~OTGFS_DIEPCTL_EPDIS;
   regval |= (OTGFS_DIEPCTL_CNAK | OTGFS_DIEPCTL_EPENA);
-  stm32_putreg(regval, STM32_OTGFS_DIEPCTL(privep->epphy));
+  stm32l4_putreg(regval, STM32L4_OTGFS_DIEPCTL(privep->epphy));
 
   /* Transfer the data to the TxFIFO.  At this point, the caller has already
    * assured that there is sufficient space in the TxFIFO to hold the transfer
    * we can just blindly continue.
    */
 
-  stm32_txfifo_write(privep, buf, nbytes);
+  stm32l4_txfifo_write(privep, buf, nbytes);
 }
 
 /****************************************************************************
- * Name: stm32_epin_request
+ * Name: stm32l4_epin_request
  *
  * Description:
  *   Begin or continue write request processing.
  *
  ****************************************************************************/
 
-static void stm32_epin_request(FAR struct stm32_usbdev_s *priv,
-                               FAR struct stm32_ep_s *privep)
+static void stm32l4_epin_request(FAR struct stm32l4_usbdev_s *priv,
+                               FAR struct stm32l4_ep_s *privep)
 {
-  struct stm32_req_s *privreq;
+  struct stm32l4_req_s *privreq;
   uint32_t regaddr;
   uint32_t regval;
   uint8_t *buf;
@@ -1270,27 +1270,27 @@ static void stm32_epin_request(FAR struct stm32_usbdev_s *priv,
   /* We get here in one of four possible ways.  From three interrupting
    * events:
    *
-   * 1. From stm32_epin as part of the transfer complete interrupt processing
+   * 1. From stm32l4_epin as part of the transfer complete interrupt processing
    *    This interrupt indicates that the last transfer has completed.
    * 2. As part of the ITTXFE interrupt processing.  That interrupt indicates
    *    that an IN token was received when the associated TxFIFO was empty.
-   * 3. From stm32_epin_txfifoempty as part of the TXFE interrupt processing.
+   * 3. From stm32l4_epin_txfifoempty as part of the TXFE interrupt processing.
    *    The TXFE interrupt is only enabled when the TxFIFO is full and the
    *    software must wait for space to become available in the TxFIFO.
    *
    * And this function may be called immediately when the write request is
    * queue to start up the next transaction.
    *
-   * 4. From stm32_ep_submit when a new write request is received WHILE the
+   * 4. From stm32l4_ep_submit when a new write request is received WHILE the
    *    endpoint is not active (privep->active == false).
    */
 
   /* Check the request from the head of the endpoint request queue */
 
-  privreq = stm32_rqpeek(privep);
+  privreq = stm32l4_rqpeek(privep);
   if (!privreq)
     {
-      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_EPINREQEMPTY), privep->epphy);
+      usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_EPINREQEMPTY), privep->epphy);
 
       /* There is no TX transfer in progress and no new pending TX
        * requests to send.  To stop transmitting any data on a particular
@@ -1298,10 +1298,10 @@ static void stm32_epin_request(FAR struct stm32_usbdev_s *priv,
        * bit, the following field must be programmed.
        */
 
-      regaddr = STM32_OTGFS_DIEPCTL(privep->epphy);
-      regval  = stm32_getreg(regaddr);
+      regaddr = STM32L4_OTGFS_DIEPCTL(privep->epphy);
+      regval  = stm32l4_getreg(regaddr);
       regval |= OTGFS_DIEPCTL_SNAK;
-      stm32_putreg(regval, regaddr);
+      stm32l4_putreg(regval, regaddr);
 
       /* The endpoint is no longer active */
 
@@ -1401,25 +1401,25 @@ static void stm32_epin_request(FAR struct stm32_usbdev_s *priv,
        *   n: n words available
        */
 
-      regaddr = STM32_OTGFS_DTXFSTS(privep->epphy);
+      regaddr = STM32L4_OTGFS_DTXFSTS(privep->epphy);
 
       /* Check for space in the TxFIFO.  If space in the TxFIFO is not
        * available, then set up an interrupt to resume the transfer when
        * the TxFIFO is empty.
        */
 
-      regval = stm32_getreg(regaddr);
+      regval = stm32l4_getreg(regaddr);
       if ((int)(regval & OTGFS_DTXFSTS_MASK) < nwords)
         {
-          usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPIN_EMPWAIT), (uint16_t)regval);
+          usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_EPIN_EMPWAIT), (uint16_t)regval);
 
           /* There is insufficient space in the TxFIFO.  Wait for a TxFIFO
            * empty interrupt and try again.
            */
 
-          uint32_t empmsk = stm32_getreg(STM32_OTGFS_DIEPEMPMSK);
+          uint32_t empmsk = stm32l4_getreg(STM32L4_OTGFS_DIEPEMPMSK);
           empmsk |= OTGFS_DIEPEMPMSK(privep->epphy);
-          stm32_putreg(empmsk, STM32_OTGFS_DIEPEMPMSK);
+          stm32l4_putreg(empmsk, STM32L4_OTGFS_DIEPEMPMSK);
 
           /* Terminate the transfer.  We will try again when the TxFIFO empty
            * interrupt is received.
@@ -1431,7 +1431,7 @@ static void stm32_epin_request(FAR struct stm32_usbdev_s *priv,
       /* Transfer data to the TxFIFO */
 
       buf = privreq->req.buf + privreq->req.xfrd;
-      stm32_epin_transfer(privep, buf, nbytes);
+      stm32l4_epin_transfer(privep, buf, nbytes);
 
       /* If it was not before, the OUT endpoint is now actively transferring
        * data.
@@ -1464,19 +1464,19 @@ static void stm32_epin_request(FAR struct stm32_usbdev_s *priv,
        * yet completed).
        */
 
-      stm32_req_complete(privep, OK);
+      stm32l4_req_complete(privep, OK);
     }
 }
 
 /****************************************************************************
- * Name: stm32_rxfifo_read
+ * Name: stm32l4_rxfifo_read
  *
  * Description:
  *   Read packet from the RxFIFO into a read request.
  *
  ****************************************************************************/
 
-static void stm32_rxfifo_read(FAR struct stm32_ep_s *privep,
+static void stm32l4_rxfifo_read(FAR struct stm32l4_ep_s *privep,
                               FAR uint8_t *dest, uint16_t len)
 {
   uint32_t regaddr;
@@ -1486,7 +1486,7 @@ static void stm32_rxfifo_read(FAR struct stm32_ep_s *privep,
    * we might as well use the address associated with EP0.
    */
 
-  regaddr = STM32_OTGFS_DFIFO_DEP(EP0);
+  regaddr = STM32L4_OTGFS_DFIFO_DEP(EP0);
 
   /* Read 32-bits and write 4 x 8-bits at time (to avoid unaligned accesses) */
 
@@ -1500,7 +1500,7 @@ static void stm32_rxfifo_read(FAR struct stm32_ep_s *privep,
 
       /* Read 1 x 32-bits of EP0 packet data */
 
-      data.w = stm32_getreg(regaddr);
+      data.w = stm32l4_getreg(regaddr);
 
       /* Write 4 x 8-bits of EP0 packet data */
 
@@ -1514,14 +1514,14 @@ static void stm32_rxfifo_read(FAR struct stm32_ep_s *privep,
 }
 
 /****************************************************************************
- * Name: stm32_rxfifo_discard
+ * Name: stm32l4_rxfifo_discard
  *
  * Description:
  *   Discard packet data from the RxFIFO.
  *
  ****************************************************************************/
 
-static void stm32_rxfifo_discard(FAR struct stm32_ep_s *privep, int len)
+static void stm32l4_rxfifo_discard(FAR struct stm32l4_ep_s *privep, int len)
 {
   if (len > 0)
     {
@@ -1532,13 +1532,13 @@ static void stm32_rxfifo_discard(FAR struct stm32_ep_s *privep, int len)
        * we might as well use the address associated with EP0.
        */
 
-      regaddr = STM32_OTGFS_DFIFO_DEP(EP0);
+      regaddr = STM32L4_OTGFS_DFIFO_DEP(EP0);
 
       /* Read 32-bits at time */
 
       for (i = 0; i < len; i += 4)
         {
-          volatile uint32_t data = stm32_getreg(regaddr);
+          volatile uint32_t data = stm32l4_getreg(regaddr);
           (void)data;
         }
 
@@ -1547,7 +1547,7 @@ static void stm32_rxfifo_discard(FAR struct stm32_ep_s *privep, int len)
 }
 
 /****************************************************************************
- * Name: stm32_epout_complete
+ * Name: stm32l4_epout_complete
  *
  * Description:
  *   This function is called when an OUT transfer complete interrupt is
@@ -1556,16 +1556,16 @@ static void stm32_rxfifo_discard(FAR struct stm32_ep_s *privep, int len)
  *
  ****************************************************************************/
 
-static void stm32_epout_complete(FAR struct stm32_usbdev_s *priv,
-                                 FAR struct stm32_ep_s *privep)
+static void stm32l4_epout_complete(FAR struct stm32l4_usbdev_s *priv,
+                                 FAR struct stm32l4_ep_s *privep)
 {
-  struct stm32_req_s *privreq;
+  struct stm32l4_req_s *privreq;
 
   /* Since a transfer just completed, there must be a read request at the head of
    * the endpoint request queue.
    */
 
-  privreq = stm32_rqpeek(privep);
+  privreq = stm32l4_rqpeek(privep);
   DEBUGASSERT(privreq);
 
   if (!privreq)
@@ -1574,7 +1574,7 @@ static void stm32_epout_complete(FAR struct stm32_usbdev_s *priv,
        * should not happen.
        */
 
-      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_EPOUTQEMPTY), privep->epphy);
+      usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_EPOUTQEMPTY), privep->epphy);
       privep->active = false;
       return;
     }
@@ -1587,16 +1587,16 @@ static void stm32_epout_complete(FAR struct stm32_usbdev_s *priv,
    */
 
   usbtrace(TRACE_COMPLETE(privep->epphy), privreq->req.xfrd);
-  stm32_req_complete(privep, OK);
+  stm32l4_req_complete(privep, OK);
   privep->active = false;
 
   /* Now set up the next read request (if any) */
 
-  stm32_epout_request(priv, privep);
+  stm32l4_epout_request(priv, privep);
 }
 
 /****************************************************************************
- * Name: stm32_ep0out_receive
+ * Name: stm32l4_ep0out_receive
  *
  * Description:
  *   This function is called from the RXFLVL interrupt handler when new incoming
@@ -1605,14 +1605,14 @@ static void stm32_epout_complete(FAR struct stm32_usbdev_s *priv,
  *
  ****************************************************************************/
 
-static inline void stm32_ep0out_receive(FAR struct stm32_ep_s *privep, int bcnt)
+static inline void stm32l4_ep0out_receive(FAR struct stm32l4_ep_s *privep, int bcnt)
 {
-  FAR struct stm32_usbdev_s *priv;
+  FAR struct stm32l4_usbdev_s *priv;
 
   /* Sanity Checking */
 
   DEBUGASSERT(privep && privep->ep.priv);
-  priv = (FAR struct stm32_usbdev_s *)privep->ep.priv;
+  priv = (FAR struct stm32l4_usbdev_s *)privep->ep.priv;
 
   uinfo("EP0: bcnt=%d\n", bcnt);
   usbtrace(TRACE_READ(EP0), bcnt);
@@ -1626,11 +1626,11 @@ static inline void stm32_ep0out_receive(FAR struct stm32_ep_s *privep, int bcnt)
       /* Read the data into our special buffer for SETUP data */
 
       int readlen = MIN(CONFIG_USBDEV_SETUP_MAXDATASIZE, bcnt);
-      stm32_rxfifo_read(privep, priv->ep0data, readlen);
+      stm32l4_rxfifo_read(privep, priv->ep0data, readlen);
 
       /* Do we have to discard any excess bytes? */
 
-      stm32_rxfifo_discard(privep,  bcnt - readlen);
+      stm32l4_rxfifo_discard(privep,  bcnt - readlen);
 
       /* Now we can process the setup command */
 
@@ -1638,7 +1638,7 @@ static inline void stm32_ep0out_receive(FAR struct stm32_ep_s *privep, int bcnt)
       priv->ep0state  = EP0STATE_SETUP_READY;
       priv->ep0datlen = readlen;
 
-      stm32_ep0out_setup(priv);
+      stm32l4_ep0out_setup(priv);
     }
   else
     {
@@ -1647,14 +1647,14 @@ static inline void stm32_ep0out_receive(FAR struct stm32_ep_s *privep, int bcnt)
        * does not become constipated.
        */
 
-      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_NOOUTSETUP), priv->ep0state);
-      stm32_rxfifo_discard(privep, bcnt);
+      usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_NOOUTSETUP), priv->ep0state);
+      stm32l4_rxfifo_discard(privep, bcnt);
       privep->active = false;
     }
 }
 
 /****************************************************************************
- * Name: stm32_epout_receive
+ * Name: stm32l4_epout_receive
  *
  * Description:
  *   This function is called from the RXFLVL interrupt handler when new incoming
@@ -1663,9 +1663,9 @@ static inline void stm32_ep0out_receive(FAR struct stm32_ep_s *privep, int bcnt)
  *
  ****************************************************************************/
 
-static inline void stm32_epout_receive(FAR struct stm32_ep_s *privep, int bcnt)
+static inline void stm32l4_epout_receive(FAR struct stm32l4_ep_s *privep, int bcnt)
 {
-  struct stm32_req_s *privreq;
+  struct stm32l4_req_s *privreq;
   uint8_t *dest;
   int buflen;
   int readlen;
@@ -1674,7 +1674,7 @@ static inline void stm32_epout_receive(FAR struct stm32_ep_s *privep, int bcnt)
    * queue.
    */
 
-  privreq = stm32_rqpeek(privep);
+  privreq = stm32l4_rqpeek(privep);
   if (!privreq)
     {
       /* Incoming data is available in the RxFIFO, but there is no read setup
@@ -1688,7 +1688,7 @@ static inline void stm32_epout_receive(FAR struct stm32_ep_s *privep, int bcnt)
 
       if (privep->epphy == 0)
         {
-          stm32_ep0out_receive(privep, bcnt);
+          stm32l4_ep0out_receive(privep, bcnt);
         }
       else
         {
@@ -1696,11 +1696,11 @@ static inline void stm32_epout_receive(FAR struct stm32_ep_s *privep, int bcnt)
            * NAKing is working as expected.
            */
 
-          usbtrace(TRACE_DEVERROR(STM32_TRACEERR_EPOUTQEMPTY), privep->epphy);
+          usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_EPOUTQEMPTY), privep->epphy);
 
           /* Discard the data in the RxFIFO */
 
-          stm32_rxfifo_discard(privep, bcnt);
+          stm32l4_rxfifo_discard(privep, bcnt);
         }
 
       privep->active = false;
@@ -1722,13 +1722,13 @@ static inline void stm32_epout_receive(FAR struct stm32_ep_s *privep, int bcnt)
 
   /* Transfer the data from the RxFIFO to the request's data buffer */
 
-  stm32_rxfifo_read(privep, dest, readlen);
+  stm32l4_rxfifo_read(privep, dest, readlen);
 
   /* If there were more bytes in the RxFIFO than could be held in the read
    * request, then we will have to discard those.
    */
 
-  stm32_rxfifo_discard(privep, bcnt - readlen);
+  stm32l4_rxfifo_discard(privep, bcnt - readlen);
 
   /* Update the number of bytes transferred */
 
@@ -1736,7 +1736,7 @@ static inline void stm32_epout_receive(FAR struct stm32_ep_s *privep, int bcnt)
 }
 
 /****************************************************************************
- * Name: stm32_epout_request
+ * Name: stm32l4_epout_request
  *
  * Description:
  *   This function is called when either (1) new read request is received, or
@@ -1745,10 +1745,10 @@ static inline void stm32_epout_receive(FAR struct stm32_ep_s *privep, int bcnt)
  *
  ****************************************************************************/
 
-static void stm32_epout_request(FAR struct stm32_usbdev_s *priv,
-                                FAR struct stm32_ep_s *privep)
+static void stm32l4_epout_request(FAR struct stm32l4_usbdev_s *priv,
+                                FAR struct stm32l4_ep_s *privep)
 {
-  struct stm32_req_s *privreq;
+  struct stm32l4_req_s *privreq;
   uint32_t regaddr;
   uint32_t regval;
   uint32_t xfrsize;
@@ -1769,10 +1769,10 @@ static void stm32_epout_request(FAR struct stm32_usbdev_s *priv,
         {
           /* Get a reference to the request at the head of the endpoint's request queue */
 
-          privreq = stm32_rqpeek(privep);
+          privreq = stm32l4_rqpeek(privep);
           if (!privreq)
             {
-              usbtrace(TRACE_DEVERROR(STM32_TRACEERR_EPOUTQEMPTY), privep->epphy);
+              usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_EPOUTQEMPTY), privep->epphy);
 
               /* There are no read requests to be setup.  Configure the hardware to
                * NAK any incoming packets.  (This should already be the case.  I
@@ -1780,10 +1780,10 @@ static void stm32_epout_request(FAR struct stm32_usbdev_s *priv,
                * completed until SNAK is cleared).
                */
 
-              regaddr = STM32_OTGFS_DOEPCTL(privep->epphy);
-              regval  = stm32_getreg(regaddr);
+              regaddr = STM32L4_OTGFS_DOEPCTL(privep->epphy);
+              regval  = stm32l4_getreg(regaddr);
               regval |= OTGFS_DOEPCTL_SNAK;
-              stm32_putreg(regval, regaddr);
+              stm32l4_putreg(regval, regaddr);
 
               /* This endpoint is no longer actively transferring */
 
@@ -1799,8 +1799,8 @@ static void stm32_epout_request(FAR struct stm32_usbdev_s *priv,
 
           if (privreq->req.len <= 0)
             {
-              usbtrace(TRACE_DEVERROR(STM32_TRACEERR_EPOUTNULLPACKET), 0);
-              stm32_req_complete(privep, OK);
+              usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_EPOUTNULLPACKET), 0);
+              stm32l4_req_complete(privep, OK);
             }
 
           /* Otherwise, we have a usable read request... break out of the loop */
@@ -1824,17 +1824,17 @@ static void stm32_epout_request(FAR struct stm32_usbdev_s *priv,
 
       /* Then setup the hardware to perform this transfer */
 
-      regaddr = STM32_OTGFS_DOEPTSIZ(privep->epphy);
-      regval  = stm32_getreg(regaddr);
+      regaddr = STM32L4_OTGFS_DOEPTSIZ(privep->epphy);
+      regval  = stm32l4_getreg(regaddr);
       regval &= ~(OTGFS_DOEPTSIZ_XFRSIZ_MASK | OTGFS_DOEPTSIZ_PKTCNT_MASK);
       regval |= (xfrsize << OTGFS_DOEPTSIZ_XFRSIZ_SHIFT);
       regval |= (pktcnt  << OTGFS_DOEPTSIZ_PKTCNT_SHIFT);
-      stm32_putreg(regval, regaddr);
+      stm32l4_putreg(regval, regaddr);
 
       /* Then enable the transfer */
 
-      regaddr = STM32_OTGFS_DOEPCTL(privep->epphy);
-      regval  = stm32_getreg(regaddr);
+      regaddr = STM32L4_OTGFS_DOEPCTL(privep->epphy);
+      regval  = stm32l4_getreg(regaddr);
 
       /* When an isochronous transfer is enabled the Even/Odd frame bit must
        * also be set appropriately.
@@ -1857,7 +1857,7 @@ static void stm32_epout_request(FAR struct stm32_usbdev_s *priv,
       /* Clearing NAKing and enable the transfer. */
 
       regval |= (OTGFS_DOEPCTL_CNAK | OTGFS_DOEPCTL_EPENA);
-      stm32_putreg(regval, regaddr);
+      stm32l4_putreg(regval, regaddr);
 
       /* A transfer is now active on this endpoint */
 
@@ -1875,40 +1875,40 @@ static void stm32_epout_request(FAR struct stm32_usbdev_s *priv,
 }
 
 /****************************************************************************
- * Name: stm32_ep_flush
+ * Name: stm32l4_ep_flush
  *
  * Description:
  *   Flush any primed descriptors from this ep
  *
  ****************************************************************************/
 
-static void stm32_ep_flush(struct stm32_ep_s *privep)
+static void stm32l4_ep_flush(struct stm32l4_ep_s *privep)
 {
   if (privep->isin)
     {
-      stm32_txfifo_flush(OTGFS_GRSTCTL_TXFNUM_D(privep->epphy));
+      stm32l4_txfifo_flush(OTGFS_GRSTCTL_TXFNUM_D(privep->epphy));
     }
   else
     {
-      stm32_rxfifo_flush();
+      stm32l4_rxfifo_flush();
     }
 }
 
 /****************************************************************************
- * Name: stm32_req_complete
+ * Name: stm32l4_req_complete
  *
  * Description:
  *   Handle termination of the request at the head of the endpoint request queue.
  *
  ****************************************************************************/
 
-static void stm32_req_complete(struct stm32_ep_s *privep, int16_t result)
+static void stm32l4_req_complete(struct stm32l4_ep_s *privep, int16_t result)
 {
-  FAR struct stm32_req_s *privreq;
+  FAR struct stm32l4_req_s *privreq;
 
   /* Remove the request at the head of the request list */
 
-  privreq = stm32_req_remfirst(privep);
+  privreq = stm32l4_req_remfirst(privep);
   DEBUGASSERT(privreq != NULL);
 
   /* If endpoint 0, temporarily reflect the state of protocol stalled
@@ -1935,30 +1935,30 @@ static void stm32_req_complete(struct stm32_ep_s *privep, int16_t result)
 }
 
 /****************************************************************************
- * Name: stm32_req_cancel
+ * Name: stm32l4_req_cancel
  *
  * Description:
  *   Cancel all pending requests for an endpoint
  *
  ****************************************************************************/
 
-static void stm32_req_cancel(struct stm32_ep_s *privep, int16_t status)
+static void stm32l4_req_cancel(struct stm32l4_ep_s *privep, int16_t status)
 {
-  if (!stm32_rqempty(privep))
+  if (!stm32l4_rqempty(privep))
     {
-      stm32_ep_flush(privep);
+      stm32l4_ep_flush(privep);
     }
 
-  while (!stm32_rqempty(privep))
+  while (!stm32l4_rqempty(privep))
     {
       usbtrace(TRACE_COMPLETE(privep->epphy),
-               (stm32_rqpeek(privep))->req.xfrd);
-      stm32_req_complete(privep, status);
+               (stm32l4_rqpeek(privep))->req.xfrd);
+      stm32l4_req_complete(privep, status);
     }
 }
 
 /****************************************************************************
- * Name: stm32_ep_findbyaddr
+ * Name: stm32l4_ep_findbyaddr
  *
  * Description:
  *   Find the physical endpoint structure corresponding to a logic endpoint
@@ -1966,13 +1966,13 @@ static void stm32_req_cancel(struct stm32_ep_s *privep, int16_t status)
  *
  ****************************************************************************/
 
-static struct stm32_ep_s *stm32_ep_findbyaddr(struct stm32_usbdev_s *priv,
+static struct stm32l4_ep_s *stm32l4_ep_findbyaddr(struct stm32l4_usbdev_s *priv,
                                               uint16_t eplog)
 {
-  struct stm32_ep_s *privep;
+  struct stm32l4_ep_s *privep;
   uint8_t epphy = USB_EPNO(eplog);
 
-  if (epphy >= STM32_NENDPOINTS)
+  if (epphy >= STM32L4_NENDPOINTS)
     {
       return NULL;
     }
@@ -1995,7 +1995,7 @@ static struct stm32_ep_s *stm32_ep_findbyaddr(struct stm32_usbdev_s *priv,
 }
 
 /****************************************************************************
- * Name: stm32_req_dispatch
+ * Name: stm32l4_req_dispatch
  *
  * Description:
  *   Provide unhandled setup actions to the class driver. This is logically part
@@ -2003,12 +2003,12 @@ static struct stm32_ep_s *stm32_ep_findbyaddr(struct stm32_usbdev_s *priv,
  *
  ****************************************************************************/
 
-static int stm32_req_dispatch(struct stm32_usbdev_s *priv,
+static int stm32l4_req_dispatch(struct stm32l4_usbdev_s *priv,
                               const struct usb_ctrlreq_s *ctrl)
 {
   int ret = -EIO;
 
-  usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_DISPATCH), 0);
+  usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_DISPATCH), 0);
   if (priv->driver)
     {
       /* Forward to the control request to the class driver implementation */
@@ -2021,7 +2021,7 @@ static int stm32_req_dispatch(struct stm32_usbdev_s *priv,
     {
       /* Stall on failure */
 
-      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_DISPATCHSTALL), 0);
+      usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_DISPATCHSTALL), 0);
       priv->stalled = true;
     }
 
@@ -2029,28 +2029,28 @@ static int stm32_req_dispatch(struct stm32_usbdev_s *priv,
 }
 
 /****************************************************************************
- * Name: stm32_usbreset
+ * Name: stm32l4_usbreset
  *
  * Description:
  *   Reset Usb engine
  *
  ****************************************************************************/
 
-static void stm32_usbreset(struct stm32_usbdev_s *priv)
+static void stm32l4_usbreset(struct stm32l4_usbdev_s *priv)
 {
-  FAR struct stm32_ep_s *privep;
+  FAR struct stm32l4_ep_s *privep;
   uint32_t regval;
   int i;
 
   /* Clear the Remote Wake-up Signaling */
 
-  regval = stm32_getreg(STM32_OTGFS_DCTL);
+  regval = stm32l4_getreg(STM32L4_OTGFS_DCTL);
   regval &= ~OTGFS_DCTL_RWUSIG;
-  stm32_putreg(regval, STM32_OTGFS_DCTL);
+  stm32l4_putreg(regval, STM32L4_OTGFS_DCTL);
 
   /* Flush the EP0 Tx FIFO */
 
-  stm32_txfifo_flush(OTGFS_GRSTCTL_TXFNUM_D(EP0));
+  stm32l4_txfifo_flush(OTGFS_GRSTCTL_TXFNUM_D(EP0));
 
   /* Tell the class driver that we are disconnected. The class
    * driver should then accept any new configurations.
@@ -2063,22 +2063,22 @@ static void stm32_usbreset(struct stm32_usbdev_s *priv)
 
   /* Mark all endpoints as available */
 
-  priv->epavail[0] = STM32_EP_AVAILABLE;
-  priv->epavail[1] = STM32_EP_AVAILABLE;
+  priv->epavail[0] = STM32L4_EP_AVAILABLE;
+  priv->epavail[1] = STM32L4_EP_AVAILABLE;
 
   /* Disable all end point interrupts */
 
-  for (i = 0; i < STM32_NENDPOINTS ; i++)
+  for (i = 0; i < STM32L4_NENDPOINTS ; i++)
     {
       /* Disable endpoint interrupts */
 
-      stm32_putreg(0xff, STM32_OTGFS_DIEPINT(i));
-      stm32_putreg(0xff, STM32_OTGFS_DOEPINT(i));
+      stm32l4_putreg(0xff, STM32L4_OTGFS_DIEPINT(i));
+      stm32l4_putreg(0xff, STM32L4_OTGFS_DOEPINT(i));
 
       /* Return write requests to the class implementation */
 
       privep = &priv->epin[i];
-      stm32_req_cancel(privep, -ESHUTDOWN);
+      stm32l4_req_cancel(privep, -ESHUTDOWN);
 
       /* Reset IN endpoint status */
 
@@ -2087,54 +2087,54 @@ static void stm32_usbreset(struct stm32_usbdev_s *priv)
       /* Return read requests to the class implementation */
 
       privep = &priv->epout[i];
-      stm32_req_cancel(privep, -ESHUTDOWN);
+      stm32l4_req_cancel(privep, -ESHUTDOWN);
 
       /* Reset endpoint status */
 
       privep->stalled = false;
     }
 
-  stm32_putreg(0xffffffff, STM32_OTGFS_DAINT);
+  stm32l4_putreg(0xffffffff, STM32L4_OTGFS_DAINT);
 
   /* Mask all device endpoint interrupts except EP0 */
 
   regval = (OTGFS_DAINT_IEP(EP0) | OTGFS_DAINT_OEP(EP0));
-  stm32_putreg(regval, STM32_OTGFS_DAINTMSK);
+  stm32l4_putreg(regval, STM32L4_OTGFS_DAINTMSK);
 
   /* Unmask OUT interrupts */
 
   regval = (OTGFS_DOEPMSK_XFRCM | OTGFS_DOEPMSK_STUPM | OTGFS_DOEPMSK_EPDM);
-  stm32_putreg(regval, STM32_OTGFS_DOEPMSK);
+  stm32l4_putreg(regval, STM32L4_OTGFS_DOEPMSK);
 
   /* Unmask IN interrupts */
 
   regval = (OTGFS_DIEPMSK_XFRCM | OTGFS_DIEPMSK_EPDM | OTGFS_DIEPMSK_TOM);
-  stm32_putreg(regval, STM32_OTGFS_DIEPMSK);
+  stm32l4_putreg(regval, STM32L4_OTGFS_DIEPMSK);
 
   /* Reset device address to 0 */
 
-  stm32_setaddress(priv, 0);
+  stm32l4_setaddress(priv, 0);
   priv->devstate = DEVSTATE_DEFAULT;
   priv->usbdev.speed = USB_SPEED_FULL;
 
   /* Re-configure EP0 */
 
-  stm32_ep0_configure(priv);
+  stm32l4_ep0_configure(priv);
 
   /* Setup EP0 to receive SETUP packets */
 
-  stm32_ep0out_ctrlsetup(priv);
+  stm32l4_ep0out_ctrlsetup(priv);
 }
 
 /****************************************************************************
- * Name: stm32_ep0out_testmode
+ * Name: stm32l4_ep0out_testmode
  *
  * Description:
  *   Select test mode
  *
  ****************************************************************************/
 
-static inline void stm32_ep0out_testmode(FAR struct stm32_usbdev_s *priv,
+static inline void stm32l4_ep0out_testmode(FAR struct stm32l4_usbdev_s *priv,
                                          uint16_t index)
 {
   uint8_t testmode;
@@ -2163,18 +2163,18 @@ static inline void stm32_ep0out_testmode(FAR struct stm32_usbdev_s *priv,
       break;
 
     default:
-      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADTESTMODE), testmode);
+      usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_BADTESTMODE), testmode);
       priv->dotest   = false;
       priv->testmode = OTGFS_TESTMODE_DISABLED;
       priv->stalled  = true;
     }
 
   priv->dotest = true;
-  stm32_ep0in_transmitzlp(priv);
+  stm32l4_ep0in_transmitzlp(priv);
 }
 
 /****************************************************************************
- * Name: stm32_ep0out_stdrequest
+ * Name: stm32l4_ep0out_stdrequest
  *
  * Description:
  *   Handle a standard request on EP0.  Pick off the things of interest to the
@@ -2182,10 +2182,10 @@ static inline void stm32_ep0out_testmode(FAR struct stm32_usbdev_s *priv,
  *
  ****************************************************************************/
 
-static inline void stm32_ep0out_stdrequest(struct stm32_usbdev_s *priv,
-                                           FAR struct stm32_ctrlreq_s *ctrlreq)
+static inline void stm32l4_ep0out_stdrequest(struct stm32l4_usbdev_s *priv,
+                                           FAR struct stm32l4_ctrlreq_s *ctrlreq)
 {
-  FAR struct stm32_ep_s *privep;
+  FAR struct stm32l4_ep_s *privep;
 
   /* Handle standard request */
 
@@ -2199,7 +2199,7 @@ static inline void stm32_ep0out_stdrequest(struct stm32_usbdev_s *priv,
          * len:   2; data = status
          */
 
-        usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_GETSTATUS), 0);
+        usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_GETSTATUS), 0);
         if (!priv->addressed ||
              ctrlreq->len != 2 ||
             USB_REQ_ISOUT(ctrlreq->type) ||
@@ -2213,11 +2213,11 @@ static inline void stm32_ep0out_stdrequest(struct stm32_usbdev_s *priv,
               {
               case USB_REQ_RECIPIENT_ENDPOINT:
                 {
-                  usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPGETSTATUS), 0);
-                  privep = stm32_ep_findbyaddr(priv, ctrlreq->index);
+                  usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_EPGETSTATUS), 0);
+                  privep = stm32l4_ep_findbyaddr(priv, ctrlreq->index);
                   if (!privep)
                     {
-                      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADEPGETSTATUS), 0);
+                      usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_BADEPGETSTATUS), 0);
                       priv->stalled = true;
                     }
                   else
@@ -2232,7 +2232,7 @@ static inline void stm32_ep0out_stdrequest(struct stm32_usbdev_s *priv,
                         }
 
                       priv->ep0data[1] = 0;
-                      stm32_ep0in_setupresponse(priv, priv->ep0data, 2);
+                      stm32l4_ep0in_setupresponse(priv, priv->ep0data, 2);
                     }
                 }
                 break;
@@ -2241,7 +2241,7 @@ static inline void stm32_ep0out_stdrequest(struct stm32_usbdev_s *priv,
                 {
                   if (ctrlreq->index == 0)
                     {
-                      usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_DEVGETSTATUS), 0);
+                      usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_DEVGETSTATUS), 0);
 
                       /* Features:  Remote Wakeup and self-powered */
 
@@ -2249,11 +2249,11 @@ static inline void stm32_ep0out_stdrequest(struct stm32_usbdev_s *priv,
                       priv->ep0data[0] |= (priv->wakeup      << USB_FEATURE_REMOTEWAKEUP);
                       priv->ep0data[1]  = 0;
 
-                      stm32_ep0in_setupresponse(priv, priv->ep0data, 2);
+                      stm32l4_ep0in_setupresponse(priv, priv->ep0data, 2);
                     }
                   else
                     {
-                      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADDEVGETSTATUS), 0);
+                      usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_BADDEVGETSTATUS), 0);
                       priv->stalled = true;
                     }
                 }
@@ -2261,17 +2261,17 @@ static inline void stm32_ep0out_stdrequest(struct stm32_usbdev_s *priv,
 
               case USB_REQ_RECIPIENT_INTERFACE:
                 {
-                  usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_IFGETSTATUS), 0);
+                  usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_IFGETSTATUS), 0);
                   priv->ep0data[0] = 0;
                   priv->ep0data[1] = 0;
 
-                  stm32_ep0in_setupresponse(priv, priv->ep0data, 2);
+                  stm32l4_ep0in_setupresponse(priv, priv->ep0data, 2);
                 }
                 break;
 
               default:
                 {
-                  usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADGETSTATUS), 0);
+                  usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_BADGETSTATUS), 0);
                   priv->stalled = true;
                 }
                 break;
@@ -2288,33 +2288,33 @@ static inline void stm32_ep0out_stdrequest(struct stm32_usbdev_s *priv,
          * len:   zero, data = none
          */
 
-        usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_CLEARFEATURE), 0);
+        usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_CLEARFEATURE), 0);
         if (priv->addressed != 0 && ctrlreq->len == 0)
           {
             uint8_t recipient = ctrlreq->type & USB_REQ_RECIPIENT_MASK;
             if (recipient == USB_REQ_RECIPIENT_ENDPOINT &&
                 ctrlreq->value == USB_FEATURE_ENDPOINTHALT &&
-                (privep = stm32_ep_findbyaddr(priv, ctrlreq->index)) != NULL)
+                (privep = stm32l4_ep_findbyaddr(priv, ctrlreq->index)) != NULL)
               {
-                stm32_ep_clrstall(privep);
-                stm32_ep0in_transmitzlp(priv);
+                stm32l4_ep_clrstall(privep);
+                stm32l4_ep0in_transmitzlp(priv);
               }
             else if (recipient == USB_REQ_RECIPIENT_DEVICE &&
                      ctrlreq->value == USB_FEATURE_REMOTEWAKEUP)
               {
                 priv->wakeup = 0;
-                stm32_ep0in_transmitzlp(priv);
+                stm32l4_ep0in_transmitzlp(priv);
               }
             else
               {
                 /* Actually, I think we could just stall here. */
 
-                (void)stm32_req_dispatch(priv, &priv->ctrlreq);
+                (void)stm32l4_req_dispatch(priv, &priv->ctrlreq);
               }
           }
         else
           {
-            usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADCLEARFEATURE), 0);
+            usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_BADCLEARFEATURE), 0);
             priv->stalled = true;
           }
       }
@@ -2328,44 +2328,44 @@ static inline void stm32_ep0out_stdrequest(struct stm32_usbdev_s *priv,
          * len:   0; data = none
          */
 
-        usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_SETFEATURE), 0);
+        usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_SETFEATURE), 0);
         if (priv->addressed != 0 && ctrlreq->len == 0)
           {
             uint8_t recipient = ctrlreq->type & USB_REQ_RECIPIENT_MASK;
             if (recipient == USB_REQ_RECIPIENT_ENDPOINT &&
                 ctrlreq->value == USB_FEATURE_ENDPOINTHALT &&
-                (privep = stm32_ep_findbyaddr(priv, ctrlreq->index)) != NULL)
+                (privep = stm32l4_ep_findbyaddr(priv, ctrlreq->index)) != NULL)
               {
-                stm32_ep_setstall(privep);
-                stm32_ep0in_transmitzlp(priv);
+                stm32l4_ep_setstall(privep);
+                stm32l4_ep0in_transmitzlp(priv);
               }
             else if (recipient == USB_REQ_RECIPIENT_DEVICE &&
                      ctrlreq->value == USB_FEATURE_REMOTEWAKEUP)
               {
                 priv->wakeup = 1;
-                stm32_ep0in_transmitzlp(priv);
+                stm32l4_ep0in_transmitzlp(priv);
               }
             else if (recipient == USB_REQ_RECIPIENT_DEVICE &&
                      ctrlreq->value == USB_FEATURE_TESTMODE &&
                      ((ctrlreq->index & 0xff) == 0))
               {
-                 stm32_ep0out_testmode(priv, ctrlreq->index);
+                 stm32l4_ep0out_testmode(priv, ctrlreq->index);
               }
             else if (priv->configured)
               {
                 /* Actually, I think we could just stall here. */
 
-                (void)stm32_req_dispatch(priv, &priv->ctrlreq);
+                (void)stm32l4_req_dispatch(priv, &priv->ctrlreq);
               }
             else
               {
-                usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADSETFEATURE), 0);
+                usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_BADSETFEATURE), 0);
                 priv->stalled = true;
               }
           }
         else
           {
-            usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADSETFEATURE), 0);
+            usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_BADSETFEATURE), 0);
             priv->stalled = true;
           }
       }
@@ -2379,7 +2379,7 @@ static inline void stm32_ep0out_stdrequest(struct stm32_usbdev_s *priv,
          * len:   0; data = none
          */
 
-        usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_SETADDRESS), ctrlreq->value);
+        usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_SETADDRESS), ctrlreq->value);
         if ((ctrlreq->type & USB_REQ_RECIPIENT_MASK) == USB_REQ_RECIPIENT_DEVICE &&
             ctrlreq->index  == 0 &&
             ctrlreq->len == 0 &&
@@ -2390,14 +2390,14 @@ static inline void stm32_ep0out_stdrequest(struct stm32_usbdev_s *priv,
              * the completion of the status phase.
              */
 
-            stm32_setaddress(priv, (uint16_t)priv->ctrlreq.value[0]);
-            stm32_ep0in_transmitzlp(priv);
+            stm32l4_setaddress(priv, (uint16_t)priv->ctrlreq.value[0]);
+            stm32l4_ep0in_transmitzlp(priv);
 
             uinfo("USB_REQ_SETADDRESS %02x\n",(uint16_t)priv->ctrlreq.value[0]);
           }
         else
           {
-            usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADSETADDRESS), 0);
+            usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_BADSETADDRESS), 0);
             priv->stalled = true;
           }
       }
@@ -2418,14 +2418,14 @@ static inline void stm32_ep0out_stdrequest(struct stm32_usbdev_s *priv,
        */
 
       {
-        usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_GETSETDESC), 0);
+        usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_GETSETDESC), 0);
         if ((ctrlreq->type & USB_REQ_RECIPIENT_MASK) == USB_REQ_RECIPIENT_DEVICE)
           {
-            (void)stm32_req_dispatch(priv, &priv->ctrlreq);
+            (void)stm32l4_req_dispatch(priv, &priv->ctrlreq);
           }
         else
           {
-            usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADGETSETDESC), 0);
+            usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_BADGETSETDESC), 0);
             priv->stalled = true;
           }
       }
@@ -2439,18 +2439,18 @@ static inline void stm32_ep0out_stdrequest(struct stm32_usbdev_s *priv,
        */
 
       {
-        usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_GETCONFIG), 0);
+        usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_GETCONFIG), 0);
         if (priv->addressed &&
            (ctrlreq->type & USB_REQ_RECIPIENT_MASK) == USB_REQ_RECIPIENT_DEVICE &&
             ctrlreq->value == 0 &&
             ctrlreq->index == 0 &&
             ctrlreq->len == 1)
           {
-            (void)stm32_req_dispatch(priv, &priv->ctrlreq);
+            (void)stm32l4_req_dispatch(priv, &priv->ctrlreq);
           }
         else
           {
-            usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADGETCONFIG), 0);
+            usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_BADGETCONFIG), 0);
             priv->stalled = true;
           }
       }
@@ -2464,7 +2464,7 @@ static inline void stm32_ep0out_stdrequest(struct stm32_usbdev_s *priv,
        */
 
       {
-        usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_SETCONFIG), 0);
+        usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_SETCONFIG), 0);
         if (priv->addressed &&
             (ctrlreq->type & USB_REQ_RECIPIENT_MASK) == USB_REQ_RECIPIENT_DEVICE &&
             ctrlreq->index == 0 &&
@@ -2472,7 +2472,7 @@ static inline void stm32_ep0out_stdrequest(struct stm32_usbdev_s *priv,
           {
             /* Give the configuration to the class driver */
 
-            int ret = stm32_req_dispatch(priv, &priv->ctrlreq);
+            int ret = stm32l4_req_dispatch(priv, &priv->ctrlreq);
 
             /* If the class driver accepted the configuration, then mark the
              * device state as configured (or not, depending on the
@@ -2496,7 +2496,7 @@ static inline void stm32_ep0out_stdrequest(struct stm32_usbdev_s *priv,
           }
         else
           {
-            usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADSETCONFIG), 0);
+            usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_BADSETCONFIG), 0);
             priv->stalled = true;
           }
       }
@@ -2517,8 +2517,8 @@ static inline void stm32_ep0out_stdrequest(struct stm32_usbdev_s *priv,
        */
 
       {
-        usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_GETSETIF), 0);
-        (void)stm32_req_dispatch(priv, &priv->ctrlreq);
+        usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_GETSETIF), 0);
+        (void)stm32l4_req_dispatch(priv, &priv->ctrlreq);
       }
       break;
 
@@ -2530,13 +2530,13 @@ static inline void stm32_ep0out_stdrequest(struct stm32_usbdev_s *priv,
        */
 
       {
-        usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_SYNCHFRAME), 0);
+        usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_SYNCHFRAME), 0);
       }
       break;
 
     default:
       {
-        usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDCTRLREQ), 0);
+        usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_INVALIDCTRLREQ), 0);
         priv->stalled = true;
       }
       break;
@@ -2544,7 +2544,7 @@ static inline void stm32_ep0out_stdrequest(struct stm32_usbdev_s *priv,
 }
 
 /****************************************************************************
- * Name: stm32_ep0out_setup
+ * Name: stm32l4_ep0out_setup
  *
  * Description:
  *   USB Ctrl EP Setup Event. This is logically part of the USB interrupt
@@ -2552,22 +2552,22 @@ static inline void stm32_ep0out_stdrequest(struct stm32_usbdev_s *priv,
  *
  ****************************************************************************/
 
-static inline void stm32_ep0out_setup(struct stm32_usbdev_s *priv)
+static inline void stm32l4_ep0out_setup(struct stm32l4_usbdev_s *priv)
 {
-  struct stm32_ctrlreq_s ctrlreq;
+  struct stm32l4_ctrlreq_s ctrlreq;
 
   /* Verify that a SETUP was received */
 
   if (priv->ep0state != EP0STATE_SETUP_READY)
     {
-      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_EP0NOSETUP), priv->ep0state);
+      usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_EP0NOSETUP), priv->ep0state);
       return;
     }
 
   /* Terminate any pending requests */
 
-  stm32_req_cancel(&priv->epout[EP0], -EPROTO);
-  stm32_req_cancel(&priv->epin[EP0],  -EPROTO);
+  stm32l4_req_cancel(&priv->epout[EP0], -EPROTO);
+  stm32l4_req_cancel(&priv->epin[EP0],  -EPROTO);
 
   /* Assume NOT stalled */
 
@@ -2596,21 +2596,21 @@ static inline void stm32_ep0out_setup(struct stm32_usbdev_s *priv)
     {
       /* Dispatch any non-standard requests */
 
-      (void)stm32_req_dispatch(priv, &priv->ctrlreq);
+      (void)stm32l4_req_dispatch(priv, &priv->ctrlreq);
     }
   else
     {
       /* Handle standard requests. */
 
-      stm32_ep0out_stdrequest(priv, &ctrlreq);
+      stm32l4_ep0out_stdrequest(priv, &ctrlreq);
     }
 
   /* Check if the setup processing resulted in a STALL */
 
   if (priv->stalled)
     {
-      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_EP0SETUPSTALLED), priv->ep0state);
-      stm32_ep0_stall(priv);
+      usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_EP0SETUPSTALLED), priv->ep0state);
+      stm32l4_ep0_stall(priv);
     }
 
   /* Reset state/data associated with thie SETUP request */
@@ -2619,7 +2619,7 @@ static inline void stm32_ep0out_setup(struct stm32_usbdev_s *priv)
 }
 
 /****************************************************************************
- * Name: stm32_epout
+ * Name: stm32l4_epout
  *
  * Description:
  *   This is part of the OUT endpoint interrupt processing.  This function
@@ -2627,9 +2627,9 @@ static inline void stm32_ep0out_setup(struct stm32_usbdev_s *priv)
  *
  ****************************************************************************/
 
-static inline void stm32_epout(FAR struct stm32_usbdev_s *priv, uint8_t epno)
+static inline void stm32l4_epout(FAR struct stm32l4_usbdev_s *priv, uint8_t epno)
 {
-  FAR struct stm32_ep_s *privep;
+  FAR struct stm32l4_ep_s *privep;
 
   /* Endpoint 0 is a special case. */
 
@@ -2646,7 +2646,7 @@ static inline void stm32_epout(FAR struct stm32_usbdev_s *priv, uint8_t epno)
         {
           /* Continue processing data from the EP0 OUT request queue */
 
-          stm32_epout_complete(priv, privep);
+          stm32l4_epout_complete(priv, privep);
 
           /* If we are not actively processing an OUT request, then we
            * need to setup to receive the next control request.
@@ -2654,7 +2654,7 @@ static inline void stm32_epout(FAR struct stm32_usbdev_s *priv, uint8_t epno)
 
           if (!privep->active)
             {
-              stm32_ep0out_ctrlsetup(priv);
+              stm32l4_ep0out_ctrlsetup(priv);
               priv->ep0state = EP0STATE_IDLE;
             }
         }
@@ -2666,12 +2666,12 @@ static inline void stm32_epout(FAR struct stm32_usbdev_s *priv, uint8_t epno)
 
   else if (priv->devstate == DEVSTATE_CONFIGURED)
     {
-      stm32_epout_complete(priv, &priv->epout[epno]);
+      stm32l4_epout_complete(priv, &priv->epout[epno]);
     }
 }
 
 /****************************************************************************
- * Name: stm32_epout_interrupt
+ * Name: stm32l4_epout_interrupt
  *
  * Description:
  *   USB OUT endpoint interrupt handler.  The core generates this interrupt when
@@ -2683,7 +2683,7 @@ static inline void stm32_epout(FAR struct stm32_usbdev_s *priv, uint8_t epno)
  *
  ****************************************************************************/
 
-static inline void stm32_epout_interrupt(FAR struct stm32_usbdev_s *priv)
+static inline void stm32l4_epout_interrupt(FAR struct stm32l4_usbdev_s *priv)
 {
   uint32_t daint;
   uint32_t regval;
@@ -2694,8 +2694,8 @@ static inline void stm32_epout_interrupt(FAR struct stm32_usbdev_s *priv)
    * interrupt status register.
    */
 
-  regval  = stm32_getreg(STM32_OTGFS_DAINT);
-  regval &= stm32_getreg(STM32_OTGFS_DAINTMSK);
+  regval  = stm32l4_getreg(STM32L4_OTGFS_DAINT);
+  regval &= stm32l4_getreg(STM32L4_OTGFS_DAINTMSK);
   daint   = (regval & OTGFS_DAINT_OEP_MASK) >> OTGFS_DAINT_OEP_SHIFT;
 
   if (daint == 0)
@@ -2710,10 +2710,10 @@ static inline void stm32_epout_interrupt(FAR struct stm32_usbdev_s *priv)
        * works by clearing each endpoint flags, masked or not.
        */
 
-      regval  = stm32_getreg(STM32_OTGFS_DAINT);
+      regval  = stm32l4_getreg(STM32L4_OTGFS_DAINT);
       daint   = (regval & OTGFS_DAINT_OEP_MASK) >> OTGFS_DAINT_OEP_SHIFT;
 
-      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_EPOUTUNEXPECTED),
+      usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_EPOUTUNEXPECTED),
                (uint16_t)regval);
 
       epno = 0;
@@ -2721,9 +2721,9 @@ static inline void stm32_epout_interrupt(FAR struct stm32_usbdev_s *priv)
         {
           if ((daint & 1) != 0)
             {
-              regval = stm32_getreg(STM32_OTGFS_DOEPINT(epno));
+              regval = stm32l4_getreg(STM32L4_OTGFS_DOEPINT(epno));
               uinfo("DOEPINT(%d) = %08x\n", epno, regval);
-              stm32_putreg(0xFF, STM32_OTGFS_DOEPINT(epno));
+              stm32l4_putreg(0xFF, STM32L4_OTGFS_DOEPINT(epno));
             }
 
           epno++;
@@ -2744,26 +2744,26 @@ static inline void stm32_epout_interrupt(FAR struct stm32_usbdev_s *priv)
         {
           /* Yes.. get the OUT endpoint interrupt status */
 
-          doepint  = stm32_getreg(STM32_OTGFS_DOEPINT(epno));
-          doepint &= stm32_getreg(STM32_OTGFS_DOEPMSK);
+          doepint  = stm32l4_getreg(STM32L4_OTGFS_DOEPINT(epno));
+          doepint &= stm32l4_getreg(STM32L4_OTGFS_DOEPMSK);
 
           /* Transfer completed interrupt.  This interrupt is trigged when
-           * stm32_rxinterrupt() removes the last packet data from the RxFIFO.
+           * stm32l4_rxinterrupt() removes the last packet data from the RxFIFO.
            * In this case, core internally sets the NAK bit for this endpoint to
            * prevent it from receiving any more packets.
            */
 
           if ((doepint & OTGFS_DOEPINT_XFRC) != 0)
             {
-              usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPOUT_XFRC), (uint16_t)doepint);
+              usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_EPOUT_XFRC), (uint16_t)doepint);
 
               /* Clear the bit in DOEPINTn for this interrupt */
 
-              stm32_putreg(OTGFS_DOEPINT_XFRC, STM32_OTGFS_DOEPINT(epno));
+              stm32l4_putreg(OTGFS_DOEPINT_XFRC, STM32L4_OTGFS_DOEPINT(epno));
 
               /* Handle the RX transfer data ready event */
 
-              stm32_epout(priv, epno);
+              stm32l4_epout(priv, epno);
             }
 
           /* Endpoint disabled interrupt (ignored because this interrupt is
@@ -2773,18 +2773,18 @@ static inline void stm32_epout_interrupt(FAR struct stm32_usbdev_s *priv)
           /* REVISIT: */
           if ((doepint & OTGFS_DOEPINT_EPDISD) != 0)
             {
-              usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPOUT_EPDISD), (uint16_t)doepint);
+              usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_EPOUT_EPDISD), (uint16_t)doepint);
 
               /* Clear the bit in DOEPINTn for this interrupt */
 
-              stm32_putreg(OTGFS_DOEPINT_EPDISD, STM32_OTGFS_DOEPINT(epno));
+              stm32l4_putreg(OTGFS_DOEPINT_EPDISD, STM32L4_OTGFS_DOEPINT(epno));
             }
 #endif
           /* Setup Phase Done (control EPs) */
 
           if ((doepint & OTGFS_DOEPINT_SETUP) != 0)
             {
-              usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPOUT_SETUP), priv->ep0state);
+              usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_EPOUT_SETUP), priv->ep0state);
 
               /* Handle the receipt of the IN SETUP packets now (OUT setup
                * packet processing may be delayed until the accompanying
@@ -2793,9 +2793,9 @@ static inline void stm32_epout_interrupt(FAR struct stm32_usbdev_s *priv)
 
               if (priv->ep0state == EP0STATE_SETUP_READY)
                 {
-                  stm32_ep0out_setup(priv);
+                  stm32l4_ep0out_setup(priv);
                 }
-              stm32_putreg(OTGFS_DOEPINT_SETUP, STM32_OTGFS_DOEPINT(epno));
+              stm32l4_putreg(OTGFS_DOEPINT_SETUP, STM32L4_OTGFS_DOEPINT(epno));
             }
         }
 
@@ -2805,26 +2805,26 @@ static inline void stm32_epout_interrupt(FAR struct stm32_usbdev_s *priv)
 }
 
 /****************************************************************************
- * Name: stm32_epin_runtestmode
+ * Name: stm32l4_epin_runtestmode
  *
  * Description:
  *   Execute the test mode setup by the SET FEATURE request
  *
  ****************************************************************************/
 
-static inline void stm32_epin_runtestmode(FAR struct stm32_usbdev_s *priv)
+static inline void stm32l4_epin_runtestmode(FAR struct stm32l4_usbdev_s *priv)
 {
-  uint32_t regval = stm32_getreg(STM32_OTGFS_DCTL);
+  uint32_t regval = stm32l4_getreg(STM32L4_OTGFS_DCTL);
   regval &= OTGFS_DCTL_TCTL_MASK;
   regval |= (uint32_t)priv->testmode << OTGFS_DCTL_TCTL_SHIFT;
-  stm32_putreg(regval , STM32_OTGFS_DCTL);
+  stm32l4_putreg(regval , STM32L4_OTGFS_DCTL);
 
   priv->dotest = 0;
   priv->testmode = OTGFS_TESTMODE_DISABLED;
 }
 
 /****************************************************************************
- * Name: stm32_epin
+ * Name: stm32l4_epin
  *
  * Description:
  *   This is part of the IN endpoint interrupt processing.  This function
@@ -2832,9 +2832,9 @@ static inline void stm32_epin_runtestmode(FAR struct stm32_usbdev_s *priv)
  *
  ****************************************************************************/
 
-static inline void stm32_epin(FAR struct stm32_usbdev_s *priv, uint8_t epno)
+static inline void stm32l4_epin(FAR struct stm32l4_usbdev_s *priv, uint8_t epno)
 {
-  FAR struct stm32_ep_s *privep = &priv->epin[epno];
+  FAR struct stm32l4_ep_s *privep = &priv->epin[epno];
 
   /* Endpoint 0 is a special case. */
 
@@ -2848,7 +2848,7 @@ static inline void stm32_epin(FAR struct stm32_usbdev_s *priv, uint8_t epno)
         {
           /* Continue processing data from the EP0 OUT request queue */
 
-          stm32_epin_request(priv, privep);
+          stm32l4_epin_request(priv, privep);
 
           /* If we are not actively processing an OUT request, then we
            * need to setup to receive the next control request.
@@ -2856,7 +2856,7 @@ static inline void stm32_epin(FAR struct stm32_usbdev_s *priv, uint8_t epno)
 
           if (!privep->active)
             {
-              stm32_ep0out_ctrlsetup(priv);
+              stm32l4_ep0out_ctrlsetup(priv);
               priv->ep0state = EP0STATE_IDLE;
             }
         }
@@ -2865,7 +2865,7 @@ static inline void stm32_epin(FAR struct stm32_usbdev_s *priv, uint8_t epno)
 
       if (priv->dotest)
         {
-          stm32_epin_runtestmode(priv);
+          stm32l4_epin_runtestmode(priv);
         }
     }
 
@@ -2877,32 +2877,32 @@ static inline void stm32_epin(FAR struct stm32_usbdev_s *priv, uint8_t epno)
     {
       /* Continue processing data from the endpoint write request queue */
 
-      stm32_epin_request(priv, privep);
+      stm32l4_epin_request(priv, privep);
     }
 }
 
 /****************************************************************************
- * Name: stm32_epin_txfifoempty
+ * Name: stm32l4_epin_txfifoempty
  *
  * Description:
  *   TxFIFO empty interrupt handling
  *
  ****************************************************************************/
 
-static inline void stm32_epin_txfifoempty(FAR struct stm32_usbdev_s *priv, int epno)
+static inline void stm32l4_epin_txfifoempty(FAR struct stm32l4_usbdev_s *priv, int epno)
 {
-  FAR struct stm32_ep_s *privep = &priv->epin[epno];
+  FAR struct stm32l4_ep_s *privep = &priv->epin[epno];
 
   /* Continue processing the write request queue.  This may mean sending
    * more data from the existing request or terminating the current requests
    * and (perhaps) starting the IN transfer from the next write request.
    */
 
-  stm32_epin_request(priv, privep);
+  stm32l4_epin_request(priv, privep);
 }
 
 /****************************************************************************
- * Name: stm32_epin_interrupt
+ * Name: stm32l4_epin_interrupt
  *
  * Description:
  *   USB IN endpoint interrupt handler.  The core generates this interrupt when
@@ -2913,7 +2913,7 @@ static inline void stm32_epin_txfifoempty(FAR struct stm32_usbdev_s *priv, int e
  *
  ****************************************************************************/
 
-static inline void stm32_epin_interrupt(FAR struct stm32_usbdev_s *priv)
+static inline void stm32l4_epin_interrupt(FAR struct stm32l4_usbdev_s *priv)
 {
   uint32_t diepint;
   uint32_t daint;
@@ -2925,8 +2925,8 @@ static inline void stm32_epin_interrupt(FAR struct stm32_usbdev_s *priv)
    * interrupt status register.
    */
 
-  daint  = stm32_getreg(STM32_OTGFS_DAINT);
-  daint &= stm32_getreg(STM32_OTGFS_DAINTMSK);
+  daint  = stm32l4_getreg(STM32L4_OTGFS_DAINT);
+  daint &= stm32l4_getreg(STM32L4_OTGFS_DAINTMSK);
   daint &= OTGFS_DAINT_IEP_MASK;
 
   if (daint == 0)
@@ -2941,8 +2941,8 @@ static inline void stm32_epin_interrupt(FAR struct stm32_usbdev_s *priv)
        * works by clearing each endpoint flags, masked or not.
        */
 
-      daint  = stm32_getreg(STM32_OTGFS_DAINT);
-      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_EPINUNEXPECTED),
+      daint  = stm32l4_getreg(STM32L4_OTGFS_DAINT);
+      usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_EPINUNEXPECTED),
                (uint16_t)daint);
 
       daint &= OTGFS_DAINT_IEP_MASK;
@@ -2953,8 +2953,8 @@ static inline void stm32_epin_interrupt(FAR struct stm32_usbdev_s *priv)
           if ((daint & 1) != 0)
             {
               uinfo("DIEPINT(%d) = %08x\n",
-                     epno, stm32_getreg(STM32_OTGFS_DIEPINT(epno)));
-              stm32_putreg(0xFF, STM32_OTGFS_DIEPINT(epno));
+                     epno, stm32l4_getreg(STM32L4_OTGFS_DIEPINT(epno)));
+              stm32l4_putreg(0xFF, STM32L4_OTGFS_DIEPINT(epno));
             }
 
           epno++;
@@ -2978,7 +2978,7 @@ static inline void stm32_epin_interrupt(FAR struct stm32_usbdev_s *priv)
            * register.
            */
 
-          mask = stm32_getreg(STM32_OTGFS_DIEPMSK);
+          mask = stm32l4_getreg(STM32L4_OTGFS_DIEPMSK);
 
           /* Check if the TxFIFO not empty interrupt is enabled for this
            * endpoint in the DIEPMSK register.  Bits n corresponds to
@@ -2987,7 +2987,7 @@ static inline void stm32_epin_interrupt(FAR struct stm32_usbdev_s *priv)
            * no TXFE bit in the mask register, so we fake one here.
            */
 
-          empty = stm32_getreg(STM32_OTGFS_DIEPEMPMSK);
+          empty = stm32l4_getreg(STM32L4_OTGFS_DIEPEMPMSK);
           if ((empty & OTGFS_DIEPEMPMSK(epno)) != 0)
             {
               mask |= OTGFS_DIEPINT_TXFE;
@@ -2997,14 +2997,14 @@ static inline void stm32_epin_interrupt(FAR struct stm32_usbdev_s *priv)
            * interrupts.
            */
 
-          diepint = stm32_getreg(STM32_OTGFS_DIEPINT(epno)) & mask;
+          diepint = stm32l4_getreg(STM32L4_OTGFS_DIEPINT(epno)) & mask;
 
           /* Decode and process the enabled, pending interrupts */
           /* Transfer completed interrupt */
 
           if ((diepint & OTGFS_DIEPINT_XFRC) != 0)
             {
-              usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPIN_XFRC),
+              usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_EPIN_XFRC),
                        (uint16_t)diepint);
 
               /* It is possible that logic may be waiting for a the
@@ -3014,20 +3014,20 @@ static inline void stm32_epin_interrupt(FAR struct stm32_usbdev_s *priv)
                */
 
               empty &= ~OTGFS_DIEPEMPMSK(epno);
-              stm32_putreg(empty, STM32_OTGFS_DIEPEMPMSK);
-              stm32_putreg(OTGFS_DIEPINT_XFRC, STM32_OTGFS_DIEPINT(epno));
+              stm32l4_putreg(empty, STM32L4_OTGFS_DIEPEMPMSK);
+              stm32l4_putreg(OTGFS_DIEPINT_XFRC, STM32L4_OTGFS_DIEPINT(epno));
 
               /* IN transfer complete */
 
-              stm32_epin(priv, epno);
+              stm32l4_epin(priv, epno);
             }
 
           /* Timeout condition */
 
           if ((diepint & OTGFS_DIEPINT_TOC) != 0)
             {
-              usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPIN_TOC), (uint16_t)diepint);
-              stm32_putreg(OTGFS_DIEPINT_TOC, STM32_OTGFS_DIEPINT(epno));
+              usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_EPIN_TOC), (uint16_t)diepint);
+              stm32l4_putreg(OTGFS_DIEPINT_TOC, STM32L4_OTGFS_DIEPINT(epno));
             }
 
           /* IN token received when TxFIFO is empty.  Applies to non-periodic IN
@@ -3039,9 +3039,9 @@ static inline void stm32_epin_interrupt(FAR struct stm32_usbdev_s *priv)
 
           if ((diepint & OTGFS_DIEPINT_ITTXFE) != 0)
             {
-              usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPIN_ITTXFE), (uint16_t)diepint);
-              stm32_epin_request(priv, &priv->epin[epno]);
-              stm32_putreg(OTGFS_DIEPINT_ITTXFE, STM32_OTGFS_DIEPINT(epno));
+              usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_EPIN_ITTXFE), (uint16_t)diepint);
+              stm32l4_epin_request(priv, &priv->epin[epno]);
+              stm32l4_putreg(OTGFS_DIEPINT_ITTXFE, STM32L4_OTGFS_DIEPINT(epno));
             }
 
           /* IN endpoint NAK effective (ignored as this used only in polled
@@ -3050,8 +3050,8 @@ static inline void stm32_epin_interrupt(FAR struct stm32_usbdev_s *priv)
 #if 0
           if ((diepint & OTGFS_DIEPINT_INEPNE) != 0)
             {
-              usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPIN_INEPNE), (uint16_t)diepint);
-              stm32_putreg(OTGFS_DIEPINT_INEPNE, STM32_OTGFS_DIEPINT(epno));
+              usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_EPIN_INEPNE), (uint16_t)diepint);
+              stm32l4_putreg(OTGFS_DIEPINT_INEPNE, STM32L4_OTGFS_DIEPINT(epno));
             }
 #endif
           /* Endpoint disabled interrupt (ignored as this used only in polled
@@ -3060,15 +3060,15 @@ static inline void stm32_epin_interrupt(FAR struct stm32_usbdev_s *priv)
 #if 0
           if ((diepint & OTGFS_DIEPINT_EPDISD) != 0)
             {
-              usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPIN_EPDISD), (uint16_t)diepint);
-              stm32_putreg(OTGFS_DIEPINT_EPDISD, STM32_OTGFS_DIEPINT(epno));
+              usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_EPIN_EPDISD), (uint16_t)diepint);
+              stm32l4_putreg(OTGFS_DIEPINT_EPDISD, STM32L4_OTGFS_DIEPINT(epno));
             }
 #endif
           /* Transmit FIFO empty */
 
           if ((diepint & OTGFS_DIEPINT_TXFE) != 0)
             {
-              usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPIN_TXFE), (uint16_t)diepint);
+              usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_EPIN_TXFE), (uint16_t)diepint);
 
               /* If we were waiting for TxFIFO to become empty, the we might have both
                * XFRC and TXFE interrupts pending.  Since we do the same thing for both
@@ -3082,16 +3082,16 @@ static inline void stm32_epin_interrupt(FAR struct stm32_usbdev_s *priv)
                    */
 
                   empty &= ~OTGFS_DIEPEMPMSK(epno);
-                  stm32_putreg(empty, STM32_OTGFS_DIEPEMPMSK);
+                  stm32l4_putreg(empty, STM32L4_OTGFS_DIEPEMPMSK);
 
                   /* Handle TxFIFO empty */
 
-                  stm32_epin_txfifoempty(priv, epno);
+                  stm32l4_epin_txfifoempty(priv, epno);
                 }
 
               /* Clear the pending TxFIFO empty interrupt */
 
-              stm32_putreg(OTGFS_DIEPINT_TXFE, STM32_OTGFS_DIEPINT(epno));
+              stm32l4_putreg(OTGFS_DIEPINT_TXFE, STM32L4_OTGFS_DIEPINT(epno));
             }
         }
 
@@ -3101,30 +3101,30 @@ static inline void stm32_epin_interrupt(FAR struct stm32_usbdev_s *priv)
 }
 
 /****************************************************************************
- * Name: stm32_resumeinterrupt
+ * Name: stm32l4_resumeinterrupt
  *
  * Description:
  *   Resume/remote wakeup detected interrupt
  *
  ****************************************************************************/
 
-static inline void stm32_resumeinterrupt(FAR struct stm32_usbdev_s *priv)
+static inline void stm32l4_resumeinterrupt(FAR struct stm32l4_usbdev_s *priv)
 {
   uint32_t regval;
 
   /* Restart the PHY clock and un-gate USB core clock (HCLK) */
 
 #ifdef CONFIG_USBDEV_LOWPOWER
-  regval = stm32_getreg(STM32_OTGFS_PCGCCTL);
+  regval = stm32l4_getreg(STM32L4_OTGFS_PCGCCTL);
   regval &= ~(OTGFS_PCGCCTL_STPPCLK | OTGFS_PCGCCTL_GATEHCLK);
-  stm32_putreg(regval, STM32_OTGFS_PCGCCTL);
+  stm32l4_putreg(regval, STM32L4_OTGFS_PCGCCTL);
 #endif
 
   /* Clear remote wake-up signaling */
 
-  regval  = stm32_getreg(STM32_OTGFS_DCTL);
+  regval  = stm32l4_getreg(STM32L4_OTGFS_DCTL);
   regval &= ~OTGFS_DCTL_RWUSIG;
-  stm32_putreg(regval, STM32_OTGFS_DCTL);
+  stm32l4_putreg(regval, STM32L4_OTGFS_DCTL);
 
   /* Restore full power -- whatever that means for this particular board */
 
@@ -3139,14 +3139,14 @@ static inline void stm32_resumeinterrupt(FAR struct stm32_usbdev_s *priv)
 }
 
 /****************************************************************************
- * Name: stm32_suspendinterrupt
+ * Name: stm32l4_suspendinterrupt
  *
  * Description:
  *   USB suspend interrupt
  *
  ****************************************************************************/
 
-static inline void stm32_suspendinterrupt(FAR struct stm32_usbdev_s *priv)
+static inline void stm32l4_suspendinterrupt(FAR struct stm32l4_usbdev_s *priv)
 {
 #ifdef CONFIG_USBDEV_LOWPOWER
   uint32_t regval;
@@ -3165,7 +3165,7 @@ static inline void stm32_suspendinterrupt(FAR struct stm32_usbdev_s *priv)
    * connected to the host, and that we have been configured.
    */
 
-  regval = stm32_getreg(STM32_OTGFS_DSTS);
+  regval = stm32l4_getreg(STM32L4_OTGFS_DSTS);
 
   if ((regval & OTGFS_DSTS_SUSPSTS) != 0 && devstate == DEVSTATE_CONFIGURED)
     {
@@ -3173,16 +3173,16 @@ static inline void stm32_suspendinterrupt(FAR struct stm32_usbdev_s *priv)
        * PHY clock.
        */
 
-      regval = stm32_getreg(STM32_OTGFS_PCGCCTL);
+      regval = stm32l4_getreg(STM32L4_OTGFS_PCGCCTL);
       regval |= OTGFS_PCGCCTL_STPPCLK;
-      stm32_putreg(regval, STM32_OTGFS_PCGCCTL);
+      stm32l4_putreg(regval, STM32L4_OTGFS_PCGCCTL);
 
       /* Setting OTGFS_PCGCCTL_GATEHCLK gate HCLK to modules other than
        * the AHB Slave and Master and wakeup logic.
        */
 
       regval |= OTGFS_PCGCCTL_GATEHCLK;
-      stm32_putreg(regval, STM32_OTGFS_PCGCCTL);
+      stm32l4_putreg(regval, STM32L4_OTGFS_PCGCCTL);
     }
 #endif
 
@@ -3194,7 +3194,7 @@ static inline void stm32_suspendinterrupt(FAR struct stm32_usbdev_s *priv)
 }
 
 /****************************************************************************
- * Name: stm32_rxinterrupt
+ * Name: stm32l4_rxinterrupt
  *
  * Description:
  *   RxFIFO non-empty interrupt.  This interrupt indicates that there is at
@@ -3202,28 +3202,28 @@ static inline void stm32_suspendinterrupt(FAR struct stm32_usbdev_s *priv)
  *
  ****************************************************************************/
 
-static inline void stm32_rxinterrupt(FAR struct stm32_usbdev_s *priv)
+static inline void stm32l4_rxinterrupt(FAR struct stm32l4_usbdev_s *priv)
 {
-  FAR struct stm32_ep_s *privep;
+  FAR struct stm32l4_ep_s *privep;
   uint32_t regval;
   int bcnt;
   int epphy;
 
   /* Disable the Rx status queue level interrupt */
 
-  regval = stm32_getreg(STM32_OTGFS_GINTMSK);
+  regval = stm32l4_getreg(STM32L4_OTGFS_GINTMSK);
   regval &= ~OTGFS_GINT_RXFLVL;
-  stm32_putreg(regval, STM32_OTGFS_GINTMSK);
+  stm32l4_putreg(regval, STM32L4_OTGFS_GINTMSK);
 
   /* Get the status from the top of the FIFO */
 
-  regval = stm32_getreg(STM32_OTGFS_GRXSTSP);
+  regval = stm32l4_getreg(STM32L4_OTGFS_GRXSTSP);
 
   /* Decode status fields */
 
   epphy  = (regval & OTGFS_GRXSTSD_EPNUM_MASK) >> OTGFS_GRXSTSD_EPNUM_SHIFT;
 
-  if (epphy < STM32_NENDPOINTS)
+  if (epphy < STM32L4_NENDPOINTS)
     {
       privep = &priv->epout[epphy];
 
@@ -3240,7 +3240,7 @@ static inline void stm32_rxinterrupt(FAR struct stm32_usbdev_s *priv)
 
         case OTGFS_GRXSTSD_PKTSTS_OUTNAK:
           {
-            usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_OUTNAK), 0);
+            usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_OUTNAK), 0);
           }
           break;
 
@@ -3252,11 +3252,11 @@ static inline void stm32_rxinterrupt(FAR struct stm32_usbdev_s *priv)
 
         case OTGFS_GRXSTSD_PKTSTS_OUTRECVD:
           {
-            usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_OUTRECVD), epphy);
+            usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_OUTRECVD), epphy);
             bcnt = (regval & OTGFS_GRXSTSD_BCNT_MASK) >> OTGFS_GRXSTSD_BCNT_SHIFT;
             if (bcnt > 0)
               {
-                stm32_epout_receive(privep, bcnt);
+                stm32l4_epout_receive(privep, bcnt);
               }
           }
           break;
@@ -3272,7 +3272,7 @@ static inline void stm32_rxinterrupt(FAR struct stm32_usbdev_s *priv)
 
         case OTGFS_GRXSTSD_PKTSTS_OUTDONE:
           {
-            usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_OUTDONE), epphy);
+            usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_OUTDONE), epphy);
           }
           break;
 
@@ -3288,7 +3288,7 @@ static inline void stm32_rxinterrupt(FAR struct stm32_usbdev_s *priv)
 
         case OTGFS_GRXSTSD_PKTSTS_SETUPDONE:
           {
-            usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_SETUPDONE), epphy);
+            usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_SETUPDONE), epphy);
           }
           break;
 
@@ -3302,14 +3302,14 @@ static inline void stm32_rxinterrupt(FAR struct stm32_usbdev_s *priv)
           {
             uint16_t datlen;
 
-            usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_SETUPRECVD), epphy);
+            usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_SETUPRECVD), epphy);
 
             /* Read EP0 setup data.  NOTE:  If multiple SETUP packets are received,
              * the last one overwrites the previous setup packets and only that
              * last SETUP packet will be processed.
              */
 
-            stm32_rxfifo_read(&priv->epout[EP0], (FAR uint8_t *)&priv->ctrlreq,
+            stm32l4_rxfifo_read(&priv->epout[EP0], (FAR uint8_t *)&priv->ctrlreq,
                              USB_SIZEOF_CTRLREQ);
 
             /* Was this an IN or an OUT SETUP packet.  If it is an OUT SETUP,
@@ -3326,9 +3326,9 @@ static inline void stm32_rxinterrupt(FAR struct stm32_usbdev_s *priv)
               {
                 /* Clear NAKSTS so that we can receive the data */
 
-                regval  = stm32_getreg(STM32_OTGFS_DOEPCTL0);
+                regval  = stm32l4_getreg(STM32L4_OTGFS_DOEPCTL0);
                 regval |= OTGFS_DOEPCTL0_CNAK;
-                stm32_putreg(regval, STM32_OTGFS_DOEPCTL0);
+                stm32l4_putreg(regval, STM32L4_OTGFS_DOEPCTL0);
 
                 /* Wait for the data phase. */
 
@@ -3347,7 +3347,7 @@ static inline void stm32_rxinterrupt(FAR struct stm32_usbdev_s *priv)
 
         default:
           {
-            usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS),
+            usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_INVALIDPARMS),
                      (regval & OTGFS_GRXSTSD_PKTSTS_MASK) >> OTGFS_GRXSTSD_PKTSTS_SHIFT);
           }
           break;
@@ -3356,37 +3356,37 @@ static inline void stm32_rxinterrupt(FAR struct stm32_usbdev_s *priv)
 
   /* Enable the Rx Status Queue Level interrupt */
 
-  regval  = stm32_getreg(STM32_OTGFS_GINTMSK);
+  regval  = stm32l4_getreg(STM32L4_OTGFS_GINTMSK);
   regval |= OTGFS_GINT_RXFLVL;
-  stm32_putreg(regval, STM32_OTGFS_GINTMSK);
+  stm32l4_putreg(regval, STM32L4_OTGFS_GINTMSK);
 }
 
 /****************************************************************************
- * Name: stm32_enuminterrupt
+ * Name: stm32l4_enuminterrupt
  *
  * Description:
  *   Enumeration done interrupt
  *
  ****************************************************************************/
 
-static inline void stm32_enuminterrupt(FAR struct stm32_usbdev_s *priv)
+static inline void stm32l4_enuminterrupt(FAR struct stm32l4_usbdev_s *priv)
 {
   uint32_t regval;
 
   /* Activate EP0 */
 
-  stm32_ep0in_activate();
+  stm32l4_ep0in_activate();
 
   /* Set USB turn-around time for the full speed device with internal PHY interface. */
 
-  regval  = stm32_getreg(STM32_OTGFS_GUSBCFG);
+  regval  = stm32l4_getreg(STM32L4_OTGFS_GUSBCFG);
   regval &= ~OTGFS_GUSBCFG_TRDT_MASK;
   regval |=  OTGFS_GUSBCFG_TRDT(5);
-  stm32_putreg(regval, STM32_OTGFS_GUSBCFG);
+  stm32l4_putreg(regval, STM32L4_OTGFS_GUSBCFG);
 }
 
 /****************************************************************************
- * Name: stm32_isocininterrupt
+ * Name: stm32l4_isocininterrupt
  *
  * Description:
  *   Incomplete isochronous IN transfer interrupt.  Assertion of the incomplete
@@ -3396,7 +3396,7 @@ static inline void stm32_enuminterrupt(FAR struct stm32_usbdev_s *priv)
  ****************************************************************************/
 
 #ifdef CONFIG_USBDEV_ISOCHRONOUS
-static inline void stm32_isocininterrupt(FAR struct stm32_usbdev_s *priv)
+static inline void stm32l4_isocininterrupt(FAR struct stm32l4_usbdev_s *priv)
 {
   int i;
 
@@ -3404,7 +3404,7 @@ static inline void stm32_isocininterrupt(FAR struct stm32_usbdev_s *priv)
    * IN endpoints to detect endpoints with incomplete IN data transfers.
    */
 
-  for (i = 0; i < STM32_NENDPOINTS; i++)
+  for (i = 0; i < STM32L4_NENDPOINTS; i++)
     {
       /* Is this an isochronous IN endpoint? */
 
@@ -3427,9 +3427,9 @@ static inline void stm32_isocininterrupt(FAR struct stm32_usbdev_s *priv)
 
       /* Check if this is the endpoint that had the incomplete transfer */
 
-      regaddr = STM32_OTGFS_DIEPCTL(privep->epphy);
-      doepctl = stm32_getreg(regaddr);
-      dsts    = stm32_getreg(STM32_OTGFS_DSTS);
+      regaddr = STM32L4_OTGFS_DIEPCTL(privep->epphy);
+      doepctl = stm32l4_getreg(regaddr);
+      dsts    = stm32l4_getreg(STM32L4_OTGFS_DSTS);
 
       /* EONUM = 0:even frame, 1:odd frame
        * SOFFN = Frame number of the received SOF
@@ -3450,16 +3450,16 @@ static inline void stm32_isocininterrupt(FAR struct stm32_usbdev_s *priv)
        * disable the endpoint.
        */
 
-      stm32_req_complete(privep, -EIO);
+      stm32l4_req_complete(privep, -EIO);
 #warning "Will clear OTGFS_DIEPCTL_USBAEP too"
-      stm32_epin_disable(privep);
+      stm32l4_epin_disable(privep);
       break;
     }
 }
 #endif
 
 /****************************************************************************
- * Name: stm32_isocoutinterrupt
+ * Name: stm32l4_isocoutinterrupt
  *
  * Description:
  *   Incomplete periodic transfer interrupt
@@ -3467,10 +3467,10 @@ static inline void stm32_isocininterrupt(FAR struct stm32_usbdev_s *priv)
  ****************************************************************************/
 
 #ifdef CONFIG_USBDEV_ISOCHRONOUS
-static inline void stm32_isocoutinterrupt(FAR struct stm32_usbdev_s *priv)
+static inline void stm32l4_isocoutinterrupt(FAR struct stm32l4_usbdev_s *priv)
 {
-  FAR struct stm32_ep_s *privep;
-  FAR struct stm32_req_s *privreq;
+  FAR struct stm32l4_ep_s *privep;
+  FAR struct stm32l4_req_s *privreq;
   uint32_t regaddr;
   uint32_t doepctl;
   uint32_t dsts;
@@ -3486,7 +3486,7 @@ static inline void stm32_isocoutinterrupt(FAR struct stm32_usbdev_s *priv)
    *   DOEPCTLx:EPENA = 1
    */
 
-  for (i = 0; i < STM32_NENDPOINTS; i++)
+  for (i = 0; i < STM32L4_NENDPOINTS; i++)
     {
       /* Is this an isochronous OUT endpoint? */
 
@@ -3509,9 +3509,9 @@ static inline void stm32_isocoutinterrupt(FAR struct stm32_usbdev_s *priv)
 
       /* Check if this is the endpoint that had the incomplete transfer */
 
-      regaddr = STM32_OTGFS_DOEPCTL(privep->epphy);
-      doepctl = stm32_getreg(regaddr);
-      dsts    = stm32_getreg(STM32_OTGFS_DSTS);
+      regaddr = STM32L4_OTGFS_DOEPCTL(privep->epphy);
+      doepctl = stm32l4_getreg(regaddr);
+      dsts    = stm32l4_getreg(STM32L4_OTGFS_DSTS);
 
       /* EONUM = 0:even frame, 1:odd frame
        * SOFFN = Frame number of the received SOF
@@ -3532,16 +3532,16 @@ static inline void stm32_isocoutinterrupt(FAR struct stm32_usbdev_s *priv)
        * disable the endpoint.
        */
 
-      stm32_req_complete(privep, -EIO);
+      stm32l4_req_complete(privep, -EIO);
 #warning "Will clear OTGFS_DOEPCTL_USBAEP too"
-      stm32_epout_disable(privep);
+      stm32l4_epout_disable(privep);
       break;
     }
 }
 #endif
 
 /****************************************************************************
- * Name: stm32_sessioninterrupt
+ * Name: stm32l4_sessioninterrupt
  *
  * Description:
  *   Session request/new session detected interrupt
@@ -3549,14 +3549,14 @@ static inline void stm32_isocoutinterrupt(FAR struct stm32_usbdev_s *priv)
  ****************************************************************************/
 
 #ifdef CONFIG_USBDEV_VBUSSENSING
-static inline void stm32_sessioninterrupt(FAR struct stm32_usbdev_s *priv)
+static inline void stm32l4_sessioninterrupt(FAR struct stm32l4_usbdev_s *priv)
 {
 #warning "Missing logic"
 }
 #endif
 
 /****************************************************************************
- * Name: stm32_otginterrupt
+ * Name: stm32l4_otginterrupt
  *
  * Description:
  *   OTG interrupt
@@ -3564,13 +3564,13 @@ static inline void stm32_sessioninterrupt(FAR struct stm32_usbdev_s *priv)
  ****************************************************************************/
 
 #ifdef CONFIG_USBDEV_VBUSSENSING
-static inline void stm32_otginterrupt(FAR struct stm32_usbdev_s *priv)
+static inline void stm32l4_otginterrupt(FAR struct stm32l4_usbdev_s *priv)
 {
   uint32_t regval;
 
   /* Check for session end detected */
 
-  regval = stm32_getreg(STM32_OTGFS_GOTGINT);
+  regval = stm32l4_getreg(STM32L4_OTGFS_GOTGINT);
   if ((regval & OTGFS_GOTGINT_SEDET) != 0)
     {
 #warning "Missing logic"
@@ -3578,19 +3578,19 @@ static inline void stm32_otginterrupt(FAR struct stm32_usbdev_s *priv)
 
   /* Clear OTG interrupt */
 
-  stm32_putreg(regval, STM32_OTGFS_GOTGINT);
+  stm32l4_putreg(regval, STM32L4_OTGFS_GOTGINT);
 }
 #endif
 
 /****************************************************************************
- * Name: stm32_usbinterrupt
+ * Name: stm32l4_usbinterrupt
  *
  * Description:
  *   USB interrupt handler
  *
  ****************************************************************************/
 
-static int stm32_usbinterrupt(int irq, FAR void *context)
+static int stm32l4_usbinterrupt(int irq, FAR void *context)
 {
   /* At present, there is only a single OTG FS device support. Hence it is
    * pre-allocated as g_otgfsdev.  However, in most code, the private data
@@ -3598,14 +3598,14 @@ static int stm32_usbinterrupt(int irq, FAR void *context)
    * global data) in order to simplify any future support for multiple devices.
    */
 
-  FAR struct stm32_usbdev_s *priv = &g_otgfsdev;
+  FAR struct stm32l4_usbdev_s *priv = &g_otgfsdev;
   uint32_t regval;
 
-  usbtrace(TRACE_INTENTRY(STM32_TRACEINTID_USB), 0);
+  usbtrace(TRACE_INTENTRY(STM32L4_TRACEINTID_USB), 0);
 
   /* Assure that we are in device mode */
 
-  DEBUGASSERT((stm32_getreg(STM32_OTGFS_GINTSTS) & OTGFS_GINTSTS_CMOD) == OTGFS_GINTSTS_DEVMODE);
+  DEBUGASSERT((stm32l4_getreg(STM32L4_OTGFS_GINTSTS) & OTGFS_GINTSTS_CMOD) == OTGFS_GINTSTS_DEVMODE);
 
   /* Get the state of all enabled interrupts.  We will do this repeatedly
    * some interrupts (like RXFLVL) will generate additional interrupting
@@ -3616,8 +3616,8 @@ static int stm32_usbinterrupt(int irq, FAR void *context)
     {
       /* Get the set of pending, un-masked interrupts */
 
-      regval  = stm32_getreg(STM32_OTGFS_GINTSTS);
-      regval &= stm32_getreg(STM32_OTGFS_GINTMSK);
+      regval  = stm32l4_getreg(STM32L4_OTGFS_GINTSTS);
+      regval &= stm32l4_getreg(STM32L4_OTGFS_GINTMSK);
 
       /* Break out of the loop when there are no further pending (and
        * unmasked) interrupts to be processes.
@@ -3627,7 +3627,7 @@ static int stm32_usbinterrupt(int irq, FAR void *context)
         {
           break;
         }
-      usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_INTPENDING), (uint16_t)regval);
+      usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_INTPENDING), (uint16_t)regval);
 
       /* OUT endpoint interrupt. The core sets this bit to indicate that an
        * interrupt is pending on one of the OUT endpoints of the core.
@@ -3635,9 +3635,9 @@ static int stm32_usbinterrupt(int irq, FAR void *context)
 
       if ((regval & OTGFS_GINT_OEP) != 0)
         {
-          usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPOUT), (uint16_t)regval);
-          stm32_epout_interrupt(priv);
-          stm32_putreg(OTGFS_GINT_OEP, STM32_OTGFS_GINTSTS);
+          usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_EPOUT), (uint16_t)regval);
+          stm32l4_epout_interrupt(priv);
+          stm32l4_putreg(OTGFS_GINT_OEP, STM32L4_OTGFS_GINTSTS);
         }
 
       /* IN endpoint interrupt.  The core sets this bit to indicate that
@@ -3646,9 +3646,9 @@ static int stm32_usbinterrupt(int irq, FAR void *context)
 
       if ((regval & OTGFS_GINT_IEP) != 0)
         {
-          usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_EPIN), (uint16_t)regval);
-          stm32_epin_interrupt(priv);
-          stm32_putreg(OTGFS_GINT_IEP, STM32_OTGFS_GINTSTS);
+          usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_EPIN), (uint16_t)regval);
+          stm32l4_epin_interrupt(priv);
+          stm32l4_putreg(OTGFS_GINT_IEP, STM32L4_OTGFS_GINTSTS);
         }
 
       /* Host/device mode mismatch error interrupt */
@@ -3656,8 +3656,8 @@ static int stm32_usbinterrupt(int irq, FAR void *context)
 #ifdef CONFIG_DEBUG_USB
       if ((regval & OTGFS_GINT_MMIS) != 0)
         {
-          usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_MISMATCH), (uint16_t)regval);
-          stm32_putreg(OTGFS_GINT_MMIS, STM32_OTGFS_GINTSTS);
+          usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_MISMATCH), (uint16_t)regval);
+          stm32l4_putreg(OTGFS_GINT_MMIS, STM32L4_OTGFS_GINTSTS);
         }
 #endif
 
@@ -3665,18 +3665,18 @@ static int stm32_usbinterrupt(int irq, FAR void *context)
 
       if ((regval & OTGFS_GINT_WKUP) != 0)
         {
-          usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_WAKEUP), (uint16_t)regval);
-          stm32_resumeinterrupt(priv);
-          stm32_putreg(OTGFS_GINT_WKUP, STM32_OTGFS_GINTSTS);
+          usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_WAKEUP), (uint16_t)regval);
+          stm32l4_resumeinterrupt(priv);
+          stm32l4_putreg(OTGFS_GINT_WKUP, STM32L4_OTGFS_GINTSTS);
         }
 
       /* USB suspend interrupt */
 
       if ((regval & OTGFS_GINT_USBSUSP) != 0)
         {
-          usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_SUSPEND), (uint16_t)regval);
-          stm32_suspendinterrupt(priv);
-          stm32_putreg(OTGFS_GINT_USBSUSP, STM32_OTGFS_GINTSTS);
+          usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_SUSPEND), (uint16_t)regval);
+          stm32l4_suspendinterrupt(priv);
+          stm32l4_putreg(OTGFS_GINT_USBSUSP, STM32L4_OTGFS_GINTSTS);
         }
 
       /* Start of frame interrupt */
@@ -3684,8 +3684,8 @@ static int stm32_usbinterrupt(int irq, FAR void *context)
 #ifdef CONFIG_USBDEV_SOFINTERRUPT
       if ((regval & OTGFS_GINT_SOF) != 0)
         {
-          usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_SOF), (uint16_t)regval);
-          stm32_putreg(OTGFS_GINT_SOF, STM32_OTGFS_GINTSTS);
+          usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_SOF), (uint16_t)regval);
+          stm32l4_putreg(OTGFS_GINT_SOF, STM32L4_OTGFS_GINTSTS);
         }
 #endif
 
@@ -3695,22 +3695,22 @@ static int stm32_usbinterrupt(int irq, FAR void *context)
 
       if ((regval & OTGFS_GINT_RXFLVL) != 0)
         {
-          usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_RXFIFO), (uint16_t)regval);
-          stm32_rxinterrupt(priv);
-          stm32_putreg(OTGFS_GINT_RXFLVL, STM32_OTGFS_GINTSTS);
+          usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_RXFIFO), (uint16_t)regval);
+          stm32l4_rxinterrupt(priv);
+          stm32l4_putreg(OTGFS_GINT_RXFLVL, STM32L4_OTGFS_GINTSTS);
         }
 
       /* USB reset interrupt */
 
       if ((regval & OTGFS_GINT_USBRST) != 0)
         {
-          usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_DEVRESET), (uint16_t)regval);
+          usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_DEVRESET), (uint16_t)regval);
 
           /* Perform the device reset */
 
-          stm32_usbreset(priv);
-          usbtrace(TRACE_INTEXIT(STM32_TRACEINTID_USB), 0);
-          stm32_putreg(OTGFS_GINT_USBRST, STM32_OTGFS_GINTSTS);
+          stm32l4_usbreset(priv);
+          usbtrace(TRACE_INTEXIT(STM32L4_TRACEINTID_USB), 0);
+          stm32l4_putreg(OTGFS_GINT_USBRST, STM32L4_OTGFS_GINTSTS);
           return OK;
         }
 
@@ -3718,9 +3718,9 @@ static int stm32_usbinterrupt(int irq, FAR void *context)
 
       if ((regval & OTGFS_GINT_ENUMDNE) != 0)
         {
-          usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_ENUMDNE), (uint16_t)regval);
-          stm32_enuminterrupt(priv);
-          stm32_putreg(OTGFS_GINT_ENUMDNE, STM32_OTGFS_GINTSTS);
+          usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_ENUMDNE), (uint16_t)regval);
+          stm32l4_enuminterrupt(priv);
+          stm32l4_putreg(OTGFS_GINT_ENUMDNE, STM32L4_OTGFS_GINTSTS);
         }
 
       /* Incomplete isochronous IN transfer interrupt.  When the core finds
@@ -3732,9 +3732,9 @@ static int stm32_usbinterrupt(int irq, FAR void *context)
 #ifdef CONFIG_USBDEV_ISOCHRONOUS
       if ((regval & OTGFS_GINT_IISOIXFR) != 0)
         {
-          usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_IISOIXFR), (uint16_t)regval);
-          stm32_isocininterrupt(priv);
-          stm32_putreg(OTGFS_GINT_IISOIXFR, STM32_OTGFS_GINTSTS);
+          usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_IISOIXFR), (uint16_t)regval);
+          stm32l4_isocininterrupt(priv);
+          stm32l4_putreg(OTGFS_GINT_IISOIXFR, STM32L4_OTGFS_GINTSTS);
         }
 
       /* Incomplete isochronous OUT transfer.  For isochronous OUT
@@ -3749,9 +3749,9 @@ static int stm32_usbinterrupt(int irq, FAR void *context)
 
       if ((regval & OTGFS_GINT_IISOOXFR) != 0)
         {
-          usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_IISOOXFR), (uint16_t)regval);
-          stm32_isocoutinterrupt(priv);
-          stm32_putreg(OTGFS_GINT_IISOOXFR, STM32_OTGFS_GINTSTS);
+          usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_IISOOXFR), (uint16_t)regval);
+          stm32l4_isocoutinterrupt(priv);
+          stm32l4_putreg(OTGFS_GINT_IISOOXFR, STM32L4_OTGFS_GINTSTS);
         }
 #endif
 
@@ -3760,23 +3760,23 @@ static int stm32_usbinterrupt(int irq, FAR void *context)
 #ifdef CONFIG_USBDEV_VBUSSENSING
       if ((regval & OTGFS_GINT_SRQ) != 0)
         {
-          usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_SRQ), (uint16_t)regval);
-          stm32_sessioninterrupt(priv);
-          stm32_putreg(OTGFS_GINT_SRQ, STM32_OTGFS_GINTSTS);
+          usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_SRQ), (uint16_t)regval);
+          stm32l4_sessioninterrupt(priv);
+          stm32l4_putreg(OTGFS_GINT_SRQ, STM32L4_OTGFS_GINTSTS);
         }
 
       /* OTG interrupt */
 
       if ((regval & OTGFS_GINT_OTG) != 0)
         {
-          usbtrace(TRACE_INTDECODE(STM32_TRACEINTID_OTG), (uint16_t)regval);
-          stm32_otginterrupt(priv);
-          stm32_putreg(OTGFS_GINT_OTG, STM32_OTGFS_GINTSTS);
+          usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_OTG), (uint16_t)regval);
+          stm32l4_otginterrupt(priv);
+          stm32l4_putreg(OTGFS_GINT_OTG, STM32L4_OTGFS_GINTSTS);
         }
 #endif
     }
 
-  usbtrace(TRACE_INTEXIT(STM32_TRACEINTID_USB), 0);
+  usbtrace(TRACE_INTEXIT(STM32L4_TRACEINTID_USB), 0);
   return OK;
 }
 
@@ -3785,28 +3785,28 @@ static int stm32_usbinterrupt(int irq, FAR void *context)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: stm32_enablegonak
+ * Name: stm32l4_enablegonak
  *
  * Description:
  *   Enable global OUT NAK mode
  *
  ****************************************************************************/
 
-static void stm32_enablegonak(FAR struct stm32_ep_s *privep)
+static void stm32l4_enablegonak(FAR struct stm32l4_ep_s *privep)
 {
   uint32_t regval;
 
   /* First, make sure that there is no GNOAKEFF interrupt pending. */
 
 #if 0
-  stm32_putreg(OTGFS_GINT_GONAKEFF, STM32_OTGFS_GINTSTS);
+  stm32l4_putreg(OTGFS_GINT_GONAKEFF, STM32L4_OTGFS_GINTSTS);
 #endif
 
   /* Enable Global OUT NAK mode in the core. */
 
-  regval = stm32_getreg(STM32_OTGFS_DCTL);
+  regval = stm32l4_getreg(STM32L4_OTGFS_DCTL);
   regval |= OTGFS_DCTL_SGONAK;
-  stm32_putreg(regval, STM32_OTGFS_DCTL);
+  stm32l4_putreg(regval, STM32L4_OTGFS_DCTL);
 
 #if 0
   /* Wait for the GONAKEFF interrupt that indicates that the OUT NAK
@@ -3814,8 +3814,8 @@ static void stm32_enablegonak(FAR struct stm32_ep_s *privep)
    * from the RxFIFO, the core sets the GONAKEFF interrupt.
    */
 
-  while ((stm32_getreg(STM32_OTGFS_GINTSTS) & OTGFS_GINT_GONAKEFF) == 0);
-  stm32_putreg(OTGFS_GINT_GONAKEFF, STM32_OTGFS_GINTSTS);
+  while ((stm32l4_getreg(STM32L4_OTGFS_GINTSTS) & OTGFS_GINT_GONAKEFF) == 0);
+  stm32l4_putreg(OTGFS_GINT_GONAKEFF, STM32L4_OTGFS_GINTSTS);
 
 #else
   /* Since we are in the interrupt handler, we cannot wait inline for the
@@ -3826,31 +3826,31 @@ static void stm32_enablegonak(FAR struct stm32_ep_s *privep)
    * in OTGFS DCTL register?
    */
 
-  while ((stm32_getreg(STM32_OTGFS_DCTL) & OTGFS_DCTL_GONSTS) == 0);
+  while ((stm32l4_getreg(STM32L4_OTGFS_DCTL) & OTGFS_DCTL_GONSTS) == 0);
 #endif
 }
 
 /****************************************************************************
- * Name: stm32_disablegonak
+ * Name: stm32l4_disablegonak
  *
  * Description:
  *   Disable global OUT NAK mode
  *
  ****************************************************************************/
 
-static void stm32_disablegonak(FAR struct stm32_ep_s *privep)
+static void stm32l4_disablegonak(FAR struct stm32l4_ep_s *privep)
 {
   uint32_t regval;
 
   /* Set the "Clear the Global OUT NAK bit" to disable global OUT NAK mode */
 
-  regval  = stm32_getreg(STM32_OTGFS_DCTL);
+  regval  = stm32l4_getreg(STM32L4_OTGFS_DCTL);
   regval |= OTGFS_DCTL_CGONAK;
-  stm32_putreg(regval, STM32_OTGFS_DCTL);
+  stm32l4_putreg(regval, STM32L4_OTGFS_DCTL);
 }
 
 /****************************************************************************
- * Name: stm32_epout_configure
+ * Name: stm32l4_epout_configure
  *
  * Description:
  *   Configure an OUT endpoint, making it usable
@@ -3862,7 +3862,7 @@ static void stm32_disablegonak(FAR struct stm32_ep_s *privep)
  *
  ****************************************************************************/
 
-static int stm32_epout_configure(FAR struct stm32_ep_s *privep, uint8_t eptype,
+static int stm32l4_epout_configure(FAR struct stm32l4_ep_s *privep, uint8_t eptype,
                                  uint16_t maxpacket)
 {
   uint32_t mpsiz;
@@ -3914,8 +3914,8 @@ static int stm32_epout_configure(FAR struct stm32_ep_s *privep, uint8_t eptype,
    * register.
    */
 
-  regaddr = STM32_OTGFS_DOEPCTL(privep->epphy);
-  regval  = stm32_getreg(regaddr);
+  regaddr = STM32L4_OTGFS_DOEPCTL(privep->epphy);
+  regval  = stm32l4_getreg(regaddr);
   if ((regval & OTGFS_DOEPCTL_USBAEP) == 0)
     {
       if (regval & OTGFS_DOEPCTL_NAKSTS)
@@ -3927,7 +3927,7 @@ static int stm32_epout_configure(FAR struct stm32_ep_s *privep, uint8_t eptype,
       regval |= mpsiz;
       regval |= (eptype << OTGFS_DOEPCTL_EPTYP_SHIFT);
       regval |= (OTGFS_DOEPCTL_SD0PID | OTGFS_DOEPCTL_USBAEP);
-      stm32_putreg(regval, regaddr);
+      stm32l4_putreg(regval, regaddr);
 
       /* Save the endpoint configuration */
 
@@ -3938,14 +3938,14 @@ static int stm32_epout_configure(FAR struct stm32_ep_s *privep, uint8_t eptype,
 
   /* Enable the interrupt for this endpoint */
 
-  regval = stm32_getreg(STM32_OTGFS_DAINTMSK);
+  regval = stm32l4_getreg(STM32L4_OTGFS_DAINTMSK);
   regval |= OTGFS_DAINT_OEP(privep->epphy);
-  stm32_putreg(regval, STM32_OTGFS_DAINTMSK);
+  stm32l4_putreg(regval, STM32L4_OTGFS_DAINTMSK);
   return OK;
 }
 
 /****************************************************************************
- * Name: stm32_epin_configure
+ * Name: stm32l4_epin_configure
  *
  * Description:
  *   Configure an IN endpoint, making it usable
@@ -3957,7 +3957,7 @@ static int stm32_epout_configure(FAR struct stm32_ep_s *privep, uint8_t eptype,
  *
  ****************************************************************************/
 
-static int stm32_epin_configure(FAR struct stm32_ep_s *privep, uint8_t eptype,
+static int stm32l4_epin_configure(FAR struct stm32l4_ep_s *privep, uint8_t eptype,
                                 uint16_t maxpacket)
 {
   uint32_t mpsiz;
@@ -4010,8 +4010,8 @@ static int stm32_epin_configure(FAR struct stm32_ep_s *privep, uint8_t eptype,
    * register.
    */
 
-  regaddr = STM32_OTGFS_DIEPCTL(privep->epphy);
-  regval  = stm32_getreg(regaddr);
+  regaddr = STM32L4_OTGFS_DIEPCTL(privep->epphy);
+  regval  = stm32l4_getreg(regaddr);
   if ((regval & OTGFS_DIEPCTL_USBAEP) == 0)
     {
       if (regval & OTGFS_DIEPCTL_NAKSTS)
@@ -4024,7 +4024,7 @@ static int stm32_epin_configure(FAR struct stm32_ep_s *privep, uint8_t eptype,
       regval |= (eptype << OTGFS_DIEPCTL_EPTYP_SHIFT);
       regval |= (eptype << OTGFS_DIEPCTL_TXFNUM_SHIFT);
       regval |= (OTGFS_DIEPCTL_SD0PID | OTGFS_DIEPCTL_USBAEP);
-      stm32_putreg(regval, regaddr);
+      stm32l4_putreg(regval, regaddr);
 
       /* Save the endpoint configuration */
 
@@ -4035,15 +4035,15 @@ static int stm32_epin_configure(FAR struct stm32_ep_s *privep, uint8_t eptype,
 
   /* Enable the interrupt for this endpoint */
 
-  regval = stm32_getreg(STM32_OTGFS_DAINTMSK);
+  regval = stm32l4_getreg(STM32L4_OTGFS_DAINTMSK);
   regval |= OTGFS_DAINT_IEP(privep->epphy);
-  stm32_putreg(regval, STM32_OTGFS_DAINTMSK);
+  stm32l4_putreg(regval, STM32L4_OTGFS_DAINTMSK);
 
   return OK;
 }
 
 /****************************************************************************
- * Name: stm32_ep_configure
+ * Name: stm32l4_ep_configure
  *
  * Description:
  *   Configure endpoint, making it usable
@@ -4057,11 +4057,11 @@ static int stm32_epin_configure(FAR struct stm32_ep_s *privep, uint8_t eptype,
  *
  ****************************************************************************/
 
-static int stm32_ep_configure(FAR struct usbdev_ep_s *ep,
+static int stm32l4_ep_configure(FAR struct usbdev_ep_s *ep,
                               FAR const struct usb_epdesc_s *desc,
                               bool last)
 {
-  FAR struct stm32_ep_s *privep = (FAR struct stm32_ep_s *)ep;
+  FAR struct stm32l4_ep_s *privep = (FAR struct stm32l4_ep_s *)ep;
   uint16_t maxpacket;
   uint8_t  eptype;
   int ret;
@@ -4078,43 +4078,43 @@ static int stm32_ep_configure(FAR struct usbdev_ep_s *ep,
 
   if (privep->isin)
     {
-      ret = stm32_epin_configure(privep, eptype, maxpacket);
+      ret = stm32l4_epin_configure(privep, eptype, maxpacket);
     }
   else
     {
-      ret = stm32_epout_configure(privep, eptype, maxpacket);
+      ret = stm32l4_epout_configure(privep, eptype, maxpacket);
     }
 
   return ret;
 }
 
 /****************************************************************************
- * Name: stm32_ep0_configure
+ * Name: stm32l4_ep0_configure
  *
  * Description:
  *   Reset Usb engine
  *
  ****************************************************************************/
 
-static void stm32_ep0_configure(FAR struct stm32_usbdev_s *priv)
+static void stm32l4_ep0_configure(FAR struct stm32l4_usbdev_s *priv)
 {
   /* Enable EP0 IN and OUT */
 
-  (void)stm32_epin_configure(&priv->epin[EP0], USB_EP_ATTR_XFER_CONTROL,
+  (void)stm32l4_epin_configure(&priv->epin[EP0], USB_EP_ATTR_XFER_CONTROL,
                              CONFIG_USBDEV_EP0_MAXSIZE);
-  (void)stm32_epout_configure(&priv->epout[EP0], USB_EP_ATTR_XFER_CONTROL,
+  (void)stm32l4_epout_configure(&priv->epout[EP0], USB_EP_ATTR_XFER_CONTROL,
                               CONFIG_USBDEV_EP0_MAXSIZE);
 }
 
 /****************************************************************************
- * Name: stm32_epout_disable
+ * Name: stm32l4_epout_disable
  *
  * Description:
  *   Diable an OUT endpoint will no longer be used
  *
  ****************************************************************************/
 
-static void stm32_epout_disable(FAR struct stm32_ep_s *privep)
+static void stm32l4_epout_disable(FAR struct stm32l4_ep_s *privep)
 {
   uint32_t regaddr;
   uint32_t regval;
@@ -4129,25 +4129,25 @@ static void stm32_epout_disable(FAR struct stm32_ep_s *privep)
    */
 
   flags = enter_critical_section();
-  stm32_enablegonak(privep);
+  stm32l4_enablegonak(privep);
 
   /* Disable the required OUT endpoint by setting the EPDIS and SNAK bits
    * int DOECPTL register.
    */
 
-  regaddr = STM32_OTGFS_DOEPCTL(privep->epphy);
-  regval  = stm32_getreg(regaddr);
+  regaddr = STM32L4_OTGFS_DOEPCTL(privep->epphy);
+  regval  = stm32l4_getreg(regaddr);
   regval &= ~OTGFS_DOEPCTL_USBAEP;
   regval |= (OTGFS_DOEPCTL_EPDIS | OTGFS_DOEPCTL_SNAK);
-  stm32_putreg(regval, regaddr);
+  stm32l4_putreg(regval, regaddr);
 
   /* Wait for the EPDISD interrupt which indicates that the OUT
    * endpoint is completely disabled.
    */
 
 #if 0 /* Doesn't happen */
-  regaddr = STM32_OTGFS_DOEPINT(privep->epphy);
-  while ((stm32_getreg(regaddr) & OTGFS_DOEPINT_EPDISD) == 0);
+  regaddr = STM32L4_OTGFS_DOEPINT(privep->epphy);
+  while ((stm32l4_getreg(regaddr) & OTGFS_DOEPINT_EPDISD) == 0);
 #else
   /* REVISIT: */
   up_udelay(10);
@@ -4155,36 +4155,36 @@ static void stm32_epout_disable(FAR struct stm32_ep_s *privep)
 
   /* Clear the EPDISD interrupt indication */
 
-  stm32_putreg(OTGFS_DOEPINT_EPDISD, STM32_OTGFS_DOEPINT(privep->epphy));
+  stm32l4_putreg(OTGFS_DOEPINT_EPDISD, STM32L4_OTGFS_DOEPINT(privep->epphy));
 
   /* Then disable the Global OUT NAK mode to continue receiving data
    * from other non-disabled OUT endpoints.
    */
 
-  stm32_disablegonak(privep);
+  stm32l4_disablegonak(privep);
 
   /* Disable endpoint interrupts */
 
-  regval  = stm32_getreg(STM32_OTGFS_DAINTMSK);
+  regval  = stm32l4_getreg(STM32L4_OTGFS_DAINTMSK);
   regval &= ~OTGFS_DAINT_OEP(privep->epphy);
-  stm32_putreg(regval, STM32_OTGFS_DAINTMSK);
+  stm32l4_putreg(regval, STM32L4_OTGFS_DAINTMSK);
 
   /* Cancel any queued read requests */
 
-  stm32_req_cancel(privep, -ESHUTDOWN);
+  stm32l4_req_cancel(privep, -ESHUTDOWN);
 
   leave_critical_section(flags);
 }
 
 /****************************************************************************
- * Name: stm32_epin_disable
+ * Name: stm32l4_epin_disable
  *
  * Description:
  *   Disable an IN endpoint when it will no longer be used
  *
  ****************************************************************************/
 
-static void stm32_epin_disable(FAR struct stm32_ep_s *privep)
+static void stm32l4_epin_disable(FAR struct stm32l4_ep_s *privep)
 {
   uint32_t regaddr;
   uint32_t regval;
@@ -4196,8 +4196,8 @@ static void stm32_epin_disable(FAR struct stm32_ep_s *privep)
    * hardware. Trying to disable again will just hang in the wait.
    */
 
-  regaddr = STM32_OTGFS_DIEPCTL(privep->epphy);
-  regval  = stm32_getreg(regaddr);
+  regaddr = STM32L4_OTGFS_DIEPCTL(privep->epphy);
+  regval  = stm32l4_getreg(regaddr);
   if ((regval & OTGFS_DIEPCTL_USBAEP) == 0)
     {
       return;
@@ -4212,24 +4212,24 @@ static void stm32_epin_disable(FAR struct stm32_ep_s *privep)
    * to poll this bit below).
    */
 
-  stm32_putreg(OTGFS_DIEPINT_INEPNE, STM32_OTGFS_DIEPINT(privep->epphy));
+  stm32l4_putreg(OTGFS_DIEPINT_INEPNE, STM32L4_OTGFS_DIEPINT(privep->epphy));
 
   /* Set the endpoint in NAK mode */
 
-  regaddr = STM32_OTGFS_DIEPCTL(privep->epphy);
-  regval  = stm32_getreg(regaddr);
+  regaddr = STM32L4_OTGFS_DIEPCTL(privep->epphy);
+  regval  = stm32l4_getreg(regaddr);
   regval &= ~OTGFS_DIEPCTL_USBAEP;
   regval |= (OTGFS_DIEPCTL_EPDIS | OTGFS_DIEPCTL_SNAK);
-  stm32_putreg(regval, regaddr);
+  stm32l4_putreg(regval, regaddr);
 
   /* Wait for the INEPNE interrupt that indicates that we are now in NAK mode */
 
-  regaddr = STM32_OTGFS_DIEPINT(privep->epphy);
-  while ((stm32_getreg(regaddr) & OTGFS_DIEPINT_INEPNE) == 0);
+  regaddr = STM32L4_OTGFS_DIEPINT(privep->epphy);
+  while ((stm32l4_getreg(regaddr) & OTGFS_DIEPINT_INEPNE) == 0);
 
   /* Clear the INEPNE interrupt indication */
 
-  stm32_putreg(OTGFS_DIEPINT_INEPNE, regaddr);
+  stm32l4_putreg(OTGFS_DIEPINT_INEPNE, regaddr);
 #endif
 
   /* Deactivate and disable the endpoint by setting the EPDIS and SNAK bits
@@ -4237,55 +4237,55 @@ static void stm32_epin_disable(FAR struct stm32_ep_s *privep)
    */
 
   flags = enter_critical_section();
-  regaddr = STM32_OTGFS_DIEPCTL(privep->epphy);
-  regval  = stm32_getreg(regaddr);
+  regaddr = STM32L4_OTGFS_DIEPCTL(privep->epphy);
+  regval  = stm32l4_getreg(regaddr);
   regval &= ~OTGFS_DIEPCTL_USBAEP;
   regval |= (OTGFS_DIEPCTL_EPDIS | OTGFS_DIEPCTL_SNAK);
-  stm32_putreg(regval, regaddr);
+  stm32l4_putreg(regval, regaddr);
 
   /* Wait for the EPDISD interrupt which indicates that the IN
    * endpoint is completely disabled.
    */
 
-  regaddr = STM32_OTGFS_DIEPINT(privep->epphy);
-  while ((stm32_getreg(regaddr) & OTGFS_DIEPINT_EPDISD) == 0);
+  regaddr = STM32L4_OTGFS_DIEPINT(privep->epphy);
+  while ((stm32l4_getreg(regaddr) & OTGFS_DIEPINT_EPDISD) == 0);
 
   /* Clear the EPDISD interrupt indication */
 
-  stm32_putreg(OTGFS_DIEPINT_EPDISD, stm32_getreg(regaddr));
+  stm32l4_putreg(OTGFS_DIEPINT_EPDISD, stm32l4_getreg(regaddr));
 
   /* Flush any data remaining in the TxFIFO */
 
-  stm32_txfifo_flush(OTGFS_GRSTCTL_TXFNUM_D(privep->epphy));
+  stm32l4_txfifo_flush(OTGFS_GRSTCTL_TXFNUM_D(privep->epphy));
 
   /* Disable endpoint interrupts */
 
-  regval  = stm32_getreg(STM32_OTGFS_DAINTMSK);
+  regval  = stm32l4_getreg(STM32L4_OTGFS_DAINTMSK);
   regval &= ~OTGFS_DAINT_IEP(privep->epphy);
-  stm32_putreg(regval, STM32_OTGFS_DAINTMSK);
+  stm32l4_putreg(regval, STM32L4_OTGFS_DAINTMSK);
 
   /* Cancel any queued write requests */
 
-  stm32_req_cancel(privep, -ESHUTDOWN);
+  stm32l4_req_cancel(privep, -ESHUTDOWN);
   leave_critical_section(flags);
 }
 
 /****************************************************************************
- * Name: stm32_ep_disable
+ * Name: stm32l4_ep_disable
  *
  * Description:
  *   The endpoint will no longer be used
  *
  ****************************************************************************/
 
-static int stm32_ep_disable(FAR struct usbdev_ep_s *ep)
+static int stm32l4_ep_disable(FAR struct usbdev_ep_s *ep)
 {
-  FAR struct stm32_ep_s *privep = (FAR struct stm32_ep_s *)ep;
+  FAR struct stm32l4_ep_s *privep = (FAR struct stm32l4_ep_s *)ep;
 
 #ifdef CONFIG_DEBUG_USB
   if (!ep)
     {
-      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
+      usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_INVALIDPARMS), 0);
       return -EINVAL;
     }
 #endif
@@ -4298,77 +4298,77 @@ static int stm32_ep_disable(FAR struct usbdev_ep_s *ep)
     {
       /* Disable the IN endpoint */
 
-      stm32_epin_disable(privep);
+      stm32l4_epin_disable(privep);
     }
   else
     {
       /* Disable the OUT endpoint */
 
-      stm32_epout_disable(privep);
+      stm32l4_epout_disable(privep);
     }
 
   return OK;
 }
 
 /****************************************************************************
- * Name: stm32_ep_allocreq
+ * Name: stm32l4_ep_allocreq
  *
  * Description:
  *   Allocate an I/O request
  *
  ****************************************************************************/
 
-static FAR struct usbdev_req_s *stm32_ep_allocreq(FAR struct usbdev_ep_s *ep)
+static FAR struct usbdev_req_s *stm32l4_ep_allocreq(FAR struct usbdev_ep_s *ep)
 {
-  FAR struct stm32_req_s *privreq;
+  FAR struct stm32l4_req_s *privreq;
 
 #ifdef CONFIG_DEBUG_USB
   if (!ep)
     {
-      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
+      usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_INVALIDPARMS), 0);
       return NULL;
     }
 #endif
 
-  usbtrace(TRACE_EPALLOCREQ, ((FAR struct stm32_ep_s *)ep)->epphy);
+  usbtrace(TRACE_EPALLOCREQ, ((FAR struct stm32l4_ep_s *)ep)->epphy);
 
-  privreq = (FAR struct stm32_req_s *)kmm_malloc(sizeof(struct stm32_req_s));
+  privreq = (FAR struct stm32l4_req_s *)kmm_malloc(sizeof(struct stm32l4_req_s));
   if (!privreq)
     {
-      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_ALLOCFAIL), 0);
+      usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_ALLOCFAIL), 0);
       return NULL;
     }
 
-  memset(privreq, 0, sizeof(struct stm32_req_s));
+  memset(privreq, 0, sizeof(struct stm32l4_req_s));
   return &privreq->req;
 }
 
 /****************************************************************************
- * Name: stm32_ep_freereq
+ * Name: stm32l4_ep_freereq
  *
  * Description:
  *   Free an I/O request
  *
  ****************************************************************************/
 
-static void stm32_ep_freereq(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *req)
+static void stm32l4_ep_freereq(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *req)
 {
-  FAR struct stm32_req_s *privreq = (FAR struct stm32_req_s *)req;
+  FAR struct stm32l4_req_s *privreq = (FAR struct stm32l4_req_s *)req;
 
 #ifdef CONFIG_DEBUG_USB
   if (!ep || !req)
     {
-      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
+      usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_INVALIDPARMS), 0);
       return;
     }
 #endif
 
-  usbtrace(TRACE_EPFREEREQ, ((FAR struct stm32_ep_s *)ep)->epphy);
+  usbtrace(TRACE_EPFREEREQ, ((FAR struct stm32l4_ep_s *)ep)->epphy);
   kmm_free(privreq);
 }
 
 /****************************************************************************
- * Name: stm32_ep_allocbuffer
+ * Name: stm32l4_ep_allocbuffer
  *
  * Description:
  *   Allocate an I/O buffer
@@ -4376,7 +4376,7 @@ static void stm32_ep_freereq(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s
  ****************************************************************************/
 
 #ifdef CONFIG_USBDEV_DMA
-static void *stm32_ep_allocbuffer(FAR struct usbdev_ep_s *ep, unsigned bytes)
+static void *stm32l4_ep_allocbuffer(FAR struct usbdev_ep_s *ep, unsigned bytes)
 {
   usbtrace(TRACE_EPALLOCBUFFER, privep->epphy);
 
@@ -4389,7 +4389,7 @@ static void *stm32_ep_allocbuffer(FAR struct usbdev_ep_s *ep, unsigned bytes)
 #endif
 
 /****************************************************************************
- * Name: stm32_ep_freebuffer
+ * Name: stm32l4_ep_freebuffer
  *
  * Description:
  *   Free an I/O buffer
@@ -4397,7 +4397,7 @@ static void *stm32_ep_allocbuffer(FAR struct usbdev_ep_s *ep, unsigned bytes)
  ****************************************************************************/
 
 #ifdef CONFIG_USBDEV_DMA
-static void stm32_ep_freebuffer(FAR struct usbdev_ep_s *ep, FAR void *buf)
+static void stm32l4_ep_freebuffer(FAR struct usbdev_ep_s *ep, FAR void *buf)
 {
   usbtrace(TRACE_EPFREEBUFFER, privep->epphy);
 
@@ -4410,18 +4410,18 @@ static void stm32_ep_freebuffer(FAR struct usbdev_ep_s *ep, FAR void *buf)
 #endif
 
 /****************************************************************************
- * Name: stm32_ep_submit
+ * Name: stm32l4_ep_submit
  *
  * Description:
  *   Submit an I/O request to the endpoint
  *
  ****************************************************************************/
 
-static int stm32_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *req)
+static int stm32l4_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *req)
 {
-  FAR struct stm32_req_s *privreq = (FAR struct stm32_req_s *)req;
-  FAR struct stm32_ep_s *privep = (FAR struct stm32_ep_s *)ep;
-  FAR struct stm32_usbdev_s *priv;
+  FAR struct stm32l4_req_s *privreq = (FAR struct stm32l4_req_s *)req;
+  FAR struct stm32l4_ep_s *privep = (FAR struct stm32l4_ep_s *)ep;
+  FAR struct stm32l4_usbdev_s *priv;
   irqstate_t flags;
   int ret = OK;
 
@@ -4430,7 +4430,7 @@ static int stm32_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *
 #ifdef CONFIG_DEBUG_USB
   if (!req || !req->callback || !req->buf || !ep)
     {
-      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
+      usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_INVALIDPARMS), 0);
       uinfo("req=%p callback=%p buf=%p ep=%p\n", req, req->callback, req->buf, ep);
       return -EINVAL;
     }
@@ -4442,7 +4442,7 @@ static int stm32_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *
 #ifdef CONFIG_DEBUG_USB
   if (!priv->driver)
     {
-      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_NOTCONFIGURED), priv->usbdev.speed);
+      usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_NOTCONFIGURED), priv->usbdev.speed);
       return -ESHUTDOWN;
     }
 #endif
@@ -4466,7 +4466,7 @@ static int stm32_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *
     {
       /* Add the new request to the request queue for the endpoint. */
 
-      if (stm32_req_addlast(privep, privreq) && !privep->active)
+      if (stm32l4_req_addlast(privep, privreq) && !privep->active)
         {
           /* If a request was added to an IN endpoint, then attempt to send
            * the request data buffer now.
@@ -4482,7 +4482,7 @@ static int stm32_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *
 
               if (!privep->active)
                 {
-                  stm32_epin_request(priv, privep);
+                  stm32l4_epin_request(priv, privep);
                 }
             }
 
@@ -4494,7 +4494,7 @@ static int stm32_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *
           else
             {
               usbtrace(TRACE_OUTREQQUEUED(privep->epphy), privreq->req.len);
-              stm32_epout_request(priv, privep);
+              stm32l4_epout_request(priv, privep);
             }
         }
     }
@@ -4504,22 +4504,22 @@ static int stm32_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *
 }
 
 /****************************************************************************
- * Name: stm32_ep_cancel
+ * Name: stm32l4_ep_cancel
  *
  * Description:
  *   Cancel an I/O request previously sent to an endpoint
  *
  ****************************************************************************/
 
-static int stm32_ep_cancel(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *req)
+static int stm32l4_ep_cancel(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *req)
 {
-  FAR struct stm32_ep_s *privep = (FAR struct stm32_ep_s *)ep;
+  FAR struct stm32l4_ep_s *privep = (FAR struct stm32l4_ep_s *)ep;
   irqstate_t flags;
 
 #ifdef CONFIG_DEBUG_USB
   if (!ep || !req)
     {
-      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
+      usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_INVALIDPARMS), 0);
       return -EINVAL;
     }
 #endif
@@ -4534,20 +4534,20 @@ static int stm32_ep_cancel(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *
    *  but ... all other implementations cancel all requests ...
    */
 
-  stm32_req_cancel(privep, -ESHUTDOWN);
+  stm32l4_req_cancel(privep, -ESHUTDOWN);
   leave_critical_section(flags);
   return OK;
 }
 
 /****************************************************************************
- * Name: stm32_epout_setstall
+ * Name: stm32l4_epout_setstall
  *
  * Description:
  *   Stall an OUT endpoint
  *
  ****************************************************************************/
 
-static int stm32_epout_setstall(FAR struct stm32_ep_s *privep)
+static int stm32l4_epout_setstall(FAR struct stm32l4_ep_s *privep)
 {
 #if 1
   /* This implementation follows the requirements from the STM32 F4 reference
@@ -4559,24 +4559,24 @@ static int stm32_epout_setstall(FAR struct stm32_ep_s *privep)
 
   /* Put the core in the Global OUT NAK mode */
 
-  stm32_enablegonak(privep);
+  stm32l4_enablegonak(privep);
 
   /* Disable and STALL the OUT endpoint by setting the EPDIS and STALL bits
    * in the DOECPTL register.
    */
 
-  regaddr = STM32_OTGFS_DOEPCTL(privep->epphy);
-  regval  = stm32_getreg(regaddr);
+  regaddr = STM32L4_OTGFS_DOEPCTL(privep->epphy);
+  regval  = stm32l4_getreg(regaddr);
   regval |= (OTGFS_DOEPCTL_EPDIS | OTGFS_DOEPCTL_STALL);
-  stm32_putreg(regval, regaddr);
+  stm32l4_putreg(regval, regaddr);
 
   /* Wait for the EPDISD interrupt which indicates that the OUT
    * endpoint is completely disabled.
    */
 
 #if 0 /* Doesn't happen */
-  regaddr = STM32_OTGFS_DOEPINT(privep->epphy);
-  while ((stm32_getreg(regaddr) & OTGFS_DOEPINT_EPDISD) == 0);
+  regaddr = STM32L4_OTGFS_DOEPINT(privep->epphy);
+  while ((stm32l4_getreg(regaddr) & OTGFS_DOEPINT_EPDISD) == 0);
 #else
   /* REVISIT: */
   up_udelay(10);
@@ -4584,7 +4584,7 @@ static int stm32_epout_setstall(FAR struct stm32_ep_s *privep)
 
   /* Disable Global OUT NAK mode */
 
-  stm32_disablegonak(privep);
+  stm32l4_disablegonak(privep);
 
   /* The endpoint is now stalled */
 
@@ -4599,10 +4599,10 @@ static int stm32_epout_setstall(FAR struct stm32_ep_s *privep)
 
   /* Stall the OUT endpoint by setting the STALL bit in the DOECPTL register. */
 
-  regaddr = STM32_OTGFS_DOEPCTL(privep->epphy);
-  regval  = stm32_getreg(regaddr);
+  regaddr = STM32L4_OTGFS_DOEPCTL(privep->epphy);
+  regval  = stm32l4_getreg(regaddr);
   regval |= OTGFS_DOEPCTL_STALL;
-  stm32_putreg(regval, regaddr);
+  stm32l4_putreg(regval, regaddr);
 
   /* The endpoint is now stalled */
 
@@ -4612,27 +4612,27 @@ static int stm32_epout_setstall(FAR struct stm32_ep_s *privep)
 }
 
 /****************************************************************************
- * Name: stm32_epin_setstall
+ * Name: stm32l4_epin_setstall
  *
  * Description:
  *   Stall an IN endpoint
  *
  ****************************************************************************/
 
-static int stm32_epin_setstall(FAR struct stm32_ep_s *privep)
+static int stm32l4_epin_setstall(FAR struct stm32l4_ep_s *privep)
 {
   uint32_t regaddr;
   uint32_t regval;
 
   /* Get the IN endpoint device control register */
 
-  regaddr = STM32_OTGFS_DIEPCTL(privep->epphy);
-  regval  = stm32_getreg(regaddr);
+  regaddr = STM32L4_OTGFS_DIEPCTL(privep->epphy);
+  regval  = stm32l4_getreg(regaddr);
 
   /* Then stall the endpoint */
 
   regval |= OTGFS_DIEPCTL_STALL;
-  stm32_putreg(regval, regaddr);
+  stm32l4_putreg(regval, regaddr);
 
   /* The endpoint is now stalled */
 
@@ -4641,14 +4641,14 @@ static int stm32_epin_setstall(FAR struct stm32_ep_s *privep)
 }
 
 /****************************************************************************
- * Name: stm32_ep_setstall
+ * Name: stm32l4_ep_setstall
  *
  * Description:
  *   Stall an endpoint
  *
  ****************************************************************************/
 
-static int stm32_ep_setstall(FAR struct stm32_ep_s *privep)
+static int stm32l4_ep_setstall(FAR struct stm32l4_ep_s *privep)
 {
   usbtrace(TRACE_EPSTALL, privep->epphy);
 
@@ -4656,23 +4656,23 @@ static int stm32_ep_setstall(FAR struct stm32_ep_s *privep)
 
   if (privep->isin == 1)
     {
-      return stm32_epin_setstall(privep);
+      return stm32l4_epin_setstall(privep);
     }
   else
     {
-      return stm32_epout_setstall(privep);
+      return stm32l4_epout_setstall(privep);
     }
 }
 
 /****************************************************************************
- * Name: stm32_ep_clrstall
+ * Name: stm32l4_ep_clrstall
  *
  * Description:
  *   Resume a stalled endpoint
  *
  ****************************************************************************/
 
-static int stm32_ep_clrstall(FAR struct stm32_ep_s *privep)
+static int stm32l4_ep_clrstall(FAR struct stm32l4_ep_s *privep)
 {
   uint32_t regaddr;
   uint32_t regval;
@@ -4687,7 +4687,7 @@ static int stm32_ep_clrstall(FAR struct stm32_ep_s *privep)
     {
       /* Clear the stall bit in the IN endpoint device control register */
 
-      regaddr  = STM32_OTGFS_DIEPCTL(privep->epphy);
+      regaddr  = STM32L4_OTGFS_DIEPCTL(privep->epphy);
       stallbit = OTGFS_DIEPCTL_STALL;
       data0bit = OTGFS_DIEPCTL_SD0PID;
     }
@@ -4695,14 +4695,14 @@ static int stm32_ep_clrstall(FAR struct stm32_ep_s *privep)
     {
       /* Clear the stall bit in the IN endpoint device control register */
 
-      regaddr  = STM32_OTGFS_DOEPCTL(privep->epphy);
+      regaddr  = STM32L4_OTGFS_DOEPCTL(privep->epphy);
       stallbit = OTGFS_DOEPCTL_STALL;
       data0bit = OTGFS_DOEPCTL_SD0PID;
     }
 
   /* Clear the stall bit */
 
-  regval  = stm32_getreg(regaddr);
+  regval  = stm32l4_getreg(regaddr);
   regval &= ~stallbit;
 
   /* Set the DATA0 pid for interrupt and bulk endpoints */
@@ -4715,7 +4715,7 @@ static int stm32_ep_clrstall(FAR struct stm32_ep_s *privep)
       regval |= data0bit;
     }
 
-  stm32_putreg(regval, regaddr);
+  stm32l4_putreg(regval, regaddr);
 
   /* The endpoint is no longer stalled */
 
@@ -4724,16 +4724,16 @@ static int stm32_ep_clrstall(FAR struct stm32_ep_s *privep)
 }
 
 /****************************************************************************
- * Name: stm32_ep_stall
+ * Name: stm32l4_ep_stall
  *
  * Description:
  *   Stall or resume an endpoint
  *
  ****************************************************************************/
 
-static int stm32_ep_stall(FAR struct usbdev_ep_s *ep, bool resume)
+static int stm32l4_ep_stall(FAR struct usbdev_ep_s *ep, bool resume)
 {
-  FAR struct stm32_ep_s *privep = (FAR struct stm32_ep_s *)ep;
+  FAR struct stm32l4_ep_s *privep = (FAR struct stm32l4_ep_s *)ep;
   irqstate_t flags;
   int ret;
 
@@ -4742,11 +4742,11 @@ static int stm32_ep_stall(FAR struct usbdev_ep_s *ep, bool resume)
   flags = enter_critical_section();
   if (resume)
     {
-      ret = stm32_ep_clrstall(privep);
+      ret = stm32l4_ep_clrstall(privep);
     }
   else
     {
-      ret = stm32_ep_setstall(privep);
+      ret = stm32l4_ep_setstall(privep);
     }
   leave_critical_section(flags);
 
@@ -4754,19 +4754,19 @@ static int stm32_ep_stall(FAR struct usbdev_ep_s *ep, bool resume)
 }
 
 /****************************************************************************
- * Name: stm32_ep0_stall
+ * Name: stm32l4_ep0_stall
  *
  * Description:
  *   Stall endpoint 0
  *
  ****************************************************************************/
 
-static void stm32_ep0_stall(FAR struct stm32_usbdev_s *priv)
+static void stm32l4_ep0_stall(FAR struct stm32l4_usbdev_s *priv)
 {
-  stm32_epin_setstall(&priv->epin[EP0]);
-  stm32_epout_setstall(&priv->epout[EP0]);
+  stm32l4_epin_setstall(&priv->epin[EP0]);
+  stm32l4_epout_setstall(&priv->epout[EP0]);
   priv->stalled = true;
-  stm32_ep0out_ctrlsetup(priv);
+  stm32l4_ep0out_ctrlsetup(priv);
 }
 
 /****************************************************************************
@@ -4774,7 +4774,7 @@ static void stm32_ep0_stall(FAR struct stm32_usbdev_s *priv)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: stm32_ep_alloc
+ * Name: stm32l4_ep_alloc
  *
  * Description:
  *   Allocate an endpoint matching the parameters.
@@ -4789,11 +4789,11 @@ static void stm32_ep0_stall(FAR struct stm32_usbdev_s *priv)
  *
  ****************************************************************************/
 
-static FAR struct usbdev_ep_s *stm32_ep_alloc(FAR struct usbdev_s *dev,
+static FAR struct usbdev_ep_s *stm32l4_ep_alloc(FAR struct usbdev_s *dev,
                                               uint8_t eplog, bool in,
                                               uint8_t eptype)
 {
-  FAR struct stm32_usbdev_s *priv = (FAR struct stm32_usbdev_s *)dev;
+  FAR struct stm32l4_usbdev_s *priv = (FAR struct stm32l4_usbdev_s *)dev;
   uint8_t epavail;
   irqstate_t flags;
   int epphy;
@@ -4821,9 +4821,9 @@ static FAR struct usbdev_ep_s *stm32_ep_alloc(FAR struct usbdev_s *dev,
        * by the hardware.
        */
 
-      if (epphy >= STM32_NENDPOINTS)
+      if (epphy >= STM32L4_NENDPOINTS)
         {
-          usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BADEPNO), (uint16_t)epphy);
+          usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_BADEPNO), (uint16_t)epphy);
           return NULL;
         }
 
@@ -4842,7 +4842,7 @@ static FAR struct usbdev_ep_s *stm32_ep_alloc(FAR struct usbdev_s *dev,
        * endpoints.
        */
 
-      for (epno = 1; epno < STM32_NENDPOINTS; epno++)
+      for (epno = 1; epno < STM32L4_NENDPOINTS; epno++)
         {
           uint8_t bit = 1 << epno;
           if ((epavail & bit) != 0)
@@ -4861,23 +4861,23 @@ static FAR struct usbdev_ep_s *stm32_ep_alloc(FAR struct usbdev_s *dev,
       /* We should not get here */
     }
 
-  usbtrace(TRACE_DEVERROR(STM32_TRACEERR_NOEP), (uint16_t)eplog);
+  usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_NOEP), (uint16_t)eplog);
   leave_critical_section(flags);
   return NULL;
 }
 
 /****************************************************************************
- * Name: stm32_ep_free
+ * Name: stm32l4_ep_free
  *
  * Description:
  *   Free the previously allocated endpoint
  *
  ****************************************************************************/
 
-static void stm32_ep_free(FAR struct usbdev_s *dev, FAR struct usbdev_ep_s *ep)
+static void stm32l4_ep_free(FAR struct usbdev_s *dev, FAR struct usbdev_ep_s *ep)
 {
-  FAR struct stm32_usbdev_s *priv = (FAR struct stm32_usbdev_s *)dev;
-  FAR struct stm32_ep_s *privep = (FAR struct stm32_ep_s *)ep;
+  FAR struct stm32l4_usbdev_s *priv = (FAR struct stm32l4_usbdev_s *)dev;
+  FAR struct stm32l4_ep_s *privep = (FAR struct stm32l4_ep_s *)ep;
   irqstate_t flags;
 
   usbtrace(TRACE_DEVFREEEP, (uint16_t)privep->epphy);
@@ -4893,14 +4893,14 @@ static void stm32_ep_free(FAR struct usbdev_s *dev, FAR struct usbdev_ep_s *ep)
 }
 
 /****************************************************************************
- * Name: stm32_getframe
+ * Name: stm32l4_getframe
  *
  * Description:
  *   Returns the current frame number
  *
  ****************************************************************************/
 
-static int stm32_getframe(struct usbdev_s *dev)
+static int stm32l4_getframe(struct usbdev_s *dev)
 {
   uint32_t regval;
 
@@ -4908,21 +4908,21 @@ static int stm32_getframe(struct usbdev_s *dev)
 
   /* Return the last frame number of the last SOF detected by the hardware */
 
-  regval = stm32_getreg(STM32_OTGFS_DSTS);
+  regval = stm32l4_getreg(STM32L4_OTGFS_DSTS);
   return (int)((regval & OTGFS_DSTS_SOFFN_MASK) >> OTGFS_DSTS_SOFFN_SHIFT);
 }
 
 /****************************************************************************
- * Name: stm32_wakeup
+ * Name: stm32l4_wakeup
  *
  * Description:
  *   Exit suspend mode.
  *
  ****************************************************************************/
 
-static int stm32_wakeup(struct usbdev_s *dev)
+static int stm32l4_wakeup(struct usbdev_s *dev)
 {
-  FAR struct stm32_usbdev_s *priv = (FAR struct stm32_usbdev_s *)dev;
+  FAR struct stm32l4_usbdev_s *priv = (FAR struct stm32l4_usbdev_s *)dev;
   uint32_t regval;
   irqstate_t flags;
 
@@ -4935,24 +4935,24 @@ static int stm32_wakeup(struct usbdev_s *dev)
     {
       /* Yes... is the core suspended? */
 
-      regval = stm32_getreg(STM32_OTGFS_DSTS);
+      regval = stm32l4_getreg(STM32L4_OTGFS_DSTS);
       if ((regval & OTGFS_DSTS_SUSPSTS) != 0)
         {
           /* Re-start the PHY clock and un-gate USB core clock (HCLK) */
 
 #ifdef CONFIG_USBDEV_LOWPOWER
-          regval = stm32_getreg(STM32_OTGFS_PCGCCTL);
+          regval = stm32l4_getreg(STM32L4_OTGFS_PCGCCTL);
           regval &= ~(OTGFS_PCGCCTL_STPPCLK | OTGFS_PCGCCTL_GATEHCLK);
-          stm32_putreg(regval, STM32_OTGFS_PCGCCTL);
+          stm32l4_putreg(regval, STM32L4_OTGFS_PCGCCTL);
 #endif
           /* Activate Remote wakeup signaling */
 
-          regval  = stm32_getreg(STM32_OTGFS_DCTL);
+          regval  = stm32l4_getreg(STM32L4_OTGFS_DCTL);
           regval |= OTGFS_DCTL_RWUSIG;
-          stm32_putreg(regval, STM32_OTGFS_DCTL);
+          stm32l4_putreg(regval, STM32L4_OTGFS_DCTL);
           up_mdelay(5);
           regval &= ~OTGFS_DCTL_RWUSIG;
-          stm32_putreg(regval, STM32_OTGFS_DCTL);
+          stm32l4_putreg(regval, STM32L4_OTGFS_DCTL);
         }
     }
 
@@ -4961,23 +4961,23 @@ static int stm32_wakeup(struct usbdev_s *dev)
 }
 
 /****************************************************************************
- * Name: stm32_selfpowered
+ * Name: stm32l4_selfpowered
  *
  * Description:
  *   Sets/clears the device self-powered feature
  *
  ****************************************************************************/
 
-static int stm32_selfpowered(struct usbdev_s *dev, bool selfpowered)
+static int stm32l4_selfpowered(struct usbdev_s *dev, bool selfpowered)
 {
-  FAR struct stm32_usbdev_s *priv = (FAR struct stm32_usbdev_s *)dev;
+  FAR struct stm32l4_usbdev_s *priv = (FAR struct stm32l4_usbdev_s *)dev;
 
   usbtrace(TRACE_DEVSELFPOWERED, (uint16_t)selfpowered);
 
 #ifdef CONFIG_DEBUG_USB
   if (!dev)
     {
-      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
+      usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_INVALIDPARMS), 0);
       return -ENODEV;
     }
 #endif
@@ -4987,21 +4987,21 @@ static int stm32_selfpowered(struct usbdev_s *dev, bool selfpowered)
 }
 
 /****************************************************************************
- * Name: stm32_pullup
+ * Name: stm32l4_pullup
  *
  * Description:
  *   Software-controlled connect to/disconnect from USB host
  *
  ****************************************************************************/
 
-static int stm32_pullup(struct usbdev_s *dev, bool enable)
+static int stm32l4_pullup(struct usbdev_s *dev, bool enable)
 {
   uint32_t regval;
 
   usbtrace(TRACE_DEVPULLUP, (uint16_t)enable);
 
   irqstate_t flags = enter_critical_section();
-  regval = stm32_getreg(STM32_OTGFS_DCTL);
+  regval = stm32l4_getreg(STM32L4_OTGFS_DCTL);
   if (enable)
     {
       /* Connect the device by clearing the soft disconnect bit in the DCTL
@@ -5019,29 +5019,29 @@ static int stm32_pullup(struct usbdev_s *dev, bool enable)
       regval |= OTGFS_DCTL_SDIS;
     }
 
-  stm32_putreg(regval, STM32_OTGFS_DCTL);
+  stm32l4_putreg(regval, STM32L4_OTGFS_DCTL);
   leave_critical_section(flags);
   return OK;
 }
 
 /****************************************************************************
- * Name: stm32_setaddress
+ * Name: stm32l4_setaddress
  *
  * Description:
  *   Set the devices USB address
  *
  ****************************************************************************/
 
-static void stm32_setaddress(struct stm32_usbdev_s *priv, uint16_t address)
+static void stm32l4_setaddress(struct stm32l4_usbdev_s *priv, uint16_t address)
 {
   uint32_t regval;
 
   /* Set the device address in the DCFG register */
 
-  regval = stm32_getreg(STM32_OTGFS_DCFG);
+  regval = stm32l4_getreg(STM32L4_OTGFS_DCFG);
   regval &= ~OTGFS_DCFG_DAD_MASK;
   regval |= ((uint32_t)address << OTGFS_DCFG_DAD_SHIFT);
-  stm32_putreg(regval, STM32_OTGFS_DCFG);
+  stm32l4_putreg(regval, STM32L4_OTGFS_DCFG);
 
   /* Are we now addressed?  (i.e., do we have a non-NULL device
    * address?)
@@ -5060,14 +5060,14 @@ static void stm32_setaddress(struct stm32_usbdev_s *priv, uint16_t address)
 }
 
 /****************************************************************************
- * Name: stm32_txfifo_flush
+ * Name: stm32l4_txfifo_flush
  *
  * Description:
  *   Flush the specific TX fifo.
  *
  ****************************************************************************/
 
-static int stm32_txfifo_flush(uint32_t txfnum)
+static int stm32l4_txfifo_flush(uint32_t txfnum)
 {
   uint32_t regval;
   uint32_t timeout;
@@ -5075,13 +5075,13 @@ static int stm32_txfifo_flush(uint32_t txfnum)
   /* Initiate the TX FIFO flush operation */
 
   regval = OTGFS_GRSTCTL_TXFFLSH | txfnum;
-  stm32_putreg(regval, STM32_OTGFS_GRSTCTL);
+  stm32l4_putreg(regval, STM32L4_OTGFS_GRSTCTL);
 
   /* Wait for the FLUSH to complete */
 
-  for (timeout = 0; timeout < STM32_FLUSH_DELAY; timeout++)
+  for (timeout = 0; timeout < STM32L4_FLUSH_DELAY; timeout++)
     {
-      regval = stm32_getreg(STM32_OTGFS_GRSTCTL);
+      regval = stm32l4_getreg(STM32L4_OTGFS_GRSTCTL);
       if ((regval & OTGFS_GRSTCTL_TXFFLSH) == 0)
         {
           break;
@@ -5095,27 +5095,27 @@ static int stm32_txfifo_flush(uint32_t txfnum)
 }
 
 /****************************************************************************
- * Name: stm32_rxfifo_flush
+ * Name: stm32l4_rxfifo_flush
  *
  * Description:
  *   Flush the RX fifo.
  *
  ****************************************************************************/
 
-static int stm32_rxfifo_flush(void)
+static int stm32l4_rxfifo_flush(void)
 {
   uint32_t regval;
   uint32_t timeout;
 
   /* Initiate the RX FIFO flush operation */
 
-  stm32_putreg(OTGFS_GRSTCTL_RXFFLSH, STM32_OTGFS_GRSTCTL);
+  stm32l4_putreg(OTGFS_GRSTCTL_RXFFLSH, STM32L4_OTGFS_GRSTCTL);
 
   /* Wait for the FLUSH to complete */
 
-  for (timeout = 0; timeout < STM32_FLUSH_DELAY; timeout++)
+  for (timeout = 0; timeout < STM32L4_FLUSH_DELAY; timeout++)
     {
-      regval = stm32_getreg(STM32_OTGFS_GRSTCTL);
+      regval = stm32l4_getreg(STM32L4_OTGFS_GRSTCTL);
       if ((regval & OTGFS_GRSTCTL_RXFFLSH) == 0)
         {
           break;
@@ -5129,34 +5129,34 @@ static int stm32_rxfifo_flush(void)
 }
 
 /****************************************************************************
- * Name: stm32_swinitialize
+ * Name: stm32l4_swinitialize
  *
  * Description:
  *   Initialize all driver data structures.
  *
  ****************************************************************************/
 
-static void stm32_swinitialize(FAR struct stm32_usbdev_s *priv)
+static void stm32l4_swinitialize(FAR struct stm32l4_usbdev_s *priv)
 {
-  FAR struct stm32_ep_s *privep;
+  FAR struct stm32l4_ep_s *privep;
   int i;
 
   /* Initialize the device state structure */
 
-  memset(priv, 0, sizeof(struct stm32_usbdev_s));
+  memset(priv, 0, sizeof(struct stm32l4_usbdev_s));
 
   priv->usbdev.ops = &g_devops;
   priv->usbdev.ep0 = &priv->epin[EP0].ep;
 
-  priv->epavail[0] = STM32_EP_AVAILABLE;
-  priv->epavail[1] = STM32_EP_AVAILABLE;
+  priv->epavail[0] = STM32L4_EP_AVAILABLE;
+  priv->epavail[1] = STM32L4_EP_AVAILABLE;
 
   priv->epin[EP0].ep.priv  = priv;
   priv->epout[EP0].ep.priv = priv;
 
   /* Initialize the IN endpoint list */
 
-  for (i = 0; i < STM32_NENDPOINTS; i++)
+  for (i = 0; i < STM32L4_NENDPOINTS; i++)
     {
       /* Set endpoint operations, reference to driver structure (not
        * really necessary because there is only one controller), and
@@ -5174,7 +5174,7 @@ static void stm32_swinitialize(FAR struct stm32_usbdev_s *priv)
        */
 
       privep->epphy    = i;
-      privep->ep.eplog = STM32_EPPHYIN2LOG(i);
+      privep->ep.eplog = STM32L4_EPPHYIN2LOG(i);
 
       /* Control until endpoint is activated */
 
@@ -5184,7 +5184,7 @@ static void stm32_swinitialize(FAR struct stm32_usbdev_s *priv)
 
   /* Initialize the OUT endpoint list */
 
-  for (i = 0; i < STM32_NENDPOINTS; i++)
+  for (i = 0; i < STM32L4_NENDPOINTS; i++)
     {
       /* Set endpoint operations, reference to driver structure (not
        * really necessary because there is only one controller), and
@@ -5201,7 +5201,7 @@ static void stm32_swinitialize(FAR struct stm32_usbdev_s *priv)
        */
 
       privep->epphy    = i;
-      privep->ep.eplog = STM32_EPPHYOUT2LOG(i);
+      privep->ep.eplog = STM32L4_EPPHYOUT2LOG(i);
 
       /* Control until endpoint is activated */
 
@@ -5211,14 +5211,14 @@ static void stm32_swinitialize(FAR struct stm32_usbdev_s *priv)
 }
 
 /****************************************************************************
- * Name: stm32_hwinitialize
+ * Name: stm32l4_hwinitialize
  *
  * Description:
  *   Configure the OTG FS core for operation.
  *
  ****************************************************************************/
 
-static void stm32_hwinitialize(FAR struct stm32_usbdev_s *priv)
+static void stm32l4_hwinitialize(FAR struct stm32l4_usbdev_s *priv)
 {
   uint32_t regval;
   uint32_t timeout;
@@ -5236,17 +5236,17 @@ static void stm32_hwinitialize(FAR struct stm32_usbdev_s *priv)
    * interrupts will occur when the TxFIFO is truly empty (not just half full).
    */
 
-  stm32_putreg(OTGFS_GAHBCFG_TXFELVL, STM32_OTGFS_GAHBCFG);
+  stm32l4_putreg(OTGFS_GAHBCFG_TXFELVL, STM32L4_OTGFS_GAHBCFG);
 
   /* Common USB OTG core initialization */
   /* Reset after a PHY select and set Host mode.  First, wait for AHB master
    * IDLE state.
    */
 
-  for (timeout = 0; timeout < STM32_READY_DELAY; timeout++)
+  for (timeout = 0; timeout < STM32L4_READY_DELAY; timeout++)
     {
       up_udelay(3);
-      regval = stm32_getreg(STM32_OTGFS_GRSTCTL);
+      regval = stm32l4_getreg(STM32L4_OTGFS_GRSTCTL);
       if ((regval & OTGFS_GRSTCTL_AHBIDL) != 0)
         {
           break;
@@ -5255,10 +5255,10 @@ static void stm32_hwinitialize(FAR struct stm32_usbdev_s *priv)
 
   /* Then perform the core soft reset. */
 
-  stm32_putreg(OTGFS_GRSTCTL_CSRST, STM32_OTGFS_GRSTCTL);
-  for (timeout = 0; timeout < STM32_READY_DELAY; timeout++)
+  stm32l4_putreg(OTGFS_GRSTCTL_CSRST, STM32L4_OTGFS_GRSTCTL);
+  for (timeout = 0; timeout < STM32L4_READY_DELAY; timeout++)
     {
-      regval = stm32_getreg(STM32_OTGFS_GRSTCTL);
+      regval = stm32l4_getreg(STM32L4_OTGFS_GRSTCTL);
       if ((regval & OTGFS_GRSTCTL_CSRST) == 0)
         {
           break;
@@ -5279,121 +5279,121 @@ static void stm32_hwinitialize(FAR struct stm32_usbdev_s *priv)
   regval |= OTGFS_GCCFG_VBDEN;
 # endif
 
-  stm32_putreg(regval, STM32_OTGFS_GCCFG);
+  stm32l4_putreg(regval, STM32L4_OTGFS_GCCFG);
   up_mdelay(20);
 
   /* When VBUS sensing is not used we need to force the B session valid */
 
 # ifndef CONFIG_USBDEV_VBUSSENSING
-  regval  =  stm32_getreg(STM32_OTGFS_GOTGCTL);
+  regval  =  stm32l4_getreg(STM32L4_OTGFS_GOTGCTL);
   regval |= (OTGFS_GOTGCTL_BVALOEN | OTGFS_GOTGCTL_BVALOVAL);
-  stm32_putreg(regval, STM32_OTGFS_GOTGCTL);
+  stm32l4_putreg(regval, STM32L4_OTGFS_GOTGCTL);
 # endif
 
   /* Force Device Mode */
 
-  regval  = stm32_getreg(STM32_OTGFS_GUSBCFG);
+  regval  = stm32l4_getreg(STM32L4_OTGFS_GUSBCFG);
   regval &= ~OTGFS_GUSBCFG_FHMOD;
   regval |= OTGFS_GUSBCFG_FDMOD;
-  stm32_putreg(regval, STM32_OTGFS_GUSBCFG);
+  stm32l4_putreg(regval, STM32L4_OTGFS_GUSBCFG);
   up_mdelay(50);
 
   /* Initialize device mode */
   /* Restart the PHY Clock */
 
-  stm32_putreg(0, STM32_OTGFS_PCGCCTL);
+  stm32l4_putreg(0, STM32L4_OTGFS_PCGCCTL);
 
   /* Device configuration register */
 
-  regval = stm32_getreg(STM32_OTGFS_DCFG);
+  regval = stm32l4_getreg(STM32L4_OTGFS_DCFG);
   regval &= ~OTGFS_DCFG_PFIVL_MASK;
   regval |= OTGFS_DCFG_PFIVL_80PCT;
-  stm32_putreg(regval, STM32_OTGFS_DCFG);
+  stm32l4_putreg(regval, STM32L4_OTGFS_DCFG);
 
   /* Set full speed PHY */
 
-  regval = stm32_getreg(STM32_OTGFS_DCFG);
+  regval = stm32l4_getreg(STM32L4_OTGFS_DCFG);
   regval &= ~OTGFS_DCFG_DSPD_MASK;
   regval |= OTGFS_DCFG_DSPD_FS;
-  stm32_putreg(regval, STM32_OTGFS_DCFG);
+  stm32l4_putreg(regval, STM32L4_OTGFS_DCFG);
 
   /* Set Rx FIFO size */
 
-  stm32_putreg(STM32_RXFIFO_WORDS, STM32_OTGFS_GRXFSIZ);
+  stm32l4_putreg(STM32L4_RXFIFO_WORDS, STM32L4_OTGFS_GRXFSIZ);
 
-#if STM32_NENDPOINTS > 0
+#if STM32L4_NENDPOINTS > 0
   /* EP0 TX */
 
-  address = STM32_RXFIFO_WORDS;
+  address = STM32L4_RXFIFO_WORDS;
   regval  = (address << OTGFS_DIEPTXF0_TX0FD_SHIFT) |
-            (STM32_EP0_TXFIFO_WORDS << OTGFS_DIEPTXF0_TX0FSA_SHIFT);
-  stm32_putreg(regval, STM32_OTGFS_DIEPTXF0);
+            (STM32L4_EP0_TXFIFO_WORDS << OTGFS_DIEPTXF0_TX0FSA_SHIFT);
+  stm32l4_putreg(regval, STM32L4_OTGFS_DIEPTXF0);
 #endif
 
-#if STM32_NENDPOINTS > 1
+#if STM32L4_NENDPOINTS > 1
   /* EP1 TX */
 
-  address += STM32_EP0_TXFIFO_WORDS;
+  address += STM32L4_EP0_TXFIFO_WORDS;
   regval   = (address << OTGFS_DIEPTXF_INEPTXSA_SHIFT) |
-             (STM32_EP1_TXFIFO_WORDS << OTGFS_DIEPTXF_INEPTXFD_SHIFT);
-  stm32_putreg(regval, STM32_OTGFS_DIEPTXF1);
+             (STM32L4_EP1_TXFIFO_WORDS << OTGFS_DIEPTXF_INEPTXFD_SHIFT);
+  stm32l4_putreg(regval, STM32L4_OTGFS_DIEPTXF1);
 #endif
 
-#if STM32_NENDPOINTS > 2
+#if STM32L4_NENDPOINTS > 2
   /* EP2 TX */
 
-  address += STM32_EP1_TXFIFO_WORDS;
+  address += STM32L4_EP1_TXFIFO_WORDS;
   regval   = (address << OTGFS_DIEPTXF_INEPTXSA_SHIFT) |
-             (STM32_EP2_TXFIFO_WORDS << OTGFS_DIEPTXF_INEPTXFD_SHIFT);
-  stm32_putreg(regval, STM32_OTGFS_DIEPTXF2);
+             (STM32L4_EP2_TXFIFO_WORDS << OTGFS_DIEPTXF_INEPTXFD_SHIFT);
+  stm32l4_putreg(regval, STM32L4_OTGFS_DIEPTXF2);
 #endif
 
-#if STM32_NENDPOINTS > 3
+#if STM32L4_NENDPOINTS > 3
   /* EP3 TX */
 
-  address += STM32_EP2_TXFIFO_WORDS;
+  address += STM32L4_EP2_TXFIFO_WORDS;
   regval   = (address << OTGFS_DIEPTXF_INEPTXSA_SHIFT) |
-             (STM32_EP3_TXFIFO_WORDS << OTGFS_DIEPTXF_INEPTXFD_SHIFT);
-  stm32_putreg(regval, STM32_OTGFS_DIEPTXF3);
+             (STM32L4_EP3_TXFIFO_WORDS << OTGFS_DIEPTXF_INEPTXFD_SHIFT);
+  stm32l4_putreg(regval, STM32L4_OTGFS_DIEPTXF3);
 #endif
 
-#if STM32_NENDPOINTS > 4
+#if STM32L4_NENDPOINTS > 4
   /* EP4 TX */
 
-  address += STM32_EP3_TXFIFO_WORDS;
+  address += STM32L4_EP3_TXFIFO_WORDS;
   regval   = (address << OTGFS_DIEPTXF_INEPTXSA_SHIFT) |
-             (STM32_EP4_TXFIFO_WORDS << OTGFS_DIEPTXF_INEPTXFD_SHIFT);
-  stm32_putreg(regval, STM32_OTGFS_DIEPTXF4);
+             (STM32L4_EP4_TXFIFO_WORDS << OTGFS_DIEPTXF_INEPTXFD_SHIFT);
+  stm32l4_putreg(regval, STM32L4_OTGFS_DIEPTXF4);
 #endif
 
-#if STM32_NENDPOINTS > 5
+#if STM32L4_NENDPOINTS > 5
   /* EP5 TX */
 
-  address += STM32_EP4_TXFIFO_WORDS;
+  address += STM32L4_EP4_TXFIFO_WORDS;
   regval   = (address << OTGFS_DIEPTXF_INEPTXSA_SHIFT) |
-             (STM32_EP5_TXFIFO_WORDS << OTGFS_DIEPTXF_INEPTXFD_SHIFT);
-  stm32_putreg(regval, STM32_OTGFS_DIEPTXF5);
+             (STM32L4_EP5_TXFIFO_WORDS << OTGFS_DIEPTXF_INEPTXFD_SHIFT);
+  stm32l4_putreg(regval, STM32L4_OTGFS_DIEPTXF5);
 #endif
 
 
   /* Flush the FIFOs */
 
-  stm32_txfifo_flush(OTGFS_GRSTCTL_TXFNUM_DALL);
-  stm32_rxfifo_flush();
+  stm32l4_txfifo_flush(OTGFS_GRSTCTL_TXFNUM_DALL);
+  stm32l4_rxfifo_flush();
 
   /* Clear all pending Device Interrupts */
 
-  stm32_putreg(0, STM32_OTGFS_DIEPMSK);
-  stm32_putreg(0, STM32_OTGFS_DOEPMSK);
-  stm32_putreg(0, STM32_OTGFS_DIEPEMPMSK);
-  stm32_putreg(0xffffffff, STM32_OTGFS_DAINT);
-  stm32_putreg(0, STM32_OTGFS_DAINTMSK);
+  stm32l4_putreg(0, STM32L4_OTGFS_DIEPMSK);
+  stm32l4_putreg(0, STM32L4_OTGFS_DOEPMSK);
+  stm32l4_putreg(0, STM32L4_OTGFS_DIEPEMPMSK);
+  stm32l4_putreg(0xffffffff, STM32L4_OTGFS_DAINT);
+  stm32l4_putreg(0, STM32L4_OTGFS_DAINTMSK);
 
   /* Configure all IN endpoints */
 
-  for (i = 0; i < STM32_NENDPOINTS; i++)
+  for (i = 0; i < STM32L4_NENDPOINTS; i++)
     {
-      regval = stm32_getreg(STM32_OTGFS_DIEPCTL(i));
+      regval = stm32l4_getreg(STM32L4_OTGFS_DIEPCTL(i));
       if ((regval & OTGFS_DIEPCTL_EPENA) != 0)
         {
           /* The endpoint is already enabled */
@@ -5405,16 +5405,16 @@ static void stm32_hwinitialize(FAR struct stm32_usbdev_s *priv)
           regval = 0;
         }
 
-      stm32_putreg(regval, STM32_OTGFS_DIEPCTL(i));
-      stm32_putreg(0, STM32_OTGFS_DIEPTSIZ(i));
-      stm32_putreg(0xff, STM32_OTGFS_DIEPINT(i));
+      stm32l4_putreg(regval, STM32L4_OTGFS_DIEPCTL(i));
+      stm32l4_putreg(0, STM32L4_OTGFS_DIEPTSIZ(i));
+      stm32l4_putreg(0xff, STM32L4_OTGFS_DIEPINT(i));
     }
 
   /* Configure all OUT endpoints */
 
-  for (i = 0; i < STM32_NENDPOINTS; i++)
+  for (i = 0; i < STM32L4_NENDPOINTS; i++)
     {
-      regval = stm32_getreg(STM32_OTGFS_DOEPCTL(i));
+      regval = stm32l4_getreg(STM32L4_OTGFS_DOEPCTL(i));
       if ((regval & OTGFS_DOEPCTL_EPENA) != 0)
         {
           /* The endpoint is already enabled */
@@ -5426,22 +5426,22 @@ static void stm32_hwinitialize(FAR struct stm32_usbdev_s *priv)
           regval = 0;
         }
 
-      stm32_putreg(regval, STM32_OTGFS_DOEPCTL(i));
-      stm32_putreg(0, STM32_OTGFS_DOEPTSIZ(i));
-      stm32_putreg(0xff, STM32_OTGFS_DOEPINT(i));
+      stm32l4_putreg(regval, STM32L4_OTGFS_DOEPCTL(i));
+      stm32l4_putreg(0, STM32L4_OTGFS_DOEPTSIZ(i));
+      stm32l4_putreg(0xff, STM32L4_OTGFS_DOEPINT(i));
     }
 
   /* Disable all interrupts. */
 
-  stm32_putreg(0, STM32_OTGFS_GINTMSK);
+  stm32l4_putreg(0, STM32L4_OTGFS_GINTMSK);
 
   /* Clear any pending USB_OTG Interrupts */
 
-  stm32_putreg(0xffffffff, STM32_OTGFS_GOTGINT);
+  stm32l4_putreg(0xffffffff, STM32L4_OTGFS_GOTGINT);
 
   /* Clear any pending interrupts */
 
-  stm32_putreg(0xbfffffff, STM32_OTGFS_GINTSTS);
+  stm32l4_putreg(0xbfffffff, STM32L4_OTGFS_GINTSTS);
 
   /* Enable the interrupts in the INTMSK */
 
@@ -5464,7 +5464,7 @@ static void stm32_hwinitialize(FAR struct stm32_usbdev_s *priv)
   regval |= OTGFS_GINT_MMIS;
 #endif
 
-  stm32_putreg(regval, STM32_OTGFS_GINTMSK);
+  stm32l4_putreg(regval, STM32L4_OTGFS_GINTMSK);
 
   /* Enable the USB global interrupt by setting GINTMSK in the global OTG
    * FS AHB configuration register; Set the TXFELVL bit in the GAHBCFG
@@ -5472,8 +5472,8 @@ static void stm32_hwinitialize(FAR struct stm32_usbdev_s *priv)
    * empty (not just half full).
    */
 
-  stm32_putreg(OTGFS_GAHBCFG_GINTMSK | OTGFS_GAHBCFG_TXFELVL,
-               STM32_OTGFS_GAHBCFG);
+  stm32l4_putreg(OTGFS_GAHBCFG_GINTMSK | OTGFS_GAHBCFG_TXFELVL,
+               STM32L4_OTGFS_GAHBCFG);
 }
 
 /****************************************************************************
@@ -5503,7 +5503,7 @@ void up_usbinitialize(void)
    * global data) in order to simplify any future support for multiple devices.
    */
 
-  FAR struct stm32_usbdev_s *priv = &g_otgfsdev;
+  FAR struct stm32l4_usbdev_s *priv = &g_otgfsdev;
   int ret;
 
   usbtrace(TRACE_DEVINIT, 0);
@@ -5537,7 +5537,7 @@ void up_usbinitialize(void)
 
   /* SOF output pin configuration is configurable. */
 
-#ifdef CONFIG_STM32_OTGFS_SOFOUTPUT
+#ifdef CONFIG_STM32L4_OTGFS_SOFOUTPUT
   stm32l4_configgpio(GPIO_OTGFS_SOF);
 #endif
 
@@ -5548,11 +5548,11 @@ void up_usbinitialize(void)
 
   /* Initialize the driver data structure */
 
-  stm32_swinitialize(priv);
+  stm32l4_swinitialize(priv);
 
   /* Attach the OTG FS interrupt handler */
 
-  ret = irq_attach(STM32L4_IRQ_OTGFS, stm32_usbinterrupt);
+  ret = irq_attach(STM32L4_IRQ_OTGFS, stm32l4_usbinterrupt);
   if (ret < 0)
     {
       uerr("irq_attach failed\n", ret);
@@ -5561,15 +5561,15 @@ void up_usbinitialize(void)
 
   /* Initialize the USB OTG core */
 
-  stm32_hwinitialize(priv);
+  stm32l4_hwinitialize(priv);
 
   /* Disconnect device */
 
-  stm32_pullup(&priv->usbdev, false);
+  stm32l4_pullup(&priv->usbdev, false);
 
   /* Reset/Re-initialize the USB hardware */
 
-  stm32_usbreset(priv);
+  stm32l4_usbreset(priv);
 
   /* Enable USB controller interrupts at the NVIC */
 
@@ -5598,7 +5598,7 @@ void up_usbuninitialize(void)
    * global data) in order to simplify any future support for multiple devices.
    */
 
-  FAR struct stm32_usbdev_s *priv = &g_otgfsdev;
+  FAR struct stm32l4_usbdev_s *priv = &g_otgfsdev;
   irqstate_t flags;
   int i;
 
@@ -5606,14 +5606,14 @@ void up_usbuninitialize(void)
 
   if (priv->driver)
     {
-      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_DRIVERREGISTERED), 0);
+      usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_DRIVERREGISTERED), 0);
       usbdev_unregister(priv->driver);
     }
 
   /* Disconnect device */
 
   flags = enter_critical_section();
-  stm32_pullup(&priv->usbdev, false);
+  stm32l4_pullup(&priv->usbdev, false);
   priv->usbdev.speed = USB_SPEED_UNKNOWN;
 
   /* Disable and detach IRQs */
@@ -5623,22 +5623,22 @@ void up_usbuninitialize(void)
 
   /* Disable all endpoint interrupts */
 
-  for (i = 0; i < STM32_NENDPOINTS; i++)
+  for (i = 0; i < STM32L4_NENDPOINTS; i++)
     {
-      stm32_putreg(0xff, STM32_OTGFS_DIEPINT(i));
-      stm32_putreg(0xff, STM32_OTGFS_DOEPINT(i));
+      stm32l4_putreg(0xff, STM32L4_OTGFS_DIEPINT(i));
+      stm32l4_putreg(0xff, STM32L4_OTGFS_DOEPINT(i));
     }
 
-  stm32_putreg(0, STM32_OTGFS_DIEPMSK);
-  stm32_putreg(0, STM32_OTGFS_DOEPMSK);
-  stm32_putreg(0, STM32_OTGFS_DIEPEMPMSK);
-  stm32_putreg(0, STM32_OTGFS_DAINTMSK);
-  stm32_putreg(0xffffffff, STM32_OTGFS_DAINT);
+  stm32l4_putreg(0, STM32L4_OTGFS_DIEPMSK);
+  stm32l4_putreg(0, STM32L4_OTGFS_DOEPMSK);
+  stm32l4_putreg(0, STM32L4_OTGFS_DIEPEMPMSK);
+  stm32l4_putreg(0, STM32L4_OTGFS_DAINTMSK);
+  stm32l4_putreg(0xffffffff, STM32L4_OTGFS_DAINT);
 
   /* Flush the FIFOs */
 
-  stm32_txfifo_flush(OTGFS_GRSTCTL_TXFNUM_DALL);
-  stm32_rxfifo_flush();
+  stm32l4_txfifo_flush(OTGFS_GRSTCTL_TXFNUM_DALL);
+  stm32l4_rxfifo_flush();
 
   /* TODO: Turn off USB power and clocking */
 
@@ -5663,7 +5663,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
    * global data) in order to simplify any future support for multiple devices.
    */
 
-  FAR struct stm32_usbdev_s *priv = &g_otgfsdev;
+  FAR struct stm32l4_usbdev_s *priv = &g_otgfsdev;
   int ret;
 
   usbtrace(TRACE_DEVREGISTER, 0);
@@ -5672,13 +5672,13 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
   if (!driver || !driver->ops->bind || !driver->ops->unbind ||
       !driver->ops->disconnect || !driver->ops->setup)
     {
-      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
+      usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_INVALIDPARMS), 0);
       return -EINVAL;
     }
 
   if (priv->driver)
     {
-      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_DRIVER), 0);
+      usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_DRIVER), 0);
       return -EBUSY;
     }
 #endif
@@ -5692,7 +5692,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
   ret = CLASS_BIND(driver, &priv->usbdev);
   if (ret)
     {
-      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_BINDFAILED), (uint16_t)-ret);
+      usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_BINDFAILED), (uint16_t)-ret);
       priv->driver = NULL;
     }
   else
@@ -5709,7 +5709,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
        *        that logic to the class drivers but left this logic here.
        */
 
-      stm32_pullup(&priv->usbdev, true);
+      stm32l4_pullup(&priv->usbdev, true);
       priv->usbdev.speed = USB_SPEED_FULL;
     }
 
@@ -5734,7 +5734,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
    * global data) in order to simplify any future support for multiple devices.
    */
 
-  FAR struct stm32_usbdev_s *priv = &g_otgfsdev;
+  FAR struct stm32l4_usbdev_s *priv = &g_otgfsdev;
   irqstate_t flags;
 
   usbtrace(TRACE_DEVUNREGISTER, 0);
@@ -5742,7 +5742,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
 #ifdef CONFIG_DEBUG_USB
   if (driver != priv->driver)
     {
-      usbtrace(TRACE_DEVERROR(STM32_TRACEERR_INVALIDPARMS), 0);
+      usbtrace(TRACE_DEVERROR(STM32L4_TRACEERR_INVALIDPARMS), 0);
       return -EINVAL;
     }
 #endif
@@ -5752,7 +5752,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
    */
 
   flags = enter_critical_section();
-  stm32_usbreset(priv);
+  stm32l4_usbreset(priv);
   leave_critical_section(flags);
 
   /* Unbind the class driver */
@@ -5766,7 +5766,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
 
   /* Disconnect device */
 
-  stm32_pullup(&priv->usbdev, false);
+  stm32l4_pullup(&priv->usbdev, false);
 
   /* Unhook the driver */
 
@@ -5776,4 +5776,4 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
   return OK;
 }
 
-#endif /* CONFIG_USBDEV && CONFIG_STM32_OTGFSDEV */
+#endif /* CONFIG_USBDEV && CONFIG_STM32L4_OTGFSDEV */
diff --git a/arch/arm/src/stm32l4/stm32l4_otgfshost.c b/arch/arm/src/stm32l4/stm32l4_otgfshost.c
index ebb07b6943..348bdc1709 100644
--- a/arch/arm/src/stm32l4/stm32l4_otgfshost.c
+++ b/arch/arm/src/stm32l4/stm32l4_otgfshost.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/stm32l4/stm32_otgfshost.c
+ * arch/arm/src/stm32l4/stm32l4_otgfshost.c
  *
  *   Copyright (C) 2012-2016 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt 
@@ -68,7 +68,7 @@
 
 #include "stm32l4_usbhost.h"
 
-#if defined(CONFIG_USBHOST) && defined(CONFIG_STM32_OTGFS)
+#if defined(CONFIG_USBHOST) && defined(CONFIG_STM32L4_OTGFS)
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -79,80 +79,80 @@
  * Pre-requisites
  *
  *  CONFIG_USBHOST      - Enable general USB host support
- *  CONFIG_STM32_OTGFS  - Enable the STM32 USB OTG FS block
- *  CONFIG_STM32_SYSCFG - Needed
+ *  CONFIG_STM32L4_OTGFS  - Enable the STM32 USB OTG FS block
+ *  CONFIG_STM32L4_SYSCFG - Needed
  *
  * Options:
  *
- *  CONFIG_STM32_OTGFS_RXFIFO_SIZE - Size of the RX FIFO in 32-bit words.
+ *  CONFIG_STM32L4_OTGFS_RXFIFO_SIZE - Size of the RX FIFO in 32-bit words.
  *    Default 128 (512 bytes)
- *  CONFIG_STM32_OTGFS_NPTXFIFO_SIZE - Size of the non-periodic Tx FIFO
+ *  CONFIG_STM32L4_OTGFS_NPTXFIFO_SIZE - Size of the non-periodic Tx FIFO
  *    in 32-bit words.  Default 96 (384 bytes)
- *  CONFIG_STM32_OTGFS_PTXFIFO_SIZE - Size of the periodic Tx FIFO in 32-bit
+ *  CONFIG_STM32L4_OTGFS_PTXFIFO_SIZE - Size of the periodic Tx FIFO in 32-bit
  *    words.  Default 96 (384 bytes)
- *  CONFIG_STM32_OTGFS_DESCSIZE - Maximum size of a descriptor.  Default: 128
- *  CONFIG_STM32_OTGFS_SOFINTR - Enable SOF interrupts.  Why would you ever
+ *  CONFIG_STM32L4_OTGFS_DESCSIZE - Maximum size of a descriptor.  Default: 128
+ *  CONFIG_STM32L4_OTGFS_SOFINTR - Enable SOF interrupts.  Why would you ever
  *    want to do that?
- *  CONFIG_STM32_USBHOST_REGDEBUG - Enable very low-level register access
+ *  CONFIG_STM32L4_USBHOST_REGDEBUG - Enable very low-level register access
  *    debug.  Depends on CONFIG_DEBUG.
- *  CONFIG_STM32_USBHOST_PKTDUMP - Dump all incoming and outgoing USB
+ *  CONFIG_STM32L4_USBHOST_PKTDUMP - Dump all incoming and outgoing USB
  *    packets. Depends on CONFIG_DEBUG.
  */
 
 /* Pre-requisites (partial) */
 
-#ifndef CONFIG_STM32_SYSCFG
-#  error "CONFIG_STM32_SYSCFG is required"
+#ifndef CONFIG_STM32L4_SYSCFG
+#  error "CONFIG_STM32L4_SYSCFG is required"
 #endif
 
 /* Default RxFIFO size */
 
-#ifndef CONFIG_STM32_OTGFS_RXFIFO_SIZE
-#  define CONFIG_STM32_OTGFS_RXFIFO_SIZE 128
+#ifndef CONFIG_STM32L4_OTGFS_RXFIFO_SIZE
+#  define CONFIG_STM32L4_OTGFS_RXFIFO_SIZE 128
 #endif
 
 /* Default host non-periodic Tx FIFO size */
 
-#ifndef CONFIG_STM32_OTGFS_NPTXFIFO_SIZE
-#  define CONFIG_STM32_OTGFS_NPTXFIFO_SIZE 96
+#ifndef CONFIG_STM32L4_OTGFS_NPTXFIFO_SIZE
+#  define CONFIG_STM32L4_OTGFS_NPTXFIFO_SIZE 96
 #endif
 
 /* Default host periodic Tx fifo size register */
 
-#ifndef CONFIG_STM32_OTGFS_PTXFIFO_SIZE
-#  define CONFIG_STM32_OTGFS_PTXFIFO_SIZE 96
+#ifndef CONFIG_STM32L4_OTGFS_PTXFIFO_SIZE
+#  define CONFIG_STM32L4_OTGFS_PTXFIFO_SIZE 96
 #endif
 
 /* Maximum size of a descriptor */
 
-#ifndef CONFIG_STM32_OTGFS_DESCSIZE
-#  define CONFIG_STM32_OTGFS_DESCSIZE 128
+#ifndef CONFIG_STM32L4_OTGFS_DESCSIZE
+#  define CONFIG_STM32L4_OTGFS_DESCSIZE 128
 #endif
 
 /* Register/packet debug depends on CONFIG_DEBUG */
 
 #ifndef CONFIG_DEBUG
-#  undef CONFIG_STM32_USBHOST_REGDEBUG
-#  undef CONFIG_STM32_USBHOST_PKTDUMP
+#  undef CONFIG_STM32L4_USBHOST_REGDEBUG
+#  undef CONFIG_STM32L4_USBHOST_PKTDUMP
 #endif
 
 /* HCD Setup *******************************************************************/
 /* Hardware capabilities */
 //XXX I think this needs to be 12 for the 'L4
-#define STM32_NHOST_CHANNELS      8   /* Number of host channels */
-#define STM32_MAX_PACKET_SIZE     64  /* Full speed max packet size */
-#define STM32_EP0_DEF_PACKET_SIZE 8   /* EP0 default packet size */
-#define STM32_EP0_MAX_PACKET_SIZE 64  /* EP0 FS max packet size */
-#define STM32_MAX_TX_FIFOS        15  /* Max number of TX FIFOs */
-#define STM32_MAX_PKTCOUNT        256 /* Max packet count */
-#define STM32_RETRY_COUNT         3   /* Number of ctrl transfer retries */
+#define STM32L4_NHOST_CHANNELS      8   /* Number of host channels */
+#define STM32L4_MAX_PACKET_SIZE     64  /* Full speed max packet size */
+#define STM32L4_EP0_DEF_PACKET_SIZE 8   /* EP0 default packet size */
+#define STM32L4_EP0_MAX_PACKET_SIZE 64  /* EP0 FS max packet size */
+#define STM32L4_MAX_TX_FIFOS        15  /* Max number of TX FIFOs */
+#define STM32L4_MAX_PKTCOUNT        256 /* Max packet count */
+#define STM32L4_RETRY_COUNT         3   /* Number of ctrl transfer retries */
 
 /* Delays **********************************************************************/
 
-#define STM32_READY_DELAY         200000 /* In loop counts */
-#define STM32_FLUSH_DELAY         200000 /* In loop counts */
-#define STM32_SETUP_DELAY         SEC2TICK(5) /* 5 seconds in system ticks */
-#define STM32_DATANAK_DELAY       SEC2TICK(5) /* 5 seconds in system ticks */
+#define STM32L4_READY_DELAY         200000 /* In loop counts */
+#define STM32L4_FLUSH_DELAY         200000 /* In loop counts */
+#define STM32L4_SETUP_DELAY         SEC2TICK(5) /* 5 seconds in system ticks */
+#define STM32L4_DATANAK_DELAY       SEC2TICK(5) /* 5 seconds in system ticks */
 
 /* Ever-present MIN/MAX macros */
 
@@ -172,7 +172,7 @@
  * state machine (for debug purposes only)
  */
 
-enum stm32_smstate_e
+enum stm32l4_smstate_e
 {
   SMSTATE_DETACHED = 0,  /* Not attached to a device */
   SMSTATE_ATTACHED,      /* Attached to a device */
@@ -182,7 +182,7 @@ enum stm32_smstate_e
 
 /* This enumeration provides the reason for the channel halt. */
 
-enum stm32_chreason_e
+enum stm32l4_chreason_e
 {
   CHREASON_IDLE = 0,     /* Inactive (initial state) */
   CHREASON_FREED,        /* Channel is no longer in use */
@@ -198,15 +198,15 @@ enum stm32_chreason_e
 
 /* This structure retains the state of one host channel.  NOTE: Since there
  * is only one channel operation active at a time, some of the fields in
- * in the structure could be moved in struct stm32_ubhost_s to achieve
+ * in the structure could be moved in struct stm32l4_ubhost_s to achieve
  * some memory savings.
  */
 
-struct stm32_chan_s
+struct stm32l4_chan_s
 {
   sem_t             waitsem;   /* Channel wait semaphore */
   volatile uint8_t  result;    /* The result of the transfer */
-  volatile uint8_t  chreason;  /* Channel halt reason. See enum stm32_chreason_e */
+  volatile uint8_t  chreason;  /* Channel halt reason. See enum stm32l4_chreason_e */
   uint8_t           chidx;     /* Channel index */
   uint8_t           epno;      /* Device endpoint number (0-127) */
   uint8_t           eptype;    /* See OTGFS_EPTYPE_* definitions */
@@ -235,7 +235,7 @@ struct stm32_chan_s
  * the endpoint.
  */
 
-struct stm32_ctrlinfo_s
+struct stm32l4_ctrlinfo_s
 {
   uint8_t           inndx;     /* EP0 IN control channel index */
   uint8_t           outndx;    /* EP0 OUT control channel index */
@@ -243,11 +243,11 @@ struct stm32_ctrlinfo_s
 
 /* This structure retains the state of the USB host controller */
 
-struct stm32_usbhost_s
+struct stm32l4_usbhost_s
 {
   /* Common device fields.  This must be the first thing defined in the
    * structure so that it is possible to simply cast from struct usbhost_s
-   * to structstm32_usbhost_s.
+   * to structstm32l4_usbhost_s.
    */
 
   struct usbhost_driver_s drvr;
@@ -265,7 +265,7 @@ struct stm32_usbhost_s
   volatile bool     pscwait;   /* True: Thread is waiting for a port event */
   sem_t             exclsem;   /* Support mutually exclusive access */
   sem_t             pscsem;    /* Semaphore to wait for a port event */
-  struct stm32_ctrlinfo_s ep0;  /* Root hub port EP0 description */
+  struct stm32l4_ctrlinfo_s ep0;  /* Root hub port EP0 description */
 
 #ifdef CONFIG_USBHOST_HUB
   /* Used to pass external hub port events */
@@ -275,7 +275,7 @@ struct stm32_usbhost_s
 
   /* The state of each host channel */
 
-  struct stm32_chan_s chan[STM32_MAX_TX_FIFOS];
+  struct stm32l4_chan_s chan[STM32L4_MAX_TX_FIFOS];
 };
 
 /****************************************************************************
@@ -284,95 +284,95 @@ struct stm32_usbhost_s
 
 /* Register operations ********************************************************/
 
-#ifdef CONFIG_STM32_USBHOST_REGDEBUG
-static void stm32_printreg(uint32_t addr, uint32_t val, bool iswrite);
-static void stm32_checkreg(uint32_t addr, uint32_t val, bool iswrite);
-static uint32_t stm32_getreg(uint32_t addr);
-static void stm32_putreg(uint32_t addr, uint32_t value);
+#ifdef CONFIG_STM32L4_USBHOST_REGDEBUG
+static void stm32l4_printreg(uint32_t addr, uint32_t val, bool iswrite);
+static void stm32l4_checkreg(uint32_t addr, uint32_t val, bool iswrite);
+static uint32_t stm32l4_getreg(uint32_t addr);
+static void stm32l4_putreg(uint32_t addr, uint32_t value);
 #else
-# define stm32_getreg(addr)     getreg32(addr)
-# define stm32_putreg(addr,val) putreg32(val,addr)
+# define stm32l4_getreg(addr)     getreg32(addr)
+# define stm32l4_putreg(addr,val) putreg32(val,addr)
 #endif
 
-static inline void stm32_modifyreg(uint32_t addr, uint32_t clrbits,
+static inline void stm32l4_modifyreg(uint32_t addr, uint32_t clrbits,
                                    uint32_t setbits);
 
-#ifdef CONFIG_STM32_USBHOST_PKTDUMP
-#  define stm32_pktdump(m,b,n) lib_dumpbuffer(m,b,n)
+#ifdef CONFIG_STM32L4_USBHOST_PKTDUMP
+#  define stm32l4_pktdump(m,b,n) lib_dumpbuffer(m,b,n)
 #else
-#  define stm32_pktdump(m,b,n)
+#  define stm32l4_pktdump(m,b,n)
 #endif
 
 /* Semaphores ******************************************************************/
 
-static void stm32_takesem(sem_t *sem);
-#define stm32_givesem(s) sem_post(s);
+static void stm32l4_takesem(sem_t *sem);
+#define stm32l4_givesem(s) sem_post(s);
 
 /* Byte stream access helper functions *****************************************/
 
-static inline uint16_t stm32_getle16(const uint8_t *val);
+static inline uint16_t stm32l4_getle16(const uint8_t *val);
 
 /* Channel management **********************************************************/
 
-static int stm32_chan_alloc(FAR struct stm32_usbhost_s *priv);
-static inline void stm32_chan_free(FAR struct stm32_usbhost_s *priv, int chidx);
-static inline void stm32_chan_freeall(FAR struct stm32_usbhost_s *priv);
-static void stm32_chan_configure(FAR struct stm32_usbhost_s *priv, int chidx);
-static void stm32_chan_halt(FAR struct stm32_usbhost_s *priv, int chidx,
-                            enum stm32_chreason_e chreason);
-static int stm32_chan_waitsetup(FAR struct stm32_usbhost_s *priv,
-                                FAR struct stm32_chan_s *chan);
+static int stm32l4_chan_alloc(FAR struct stm32l4_usbhost_s *priv);
+static inline void stm32l4_chan_free(FAR struct stm32l4_usbhost_s *priv, int chidx);
+static inline void stm32l4_chan_freeall(FAR struct stm32l4_usbhost_s *priv);
+static void stm32l4_chan_configure(FAR struct stm32l4_usbhost_s *priv, int chidx);
+static void stm32l4_chan_halt(FAR struct stm32l4_usbhost_s *priv, int chidx,
+                            enum stm32l4_chreason_e chreason);
+static int stm32l4_chan_waitsetup(FAR struct stm32l4_usbhost_s *priv,
+                                FAR struct stm32l4_chan_s *chan);
 #ifdef CONFIG_USBHOST_ASYNCH
-static int stm32_chan_asynchsetup(FAR struct stm32_usbhost_s *priv,
-                                  FAR struct stm32_chan_s *chan,
+static int stm32l4_chan_asynchsetup(FAR struct stm32l4_usbhost_s *priv,
+                                  FAR struct stm32l4_chan_s *chan,
                                   usbhost_asynch_t callback, FAR void *arg);
 #endif
-static int stm32_chan_wait(FAR struct stm32_usbhost_s *priv,
-                           FAR struct stm32_chan_s *chan);
-static void stm32_chan_wakeup(FAR struct stm32_usbhost_s *priv,
-                              FAR struct stm32_chan_s *chan);
-static int stm32_ctrlchan_alloc(FAR struct stm32_usbhost_s *priv,
+static int stm32l4_chan_wait(FAR struct stm32l4_usbhost_s *priv,
+                           FAR struct stm32l4_chan_s *chan);
+static void stm32l4_chan_wakeup(FAR struct stm32l4_usbhost_s *priv,
+                              FAR struct stm32l4_chan_s *chan);
+static int stm32l4_ctrlchan_alloc(FAR struct stm32l4_usbhost_s *priv,
                                 uint8_t epno, uint8_t funcaddr, uint8_t speed,
-                                FAR struct stm32_ctrlinfo_s *ctrlep);
-static int stm32_ctrlep_alloc(FAR struct stm32_usbhost_s *priv,
+                                FAR struct stm32l4_ctrlinfo_s *ctrlep);
+static int stm32l4_ctrlep_alloc(FAR struct stm32l4_usbhost_s *priv,
                               FAR const struct usbhost_epdesc_s *epdesc,
                               FAR usbhost_ep_t *ep);
-static int stm32_xfrep_alloc(FAR struct stm32_usbhost_s *priv,
+static int stm32l4_xfrep_alloc(FAR struct stm32l4_usbhost_s *priv,
                               FAR const struct usbhost_epdesc_s *epdesc,
                               FAR usbhost_ep_t *ep);
 
 /* Control/data transfer logic *************************************************/
 
-static void stm32_transfer_start(FAR struct stm32_usbhost_s *priv, int chidx);
+static void stm32l4_transfer_start(FAR struct stm32l4_usbhost_s *priv, int chidx);
 #if 0 /* Not used */
-static inline uint16_t stm32_getframe(void);
+static inline uint16_t stm32l4_getframe(void);
 #endif
-static int stm32_ctrl_sendsetup(FAR struct stm32_usbhost_s *priv,
-                                FAR struct stm32_ctrlinfo_s *ep0,
+static int stm32l4_ctrl_sendsetup(FAR struct stm32l4_usbhost_s *priv,
+                                FAR struct stm32l4_ctrlinfo_s *ep0,
                                 FAR const struct usb_ctrlreq_s *req);
-static int stm32_ctrl_senddata(FAR struct stm32_usbhost_s *priv,
-                               FAR struct stm32_ctrlinfo_s *ep0,
+static int stm32l4_ctrl_senddata(FAR struct stm32l4_usbhost_s *priv,
+                               FAR struct stm32l4_ctrlinfo_s *ep0,
                                FAR uint8_t *buffer, unsigned int buflen);
-static int stm32_ctrl_recvdata(FAR struct stm32_usbhost_s *priv,
-                               FAR struct stm32_ctrlinfo_s *ep0,
+static int stm32l4_ctrl_recvdata(FAR struct stm32l4_usbhost_s *priv,
+                               FAR struct stm32l4_ctrlinfo_s *ep0,
                                FAR uint8_t *buffer, unsigned int buflen);
-static int stm32_in_setup(FAR struct stm32_usbhost_s *priv, int chidx);
-static ssize_t stm32_in_transfer(FAR struct stm32_usbhost_s *priv, int chidx,
+static int stm32l4_in_setup(FAR struct stm32l4_usbhost_s *priv, int chidx);
+static ssize_t stm32l4_in_transfer(FAR struct stm32l4_usbhost_s *priv, int chidx,
                                  FAR uint8_t *buffer, size_t buflen);
 #ifdef CONFIG_USBHOST_ASYNCH
-static void stm32_in_next(FAR struct stm32_usbhost_s *priv,
-                          FAR struct stm32_chan_s *chan);
-static int stm32_in_asynch(FAR struct stm32_usbhost_s *priv, int chidx,
+static void stm32l4_in_next(FAR struct stm32l4_usbhost_s *priv,
+                          FAR struct stm32l4_chan_s *chan);
+static int stm32l4_in_asynch(FAR struct stm32l4_usbhost_s *priv, int chidx,
                            FAR uint8_t *buffer, size_t buflen,
                            usbhost_asynch_t callback, FAR void *arg);
 #endif
-static int stm32_out_setup(FAR struct stm32_usbhost_s *priv, int chidx);
-static ssize_t stm32_out_transfer(FAR struct stm32_usbhost_s *priv, int chidx,
+static int stm32l4_out_setup(FAR struct stm32l4_usbhost_s *priv, int chidx);
+static ssize_t stm32l4_out_transfer(FAR struct stm32l4_usbhost_s *priv, int chidx,
                                   FAR uint8_t *buffer, size_t buflen);
 #ifdef CONFIG_USBHOST_ASYNCH
-static void stm32_out_next(FAR struct stm32_usbhost_s *priv,
-                           FAR struct stm32_chan_s *chan);
-static int stm32_out_asynch(FAR struct stm32_usbhost_s *priv, int chidx,
+static void stm32l4_out_next(FAR struct stm32l4_usbhost_s *priv,
+                           FAR struct stm32l4_chan_s *chan);
+static int stm32l4_out_asynch(FAR struct stm32l4_usbhost_s *priv, int chidx,
                             FAR uint8_t *buffer, size_t buflen,
                             usbhost_asynch_t callback, FAR void *arg);
 #endif
@@ -380,94 +380,94 @@ static int stm32_out_asynch(FAR struct stm32_usbhost_s *priv, int chidx,
 /* Interrupt handling **********************************************************/
 /* Lower level interrupt handlers */
 
-static void stm32_gint_wrpacket(FAR struct stm32_usbhost_s *priv,
+static void stm32l4_gint_wrpacket(FAR struct stm32l4_usbhost_s *priv,
                                 FAR uint8_t *buffer, int chidx, int buflen);
-static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv,
+static inline void stm32l4_gint_hcinisr(FAR struct stm32l4_usbhost_s *priv,
                                       int chidx);
-static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv,
+static inline void stm32l4_gint_hcoutisr(FAR struct stm32l4_usbhost_s *priv,
                                        int chidx);
-static void stm32_gint_connected(FAR struct stm32_usbhost_s *priv);
-static void stm32_gint_disconnected(FAR struct stm32_usbhost_s *priv);
+static void stm32l4_gint_connected(FAR struct stm32l4_usbhost_s *priv);
+static void stm32l4_gint_disconnected(FAR struct stm32l4_usbhost_s *priv);
 
 /* Second level interrupt handlers */
 
-#ifdef CONFIG_STM32_OTGFS_SOFINTR
-static inline void stm32_gint_sofisr(FAR struct stm32_usbhost_s *priv);
+#ifdef CONFIG_STM32L4_OTGFS_SOFINTR
+static inline void stm32l4_gint_sofisr(FAR struct stm32l4_usbhost_s *priv);
 #endif
-static inline void stm32_gint_rxflvlisr(FAR struct stm32_usbhost_s *priv);
-static inline void stm32_gint_nptxfeisr(FAR struct stm32_usbhost_s *priv);
-static inline void stm32_gint_ptxfeisr(FAR struct stm32_usbhost_s *priv);
-static inline void stm32_gint_hcisr(FAR struct stm32_usbhost_s *priv);
-static inline void stm32_gint_hprtisr(FAR struct stm32_usbhost_s *priv);
-static inline void stm32_gint_discisr(FAR struct stm32_usbhost_s *priv);
-static inline void stm32_gint_ipxfrisr(FAR struct stm32_usbhost_s *priv);
+static inline void stm32l4_gint_rxflvlisr(FAR struct stm32l4_usbhost_s *priv);
+static inline void stm32l4_gint_nptxfeisr(FAR struct stm32l4_usbhost_s *priv);
+static inline void stm32l4_gint_ptxfeisr(FAR struct stm32l4_usbhost_s *priv);
+static inline void stm32l4_gint_hcisr(FAR struct stm32l4_usbhost_s *priv);
+static inline void stm32l4_gint_hprtisr(FAR struct stm32l4_usbhost_s *priv);
+static inline void stm32l4_gint_discisr(FAR struct stm32l4_usbhost_s *priv);
+static inline void stm32l4_gint_ipxfrisr(FAR struct stm32l4_usbhost_s *priv);
 
 /* First level, global interrupt handler */
 
-static int stm32_gint_isr(int irq, FAR void *context);
+static int stm32l4_gint_isr(int irq, FAR void *context);
 
 /* Interrupt controls */
 
-static void stm32_gint_enable(void);
-static void stm32_gint_disable(void);
-static inline void stm32_hostinit_enable(void);
-static void stm32_txfe_enable(FAR struct stm32_usbhost_s *priv, int chidx);
+static void stm32l4_gint_enable(void);
+static void stm32l4_gint_disable(void);
+static inline void stm32l4_hostinit_enable(void);
+static void stm32l4_txfe_enable(FAR struct stm32l4_usbhost_s *priv, int chidx);
 
 /* USB host controller operations **********************************************/
 
-static int stm32_wait(FAR struct usbhost_connection_s *conn,
+static int stm32l4_wait(FAR struct usbhost_connection_s *conn,
                       FAR struct usbhost_hubport_s **hport);
-static int stm32_rh_enumerate(FAR struct stm32_usbhost_s *priv,
+static int stm32l4_rh_enumerate(FAR struct stm32l4_usbhost_s *priv,
                               FAR struct usbhost_connection_s *conn,
                               FAR struct usbhost_hubport_s *hport);
-static int stm32_enumerate(FAR struct usbhost_connection_s *conn,
+static int stm32l4_enumerate(FAR struct usbhost_connection_s *conn,
                            FAR struct usbhost_hubport_s *hport);
 
-static int stm32_ep0configure(FAR struct usbhost_driver_s *drvr,
+static int stm32l4_ep0configure(FAR struct usbhost_driver_s *drvr,
                               usbhost_ep_t ep0, uint8_t funcaddr, uint8_t speed,
                               uint16_t maxpacketsize);
-static int stm32_epalloc(FAR struct usbhost_driver_s *drvr,
+static int stm32l4_epalloc(FAR struct usbhost_driver_s *drvr,
                          FAR const FAR struct usbhost_epdesc_s *epdesc,
                          FAR usbhost_ep_t *ep);
-static int stm32_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep);
-static int stm32_alloc(FAR struct usbhost_driver_s *drvr,
+static int stm32l4_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep);
+static int stm32l4_alloc(FAR struct usbhost_driver_s *drvr,
                        FAR uint8_t **buffer, FAR size_t *maxlen);
-static int stm32_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer);
-static int stm32_ioalloc(FAR struct usbhost_driver_s *drvr,
+static int stm32l4_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer);
+static int stm32l4_ioalloc(FAR struct usbhost_driver_s *drvr,
                          FAR uint8_t **buffer, size_t buflen);
-static int stm32_iofree(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer);
-static int stm32_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
+static int stm32l4_iofree(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer);
+static int stm32l4_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
                         const struct usb_ctrlreq_s *req,
                         FAR uint8_t *buffer);
-static int stm32_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
+static int stm32l4_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
                          FAR const struct usb_ctrlreq_s *req,
                          FAR const uint8_t *buffer);
-static ssize_t stm32_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep,
+static ssize_t stm32l4_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep,
                               FAR uint8_t *buffer, size_t buflen);
 #ifdef CONFIG_USBHOST_ASYNCH
-static int stm32_asynch(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep,
+static int stm32l4_asynch(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep,
                         FAR uint8_t *buffer, size_t buflen,
                         usbhost_asynch_t callback, FAR void *arg);
 #endif
-static int stm32_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep);
+static int stm32l4_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep);
 #ifdef CONFIG_USBHOST_HUB
-static int stm32_connect(FAR struct usbhost_driver_s *drvr,
+static int stm32l4_connect(FAR struct usbhost_driver_s *drvr,
                          FAR struct usbhost_hubport_s *hport,
                          bool connected);
 #endif
-static void stm32_disconnect(FAR struct usbhost_driver_s *drvr,
+static void stm32l4_disconnect(FAR struct usbhost_driver_s *drvr,
                              FAR struct usbhost_hubport_s *hport);
 
 /* Initialization **************************************************************/
 
-static void stm32_portreset(FAR struct stm32_usbhost_s *priv);
-static void stm32_flush_txfifos(uint32_t txfnum);
-static void stm32_flush_rxfifo(void);
-static void stm32_vbusdrive(FAR struct stm32_usbhost_s *priv, bool state);
-static void stm32_host_initialize(FAR struct stm32_usbhost_s *priv);
+static void stm32l4_portreset(FAR struct stm32l4_usbhost_s *priv);
+static void stm32l4_flush_txfifos(uint32_t txfnum);
+static void stm32l4_flush_rxfifo(void);
+static void stm32l4_vbusdrive(FAR struct stm32l4_usbhost_s *priv, bool state);
+static void stm32l4_host_initialize(FAR struct stm32l4_usbhost_s *priv);
 
-static inline void stm32_sw_initialize(FAR struct stm32_usbhost_s *priv);
-static inline int stm32_hw_initialize(FAR struct stm32_usbhost_s *priv);
+static inline void stm32l4_sw_initialize(FAR struct stm32l4_usbhost_s *priv);
+static inline int stm32l4_hw_initialize(FAR struct stm32l4_usbhost_s *priv);
 
 /****************************************************************************
  * Private Data
@@ -478,14 +478,14 @@ static inline int stm32_hw_initialize(FAR struct stm32_usbhost_s *priv);
  * instance.
  */
 
-static struct stm32_usbhost_s g_usbhost;
+static struct stm32l4_usbhost_s g_usbhost;
 
 /* This is the connection/enumeration interface */
 
 static struct usbhost_connection_s g_usbconn =
 {
-  .wait             = stm32_wait,
-  .enumerate        = stm32_enumerate,
+  .wait             = stm32l4_wait,
+  .enumerate        = stm32l4_enumerate,
 };
 
 /****************************************************************************
@@ -497,30 +497,30 @@ static struct usbhost_connection_s g_usbconn =
  ****************************************************************************/
 
 /****************************************************************************
- * Name: stm32_printreg
+ * Name: stm32l4_printreg
  *
  * Description:
  *   Print the contents of an STM32xx register operation
  *
  ****************************************************************************/
 
-#ifdef CONFIG_STM32_USBHOST_REGDEBUG
-static void stm32_printreg(uint32_t addr, uint32_t val, bool iswrite)
+#ifdef CONFIG_STM32L4_USBHOST_REGDEBUG
+static void stm32l4_printreg(uint32_t addr, uint32_t val, bool iswrite)
 {
   lldbg("%08x%s%08x\n", addr, iswrite ? "<-" : "->", val);
 }
 #endif
 
 /****************************************************************************
- * Name: stm32_checkreg
+ * Name: stm32l4_checkreg
  *
  * Description:
  *   Get the contents of an STM32 register
  *
  ****************************************************************************/
 
-#ifdef CONFIG_STM32_USBHOST_REGDEBUG
-static void stm32_checkreg(uint32_t addr, uint32_t val, bool iswrite)
+#ifdef CONFIG_STM32L4_USBHOST_REGDEBUG
+static void stm32l4_checkreg(uint32_t addr, uint32_t val, bool iswrite)
 {
   static uint32_t prevaddr = 0;
   static uint32_t preval = 0;
@@ -551,7 +551,7 @@ static void stm32_checkreg(uint32_t addr, uint32_t val, bool iswrite)
             {
               /* Yes.. Just one */
 
-              stm32_printreg(prevaddr, preval, prevwrite);
+              stm32l4_printreg(prevaddr, preval, prevwrite);
             }
           else
             {
@@ -570,21 +570,21 @@ static void stm32_checkreg(uint32_t addr, uint32_t val, bool iswrite)
 
       /* Show the new regisgter access */
 
-      stm32_printreg(addr, val, iswrite);
+      stm32l4_printreg(addr, val, iswrite);
     }
 }
 #endif
 
 /****************************************************************************
- * Name: stm32_getreg
+ * Name: stm32l4_getreg
  *
  * Description:
  *   Get the contents of an STM32 register
  *
  ****************************************************************************/
 
-#ifdef CONFIG_STM32_USBHOST_REGDEBUG
-static uint32_t stm32_getreg(uint32_t addr)
+#ifdef CONFIG_STM32L4_USBHOST_REGDEBUG
+static uint32_t stm32l4_getreg(uint32_t addr)
 {
   /* Read the value from the register */
 
@@ -592,25 +592,25 @@ static uint32_t stm32_getreg(uint32_t addr)
 
   /* Check if we need to print this value */
 
-  stm32_checkreg(addr, val, false);
+  stm32l4_checkreg(addr, val, false);
   return val;
 }
 #endif
 
 /****************************************************************************
- * Name: stm32_putreg
+ * Name: stm32l4_putreg
  *
  * Description:
  *   Set the contents of an STM32 register to a value
  *
  ****************************************************************************/
 
-#ifdef CONFIG_STM32_USBHOST_REGDEBUG
-static void stm32_putreg(uint32_t addr, uint32_t val)
+#ifdef CONFIG_STM32L4_USBHOST_REGDEBUG
+static void stm32l4_putreg(uint32_t addr, uint32_t val)
 {
   /* Check if we need to print this value */
 
-  stm32_checkreg(addr, val, true);
+  stm32l4_checkreg(addr, val, true);
 
   /* Write the value */
 
@@ -619,20 +619,20 @@ static void stm32_putreg(uint32_t addr, uint32_t val)
 #endif
 
 /****************************************************************************
- * Name: stm32_modifyreg
+ * Name: stm32l4_modifyreg
  *
  * Description:
  *   Modify selected bits of an STM32 register.
  *
  ****************************************************************************/
 
-static inline void stm32_modifyreg(uint32_t addr, uint32_t clrbits, uint32_t setbits)
+static inline void stm32l4_modifyreg(uint32_t addr, uint32_t clrbits, uint32_t setbits)
 {
-  stm32_putreg(addr, (((stm32_getreg(addr)) & ~clrbits) | setbits));
+  stm32l4_putreg(addr, (((stm32l4_getreg(addr)) & ~clrbits) | setbits));
 }
 
 /****************************************************************************
- * Name: stm32_takesem
+ * Name: stm32l4_takesem
  *
  * Description:
  *   This is just a wrapper to handle the annoying behavior of semaphore
@@ -640,7 +640,7 @@ static inline void stm32_modifyreg(uint32_t addr, uint32_t clrbits, uint32_t set
  *
  ****************************************************************************/
 
-static void stm32_takesem(sem_t *sem)
+static void stm32l4_takesem(sem_t *sem)
 {
   /* Take the semaphore (perhaps waiting) */
 
@@ -655,33 +655,33 @@ static void stm32_takesem(sem_t *sem)
 }
 
 /****************************************************************************
- * Name: stm32_getle16
+ * Name: stm32l4_getle16
  *
  * Description:
  *   Get a (possibly unaligned) 16-bit little endian value.
  *
  ****************************************************************************/
 
-static inline uint16_t stm32_getle16(const uint8_t *val)
+static inline uint16_t stm32l4_getle16(const uint8_t *val)
 {
   return (uint16_t)val[1] << 8 | (uint16_t)val[0];
 }
 
 /****************************************************************************
- * Name: stm32_chan_alloc
+ * Name: stm32l4_chan_alloc
  *
  * Description:
  *   Allocate a channel.
  *
  ****************************************************************************/
 
-static int stm32_chan_alloc(FAR struct stm32_usbhost_s *priv)
+static int stm32l4_chan_alloc(FAR struct stm32l4_usbhost_s *priv)
 {
   int chidx;
 
   /* Search the table of channels */
 
-  for (chidx = 0; chidx < STM32_NHOST_CHANNELS; chidx++)
+  for (chidx = 0; chidx < STM32L4_NHOST_CHANNELS; chidx++)
     {
       /* Is this channel available? */
 
@@ -700,20 +700,20 @@ static int stm32_chan_alloc(FAR struct stm32_usbhost_s *priv)
 }
 
 /****************************************************************************
- * Name: stm32_chan_free
+ * Name: stm32l4_chan_free
  *
  * Description:
  *   Free a previoiusly allocated channel.
  *
  ****************************************************************************/
 
-static void stm32_chan_free(FAR struct stm32_usbhost_s *priv, int chidx)
+static void stm32l4_chan_free(FAR struct stm32l4_usbhost_s *priv, int chidx)
 {
-  DEBUGASSERT((unsigned)chidx < STM32_NHOST_CHANNELS);
+  DEBUGASSERT((unsigned)chidx < STM32L4_NHOST_CHANNELS);
 
   /* Halt the channel */
 
-  stm32_chan_halt(priv, chidx, CHREASON_FREED);
+  stm32l4_chan_halt(priv, chidx, CHREASON_FREED);
 
   /* Mark the channel available */
 
@@ -721,27 +721,27 @@ static void stm32_chan_free(FAR struct stm32_usbhost_s *priv, int chidx)
 }
 
 /****************************************************************************
- * Name: stm32_chan_freeall
+ * Name: stm32l4_chan_freeall
  *
  * Description:
  *   Free all channels.
  *
  ****************************************************************************/
 
-static inline void stm32_chan_freeall(FAR struct stm32_usbhost_s *priv)
+static inline void stm32l4_chan_freeall(FAR struct stm32l4_usbhost_s *priv)
 {
   uint8_t chidx;
 
   /* Free all host channels */
 
-  for (chidx = 2; chidx < STM32_NHOST_CHANNELS; chidx ++)
+  for (chidx = 2; chidx < STM32L4_NHOST_CHANNELS; chidx ++)
     {
-      stm32_chan_free(priv, chidx);
+      stm32l4_chan_free(priv, chidx);
     }
 }
 
 /****************************************************************************
- * Name: stm32_chan_configure
+ * Name: stm32l4_chan_configure
  *
  * Description:
  *   Configure or re-configure a host channel.  Host channels are configured
@@ -750,14 +750,14 @@ static inline void stm32_chan_freeall(FAR struct stm32_usbhost_s *priv)
  *
  ****************************************************************************/
 
-static void stm32_chan_configure(FAR struct stm32_usbhost_s *priv, int chidx)
+static void stm32l4_chan_configure(FAR struct stm32l4_usbhost_s *priv, int chidx)
 {
-  FAR struct stm32_chan_s *chan = &priv->chan[chidx];
+  FAR struct stm32l4_chan_s *chan = &priv->chan[chidx];
   uint32_t regval;
 
   /* Clear any old pending interrupts for this host channel. */
 
-  stm32_putreg(STM32_OTGFS_HCINT(chidx), 0xffffffff);
+  stm32l4_putreg(STM32L4_OTGFS_HCINT(chidx), 0xffffffff);
 
   /* Enable channel interrupts required for transfers on this channel. */
 
@@ -856,15 +856,15 @@ static void stm32_chan_configure(FAR struct stm32_usbhost_s *priv, int chidx)
       break;
     }
 
-  stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), regval);
+  stm32l4_putreg(STM32L4_OTGFS_HCINTMSK(chidx), regval);
 
   /* Enable the top level host channel interrupt. */
 
-  stm32_modifyreg(STM32_OTGFS_HAINTMSK, 0, OTGFS_HAINT(chidx));
+  stm32l4_modifyreg(STM32L4_OTGFS_HAINTMSK, 0, OTGFS_HAINT(chidx));
 
   /* Make sure host channel interrupts are enabled. */
 
-  stm32_modifyreg(STM32_OTGFS_GINTMSK, 0, OTGFS_GINT_HC);
+  stm32l4_modifyreg(STM32L4_OTGFS_GINTMSK, 0, OTGFS_GINT_HC);
 
   /* Program the HCCHAR register */
 
@@ -896,11 +896,11 @@ static void stm32_chan_configure(FAR struct stm32_usbhost_s *priv, int chidx)
 
   /* Write the channel configuration */
 
-  stm32_putreg(STM32_OTGFS_HCCHAR(chidx), regval);
+  stm32l4_putreg(STM32L4_OTGFS_HCCHAR(chidx), regval);
 }
 
 /****************************************************************************
- * Name: stm32_chan_halt
+ * Name: stm32l4_chan_halt
  *
  * Description:
  *   Halt the channel associated with 'chidx' by setting the CHannel DISable
@@ -908,8 +908,8 @@ static void stm32_chan_configure(FAR struct stm32_usbhost_s *priv, int chidx)
  *
  ****************************************************************************/
 
-static void stm32_chan_halt(FAR struct stm32_usbhost_s *priv, int chidx,
-                            enum stm32_chreason_e chreason)
+static void stm32l4_chan_halt(FAR struct stm32l4_usbhost_s *priv, int chidx,
+                            enum stm32l4_chreason_e chreason)
 {
   uint32_t hcchar;
   uint32_t intmsk;
@@ -933,7 +933,7 @@ static void stm32_chan_halt(FAR struct stm32_usbhost_s *priv, int chidx,
    *  USB."
    */
 
-  hcchar  = stm32_getreg(STM32_OTGFS_HCCHAR(chidx));
+  hcchar  = stm32l4_getreg(STM32L4_OTGFS_HCCHAR(chidx));
   hcchar |= (OTGFS_HCCHAR_CHDIS | OTGFS_HCCHAR_CHENA);
 
   /* Get the endpoint type from the HCCHAR register */
@@ -955,13 +955,13 @@ static void stm32_chan_halt(FAR struct stm32_usbhost_s *priv, int chidx,
     {
       /* Get the number of words available in the non-periodic Tx FIFO. */
 
-      avail = stm32_getreg(STM32_OTGFS_HNPTXSTS) & OTGFS_HNPTXSTS_NPTXFSAV_MASK;
+      avail = stm32l4_getreg(STM32L4_OTGFS_HNPTXSTS) & OTGFS_HNPTXSTS_NPTXFSAV_MASK;
     }
   else /* if (eptype == OTGFS_HCCHAR_EPTYP_ISOC || eptype == OTGFS_HCCHAR_EPTYP_INTR) */
     {
       /* Get the number of words available in the non-periodic Tx FIFO. */
 
-      avail = stm32_getreg(STM32_OTGFS_HPTXSTS) & OTGFS_HPTXSTS_PTXFSAVL_MASK;
+      avail = stm32l4_getreg(STM32L4_OTGFS_HPTXSTS) & OTGFS_HPTXSTS_PTXFSAVL_MASK;
     }
 
   /* Check if there is any space available in the Tx FIFO. */
@@ -975,17 +975,17 @@ static void stm32_chan_halt(FAR struct stm32_usbhost_s *priv, int chidx,
 
   /* Unmask the CHannel Halted (CHH) interrupt */
 
-  intmsk  = stm32_getreg(STM32_OTGFS_HCINTMSK(chidx));
+  intmsk  = stm32l4_getreg(STM32L4_OTGFS_HCINTMSK(chidx));
   intmsk |= OTGFS_HCINT_CHH;
-  stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), intmsk);
+  stm32l4_putreg(STM32L4_OTGFS_HCINTMSK(chidx), intmsk);
 
   /* Halt the channel by setting CHDIS (and maybe CHENA) in the HCCHAR */
 
-  stm32_putreg(STM32_OTGFS_HCCHAR(chidx), hcchar);
+  stm32l4_putreg(STM32L4_OTGFS_HCCHAR(chidx), hcchar);
 }
 
 /****************************************************************************
- * Name: stm32_chan_waitsetup
+ * Name: stm32l4_chan_waitsetup
  *
  * Description:
  *   Set the request for the transfer complete event well BEFORE enabling the
@@ -998,8 +998,8 @@ static void stm32_chan_halt(FAR struct stm32_usbhost_s *priv, int chidx,
  *
  ****************************************************************************/
 
-static int stm32_chan_waitsetup(FAR struct stm32_usbhost_s *priv,
-                                FAR struct stm32_chan_s *chan)
+static int stm32l4_chan_waitsetup(FAR struct stm32l4_usbhost_s *priv,
+                                FAR struct stm32l4_chan_s *chan)
 {
   irqstate_t flags = enter_critical_section();
   int        ret   = -ENODEV;
@@ -1025,7 +1025,7 @@ static int stm32_chan_waitsetup(FAR struct stm32_usbhost_s *priv,
 }
 
 /****************************************************************************
- * Name: stm32_chan_asynchsetup
+ * Name: stm32l4_chan_asynchsetup
  *
  * Description:
  *   Set the request for the transfer complete event well BEFORE enabling the
@@ -1039,8 +1039,8 @@ static int stm32_chan_waitsetup(FAR struct stm32_usbhost_s *priv,
  ****************************************************************************/
 
 #ifdef CONFIG_USBHOST_ASYNCH
-static int stm32_chan_asynchsetup(FAR struct stm32_usbhost_s *priv,
-                                  FAR struct stm32_chan_s *chan,
+static int stm32l4_chan_asynchsetup(FAR struct stm32l4_usbhost_s *priv,
+                                  FAR struct stm32l4_chan_s *chan,
                                   usbhost_asynch_t callback, FAR void *arg)
 {
   irqstate_t flags = enter_critical_section();
@@ -1066,7 +1066,7 @@ static int stm32_chan_asynchsetup(FAR struct stm32_usbhost_s *priv,
 #endif
 
 /****************************************************************************
- * Name: stm32_chan_wait
+ * Name: stm32l4_chan_wait
  *
  * Description:
  *   Wait for a transfer on a channel to complete.
@@ -1076,8 +1076,8 @@ static int stm32_chan_asynchsetup(FAR struct stm32_usbhost_s *priv,
  *
  ****************************************************************************/
 
-static int stm32_chan_wait(FAR struct stm32_usbhost_s *priv,
-                           FAR struct stm32_chan_s *chan)
+static int stm32l4_chan_wait(FAR struct stm32l4_usbhost_s *priv,
+                           FAR struct stm32l4_chan_s *chan)
 {
   irqstate_t flags;
   int ret;
@@ -1121,7 +1121,7 @@ static int stm32_chan_wait(FAR struct stm32_usbhost_s *priv,
 }
 
 /****************************************************************************
- * Name: stm32_chan_wakeup
+ * Name: stm32l4_chan_wakeup
  *
  * Description:
  *   A channel transfer has completed... wakeup any threads waiting for the
@@ -1133,8 +1133,8 @@ static int stm32_chan_wait(FAR struct stm32_usbhost_s *priv,
  *
  ****************************************************************************/
 
-static void stm32_chan_wakeup(FAR struct stm32_usbhost_s *priv,
-                              FAR struct stm32_chan_s *chan)
+static void stm32l4_chan_wakeup(FAR struct stm32l4_usbhost_s *priv,
+                              FAR struct stm32l4_chan_s *chan)
 {
   /* Is the transfer complete? */
 
@@ -1155,7 +1155,7 @@ static void stm32_chan_wakeup(FAR struct stm32_usbhost_s *priv,
                                      OTGFS_VTRACE2_CHANWAKEUP_OUT,
                           chan->epno, chan->result);
 
-          stm32_givesem(&chan->waitsem);
+          stm32l4_givesem(&chan->waitsem);
           chan->waiter = false;
         }
 
@@ -1170,11 +1170,11 @@ static void stm32_chan_wakeup(FAR struct stm32_usbhost_s *priv,
 
           if (chan->in)
             {
-              stm32_in_next(priv, chan);
+              stm32l4_in_next(priv, chan);
             }
           else
             {
-              stm32_out_next(priv, chan);
+              stm32l4_out_next(priv, chan);
             }
         }
 #endif
@@ -1182,22 +1182,22 @@ static void stm32_chan_wakeup(FAR struct stm32_usbhost_s *priv,
 }
 
 /****************************************************************************
- * Name: stm32_ctrlchan_alloc
+ * Name: stm32l4_ctrlchan_alloc
  *
  * Description:
  *   Allocate and configured channels for a control pipe.
  *
  ****************************************************************************/
 
-static int stm32_ctrlchan_alloc(FAR struct stm32_usbhost_s *priv,
+static int stm32l4_ctrlchan_alloc(FAR struct stm32l4_usbhost_s *priv,
                                 uint8_t epno, uint8_t funcaddr, uint8_t speed,
-                                FAR struct stm32_ctrlinfo_s *ctrlep)
+                                FAR struct stm32l4_ctrlinfo_s *ctrlep)
 {
-  FAR struct stm32_chan_s *chan;
+  FAR struct stm32l4_chan_s *chan;
   int inndx;
   int outndx;
 
-  outndx = stm32_chan_alloc(priv);
+  outndx = stm32l4_chan_alloc(priv);
   if (outndx < 0)
     {
       return -ENOMEM;
@@ -1210,20 +1210,20 @@ static int stm32_ctrlchan_alloc(FAR struct stm32_usbhost_s *priv,
   chan->eptype    = OTGFS_EPTYPE_CTRL;
   chan->funcaddr  = funcaddr;
   chan->speed     = speed;
-  chan->maxpacket = STM32_EP0_DEF_PACKET_SIZE;
+  chan->maxpacket = STM32L4_EP0_DEF_PACKET_SIZE;
   chan->indata1   = false;
   chan->outdata1  = false;
 
   /* Configure control OUT channels */
 
-  stm32_chan_configure(priv, outndx);
+  stm32l4_chan_configure(priv, outndx);
 
   /* Allocate and initialize the control IN channel */
 
-  inndx = stm32_chan_alloc(priv);
+  inndx = stm32l4_chan_alloc(priv);
   if (inndx < 0)
     {
-      stm32_chan_free(priv, outndx);
+      stm32l4_chan_free(priv, outndx);
       return -ENOMEM;
     }
 
@@ -1234,18 +1234,18 @@ static int stm32_ctrlchan_alloc(FAR struct stm32_usbhost_s *priv,
   chan->eptype    = OTGFS_EPTYPE_CTRL;
   chan->funcaddr  = funcaddr;
   chan->speed     = speed;
-  chan->maxpacket = STM32_EP0_DEF_PACKET_SIZE;
+  chan->maxpacket = STM32L4_EP0_DEF_PACKET_SIZE;
   chan->indata1   = false;
   chan->outdata1  = false;
 
   /* Configure control IN channels */
 
-  stm32_chan_configure(priv, inndx);
+  stm32l4_chan_configure(priv, inndx);
   return OK;
 }
 
 /****************************************************************************
- * Name: stm32_ctrlep_alloc
+ * Name: stm32l4_ctrlep_alloc
  *
  * Description:
  *   Allocate a container and channels for control pipe.
@@ -1265,12 +1265,12 @@ static int stm32_ctrlchan_alloc(FAR struct stm32_usbhost_s *priv,
  *
  ****************************************************************************/
 
-static int stm32_ctrlep_alloc(FAR struct stm32_usbhost_s *priv,
+static int stm32l4_ctrlep_alloc(FAR struct stm32l4_usbhost_s *priv,
                               FAR const struct usbhost_epdesc_s *epdesc,
                               FAR usbhost_ep_t *ep)
 {
   FAR struct usbhost_hubport_s *hport;
-  FAR struct stm32_ctrlinfo_s *ctrlep;
+  FAR struct stm32l4_ctrlinfo_s *ctrlep;
   int ret;
 
   /* Sanity check.  NOTE that this method should only be called if a device is
@@ -1282,7 +1282,7 @@ static int stm32_ctrlep_alloc(FAR struct stm32_usbhost_s *priv,
 
   /* Allocate a container for the control endpoint */
 
-  ctrlep = (FAR struct stm32_ctrlinfo_s *)kmm_malloc(sizeof(struct stm32_ctrlinfo_s));
+  ctrlep = (FAR struct stm32l4_ctrlinfo_s *)kmm_malloc(sizeof(struct stm32l4_ctrlinfo_s));
   if (ctrlep == NULL)
     {
       uerr("ERROR: Failed to allocate control endpoint container\n");
@@ -1291,11 +1291,11 @@ static int stm32_ctrlep_alloc(FAR struct stm32_usbhost_s *priv,
 
   /* Then allocate and configure the IN/OUT channnels  */
 
-  ret = stm32_ctrlchan_alloc(priv, epdesc->addr & USB_EPNO_MASK,
+  ret = stm32l4_ctrlchan_alloc(priv, epdesc->addr & USB_EPNO_MASK,
                              hport->funcaddr, hport->speed, ctrlep);
   if (ret < 0)
     {
-      uerr("ERROR: stm32_ctrlchan_alloc failed: %d\n", ret);
+      uerr("ERROR: stm32l4_ctrlchan_alloc failed: %d\n", ret);
       kmm_free(ctrlep);
       return ret;
     }
@@ -1307,7 +1307,7 @@ static int stm32_ctrlep_alloc(FAR struct stm32_usbhost_s *priv,
 }
 
 /************************************************************************************
- * Name: stm32_xfrep_alloc
+ * Name: stm32l4_xfrep_alloc
  *
  * Description:
  *   Allocate and configure one unidirectional endpoint.
@@ -1327,12 +1327,12 @@ static int stm32_ctrlep_alloc(FAR struct stm32_usbhost_s *priv,
  *
  ************************************************************************************/
 
-static int stm32_xfrep_alloc(FAR struct stm32_usbhost_s *priv,
+static int stm32l4_xfrep_alloc(FAR struct stm32l4_usbhost_s *priv,
                               FAR const struct usbhost_epdesc_s *epdesc,
                               FAR usbhost_ep_t *ep)
 {
   struct usbhost_hubport_s *hport;
-  FAR struct stm32_chan_s *chan;
+  FAR struct stm32l4_chan_s *chan;
   int chidx;
 
   /* Sanity check.  NOTE that this method should only be called if a device is
@@ -1344,7 +1344,7 @@ static int stm32_xfrep_alloc(FAR struct stm32_usbhost_s *priv,
 
   /* Allocate a host channel for the endpoint */
 
-  chidx = stm32_chan_alloc(priv);
+  chidx = stm32l4_chan_alloc(priv);
   if (chidx < 0)
     {
       uerr("ERROR: Failed to allocate a host channel\n");
@@ -1369,7 +1369,7 @@ static int stm32_xfrep_alloc(FAR struct stm32_usbhost_s *priv,
 
   /* Then configure the endpoint */
 
-  stm32_chan_configure(priv, chidx);
+  stm32l4_chan_configure(priv, chidx);
 
   /* Return the index to the allocated channel as the endpoint "handle" */
 
@@ -1378,16 +1378,16 @@ static int stm32_xfrep_alloc(FAR struct stm32_usbhost_s *priv,
 }
 
 /****************************************************************************
- * Name: stm32_transfer_start
+ * Name: stm32l4_transfer_start
  *
  * Description:
  *   Start at transfer on the select IN or OUT channel.
  *
  ****************************************************************************/
 
-static void stm32_transfer_start(FAR struct stm32_usbhost_s *priv, int chidx)
+static void stm32l4_transfer_start(FAR struct stm32l4_usbhost_s *priv, int chidx)
 {
-  FAR struct stm32_chan_s *chan;
+  FAR struct stm32l4_chan_s *chan;
   uint32_t regval;
   unsigned int npackets;
   unsigned int maxpacket;
@@ -1426,10 +1426,10 @@ static void stm32_transfer_start(FAR struct stm32_usbhost_s *priv, int chidx)
        * packets that can be transferred (this should not happen).
        */
 
-      if (npackets > STM32_MAX_PKTCOUNT)
+      if (npackets > STM32L4_MAX_PKTCOUNT)
         {
-          npackets = STM32_MAX_PKTCOUNT;
-          chan->buflen = STM32_MAX_PKTCOUNT * maxpacket;
+          npackets = STM32L4_MAX_PKTCOUNT;
+          chan->buflen = STM32L4_MAX_PKTCOUNT * maxpacket;
           usbhost_trace2(OTGFS_TRACE2_CLIP, chidx, chan->buflen);
         }
     }
@@ -1466,18 +1466,18 @@ static void stm32_transfer_start(FAR struct stm32_usbhost_s *priv, int chidx)
   regval = ((uint32_t)chan->buflen << OTGFS_HCTSIZ_XFRSIZ_SHIFT) |
            ((uint32_t)npackets << OTGFS_HCTSIZ_PKTCNT_SHIFT) |
            ((uint32_t)chan->pid << OTGFS_HCTSIZ_DPID_SHIFT);
-  stm32_putreg(STM32_OTGFS_HCTSIZ(chidx), regval);
+  stm32l4_putreg(STM32L4_OTGFS_HCTSIZ(chidx), regval);
 
   /* Setup the HCCHAR register: Frame oddness and host channel enable */
 
-  regval = stm32_getreg(STM32_OTGFS_HCCHAR(chidx));
+  regval = stm32l4_getreg(STM32L4_OTGFS_HCCHAR(chidx));
 
   /* Set/clear the Odd Frame bit.  Check for an even frame; if so set Odd
    * Frame. This field is applicable for only periodic (isochronous and
    * interrupt) channels.
    */
 
-  if ((stm32_getreg(STM32_OTGFS_HFNUM) & 1) == 0)
+  if ((stm32l4_getreg(STM32L4_OTGFS_HFNUM) & 1) == 0)
     {
       regval |= OTGFS_HCCHAR_ODDFRM;
     }
@@ -1488,7 +1488,7 @@ static void stm32_transfer_start(FAR struct stm32_usbhost_s *priv, int chidx)
 
   regval &= ~OTGFS_HCCHAR_CHDIS;
   regval |= OTGFS_HCCHAR_CHENA;
-  stm32_putreg(STM32_OTGFS_HCCHAR(chidx), regval);
+  stm32l4_putreg(STM32L4_OTGFS_HCCHAR(chidx), regval);
 
   /* If this is an out transfer, then we need to do more.. we need to copy
    * the outgoing data into the correct TxFIFO.
@@ -1509,7 +1509,7 @@ static void stm32_transfer_start(FAR struct stm32_usbhost_s *priv, int chidx)
           {
             /* Read the Non-periodic Tx FIFO status register */
 
-            regval = stm32_getreg(STM32_OTGFS_HNPTXSTS);
+            regval = stm32l4_getreg(STM32L4_OTGFS_HNPTXSTS);
             avail  = ((regval & OTGFS_HNPTXSTS_NPTXFSAV_MASK) >> OTGFS_HNPTXSTS_NPTXFSAV_SHIFT) << 2;
           }
           break;
@@ -1521,7 +1521,7 @@ static void stm32_transfer_start(FAR struct stm32_usbhost_s *priv, int chidx)
           {
             /* Read the Non-periodic Tx FIFO status register */
 
-            regval = stm32_getreg(STM32_OTGFS_HPTXSTS);
+            regval = stm32l4_getreg(STM32L4_OTGFS_HPTXSTS);
             avail  = ((regval & OTGFS_HPTXSTS_PTXFSAVL_MASK) >> OTGFS_HPTXSTS_PTXFSAVL_SHIFT) << 2;
           }
           break;
@@ -1550,7 +1550,7 @@ static void stm32_transfer_start(FAR struct stm32_usbhost_s *priv, int chidx)
 
           /* Write packet into the Tx FIFO. */
 
-          stm32_gint_wrpacket(priv, chan->buffer, chidx, wrsize);
+          stm32l4_gint_wrpacket(priv, chan->buffer, chidx, wrsize);
         }
 
       /* Did we put the entire buffer into the Tx FIFO? */
@@ -1562,13 +1562,13 @@ static void stm32_transfer_start(FAR struct stm32_usbhost_s *priv, int chidx)
            * FIFO becomes empty.
            */
 
-           stm32_txfe_enable(priv, chidx);
+           stm32l4_txfe_enable(priv, chidx);
         }
     }
 }
 
 /****************************************************************************
- * Name: stm32_getframe
+ * Name: stm32l4_getframe
  *
  * Description:
  *   Get the current frame number.  The frame number (FRNUM) field increments
@@ -1578,25 +1578,25 @@ static void stm32_transfer_start(FAR struct stm32_usbhost_s *priv, int chidx)
  ****************************************************************************/
 
 #if 0 /* Not used */
-static inline uint16_t stm32_getframe(void)
+static inline uint16_t stm32l4_getframe(void)
 {
-  return (uint16_t)(stm32_getreg(STM32_OTGFS_HFNUM) & OTGFS_HFNUM_FRNUM_MASK);
+  return (uint16_t)(stm32l4_getreg(STM32L4_OTGFS_HFNUM) & OTGFS_HFNUM_FRNUM_MASK);
 }
 #endif
 
 /****************************************************************************
- * Name: stm32_ctrl_sendsetup
+ * Name: stm32l4_ctrl_sendsetup
  *
  * Description:
  *   Send an IN/OUT SETUP packet.
  *
  ****************************************************************************/
 
-static int stm32_ctrl_sendsetup(FAR struct stm32_usbhost_s *priv,
-                                FAR struct stm32_ctrlinfo_s *ep0,
+static int stm32l4_ctrl_sendsetup(FAR struct stm32l4_usbhost_s *priv,
+                                FAR struct stm32l4_ctrlinfo_s *ep0,
                                 FAR const struct usb_ctrlreq_s *req)
 {
-  FAR struct stm32_chan_s *chan;
+  FAR struct stm32l4_chan_s *chan;
   systime_t start;
   systime_t elapsed;
   int ret;
@@ -1617,7 +1617,7 @@ static int stm32_ctrl_sendsetup(FAR struct stm32_usbhost_s *priv,
 
       /* Set up for the wait BEFORE starting the transfer */
 
-      ret = stm32_chan_waitsetup(priv, chan);
+      ret = stm32l4_chan_waitsetup(priv, chan);
       if (ret < 0)
         {
           usbhost_trace1(OTGFS_TRACE1_DEVDISCONN, 0);
@@ -1626,11 +1626,11 @@ static int stm32_ctrl_sendsetup(FAR struct stm32_usbhost_s *priv,
 
       /* Start the transfer */
 
-      stm32_transfer_start(priv, ep0->outndx);
+      stm32l4_transfer_start(priv, ep0->outndx);
 
       /* Wait for the transfer to complete */
 
-      ret = stm32_chan_wait(priv, chan);
+      ret = stm32l4_chan_wait(priv, chan);
 
       /* Return on success and for all failures other than EAGAIN.  EAGAIN
        * means that the device NAKed the SETUP command and that we should
@@ -1655,13 +1655,13 @@ static int stm32_ctrl_sendsetup(FAR struct stm32_usbhost_s *priv,
 
       elapsed = clock_systimer() - start;
     }
-  while (elapsed < STM32_SETUP_DELAY);
+  while (elapsed < STM32L4_SETUP_DELAY);
 
   return -ETIMEDOUT;
 }
 
 /****************************************************************************
- * Name: stm32_ctrl_senddata
+ * Name: stm32l4_ctrl_senddata
  *
  * Description:
  *   Send data in the data phase of an OUT control transfer.  Or send status
@@ -1669,11 +1669,11 @@ static int stm32_ctrl_sendsetup(FAR struct stm32_usbhost_s *priv,
  *
  ****************************************************************************/
 
-static int stm32_ctrl_senddata(FAR struct stm32_usbhost_s *priv,
-                               FAR struct stm32_ctrlinfo_s *ep0,
+static int stm32l4_ctrl_senddata(FAR struct stm32l4_usbhost_s *priv,
+                               FAR struct stm32l4_ctrlinfo_s *ep0,
                                FAR uint8_t *buffer, unsigned int buflen)
 {
-  FAR struct stm32_chan_s *chan = &priv->chan[ep0->outndx];
+  FAR struct stm32l4_chan_s *chan = &priv->chan[ep0->outndx];
   int ret;
 
   /* Save buffer information */
@@ -1697,7 +1697,7 @@ static int stm32_ctrl_senddata(FAR struct stm32_usbhost_s *priv,
 
   /* Set up for the wait BEFORE starting the transfer */
 
-  ret = stm32_chan_waitsetup(priv, chan);
+  ret = stm32l4_chan_waitsetup(priv, chan);
   if (ret < 0)
     {
       usbhost_trace1(OTGFS_TRACE1_DEVDISCONN, 0);
@@ -1706,15 +1706,15 @@ static int stm32_ctrl_senddata(FAR struct stm32_usbhost_s *priv,
 
   /* Start the transfer */
 
-  stm32_transfer_start(priv, ep0->outndx);
+  stm32l4_transfer_start(priv, ep0->outndx);
 
   /* Wait for the transfer to complete and return the result */
 
-  return stm32_chan_wait(priv, chan);
+  return stm32l4_chan_wait(priv, chan);
 }
 
 /****************************************************************************
- * Name: stm32_ctrl_recvdata
+ * Name: stm32l4_ctrl_recvdata
  *
  * Description:
  *   Receive data in the data phase of an IN control transfer.  Or receive status
@@ -1722,11 +1722,11 @@ static int stm32_ctrl_senddata(FAR struct stm32_usbhost_s *priv,
  *
  ****************************************************************************/
 
-static int stm32_ctrl_recvdata(FAR struct stm32_usbhost_s *priv,
-                               FAR struct stm32_ctrlinfo_s *ep0,
+static int stm32l4_ctrl_recvdata(FAR struct stm32l4_usbhost_s *priv,
+                               FAR struct stm32l4_ctrlinfo_s *ep0,
                                FAR uint8_t *buffer, unsigned int buflen)
 {
-  FAR struct stm32_chan_s *chan = &priv->chan[ep0->inndx];
+  FAR struct stm32l4_chan_s *chan = &priv->chan[ep0->inndx];
   int ret;
 
   /* Save buffer information */
@@ -1738,7 +1738,7 @@ static int stm32_ctrl_recvdata(FAR struct stm32_usbhost_s *priv,
 
   /* Set up for the wait BEFORE starting the transfer */
 
-  ret = stm32_chan_waitsetup(priv, chan);
+  ret = stm32l4_chan_waitsetup(priv, chan);
   if (ret < 0)
     {
       usbhost_trace1(OTGFS_TRACE1_DEVDISCONN, 0);
@@ -1747,24 +1747,24 @@ static int stm32_ctrl_recvdata(FAR struct stm32_usbhost_s *priv,
 
   /* Start the transfer */
 
-  stm32_transfer_start(priv, ep0->inndx);
+  stm32l4_transfer_start(priv, ep0->inndx);
 
   /* Wait for the transfer to complete and return the result */
 
-  return stm32_chan_wait(priv, chan);
+  return stm32l4_chan_wait(priv, chan);
 }
 
 /****************************************************************************
- * Name: stm32_in_setup
+ * Name: stm32l4_in_setup
  *
  * Description:
  *   Initiate an IN transfer on an bulk, interrupt, or isochronous pipe.
  *
  ****************************************************************************/
 
-static int stm32_in_setup(FAR struct stm32_usbhost_s *priv, int chidx)
+static int stm32l4_in_setup(FAR struct stm32l4_usbhost_s *priv, int chidx)
 {
-  FAR struct stm32_chan_s *chan;
+  FAR struct stm32l4_chan_s *chan;
 
   /* Set up for the transfer based on the direction and the endpoint type */
 
@@ -1811,22 +1811,22 @@ static int stm32_in_setup(FAR struct stm32_usbhost_s *priv, int chidx)
 
   /* Start the transfer */
 
-  stm32_transfer_start(priv, chidx);
+  stm32l4_transfer_start(priv, chidx);
   return OK;
 }
 
 /****************************************************************************
- * Name: stm32_in_transfer
+ * Name: stm32l4_in_transfer
  *
  * Description:
  *   Transfer 'buflen' bytes into 'buffer' from an IN channel.
  *
  ****************************************************************************/
 
-static ssize_t stm32_in_transfer(FAR struct stm32_usbhost_s *priv, int chidx,
+static ssize_t stm32l4_in_transfer(FAR struct stm32l4_usbhost_s *priv, int chidx,
                                  FAR uint8_t *buffer, size_t buflen)
 {
-  FAR struct stm32_chan_s *chan;
+  FAR struct stm32l4_chan_s *chan;
   systime_t start;
   systime_t elapsed;
   int ret;
@@ -1845,7 +1845,7 @@ static ssize_t stm32_in_transfer(FAR struct stm32_usbhost_s *priv, int chidx,
     {
       /* Set up for the wait BEFORE starting the transfer */
 
-      ret = stm32_chan_waitsetup(priv, chan);
+      ret = stm32l4_chan_waitsetup(priv, chan);
       if (ret < 0)
         {
           usbhost_trace1(OTGFS_TRACE1_DEVDISCONN, 0);
@@ -1854,16 +1854,16 @@ static ssize_t stm32_in_transfer(FAR struct stm32_usbhost_s *priv, int chidx,
 
       /* Set up for the transfer based on the direction and the endpoint type */
 
-      ret = stm32_in_setup(priv, chidx);
+      ret = stm32l4_in_setup(priv, chidx);
       if (ret < 0)
         {
-          uerr("ERROR: stm32_in_setup failed: %d\n", ret);
+          uerr("ERROR: stm32l4_in_setup failed: %d\n", ret);
           return (ssize_t)ret;
         }
 
       /* Wait for the transfer to complete and get the result */
 
-      ret = stm32_chan_wait(priv, chan);
+      ret = stm32l4_chan_wait(priv, chan);
 
       /* EAGAIN indicates that the device NAKed the transfer and we need
        * do try again.  Anything else (success or other errors) will
@@ -1883,12 +1883,12 @@ static ssize_t stm32_in_transfer(FAR struct stm32_usbhost_s *priv, int chidx,
 
           elapsed = clock_systimer() - start;
           if (ret != -EAGAIN ||                  /* Not a NAK condition OR */
-              elapsed >= STM32_DATANAK_DELAY ||  /* Timeout has elapsed OR */
+              elapsed >= STM32L4_DATANAK_DELAY ||  /* Timeout has elapsed OR */
               chan->xfrd > 0)                    /* Data has been partially transferred */
             {
               /* Break out and return the error */
 
-              uerr("ERROR: stm32_chan_wait failed: %d\n", ret);
+              uerr("ERROR: stm32l4_chan_wait failed: %d\n", ret);
               return (ssize_t)ret;
             }
         }
@@ -1898,7 +1898,7 @@ static ssize_t stm32_in_transfer(FAR struct stm32_usbhost_s *priv, int chidx,
 }
 
 /****************************************************************************
- * Name: stm32_in_next
+ * Name: stm32l4_in_next
  *
  * Description:
  *   Initiate the next of a sequence of asynchronous transfers.
@@ -1909,8 +1909,8 @@ static ssize_t stm32_in_transfer(FAR struct stm32_usbhost_s *priv, int chidx,
  ****************************************************************************/
 
 #ifdef CONFIG_USBHOST_ASYNCH
-static void stm32_in_next(FAR struct stm32_usbhost_s *priv,
-                          FAR struct stm32_chan_s *chan)
+static void stm32l4_in_next(FAR struct stm32l4_usbhost_s *priv,
+                          FAR struct stm32l4_chan_s *chan)
 {
   usbhost_asynch_t callback;
   FAR void *arg;
@@ -1927,13 +1927,13 @@ static void stm32_in_next(FAR struct stm32_usbhost_s *priv,
        * endpoint type
        */
 
-      ret = stm32_in_setup(priv, chan->chidx);
+      ret = stm32l4_in_setup(priv, chan->chidx);
       if (ret >= 0)
         {
           return;
         }
 
-      uerr("ERROR: stm32_in_setup failed: %d\n", ret);
+      uerr("ERROR: stm32l4_in_setup failed: %d\n", ret);
       result = ret;
     }
 
@@ -1963,7 +1963,7 @@ static void stm32_in_next(FAR struct stm32_usbhost_s *priv,
 #endif
 
 /****************************************************************************
- * Name: stm32_in_asynch
+ * Name: stm32l4_in_asynch
  *
  * Description:
  *   Initiate the first of a sequence of asynchronous transfers.
@@ -1974,11 +1974,11 @@ static void stm32_in_next(FAR struct stm32_usbhost_s *priv,
  ****************************************************************************/
 
 #ifdef CONFIG_USBHOST_ASYNCH
-static int stm32_in_asynch(FAR struct stm32_usbhost_s *priv, int chidx,
+static int stm32l4_in_asynch(FAR struct stm32l4_usbhost_s *priv, int chidx,
                            FAR uint8_t *buffer, size_t buflen,
                            usbhost_asynch_t callback, FAR void *arg)
 {
-  FAR struct stm32_chan_s *chan;
+  FAR struct stm32l4_chan_s *chan;
   int ret;
 
   /* Set up for the transfer data and callback BEFORE starting the first transfer */
@@ -1988,19 +1988,19 @@ static int stm32_in_asynch(FAR struct stm32_usbhost_s *priv, int chidx,
   chan->buflen = buflen;
   chan->xfrd   = 0;
 
-  ret = stm32_chan_asynchsetup(priv, chan, callback, arg);
+  ret = stm32l4_chan_asynchsetup(priv, chan, callback, arg);
   if (ret < 0)
     {
-      uerr("ERROR: stm32_chan_asynchsetup failed: %d\n", ret);
+      uerr("ERROR: stm32l4_chan_asynchsetup failed: %d\n", ret);
       return ret;
     }
 
   /* Set up for the transfer based on the direction and the endpoint type */
 
-  ret = stm32_in_setup(priv, chidx);
+  ret = stm32l4_in_setup(priv, chidx);
   if (ret < 0)
     {
-      uerr("ERROR: stm32_in_setup failed: %d\n", ret);
+      uerr("ERROR: stm32l4_in_setup failed: %d\n", ret);
     }
 
   /* And return with the transfer pending */
@@ -2010,16 +2010,16 @@ static int stm32_in_asynch(FAR struct stm32_usbhost_s *priv, int chidx,
 #endif
 
 /****************************************************************************
- * Name: stm32_out_setup
+ * Name: stm32l4_out_setup
  *
  * Description:
  *   Initiate an OUT transfer on an bulk, interrupt, or isochronous pipe.
  *
  ****************************************************************************/
 
-static int stm32_out_setup(FAR struct stm32_usbhost_s *priv, int chidx)
+static int stm32l4_out_setup(FAR struct stm32l4_usbhost_s *priv, int chidx)
 {
-  FAR struct stm32_chan_s *chan;
+  FAR struct stm32l4_chan_s *chan;
 
   /* Set up for the transfer based on the direction and the endpoint type */
 
@@ -2070,22 +2070,22 @@ static int stm32_out_setup(FAR struct stm32_usbhost_s *priv, int chidx)
 
   /* Start the transfer */
 
-  stm32_transfer_start(priv, chidx);
+  stm32l4_transfer_start(priv, chidx);
   return OK;
 }
 
 /****************************************************************************
- * Name: stm32_out_transfer
+ * Name: stm32l4_out_transfer
  *
  * Description:
  *   Transfer the 'buflen' bytes in 'buffer' through an OUT channel.
  *
  ****************************************************************************/
 
-static ssize_t stm32_out_transfer(FAR struct stm32_usbhost_s *priv, int chidx,
+static ssize_t stm32l4_out_transfer(FAR struct stm32l4_usbhost_s *priv, int chidx,
                                   FAR uint8_t *buffer, size_t buflen)
 {
-  FAR struct stm32_chan_s *chan;
+  FAR struct stm32l4_chan_s *chan;
   systime_t start;
   systime_t elapsed;
   size_t xfrlen;
@@ -2114,7 +2114,7 @@ static ssize_t stm32_out_transfer(FAR struct stm32_usbhost_s *priv, int chidx,
 
       /* Set up for the wait BEFORE starting the transfer */
 
-      ret = stm32_chan_waitsetup(priv, chan);
+      ret = stm32l4_chan_waitsetup(priv, chan);
       if (ret < 0)
         {
           usbhost_trace1(OTGFS_TRACE1_DEVDISCONN, 0);
@@ -2123,16 +2123,16 @@ static ssize_t stm32_out_transfer(FAR struct stm32_usbhost_s *priv, int chidx,
 
       /* Set up for the transfer based on the direction and the endpoint type */
 
-      ret = stm32_out_setup(priv, chidx);
+      ret = stm32l4_out_setup(priv, chidx);
       if (ret < 0)
         {
-          uerr("ERROR: stm32_out_setup failed: %d\n", ret);
+          uerr("ERROR: stm32l4_out_setup failed: %d\n", ret);
           return (ssize_t)ret;
         }
 
       /* Wait for the transfer to complete and get the result */
 
-      ret = stm32_chan_wait(priv, chan);
+      ret = stm32l4_chan_wait(priv, chan);
 
       /* Handle transfer failures */
 
@@ -2149,12 +2149,12 @@ static ssize_t stm32_out_transfer(FAR struct stm32_usbhost_s *priv, int chidx,
 
           elapsed = clock_systimer() - start;
           if (ret != -EAGAIN ||                  /* Not a NAK condition OR */
-              elapsed >= STM32_DATANAK_DELAY ||  /* Timeout has elapsed OR */
+              elapsed >= STM32L4_DATANAK_DELAY ||  /* Timeout has elapsed OR */
               chan->xfrd > 0)                    /* Data has been partially transferred */
             {
               /* Break out and return the error */
 
-              uerr("ERROR: stm32_chan_wait failed: %d\n", ret);
+              uerr("ERROR: stm32l4_chan_wait failed: %d\n", ret);
               return (ssize_t)ret;
             }
 
@@ -2162,7 +2162,7 @@ static ssize_t stm32_out_transfer(FAR struct stm32_usbhost_s *priv, int chidx,
            * data in the FIFO when the NAK occurs?  Does it discard it?
            */
 
-          stm32_flush_txfifos(OTGFS_GRSTCTL_TXFNUM_HALL);
+          stm32l4_flush_txfifos(OTGFS_GRSTCTL_TXFNUM_HALL);
 
           /* Get the device a little time to catch up.  Then retry the transfer
            * using the same buffer pointer and length.
@@ -2184,7 +2184,7 @@ static ssize_t stm32_out_transfer(FAR struct stm32_usbhost_s *priv, int chidx,
 }
 
 /****************************************************************************
- * Name: stm32_out_next
+ * Name: stm32l4_out_next
  *
  * Description:
  *   Initiate the next of a sequence of asynchronous transfers.
@@ -2195,8 +2195,8 @@ static ssize_t stm32_out_transfer(FAR struct stm32_usbhost_s *priv, int chidx,
  ****************************************************************************/
 
 #ifdef CONFIG_USBHOST_ASYNCH
-static void stm32_out_next(FAR struct stm32_usbhost_s *priv,
-                           FAR struct stm32_chan_s *chan)
+static void stm32l4_out_next(FAR struct stm32l4_usbhost_s *priv,
+                           FAR struct stm32l4_chan_s *chan)
 {
   usbhost_asynch_t callback;
   FAR void *arg;
@@ -2213,13 +2213,13 @@ static void stm32_out_next(FAR struct stm32_usbhost_s *priv,
        * endpoint type
        */
 
-      ret = stm32_out_setup(priv, chan->chidx);
+      ret = stm32l4_out_setup(priv, chan->chidx);
       if (ret >= 0)
         {
           return;
         }
 
-      uerr("ERROR: stm32_out_setup failed: %d\n", ret);
+      uerr("ERROR: stm32l4_out_setup failed: %d\n", ret);
       result = ret;
     }
 
@@ -2249,7 +2249,7 @@ static void stm32_out_next(FAR struct stm32_usbhost_s *priv,
 #endif
 
 /****************************************************************************
- * Name: stm32_out_asynch
+ * Name: stm32l4_out_asynch
  *
  * Description:
  *   Initiate the first of a sequence of asynchronous transfers.
@@ -2260,11 +2260,11 @@ static void stm32_out_next(FAR struct stm32_usbhost_s *priv,
  ****************************************************************************/
 
 #ifdef CONFIG_USBHOST_ASYNCH
-static int stm32_out_asynch(FAR struct stm32_usbhost_s *priv, int chidx,
+static int stm32l4_out_asynch(FAR struct stm32l4_usbhost_s *priv, int chidx,
                             FAR uint8_t *buffer, size_t buflen,
                             usbhost_asynch_t callback, FAR void *arg)
 {
-  FAR struct stm32_chan_s *chan;
+  FAR struct stm32l4_chan_s *chan;
   int ret;
 
   /* Set up for the transfer data and callback BEFORE starting the first transfer */
@@ -2274,19 +2274,19 @@ static int stm32_out_asynch(FAR struct stm32_usbhost_s *priv, int chidx,
   chan->buflen = buflen;
   chan->xfrd   = 0;
 
-  ret = stm32_chan_asynchsetup(priv, chan, callback, arg);
+  ret = stm32l4_chan_asynchsetup(priv, chan, callback, arg);
   if (ret < 0)
     {
-      uerr("ERROR: stm32_chan_asynchsetup failed: %d\n", ret);
+      uerr("ERROR: stm32l4_chan_asynchsetup failed: %d\n", ret);
       return ret;
     }
 
   /* Set up for the transfer based on the direction and the endpoint type */
 
-  ret = stm32_out_setup(priv, chidx);
+  ret = stm32l4_out_setup(priv, chidx);
   if (ret < 0)
     {
-      uerr("ERROR: stm32_out_setup failed: %d\n", ret);
+      uerr("ERROR: stm32l4_out_setup failed: %d\n", ret);
     }
 
   /* And return with the transfer pending */
@@ -2296,7 +2296,7 @@ static int stm32_out_asynch(FAR struct stm32_usbhost_s *priv, int chidx,
 #endif
 
 /****************************************************************************
- * Name: stm32_gint_wrpacket
+ * Name: stm32l4_gint_wrpacket
  *
  * Description:
  *   Transfer the 'buflen' bytes in 'buffer' to the Tx FIFO associated with
@@ -2304,14 +2304,14 @@ static int stm32_out_asynch(FAR struct stm32_usbhost_s *priv, int chidx,
  *
  ****************************************************************************/
 
-static void stm32_gint_wrpacket(FAR struct stm32_usbhost_s *priv,
+static void stm32l4_gint_wrpacket(FAR struct stm32l4_usbhost_s *priv,
                                 FAR uint8_t *buffer, int chidx, int buflen)
 {
   FAR uint32_t *src;
   uint32_t fifo;
   int buflen32;
 
-  stm32_pktdump("Sending", buffer, buflen);
+  stm32l4_pktdump("Sending", buffer, buflen);
 
   /* Get the number of 32-byte words associated with this byte size */
 
@@ -2319,7 +2319,7 @@ static void stm32_gint_wrpacket(FAR struct stm32_usbhost_s *priv,
 
   /* Get the address of the Tx FIFO associated with this channel */
 
-  fifo = STM32_OTGFS_DFIFO_HCH(chidx);
+  fifo = STM32L4_OTGFS_DFIFO_HCH(chidx);
 
   /* Transfer all of the data into the Tx FIFO */
 
@@ -2327,7 +2327,7 @@ static void stm32_gint_wrpacket(FAR struct stm32_usbhost_s *priv,
   for (; buflen32 > 0; buflen32--)
     {
       uint32_t data = *src++;
-      stm32_putreg(fifo, data);
+      stm32l4_putreg(fifo, data);
     }
 
   /* Increment the count of bytes "in-flight" in the Tx FIFO */
@@ -2336,7 +2336,7 @@ static void stm32_gint_wrpacket(FAR struct stm32_usbhost_s *priv,
 }
 
 /****************************************************************************
- * Name: stm32_gint_hcinisr
+ * Name: stm32l4_gint_hcinisr
  *
  * Description:
  *   USB OTG FS host IN channels interrupt handler
@@ -2354,10 +2354,10 @@ static void stm32_gint_wrpacket(FAR struct stm32_usbhost_s *priv,
  *
  ****************************************************************************/
 
-static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv,
+static inline void stm32l4_gint_hcinisr(FAR struct stm32l4_usbhost_s *priv,
                                       int chidx)
 {
-  FAR struct stm32_chan_s *chan = &priv->chan[chidx];
+  FAR struct stm32l4_chan_s *chan = &priv->chan[chidx];
   uint32_t regval;
   uint32_t pending;
 
@@ -2365,8 +2365,8 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv,
    * HCINTMSK register to get the set of enabled HC interrupts.
    */
 
-  pending = stm32_getreg(STM32_OTGFS_HCINT(chidx));
-  regval  = stm32_getreg(STM32_OTGFS_HCINTMSK(chidx));
+  pending = stm32l4_getreg(STM32L4_OTGFS_HCINT(chidx));
+  regval  = stm32l4_getreg(STM32L4_OTGFS_HCINTMSK(chidx));
 
   /* AND the two to get the set of enabled, pending HC interrupts */
 
@@ -2379,7 +2379,7 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv,
     {
       /* Clear the pending the ACK response received/transmitted (ACK) interrupt */
 
-      stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_ACK);
+      stm32l4_putreg(STM32L4_OTGFS_HCINT(chidx), OTGFS_HCINT_ACK);
     }
 
   /* Check for a pending STALL response receive (STALL) interrupt */
@@ -2388,13 +2388,13 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv,
     {
       /* Clear the NAK and STALL Conditions. */
 
-      stm32_putreg(STM32_OTGFS_HCINT(chidx), (OTGFS_HCINT_NAK | OTGFS_HCINT_STALL));
+      stm32l4_putreg(STM32L4_OTGFS_HCINT(chidx), (OTGFS_HCINT_NAK | OTGFS_HCINT_STALL));
 
       /* Halt the channel when a STALL, TXERR, BBERR or DTERR interrupt is
        * received on the channel.
        */
 
-      stm32_chan_halt(priv, chidx, CHREASON_STALL);
+      stm32l4_chan_halt(priv, chidx, CHREASON_STALL);
 
       /* When there is a STALL, clear any pending NAK so that it is not
        * processed below.
@@ -2411,11 +2411,11 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv,
        * received on the channel.
        */
 
-      stm32_chan_halt(priv, chidx, CHREASON_DTERR);
+      stm32l4_chan_halt(priv, chidx, CHREASON_DTERR);
 
       /* Clear the NAK and data toggle error conditions */
 
-      stm32_putreg(STM32_OTGFS_HCINT(chidx), (OTGFS_HCINT_NAK | OTGFS_HCINT_DTERR));
+      stm32l4_putreg(STM32L4_OTGFS_HCINT(chidx), (OTGFS_HCINT_NAK | OTGFS_HCINT_DTERR));
     }
 
   /* Check for a pending FRaMe OverRun (FRMOR) interrupt */
@@ -2424,11 +2424,11 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv,
     {
       /* Halt the channel -- the CHH interrupt is expected next */
 
-      stm32_chan_halt(priv, chidx, CHREASON_FRMOR);
+      stm32l4_chan_halt(priv, chidx, CHREASON_FRMOR);
 
       /* Clear the FRaMe OverRun (FRMOR) condition */
 
-      stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_FRMOR);
+      stm32l4_putreg(STM32L4_OTGFS_HCINT(chidx), OTGFS_HCINT_FRMOR);
     }
 
   /* Check for a pending TransFeR Completed (XFRC) interrupt */
@@ -2437,7 +2437,7 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv,
     {
       /* Clear the TransFeR Completed (XFRC) condition */
 
-      stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_XFRC);
+      stm32l4_putreg(STM32L4_OTGFS_HCINT(chidx), OTGFS_HCINT_XFRC);
 
       /* Then handle the transfer completion event based on the endpoint type */
 
@@ -2445,22 +2445,22 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv,
         {
           /* Halt the channel -- the CHH interrupt is expected next */
 
-          stm32_chan_halt(priv, chidx, CHREASON_XFRC);
+          stm32l4_chan_halt(priv, chidx, CHREASON_XFRC);
 
           /* Clear any pending NAK condition.  The 'indata1' data toggle
            * should have been appropriately updated by the RxFIFO
            * logic as each packet was received.
            */
 
-          stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_NAK);
+          stm32l4_putreg(STM32L4_OTGFS_HCINT(chidx), OTGFS_HCINT_NAK);
         }
       else if (chan->eptype == OTGFS_EPTYPE_INTR)
         {
           /* Force the next transfer on an ODD frame */
 
-          regval = stm32_getreg(STM32_OTGFS_HCCHAR(chidx));
+          regval = stm32l4_getreg(STM32L4_OTGFS_HCCHAR(chidx));
           regval |= OTGFS_HCCHAR_ODDFRM;
-          stm32_putreg(STM32_OTGFS_HCCHAR(chidx), regval);
+          stm32l4_putreg(STM32L4_OTGFS_HCCHAR(chidx), regval);
 
           /* Set the request done state */
 
@@ -2474,9 +2474,9 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv,
     {
       /* Mask the CHannel Halted (CHH) interrupt */
 
-      regval  = stm32_getreg(STM32_OTGFS_HCINTMSK(chidx));
+      regval  = stm32l4_getreg(STM32L4_OTGFS_HCINTMSK(chidx));
       regval &= ~OTGFS_HCINT_CHH;
-      stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), regval);
+      stm32l4_putreg(STM32L4_OTGFS_HCINTMSK(chidx), regval);
 
       /* Update the request state based on the host state machine state */
 
@@ -2505,7 +2505,7 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv,
            * and check for an interrupt endpoint.
            */
 
-          regval = stm32_getreg(STM32_OTGFS_HCCHAR(chidx));
+          regval = stm32l4_getreg(STM32L4_OTGFS_HCCHAR(chidx));
           if ((regval & OTGFS_HCCHAR_EPTYP_MASK) == OTGFS_HCCHAR_EPTYP_INTR)
             {
               /* Toggle the IN data toggle (Used by Bulk and INTR only) */
@@ -2526,7 +2526,7 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv,
 
       /* Clear the CHannel Halted (CHH) condition */
 
-      stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_CHH);
+      stm32l4_putreg(STM32L4_OTGFS_HCINT(chidx), OTGFS_HCINT_CHH);
     }
 
   /* Check for a pending Transaction ERror (TXERR) interrupt */
@@ -2537,11 +2537,11 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv,
        * received on the channel.
        */
 
-      stm32_chan_halt(priv, chidx, CHREASON_TXERR);
+      stm32l4_chan_halt(priv, chidx, CHREASON_TXERR);
 
       /* Clear the Transaction ERror (TXERR) condition */
 
-      stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_TXERR);
+      stm32l4_putreg(STM32L4_OTGFS_HCINT(chidx), OTGFS_HCINT_TXERR);
     }
 
   /* Check for a pending NAK response received (NAK) interrupt */
@@ -2561,7 +2561,7 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv,
         {
           /* Halt the channel -- the CHH interrupt is expected next */
 
-          stm32_chan_halt(priv, chidx, CHREASON_NAK);
+          stm32l4_chan_halt(priv, chidx, CHREASON_NAK);
         }
 
       /* Re-activate CTRL and BULK channels.
@@ -2575,29 +2575,29 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv,
            * CHENA is set
            */
 
-          regval  = stm32_getreg(STM32_OTGFS_HCCHAR(chidx));
+          regval  = stm32l4_getreg(STM32L4_OTGFS_HCCHAR(chidx));
           regval |= OTGFS_HCCHAR_CHENA;
           regval &= ~OTGFS_HCCHAR_CHDIS;
-          stm32_putreg(STM32_OTGFS_HCCHAR(chidx), regval);
+          stm32l4_putreg(STM32L4_OTGFS_HCCHAR(chidx), regval);
         }
 #else
       /* Halt all transfers on the NAK -- the CHH interrupt is expected next */
 
-      stm32_chan_halt(priv, chidx, CHREASON_NAK);
+      stm32l4_chan_halt(priv, chidx, CHREASON_NAK);
 #endif
 
       /* Clear the NAK condition */
 
-      stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_NAK);
+      stm32l4_putreg(STM32L4_OTGFS_HCINT(chidx), OTGFS_HCINT_NAK);
     }
 
   /* Check for a transfer complete event */
 
-  stm32_chan_wakeup(priv, chan);
+  stm32l4_chan_wakeup(priv, chan);
 }
 
 /****************************************************************************
- * Name: stm32_gint_hcoutisr
+ * Name: stm32l4_gint_hcoutisr
  *
  * Description:
  *   USB OTG FS host OUT channels interrupt handler
@@ -2615,10 +2615,10 @@ static inline void stm32_gint_hcinisr(FAR struct stm32_usbhost_s *priv,
  *
  ****************************************************************************/
 
-static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv,
+static inline void stm32l4_gint_hcoutisr(FAR struct stm32l4_usbhost_s *priv,
                                        int chidx)
 {
-  FAR struct stm32_chan_s *chan = &priv->chan[chidx];
+  FAR struct stm32l4_chan_s *chan = &priv->chan[chidx];
   uint32_t regval;
   uint32_t pending;
 
@@ -2626,8 +2626,8 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv,
    * HCINTMSK register to get the set of enabled HC interrupts.
    */
 
-  pending = stm32_getreg(STM32_OTGFS_HCINT(chidx));
-  regval  = stm32_getreg(STM32_OTGFS_HCINTMSK(chidx));
+  pending = stm32l4_getreg(STM32L4_OTGFS_HCINT(chidx));
+  regval  = stm32l4_getreg(STM32L4_OTGFS_HCINTMSK(chidx));
 
   /* AND the two to get the set of enabled, pending HC interrupts */
 
@@ -2640,7 +2640,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv,
     {
       /* Clear the pending the ACK response received/transmitted (ACK) interrupt */
 
-      stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_ACK);
+      stm32l4_putreg(STM32L4_OTGFS_HCINT(chidx), OTGFS_HCINT_ACK);
     }
 
   /* Check for a pending FRaMe OverRun (FRMOR) interrupt */
@@ -2649,11 +2649,11 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv,
     {
       /* Halt the channel (probably not necessary for FRMOR) */
 
-      stm32_chan_halt(priv, chidx, CHREASON_FRMOR);
+      stm32l4_chan_halt(priv, chidx, CHREASON_FRMOR);
 
       /* Clear the pending the FRaMe OverRun (FRMOR) interrupt */
 
-      stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_FRMOR);
+      stm32l4_putreg(STM32L4_OTGFS_HCINT(chidx), OTGFS_HCINT_FRMOR);
     }
 
   /* Check for a pending TransFeR Completed (XFRC) interrupt */
@@ -2670,11 +2670,11 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv,
 
       /* Halt the channel -- the CHH interrupt is expected next */
 
-      stm32_chan_halt(priv, chidx, CHREASON_XFRC);
+      stm32l4_chan_halt(priv, chidx, CHREASON_XFRC);
 
       /* Clear the pending the TransFeR Completed (XFRC) interrupt */
 
-      stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_XFRC);
+      stm32l4_putreg(STM32L4_OTGFS_HCINT(chidx), OTGFS_HCINT_XFRC);
     }
 
   /* Check for a pending STALL response receive (STALL) interrupt */
@@ -2683,13 +2683,13 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv,
     {
       /* Clear the pending the STALL response receiv (STALL) interrupt */
 
-      stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_STALL);
+      stm32l4_putreg(STM32L4_OTGFS_HCINT(chidx), OTGFS_HCINT_STALL);
 
       /* Halt the channel when a STALL, TXERR, BBERR or DTERR interrupt is
        * received on the channel.
        */
 
-      stm32_chan_halt(priv, chidx, CHREASON_STALL);
+      stm32l4_chan_halt(priv, chidx, CHREASON_STALL);
     }
 
   /* Check for a pending NAK response received (NAK) interrupt */
@@ -2698,11 +2698,11 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv,
     {
       /* Halt the channel  -- the CHH interrupt is expected next */
 
-      stm32_chan_halt(priv, chidx, CHREASON_NAK);
+      stm32l4_chan_halt(priv, chidx, CHREASON_NAK);
 
       /* Clear the pending the NAK response received (NAK) interrupt */
 
-      stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_NAK);
+      stm32l4_putreg(STM32L4_OTGFS_HCINT(chidx), OTGFS_HCINT_NAK);
     }
 
   /* Check for a pending Transaction ERror (TXERR) interrupt */
@@ -2713,11 +2713,11 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv,
        * received on the channel.
        */
 
-      stm32_chan_halt(priv, chidx, CHREASON_TXERR);
+      stm32l4_chan_halt(priv, chidx, CHREASON_TXERR);
 
       /* Clear the pending the Transaction ERror (TXERR) interrupt */
 
-      stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_TXERR);
+      stm32l4_putreg(STM32L4_OTGFS_HCINT(chidx), OTGFS_HCINT_TXERR);
     }
 
   /* Check for a NYET interrupt */
@@ -2727,11 +2727,11 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv,
     {
       /* Halt the channel */
 
-      stm32_chan_halt(priv, chidx, CHREASON_NYET);
+      stm32l4_chan_halt(priv, chidx, CHREASON_NYET);
 
       /* Clear the pending the NYET interrupt */
 
-      stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_NYET);
+      stm32l4_putreg(STM32L4_OTGFS_HCINT(chidx), OTGFS_HCINT_NYET);
     }
 #endif
 
@@ -2743,11 +2743,11 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv,
        * received on the channel.
        */
 
-      stm32_chan_halt(priv, chidx, CHREASON_DTERR);
+      stm32l4_chan_halt(priv, chidx, CHREASON_DTERR);
 
       /* Clear the pending the Data Toggle ERRor (DTERR) and NAK interrupts */
 
-      stm32_putreg(STM32_OTGFS_HCINT(chidx), (OTGFS_HCINT_DTERR | OTGFS_HCINT_NAK));
+      stm32l4_putreg(STM32L4_OTGFS_HCINT(chidx), (OTGFS_HCINT_DTERR | OTGFS_HCINT_NAK));
     }
 
   /* Check for a pending CHannel Halted (CHH) interrupt */
@@ -2756,9 +2756,9 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv,
     {
       /* Mask the CHannel Halted (CHH) interrupt */
 
-      regval  = stm32_getreg(STM32_OTGFS_HCINTMSK(chidx));
+      regval  = stm32l4_getreg(STM32L4_OTGFS_HCINTMSK(chidx));
       regval &= ~OTGFS_HCINT_CHH;
-      stm32_putreg(STM32_OTGFS_HCINTMSK(chidx), regval);
+      stm32l4_putreg(STM32L4_OTGFS_HCINTMSK(chidx), regval);
 
       if (chan->chreason == CHREASON_XFRC)
         {
@@ -2770,7 +2770,7 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv,
            * the endpoint type.
            */
 
-          regval = stm32_getreg(STM32_OTGFS_HCCHAR(chidx));
+          regval = stm32l4_getreg(STM32L4_OTGFS_HCCHAR(chidx));
 
           /* Is it a bulk endpoint?  Were an odd number of packets
            * transferred?
@@ -2813,23 +2813,23 @@ static inline void stm32_gint_hcoutisr(FAR struct stm32_usbhost_s *priv,
 
       /* Clear the pending the CHannel Halted (CHH) interrupt */
 
-      stm32_putreg(STM32_OTGFS_HCINT(chidx), OTGFS_HCINT_CHH);
+      stm32l4_putreg(STM32L4_OTGFS_HCINT(chidx), OTGFS_HCINT_CHH);
     }
 
   /* Check for a transfer complete event */
 
-  stm32_chan_wakeup(priv, chan);
+  stm32l4_chan_wakeup(priv, chan);
 }
 
 /****************************************************************************
- * Name: stm32_gint_connected
+ * Name: stm32l4_gint_connected
  *
  * Description:
  *   Handle a connection event.
  *
  ****************************************************************************/
 
-static void stm32_gint_connected(FAR struct stm32_usbhost_s *priv)
+static void stm32l4_gint_connected(FAR struct stm32l4_usbhost_s *priv)
 {
   /* We we previously disconnected? */
 
@@ -2847,21 +2847,21 @@ static void stm32_gint_connected(FAR struct stm32_usbhost_s *priv)
       priv->smstate = SMSTATE_ATTACHED;
       if (priv->pscwait)
         {
-          stm32_givesem(&priv->pscsem);
+          stm32l4_givesem(&priv->pscsem);
           priv->pscwait = false;
         }
     }
 }
 
 /****************************************************************************
- * Name: stm32_gint_disconnected
+ * Name: stm32l4_gint_disconnected
  *
  * Description:
  *   Handle a disconnection event.
  *
  ****************************************************************************/
 
-static void stm32_gint_disconnected(FAR struct stm32_usbhost_s *priv)
+static void stm32l4_gint_disconnected(FAR struct stm32l4_usbhost_s *priv)
 {
   /* Were we previously connected? */
 
@@ -2886,7 +2886,7 @@ static void stm32_gint_disconnected(FAR struct stm32_usbhost_s *priv)
       priv->smstate   = SMSTATE_DETACHED;
       priv->connected = false;
       priv->change    = true;
-      stm32_chan_freeall(priv);
+      stm32l4_chan_freeall(priv);
 
       priv->rhport.hport.speed = USB_SPEED_FULL;
 
@@ -2894,41 +2894,41 @@ static void stm32_gint_disconnected(FAR struct stm32_usbhost_s *priv)
 
       if (priv->pscwait)
         {
-          stm32_givesem(&priv->pscsem);
+          stm32l4_givesem(&priv->pscsem);
           priv->pscwait = false;
         }
     }
 }
 
 /****************************************************************************
- * Name: stm32_gint_sofisr
+ * Name: stm32l4_gint_sofisr
  *
  * Description:
  *   USB OTG FS start-of-frame interrupt handler
  *
  ****************************************************************************/
 
-#ifdef CONFIG_STM32_OTGFS_SOFINTR
-static inline void stm32_gint_sofisr(FAR struct stm32_usbhost_s *priv)
+#ifdef CONFIG_STM32L4_OTGFS_SOFINTR
+static inline void stm32l4_gint_sofisr(FAR struct stm32l4_usbhost_s *priv)
 {
   /* Handle SOF interrupt */
 #warning "Do what?"
 
   /* Clear pending SOF interrupt */
 
-  stm32_putreg(STM32_OTGFS_GINTSTS, OTGFS_GINT_SOF);
+  stm32l4_putreg(STM32L4_OTGFS_GINTSTS, OTGFS_GINT_SOF);
 }
 #endif
 
 /****************************************************************************
- * Name: stm32_gint_rxflvlisr
+ * Name: stm32l4_gint_rxflvlisr
  *
  * Description:
  *   USB OTG FS RxFIFO non-empty interrupt handler
  *
  ****************************************************************************/
 
-static inline void stm32_gint_rxflvlisr(FAR struct stm32_usbhost_s *priv)
+static inline void stm32l4_gint_rxflvlisr(FAR struct stm32l4_usbhost_s *priv)
 {
   FAR uint32_t *dest;
   uint32_t grxsts;
@@ -2943,13 +2943,13 @@ static inline void stm32_gint_rxflvlisr(FAR struct stm32_usbhost_s *priv)
 
   /* Disable the RxFIFO non-empty interrupt */
 
-  intmsk  = stm32_getreg(STM32_OTGFS_GINTMSK);
+  intmsk  = stm32l4_getreg(STM32L4_OTGFS_GINTMSK);
   intmsk &= ~OTGFS_GINT_RXFLVL;
-  stm32_putreg(STM32_OTGFS_GINTMSK, intmsk);
+  stm32l4_putreg(STM32L4_OTGFS_GINTMSK, intmsk);
 
   /* Read and pop the next status from the Rx FIFO */
 
-  grxsts = stm32_getreg(STM32_OTGFS_GRXSTSP);
+  grxsts = stm32l4_getreg(STM32L4_OTGFS_GRXSTSP);
   uinfo("GRXSTS: %08x\n", grxsts);
 
   /* Isolate the channel number/index in the status word */
@@ -2958,7 +2958,7 @@ static inline void stm32_gint_rxflvlisr(FAR struct stm32_usbhost_s *priv)
 
   /* Get the host channel characteristics register (HCCHAR) for this channel */
 
-  hcchar = stm32_getreg(STM32_OTGFS_HCCHAR(chidx));
+  hcchar = stm32l4_getreg(STM32L4_OTGFS_HCCHAR(chidx));
 
   /* Then process the interrupt according to the packet status */
 
@@ -2974,15 +2974,15 @@ static inline void stm32_gint_rxflvlisr(FAR struct stm32_usbhost_s *priv)
             /* Transfer the packet from the Rx FIFO into the user buffer */
 
             dest   = (FAR uint32_t *)priv->chan[chidx].buffer;
-            fifo   = STM32_OTGFS_DFIFO_HCH(0);
+            fifo   = STM32L4_OTGFS_DFIFO_HCH(0);
             bcnt32 = (bcnt + 3) >> 2;
 
             for (i = 0; i < bcnt32; i++)
               {
-                *dest++ = stm32_getreg(fifo);
+                *dest++ = stm32l4_getreg(fifo);
               }
 
-            stm32_pktdump("Received", priv->chan[chidx].buffer, bcnt);
+            stm32l4_pktdump("Received", priv->chan[chidx].buffer, bcnt);
 
             /* Toggle the IN data pid (Used by Bulk and INTR only) */
 
@@ -2995,14 +2995,14 @@ static inline void stm32_gint_rxflvlisr(FAR struct stm32_usbhost_s *priv)
 
             /* Check if more packets are expected */
 
-            hctsiz = stm32_getreg(STM32_OTGFS_HCTSIZ(chidx));
+            hctsiz = stm32l4_getreg(STM32L4_OTGFS_HCTSIZ(chidx));
             if ((hctsiz & OTGFS_HCTSIZ_PKTCNT_MASK) != 0)
               {
                 /* Re-activate the channel when more packets are expected */
 
                 hcchar |= OTGFS_HCCHAR_CHENA;
                 hcchar &= ~OTGFS_HCCHAR_CHDIS;
-                stm32_putreg(STM32_OTGFS_HCCHAR(chidx), hcchar);
+                stm32l4_putreg(STM32L4_OTGFS_HCCHAR(chidx), hcchar);
               }
           }
       }
@@ -3018,20 +3018,20 @@ static inline void stm32_gint_rxflvlisr(FAR struct stm32_usbhost_s *priv)
   /* Re-enable the RxFIFO non-empty interrupt */
 
   intmsk |= OTGFS_GINT_RXFLVL;
-  stm32_putreg(STM32_OTGFS_GINTMSK, intmsk);
+  stm32l4_putreg(STM32L4_OTGFS_GINTMSK, intmsk);
 }
 
 /****************************************************************************
- * Name: stm32_gint_nptxfeisr
+ * Name: stm32l4_gint_nptxfeisr
  *
  * Description:
  *   USB OTG FS non-periodic TxFIFO empty interrupt handler
  *
  ****************************************************************************/
 
-static inline void stm32_gint_nptxfeisr(FAR struct stm32_usbhost_s *priv)
+static inline void stm32l4_gint_nptxfeisr(FAR struct stm32l4_usbhost_s *priv)
 {
-  FAR struct stm32_chan_s *chan;
+  FAR struct stm32l4_chan_s *chan;
   uint32_t     regval;
   unsigned int wrsize;
   unsigned int avail;
@@ -3061,13 +3061,13 @@ static inline void stm32_gint_nptxfeisr(FAR struct stm32_usbhost_s *priv)
     {
       /* Disable further Tx FIFO empty interrupts and bail. */
 
-      stm32_modifyreg(STM32_OTGFS_GINTMSK, OTGFS_GINT_NPTXFE, 0);
+      stm32l4_modifyreg(STM32L4_OTGFS_GINTMSK, OTGFS_GINT_NPTXFE, 0);
       return;
     }
 
   /* Read the status from the top of the non-periodic TxFIFO */
 
-  regval = stm32_getreg(STM32_OTGFS_HNPTXSTS);
+  regval = stm32l4_getreg(STM32L4_OTGFS_HNPTXSTS);
 
   /* Extract the number of bytes available in the non-periodic Tx FIFO. */
 
@@ -3098,7 +3098,7 @@ static inline void stm32_gint_nptxfeisr(FAR struct stm32_usbhost_s *priv)
 
   else
     {
-      stm32_modifyreg(STM32_OTGFS_GINTMSK, OTGFS_GINT_NPTXFE, 0);
+      stm32l4_modifyreg(STM32L4_OTGFS_GINTMSK, OTGFS_GINT_NPTXFE, 0);
     }
 
   /* Write the next group of packets into the Tx FIFO */
@@ -3106,20 +3106,20 @@ static inline void stm32_gint_nptxfeisr(FAR struct stm32_usbhost_s *priv)
   uinfo("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);
+  stm32l4_gint_wrpacket(priv, chan->buffer, chidx, wrsize);
 }
 
 /****************************************************************************
- * Name: stm32_gint_ptxfeisr
+ * Name: stm32l4_gint_ptxfeisr
  *
  * Description:
  *   USB OTG FS periodic TxFIFO empty interrupt handler
  *
  ****************************************************************************/
 
-static inline void stm32_gint_ptxfeisr(FAR struct stm32_usbhost_s *priv)
+static inline void stm32l4_gint_ptxfeisr(FAR struct stm32l4_usbhost_s *priv)
 {
-  FAR struct stm32_chan_s *chan;
+  FAR struct stm32l4_chan_s *chan;
   uint32_t     regval;
   unsigned int wrsize;
   unsigned int avail;
@@ -3149,13 +3149,13 @@ static inline void stm32_gint_ptxfeisr(FAR struct stm32_usbhost_s *priv)
     {
       /* Disable further Tx FIFO empty interrupts and bail. */
 
-      stm32_modifyreg(STM32_OTGFS_GINTMSK, OTGFS_GINT_PTXFE, 0);
+      stm32l4_modifyreg(STM32L4_OTGFS_GINTMSK, OTGFS_GINT_PTXFE, 0);
       return;
     }
 
   /* Read the status from the top of the periodic TxFIFO */
 
-  regval = stm32_getreg(STM32_OTGFS_HPTXSTS);
+  regval = stm32l4_getreg(STM32L4_OTGFS_HPTXSTS);
 
   /* Extract the number of bytes available in the periodic Tx FIFO. */
 
@@ -3186,7 +3186,7 @@ static inline void stm32_gint_ptxfeisr(FAR struct stm32_usbhost_s *priv)
 
   else
     {
-      stm32_modifyreg(STM32_OTGFS_GINTMSK, OTGFS_GINT_PTXFE, 0);
+      stm32l4_modifyreg(STM32L4_OTGFS_GINTMSK, OTGFS_GINT_PTXFE, 0);
     }
 
   /* Write the next group of packets into the Tx FIFO */
@@ -3194,30 +3194,30 @@ static inline void stm32_gint_ptxfeisr(FAR struct stm32_usbhost_s *priv)
   uinfo("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);
+  stm32l4_gint_wrpacket(priv, chan->buffer, chidx, wrsize);
 }
 
 /****************************************************************************
- * Name: stm32_gint_hcisr
+ * Name: stm32l4_gint_hcisr
  *
  * Description:
  *   USB OTG FS host channels interrupt handler
  *
  ****************************************************************************/
 
-static inline void stm32_gint_hcisr(FAR struct stm32_usbhost_s *priv)
+static inline void stm32l4_gint_hcisr(FAR struct stm32l4_usbhost_s *priv)
 {
   uint32_t haint;
   uint32_t hcchar;
   int i = 0;
 
   /* Read the Host all channels interrupt register and test each bit in the
-   * register. Each bit i, i=0...(STM32_NHOST_CHANNELS-1), corresponds to
+   * register. Each bit i, i=0...(STM32L4_NHOST_CHANNELS-1), corresponds to
    * a pending interrupt on channel i.
    */
 
-  haint = stm32_getreg(STM32_OTGFS_HAINT);
-  for (i = 0; i < STM32_NHOST_CHANNELS; i++)
+  haint = stm32l4_getreg(STM32L4_OTGFS_HAINT);
+  for (i = 0; i < STM32L4_NHOST_CHANNELS; i++)
     {
       /* Is an interrupt pending on this channel? */
 
@@ -3225,7 +3225,7 @@ static inline void stm32_gint_hcisr(FAR struct stm32_usbhost_s *priv)
         {
           /* Yes... read the HCCHAR register to get the direction bit */
 
-          hcchar = stm32_getreg(STM32_OTGFS_HCCHAR(i));
+          hcchar = stm32l4_getreg(STM32L4_OTGFS_HCCHAR(i));
 
           /* Was this an interrupt on an IN or an OUT channel? */
 
@@ -3233,27 +3233,27 @@ static inline void stm32_gint_hcisr(FAR struct stm32_usbhost_s *priv)
             {
               /* Handle the HC IN channel interrupt */
 
-              stm32_gint_hcinisr(priv, i);
+              stm32l4_gint_hcinisr(priv, i);
             }
           else
             {
               /* Handle the HC OUT channel interrupt */
 
-              stm32_gint_hcoutisr(priv, i);
+              stm32l4_gint_hcoutisr(priv, i);
             }
         }
     }
 }
 
 /****************************************************************************
- * Name: stm32_gint_hprtisr
+ * Name: stm32l4_gint_hprtisr
  *
  * Description:
  *   USB OTG FS host port interrupt handler
  *
  ****************************************************************************/
 
-static inline void stm32_gint_hprtisr(FAR struct stm32_usbhost_s *priv)
+static inline void stm32l4_gint_hprtisr(FAR struct stm32l4_usbhost_s *priv)
 {
   uint32_t hprt;
   uint32_t newhprt;
@@ -3262,7 +3262,7 @@ static inline void stm32_gint_hprtisr(FAR struct stm32_usbhost_s *priv)
   usbhost_vtrace1(OTGFS_VTRACE1_GINT_HPRT, 0);
   /* Read the port status and control register (HPRT) */
 
-  hprt = stm32_getreg(STM32_OTGFS_HPRT);
+  hprt = stm32l4_getreg(STM32L4_OTGFS_HPRT);
 
   /* Setup to clear the interrupt bits in GINTSTS by setting the corresponding
    * bits in the HPRT.  The HCINT interrupt bit is cleared when the appropriate
@@ -3294,8 +3294,8 @@ static inline void stm32_gint_hprtisr(FAR struct stm32_usbhost_s *priv)
 
       usbhost_vtrace1(OTGFS_VTRACE1_GINT_HPRT_PCDET, 0);
       newhprt |= OTGFS_HPRT_PCDET;
-      stm32_portreset(priv);
-      stm32_gint_connected(priv);
+      stm32l4_portreset(priv);
+      stm32l4_gint_connected(priv);
     }
 
   /* Check for Port Enable CHaNGed (PENCHNG) */
@@ -3313,11 +3313,11 @@ static inline void stm32_gint_hprtisr(FAR struct stm32_usbhost_s *priv)
         {
           /* Yes.. handle the new connection event */
 
-          stm32_gint_connected(priv);
+          stm32l4_gint_connected(priv);
 
           /* Check the Host ConFiGuration register (HCFG) */
 
-          hcfg = stm32_getreg(STM32_OTGFS_HCFG);
+          hcfg = stm32l4_getreg(STM32L4_OTGFS_HCFG);
 
           /* Is this a low speed or full speed connection (OTG FS does not
            * support high speed)
@@ -3328,7 +3328,7 @@ static inline void stm32_gint_hprtisr(FAR struct stm32_usbhost_s *priv)
               /* Set the Host Frame Interval Register for the 6KHz speed */
 
               usbhost_vtrace1(OTGFS_VTRACE1_GINT_HPRT_LSDEV, 0);
-              stm32_putreg(STM32_OTGFS_HFIR, 6000);
+              stm32l4_putreg(STM32L4_OTGFS_HFIR, 6000);
 
               /* Are we switching from FS to LS? */
 
@@ -3340,18 +3340,18 @@ static inline void stm32_gint_hprtisr(FAR struct stm32_usbhost_s *priv)
 
                   hcfg &= ~OTGFS_HCFG_FSLSPCS_MASK;
                   hcfg |= OTGFS_HCFG_FSLSPCS_LS6MHz;
-                  stm32_putreg(STM32_OTGFS_HCFG, hcfg);
+                  stm32l4_putreg(STM32L4_OTGFS_HCFG, hcfg);
 
                   /* And reset the port */
 
-                  stm32_portreset(priv);
+                  stm32l4_portreset(priv);
                 }
             }
           else /* if ((hprt & OTGFS_HPRT_PSPD_MASK) == OTGFS_HPRT_PSPD_FS) */
             {
 
               usbhost_vtrace1(OTGFS_VTRACE1_GINT_HPRT_FSDEV, 0);
-              stm32_putreg(STM32_OTGFS_HFIR, 48000);
+              stm32l4_putreg(STM32L4_OTGFS_HFIR, 48000);
 
               /* Are we switching from LS to FS? */
 
@@ -3363,11 +3363,11 @@ static inline void stm32_gint_hprtisr(FAR struct stm32_usbhost_s *priv)
 
                   hcfg &= ~OTGFS_HCFG_FSLSPCS_MASK;
                   hcfg |= OTGFS_HCFG_FSLSPCS_FS48MHz;
-                  stm32_putreg(STM32_OTGFS_HCFG, hcfg);
+                  stm32l4_putreg(STM32L4_OTGFS_HCFG, hcfg);
 
                   /* And reset the port */
 
-                  stm32_portreset(priv);
+                  stm32l4_portreset(priv);
                 }
             }
         }
@@ -3375,37 +3375,37 @@ static inline void stm32_gint_hprtisr(FAR struct stm32_usbhost_s *priv)
 
   /* Clear port interrupts by setting bits in the HPRT */
 
-  stm32_putreg(STM32_OTGFS_HPRT, newhprt);
+  stm32l4_putreg(STM32L4_OTGFS_HPRT, newhprt);
 }
 
 /****************************************************************************
- * Name: stm32_gint_discisr
+ * Name: stm32l4_gint_discisr
  *
  * Description:
  *   USB OTG FS disconnect detected interrupt handler
  *
  ****************************************************************************/
 
-static inline void stm32_gint_discisr(FAR struct stm32_usbhost_s *priv)
+static inline void stm32l4_gint_discisr(FAR struct stm32l4_usbhost_s *priv)
 {
   /* Handle the disconnection event */
 
-  stm32_gint_disconnected(priv);
+  stm32l4_gint_disconnected(priv);
 
   /* Clear the dicsonnect interrupt */
 
-  stm32_putreg(STM32_OTGFS_GINTSTS, OTGFS_GINT_DISC);
+  stm32l4_putreg(STM32L4_OTGFS_GINTSTS, OTGFS_GINT_DISC);
 }
 
 /****************************************************************************
- * Name: stm32_gint_ipxfrisr
+ * Name: stm32l4_gint_ipxfrisr
  *
  * Description:
  *   USB OTG FS incomplete periodic interrupt handler
  *
  ****************************************************************************/
 
-static inline void stm32_gint_ipxfrisr(FAR struct stm32_usbhost_s *priv)
+static inline void stm32l4_gint_ipxfrisr(FAR struct stm32l4_usbhost_s *priv)
 {
   uint32_t regval;
 
@@ -3413,24 +3413,24 @@ static inline void stm32_gint_ipxfrisr(FAR struct stm32_usbhost_s *priv)
    * CHDIS : Set to stop transmitting/receiving data on a channel
    */
 
-  regval = stm32_getreg(STM32_OTGFS_HCCHAR(0));
+  regval = stm32l4_getreg(STM32L4_OTGFS_HCCHAR(0));
   regval |= (OTGFS_HCCHAR_CHDIS | OTGFS_HCCHAR_CHENA);
-  stm32_putreg(STM32_OTGFS_HCCHAR(0), regval);
+  stm32l4_putreg(STM32L4_OTGFS_HCCHAR(0), regval);
 
   /* Clear the incomplete isochronous OUT interrupt */
 
-  stm32_putreg(STM32_OTGFS_GINTSTS, OTGFS_GINT_IPXFR);
+  stm32l4_putreg(STM32L4_OTGFS_GINTSTS, OTGFS_GINT_IPXFR);
 }
 
 /****************************************************************************
- * Name: stm32_gint_isr
+ * Name: stm32l4_gint_isr
  *
  * Description:
  *   USB OTG FS global interrupt handler
  *
  ****************************************************************************/
 
-static int stm32_gint_isr(int irq, FAR void *context)
+static int stm32l4_gint_isr(int irq, FAR void *context)
 {
   /* At present, there is only support for a single OTG FS host. Hence it is
    * pre-allocated as g_usbhost.  However, in most code, the private data
@@ -3438,7 +3438,7 @@ static int stm32_gint_isr(int irq, FAR void *context)
    * global data) in order to simplify any future support for multiple devices.
    */
 
-  FAR struct stm32_usbhost_s *priv = &g_usbhost;
+  FAR struct stm32l4_usbhost_s *priv = &g_usbhost;
   uint32_t pending;
 
   /* If OTG were supported, we would need to check if we are in host or
@@ -3454,8 +3454,8 @@ static int stm32_gint_isr(int irq, FAR void *context)
     {
       /* Get the unmasked bits in the GINT status */
 
-      pending  = stm32_getreg(STM32_OTGFS_GINTSTS);
-      pending &= stm32_getreg(STM32_OTGFS_GINTMSK);
+      pending  = stm32l4_getreg(STM32L4_OTGFS_GINTSTS);
+      pending &= stm32l4_getreg(STM32L4_OTGFS_GINTMSK);
 
       /* Return from the interrupt when there are no further pending
        * interrupts.
@@ -3470,11 +3470,11 @@ static int stm32_gint_isr(int irq, FAR void *context)
 
       /* Handle the start of frame interrupt */
 
-#ifdef CONFIG_STM32_OTGFS_SOFINTR
+#ifdef CONFIG_STM32L4_OTGFS_SOFINTR
       if ((pending & OTGFS_GINT_SOF) != 0)
         {
           usbhost_vtrace1(OTGFS_VTRACE1_GINT_SOF, 0);
-          stm32_gint_sofisr(priv);
+          stm32l4_gint_sofisr(priv);
         }
 #endif
 
@@ -3483,7 +3483,7 @@ static int stm32_gint_isr(int irq, FAR void *context)
       if ((pending & OTGFS_GINT_RXFLVL) != 0)
         {
           usbhost_vtrace1(OTGFS_VTRACE1_GINT_RXFLVL, 0);
-          stm32_gint_rxflvlisr(priv);
+          stm32l4_gint_rxflvlisr(priv);
         }
 
       /* Handle the non-periodic TxFIFO empty interrupt */
@@ -3491,7 +3491,7 @@ static int stm32_gint_isr(int irq, FAR void *context)
       if ((pending & OTGFS_GINT_NPTXFE) != 0)
         {
           usbhost_vtrace1(OTGFS_VTRACE1_GINT_NPTXFE, 0);
-          stm32_gint_nptxfeisr(priv);
+          stm32l4_gint_nptxfeisr(priv);
         }
 
       /* Handle the periodic TxFIFO empty interrupt */
@@ -3499,7 +3499,7 @@ static int stm32_gint_isr(int irq, FAR void *context)
       if ((pending & OTGFS_GINT_PTXFE) != 0)
         {
           usbhost_vtrace1(OTGFS_VTRACE1_GINT_PTXFE, 0);
-          stm32_gint_ptxfeisr(priv);
+          stm32l4_gint_ptxfeisr(priv);
         }
 
       /* Handle the host channels interrupt */
@@ -3507,14 +3507,14 @@ static int stm32_gint_isr(int irq, FAR void *context)
       if ((pending & OTGFS_GINT_HC) != 0)
         {
           usbhost_vtrace1(OTGFS_VTRACE1_GINT_HC, 0);
-          stm32_gint_hcisr(priv);
+          stm32l4_gint_hcisr(priv);
         }
 
       /* Handle the host port interrupt */
 
       if ((pending & OTGFS_GINT_HPRT) != 0)
         {
-          stm32_gint_hprtisr(priv);
+          stm32l4_gint_hprtisr(priv);
         }
 
       /* Handle the disconnect detected interrupt */
@@ -3522,7 +3522,7 @@ static int stm32_gint_isr(int irq, FAR void *context)
       if ((pending & OTGFS_GINT_DISC) != 0)
         {
           usbhost_vtrace1(OTGFS_VTRACE1_GINT_DISC, 0);
-          stm32_gint_discisr(priv);
+          stm32l4_gint_discisr(priv);
         }
 
       /* Handle the incomplete periodic transfer */
@@ -3530,7 +3530,7 @@ static int stm32_gint_isr(int irq, FAR void *context)
       if ((pending & OTGFS_GINT_IPXFR) != 0)
         {
           usbhost_vtrace1(OTGFS_VTRACE1_GINT_IPXFR, 0);
-          stm32_gint_ipxfrisr(priv);
+          stm32l4_gint_ipxfrisr(priv);
         }
     }
 
@@ -3540,7 +3540,7 @@ static int stm32_gint_isr(int irq, FAR void *context)
 }
 
 /****************************************************************************
- * Name: stm32_gint_enable and stm32_gint_disable
+ * Name: stm32l4_gint_enable and stm32l4_gint_disable
  *
  * Description:
  *   Respectively enable or disable the global OTG FS interrupt.
@@ -3553,30 +3553,30 @@ static int stm32_gint_isr(int irq, FAR void *context)
  *
  ****************************************************************************/
 
-static void stm32_gint_enable(void)
+static void stm32l4_gint_enable(void)
 {
   uint32_t regval;
 
   /* Set the GINTMSK bit to unmask the interrupt */
 
-  regval  = stm32_getreg(STM32_OTGFS_GAHBCFG);
+  regval  = stm32l4_getreg(STM32L4_OTGFS_GAHBCFG);
   regval |= OTGFS_GAHBCFG_GINTMSK;
-  stm32_putreg(STM32_OTGFS_GAHBCFG, regval);
+  stm32l4_putreg(STM32L4_OTGFS_GAHBCFG, regval);
 }
 
-static void stm32_gint_disable(void)
+static void stm32l4_gint_disable(void)
 {
   uint32_t regval;
 
   /* Clear the GINTMSK bit to mask the interrupt */
 
-  regval  = stm32_getreg(STM32_OTGFS_GAHBCFG);
+  regval  = stm32l4_getreg(STM32L4_OTGFS_GAHBCFG);
   regval &= ~OTGFS_GAHBCFG_GINTMSK;
-  stm32_putreg(STM32_OTGFS_GAHBCFG, regval);
+  stm32l4_putreg(STM32L4_OTGFS_GAHBCFG, regval);
 }
 
 /****************************************************************************
- * Name: stm32_hostinit_enable
+ * Name: stm32l4_hostinit_enable
  *
  * Description:
  *   Enable host interrupts.
@@ -3589,25 +3589,25 @@ static void stm32_gint_disable(void)
  *
  ****************************************************************************/
 
-static inline void stm32_hostinit_enable(void)
+static inline void stm32l4_hostinit_enable(void)
 {
   uint32_t regval;
 
   /* Disable all interrupts. */
 
-  stm32_putreg(STM32_OTGFS_GINTMSK, 0);
+  stm32l4_putreg(STM32L4_OTGFS_GINTMSK, 0);
 
   /* Clear any pending interrupts. */
 
-  stm32_putreg(STM32_OTGFS_GINTSTS, 0xffffffff);
+  stm32l4_putreg(STM32L4_OTGFS_GINTSTS, 0xffffffff);
 
   /* Clear any pending USB OTG Interrupts (should be done elsewhere if OTG is supported) */
 
-  stm32_putreg(STM32_OTGFS_GOTGINT, 0xffffffff);
+  stm32l4_putreg(STM32L4_OTGFS_GOTGINT, 0xffffffff);
 
   /* Clear any pending USB OTG interrupts */
 
-  stm32_putreg(STM32_OTGFS_GINTSTS, 0xbfffffff);
+  stm32l4_putreg(STM32L4_OTGFS_GINTSTS, 0xbfffffff);
 
   /* Enable the host interrupts */
   /* Common interrupts:
@@ -3635,18 +3635,18 @@ static inline void stm32_hostinit_enable(void)
    *   OTGFS_GINT_DISC     : Disconnect detected interrupt
    */
 
-#ifdef CONFIG_STM32_OTGFS_SOFINTR
+#ifdef CONFIG_STM32L4_OTGFS_SOFINTR
   regval |= (OTGFS_GINT_SOF    | OTGFS_GINT_RXFLVL   | OTGFS_GINT_IISOOXFR |
              OTGFS_GINT_HPRT   | OTGFS_GINT_HC       | OTGFS_GINT_DISC);
 #else
   regval |= (OTGFS_GINT_RXFLVL | OTGFS_GINT_IPXFR    | OTGFS_GINT_HPRT     |
              OTGFS_GINT_HC     | OTGFS_GINT_DISC);
 #endif
-  stm32_putreg(STM32_OTGFS_GINTMSK, regval);
+  stm32l4_putreg(STM32L4_OTGFS_GINTMSK, regval);
 }
 
 /****************************************************************************
- * Name: stm32_txfe_enable
+ * Name: stm32l4_txfe_enable
  *
  * Description:
  *   Enable Tx FIFO empty interrupts.  This is necessary when the entire
@@ -3667,9 +3667,9 @@ static inline void stm32_hostinit_enable(void)
  *
  ****************************************************************************/
 
-static void stm32_txfe_enable(FAR struct stm32_usbhost_s *priv, int chidx)
+static void stm32l4_txfe_enable(FAR struct stm32l4_usbhost_s *priv, int chidx)
 {
-  FAR struct stm32_chan_s *chan = &priv->chan[chidx];
+  FAR struct stm32l4_chan_s *chan = &priv->chan[chidx];
   irqstate_t flags;
   uint32_t regval;
 
@@ -3681,7 +3681,7 @@ static void stm32_txfe_enable(FAR struct stm32_usbhost_s *priv, int chidx)
 
   /* Should we enable the periodic or non-peridic Tx FIFO empty interrupts */
 
-  regval = stm32_getreg(STM32_OTGFS_GINTMSK);
+  regval = stm32l4_getreg(STM32L4_OTGFS_GINTMSK);
   switch (chan->eptype)
     {
     default:
@@ -3698,7 +3698,7 @@ static void stm32_txfe_enable(FAR struct stm32_usbhost_s *priv, int chidx)
 
   /* Enable interrupts */
 
-  stm32_putreg(STM32_OTGFS_GINTMSK, regval);
+  stm32l4_putreg(STM32L4_OTGFS_GINTMSK, regval);
   leave_critical_section(flags);
 }
 
@@ -3707,7 +3707,7 @@ static void stm32_txfe_enable(FAR struct stm32_usbhost_s *priv, int chidx)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: stm32_wait
+ * Name: stm32l4_wait
  *
  * Description:
  *   Wait for a device to be connected or disconnected to/from a hub port.
@@ -3731,10 +3731,10 @@ static void stm32_txfe_enable(FAR struct stm32_usbhost_s *priv, int chidx)
  *
  ****************************************************************************/
 
-static int stm32_wait(FAR struct usbhost_connection_s *conn,
+static int stm32l4_wait(FAR struct usbhost_connection_s *conn,
                       FAR struct usbhost_hubport_s **hport)
 {
-  FAR struct stm32_usbhost_s *priv = &g_usbhost;
+  FAR struct stm32l4_usbhost_s *priv = &g_usbhost;
   struct usbhost_hubport_s *connport;
   irqstate_t flags;
 
@@ -3786,12 +3786,12 @@ static int stm32_wait(FAR struct usbhost_connection_s *conn,
       /* Wait for the next connection event */
 
       priv->pscwait = true;
-      stm32_takesem(&priv->pscsem);
+      stm32l4_takesem(&priv->pscsem);
     }
 }
 
 /****************************************************************************
- * Name: stm32_enumerate
+ * Name: stm32l4_enumerate
  *
  * Description:
  *   Enumerate the connected device.  As part of this enumeration process,
@@ -3818,7 +3818,7 @@ static int stm32_wait(FAR struct usbhost_connection_s *conn,
  *
  ****************************************************************************/
 
-static int stm32_rh_enumerate(FAR struct stm32_usbhost_s *priv,
+static int stm32l4_rh_enumerate(FAR struct stm32l4_usbhost_s *priv,
                               FAR struct usbhost_connection_s *conn,
                               FAR struct usbhost_hubport_s *hport)
 {
@@ -3847,11 +3847,11 @@ static int stm32_rh_enumerate(FAR struct stm32_usbhost_s *priv,
 
   /* Reset the host port */
 
-  stm32_portreset(priv);
+  stm32l4_portreset(priv);
 
   /* Get the current device speed */
 
-  regval = stm32_getreg(STM32_OTGFS_HPRT);
+  regval = stm32l4_getreg(STM32L4_OTGFS_HPRT);
   if ((regval & OTGFS_HPRT_PSPD_MASK) == OTGFS_HPRT_PSPD_LS)
     {
       priv->rhport.hport.speed = USB_SPEED_LOW;
@@ -3863,7 +3863,7 @@ static int stm32_rh_enumerate(FAR struct stm32_usbhost_s *priv,
 
   /* Allocate and initialize the root hub port EP0 channels */
 
-  ret = stm32_ctrlchan_alloc(priv, 0, 0, priv->rhport.hport.speed, &priv->ep0);
+  ret = stm32l4_ctrlchan_alloc(priv, 0, 0, priv->rhport.hport.speed, &priv->ep0);
   if (ret < 0)
     {
       uerr("ERROR: Failed to allocate a control endpoint: %d\n", ret);
@@ -3872,10 +3872,10 @@ static int stm32_rh_enumerate(FAR struct stm32_usbhost_s *priv,
   return ret;
 }
 
-static int stm32_enumerate(FAR struct usbhost_connection_s *conn,
+static int stm32l4_enumerate(FAR struct usbhost_connection_s *conn,
                            FAR struct usbhost_hubport_s *hport)
 {
-  FAR struct stm32_usbhost_s *priv = &g_usbhost;
+  FAR struct stm32l4_usbhost_s *priv = &g_usbhost;
   int ret;
 
   DEBUGASSERT(hport);
@@ -3889,7 +3889,7 @@ static int stm32_enumerate(FAR struct usbhost_connection_s *conn,
   if (ROOTHUB(hport))
 #endif
     {
-      ret = stm32_rh_enumerate(priv, conn, hport);
+      ret = stm32l4_rh_enumerate(priv, conn, hport);
       if (ret < 0)
         {
           return ret;
@@ -3913,14 +3913,14 @@ static int stm32_enumerate(FAR struct usbhost_connection_s *conn,
       /* Return to the disconnected state */
 
       uerr("ERROR: Enumeration failed: %d\n", ret);
-      stm32_gint_disconnected(priv);
+      stm32l4_gint_disconnected(priv);
     }
 
   return ret;
 }
 
 /************************************************************************************
- * Name: stm32_ep0configure
+ * Name: stm32l4_ep0configure
  *
  * Description:
  *   Configure endpoint 0.  This method is normally used internally by the
@@ -3946,20 +3946,20 @@ static int stm32_enumerate(FAR struct usbhost_connection_s *conn,
  *
  ************************************************************************************/
 
-static int stm32_ep0configure(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
+static int stm32l4_ep0configure(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
                               uint8_t funcaddr, uint8_t speed,
                               uint16_t maxpacketsize)
 {
-  FAR struct stm32_usbhost_s *priv = (FAR struct stm32_usbhost_s *)drvr;
-  FAR struct stm32_ctrlinfo_s *ep0info = (FAR struct stm32_ctrlinfo_s *)ep0;
-  FAR struct stm32_chan_s *chan;
+  FAR struct stm32l4_usbhost_s *priv = (FAR struct stm32l4_usbhost_s *)drvr;
+  FAR struct stm32l4_ctrlinfo_s *ep0info = (FAR struct stm32l4_ctrlinfo_s *)ep0;
+  FAR struct stm32l4_chan_s *chan;
 
   DEBUGASSERT(drvr != NULL && ep0info != NULL && funcaddr < 128 &&
               maxpacketsize <= 64);
 
   /* We must have exclusive access to the USB host hardware and state structures */
 
-  stm32_takesem(&priv->exclsem);
+  stm32l4_takesem(&priv->exclsem);
 
   /* Configure the EP0 OUT channel */
 
@@ -3968,7 +3968,7 @@ static int stm32_ep0configure(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep
   chan->speed     = speed;
   chan->maxpacket = maxpacketsize;
 
-  stm32_chan_configure(priv, ep0info->outndx);
+  stm32l4_chan_configure(priv, ep0info->outndx);
 
   /* Configure the EP0 IN channel */
 
@@ -3977,14 +3977,14 @@ static int stm32_ep0configure(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep
   chan->speed     = speed;
   chan->maxpacket = maxpacketsize;
 
-  stm32_chan_configure(priv, ep0info->inndx);
+  stm32l4_chan_configure(priv, ep0info->inndx);
 
-  stm32_givesem(&priv->exclsem);
+  stm32l4_givesem(&priv->exclsem);
   return OK;
 }
 
 /************************************************************************************
- * Name: stm32_epalloc
+ * Name: stm32l4_epalloc
  *
  * Description:
  *   Allocate and configure one endpoint.
@@ -4005,11 +4005,11 @@ static int stm32_ep0configure(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep
  *
  ************************************************************************************/
 
-static int stm32_epalloc(FAR struct usbhost_driver_s *drvr,
+static int stm32l4_epalloc(FAR struct usbhost_driver_s *drvr,
                          FAR const struct usbhost_epdesc_s *epdesc,
                          FAR usbhost_ep_t *ep)
 {
-  FAR struct stm32_usbhost_s *priv = (FAR struct stm32_usbhost_s *)drvr;
+  FAR struct stm32l4_usbhost_s *priv = (FAR struct stm32l4_usbhost_s *)drvr;
   int ret;
 
   /* Sanity check.  NOTE that this method should only be called if a device is
@@ -4020,7 +4020,7 @@ static int stm32_epalloc(FAR struct usbhost_driver_s *drvr,
 
   /* We must have exclusive access to the USB host hardware and state structures */
 
-  stm32_takesem(&priv->exclsem);
+  stm32l4_takesem(&priv->exclsem);
 
   /* Handler control pipes differently from other endpoint types.  This is
    * because the normal, "transfer" endpoints are unidirectional an require
@@ -4030,19 +4030,19 @@ static int stm32_epalloc(FAR struct usbhost_driver_s *drvr,
 
   if (epdesc->xfrtype == OTGFS_EPTYPE_CTRL)
     {
-      ret = stm32_ctrlep_alloc(priv, epdesc, ep);
+      ret = stm32l4_ctrlep_alloc(priv, epdesc, ep);
     }
   else
     {
-      ret = stm32_xfrep_alloc(priv, epdesc, ep);
+      ret = stm32l4_xfrep_alloc(priv, epdesc, ep);
     }
 
-  stm32_givesem(&priv->exclsem);
+  stm32l4_givesem(&priv->exclsem);
   return ret;
 }
 
 /************************************************************************************
- * Name: stm32_epfree
+ * Name: stm32l4_epfree
  *
  * Description:
  *   Free and endpoint previously allocated by DRVR_EPALLOC.
@@ -4061,45 +4061,45 @@ static int stm32_epalloc(FAR struct usbhost_driver_s *drvr,
  *
  ************************************************************************************/
 
-static int stm32_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep)
+static int stm32l4_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep)
 {
-  FAR struct stm32_usbhost_s *priv = (FAR struct stm32_usbhost_s *)drvr;
+  FAR struct stm32l4_usbhost_s *priv = (FAR struct stm32l4_usbhost_s *)drvr;
 
   DEBUGASSERT(priv);
 
   /* We must have exclusive access to the USB host hardware and state structures */
 
-  stm32_takesem(&priv->exclsem);
+  stm32l4_takesem(&priv->exclsem);
 
-  /* A single channel is represent by an index in the range of 0 to STM32_MAX_TX_FIFOS.
+  /* A single channel is represent by an index in the range of 0 to STM32L4_MAX_TX_FIFOS.
    * Otherwise, the ep must be a pointer to an allocated control endpoint structure.
    */
 
-  if ((uintptr_t)ep < STM32_MAX_TX_FIFOS)
+  if ((uintptr_t)ep < STM32L4_MAX_TX_FIFOS)
     {
       /* Halt the channel and mark the channel available */
 
-      stm32_chan_free(priv, (int)ep);
+      stm32l4_chan_free(priv, (int)ep);
     }
   else
     {
       /* Halt both control channel and mark the channels available */
 
-      FAR struct stm32_ctrlinfo_s *ctrlep = (FAR struct stm32_ctrlinfo_s *)ep;
-      stm32_chan_free(priv, ctrlep->inndx);
-      stm32_chan_free(priv, ctrlep->outndx);
+      FAR struct stm32l4_ctrlinfo_s *ctrlep = (FAR struct stm32l4_ctrlinfo_s *)ep;
+      stm32l4_chan_free(priv, ctrlep->inndx);
+      stm32l4_chan_free(priv, ctrlep->outndx);
 
       /* And free the control endpoint container */
 
       kmm_free(ctrlep);
     }
 
-  stm32_givesem(&priv->exclsem);
+  stm32l4_givesem(&priv->exclsem);
   return OK;
 }
 
 /****************************************************************************
- * Name: stm32_alloc
+ * Name: stm32l4_alloc
  *
  * Description:
  *   Some hardware supports special memory in which request and descriptor data can
@@ -4130,7 +4130,7 @@ static int stm32_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep)
  *
  ****************************************************************************/
 
-static int stm32_alloc(FAR struct usbhost_driver_s *drvr,
+static int stm32l4_alloc(FAR struct usbhost_driver_s *drvr,
                        FAR uint8_t **buffer, FAR size_t *maxlen)
 {
   FAR uint8_t *alloc;
@@ -4139,7 +4139,7 @@ static int stm32_alloc(FAR struct usbhost_driver_s *drvr,
 
   /* There is no special memory requirement for the STM32. */
 
-  alloc = (FAR uint8_t *)kmm_malloc(CONFIG_STM32_OTGFS_DESCSIZE);
+  alloc = (FAR uint8_t *)kmm_malloc(CONFIG_STM32L4_OTGFS_DESCSIZE);
   if (!alloc)
     {
       return -ENOMEM;
@@ -4148,12 +4148,12 @@ static int stm32_alloc(FAR struct usbhost_driver_s *drvr,
   /* Return the allocated address and size of the descriptor buffer */
 
   *buffer = alloc;
-  *maxlen = CONFIG_STM32_OTGFS_DESCSIZE;
+  *maxlen = CONFIG_STM32L4_OTGFS_DESCSIZE;
   return OK;
 }
 
 /****************************************************************************
- * Name: stm32_free
+ * Name: stm32l4_free
  *
  * Description:
  *   Some hardware supports special memory in which request and descriptor data can
@@ -4175,7 +4175,7 @@ static int stm32_alloc(FAR struct usbhost_driver_s *drvr,
  *
  ****************************************************************************/
 
-static int stm32_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer)
+static int stm32l4_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer)
 {
   /* There is no special memory requirement */
 
@@ -4185,7 +4185,7 @@ static int stm32_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer)
 }
 
 /************************************************************************************
- * Name: stm32_ioalloc
+ * Name: stm32l4_ioalloc
  *
  * Description:
  *   Some hardware supports special memory in which larger IO buffers can
@@ -4211,7 +4211,7 @@ static int stm32_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer)
  *
  ************************************************************************************/
 
-static int stm32_ioalloc(FAR struct usbhost_driver_s *drvr,
+static int stm32l4_ioalloc(FAR struct usbhost_driver_s *drvr,
                          FAR uint8_t **buffer, size_t buflen)
 {
   FAR uint8_t *alloc;
@@ -4233,7 +4233,7 @@ static int stm32_ioalloc(FAR struct usbhost_driver_s *drvr,
 }
 
 /************************************************************************************
- * Name: stm32_iofree
+ * Name: stm32l4_iofree
  *
  * Description:
  *   Some hardware supports special memory in which IO data can  be accessed more
@@ -4255,7 +4255,7 @@ static int stm32_ioalloc(FAR struct usbhost_driver_s *drvr,
  *
  ************************************************************************************/
 
-static int stm32_iofree(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer)
+static int stm32l4_iofree(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer)
 {
   /* There is no special memory requirement */
 
@@ -4265,7 +4265,7 @@ static int stm32_iofree(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer)
 }
 
 /****************************************************************************
- * Name: stm32_ctrlin and stm32_ctrlout
+ * Name: stm32l4_ctrlin and stm32l4_ctrlout
  *
  * Description:
  *   Process a IN or OUT request on the control endpoint.  These methods
@@ -4299,12 +4299,12 @@ static int stm32_iofree(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer)
  *
  ****************************************************************************/
 
-static int stm32_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
+static int stm32l4_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
                         FAR const struct usb_ctrlreq_s *req,
                         FAR uint8_t *buffer)
 {
-  FAR struct stm32_usbhost_s *priv = (FAR struct stm32_usbhost_s *)drvr;
-  FAR struct stm32_ctrlinfo_s *ep0info = (FAR struct stm32_ctrlinfo_s *)ep0;
+  FAR struct stm32l4_usbhost_s *priv = (FAR struct stm32l4_usbhost_s *)drvr;
+  FAR struct stm32l4_ctrlinfo_s *ep0info = (FAR struct stm32l4_ctrlinfo_s *)ep0;
   uint16_t buflen;
   systime_t start;
   systime_t elapsed;
@@ -4319,19 +4319,19 @@ static int stm32_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
 
   /* Extract values from the request */
 
-  buflen = stm32_getle16(req->len);
+  buflen = stm32l4_getle16(req->len);
 
   /* We must have exclusive access to the USB host hardware and state structures */
 
-  stm32_takesem(&priv->exclsem);
+  stm32l4_takesem(&priv->exclsem);
 
   /* Loop, retrying until the retry time expires */
 
-  for (retries = 0; retries < STM32_RETRY_COUNT; retries++)
+  for (retries = 0; retries < STM32L4_RETRY_COUNT; retries++)
     {
       /* Send the SETUP request */
 
-      ret = stm32_ctrl_sendsetup(priv, ep0info, req);
+      ret = stm32l4_ctrl_sendsetup(priv, ep0info, req);
       if (ret < 0)
         {
           usbhost_trace1(OTGFS_TRACE1_SENDSETUP, -ret);
@@ -4347,7 +4347,7 @@ static int stm32_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
 
           if (buflen > 0)
             {
-              ret = stm32_ctrl_recvdata(priv, ep0info, buffer, buflen);
+              ret = stm32l4_ctrl_recvdata(priv, ep0info, buffer, buflen);
               if (ret < 0)
                 {
                   usbhost_trace1(OTGFS_TRACE1_RECVDATA, -ret);
@@ -4359,12 +4359,12 @@ static int stm32_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
           if (ret == OK)
             {
               priv->chan[ep0info->outndx].outdata1 ^= true;
-              ret = stm32_ctrl_senddata(priv, ep0info, NULL, 0);
+              ret = stm32l4_ctrl_senddata(priv, ep0info, NULL, 0);
               if (ret == OK)
                 {
                   /* All success transactions exit here */
 
-                  stm32_givesem(&priv->exclsem);
+                  stm32l4_givesem(&priv->exclsem);
                   return OK;
                 }
 
@@ -4375,21 +4375,21 @@ static int stm32_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
 
           elapsed = clock_systimer() - start;
         }
-      while (elapsed < STM32_DATANAK_DELAY);
+      while (elapsed < STM32L4_DATANAK_DELAY);
     }
 
   /* All failures exit here after all retries and timeouts have been exhausted */
 
-  stm32_givesem(&priv->exclsem);
+  stm32l4_givesem(&priv->exclsem);
   return -ETIMEDOUT;
 }
 
-static int stm32_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
+static int stm32l4_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
                          FAR const struct usb_ctrlreq_s *req,
                          FAR const uint8_t *buffer)
 {
-  FAR struct stm32_usbhost_s *priv = (FAR struct stm32_usbhost_s *)drvr;
-  FAR struct stm32_ctrlinfo_s *ep0info = (FAR struct stm32_ctrlinfo_s *)ep0;
+  FAR struct stm32l4_usbhost_s *priv = (FAR struct stm32l4_usbhost_s *)drvr;
+  FAR struct stm32l4_ctrlinfo_s *ep0info = (FAR struct stm32l4_ctrlinfo_s *)ep0;
   uint16_t buflen;
   systime_t start;
   systime_t elapsed;
@@ -4404,19 +4404,19 @@ static int stm32_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
 
   /* Extract values from the request */
 
-  buflen = stm32_getle16(req->len);
+  buflen = stm32l4_getle16(req->len);
 
   /* We must have exclusive access to the USB host hardware and state structures */
 
-  stm32_takesem(&priv->exclsem);
+  stm32l4_takesem(&priv->exclsem);
 
   /* Loop, retrying until the retry time expires */
 
-  for (retries = 0; retries < STM32_RETRY_COUNT; retries++)
+  for (retries = 0; retries < STM32L4_RETRY_COUNT; retries++)
     {
       /* Send the SETUP request */
 
-      ret = stm32_ctrl_sendsetup(priv, ep0info, req);
+      ret = stm32l4_ctrl_sendsetup(priv, ep0info, req);
       if (ret < 0)
         {
           usbhost_trace1(OTGFS_TRACE1_SENDSETUP, -ret);
@@ -4435,7 +4435,7 @@ static int stm32_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
               /* Start DATA out transfer (only one DATA packet) */
 
               priv->chan[ep0info->outndx].outdata1 = true;
-              ret = stm32_ctrl_senddata(priv, ep0info, NULL, 0);
+              ret = stm32l4_ctrl_senddata(priv, ep0info, NULL, 0);
               if (ret < 0)
                 {
                   usbhost_trace1(OTGFS_TRACE1_SENDDATA, -ret);
@@ -4446,12 +4446,12 @@ static int stm32_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
 
           if (ret == OK)
             {
-              ret = stm32_ctrl_recvdata(priv, ep0info, NULL, 0);
+              ret = stm32l4_ctrl_recvdata(priv, ep0info, NULL, 0);
               if (ret == OK)
                 {
                   /* All success transactins exit here */
 
-                  stm32_givesem(&priv->exclsem);
+                  stm32l4_givesem(&priv->exclsem);
                   return OK;
                 }
 
@@ -4462,17 +4462,17 @@ static int stm32_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
 
           elapsed = clock_systimer() - start;
         }
-      while (elapsed < STM32_DATANAK_DELAY);
+      while (elapsed < STM32L4_DATANAK_DELAY);
     }
 
   /* All failures exit here after all retries and timeouts have been exhausted */
 
-  stm32_givesem(&priv->exclsem);
+  stm32l4_givesem(&priv->exclsem);
   return -ETIMEDOUT;
 }
 
 /****************************************************************************
- * Name: stm32_transfer
+ * Name: stm32l4_transfer
  *
  * Description:
  *   Process a request to handle a transfer descriptor.  This method will
@@ -4509,38 +4509,38 @@ static int stm32_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
  *
  ****************************************************************************/
 
-static ssize_t stm32_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep,
+static ssize_t stm32l4_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep,
                               FAR uint8_t *buffer, size_t buflen)
 {
-  FAR struct stm32_usbhost_s *priv  = (FAR struct stm32_usbhost_s *)drvr;
+  FAR struct stm32l4_usbhost_s *priv  = (FAR struct stm32l4_usbhost_s *)drvr;
   unsigned int chidx = (unsigned int)ep;
   ssize_t nbytes;
 
   uvdbg("chidx: %d buflen: %d\n",  (unsigned int)ep, buflen);
 
-  DEBUGASSERT(priv && buffer && chidx < STM32_MAX_TX_FIFOS && buflen > 0);
+  DEBUGASSERT(priv && buffer && chidx < STM32L4_MAX_TX_FIFOS && buflen > 0);
 
   /* We must have exclusive access to the USB host hardware and state structures */
 
-  stm32_takesem(&priv->exclsem);
+  stm32l4_takesem(&priv->exclsem);
 
   /* Handle IN and OUT transfer slightly differently */
 
   if (priv->chan[chidx].in)
     {
-      nbytes = stm32_in_transfer(priv, chidx, buffer, buflen);
+      nbytes = stm32l4_in_transfer(priv, chidx, buffer, buflen);
     }
   else
     {
-      nbytes = stm32_out_transfer(priv, chidx, buffer, buflen);
+      nbytes = stm32l4_out_transfer(priv, chidx, buffer, buflen);
     }
 
-  stm32_givesem(&priv->exclsem);
+  stm32l4_givesem(&priv->exclsem);
   return nbytes;
 }
 
 /****************************************************************************
- * Name: stm32_asynch
+ * Name: stm32l4_asynch
  *
  * Description:
  *   Process a request to handle a transfer descriptor.  This method will
@@ -4575,40 +4575,40 @@ static ssize_t stm32_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep
  ****************************************************************************/
 
 #ifdef CONFIG_USBHOST_ASYNCH
-static int stm32_asynch(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep,
+static int stm32l4_asynch(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep,
                         FAR uint8_t *buffer, size_t buflen,
                         usbhost_asynch_t callback, FAR void *arg)
 {
-  FAR struct stm32_usbhost_s *priv  = (FAR struct stm32_usbhost_s *)drvr;
+  FAR struct stm32l4_usbhost_s *priv  = (FAR struct stm32l4_usbhost_s *)drvr;
   unsigned int chidx = (unsigned int)ep;
   int ret;
 
   uvdbg("chidx: %d buflen: %d\n",  (unsigned int)ep, buflen);
 
-  DEBUGASSERT(priv && buffer && chidx < STM32_MAX_TX_FIFOS && buflen > 0);
+  DEBUGASSERT(priv && buffer && chidx < STM32L4_MAX_TX_FIFOS && buflen > 0);
 
   /* We must have exclusive access to the USB host hardware and state structures */
 
-  stm32_takesem(&priv->exclsem);
+  stm32l4_takesem(&priv->exclsem);
 
   /* Handle IN and OUT transfer slightly differently */
 
   if (priv->chan[chidx].in)
     {
-      ret = stm32_in_asynch(priv, chidx, buffer, buflen, callback, arg);
+      ret = stm32l4_in_asynch(priv, chidx, buffer, buflen, callback, arg);
     }
   else
     {
-      ret = stm32_out_asynch(priv, chidx, buffer, buflen, callback, arg);
+      ret = stm32l4_out_asynch(priv, chidx, buffer, buflen, callback, arg);
     }
 
-  stm32_givesem(&priv->exclsem);
+  stm32l4_givesem(&priv->exclsem);
   return ret;
 }
 #endif /* CONFIG_USBHOST_ASYNCH */
 
 /************************************************************************************
- * Name: stm32_cancel
+ * Name: stm32l4_cancel
  *
  * Description:
  *   Cancel a pending transfer on an endpoint.  Cancelled synchronous or
@@ -4626,16 +4626,16 @@ static int stm32_asynch(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep,
  *
  ************************************************************************************/
 
-static int stm32_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep)
+static int stm32l4_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep)
 {
-  FAR struct stm32_usbhost_s *priv  = (FAR struct stm32_usbhost_s *)drvr;
-  FAR struct stm32_chan_s *chan;
+  FAR struct stm32l4_usbhost_s *priv  = (FAR struct stm32l4_usbhost_s *)drvr;
+  FAR struct stm32l4_chan_s *chan;
   unsigned int chidx = (unsigned int)ep;
   irqstate_t flags;
 
   uvdbg("chidx: %u: %d\n",  chidx);
 
-  DEBUGASSERT(priv && chidx < STM32_MAX_TX_FIFOS);
+  DEBUGASSERT(priv && chidx < STM32L4_MAX_TX_FIFOS);
   chan = &priv->chan[chidx];
 
   /* We need to disable interrupts to avoid race conditions with the asynchronous
@@ -4646,7 +4646,7 @@ static int stm32_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep)
 
   /* Halt the channel */
 
-  stm32_chan_halt(priv, chidx, CHREASON_CANCELLED);
+  stm32l4_chan_halt(priv, chidx, CHREASON_CANCELLED);
   chan->result = -ESHUTDOWN;
 
   /* Is there a thread waiting for this transfer to complete? */
@@ -4661,7 +4661,7 @@ static int stm32_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep)
 
       /* Wake'em up! */
 
-      stm32_givesem(&chan->waitsem);
+      stm32l4_givesem(&chan->waitsem);
       chan->waiter = false;
     }
 
@@ -4695,7 +4695,7 @@ static int stm32_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep)
 }
 
 /************************************************************************************
- * Name: stm32_connect
+ * Name: stm32l4_connect
  *
  * Description:
  *   New connections may be detected by an attached hub.  This method is the
@@ -4716,11 +4716,11 @@ static int stm32_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep)
  ************************************************************************************/
 
 #ifdef CONFIG_USBHOST_HUB
-static int stm32_connect(FAR struct usbhost_driver_s *drvr,
+static int stm32l4_connect(FAR struct usbhost_driver_s *drvr,
                          FAR struct usbhost_hubport_s *hport,
                          bool connected)
 {
-  FAR struct stm32_usbhost_s *priv = (FAR struct stm32_usbhost_s *)drvr;
+  FAR struct stm32l4_usbhost_s *priv = (FAR struct stm32l4_usbhost_s *)drvr;
   irqstate_t flags;
 
   DEBUGASSERT(priv != NULL && hport != NULL);
@@ -4737,7 +4737,7 @@ static int stm32_connect(FAR struct usbhost_driver_s *drvr,
   if (priv->pscwait)
     {
       priv->pscwait = false;
-      stm32_givesem(&priv->pscsem);
+      stm32l4_givesem(&priv->pscsem);
     }
 
   leave_critical_section(flags);
@@ -4746,7 +4746,7 @@ static int stm32_connect(FAR struct usbhost_driver_s *drvr,
 #endif
 
 /****************************************************************************
- * Name: stm32_disconnect
+ * Name: stm32l4_disconnect
  *
  * Description:
  *   Called by the class when an error occurs and driver has been disconnected.
@@ -4770,7 +4770,7 @@ static int stm32_connect(FAR struct usbhost_driver_s *drvr,
  *
  ****************************************************************************/
 
-static void stm32_disconnect(FAR struct usbhost_driver_s *drvr,
+static void stm32l4_disconnect(FAR struct usbhost_driver_s *drvr,
                              FAR struct usbhost_hubport_s *hport)
 {
   DEBUGASSERT(hport != NULL);
@@ -4781,7 +4781,7 @@ static void stm32_disconnect(FAR struct usbhost_driver_s *drvr,
  * Initialization
  ****************************************************************************/
 /****************************************************************************
- * Name: stm32_portreset
+ * Name: stm32l4_portreset
  *
  * Description:
  *   Reset the USB host port.
@@ -4800,26 +4800,26 @@ static void stm32_disconnect(FAR struct usbhost_driver_s *drvr,
  *
  ****************************************************************************/
 
-static void stm32_portreset(FAR struct stm32_usbhost_s *priv)
+static void stm32l4_portreset(FAR struct stm32l4_usbhost_s *priv)
 {
   uint32_t regval;
 
-  regval  = stm32_getreg(STM32_OTGFS_HPRT);
+  regval  = stm32l4_getreg(STM32L4_OTGFS_HPRT);
   regval &= ~(OTGFS_HPRT_PENA | OTGFS_HPRT_PCDET | OTGFS_HPRT_PENCHNG |
               OTGFS_HPRT_POCCHNG);
   regval |= OTGFS_HPRT_PRST;
-  stm32_putreg(STM32_OTGFS_HPRT, regval);
+  stm32l4_putreg(STM32L4_OTGFS_HPRT, regval);
 
   up_mdelay(20);
 
   regval &= ~OTGFS_HPRT_PRST;
-  stm32_putreg(STM32_OTGFS_HPRT, regval);
+  stm32l4_putreg(STM32L4_OTGFS_HPRT, regval);
 
   up_mdelay(20);
 }
 
 /****************************************************************************
- * Name: stm32_flush_txfifos
+ * Name: stm32l4_flush_txfifos
  *
  * Description:
  *   Flush the selected Tx FIFO.
@@ -4832,7 +4832,7 @@ static void stm32_portreset(FAR struct stm32_usbhost_s *priv)
  *
  ****************************************************************************/
 
-static void stm32_flush_txfifos(uint32_t txfnum)
+static void stm32l4_flush_txfifos(uint32_t txfnum)
 {
   uint32_t regval;
   uint32_t timeout;
@@ -4840,13 +4840,13 @@ static void stm32_flush_txfifos(uint32_t txfnum)
   /* Initiate the TX FIFO flush operation */
 
   regval = OTGFS_GRSTCTL_TXFFLSH | txfnum;
-  stm32_putreg(STM32_OTGFS_GRSTCTL, regval);
+  stm32l4_putreg(STM32L4_OTGFS_GRSTCTL, regval);
 
   /* Wait for the FLUSH to complete */
 
-  for (timeout = 0; timeout < STM32_FLUSH_DELAY; timeout++)
+  for (timeout = 0; timeout < STM32L4_FLUSH_DELAY; timeout++)
     {
-      regval = stm32_getreg(STM32_OTGFS_GRSTCTL);
+      regval = stm32l4_getreg(STM32L4_OTGFS_GRSTCTL);
       if ((regval & OTGFS_GRSTCTL_TXFFLSH) == 0)
         {
           break;
@@ -4859,7 +4859,7 @@ static void stm32_flush_txfifos(uint32_t txfnum)
 }
 
 /****************************************************************************
- * Name: stm32_flush_rxfifo
+ * Name: stm32l4_flush_rxfifo
  *
  * Description:
  *   Flush the Rx FIFO.
@@ -4872,20 +4872,20 @@ static void stm32_flush_txfifos(uint32_t txfnum)
  *
  ****************************************************************************/
 
-static void stm32_flush_rxfifo(void)
+static void stm32l4_flush_rxfifo(void)
 {
   uint32_t regval;
   uint32_t timeout;
 
   /* Initiate the RX FIFO flush operation */
 
-  stm32_putreg(STM32_OTGFS_GRSTCTL, OTGFS_GRSTCTL_RXFFLSH);
+  stm32l4_putreg(STM32L4_OTGFS_GRSTCTL, OTGFS_GRSTCTL_RXFFLSH);
 
   /* Wait for the FLUSH to complete */
 
-  for (timeout = 0; timeout < STM32_FLUSH_DELAY; timeout++)
+  for (timeout = 0; timeout < STM32L4_FLUSH_DELAY; timeout++)
     {
-      regval = stm32_getreg(STM32_OTGFS_GRSTCTL);
+      regval = stm32l4_getreg(STM32L4_OTGFS_GRSTCTL);
       if ((regval & OTGFS_GRSTCTL_RXFFLSH) == 0)
         {
           break;
@@ -4898,7 +4898,7 @@ static void stm32_flush_rxfifo(void)
 }
 
 /****************************************************************************
- * Name: stm32_vbusdrive
+ * Name: stm32l4_vbusdrive
  *
  * Description:
  *   Drive the Vbus +5V.
@@ -4912,41 +4912,41 @@ static void stm32_flush_rxfifo(void)
  *
  ****************************************************************************/
 
-static void stm32_vbusdrive(FAR struct stm32_usbhost_s *priv, bool state)
+static void stm32l4_vbusdrive(FAR struct stm32l4_usbhost_s *priv, bool state)
 {
   uint32_t regval;
 
   /* Enable/disable the external charge pump */
 
-  stm32_usbhost_vbusdrive(0, state);
+  stm32l4_usbhost_vbusdrive(0, state);
 
   /* Turn on the Host port power. */
 
-  regval = stm32_getreg(STM32_OTGFS_HPRT);
+  regval = stm32l4_getreg(STM32L4_OTGFS_HPRT);
   regval &= ~(OTGFS_HPRT_PENA | OTGFS_HPRT_PCDET | OTGFS_HPRT_PENCHNG |
               OTGFS_HPRT_POCCHNG);
 
   if (((regval & OTGFS_HPRT_PPWR) == 0) && state)
     {
       regval |= OTGFS_HPRT_PPWR;
-      stm32_putreg(STM32_OTGFS_HPRT, regval);
+      stm32l4_putreg(STM32L4_OTGFS_HPRT, regval);
     }
 
   if (((regval & OTGFS_HPRT_PPWR) != 0) && !state)
     {
       regval &= ~OTGFS_HPRT_PPWR;
-      stm32_putreg(STM32_OTGFS_HPRT, regval);
+      stm32l4_putreg(STM32L4_OTGFS_HPRT, regval);
     }
 
   up_mdelay(200);
 }
 
 /****************************************************************************
- * Name: stm32_host_initialize
+ * Name: stm32l4_host_initialize
  *
  * Description:
  *   Initialize/re-initialize hardware for host mode operation.  At present,
- *   this function is called only from stm32_hw_initialize().  But if OTG mode
+ *   this function is called only from stm32l4_hw_initialize().  But if OTG mode
  *   were supported, this function would also be called to swtich between
  *   host and device modes on a connector ID change interrupt.
  *
@@ -4958,7 +4958,7 @@ static void stm32_vbusdrive(FAR struct stm32_usbhost_s *priv, bool state)
  *
  ****************************************************************************/
 
-static void stm32_host_initialize(FAR struct stm32_usbhost_s *priv)
+static void stm32l4_host_initialize(FAR struct stm32l4_usbhost_s *priv)
 {
   uint32_t regval;
   uint32_t offset;
@@ -4966,41 +4966,41 @@ static void stm32_host_initialize(FAR struct stm32_usbhost_s *priv)
 
   /* Restart the PHY Clock */
 
-  stm32_putreg(STM32_OTGFS_PCGCCTL, 0);
+  stm32l4_putreg(STM32L4_OTGFS_PCGCCTL, 0);
 
   /* Initialize Host Configuration (HCFG) register */
 
-  regval  = stm32_getreg(STM32_OTGFS_HCFG);
+  regval  = stm32l4_getreg(STM32L4_OTGFS_HCFG);
   regval &= ~OTGFS_HCFG_FSLSPCS_MASK;
   regval |= OTGFS_HCFG_FSLSPCS_FS48MHz;
-  stm32_putreg(STM32_OTGFS_HCFG, regval);
+  stm32l4_putreg(STM32L4_OTGFS_HCFG, regval);
 
   /* Reset the host port */
 
-  stm32_portreset(priv);
+  stm32l4_portreset(priv);
 
   /* Clear the FS-/LS-only support bit in the HCFG register */
 
-  regval = stm32_getreg(STM32_OTGFS_HCFG);
+  regval = stm32l4_getreg(STM32L4_OTGFS_HCFG);
   regval &= ~OTGFS_HCFG_FSLSS;
-  stm32_putreg(STM32_OTGFS_HCFG, regval);
+  stm32l4_putreg(STM32L4_OTGFS_HCFG, regval);
 
   /* Carve up FIFO memory for the Rx FIFO and the periodic and non-periodic Tx FIFOs */
   /* Configure Rx FIFO size (GRXFSIZ) */
 
-  stm32_putreg(STM32_OTGFS_GRXFSIZ, CONFIG_STM32_OTGFS_RXFIFO_SIZE);
-  offset = CONFIG_STM32_OTGFS_RXFIFO_SIZE;
+  stm32l4_putreg(STM32L4_OTGFS_GRXFSIZ, CONFIG_STM32L4_OTGFS_RXFIFO_SIZE);
+  offset = CONFIG_STM32L4_OTGFS_RXFIFO_SIZE;
 
   /* Setup the host non-periodic Tx FIFO size (HNPTXFSIZ) */
 
-  regval = (offset | (CONFIG_STM32_OTGFS_NPTXFIFO_SIZE << OTGFS_HNPTXFSIZ_NPTXFD_SHIFT));
-  stm32_putreg(STM32_OTGFS_HNPTXFSIZ, regval);
-  offset += CONFIG_STM32_OTGFS_NPTXFIFO_SIZE;
+  regval = (offset | (CONFIG_STM32L4_OTGFS_NPTXFIFO_SIZE << OTGFS_HNPTXFSIZ_NPTXFD_SHIFT));
+  stm32l4_putreg(STM32L4_OTGFS_HNPTXFSIZ, regval);
+  offset += CONFIG_STM32L4_OTGFS_NPTXFIFO_SIZE;
 
   /* Set up the host periodic Tx fifo size register (HPTXFSIZ) */
 
-  regval = (offset | (CONFIG_STM32_OTGFS_PTXFIFO_SIZE << OTGFS_HPTXFSIZ_PTXFD_SHIFT));
-  stm32_putreg(STM32_OTGFS_HPTXFSIZ, regval);
+  regval = (offset | (CONFIG_STM32L4_OTGFS_PTXFIFO_SIZE << OTGFS_HPTXFSIZ_PTXFD_SHIFT));
+  stm32l4_putreg(STM32L4_OTGFS_HPTXFSIZ, regval);
 
   /* If OTG were supported, we sould need to clear HNP enable bit in the
    * USB_OTG control register about here.
@@ -5008,30 +5008,30 @@ static void stm32_host_initialize(FAR struct stm32_usbhost_s *priv)
 
   /* Flush all FIFOs */
 
-  stm32_flush_txfifos(OTGFS_GRSTCTL_TXFNUM_HALL);
-  stm32_flush_rxfifo();
+  stm32l4_flush_txfifos(OTGFS_GRSTCTL_TXFNUM_HALL);
+  stm32l4_flush_rxfifo();
 
   /* Clear all pending HC Interrupts */
 
-  for (i = 0; i < STM32_NHOST_CHANNELS; i++)
+  for (i = 0; i < STM32L4_NHOST_CHANNELS; i++)
     {
-      stm32_putreg(STM32_OTGFS_HCINT(i), 0xffffffff);
-      stm32_putreg(STM32_OTGFS_HCINTMSK(i), 0);
+      stm32l4_putreg(STM32L4_OTGFS_HCINT(i), 0xffffffff);
+      stm32l4_putreg(STM32L4_OTGFS_HCINTMSK(i), 0);
     }
 
   /* Driver Vbus +5V (the smoke test).  Should be done elsewhere in OTG
    * mode.
    */
 
-  stm32_vbusdrive(priv, true);
+  stm32l4_vbusdrive(priv, true);
 
   /* Enable host interrupts */
 
-  stm32_hostinit_enable();
+  stm32l4_hostinit_enable();
 }
 
 /****************************************************************************
- * Name: stm32_sw_initialize
+ * Name: stm32l4_sw_initialize
  *
  * Description:
  *   One-time setup of the host driver state structure.
@@ -5044,7 +5044,7 @@ static void stm32_host_initialize(FAR struct stm32_usbhost_s *priv)
  *
  ****************************************************************************/
 
-static inline void stm32_sw_initialize(FAR struct stm32_usbhost_s *priv)
+static inline void stm32l4_sw_initialize(FAR struct stm32l4_usbhost_s *priv)
 {
   FAR struct usbhost_driver_s *drvr;
   FAR struct usbhost_hubport_s *hport;
@@ -5053,24 +5053,24 @@ static inline void stm32_sw_initialize(FAR struct stm32_usbhost_s *priv)
   /* Initialize the device operations */
 
   drvr                 = &priv->drvr;
-  drvr->ep0configure   = stm32_ep0configure;
-  drvr->epalloc        = stm32_epalloc;
-  drvr->epfree         = stm32_epfree;
-  drvr->alloc          = stm32_alloc;
-  drvr->free           = stm32_free;
-  drvr->ioalloc        = stm32_ioalloc;
-  drvr->iofree         = stm32_iofree;
-  drvr->ctrlin         = stm32_ctrlin;
-  drvr->ctrlout        = stm32_ctrlout;
-  drvr->transfer       = stm32_transfer;
+  drvr->ep0configure   = stm32l4_ep0configure;
+  drvr->epalloc        = stm32l4_epalloc;
+  drvr->epfree         = stm32l4_epfree;
+  drvr->alloc          = stm32l4_alloc;
+  drvr->free           = stm32l4_free;
+  drvr->ioalloc        = stm32l4_ioalloc;
+  drvr->iofree         = stm32l4_iofree;
+  drvr->ctrlin         = stm32l4_ctrlin;
+  drvr->ctrlout        = stm32l4_ctrlout;
+  drvr->transfer       = stm32l4_transfer;
 #ifdef CONFIG_USBHOST_ASYNCH
-  drvr->asynch         = stm32_asynch;
+  drvr->asynch         = stm32l4_asynch;
 #endif
-  drvr->cancel         = stm32_cancel;
+  drvr->cancel         = stm32l4_cancel;
 #ifdef CONFIG_USBHOST_HUB
-  drvr->connect        = stm32_connect;
+  drvr->connect        = stm32l4_connect;
 #endif
-  drvr->disconnect     = stm32_disconnect;
+  drvr->disconnect     = stm32l4_disconnect;
 
   /* Initialize the public port representation */
 
@@ -5099,20 +5099,20 @@ static inline void stm32_sw_initialize(FAR struct stm32_usbhost_s *priv)
 
   /* Put all of the channels back in their initial, allocated state */
 
-  memset(priv->chan, 0, STM32_MAX_TX_FIFOS * sizeof(struct stm32_chan_s));
+  memset(priv->chan, 0, STM32L4_MAX_TX_FIFOS * sizeof(struct stm32l4_chan_s));
 
   /* Initialize each channel */
 
-  for (i = 0; i < STM32_MAX_TX_FIFOS; i++)
+  for (i = 0; i < STM32L4_MAX_TX_FIFOS; i++)
     {
-      FAR struct stm32_chan_s *chan = &priv->chan[i];
+      FAR struct stm32l4_chan_s *chan = &priv->chan[i];
       chan->chidx = i;
       sem_init(&chan->waitsem,  0, 0);
     }
 }
 
 /****************************************************************************
- * Name: stm32_hw_initialize
+ * Name: stm32l4_hw_initialize
  *
  * Description:
  *   One-time setup of the host controller harware for normal operations.
@@ -5125,7 +5125,7 @@ static inline void stm32_sw_initialize(FAR struct stm32_usbhost_s *priv)
  *
  ****************************************************************************/
 
-static inline int stm32_hw_initialize(FAR struct stm32_usbhost_s *priv)
+static inline int stm32l4_hw_initialize(FAR struct stm32l4_usbhost_s *priv)
 {
   uint32_t regval;
   unsigned long timeout;
@@ -5134,18 +5134,18 @@ static inline int stm32_hw_initialize(FAR struct stm32_usbhost_s *priv)
    * transceiver: "This bit is always 1 with write-only access"
    */
 
-  regval = stm32_getreg(STM32_OTGFS_GUSBCFG);
+  regval = stm32l4_getreg(STM32L4_OTGFS_GUSBCFG);
   regval |= OTGFS_GUSBCFG_PHYSEL;
-  stm32_putreg(STM32_OTGFS_GUSBCFG, regval);
+  stm32l4_putreg(STM32L4_OTGFS_GUSBCFG, regval);
 
   /* Reset after a PHY select and set Host mode.  First, wait for AHB master
    * IDLE state.
    */
 
-  for (timeout = 0; timeout < STM32_READY_DELAY; timeout++)
+  for (timeout = 0; timeout < STM32L4_READY_DELAY; timeout++)
     {
       up_udelay(3);
-      regval = stm32_getreg(STM32_OTGFS_GRSTCTL);
+      regval = stm32l4_getreg(STM32L4_OTGFS_GRSTCTL);
       if ((regval & OTGFS_GRSTCTL_AHBIDL) != 0)
         {
           break;
@@ -5154,10 +5154,10 @@ static inline int stm32_hw_initialize(FAR struct stm32_usbhost_s *priv)
 
   /* Then perform the core soft reset. */
 
-  stm32_putreg(STM32_OTGFS_GRSTCTL, OTGFS_GRSTCTL_CSRST);
-  for (timeout = 0; timeout < STM32_READY_DELAY; timeout++)
+  stm32l4_putreg(STM32L4_OTGFS_GRSTCTL, OTGFS_GRSTCTL_CSRST);
+  for (timeout = 0; timeout < STM32L4_READY_DELAY; timeout++)
     {
-      regval = stm32_getreg(STM32_OTGFS_GRSTCTL);
+      regval = stm32l4_getreg(STM32L4_OTGFS_GRSTCTL);
       if ((regval & OTGFS_GRSTCTL_CSRST) == 0)
         {
           break;
@@ -5174,10 +5174,10 @@ static inline int stm32_hw_initialize(FAR struct stm32_usbhost_s *priv)
 #ifndef CONFIG_USBDEV_VBUSSENSING
   regval |= OTGFS_GCCFG_NOVBUSSENS;
 #endif
-#ifdef CONFIG_STM32_OTGFS_SOFOUTPUT
+#ifdef CONFIG_STM32L4_OTGFS_SOFOUTPUT
   regval |= OTGFS_GCCFG_SOFOUTEN;
 #endif
-  stm32_putreg(STM32_OTGFS_GCCFG, regval);
+  stm32l4_putreg(STM32L4_OTGFS_GCCFG, regval);
   up_mdelay(20);
 
   /* Initialize OTG features:  In order to support OTP, the HNPCAP and SRPCAP
@@ -5186,15 +5186,15 @@ static inline int stm32_hw_initialize(FAR struct stm32_usbhost_s *priv)
 
   /* Force Host Mode */
 
-  regval  = stm32_getreg(STM32_OTGFS_GUSBCFG);
+  regval  = stm32l4_getreg(STM32L4_OTGFS_GUSBCFG);
   regval &= ~OTGFS_GUSBCFG_FDMOD;
   regval |= OTGFS_GUSBCFG_FHMOD;
-  stm32_putreg(STM32_OTGFS_GUSBCFG, regval);
+  stm32l4_putreg(STM32L4_OTGFS_GUSBCFG, regval);
   up_mdelay(50);
 
   /* Initialize host mode and return success */
 
-  stm32_host_initialize(priv);
+  stm32l4_host_initialize(priv);
   return OK;
 }
 
@@ -5203,7 +5203,7 @@ static inline int stm32_hw_initialize(FAR struct stm32_usbhost_s *priv)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: stm32_otgfshost_initialize
+ * Name: stm32l4_otgfshost_initialize
  *
  * Description:
  *   Initialize USB host device controller hardware.
@@ -5227,7 +5227,7 @@ static inline int stm32_hw_initialize(FAR struct stm32_usbhost_s *priv)
  *
  ****************************************************************************/
 
-FAR struct usbhost_connection_s *stm32_otgfshost_initialize(int controller)
+FAR struct usbhost_connection_s *stm32l4_otgfshost_initialize(int controller)
 {
   /* At present, there is only support for a single OTG FS host. Hence it is
    * pre-allocated as g_usbhost.  However, in most code, the private data
@@ -5235,7 +5235,7 @@ FAR struct usbhost_connection_s *stm32_otgfshost_initialize(int controller)
    * global data) in order to simplify any future support for multiple devices.
    */
 
-  FAR struct stm32_usbhost_s *priv = &g_usbhost;
+  FAR struct stm32l4_usbhost_s *priv = &g_usbhost;
 
   /* Sanity checks */
 
@@ -5243,11 +5243,11 @@ FAR struct usbhost_connection_s *stm32_otgfshost_initialize(int controller)
 
   /* Make sure that interrupts from the OTG FS core are disabled */
 
-  stm32_gint_disable();
+  stm32l4_gint_disable();
 
   /* Reset the state of the host driver */
 
-  stm32_sw_initialize(priv);
+  stm32l4_sw_initialize(priv);
 
   /* Alternate function pin configuration.  Here we assume that:
    *
@@ -5272,23 +5272,23 @@ FAR struct usbhost_connection_s *stm32_otgfshost_initialize(int controller)
    * *Pins may vary from device-to-device.
    */
 
-  stm32_configgpio(GPIO_OTGFS_DM);
-  stm32_configgpio(GPIO_OTGFS_DP);
-  stm32_configgpio(GPIO_OTGFS_ID);    /* Only needed for OTG */
+  stm32l4_configgpio(GPIO_OTGFS_DM);
+  stm32l4_configgpio(GPIO_OTGFS_DP);
+  stm32l4_configgpio(GPIO_OTGFS_ID);    /* Only needed for OTG */
 
   /* SOF output pin configuration is configurable */
 
-#ifdef CONFIG_STM32_OTGFS_SOFOUTPUT
-  stm32_configgpio(GPIO_OTGFS_SOF);
+#ifdef CONFIG_STM32L4_OTGFS_SOFOUTPUT
+  stm32l4_configgpio(GPIO_OTGFS_SOF);
 #endif
 
   /* Initialize the USB OTG FS core */
 
-  stm32_hw_initialize(priv);
+  stm32l4_hw_initialize(priv);
 
   /* Attach USB host controller interrupt handler */
 
-  if (irq_attach(STM32_IRQ_OTGFS, stm32_gint_isr) != 0)
+  if (irq_attach(STM32L4_IRQ_OTGFS, stm32l4_gint_isr) != 0)
     {
       usbhost_trace1(OTGFS_TRACE1_IRQATTACH, 0);
       return NULL;
@@ -5296,12 +5296,12 @@ FAR struct usbhost_connection_s *stm32_otgfshost_initialize(int controller)
 
   /* Enable USB OTG FS global interrupts */
 
-  stm32_gint_enable();
+  stm32l4_gint_enable();
 
   /* Enable interrupts at the interrupt controller */
 
-  up_enable_irq(STM32_IRQ_OTGFS);
+  up_enable_irq(STM32L4_IRQ_OTGFS);
   return &g_usbconn;
 }
 
-#endif /* CONFIG_USBHOST && CONFIG_STM32_OTGFS */
+#endif /* CONFIG_USBHOST && CONFIG_STM32L4_OTGFS */
-- 
GitLab


From 4f5d22c940c10edf8caf2ddf91e49046af2fa857 Mon Sep 17 00:00:00 2001
From: Sebastien Lorquet 
Date: Tue, 12 Jul 2016 00:03:38 +0200
Subject: [PATCH 205/229] fix a typo

---
 arch/arm/src/stm32l4/stm32l4_freerun.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/src/stm32l4/stm32l4_freerun.c b/arch/arm/src/stm32l4/stm32l4_freerun.c
index a11df0ba0e..6ffda5ac21 100644
--- a/arch/arm/src/stm32l4/stm32l4_freerun.c
+++ b/arch/arm/src/stm32l4/stm32l4_freerun.c
@@ -1,4 +1,4 @@
-s/****************************************************************************
+/****************************************************************************
  * arch/arm/src/stm32l4/stm32l4_freerun.c
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
-- 
GitLab


From d37c5718aa371c301f798cfd75e88256b4ad6dbf Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 11 Jul 2016 16:04:07 -0600
Subject: [PATCH 206/229] Update README.txt

---
 configs/freedom-k64f/README.txt | 35 +++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/configs/freedom-k64f/README.txt b/configs/freedom-k64f/README.txt
index 9ef9660763..87519c37fa 100644
--- a/configs/freedom-k64f/README.txt
+++ b/configs/freedom-k64f/README.txt
@@ -10,6 +10,7 @@ Contents
   o Freedom K64F Features
   o Serial Console
   o LEDs and Buttons
+  o Ethernet
   o Development Environment
   o GNU Toolchain Options
 
@@ -125,6 +126,40 @@ LEDs and Buttons
   SW2       PTC6/SPI0_SOUT/PD0_EXTRG/I2S0_RX_BCLK/FB_AD9/I2S0_MCLK/LLWU_P10
   SW3       PTA4/FTM0_CH1/NMI_b/LLWU_P3
 
+Ethernet
+========
+
+  ------------ ----------------- --------------------------------------------
+  KSZ8081      Board Signal(s)   K64F Pin
+  Pin Signal                     Function
+  --- -------- ----------------- --------------------------------------------
+   1  VDD_1V2  VDDPLL_1.2V       ---
+   2  VDDA_3V3 VDDA_ENET         ---
+   3  RXM      ENET1_RX-         ---
+   4  RXP      ENET1_RX+         ---
+   5  TXM      ENET1_TX-         ---
+   6  TXP      ENET1_TX+         ---
+   7  X0       RMII_XTAL0        ---
+   8  XI       RMII_XTAL1        ---
+   9  REXT     ---               ---, Apparently not connected
+  10  MDIO     RMII0_MDIO        PTB0/RMII0_MDIO
+  11  MDC      RMII0_MDC         PTB1/RMII0_MDC
+  12  RXD1     RMII0_RXD_1       PTA12/RMII0_RXD1
+  13  RXD0     RMII0_RXD_0       PTA13/RMII0_RXD0
+  14  VDDIO    VDDIO_ENET        ---
+  15  CRS_DIV                    PTA14/RMII0_CRS_DV
+  16  REF_CLK  RMII_RXCLK        PTA18/EXTAL0, PHY clock input
+  17  RXER     RMII0_RXER        PTA5/RMII0_RXER
+  18  INTRP    RMII0_INT_B,      J14 Pin 2, Apparently not available unless jumpered
+               PHY_INT_1
+  19  TXEN     RMII0_TXEN        PTA15/RMII0_TXEN
+  20  TXD0     RMII0_TXD_0       PTA16/RMII0_TXD0
+  21  TXD1     RMII0_TXD_1       PTA17/RMII0_TXD1
+  22  GND1     ---               ---
+  24  nRST     PHY_RST_B         ---
+  25  GND2     ---               ---
+  --- -------- ----------------- --------------------------------------------
+
 Development Environment
 =======================
 
-- 
GitLab


From 749b54fbda0bcdf452f3d8c661291bcad9fd55da Mon Sep 17 00:00:00 2001
From: Sebastien Lorquet 
Date: Tue, 12 Jul 2016 00:16:08 +0200
Subject: [PATCH 207/229] PR fixes for oneshoot and freerun

---
 arch/arm/src/stm32l4/stm32l4_freerun.c | 16 ++++++++--------
 arch/arm/src/stm32l4/stm32l4_oneshot.c | 23 ++++++++++++-----------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/arch/arm/src/stm32l4/stm32l4_freerun.c b/arch/arm/src/stm32l4/stm32l4_freerun.c
index 6ffda5ac21..1a653b4965 100644
--- a/arch/arm/src/stm32l4/stm32l4_freerun.c
+++ b/arch/arm/src/stm32l4/stm32l4_freerun.c
@@ -57,7 +57,7 @@
  * Private Functions
  ****************************************************************************/
 
-static struct stm32l4_freerun_s *g_freerun;
+FAR static struct stm32l4_freerun_s *g_freerun;
 
 /****************************************************************************
  * Private Functions
@@ -81,9 +81,9 @@ static struct stm32l4_freerun_s *g_freerun;
  *
  ****************************************************************************/
 
-static int stm32l4_freerun_handler(int irq, void *context)
+static int stm32l4_freerun_handler(int irq, FAR void *context)
 {
-  struct stm32l4_freerun_s *freerun = g_freerun;
+  FAR struct stm32l4_freerun_s *freerun = g_freerun;
 
   DEBUGASSERT(freerun != NULL && freerun->overflow < UINT32_MAX);
   freerun->overflow++;
@@ -115,8 +115,8 @@ static int stm32l4_freerun_handler(int irq, void *context)
  *
  ****************************************************************************/
 
-int stm32l4_freerun_initialize(struct stm32l4_freerun_s *freerun, int chan,
-                             uint16_t resolution)
+int stm32l4_freerun_initialize(FAR struct stm32l4_freerun_s *freerun, int chan,
+                               uint16_t resolution)
 {
   uint32_t frequency;
 
@@ -183,8 +183,8 @@ int stm32l4_freerun_initialize(struct stm32l4_freerun_s *freerun, int chan,
  *
  ****************************************************************************/
 
-int stm32l4_freerun_counter(struct stm32l4_freerun_s *freerun,
-                          struct timespec *ts)
+int stm32l4_freerun_counter(FAR struct stm32l4_freerun_s *freerun,
+                            FAR struct timespec *ts)
 {
   uint64_t usec;
   uint32_t counter;
@@ -275,7 +275,7 @@ int stm32l4_freerun_counter(struct stm32l4_freerun_s *freerun,
  *
  ****************************************************************************/
 
-int stm32l4_freerun_uninitialize(struct stm32l4_freerun_s *freerun)
+int stm32l4_freerun_uninitialize(FAR struct stm32l4_freerun_s *freerun)
 {
   DEBUGASSERT(freerun && freerun->tch);
 
diff --git a/arch/arm/src/stm32l4/stm32l4_oneshot.c b/arch/arm/src/stm32l4/stm32l4_oneshot.c
index 221f023155..6c8027e15c 100644
--- a/arch/arm/src/stm32l4/stm32l4_oneshot.c
+++ b/arch/arm/src/stm32l4/stm32l4_oneshot.c
@@ -83,11 +83,11 @@ static struct stm32l4_oneshot_s *g_oneshot;
  *
  ****************************************************************************/
 
-static int stm32l4_oneshot_handler(int irq, void *context)
+static int stm32l4_oneshot_handler(int irq, FAR void *context)
 {
-  struct stm32l4_oneshot_s *oneshot = g_oneshot;
+  FAR struct stm32l4_oneshot_s *oneshot = g_oneshot;
   oneshot_handler_t oneshot_handler;
-  void *oneshot_arg;
+  FAR void *oneshot_arg;
 
   tmrinfo("Expired...\n");
   DEBUGASSERT(oneshot != NULL && oneshot->handler);
@@ -138,8 +138,8 @@ static int stm32l4_oneshot_handler(int irq, void *context)
  *
  ****************************************************************************/
 
-int stm32l4_oneshot_initialize(struct stm32l4_oneshot_s *oneshot, int chan,
-                           uint16_t resolution)
+int stm32l4_oneshot_initialize(FAR struct stm32l4_oneshot_s *oneshot, int chan,
+                               uint16_t resolution)
 {
   uint32_t frequency;
 
@@ -181,7 +181,8 @@ int stm32l4_oneshot_initialize(struct stm32l4_oneshot_s *oneshot, int chan,
  *
  ****************************************************************************/
 
-int stm32l4_oneshot_max_delay(struct stm32l4_oneshot_s *oneshot, uint64_t *usec)
+int stm32l4_oneshot_max_delay(FAR struct stm32l4_oneshot_s *oneshot, 
+                              FAR uint64_t *usec)
 {
   DEBUGASSERT(oneshot != NULL && usec != NULL);
 
@@ -210,9 +211,9 @@ int stm32l4_oneshot_max_delay(struct stm32l4_oneshot_s *oneshot, uint64_t *usec)
  *
  ****************************************************************************/
 
-int stm32l4_oneshot_start(struct stm32l4_oneshot_s *oneshot,
-                        oneshot_handler_t handler, void *arg,
-                        const struct timespec *ts)
+int stm32l4_oneshot_start(FAR struct stm32l4_oneshot_s *oneshot,
+                          oneshot_handler_t handler, FAR void *arg,
+                          FAR const struct timespec *ts)
 {
   uint64_t usec;
   uint64_t period;
@@ -307,8 +308,8 @@ int stm32l4_oneshot_start(struct stm32l4_oneshot_s *oneshot,
  *
  ****************************************************************************/
 
-int stm32l4_oneshot_cancel(struct stm32l4_oneshot_s *oneshot,
-                         struct timespec *ts)
+int stm32l4_oneshot_cancel(FAR struct stm32l4_oneshot_s *oneshot,
+                           FAR struct timespec *ts)
 {
   irqstate_t flags;
   uint64_t usec;
-- 
GitLab


From c80b627e8d85f3f9bdec14181a1a3720392a6488 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 11 Jul 2016 16:28:54 -0600
Subject: [PATCH 208/229] Partial review of last PR

---
 arch/arm/src/stm32l4/stm32l4_otgfsdev.c | 155 +++++++++++++-----------
 1 file changed, 86 insertions(+), 69 deletions(-)

diff --git a/arch/arm/src/stm32l4/stm32l4_otgfsdev.c b/arch/arm/src/stm32l4/stm32l4_otgfsdev.c
index 6d891282c9..2ade38444f 100644
--- a/arch/arm/src/stm32l4/stm32l4_otgfsdev.c
+++ b/arch/arm/src/stm32l4/stm32l4_otgfsdev.c
@@ -119,7 +119,7 @@
 
 /* Number of endpoints */
 
-#define STM32L4_NENDPOINTS             (6)          /* ep0-5 x 2 for IN and OUT */
+#define STM32L4_NENDPOINTS  (6)          /* ep0-5 x 2 for IN and OUT */
 
 /* Adjust actual number of endpoints based upon size; 0 means 'not available',
  * and we expect that the first 0-length endpoint implies that all others
@@ -333,7 +333,7 @@
 
 /* Endpoint 0 */
 
-#define EP0                          (0)
+#define EP0                            (0)
 
 /* The set of all endpoints available to the class implementation (1-n).
  * This is a bitmap, and the first endpoint (0) is reserved.
@@ -467,8 +467,8 @@ struct stm32l4_ctrlreq_s
 
 struct stm32l4_req_s
 {
-  struct usbdev_req_s  req;           /* Standard USB request */
-  struct stm32l4_req_s  *flink;         /* Supports a singly linked list */
+  struct usbdev_req_s      req;           /* Standard USB request */
+  struct stm32l4_req_s    *flink;         /* Supports a singly linked list */
 };
 
 /* This is the internal representation of an endpoint */
@@ -480,20 +480,20 @@ struct stm32l4_ep_s
    * to struct stm32l4_ep_s.
    */
 
-  struct usbdev_ep_s      ep;          /* Standard endpoint structure */
+  struct usbdev_ep_s       ep;            /* Standard endpoint structure */
 
   /* STM32-specific fields */
 
-  struct stm32l4_usbdev_s *dev;          /* Reference to private driver data */
-  struct stm32l4_req_s    *head;         /* Request list for this endpoint */
+  struct stm32l4_usbdev_s *dev;           /* Reference to private driver data */
+  struct stm32l4_req_s    *head;          /* Request list for this endpoint */
   struct stm32l4_req_s    *tail;
-  uint8_t                epphy;        /* Physical EP address */
-  uint8_t                eptype:2;     /* Endpoint type */
-  uint8_t                active:1;     /* 1: A request is being processed */
-  uint8_t                stalled:1;    /* 1: Endpoint is stalled */
-  uint8_t                isin:1;       /* 1: IN Endpoint */
-  uint8_t                odd:1;        /* 1: Odd frame */
-  uint8_t                zlp:1;        /* 1: Transmit a zero-length-packet (IN EPs only) */
+  uint8_t                  epphy;         /* Physical EP address */
+  uint8_t                  eptype:2;      /* Endpoint type */
+  uint8_t                  active:1;      /* 1: A request is being processed */
+  uint8_t                  stalled:1;     /* 1: Endpoint is stalled */
+  uint8_t                  isin:1;        /* 1: IN Endpoint */
+  uint8_t                  odd:1;         /* 1: Odd frame */
+  uint8_t                  zlp:1;         /* 1: Transmit a zero-length-packet (IN EPs only) */
 };
 
 /* This structure retains the state of the USB device controller */
@@ -505,7 +505,7 @@ struct stm32l4_usbdev_s
    * to struct stm32l4_usbdev_s.
    */
 
-  struct usbdev_s         usbdev;
+  struct usbdev_s          usbdev;
 
   /* The bound device class driver */
 
@@ -513,17 +513,17 @@ struct stm32l4_usbdev_s
 
   /* STM32-specific fields */
 
-  uint8_t                 stalled:1;     /* 1: Protocol stalled */
-  uint8_t                 selfpowered:1; /* 1: Device is self powered */
-  uint8_t                 addressed:1;   /* 1: Peripheral address has been set */
-  uint8_t                 configured:1;  /* 1: Class driver has been configured */
-  uint8_t                 wakeup:1;      /* 1: Device remote wake-up */
-  uint8_t                 dotest:1;      /* 1: Test mode selected */
+  uint8_t                  stalled:1;     /* 1: Protocol stalled */
+  uint8_t                  selfpowered:1; /* 1: Device is self powered */
+  uint8_t                  addressed:1;   /* 1: Peripheral address has been set */
+  uint8_t                  configured:1;  /* 1: Class driver has been configured */
+  uint8_t                  wakeup:1;      /* 1: Device remote wake-up */
+  uint8_t                  dotest:1;      /* 1: Test mode selected */
 
-  uint8_t                 devstate:4;    /* See enum stm32l4_devstate_e */
-  uint8_t                 ep0state:4;    /* See enum stm32l4_ep0state_e */
-  uint8_t                 testmode:4;    /* Selected test mode */
-  uint8_t                 epavail[2];    /* Bitset of available OUT/IN endpoints */
+  uint8_t                  devstate:4;    /* See enum stm32l4_devstate_e */
+  uint8_t                  ep0state:4;    /* See enum stm32l4_ep0state_e */
+  uint8_t                  testmode:4;    /* Selected test mode */
+  uint8_t                  epavail[2];    /* Bitset of available OUT/IN endpoints */
 
   /* E0 SETUP data buffering.
    *
@@ -545,14 +545,14 @@ struct stm32l4_usbdev_s
    *   Length of OUT DATA received in ep0data[] (Not used with OUT data)
    */
 
-  struct usb_ctrlreq_s    ctrlreq;
-  uint8_t                 ep0data[CONFIG_USBDEV_SETUP_MAXDATASIZE];
-  uint16_t                ep0datlen;
+  struct usb_ctrlreq_s     ctrlreq;
+  uint8_t                  ep0data[CONFIG_USBDEV_SETUP_MAXDATASIZE];
+  uint16_t                 ep0datlen;
 
   /* The endpoint lists */
 
-  struct stm32l4_ep_s       epin[STM32L4_NENDPOINTS];
-  struct stm32l4_ep_s       epout[STM32L4_NENDPOINTS];
+  struct stm32l4_ep_s      epin[STM32L4_NENDPOINTS];
+  struct stm32l4_ep_s      epout[STM32L4_NENDPOINTS];
 };
 
 /****************************************************************************
@@ -992,7 +992,7 @@ static FAR struct stm32l4_req_s *stm32l4_req_remfirst(FAR struct stm32l4_ep_s *p
  ****************************************************************************/
 
 static bool stm32l4_req_addlast(FAR struct stm32l4_ep_s *privep,
-                              FAR struct stm32l4_req_s *req)
+                                FAR struct stm32l4_req_s *req)
 {
   bool is_empty = !privep->head;
 
@@ -1007,6 +1007,7 @@ static bool stm32l4_req_addlast(FAR struct stm32l4_ep_s *privep,
       privep->tail->flink = req;
       privep->tail        = req;
     }
+
   return is_empty;
 }
 
@@ -1019,7 +1020,7 @@ static bool stm32l4_req_addlast(FAR struct stm32l4_ep_s *privep,
  ****************************************************************************/
 
 static void stm32l4_ep0in_setupresponse(FAR struct stm32l4_usbdev_s *priv,
-                                      FAR uint8_t *buf, uint32_t nbytes)
+                                        FAR uint8_t *buf, uint32_t nbytes)
 {
   stm32l4_epin_transfer(&priv->epin[EP0], buf, nbytes);
   priv->ep0state = EP0STATE_SETUPRESPONSE;
@@ -1112,7 +1113,7 @@ static void stm32l4_ep0out_ctrlsetup(FAR struct stm32l4_usbdev_s *priv)
  ****************************************************************************/
 
 static void stm32l4_txfifo_write(FAR struct stm32l4_ep_s *privep,
-                               FAR uint8_t *buf, int nbytes)
+                                 FAR uint8_t *buf, int nbytes)
 {
   uint32_t regaddr;
   uint32_t regval;
@@ -1157,7 +1158,7 @@ static void stm32l4_txfifo_write(FAR struct stm32l4_ep_s *privep,
  ****************************************************************************/
 
 static void stm32l4_epin_transfer(FAR struct stm32l4_ep_s *privep,
-                                FAR uint8_t *buf, int nbytes)
+                                  FAR uint8_t *buf, int nbytes)
 {
   uint32_t pktcnt;
   uint32_t regval;
@@ -1257,7 +1258,7 @@ static void stm32l4_epin_transfer(FAR struct stm32l4_ep_s *privep,
  ****************************************************************************/
 
 static void stm32l4_epin_request(FAR struct stm32l4_usbdev_s *priv,
-                               FAR struct stm32l4_ep_s *privep)
+                                 FAR struct stm32l4_ep_s *privep)
 {
   struct stm32l4_req_s *privreq;
   uint32_t regaddr;
@@ -1310,8 +1311,8 @@ static void stm32l4_epin_request(FAR struct stm32l4_usbdev_s *priv,
     }
 
   uinfo("EP%d req=%p: len=%d xfrd=%d zlp=%d\n",
-          privep->epphy, privreq, privreq->req.len,
-          privreq->req.xfrd, privep->zlp);
+        privep->epphy, privreq, privreq->req.len,
+        privreq->req.xfrd, privep->zlp);
 
   /* Check for a special case:  If we are just starting a request (xfrd==0) and
    * the class driver is trying to send a zero-length packet (len==0).  Then set
@@ -1477,7 +1478,7 @@ static void stm32l4_epin_request(FAR struct stm32l4_usbdev_s *priv,
  ****************************************************************************/
 
 static void stm32l4_rxfifo_read(FAR struct stm32l4_ep_s *privep,
-                              FAR uint8_t *dest, uint16_t len)
+                                FAR uint8_t *dest, uint16_t len)
 {
   uint32_t regaddr;
   int i;
@@ -1557,7 +1558,7 @@ static void stm32l4_rxfifo_discard(FAR struct stm32l4_ep_s *privep, int len)
  ****************************************************************************/
 
 static void stm32l4_epout_complete(FAR struct stm32l4_usbdev_s *priv,
-                                 FAR struct stm32l4_ep_s *privep)
+                                   FAR struct stm32l4_ep_s *privep)
 {
   struct stm32l4_req_s *privreq;
 
@@ -1580,7 +1581,7 @@ static void stm32l4_epout_complete(FAR struct stm32l4_usbdev_s *priv,
     }
 
   uinfo("EP%d: len=%d xfrd=%d\n",
-          privep->epphy, privreq->req.len, privreq->req.xfrd);
+        privep->epphy, privreq->req.len, privreq->req.xfrd);
 
   /* Return the completed read request to the class driver and mark the state
    * IDLE.
@@ -1605,7 +1606,8 @@ static void stm32l4_epout_complete(FAR struct stm32l4_usbdev_s *priv,
  *
  ****************************************************************************/
 
-static inline void stm32l4_ep0out_receive(FAR struct stm32l4_ep_s *privep, int bcnt)
+static inline void stm32l4_ep0out_receive(FAR struct stm32l4_ep_s *privep,
+                                          int bcnt)
 {
   FAR struct stm32l4_usbdev_s *priv;
 
@@ -1663,7 +1665,8 @@ static inline void stm32l4_ep0out_receive(FAR struct stm32l4_ep_s *privep, int b
  *
  ****************************************************************************/
 
-static inline void stm32l4_epout_receive(FAR struct stm32l4_ep_s *privep, int bcnt)
+static inline void stm32l4_epout_receive(FAR struct stm32l4_ep_s *privep,
+                                         int bcnt)
 {
   struct stm32l4_req_s *privreq;
   uint8_t *dest;
@@ -1746,7 +1749,7 @@ static inline void stm32l4_epout_receive(FAR struct stm32l4_ep_s *privep, int bc
  ****************************************************************************/
 
 static void stm32l4_epout_request(FAR struct stm32l4_usbdev_s *priv,
-                                FAR struct stm32l4_ep_s *privep)
+                                  FAR struct stm32l4_ep_s *privep)
 {
   struct stm32l4_req_s *privreq;
   uint32_t regaddr;
@@ -1967,7 +1970,7 @@ static void stm32l4_req_cancel(struct stm32l4_ep_s *privep, int16_t status)
  ****************************************************************************/
 
 static struct stm32l4_ep_s *stm32l4_ep_findbyaddr(struct stm32l4_usbdev_s *priv,
-                                              uint16_t eplog)
+                                                  uint16_t eplog)
 {
   struct stm32l4_ep_s *privep;
   uint8_t epphy = USB_EPNO(eplog);
@@ -2004,7 +2007,7 @@ static struct stm32l4_ep_s *stm32l4_ep_findbyaddr(struct stm32l4_usbdev_s *priv,
  ****************************************************************************/
 
 static int stm32l4_req_dispatch(struct stm32l4_usbdev_s *priv,
-                              const struct usb_ctrlreq_s *ctrl)
+                                const struct usb_ctrlreq_s *ctrl)
 {
   int ret = -EIO;
 
@@ -2135,7 +2138,7 @@ static void stm32l4_usbreset(struct stm32l4_usbdev_s *priv)
  ****************************************************************************/
 
 static inline void stm32l4_ep0out_testmode(FAR struct stm32l4_usbdev_s *priv,
-                                         uint16_t index)
+                                           uint16_t index)
 {
   uint8_t testmode;
 
@@ -2183,7 +2186,7 @@ static inline void stm32l4_ep0out_testmode(FAR struct stm32l4_usbdev_s *priv,
  ****************************************************************************/
 
 static inline void stm32l4_ep0out_stdrequest(struct stm32l4_usbdev_s *priv,
-                                           FAR struct stm32l4_ctrlreq_s *ctrlreq)
+                                             FAR struct stm32l4_ctrlreq_s *ctrlreq)
 {
   FAR struct stm32l4_ep_s *privep;
 
@@ -2627,7 +2630,8 @@ static inline void stm32l4_ep0out_setup(struct stm32l4_usbdev_s *priv)
  *
  ****************************************************************************/
 
-static inline void stm32l4_epout(FAR struct stm32l4_usbdev_s *priv, uint8_t epno)
+static inline void stm32l4_epout(FAR struct stm32l4_usbdev_s *priv,
+                                 uint8_t epno)
 {
   FAR struct stm32l4_ep_s *privep;
 
@@ -2755,7 +2759,8 @@ static inline void stm32l4_epout_interrupt(FAR struct stm32l4_usbdev_s *priv)
 
           if ((doepint & OTGFS_DOEPINT_XFRC) != 0)
             {
-              usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_EPOUT_XFRC), (uint16_t)doepint);
+              usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_EPOUT_XFRC),
+                       (uint16_t)doepint);
 
               /* Clear the bit in DOEPINTn for this interrupt */
 
@@ -2773,7 +2778,8 @@ static inline void stm32l4_epout_interrupt(FAR struct stm32l4_usbdev_s *priv)
           /* REVISIT: */
           if ((doepint & OTGFS_DOEPINT_EPDISD) != 0)
             {
-              usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_EPOUT_EPDISD), (uint16_t)doepint);
+              usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_EPOUT_EPDISD),
+                       (uint16_t)doepint);
 
               /* Clear the bit in DOEPINTn for this interrupt */
 
@@ -2784,7 +2790,8 @@ static inline void stm32l4_epout_interrupt(FAR struct stm32l4_usbdev_s *priv)
 
           if ((doepint & OTGFS_DOEPINT_SETUP) != 0)
             {
-              usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_EPOUT_SETUP), priv->ep0state);
+              usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_EPOUT_SETUP),
+                       priv->ep0state);
 
               /* Handle the receipt of the IN SETUP packets now (OUT setup
                * packet processing may be delayed until the accompanying
@@ -2795,6 +2802,7 @@ static inline void stm32l4_epout_interrupt(FAR struct stm32l4_usbdev_s *priv)
                 {
                   stm32l4_ep0out_setup(priv);
                 }
+
               stm32l4_putreg(OTGFS_DOEPINT_SETUP, STM32L4_OTGFS_DOEPINT(epno));
             }
         }
@@ -2832,7 +2840,8 @@ static inline void stm32l4_epin_runtestmode(FAR struct stm32l4_usbdev_s *priv)
  *
  ****************************************************************************/
 
-static inline void stm32l4_epin(FAR struct stm32l4_usbdev_s *priv, uint8_t epno)
+static inline void stm32l4_epin(FAR struct stm32l4_usbdev_s *priv,
+                                uint8_t epno)
 {
   FAR struct stm32l4_ep_s *privep = &priv->epin[epno];
 
@@ -2889,7 +2898,8 @@ static inline void stm32l4_epin(FAR struct stm32l4_usbdev_s *priv, uint8_t epno)
  *
  ****************************************************************************/
 
-static inline void stm32l4_epin_txfifoempty(FAR struct stm32l4_usbdev_s *priv, int epno)
+static inline void stm32l4_epin_txfifoempty(FAR struct stm32l4_usbdev_s *priv,
+                                            int epno)
 {
   FAR struct stm32l4_ep_s *privep = &priv->epin[epno];
 
@@ -3310,7 +3320,7 @@ static inline void stm32l4_rxinterrupt(FAR struct stm32l4_usbdev_s *priv)
              */
 
             stm32l4_rxfifo_read(&priv->epout[EP0], (FAR uint8_t *)&priv->ctrlreq,
-                             USB_SIZEOF_CTRLREQ);
+                                USB_SIZEOF_CTRLREQ);
 
             /* Was this an IN or an OUT SETUP packet.  If it is an OUT SETUP,
              * then we need to wait for the completion of the data phase to
@@ -3595,7 +3605,8 @@ static int stm32l4_usbinterrupt(int irq, FAR void *context)
   /* At present, there is only a single OTG FS device support. Hence it is
    * pre-allocated as g_otgfsdev.  However, in most code, the private data
    * structure will be referenced using the 'priv' pointer (rather than the
-   * global data) in order to simplify any future support for multiple devices.
+   * global data) in order to simplify any future support for multiple
+   * devices.
    */
 
   FAR struct stm32l4_usbdev_s *priv = &g_otgfsdev;
@@ -3605,7 +3616,8 @@ static int stm32l4_usbinterrupt(int irq, FAR void *context)
 
   /* Assure that we are in device mode */
 
-  DEBUGASSERT((stm32l4_getreg(STM32L4_OTGFS_GINTSTS) & OTGFS_GINTSTS_CMOD) == OTGFS_GINTSTS_DEVMODE);
+  DEBUGASSERT((stm32l4_getreg(STM32L4_OTGFS_GINTSTS) & OTGFS_GINTSTS_CMOD) ==
+              OTGFS_GINTSTS_DEVMODE);
 
   /* Get the state of all enabled interrupts.  We will do this repeatedly
    * some interrupts (like RXFLVL) will generate additional interrupting
@@ -3627,6 +3639,7 @@ static int stm32l4_usbinterrupt(int irq, FAR void *context)
         {
           break;
         }
+
       usbtrace(TRACE_INTDECODE(STM32L4_TRACEINTID_INTPENDING), (uint16_t)regval);
 
       /* OUT endpoint interrupt. The core sets this bit to indicate that an
@@ -3862,8 +3875,8 @@ static void stm32l4_disablegonak(FAR struct stm32l4_ep_s *privep)
  *
  ****************************************************************************/
 
-static int stm32l4_epout_configure(FAR struct stm32l4_ep_s *privep, uint8_t eptype,
-                                 uint16_t maxpacket)
+static int stm32l4_epout_configure(FAR struct stm32l4_ep_s *privep,
+                                   uint8_t eptype, uint16_t maxpacket)
 {
   uint32_t mpsiz;
   uint32_t regaddr;
@@ -3958,7 +3971,7 @@ static int stm32l4_epout_configure(FAR struct stm32l4_ep_s *privep, uint8_t epty
  ****************************************************************************/
 
 static int stm32l4_epin_configure(FAR struct stm32l4_ep_s *privep, uint8_t eptype,
-                                uint16_t maxpacket)
+                                  uint16_t maxpacket)
 {
   uint32_t mpsiz;
   uint32_t regaddr;
@@ -4058,8 +4071,8 @@ static int stm32l4_epin_configure(FAR struct stm32l4_ep_s *privep, uint8_t eptyp
  ****************************************************************************/
 
 static int stm32l4_ep_configure(FAR struct usbdev_ep_s *ep,
-                              FAR const struct usb_epdesc_s *desc,
-                              bool last)
+                                FAR const struct usb_epdesc_s *desc,
+                                bool last)
 {
   FAR struct stm32l4_ep_s *privep = (FAR struct stm32l4_ep_s *)ep;
   uint16_t maxpacket;
@@ -4101,9 +4114,9 @@ static void stm32l4_ep0_configure(FAR struct stm32l4_usbdev_s *priv)
   /* Enable EP0 IN and OUT */
 
   (void)stm32l4_epin_configure(&priv->epin[EP0], USB_EP_ATTR_XFER_CONTROL,
-                             CONFIG_USBDEV_EP0_MAXSIZE);
+                               CONFIG_USBDEV_EP0_MAXSIZE);
   (void)stm32l4_epout_configure(&priv->epout[EP0], USB_EP_ATTR_XFER_CONTROL,
-                              CONFIG_USBDEV_EP0_MAXSIZE);
+                                CONFIG_USBDEV_EP0_MAXSIZE);
 }
 
 /****************************************************************************
@@ -4417,7 +4430,8 @@ static void stm32l4_ep_freebuffer(FAR struct usbdev_ep_s *ep, FAR void *buf)
  *
  ****************************************************************************/
 
-static int stm32l4_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *req)
+static int stm32l4_ep_submit(FAR struct usbdev_ep_s *ep,
+                             FAR struct usbdev_req_s *req)
 {
   FAR struct stm32l4_req_s *privreq = (FAR struct stm32l4_req_s *)req;
   FAR struct stm32l4_ep_s *privep = (FAR struct stm32l4_ep_s *)ep;
@@ -4511,7 +4525,8 @@ static int stm32l4_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s
  *
  ****************************************************************************/
 
-static int stm32l4_ep_cancel(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *req)
+static int stm32l4_ep_cancel(FAR struct usbdev_ep_s *ep,
+                             FAR struct usbdev_req_s *req)
 {
   FAR struct stm32l4_ep_s *privep = (FAR struct stm32l4_ep_s *)ep;
   irqstate_t flags;
@@ -4790,8 +4805,8 @@ static void stm32l4_ep0_stall(FAR struct stm32l4_usbdev_s *priv)
  ****************************************************************************/
 
 static FAR struct usbdev_ep_s *stm32l4_ep_alloc(FAR struct usbdev_s *dev,
-                                              uint8_t eplog, bool in,
-                                              uint8_t eptype)
+                                                uint8_t eplog, bool in,
+                                                uint8_t eptype)
 {
   FAR struct stm32l4_usbdev_s *priv = (FAR struct stm32l4_usbdev_s *)dev;
   uint8_t epavail;
@@ -4874,7 +4889,8 @@ static FAR struct usbdev_ep_s *stm32l4_ep_alloc(FAR struct usbdev_s *dev,
  *
  ****************************************************************************/
 
-static void stm32l4_ep_free(FAR struct usbdev_s *dev, FAR struct usbdev_ep_s *ep)
+static void stm32l4_ep_free(FAR struct usbdev_s *dev,
+                            FAR struct usbdev_ep_s *ep)
 {
   FAR struct stm32l4_usbdev_s *priv = (FAR struct stm32l4_usbdev_s *)dev;
   FAR struct stm32l4_ep_s *privep = (FAR struct stm32l4_ep_s *)ep;
@@ -5032,7 +5048,8 @@ static int stm32l4_pullup(struct usbdev_s *dev, bool enable)
  *
  ****************************************************************************/
 
-static void stm32l4_setaddress(struct stm32l4_usbdev_s *priv, uint16_t address)
+static void stm32l4_setaddress(struct stm32l4_usbdev_s *priv,
+                               uint16_t address)
 {
   uint32_t regval;
 
-- 
GitLab


From 9dd70ffbae1a8ba5ea5225fac279b0b38e804bc8 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Mon, 11 Jul 2016 16:54:20 -0600
Subject: [PATCH 209/229] Freedom K64F:  Green and Blue LEDs reversed

---
 arch/arm/src/kinetis/kinetis_enet.c     |  2 +-
 configs/freedom-k64f/include/board.h    | 24 ++++++++++++------------
 configs/freedom-k64f/src/freedom-k64f.h |  6 +++---
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/arch/arm/src/kinetis/kinetis_enet.c b/arch/arm/src/kinetis/kinetis_enet.c
index 4a263a8c37..b3364a6bd3 100644
--- a/arch/arm/src/kinetis/kinetis_enet.c
+++ b/arch/arm/src/kinetis/kinetis_enet.c
@@ -1448,7 +1448,7 @@ static inline void kinetis_initphy(struct kinetis_driver_s *priv)
   phydata = 0;
   kinetis_readmii(priv, CONFIG_ENET_PHYADDR, PHY_STATUS, &phydata);
 
-  /* Set up the transmit and receive contrel registers based on the
+  /* Set up the transmit and receive control registers based on the
    * configuration and the auto negotiation results.
    */
 
diff --git a/configs/freedom-k64f/include/board.h b/configs/freedom-k64f/include/board.h
index 92247416c3..7dcb29fc43 100644
--- a/configs/freedom-k64f/include/board.h
+++ b/configs/freedom-k64f/include/board.h
@@ -162,18 +162,18 @@
  * the Freedom K64F.  The following definitions describe how NuttX controls
  * the LEDs:
  *
- *   SYMBOL                Meaning                 LED state
- *                                                 RED   GREEN  BLUE
- *   -------------------  -----------------------  -----------------   */
-#define LED_STARTED       1 /* NuttX has been started    OFF  OFF  OFF */
-#define LED_HEAPALLOCATE  2 /* Heap has been allocated   OFF  OFF  ON  */
-#define LED_IRQSENABLED   0 /* Interrupts enabled        OFF  OFF  ON  */
-#define LED_STACKCREATED  3 /* Idle stack created        OFF  ON   OFF */
-#define LED_INIRQ         0 /* In an interrupt          (no change)    */
-#define LED_SIGNAL        0 /* In a signal handler      (no change)    */
-#define LED_ASSERTION     0 /* An assertion failed      (no change)    */
-#define LED_PANIC         4 /* The system has crashed    FLASH OFF OFF */
-#undef  LED_IDLE            /* K64 is in sleep mode     (Not used)     */
+ *   SYMBOL                Meaning                      LED state
+ *                                                      RED   GREEN  BLUE
+ *   -------------------  ----------------------------  ----------------- */
+#define LED_STARTED       1 /* NuttX has been started    OFF   OFF    OFF */
+#define LED_HEAPALLOCATE  2 /* Heap has been allocated   OFF   OFF    ON  */
+#define LED_IRQSENABLED   0 /* Interrupts enabled        OFF   OFF    ON  */
+#define LED_STACKCREATED  3 /* Idle stack created        OFF   ON     OFF */
+#define LED_INIRQ         0 /* In an interrupt          (no change)       */
+#define LED_SIGNAL        0 /* In a signal handler      (no change)       */
+#define LED_ASSERTION     0 /* An assertion failed      (no change)       */
+#define LED_PANIC         4 /* The system has crashed    FLASH OFF    OFF */
+#undef  LED_IDLE            /* K64 is in sleep mode     (Not used)        */
 
 /* Button definitions ***************************************************************/
 /* Two push buttons, SW2 and SW3, are available on FRDM-K64F board, where SW2 is
diff --git a/configs/freedom-k64f/src/freedom-k64f.h b/configs/freedom-k64f/src/freedom-k64f.h
index 53a6e000e9..a253dd3be4 100644
--- a/configs/freedom-k64f/src/freedom-k64f.h
+++ b/configs/freedom-k64f/src/freedom-k64f.h
@@ -91,13 +91,13 @@
  *   LED    K64
  *   ------ -------------------------------------------------------
  *   RED    PTB22/SPI2_SOUT/FB_AD29/CMP2_OUT
- *   BLUE   PTB21/SPI2_SCK/FB_AD30/CMP1_OUT
  *   GREEN  PTE26/ENET_1588_CLKIN/UART4_CTS_b/RTC_CLKOUT/USB0_CLKIN
+ *   BLUE   PTB21/SPI2_SCK/FB_AD30/CMP1_OUT
  */
 
 #define GPIO_LED_R         (GPIO_LOWDRIVE | GPIO_OUTPUT_ONE | PIN_PORTB | PIN22)
-#define GPIO_LED_G         (GPIO_LOWDRIVE | GPIO_OUTPUT_ONE | PIN_PORTB | PIN21)
-#define GPIO_LED_B         (GPIO_LOWDRIVE | GPIO_OUTPUT_ONE | PIN_PORTE | PIN26)
+#define GPIO_LED_G         (GPIO_LOWDRIVE | GPIO_OUTPUT_ONE | PIN_PORTE | PIN26)
+#define GPIO_LED_B         (GPIO_LOWDRIVE | GPIO_OUTPUT_ONE | PIN_PORTB | PIN21)
 
 /************************************************************************************
  * Public data
-- 
GitLab


From 5e12d6203e51b0c6e8b080da1f28c5d3e305b144 Mon Sep 17 00:00:00 2001
From: Sebastien Lorquet 
Date: Tue, 12 Jul 2016 00:57:18 +0200
Subject: [PATCH 210/229] Cosmetic changes after PR 94

---
 arch/arm/src/stm32l4/stm32l4_otgfsdev.c      | 189 ++++++++-------
 arch/arm/src/stm32l4/stm32l4_otgfshost.c     | 228 ++++++++++---------
 arch/arm/src/stm32l4/stm32l4_rtcc.c          |   2 +-
 arch/arm/src/stm32l4/stm32l4_tickless.c      |   2 +-
 arch/arm/src/stm32l4/stm32l4_tim.c           |  92 ++++----
 arch/arm/src/stm32l4/stm32l4_tim_lowerhalf.c |  13 +-
 6 files changed, 279 insertions(+), 247 deletions(-)

diff --git a/arch/arm/src/stm32l4/stm32l4_otgfsdev.c b/arch/arm/src/stm32l4/stm32l4_otgfsdev.c
index 6d891282c9..620059f99c 100644
--- a/arch/arm/src/stm32l4/stm32l4_otgfsdev.c
+++ b/arch/arm/src/stm32l4/stm32l4_otgfsdev.c
@@ -468,7 +468,7 @@ struct stm32l4_ctrlreq_s
 struct stm32l4_req_s
 {
   struct usbdev_req_s  req;           /* Standard USB request */
-  struct stm32l4_req_s  *flink;         /* Supports a singly linked list */
+  FAR struct stm32l4_req_s  *flink;   /* Supports a singly linked list */
 };
 
 /* This is the internal representation of an endpoint */
@@ -484,9 +484,9 @@ struct stm32l4_ep_s
 
   /* STM32-specific fields */
 
-  struct stm32l4_usbdev_s *dev;          /* Reference to private driver data */
-  struct stm32l4_req_s    *head;         /* Request list for this endpoint */
-  struct stm32l4_req_s    *tail;
+  FAR struct stm32l4_usbdev_s *dev;      /* Reference to private driver data */
+  FAR struct stm32l4_req_s    *head;     /* Request list for this endpoint */
+  FAR struct stm32l4_req_s    *tail;
   uint8_t                epphy;        /* Physical EP address */
   uint8_t                eptype:2;     /* Endpoint type */
   uint8_t                active:1;     /* 1: A request is being processed */
@@ -509,7 +509,7 @@ struct stm32l4_usbdev_s
 
   /* The bound device class driver */
 
-  struct usbdevclass_driver_s *driver;
+  FAR struct usbdevclass_driver_s *driver;
 
   /* STM32-specific fields */
 
@@ -573,13 +573,14 @@ static void        stm32l4_putreg(uint32_t val, uint32_t addr);
 
 static FAR struct stm32l4_req_s *stm32l4_req_remfirst(FAR struct stm32l4_ep_s *privep);
 static bool       stm32l4_req_addlast(FAR struct stm32l4_ep_s *privep,
-                    FAR struct stm32l4_req_s *req);
+                                      FAR struct stm32l4_req_s *req);
 
 /* Low level data transfers and request operations *****************************/
 /* Special endpoint 0 data transfer logic */
 
 static void        stm32l4_ep0in_setupresponse(FAR struct stm32l4_usbdev_s *priv,
-                     FAR uint8_t *data, uint32_t nbytes);
+                                               FAR uint8_t *data,
+                                               uint32_t nbytes);
 static inline void stm32l4_ep0in_transmitzlp(FAR struct stm32l4_usbdev_s *priv);
 static void        stm32l4_ep0in_activate(void);
 
@@ -588,56 +589,61 @@ static void        stm32l4_ep0out_ctrlsetup(FAR struct stm32l4_usbdev_s *priv);
 /* IN request and TxFIFO handling */
 
 static void        stm32l4_txfifo_write(FAR struct stm32l4_ep_s *privep,
-                     FAR uint8_t *buf, int nbytes);
+                                        FAR uint8_t *buf, int nbytes);
 static void        stm32l4_epin_transfer(FAR struct stm32l4_ep_s *privep,
-                     FAR uint8_t *buf, int nbytes);
+                                         FAR uint8_t *buf, int nbytes);
 static void        stm32l4_epin_request(FAR struct stm32l4_usbdev_s *priv,
-                     FAR struct stm32l4_ep_s *privep);
+                                        FAR struct stm32l4_ep_s *privep);
 
 /* OUT request and RxFIFO handling */
 
 static void        stm32l4_rxfifo_read(FAR struct stm32l4_ep_s *privep,
-                     FAR uint8_t *dest, uint16_t len);
-static void        stm32l4_rxfifo_discard(FAR struct stm32l4_ep_s *privep, int len);
+                                       FAR uint8_t *dest, uint16_t len);
+static void        stm32l4_rxfifo_discard(FAR struct stm32l4_ep_s *privep,
+                                          int len);
 static void        stm32l4_epout_complete(FAR struct stm32l4_usbdev_s *priv,
-                     FAR struct stm32l4_ep_s *privep);
-static inline void stm32l4_ep0out_receive(FAR struct stm32l4_ep_s *privep, int bcnt);
-static inline void stm32l4_epout_receive(FAR struct stm32l4_ep_s *privep, int bcnt);
+                                          FAR struct stm32l4_ep_s *privep);
+static inline void stm32l4_ep0out_receive(FAR struct stm32l4_ep_s *privep,
+                                          int bcnt);
+static inline void stm32l4_epout_receive(FAR struct stm32l4_ep_s *privep,
+                                         int bcnt);
 static void        stm32l4_epout_request(FAR struct stm32l4_usbdev_s *priv,
-                     FAR struct stm32l4_ep_s *privep);
+                                         FAR struct stm32l4_ep_s *privep);
 
 /* General request handling */
 
 static void        stm32l4_ep_flush(FAR struct stm32l4_ep_s *privep);
 static void        stm32l4_req_complete(FAR struct stm32l4_ep_s *privep,
-                     int16_t result);
+                                        int16_t result);
 static void        stm32l4_req_cancel(FAR struct stm32l4_ep_s *privep,
-                     int16_t status);
+                                      int16_t status);
 
 /* Interrupt handling **********************************************************/
 
 static struct      stm32l4_ep_s *stm32l4_ep_findbyaddr(struct stm32l4_usbdev_s *priv,
-                     uint16_t eplog);
+                                                       uint16_t eplog);
 static int         stm32l4_req_dispatch(FAR struct stm32l4_usbdev_s *priv,
-                     FAR const struct usb_ctrlreq_s *ctrl);
+                                        FAR const struct usb_ctrlreq_s *ctrl);
 static void        stm32l4_usbreset(FAR struct stm32l4_usbdev_s *priv);
 
 /* Second level OUT endpoint interrupt processing */
 
 static inline void stm32l4_ep0out_testmode(FAR struct stm32l4_usbdev_s *priv,
-                     uint16_t index);
-static inline void stm32l4_ep0out_stdrequest(struct stm32l4_usbdev_s *priv,
-                     FAR struct stm32l4_ctrlreq_s *ctrlreq);
+                                           uint16_t index);
+static inline void stm32l4_ep0out_stdrequest(FAR struct stm32l4_usbdev_s *priv,
+                                             FAR struct stm32l4_ctrlreq_s *ctrlreq);
 static inline void stm32l4_ep0out_setup(struct stm32l4_usbdev_s *priv);
 static inline void stm32l4_epout(FAR struct stm32l4_usbdev_s *priv,
-                     uint8_t epno);
+                                 uint8_t epno);
 static inline void stm32l4_epout_interrupt(FAR struct stm32l4_usbdev_s *priv);
 
 /* Second level IN endpoint interrupt processing */
 
 static inline void stm32l4_epin_runtestmode(FAR struct stm32l4_usbdev_s *priv);
-static inline void stm32l4_epin(FAR struct stm32l4_usbdev_s *priv, uint8_t epno);
-static inline void stm32l4_epin_txfifoempty(FAR struct stm32l4_usbdev_s *priv, int epno);
+static inline void stm32l4_epin(FAR struct stm32l4_usbdev_s *priv,
+                                uint8_t epno);
+static inline void stm32l4_epin_txfifoempty(FAR struct stm32l4_usbdev_s *priv,
+                                            int epno);
 static inline void stm32l4_epin_interrupt(FAR struct stm32l4_usbdev_s *priv);
 
 /* Other second level interrupt processing */
@@ -668,11 +674,12 @@ static void        stm32l4_disablegonak(FAR struct stm32l4_ep_s *privep);
 /* Endpoint configuration */
 
 static int         stm32l4_epout_configure(FAR struct stm32l4_ep_s *privep,
-                     uint8_t eptype, uint16_t maxpacket);
+                                           uint8_t eptype, uint16_t maxpacket);
 static int         stm32l4_epin_configure(FAR struct stm32l4_ep_s *privep,
-                     uint8_t eptype, uint16_t maxpacket);
+                                          uint8_t eptype, uint16_t maxpacket);
 static int         stm32l4_ep_configure(FAR struct usbdev_ep_s *ep,
-                     FAR const struct usb_epdesc_s *desc, bool last);
+                                        FAR const struct usb_epdesc_s *desc,
+                                        bool last);
 static void        stm32l4_ep0_configure(FAR struct stm32l4_usbdev_s *priv);
 
 /* Endpoint disable */
@@ -685,24 +692,26 @@ static int         stm32l4_ep_disable(FAR struct usbdev_ep_s *ep);
 
 static FAR struct usbdev_req_s *stm32l4_ep_allocreq(FAR struct usbdev_ep_s *ep);
 static void        stm32l4_ep_freereq(FAR struct usbdev_ep_s *ep,
-                     FAR struct usbdev_req_s *);
+                                      FAR struct usbdev_req_s *);
 
 /* Endpoint buffer management */
 
 #ifdef CONFIG_USBDEV_DMA
-static void       *stm32l4_ep_allocbuffer(FAR struct usbdev_ep_s *ep, unsigned bytes);
-static void        stm32l4_ep_freebuffer(FAR struct usbdev_ep_s *ep, FAR void *buf);
+static void       *stm32l4_ep_allocbuffer(FAR struct usbdev_ep_s *ep,
+                                          unsigned bytes);
+static void        stm32l4_ep_freebuffer(FAR struct usbdev_ep_s *ep,
+                                         FAR void *buf);
 #endif
 
 /* Endpoint request submission */
 
 static int         stm32l4_ep_submit(FAR struct usbdev_ep_s *ep,
-                     struct usbdev_req_s *req);
+                                     FAR struct usbdev_req_s *req);
 
 /* Endpoint request cancellation */
 
 static int         stm32l4_ep_cancel(FAR struct usbdev_ep_s *ep,
-                     struct usbdev_req_s *req);
+                                     FAR struct usbdev_req_s *req);
 
 /* Stall handling */
 
@@ -716,18 +725,19 @@ static void        stm32l4_ep0_stall(FAR struct stm32l4_usbdev_s *priv);
 /* Endpoint allocation */
 
 static FAR struct usbdev_ep_s *stm32l4_ep_alloc(FAR struct usbdev_s *dev,
-                     uint8_t epno, bool in, uint8_t eptype);
+                                                uint8_t epno, bool in,
+                                                uint8_t eptype);
 static void        stm32l4_ep_free(FAR struct usbdev_s *dev,
-                     FAR struct usbdev_ep_s *ep);
+                                   FAR struct usbdev_ep_s *ep);
 
 /* USB device controller operations ********************************************/
 
-static int         stm32l4_getframe(struct usbdev_s *dev);
-static int         stm32l4_wakeup(struct usbdev_s *dev);
-static int         stm32l4_selfpowered(struct usbdev_s *dev, bool selfpowered);
-static int         stm32l4_pullup(struct usbdev_s *dev, bool enable);
-static void        stm32l4_setaddress(struct stm32l4_usbdev_s *priv,
-                     uint16_t address);
+static int         stm32l4_getframe(FAR struct usbdev_s *dev);
+static int         stm32l4_wakeup(FAR struct usbdev_s *dev);
+static int         stm32l4_selfpowered(FAR struct usbdev_s *dev, bool selfpowered);
+static int         stm32l4_pullup(FAR struct usbdev_s *dev, bool enable);
+static void        stm32l4_setaddress(FAR struct stm32l4_usbdev_s *priv,
+                                      uint16_t address);
 static int         stm32l4_txfifo_flush(uint32_t txfnum);
 static int         stm32l4_rxfifo_flush(void);
 
@@ -992,7 +1002,7 @@ static FAR struct stm32l4_req_s *stm32l4_req_remfirst(FAR struct stm32l4_ep_s *p
  ****************************************************************************/
 
 static bool stm32l4_req_addlast(FAR struct stm32l4_ep_s *privep,
-                              FAR struct stm32l4_req_s *req)
+                                FAR struct stm32l4_req_s *req)
 {
   bool is_empty = !privep->head;
 
@@ -1019,7 +1029,7 @@ static bool stm32l4_req_addlast(FAR struct stm32l4_ep_s *privep,
  ****************************************************************************/
 
 static void stm32l4_ep0in_setupresponse(FAR struct stm32l4_usbdev_s *priv,
-                                      FAR uint8_t *buf, uint32_t nbytes)
+                                        FAR uint8_t *buf, uint32_t nbytes)
 {
   stm32l4_epin_transfer(&priv->epin[EP0], buf, nbytes);
   priv->ep0state = EP0STATE_SETUPRESPONSE;
@@ -1112,7 +1122,7 @@ static void stm32l4_ep0out_ctrlsetup(FAR struct stm32l4_usbdev_s *priv)
  ****************************************************************************/
 
 static void stm32l4_txfifo_write(FAR struct stm32l4_ep_s *privep,
-                               FAR uint8_t *buf, int nbytes)
+                                 FAR uint8_t *buf, int nbytes)
 {
   uint32_t regaddr;
   uint32_t regval;
@@ -1157,7 +1167,7 @@ static void stm32l4_txfifo_write(FAR struct stm32l4_ep_s *privep,
  ****************************************************************************/
 
 static void stm32l4_epin_transfer(FAR struct stm32l4_ep_s *privep,
-                                FAR uint8_t *buf, int nbytes)
+                                  FAR uint8_t *buf, int nbytes)
 {
   uint32_t pktcnt;
   uint32_t regval;
@@ -1257,7 +1267,7 @@ static void stm32l4_epin_transfer(FAR struct stm32l4_ep_s *privep,
  ****************************************************************************/
 
 static void stm32l4_epin_request(FAR struct stm32l4_usbdev_s *priv,
-                               FAR struct stm32l4_ep_s *privep)
+                                 FAR struct stm32l4_ep_s *privep)
 {
   struct stm32l4_req_s *privreq;
   uint32_t regaddr;
@@ -1477,7 +1487,7 @@ static void stm32l4_epin_request(FAR struct stm32l4_usbdev_s *priv,
  ****************************************************************************/
 
 static void stm32l4_rxfifo_read(FAR struct stm32l4_ep_s *privep,
-                              FAR uint8_t *dest, uint16_t len)
+                                FAR uint8_t *dest, uint16_t len)
 {
   uint32_t regaddr;
   int i;
@@ -1557,9 +1567,9 @@ static void stm32l4_rxfifo_discard(FAR struct stm32l4_ep_s *privep, int len)
  ****************************************************************************/
 
 static void stm32l4_epout_complete(FAR struct stm32l4_usbdev_s *priv,
-                                 FAR struct stm32l4_ep_s *privep)
+                                   FAR struct stm32l4_ep_s *privep)
 {
-  struct stm32l4_req_s *privreq;
+  FAR struct stm32l4_req_s *privreq;
 
   /* Since a transfer just completed, there must be a read request at the head of
    * the endpoint request queue.
@@ -1605,7 +1615,8 @@ static void stm32l4_epout_complete(FAR struct stm32l4_usbdev_s *priv,
  *
  ****************************************************************************/
 
-static inline void stm32l4_ep0out_receive(FAR struct stm32l4_ep_s *privep, int bcnt)
+static inline void stm32l4_ep0out_receive(FAR struct stm32l4_ep_s *privep,
+                                          int bcnt)
 {
   FAR struct stm32l4_usbdev_s *priv;
 
@@ -1663,10 +1674,11 @@ static inline void stm32l4_ep0out_receive(FAR struct stm32l4_ep_s *privep, int b
  *
  ****************************************************************************/
 
-static inline void stm32l4_epout_receive(FAR struct stm32l4_ep_s *privep, int bcnt)
+static inline void stm32l4_epout_receive(FAR struct stm32l4_ep_s *privep,
+                                         int bcnt)
 {
-  struct stm32l4_req_s *privreq;
-  uint8_t *dest;
+  FAR struct stm32l4_req_s *privreq;
+  FAR uint8_t *dest;
   int buflen;
   int readlen;
 
@@ -1746,9 +1758,9 @@ static inline void stm32l4_epout_receive(FAR struct stm32l4_ep_s *privep, int bc
  ****************************************************************************/
 
 static void stm32l4_epout_request(FAR struct stm32l4_usbdev_s *priv,
-                                FAR struct stm32l4_ep_s *privep)
+                                  FAR struct stm32l4_ep_s *privep)
 {
-  struct stm32l4_req_s *privreq;
+  FAR struct stm32l4_req_s *privreq;
   uint32_t regaddr;
   uint32_t regval;
   uint32_t xfrsize;
@@ -1882,7 +1894,7 @@ static void stm32l4_epout_request(FAR struct stm32l4_usbdev_s *priv,
  *
  ****************************************************************************/
 
-static void stm32l4_ep_flush(struct stm32l4_ep_s *privep)
+static void stm32l4_ep_flush(FAR struct stm32l4_ep_s *privep)
 {
   if (privep->isin)
     {
@@ -1902,7 +1914,8 @@ static void stm32l4_ep_flush(struct stm32l4_ep_s *privep)
  *
  ****************************************************************************/
 
-static void stm32l4_req_complete(struct stm32l4_ep_s *privep, int16_t result)
+static void stm32l4_req_complete(FAR struct stm32l4_ep_s *privep,
+                                 int16_t result)
 {
   FAR struct stm32l4_req_s *privreq;
 
@@ -1942,7 +1955,7 @@ static void stm32l4_req_complete(struct stm32l4_ep_s *privep, int16_t result)
  *
  ****************************************************************************/
 
-static void stm32l4_req_cancel(struct stm32l4_ep_s *privep, int16_t status)
+static void stm32l4_req_cancel(FAR struct stm32l4_ep_s *privep, int16_t status)
 {
   if (!stm32l4_rqempty(privep))
     {
@@ -1966,8 +1979,8 @@ static void stm32l4_req_cancel(struct stm32l4_ep_s *privep, int16_t status)
  *
  ****************************************************************************/
 
-static struct stm32l4_ep_s *stm32l4_ep_findbyaddr(struct stm32l4_usbdev_s *priv,
-                                              uint16_t eplog)
+static FAR struct stm32l4_ep_s *stm32l4_ep_findbyaddr(FAR struct stm32l4_usbdev_s *priv,
+                                                      uint16_t eplog)
 {
   struct stm32l4_ep_s *privep;
   uint8_t epphy = USB_EPNO(eplog);
@@ -2003,8 +2016,8 @@ static struct stm32l4_ep_s *stm32l4_ep_findbyaddr(struct stm32l4_usbdev_s *priv,
  *
  ****************************************************************************/
 
-static int stm32l4_req_dispatch(struct stm32l4_usbdev_s *priv,
-                              const struct usb_ctrlreq_s *ctrl)
+static int stm32l4_req_dispatch(FAR struct stm32l4_usbdev_s *priv,
+                                FAR const struct usb_ctrlreq_s *ctrl)
 {
   int ret = -EIO;
 
@@ -2036,7 +2049,7 @@ static int stm32l4_req_dispatch(struct stm32l4_usbdev_s *priv,
  *
  ****************************************************************************/
 
-static void stm32l4_usbreset(struct stm32l4_usbdev_s *priv)
+static void stm32l4_usbreset(FAR struct stm32l4_usbdev_s *priv)
 {
   FAR struct stm32l4_ep_s *privep;
   uint32_t regval;
@@ -2135,7 +2148,7 @@ static void stm32l4_usbreset(struct stm32l4_usbdev_s *priv)
  ****************************************************************************/
 
 static inline void stm32l4_ep0out_testmode(FAR struct stm32l4_usbdev_s *priv,
-                                         uint16_t index)
+                                           uint16_t index)
 {
   uint8_t testmode;
 
@@ -2182,8 +2195,8 @@ static inline void stm32l4_ep0out_testmode(FAR struct stm32l4_usbdev_s *priv,
  *
  ****************************************************************************/
 
-static inline void stm32l4_ep0out_stdrequest(struct stm32l4_usbdev_s *priv,
-                                           FAR struct stm32l4_ctrlreq_s *ctrlreq)
+static inline void stm32l4_ep0out_stdrequest(FAR struct stm32l4_usbdev_s *priv,
+                                             FAR struct stm32l4_ctrlreq_s *ctrlreq)
 {
   FAR struct stm32l4_ep_s *privep;
 
@@ -2552,7 +2565,7 @@ static inline void stm32l4_ep0out_stdrequest(struct stm32l4_usbdev_s *priv,
  *
  ****************************************************************************/
 
-static inline void stm32l4_ep0out_setup(struct stm32l4_usbdev_s *priv)
+static inline void stm32l4_ep0out_setup(FAR struct stm32l4_usbdev_s *priv)
 {
   struct stm32l4_ctrlreq_s ctrlreq;
 
@@ -3862,8 +3875,8 @@ static void stm32l4_disablegonak(FAR struct stm32l4_ep_s *privep)
  *
  ****************************************************************************/
 
-static int stm32l4_epout_configure(FAR struct stm32l4_ep_s *privep, uint8_t eptype,
-                                 uint16_t maxpacket)
+static int stm32l4_epout_configure(FAR struct stm32l4_ep_s *privep,
+                                   uint8_t eptype, uint16_t maxpacket)
 {
   uint32_t mpsiz;
   uint32_t regaddr;
@@ -3957,8 +3970,8 @@ static int stm32l4_epout_configure(FAR struct stm32l4_ep_s *privep, uint8_t epty
  *
  ****************************************************************************/
 
-static int stm32l4_epin_configure(FAR struct stm32l4_ep_s *privep, uint8_t eptype,
-                                uint16_t maxpacket)
+static int stm32l4_epin_configure(FAR struct stm32l4_ep_s *privep,
+                                  uint8_t eptype, uint16_t maxpacket)
 {
   uint32_t mpsiz;
   uint32_t regaddr;
@@ -4058,8 +4071,8 @@ static int stm32l4_epin_configure(FAR struct stm32l4_ep_s *privep, uint8_t eptyp
  ****************************************************************************/
 
 static int stm32l4_ep_configure(FAR struct usbdev_ep_s *ep,
-                              FAR const struct usb_epdesc_s *desc,
-                              bool last)
+                                FAR const struct usb_epdesc_s *desc,
+                                bool last)
 {
   FAR struct stm32l4_ep_s *privep = (FAR struct stm32l4_ep_s *)ep;
   uint16_t maxpacket;
@@ -4417,7 +4430,8 @@ static void stm32l4_ep_freebuffer(FAR struct usbdev_ep_s *ep, FAR void *buf)
  *
  ****************************************************************************/
 
-static int stm32l4_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *req)
+static int stm32l4_ep_submit(FAR struct usbdev_ep_s *ep,
+                             FAR struct usbdev_req_s *req)
 {
   FAR struct stm32l4_req_s *privreq = (FAR struct stm32l4_req_s *)req;
   FAR struct stm32l4_ep_s *privep = (FAR struct stm32l4_ep_s *)ep;
@@ -4511,7 +4525,8 @@ static int stm32l4_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s
  *
  ****************************************************************************/
 
-static int stm32l4_ep_cancel(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *req)
+static int stm32l4_ep_cancel(FAR struct usbdev_ep_s *ep,
+                             FAR struct usbdev_req_s *req)
 {
   FAR struct stm32l4_ep_s *privep = (FAR struct stm32l4_ep_s *)ep;
   irqstate_t flags;
@@ -4790,8 +4805,8 @@ static void stm32l4_ep0_stall(FAR struct stm32l4_usbdev_s *priv)
  ****************************************************************************/
 
 static FAR struct usbdev_ep_s *stm32l4_ep_alloc(FAR struct usbdev_s *dev,
-                                              uint8_t eplog, bool in,
-                                              uint8_t eptype)
+                                                uint8_t eplog, bool in,
+                                                uint8_t eptype)
 {
   FAR struct stm32l4_usbdev_s *priv = (FAR struct stm32l4_usbdev_s *)dev;
   uint8_t epavail;
@@ -4874,7 +4889,8 @@ static FAR struct usbdev_ep_s *stm32l4_ep_alloc(FAR struct usbdev_s *dev,
  *
  ****************************************************************************/
 
-static void stm32l4_ep_free(FAR struct usbdev_s *dev, FAR struct usbdev_ep_s *ep)
+static void stm32l4_ep_free(FAR struct usbdev_s *dev,
+                            FAR struct usbdev_ep_s *ep)
 {
   FAR struct stm32l4_usbdev_s *priv = (FAR struct stm32l4_usbdev_s *)dev;
   FAR struct stm32l4_ep_s *privep = (FAR struct stm32l4_ep_s *)ep;
@@ -4900,7 +4916,7 @@ static void stm32l4_ep_free(FAR struct usbdev_s *dev, FAR struct usbdev_ep_s *ep
  *
  ****************************************************************************/
 
-static int stm32l4_getframe(struct usbdev_s *dev)
+static int stm32l4_getframe(FAR struct usbdev_s *dev)
 {
   uint32_t regval;
 
@@ -4920,7 +4936,7 @@ static int stm32l4_getframe(struct usbdev_s *dev)
  *
  ****************************************************************************/
 
-static int stm32l4_wakeup(struct usbdev_s *dev)
+static int stm32l4_wakeup(FAR struct usbdev_s *dev)
 {
   FAR struct stm32l4_usbdev_s *priv = (FAR struct stm32l4_usbdev_s *)dev;
   uint32_t regval;
@@ -4968,7 +4984,7 @@ static int stm32l4_wakeup(struct usbdev_s *dev)
  *
  ****************************************************************************/
 
-static int stm32l4_selfpowered(struct usbdev_s *dev, bool selfpowered)
+static int stm32l4_selfpowered(FAR struct usbdev_s *dev, bool selfpowered)
 {
   FAR struct stm32l4_usbdev_s *priv = (FAR struct stm32l4_usbdev_s *)dev;
 
@@ -4994,7 +5010,7 @@ static int stm32l4_selfpowered(struct usbdev_s *dev, bool selfpowered)
  *
  ****************************************************************************/
 
-static int stm32l4_pullup(struct usbdev_s *dev, bool enable)
+static int stm32l4_pullup(FAR struct usbdev_s *dev, bool enable)
 {
   uint32_t regval;
 
@@ -5032,7 +5048,8 @@ static int stm32l4_pullup(struct usbdev_s *dev, bool enable)
  *
  ****************************************************************************/
 
-static void stm32l4_setaddress(struct stm32l4_usbdev_s *priv, uint16_t address)
+static void stm32l4_setaddress(FAR struct stm32l4_usbdev_s *priv,
+                               uint16_t address)
 {
   uint32_t regval;
 
@@ -5655,7 +5672,7 @@ void up_usbuninitialize(void)
  *
  ****************************************************************************/
 
-int usbdev_register(struct usbdevclass_driver_s *driver)
+int usbdev_register(FAR struct usbdevclass_driver_s *driver)
 {
   /* At present, there is only a single OTG FS device support. Hence it is
    * pre-allocated as g_otgfsdev.  However, in most code, the private data
@@ -5726,7 +5743,7 @@ int usbdev_register(struct usbdevclass_driver_s *driver)
  *
  ****************************************************************************/
 
-int usbdev_unregister(struct usbdevclass_driver_s *driver)
+int usbdev_unregister(FAR struct usbdevclass_driver_s *driver)
 {
   /* At present, there is only a single OTG FS device support. Hence it is
    * pre-allocated as g_otgfsdev.  However, in most code, the private data
diff --git a/arch/arm/src/stm32l4/stm32l4_otgfshost.c b/arch/arm/src/stm32l4/stm32l4_otgfshost.c
index 348bdc1709..543ea7c881 100644
--- a/arch/arm/src/stm32l4/stm32l4_otgfshost.c
+++ b/arch/arm/src/stm32l4/stm32l4_otgfshost.c
@@ -295,7 +295,7 @@ static void stm32l4_putreg(uint32_t addr, uint32_t value);
 #endif
 
 static inline void stm32l4_modifyreg(uint32_t addr, uint32_t clrbits,
-                                   uint32_t setbits);
+                                     uint32_t setbits);
 
 #ifdef CONFIG_STM32L4_USBHOST_PKTDUMP
 #  define stm32l4_pktdump(m,b,n) lib_dumpbuffer(m,b,n)
@@ -305,12 +305,12 @@ static inline void stm32l4_modifyreg(uint32_t addr, uint32_t clrbits,
 
 /* Semaphores ******************************************************************/
 
-static void stm32l4_takesem(sem_t *sem);
+static void stm32l4_takesem(FAR sem_t *sem);
 #define stm32l4_givesem(s) sem_post(s);
 
 /* Byte stream access helper functions *****************************************/
 
-static inline uint16_t stm32l4_getle16(const uint8_t *val);
+static inline uint16_t stm32l4_getle16(FAR const uint8_t *val);
 
 /* Channel management **********************************************************/
 
@@ -319,27 +319,27 @@ static inline void stm32l4_chan_free(FAR struct stm32l4_usbhost_s *priv, int chi
 static inline void stm32l4_chan_freeall(FAR struct stm32l4_usbhost_s *priv);
 static void stm32l4_chan_configure(FAR struct stm32l4_usbhost_s *priv, int chidx);
 static void stm32l4_chan_halt(FAR struct stm32l4_usbhost_s *priv, int chidx,
-                            enum stm32l4_chreason_e chreason);
+                              enum stm32l4_chreason_e chreason);
 static int stm32l4_chan_waitsetup(FAR struct stm32l4_usbhost_s *priv,
-                                FAR struct stm32l4_chan_s *chan);
+                                  FAR struct stm32l4_chan_s *chan);
 #ifdef CONFIG_USBHOST_ASYNCH
 static int stm32l4_chan_asynchsetup(FAR struct stm32l4_usbhost_s *priv,
-                                  FAR struct stm32l4_chan_s *chan,
-                                  usbhost_asynch_t callback, FAR void *arg);
+                                    FAR struct stm32l4_chan_s *chan,
+                                    usbhost_asynch_t callback, FAR void *arg);
 #endif
 static int stm32l4_chan_wait(FAR struct stm32l4_usbhost_s *priv,
-                           FAR struct stm32l4_chan_s *chan);
+                             FAR struct stm32l4_chan_s *chan);
 static void stm32l4_chan_wakeup(FAR struct stm32l4_usbhost_s *priv,
-                              FAR struct stm32l4_chan_s *chan);
+                                FAR struct stm32l4_chan_s *chan);
 static int stm32l4_ctrlchan_alloc(FAR struct stm32l4_usbhost_s *priv,
-                                uint8_t epno, uint8_t funcaddr, uint8_t speed,
-                                FAR struct stm32l4_ctrlinfo_s *ctrlep);
+                                  uint8_t epno, uint8_t funcaddr, uint8_t speed,
+                                  FAR struct stm32l4_ctrlinfo_s *ctrlep);
 static int stm32l4_ctrlep_alloc(FAR struct stm32l4_usbhost_s *priv,
-                              FAR const struct usbhost_epdesc_s *epdesc,
-                              FAR usbhost_ep_t *ep);
+                                FAR const struct usbhost_epdesc_s *epdesc,
+                                FAR usbhost_ep_t *ep);
 static int stm32l4_xfrep_alloc(FAR struct stm32l4_usbhost_s *priv,
-                              FAR const struct usbhost_epdesc_s *epdesc,
-                              FAR usbhost_ep_t *ep);
+                                FAR const struct usbhost_epdesc_s *epdesc,
+                                FAR usbhost_ep_t *ep);
 
 /* Control/data transfer logic *************************************************/
 
@@ -348,44 +348,44 @@ static void stm32l4_transfer_start(FAR struct stm32l4_usbhost_s *priv, int chidx
 static inline uint16_t stm32l4_getframe(void);
 #endif
 static int stm32l4_ctrl_sendsetup(FAR struct stm32l4_usbhost_s *priv,
-                                FAR struct stm32l4_ctrlinfo_s *ep0,
-                                FAR const struct usb_ctrlreq_s *req);
+                                  FAR struct stm32l4_ctrlinfo_s *ep0,
+                                  FAR const struct usb_ctrlreq_s *req);
 static int stm32l4_ctrl_senddata(FAR struct stm32l4_usbhost_s *priv,
-                               FAR struct stm32l4_ctrlinfo_s *ep0,
-                               FAR uint8_t *buffer, unsigned int buflen);
+                                 FAR struct stm32l4_ctrlinfo_s *ep0,
+                                 FAR uint8_t *buffer, unsigned int buflen);
 static int stm32l4_ctrl_recvdata(FAR struct stm32l4_usbhost_s *priv,
-                               FAR struct stm32l4_ctrlinfo_s *ep0,
-                               FAR uint8_t *buffer, unsigned int buflen);
+                                 FAR struct stm32l4_ctrlinfo_s *ep0,
+                                 FAR uint8_t *buffer, unsigned int buflen);
 static int stm32l4_in_setup(FAR struct stm32l4_usbhost_s *priv, int chidx);
 static ssize_t stm32l4_in_transfer(FAR struct stm32l4_usbhost_s *priv, int chidx,
-                                 FAR uint8_t *buffer, size_t buflen);
+                                   FAR uint8_t *buffer, size_t buflen);
 #ifdef CONFIG_USBHOST_ASYNCH
 static void stm32l4_in_next(FAR struct stm32l4_usbhost_s *priv,
-                          FAR struct stm32l4_chan_s *chan);
+                            FAR struct stm32l4_chan_s *chan);
 static int stm32l4_in_asynch(FAR struct stm32l4_usbhost_s *priv, int chidx,
-                           FAR uint8_t *buffer, size_t buflen,
-                           usbhost_asynch_t callback, FAR void *arg);
+                             FAR uint8_t *buffer, size_t buflen,
+                             usbhost_asynch_t callback, FAR void *arg);
 #endif
 static int stm32l4_out_setup(FAR struct stm32l4_usbhost_s *priv, int chidx);
 static ssize_t stm32l4_out_transfer(FAR struct stm32l4_usbhost_s *priv, int chidx,
-                                  FAR uint8_t *buffer, size_t buflen);
+                                    FAR uint8_t *buffer, size_t buflen);
 #ifdef CONFIG_USBHOST_ASYNCH
 static void stm32l4_out_next(FAR struct stm32l4_usbhost_s *priv,
-                           FAR struct stm32l4_chan_s *chan);
+                             FAR struct stm32l4_chan_s *chan);
 static int stm32l4_out_asynch(FAR struct stm32l4_usbhost_s *priv, int chidx,
-                            FAR uint8_t *buffer, size_t buflen,
-                            usbhost_asynch_t callback, FAR void *arg);
+                              FAR uint8_t *buffer, size_t buflen,
+                              usbhost_asynch_t callback, FAR void *arg);
 #endif
 
 /* Interrupt handling **********************************************************/
 /* Lower level interrupt handlers */
 
 static void stm32l4_gint_wrpacket(FAR struct stm32l4_usbhost_s *priv,
-                                FAR uint8_t *buffer, int chidx, int buflen);
+                                  FAR uint8_t *buffer, int chidx, int buflen);
 static inline void stm32l4_gint_hcinisr(FAR struct stm32l4_usbhost_s *priv,
-                                      int chidx);
+                                        int chidx);
 static inline void stm32l4_gint_hcoutisr(FAR struct stm32l4_usbhost_s *priv,
-                                       int chidx);
+                                         int chidx);
 static void stm32l4_gint_connected(FAR struct stm32l4_usbhost_s *priv);
 static void stm32l4_gint_disconnected(FAR struct stm32l4_usbhost_s *priv);
 
@@ -416,47 +416,47 @@ static void stm32l4_txfe_enable(FAR struct stm32l4_usbhost_s *priv, int chidx);
 /* USB host controller operations **********************************************/
 
 static int stm32l4_wait(FAR struct usbhost_connection_s *conn,
-                      FAR struct usbhost_hubport_s **hport);
+                        FAR struct usbhost_hubport_s **hport);
 static int stm32l4_rh_enumerate(FAR struct stm32l4_usbhost_s *priv,
-                              FAR struct usbhost_connection_s *conn,
-                              FAR struct usbhost_hubport_s *hport);
+                                FAR struct usbhost_connection_s *conn,
+                                FAR struct usbhost_hubport_s *hport);
 static int stm32l4_enumerate(FAR struct usbhost_connection_s *conn,
-                           FAR struct usbhost_hubport_s *hport);
+                             FAR struct usbhost_hubport_s *hport);
 
 static int stm32l4_ep0configure(FAR struct usbhost_driver_s *drvr,
-                              usbhost_ep_t ep0, uint8_t funcaddr, uint8_t speed,
-                              uint16_t maxpacketsize);
+                                usbhost_ep_t ep0, uint8_t funcaddr, uint8_t speed,
+                                uint16_t maxpacketsize);
 static int stm32l4_epalloc(FAR struct usbhost_driver_s *drvr,
-                         FAR const FAR struct usbhost_epdesc_s *epdesc,
-                         FAR usbhost_ep_t *ep);
+                           FAR const FAR struct usbhost_epdesc_s *epdesc,
+                           FAR usbhost_ep_t *ep);
 static int stm32l4_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep);
 static int stm32l4_alloc(FAR struct usbhost_driver_s *drvr,
-                       FAR uint8_t **buffer, FAR size_t *maxlen);
+                         FAR uint8_t **buffer, FAR size_t *maxlen);
 static int stm32l4_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer);
 static int stm32l4_ioalloc(FAR struct usbhost_driver_s *drvr,
-                         FAR uint8_t **buffer, size_t buflen);
+                           FAR uint8_t **buffer, size_t buflen);
 static int stm32l4_iofree(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer);
 static int stm32l4_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
-                        const struct usb_ctrlreq_s *req,
-                        FAR uint8_t *buffer);
+                          FAR const struct usb_ctrlreq_s *req,
+                          FAR uint8_t *buffer);
 static int stm32l4_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
-                         FAR const struct usb_ctrlreq_s *req,
-                         FAR const uint8_t *buffer);
+                           FAR const struct usb_ctrlreq_s *req,
+                           FAR const uint8_t *buffer);
 static ssize_t stm32l4_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep,
-                              FAR uint8_t *buffer, size_t buflen);
+                                FAR uint8_t *buffer, size_t buflen);
 #ifdef CONFIG_USBHOST_ASYNCH
 static int stm32l4_asynch(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep,
-                        FAR uint8_t *buffer, size_t buflen,
-                        usbhost_asynch_t callback, FAR void *arg);
+                          FAR uint8_t *buffer, size_t buflen,
+                          usbhost_asynch_t callback, FAR void *arg);
 #endif
 static int stm32l4_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep);
 #ifdef CONFIG_USBHOST_HUB
 static int stm32l4_connect(FAR struct usbhost_driver_s *drvr,
-                         FAR struct usbhost_hubport_s *hport,
-                         bool connected);
+                           FAR struct usbhost_hubport_s *hport,
+                           bool connected);
 #endif
 static void stm32l4_disconnect(FAR struct usbhost_driver_s *drvr,
-                             FAR struct usbhost_hubport_s *hport);
+                               FAR struct usbhost_hubport_s *hport);
 
 /* Initialization **************************************************************/
 
@@ -626,7 +626,8 @@ static void stm32l4_putreg(uint32_t addr, uint32_t val)
  *
  ****************************************************************************/
 
-static inline void stm32l4_modifyreg(uint32_t addr, uint32_t clrbits, uint32_t setbits)
+static inline void stm32l4_modifyreg(uint32_t addr, uint32_t clrbits,
+                                     uint32_t setbits)
 {
   stm32l4_putreg(addr, (((stm32l4_getreg(addr)) & ~clrbits) | setbits));
 }
@@ -640,7 +641,7 @@ static inline void stm32l4_modifyreg(uint32_t addr, uint32_t clrbits, uint32_t s
  *
  ****************************************************************************/
 
-static void stm32l4_takesem(sem_t *sem)
+static void stm32l4_takesem(FAR sem_t *sem)
 {
   /* Take the semaphore (perhaps waiting) */
 
@@ -662,7 +663,7 @@ static void stm32l4_takesem(sem_t *sem)
  *
  ****************************************************************************/
 
-static inline uint16_t stm32l4_getle16(const uint8_t *val)
+static inline uint16_t stm32l4_getle16(FAR const uint8_t *val)
 {
   return (uint16_t)val[1] << 8 | (uint16_t)val[0];
 }
@@ -909,7 +910,7 @@ static void stm32l4_chan_configure(FAR struct stm32l4_usbhost_s *priv, int chidx
  ****************************************************************************/
 
 static void stm32l4_chan_halt(FAR struct stm32l4_usbhost_s *priv, int chidx,
-                            enum stm32l4_chreason_e chreason)
+                              enum stm32l4_chreason_e chreason)
 {
   uint32_t hcchar;
   uint32_t intmsk;
@@ -999,7 +1000,7 @@ static void stm32l4_chan_halt(FAR struct stm32l4_usbhost_s *priv, int chidx,
  ****************************************************************************/
 
 static int stm32l4_chan_waitsetup(FAR struct stm32l4_usbhost_s *priv,
-                                FAR struct stm32l4_chan_s *chan)
+                                  FAR struct stm32l4_chan_s *chan)
 {
   irqstate_t flags = enter_critical_section();
   int        ret   = -ENODEV;
@@ -1040,8 +1041,8 @@ static int stm32l4_chan_waitsetup(FAR struct stm32l4_usbhost_s *priv,
 
 #ifdef CONFIG_USBHOST_ASYNCH
 static int stm32l4_chan_asynchsetup(FAR struct stm32l4_usbhost_s *priv,
-                                  FAR struct stm32l4_chan_s *chan,
-                                  usbhost_asynch_t callback, FAR void *arg)
+                                    FAR struct stm32l4_chan_s *chan,
+                                    usbhost_asynch_t callback, FAR void *arg)
 {
   irqstate_t flags = enter_critical_section();
   int        ret   = -ENODEV;
@@ -1077,7 +1078,7 @@ static int stm32l4_chan_asynchsetup(FAR struct stm32l4_usbhost_s *priv,
  ****************************************************************************/
 
 static int stm32l4_chan_wait(FAR struct stm32l4_usbhost_s *priv,
-                           FAR struct stm32l4_chan_s *chan)
+                             FAR struct stm32l4_chan_s *chan)
 {
   irqstate_t flags;
   int ret;
@@ -1134,7 +1135,7 @@ static int stm32l4_chan_wait(FAR struct stm32l4_usbhost_s *priv,
  ****************************************************************************/
 
 static void stm32l4_chan_wakeup(FAR struct stm32l4_usbhost_s *priv,
-                              FAR struct stm32l4_chan_s *chan)
+                                FAR struct stm32l4_chan_s *chan)
 {
   /* Is the transfer complete? */
 
@@ -1190,8 +1191,8 @@ static void stm32l4_chan_wakeup(FAR struct stm32l4_usbhost_s *priv,
  ****************************************************************************/
 
 static int stm32l4_ctrlchan_alloc(FAR struct stm32l4_usbhost_s *priv,
-                                uint8_t epno, uint8_t funcaddr, uint8_t speed,
-                                FAR struct stm32l4_ctrlinfo_s *ctrlep)
+                                  uint8_t epno, uint8_t funcaddr, uint8_t speed,
+                                  FAR struct stm32l4_ctrlinfo_s *ctrlep)
 {
   FAR struct stm32l4_chan_s *chan;
   int inndx;
@@ -1266,8 +1267,8 @@ static int stm32l4_ctrlchan_alloc(FAR struct stm32l4_usbhost_s *priv,
  ****************************************************************************/
 
 static int stm32l4_ctrlep_alloc(FAR struct stm32l4_usbhost_s *priv,
-                              FAR const struct usbhost_epdesc_s *epdesc,
-                              FAR usbhost_ep_t *ep)
+                                FAR const struct usbhost_epdesc_s *epdesc,
+                                FAR usbhost_ep_t *ep)
 {
   FAR struct usbhost_hubport_s *hport;
   FAR struct stm32l4_ctrlinfo_s *ctrlep;
@@ -1328,8 +1329,8 @@ static int stm32l4_ctrlep_alloc(FAR struct stm32l4_usbhost_s *priv,
  ************************************************************************************/
 
 static int stm32l4_xfrep_alloc(FAR struct stm32l4_usbhost_s *priv,
-                              FAR const struct usbhost_epdesc_s *epdesc,
-                              FAR usbhost_ep_t *ep)
+                               FAR const struct usbhost_epdesc_s *epdesc,
+                               FAR usbhost_ep_t *ep)
 {
   struct usbhost_hubport_s *hport;
   FAR struct stm32l4_chan_s *chan;
@@ -1385,7 +1386,8 @@ static int stm32l4_xfrep_alloc(FAR struct stm32l4_usbhost_s *priv,
  *
  ****************************************************************************/
 
-static void stm32l4_transfer_start(FAR struct stm32l4_usbhost_s *priv, int chidx)
+static void stm32l4_transfer_start(FAR struct stm32l4_usbhost_s *priv,
+                                   int chidx)
 {
   FAR struct stm32l4_chan_s *chan;
   uint32_t regval;
@@ -1593,8 +1595,8 @@ static inline uint16_t stm32l4_getframe(void)
  ****************************************************************************/
 
 static int stm32l4_ctrl_sendsetup(FAR struct stm32l4_usbhost_s *priv,
-                                FAR struct stm32l4_ctrlinfo_s *ep0,
-                                FAR const struct usb_ctrlreq_s *req)
+                                  FAR struct stm32l4_ctrlinfo_s *ep0,
+                                  FAR const struct usb_ctrlreq_s *req)
 {
   FAR struct stm32l4_chan_s *chan;
   systime_t start;
@@ -1670,8 +1672,8 @@ static int stm32l4_ctrl_sendsetup(FAR struct stm32l4_usbhost_s *priv,
  ****************************************************************************/
 
 static int stm32l4_ctrl_senddata(FAR struct stm32l4_usbhost_s *priv,
-                               FAR struct stm32l4_ctrlinfo_s *ep0,
-                               FAR uint8_t *buffer, unsigned int buflen)
+                                 FAR struct stm32l4_ctrlinfo_s *ep0,
+                                 FAR uint8_t *buffer, unsigned int buflen)
 {
   FAR struct stm32l4_chan_s *chan = &priv->chan[ep0->outndx];
   int ret;
@@ -1723,8 +1725,8 @@ static int stm32l4_ctrl_senddata(FAR struct stm32l4_usbhost_s *priv,
  ****************************************************************************/
 
 static int stm32l4_ctrl_recvdata(FAR struct stm32l4_usbhost_s *priv,
-                               FAR struct stm32l4_ctrlinfo_s *ep0,
-                               FAR uint8_t *buffer, unsigned int buflen)
+                                 FAR struct stm32l4_ctrlinfo_s *ep0,
+                                 FAR uint8_t *buffer, unsigned int buflen)
 {
   FAR struct stm32l4_chan_s *chan = &priv->chan[ep0->inndx];
   int ret;
@@ -1823,8 +1825,9 @@ static int stm32l4_in_setup(FAR struct stm32l4_usbhost_s *priv, int chidx)
  *
  ****************************************************************************/
 
-static ssize_t stm32l4_in_transfer(FAR struct stm32l4_usbhost_s *priv, int chidx,
-                                 FAR uint8_t *buffer, size_t buflen)
+static ssize_t stm32l4_in_transfer(FAR struct stm32l4_usbhost_s *priv,
+                                   int chidx, FAR uint8_t *buffer,
+                                   size_t buflen)
 {
   FAR struct stm32l4_chan_s *chan;
   systime_t start;
@@ -1910,7 +1913,7 @@ static ssize_t stm32l4_in_transfer(FAR struct stm32l4_usbhost_s *priv, int chidx
 
 #ifdef CONFIG_USBHOST_ASYNCH
 static void stm32l4_in_next(FAR struct stm32l4_usbhost_s *priv,
-                          FAR struct stm32l4_chan_s *chan)
+                            FAR struct stm32l4_chan_s *chan)
 {
   usbhost_asynch_t callback;
   FAR void *arg;
@@ -1975,8 +1978,8 @@ static void stm32l4_in_next(FAR struct stm32l4_usbhost_s *priv,
 
 #ifdef CONFIG_USBHOST_ASYNCH
 static int stm32l4_in_asynch(FAR struct stm32l4_usbhost_s *priv, int chidx,
-                           FAR uint8_t *buffer, size_t buflen,
-                           usbhost_asynch_t callback, FAR void *arg)
+                             FAR uint8_t *buffer, size_t buflen,
+                             usbhost_asynch_t callback, FAR void *arg)
 {
   FAR struct stm32l4_chan_s *chan;
   int ret;
@@ -2082,8 +2085,9 @@ static int stm32l4_out_setup(FAR struct stm32l4_usbhost_s *priv, int chidx)
  *
  ****************************************************************************/
 
-static ssize_t stm32l4_out_transfer(FAR struct stm32l4_usbhost_s *priv, int chidx,
-                                  FAR uint8_t *buffer, size_t buflen)
+static ssize_t stm32l4_out_transfer(FAR struct stm32l4_usbhost_s *priv,
+                                    int chidx, FAR uint8_t *buffer,
+                                    size_t buflen)
 {
   FAR struct stm32l4_chan_s *chan;
   systime_t start;
@@ -2196,7 +2200,7 @@ static ssize_t stm32l4_out_transfer(FAR struct stm32l4_usbhost_s *priv, int chid
 
 #ifdef CONFIG_USBHOST_ASYNCH
 static void stm32l4_out_next(FAR struct stm32l4_usbhost_s *priv,
-                           FAR struct stm32l4_chan_s *chan)
+                             FAR struct stm32l4_chan_s *chan)
 {
   usbhost_asynch_t callback;
   FAR void *arg;
@@ -2261,8 +2265,8 @@ static void stm32l4_out_next(FAR struct stm32l4_usbhost_s *priv,
 
 #ifdef CONFIG_USBHOST_ASYNCH
 static int stm32l4_out_asynch(FAR struct stm32l4_usbhost_s *priv, int chidx,
-                            FAR uint8_t *buffer, size_t buflen,
-                            usbhost_asynch_t callback, FAR void *arg)
+                              FAR uint8_t *buffer, size_t buflen,
+                              usbhost_asynch_t callback, FAR void *arg)
 {
   FAR struct stm32l4_chan_s *chan;
   int ret;
@@ -2305,7 +2309,7 @@ static int stm32l4_out_asynch(FAR struct stm32l4_usbhost_s *priv, int chidx,
  ****************************************************************************/
 
 static void stm32l4_gint_wrpacket(FAR struct stm32l4_usbhost_s *priv,
-                                FAR uint8_t *buffer, int chidx, int buflen)
+                                  FAR uint8_t *buffer, int chidx, int buflen)
 {
   FAR uint32_t *src;
   uint32_t fifo;
@@ -2355,7 +2359,7 @@ static void stm32l4_gint_wrpacket(FAR struct stm32l4_usbhost_s *priv,
  ****************************************************************************/
 
 static inline void stm32l4_gint_hcinisr(FAR struct stm32l4_usbhost_s *priv,
-                                      int chidx)
+                                        int chidx)
 {
   FAR struct stm32l4_chan_s *chan = &priv->chan[chidx];
   uint32_t regval;
@@ -2616,7 +2620,7 @@ static inline void stm32l4_gint_hcinisr(FAR struct stm32l4_usbhost_s *priv,
  ****************************************************************************/
 
 static inline void stm32l4_gint_hcoutisr(FAR struct stm32l4_usbhost_s *priv,
-                                       int chidx)
+                                         int chidx)
 {
   FAR struct stm32l4_chan_s *chan = &priv->chan[chidx];
   uint32_t regval;
@@ -3732,7 +3736,7 @@ static void stm32l4_txfe_enable(FAR struct stm32l4_usbhost_s *priv, int chidx)
  ****************************************************************************/
 
 static int stm32l4_wait(FAR struct usbhost_connection_s *conn,
-                      FAR struct usbhost_hubport_s **hport)
+                        FAR struct usbhost_hubport_s **hport)
 {
   FAR struct stm32l4_usbhost_s *priv = &g_usbhost;
   struct usbhost_hubport_s *connport;
@@ -3819,8 +3823,8 @@ static int stm32l4_wait(FAR struct usbhost_connection_s *conn,
  ****************************************************************************/
 
 static int stm32l4_rh_enumerate(FAR struct stm32l4_usbhost_s *priv,
-                              FAR struct usbhost_connection_s *conn,
-                              FAR struct usbhost_hubport_s *hport)
+                                FAR struct usbhost_connection_s *conn,
+                                FAR struct usbhost_hubport_s *hport)
 {
   uint32_t regval;
   int ret;
@@ -3873,7 +3877,7 @@ static int stm32l4_rh_enumerate(FAR struct stm32l4_usbhost_s *priv,
 }
 
 static int stm32l4_enumerate(FAR struct usbhost_connection_s *conn,
-                           FAR struct usbhost_hubport_s *hport)
+                             FAR struct usbhost_hubport_s *hport)
 {
   FAR struct stm32l4_usbhost_s *priv = &g_usbhost;
   int ret;
@@ -3946,9 +3950,9 @@ static int stm32l4_enumerate(FAR struct usbhost_connection_s *conn,
  *
  ************************************************************************************/
 
-static int stm32l4_ep0configure(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
-                              uint8_t funcaddr, uint8_t speed,
-                              uint16_t maxpacketsize)
+static int stm32l4_ep0configure(FAR struct usbhost_driver_s *drvr,
+                                usbhost_ep_t ep0, uint8_t funcaddr,
+                                uint8_t speed, uint16_t maxpacketsize)
 {
   FAR struct stm32l4_usbhost_s *priv = (FAR struct stm32l4_usbhost_s *)drvr;
   FAR struct stm32l4_ctrlinfo_s *ep0info = (FAR struct stm32l4_ctrlinfo_s *)ep0;
@@ -4006,8 +4010,8 @@ static int stm32l4_ep0configure(FAR struct usbhost_driver_s *drvr, usbhost_ep_t
  ************************************************************************************/
 
 static int stm32l4_epalloc(FAR struct usbhost_driver_s *drvr,
-                         FAR const struct usbhost_epdesc_s *epdesc,
-                         FAR usbhost_ep_t *ep)
+                           FAR const struct usbhost_epdesc_s *epdesc,
+                           FAR usbhost_ep_t *ep)
 {
   FAR struct stm32l4_usbhost_s *priv = (FAR struct stm32l4_usbhost_s *)drvr;
   int ret;
@@ -4129,9 +4133,9 @@ static int stm32l4_epfree(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep)
  *   - Never called from an interrupt handler.
  *
  ****************************************************************************/
-
+#warning this function name is too generic
 static int stm32l4_alloc(FAR struct usbhost_driver_s *drvr,
-                       FAR uint8_t **buffer, FAR size_t *maxlen)
+                         FAR uint8_t **buffer, FAR size_t *maxlen)
 {
   FAR uint8_t *alloc;
 
@@ -4174,7 +4178,7 @@ static int stm32l4_alloc(FAR struct usbhost_driver_s *drvr,
  *   - Never called from an interrupt handler.
  *
  ****************************************************************************/
-
+#warning this function name is too generic
 static int stm32l4_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer)
 {
   /* There is no special memory requirement */
@@ -4210,9 +4214,9 @@ static int stm32l4_free(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer)
  *   This function will *not* be called from an interrupt handler.
  *
  ************************************************************************************/
-
+#warning this function name is too generic
 static int stm32l4_ioalloc(FAR struct usbhost_driver_s *drvr,
-                         FAR uint8_t **buffer, size_t buflen)
+                           FAR uint8_t **buffer, size_t buflen)
 {
   FAR uint8_t *alloc;
 
@@ -4254,7 +4258,7 @@ static int stm32l4_ioalloc(FAR struct usbhost_driver_s *drvr,
  *   This function will *not* be called from an interrupt handler.
  *
  ************************************************************************************/
-
+#warning this function name is too generic
 static int stm32l4_iofree(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer)
 {
   /* There is no special memory requirement */
@@ -4300,8 +4304,8 @@ static int stm32l4_iofree(FAR struct usbhost_driver_s *drvr, FAR uint8_t *buffer
  ****************************************************************************/
 
 static int stm32l4_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
-                        FAR const struct usb_ctrlreq_s *req,
-                        FAR uint8_t *buffer)
+                          FAR const struct usb_ctrlreq_s *req,
+                          FAR uint8_t *buffer)
 {
   FAR struct stm32l4_usbhost_s *priv = (FAR struct stm32l4_usbhost_s *)drvr;
   FAR struct stm32l4_ctrlinfo_s *ep0info = (FAR struct stm32l4_ctrlinfo_s *)ep0;
@@ -4385,8 +4389,8 @@ static int stm32l4_ctrlin(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
 }
 
 static int stm32l4_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
-                         FAR const struct usb_ctrlreq_s *req,
-                         FAR const uint8_t *buffer)
+                           FAR const struct usb_ctrlreq_s *req,
+                           FAR const uint8_t *buffer)
 {
   FAR struct stm32l4_usbhost_s *priv = (FAR struct stm32l4_usbhost_s *)drvr;
   FAR struct stm32l4_ctrlinfo_s *ep0info = (FAR struct stm32l4_ctrlinfo_s *)ep0;
@@ -4510,7 +4514,7 @@ static int stm32l4_ctrlout(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep0,
  ****************************************************************************/
 
 static ssize_t stm32l4_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep,
-                              FAR uint8_t *buffer, size_t buflen)
+                                FAR uint8_t *buffer, size_t buflen)
 {
   FAR struct stm32l4_usbhost_s *priv  = (FAR struct stm32l4_usbhost_s *)drvr;
   unsigned int chidx = (unsigned int)ep;
@@ -4576,8 +4580,8 @@ static ssize_t stm32l4_transfer(FAR struct usbhost_driver_s *drvr, usbhost_ep_t
 
 #ifdef CONFIG_USBHOST_ASYNCH
 static int stm32l4_asynch(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep,
-                        FAR uint8_t *buffer, size_t buflen,
-                        usbhost_asynch_t callback, FAR void *arg)
+                          FAR uint8_t *buffer, size_t buflen,
+                          usbhost_asynch_t callback, FAR void *arg)
 {
   FAR struct stm32l4_usbhost_s *priv  = (FAR struct stm32l4_usbhost_s *)drvr;
   unsigned int chidx = (unsigned int)ep;
@@ -4717,8 +4721,8 @@ static int stm32l4_cancel(FAR struct usbhost_driver_s *drvr, usbhost_ep_t ep)
 
 #ifdef CONFIG_USBHOST_HUB
 static int stm32l4_connect(FAR struct usbhost_driver_s *drvr,
-                         FAR struct usbhost_hubport_s *hport,
-                         bool connected)
+                           FAR struct usbhost_hubport_s *hport,
+                           bool connected)
 {
   FAR struct stm32l4_usbhost_s *priv = (FAR struct stm32l4_usbhost_s *)drvr;
   irqstate_t flags;
@@ -4771,7 +4775,7 @@ static int stm32l4_connect(FAR struct usbhost_driver_s *drvr,
  ****************************************************************************/
 
 static void stm32l4_disconnect(FAR struct usbhost_driver_s *drvr,
-                             FAR struct usbhost_hubport_s *hport)
+                               FAR struct usbhost_hubport_s *hport)
 {
   DEBUGASSERT(hport != NULL);
   hport->devclass = NULL;
diff --git a/arch/arm/src/stm32l4/stm32l4_rtcc.c b/arch/arm/src/stm32l4/stm32l4_rtcc.c
index d15a8981b4..338d9a5407 100644
--- a/arch/arm/src/stm32l4/stm32l4_rtcc.c
+++ b/arch/arm/src/stm32l4/stm32l4_rtcc.c
@@ -535,7 +535,7 @@ static void rtc_resume(void)
  ************************************************************************************/
 
 #ifdef CONFIG_RTC_ALARM
-static int stm32l4_rtc_alarm_handler(int irq, void *context)
+static int stm32l4_rtc_alarm_handler(int irq, FAR void *context)
 {
   FAR struct alm_cbinfo_s *cbinfo;
   alm_callback_t cb;
diff --git a/arch/arm/src/stm32l4/stm32l4_tickless.c b/arch/arm/src/stm32l4/stm32l4_tickless.c
index b14bef51e8..9474f720c5 100644
--- a/arch/arm/src/stm32l4/stm32l4_tickless.c
+++ b/arch/arm/src/stm32l4/stm32l4_tickless.c
@@ -152,7 +152,7 @@ static struct stm32l4_tickless_s g_tickless;
  *
  ****************************************************************************/
 
-static void stm32l4_oneshot_handler(void *arg)
+static void stm32l4_oneshot_handler(FAR void *arg)
 {
   tmrinfo("Expired...\n");
   sched_timer_expiration();
diff --git a/arch/arm/src/stm32l4/stm32l4_tim.c b/arch/arm/src/stm32l4/stm32l4_tim.c
index d4c560855c..57440d902a 100644
--- a/arch/arm/src/stm32l4/stm32l4_tim.c
+++ b/arch/arm/src/stm32l4/stm32l4_tim.c
@@ -217,7 +217,7 @@
 
 struct stm32l4_tim_priv_s
 {
-  const struct stm32l4_tim_ops_s *ops;
+  FAR const struct stm32l4_tim_ops_s *ops;
   stm32l4_tim_mode_t mode;
   uint32_t base;                      /* TIMn base address */
 };
@@ -229,16 +229,16 @@ struct stm32l4_tim_priv_s
 /* Register helpers */
 
 static inline uint16_t stm32l4_getreg16(FAR struct stm32l4_tim_dev_s *dev,
-                                      uint8_t offset);
-static inline void stm32l4_putreg16(FAR struct stm32l4_tim_dev_s *dev, uint8_t offset,
-                                  uint16_t value);
+                                        uint8_t offset);
+static inline void stm32l4_putreg16(FAR struct stm32l4_tim_dev_s *dev, 
+                                    uint8_t offset, uint16_t value);
 static inline void stm32l4_modifyreg16(FAR struct stm32l4_tim_dev_s *dev,
-                                     uint8_t offset, uint16_t clearbits,
-                                     uint16_t setbits);
+                                       uint8_t offset, uint16_t clearbits,
+                                       uint16_t setbits);
 static inline uint32_t stm32l4_getreg32(FAR struct stm32l4_tim_dev_s *dev,
-                                      uint8_t offset);
-static inline void stm32l4_putreg32(FAR struct stm32l4_tim_dev_s *dev, uint8_t offset,
-                                  uint32_t value);
+                                        uint8_t offset);
+static inline void stm32l4_putreg32(FAR struct stm32l4_tim_dev_s *dev,
+                                    uint8_t offset, uint32_t value);
 
 /* Timer helpers */
 
@@ -254,21 +254,26 @@ static void stm32l4_tim_gpioconfig(uint32_t cfg, stm32l4_tim_channel_t mode);
 
 /* Timer methods */
 
-static int stm32l4_tim_setmode(FAR struct stm32l4_tim_dev_s *dev, stm32l4_tim_mode_t mode);
-static int stm32l4_tim_setclock(FAR struct stm32l4_tim_dev_s *dev, uint32_t freq);
+static int stm32l4_tim_setmode(FAR struct stm32l4_tim_dev_s *dev,
+                               stm32l4_tim_mode_t mode);
+static int stm32l4_tim_setclock(FAR struct stm32l4_tim_dev_s *dev,
+                                uint32_t freq);
 static void stm32l4_tim_setperiod(FAR struct stm32l4_tim_dev_s *dev,
-                                uint32_t period);
+                                  uint32_t period);
 static uint32_t stm32l4_tim_getcounter(FAR struct stm32l4_tim_dev_s *dev);
-static int stm32l4_tim_setchannel(FAR struct stm32l4_tim_dev_s *dev, uint8_t channel,
-                                stm32l4_tim_channel_t mode);
-static int stm32l4_tim_setcompare(FAR struct stm32l4_tim_dev_s *dev, uint8_t channel,
-                                uint32_t compare);
-static int stm32l4_tim_getcapture(FAR struct stm32l4_tim_dev_s *dev, uint8_t channel);
+static int stm32l4_tim_setchannel(FAR struct stm32l4_tim_dev_s *dev, 
+                                  uint8_t channel, stm32l4_tim_channel_t mode);
+static int stm32l4_tim_setcompare(FAR struct stm32l4_tim_dev_s *dev, 
+                                  uint8_t channel, uint32_t compare);
+static int stm32l4_tim_getcapture(FAR struct stm32l4_tim_dev_s *dev,
+                                  uint8_t channel);
 static int stm32l4_tim_setisr(FAR struct stm32l4_tim_dev_s *dev,
-                            int (*handler)(int irq, void *context),
-                            int source);
-static void stm32l4_tim_enableint(FAR struct stm32l4_tim_dev_s *dev, int source);
-static void stm32l4_tim_disableint(FAR struct stm32l4_tim_dev_s *dev, int source);
+                              int (*handler)(int irq, FAR void *context),
+                              int source);
+static void stm32l4_tim_enableint(FAR struct stm32l4_tim_dev_s *dev,
+                                  int source);
+static void stm32l4_tim_disableint(FAR struct stm32l4_tim_dev_s *dev,
+                                   int source);
 static void stm32l4_tim_ackint(FAR struct stm32l4_tim_dev_s *dev, int source);
 static int stm32l4_tim_checkint(FAR struct stm32l4_tim_dev_s *dev, int source);
 
@@ -403,7 +408,7 @@ struct stm32l4_tim_priv_s stm32l4_tim17_priv =
  ************************************************************************************/
 
 static inline uint16_t stm32l4_getreg16(FAR struct stm32l4_tim_dev_s *dev,
-                                      uint8_t offset)
+                                        uint8_t offset)
 {
   return getreg16(((struct stm32l4_tim_priv_s *)dev)->base + offset);
 }
@@ -416,8 +421,8 @@ static inline uint16_t stm32l4_getreg16(FAR struct stm32l4_tim_dev_s *dev,
  *
  ************************************************************************************/
 
-static inline void stm32l4_putreg16(FAR struct stm32l4_tim_dev_s *dev, uint8_t offset,
-                                  uint16_t value)
+static inline void stm32l4_putreg16(FAR struct stm32l4_tim_dev_s *dev,
+                                    uint8_t offset, uint16_t value)
 {
   putreg16(value, ((struct stm32l4_tim_priv_s *)dev)->base + offset);
 }
@@ -431,10 +436,11 @@ static inline void stm32l4_putreg16(FAR struct stm32l4_tim_dev_s *dev, uint8_t o
  ************************************************************************************/
 
 static inline void stm32l4_modifyreg16(FAR struct stm32l4_tim_dev_s *dev,
-                                     uint8_t offset, uint16_t clearbits,
-                                     uint16_t setbits)
+                                       uint8_t offset, uint16_t clearbits,
+                                       uint16_t setbits)
 {
-  modifyreg16(((struct stm32l4_tim_priv_s *)dev)->base + offset, clearbits, setbits);
+  modifyreg16(((struct stm32l4_tim_priv_s *)dev)->base + offset, clearbits,
+              setbits);
 }
 
 /************************************************************************************
@@ -447,7 +453,7 @@ static inline void stm32l4_modifyreg16(FAR struct stm32l4_tim_dev_s *dev,
  ************************************************************************************/
 
 static inline uint32_t stm32l4_getreg32(FAR struct stm32l4_tim_dev_s *dev,
-                                      uint8_t offset)
+                                        uint8_t offset)
 {
   return getreg32(((struct stm32l4_tim_priv_s *)dev)->base + offset);
 }
@@ -461,8 +467,8 @@ static inline uint32_t stm32l4_getreg32(FAR struct stm32l4_tim_dev_s *dev,
  *
  ************************************************************************************/
 
-static inline void stm32l4_putreg32(FAR struct stm32l4_tim_dev_s *dev, uint8_t offset,
-                                  uint32_t value)
+static inline void stm32l4_putreg32(FAR struct stm32l4_tim_dev_s *dev,
+                                    uint8_t offset, uint32_t value)
 {
   putreg32(value, ((struct stm32l4_tim_priv_s *)dev)->base + offset);
 }
@@ -541,7 +547,8 @@ static void stm32l4_tim_gpioconfig(uint32_t cfg, stm32l4_tim_channel_t mode)
  * Name: stm32l4_tim_setmode
  ************************************************************************************/
 
-static int stm32l4_tim_setmode(FAR struct stm32l4_tim_dev_s *dev, stm32l4_tim_mode_t mode)
+static int stm32l4_tim_setmode(FAR struct stm32l4_tim_dev_s *dev,
+                               stm32l4_tim_mode_t mode)
 {
   uint16_t val = ATIM_CR1_CEN | ATIM_CR1_ARPE;
 
@@ -611,7 +618,8 @@ static int stm32l4_tim_setmode(FAR struct stm32l4_tim_dev_s *dev, stm32l4_tim_mo
  * Name: stm32l4_tim_setclock
  ************************************************************************************/
 
-static int stm32l4_tim_setclock(FAR struct stm32l4_tim_dev_s *dev, uint32_t freq)
+static int stm32l4_tim_setclock(FAR struct stm32l4_tim_dev_s *dev,
+                                uint32_t freq)
 {
   uint32_t freqin;
   int prescaler;
@@ -747,8 +755,8 @@ static uint32_t stm32l4_tim_getcounter(FAR struct stm32l4_tim_dev_s *dev)
  * Name: stm32l4_tim_setchannel
  ************************************************************************************/
 
-static int stm32l4_tim_setchannel(FAR struct stm32l4_tim_dev_s *dev, uint8_t channel,
-                                stm32l4_tim_channel_t mode)
+static int stm32l4_tim_setchannel(FAR struct stm32l4_tim_dev_s *dev,
+                                  uint8_t channel, stm32l4_tim_channel_t mode)
 {
   uint16_t ccmr_orig   = 0;
   uint16_t ccmr_val    = 0;
@@ -1096,8 +1104,8 @@ static int stm32l4_tim_setchannel(FAR struct stm32l4_tim_dev_s *dev, uint8_t cha
  * Name: stm32l4_tim_setcompare
  ************************************************************************************/
 
-static int stm32l4_tim_setcompare(FAR struct stm32l4_tim_dev_s *dev, uint8_t channel,
-                                uint32_t compare)
+static int stm32l4_tim_setcompare(FAR struct stm32l4_tim_dev_s *dev,
+                                  uint8_t channel, uint32_t compare)
 {
   DEBUGASSERT(dev != NULL);
 
@@ -1125,7 +1133,8 @@ static int stm32l4_tim_setcompare(FAR struct stm32l4_tim_dev_s *dev, uint8_t cha
  * Name: stm32l4_tim_getcapture
  ************************************************************************************/
 
-static int stm32l4_tim_getcapture(FAR struct stm32l4_tim_dev_s *dev, uint8_t channel)
+static int stm32l4_tim_getcapture(FAR struct stm32l4_tim_dev_s *dev,
+                                  uint8_t channel)
 {
   DEBUGASSERT(dev != NULL);
 
@@ -1149,8 +1158,8 @@ static int stm32l4_tim_getcapture(FAR struct stm32l4_tim_dev_s *dev, uint8_t cha
  ************************************************************************************/
 
 static int stm32l4_tim_setisr(FAR struct stm32l4_tim_dev_s *dev,
-                            int (*handler)(int irq, void *context),
-                            int source)
+                              int (*handler)(int irq, FAR void *context),
+                              int source)
 {
   int vectorno;
 
@@ -1256,7 +1265,8 @@ static void stm32l4_tim_enableint(FAR struct stm32l4_tim_dev_s *dev, int source)
  * Name: stm32l4_tim_disableint
  ************************************************************************************/
 
-static void stm32l4_tim_disableint(FAR struct stm32l4_tim_dev_s *dev, int source)
+static void stm32l4_tim_disableint(FAR struct stm32l4_tim_dev_s *dev,
+                                   int source)
 {
   DEBUGASSERT(dev != NULL);
   stm32l4_modifyreg16(dev, STM32L4_BTIM_DIER_OFFSET, ATIM_DIER_UIE, 0);
@@ -1386,7 +1396,7 @@ FAR struct stm32l4_tim_dev_s *stm32l4_tim_init(int timer)
  *
  ************************************************************************************/
 
-int stm32l4_tim_deinit(FAR struct stm32l4_tim_dev_s * dev)
+int stm32l4_tim_deinit(FAR struct stm32l4_tim_dev_s *dev)
 {
   DEBUGASSERT(dev != NULL);
 
diff --git a/arch/arm/src/stm32l4/stm32l4_tim_lowerhalf.c b/arch/arm/src/stm32l4/stm32l4_tim_lowerhalf.c
index 7fff996234..e7d0d72dbd 100644
--- a/arch/arm/src/stm32l4/stm32l4_tim_lowerhalf.c
+++ b/arch/arm/src/stm32l4/stm32l4_tim_lowerhalf.c
@@ -144,9 +144,9 @@ static int stm32l4_timer_handler(FAR struct stm32l4_lowerhalf_s *lower);
 static int stm32l4_start(FAR struct timer_lowerhalf_s *lower);
 static int stm32l4_stop(FAR struct timer_lowerhalf_s *lower);
 static int stm32l4_settimeout(FAR struct timer_lowerhalf_s *lower,
-                            uint32_t timeout);
+                              uint32_t timeout);
 static tccb_t stm32l4_sethandler(FAR struct timer_lowerhalf_s *lower,
-                               tccb_t handler);
+                                 tccb_t handler);
 
 /****************************************************************************
  * Private Data
@@ -437,9 +437,9 @@ static int stm32l4_start(FAR struct timer_lowerhalf_s *lower)
  *
  ****************************************************************************/
 
-static int stm32l4_stop(struct timer_lowerhalf_s *lower)
+static int stm32l4_stop(FAR struct timer_lowerhalf_s *lower)
 {
-  struct stm32l4_lowerhalf_s *priv = (struct stm32l4_lowerhalf_s *)lower;
+  FAR struct stm32l4_lowerhalf_s *priv = (FAR struct stm32l4_lowerhalf_s *)lower;
 
   if (priv->started)
     {
@@ -471,7 +471,8 @@ static int stm32l4_stop(struct timer_lowerhalf_s *lower)
  *
  ****************************************************************************/
 
-static int stm32l4_settimeout(FAR struct timer_lowerhalf_s *lower, uint32_t timeout)
+static int stm32l4_settimeout(FAR struct timer_lowerhalf_s *lower,
+                              uint32_t timeout)
 {
   FAR struct stm32l4_lowerhalf_s *priv = (FAR struct stm32l4_lowerhalf_s *)lower;
   uint64_t maxtimeout;
@@ -517,7 +518,7 @@ static int stm32l4_settimeout(FAR struct timer_lowerhalf_s *lower, uint32_t time
  ****************************************************************************/
 
 static tccb_t stm32l4_sethandler(FAR struct timer_lowerhalf_s *lower,
-                               tccb_t newhandler)
+                                 tccb_t newhandler)
 {
   FAR struct stm32l4_lowerhalf_s *priv = (FAR struct stm32l4_lowerhalf_s *)lower;
 
-- 
GitLab


From 4172016667b5e491ad3a11d11aa2ad7d7aa6dd3d Mon Sep 17 00:00:00 2001
From: Sebastien Lorquet 
Date: Tue, 12 Jul 2016 01:04:15 +0200
Subject: [PATCH 211/229] revert changes made by greg

---
 arch/arm/src/stm32l4/stm32l4_otgfsdev.c | 189 +++++++++++-------------
 1 file changed, 86 insertions(+), 103 deletions(-)

diff --git a/arch/arm/src/stm32l4/stm32l4_otgfsdev.c b/arch/arm/src/stm32l4/stm32l4_otgfsdev.c
index 620059f99c..6d891282c9 100644
--- a/arch/arm/src/stm32l4/stm32l4_otgfsdev.c
+++ b/arch/arm/src/stm32l4/stm32l4_otgfsdev.c
@@ -468,7 +468,7 @@ struct stm32l4_ctrlreq_s
 struct stm32l4_req_s
 {
   struct usbdev_req_s  req;           /* Standard USB request */
-  FAR struct stm32l4_req_s  *flink;   /* Supports a singly linked list */
+  struct stm32l4_req_s  *flink;         /* Supports a singly linked list */
 };
 
 /* This is the internal representation of an endpoint */
@@ -484,9 +484,9 @@ struct stm32l4_ep_s
 
   /* STM32-specific fields */
 
-  FAR struct stm32l4_usbdev_s *dev;      /* Reference to private driver data */
-  FAR struct stm32l4_req_s    *head;     /* Request list for this endpoint */
-  FAR struct stm32l4_req_s    *tail;
+  struct stm32l4_usbdev_s *dev;          /* Reference to private driver data */
+  struct stm32l4_req_s    *head;         /* Request list for this endpoint */
+  struct stm32l4_req_s    *tail;
   uint8_t                epphy;        /* Physical EP address */
   uint8_t                eptype:2;     /* Endpoint type */
   uint8_t                active:1;     /* 1: A request is being processed */
@@ -509,7 +509,7 @@ struct stm32l4_usbdev_s
 
   /* The bound device class driver */
 
-  FAR struct usbdevclass_driver_s *driver;
+  struct usbdevclass_driver_s *driver;
 
   /* STM32-specific fields */
 
@@ -573,14 +573,13 @@ static void        stm32l4_putreg(uint32_t val, uint32_t addr);
 
 static FAR struct stm32l4_req_s *stm32l4_req_remfirst(FAR struct stm32l4_ep_s *privep);
 static bool       stm32l4_req_addlast(FAR struct stm32l4_ep_s *privep,
-                                      FAR struct stm32l4_req_s *req);
+                    FAR struct stm32l4_req_s *req);
 
 /* Low level data transfers and request operations *****************************/
 /* Special endpoint 0 data transfer logic */
 
 static void        stm32l4_ep0in_setupresponse(FAR struct stm32l4_usbdev_s *priv,
-                                               FAR uint8_t *data,
-                                               uint32_t nbytes);
+                     FAR uint8_t *data, uint32_t nbytes);
 static inline void stm32l4_ep0in_transmitzlp(FAR struct stm32l4_usbdev_s *priv);
 static void        stm32l4_ep0in_activate(void);
 
@@ -589,61 +588,56 @@ static void        stm32l4_ep0out_ctrlsetup(FAR struct stm32l4_usbdev_s *priv);
 /* IN request and TxFIFO handling */
 
 static void        stm32l4_txfifo_write(FAR struct stm32l4_ep_s *privep,
-                                        FAR uint8_t *buf, int nbytes);
+                     FAR uint8_t *buf, int nbytes);
 static void        stm32l4_epin_transfer(FAR struct stm32l4_ep_s *privep,
-                                         FAR uint8_t *buf, int nbytes);
+                     FAR uint8_t *buf, int nbytes);
 static void        stm32l4_epin_request(FAR struct stm32l4_usbdev_s *priv,
-                                        FAR struct stm32l4_ep_s *privep);
+                     FAR struct stm32l4_ep_s *privep);
 
 /* OUT request and RxFIFO handling */
 
 static void        stm32l4_rxfifo_read(FAR struct stm32l4_ep_s *privep,
-                                       FAR uint8_t *dest, uint16_t len);
-static void        stm32l4_rxfifo_discard(FAR struct stm32l4_ep_s *privep,
-                                          int len);
+                     FAR uint8_t *dest, uint16_t len);
+static void        stm32l4_rxfifo_discard(FAR struct stm32l4_ep_s *privep, int len);
 static void        stm32l4_epout_complete(FAR struct stm32l4_usbdev_s *priv,
-                                          FAR struct stm32l4_ep_s *privep);
-static inline void stm32l4_ep0out_receive(FAR struct stm32l4_ep_s *privep,
-                                          int bcnt);
-static inline void stm32l4_epout_receive(FAR struct stm32l4_ep_s *privep,
-                                         int bcnt);
+                     FAR struct stm32l4_ep_s *privep);
+static inline void stm32l4_ep0out_receive(FAR struct stm32l4_ep_s *privep, int bcnt);
+static inline void stm32l4_epout_receive(FAR struct stm32l4_ep_s *privep, int bcnt);
 static void        stm32l4_epout_request(FAR struct stm32l4_usbdev_s *priv,
-                                         FAR struct stm32l4_ep_s *privep);
+                     FAR struct stm32l4_ep_s *privep);
 
 /* General request handling */
 
 static void        stm32l4_ep_flush(FAR struct stm32l4_ep_s *privep);
 static void        stm32l4_req_complete(FAR struct stm32l4_ep_s *privep,
-                                        int16_t result);
+                     int16_t result);
 static void        stm32l4_req_cancel(FAR struct stm32l4_ep_s *privep,
-                                      int16_t status);
+                     int16_t status);
 
 /* Interrupt handling **********************************************************/
 
 static struct      stm32l4_ep_s *stm32l4_ep_findbyaddr(struct stm32l4_usbdev_s *priv,
-                                                       uint16_t eplog);
+                     uint16_t eplog);
 static int         stm32l4_req_dispatch(FAR struct stm32l4_usbdev_s *priv,
-                                        FAR const struct usb_ctrlreq_s *ctrl);
+                     FAR const struct usb_ctrlreq_s *ctrl);
 static void        stm32l4_usbreset(FAR struct stm32l4_usbdev_s *priv);
 
 /* Second level OUT endpoint interrupt processing */
 
 static inline void stm32l4_ep0out_testmode(FAR struct stm32l4_usbdev_s *priv,
-                                           uint16_t index);
-static inline void stm32l4_ep0out_stdrequest(FAR struct stm32l4_usbdev_s *priv,
-                                             FAR struct stm32l4_ctrlreq_s *ctrlreq);
+                     uint16_t index);
+static inline void stm32l4_ep0out_stdrequest(struct stm32l4_usbdev_s *priv,
+                     FAR struct stm32l4_ctrlreq_s *ctrlreq);
 static inline void stm32l4_ep0out_setup(struct stm32l4_usbdev_s *priv);
 static inline void stm32l4_epout(FAR struct stm32l4_usbdev_s *priv,
-                                 uint8_t epno);
+                     uint8_t epno);
 static inline void stm32l4_epout_interrupt(FAR struct stm32l4_usbdev_s *priv);
 
 /* Second level IN endpoint interrupt processing */
 
 static inline void stm32l4_epin_runtestmode(FAR struct stm32l4_usbdev_s *priv);
-static inline void stm32l4_epin(FAR struct stm32l4_usbdev_s *priv,
-                                uint8_t epno);
-static inline void stm32l4_epin_txfifoempty(FAR struct stm32l4_usbdev_s *priv,
-                                            int epno);
+static inline void stm32l4_epin(FAR struct stm32l4_usbdev_s *priv, uint8_t epno);
+static inline void stm32l4_epin_txfifoempty(FAR struct stm32l4_usbdev_s *priv, int epno);
 static inline void stm32l4_epin_interrupt(FAR struct stm32l4_usbdev_s *priv);
 
 /* Other second level interrupt processing */
@@ -674,12 +668,11 @@ static void        stm32l4_disablegonak(FAR struct stm32l4_ep_s *privep);
 /* Endpoint configuration */
 
 static int         stm32l4_epout_configure(FAR struct stm32l4_ep_s *privep,
-                                           uint8_t eptype, uint16_t maxpacket);
+                     uint8_t eptype, uint16_t maxpacket);
 static int         stm32l4_epin_configure(FAR struct stm32l4_ep_s *privep,
-                                          uint8_t eptype, uint16_t maxpacket);
+                     uint8_t eptype, uint16_t maxpacket);
 static int         stm32l4_ep_configure(FAR struct usbdev_ep_s *ep,
-                                        FAR const struct usb_epdesc_s *desc,
-                                        bool last);
+                     FAR const struct usb_epdesc_s *desc, bool last);
 static void        stm32l4_ep0_configure(FAR struct stm32l4_usbdev_s *priv);
 
 /* Endpoint disable */
@@ -692,26 +685,24 @@ static int         stm32l4_ep_disable(FAR struct usbdev_ep_s *ep);
 
 static FAR struct usbdev_req_s *stm32l4_ep_allocreq(FAR struct usbdev_ep_s *ep);
 static void        stm32l4_ep_freereq(FAR struct usbdev_ep_s *ep,
-                                      FAR struct usbdev_req_s *);
+                     FAR struct usbdev_req_s *);
 
 /* Endpoint buffer management */
 
 #ifdef CONFIG_USBDEV_DMA
-static void       *stm32l4_ep_allocbuffer(FAR struct usbdev_ep_s *ep,
-                                          unsigned bytes);
-static void        stm32l4_ep_freebuffer(FAR struct usbdev_ep_s *ep,
-                                         FAR void *buf);
+static void       *stm32l4_ep_allocbuffer(FAR struct usbdev_ep_s *ep, unsigned bytes);
+static void        stm32l4_ep_freebuffer(FAR struct usbdev_ep_s *ep, FAR void *buf);
 #endif
 
 /* Endpoint request submission */
 
 static int         stm32l4_ep_submit(FAR struct usbdev_ep_s *ep,
-                                     FAR struct usbdev_req_s *req);
+                     struct usbdev_req_s *req);
 
 /* Endpoint request cancellation */
 
 static int         stm32l4_ep_cancel(FAR struct usbdev_ep_s *ep,
-                                     FAR struct usbdev_req_s *req);
+                     struct usbdev_req_s *req);
 
 /* Stall handling */
 
@@ -725,19 +716,18 @@ static void        stm32l4_ep0_stall(FAR struct stm32l4_usbdev_s *priv);
 /* Endpoint allocation */
 
 static FAR struct usbdev_ep_s *stm32l4_ep_alloc(FAR struct usbdev_s *dev,
-                                                uint8_t epno, bool in,
-                                                uint8_t eptype);
+                     uint8_t epno, bool in, uint8_t eptype);
 static void        stm32l4_ep_free(FAR struct usbdev_s *dev,
-                                   FAR struct usbdev_ep_s *ep);
+                     FAR struct usbdev_ep_s *ep);
 
 /* USB device controller operations ********************************************/
 
-static int         stm32l4_getframe(FAR struct usbdev_s *dev);
-static int         stm32l4_wakeup(FAR struct usbdev_s *dev);
-static int         stm32l4_selfpowered(FAR struct usbdev_s *dev, bool selfpowered);
-static int         stm32l4_pullup(FAR struct usbdev_s *dev, bool enable);
-static void        stm32l4_setaddress(FAR struct stm32l4_usbdev_s *priv,
-                                      uint16_t address);
+static int         stm32l4_getframe(struct usbdev_s *dev);
+static int         stm32l4_wakeup(struct usbdev_s *dev);
+static int         stm32l4_selfpowered(struct usbdev_s *dev, bool selfpowered);
+static int         stm32l4_pullup(struct usbdev_s *dev, bool enable);
+static void        stm32l4_setaddress(struct stm32l4_usbdev_s *priv,
+                     uint16_t address);
 static int         stm32l4_txfifo_flush(uint32_t txfnum);
 static int         stm32l4_rxfifo_flush(void);
 
@@ -1002,7 +992,7 @@ static FAR struct stm32l4_req_s *stm32l4_req_remfirst(FAR struct stm32l4_ep_s *p
  ****************************************************************************/
 
 static bool stm32l4_req_addlast(FAR struct stm32l4_ep_s *privep,
-                                FAR struct stm32l4_req_s *req)
+                              FAR struct stm32l4_req_s *req)
 {
   bool is_empty = !privep->head;
 
@@ -1029,7 +1019,7 @@ static bool stm32l4_req_addlast(FAR struct stm32l4_ep_s *privep,
  ****************************************************************************/
 
 static void stm32l4_ep0in_setupresponse(FAR struct stm32l4_usbdev_s *priv,
-                                        FAR uint8_t *buf, uint32_t nbytes)
+                                      FAR uint8_t *buf, uint32_t nbytes)
 {
   stm32l4_epin_transfer(&priv->epin[EP0], buf, nbytes);
   priv->ep0state = EP0STATE_SETUPRESPONSE;
@@ -1122,7 +1112,7 @@ static void stm32l4_ep0out_ctrlsetup(FAR struct stm32l4_usbdev_s *priv)
  ****************************************************************************/
 
 static void stm32l4_txfifo_write(FAR struct stm32l4_ep_s *privep,
-                                 FAR uint8_t *buf, int nbytes)
+                               FAR uint8_t *buf, int nbytes)
 {
   uint32_t regaddr;
   uint32_t regval;
@@ -1167,7 +1157,7 @@ static void stm32l4_txfifo_write(FAR struct stm32l4_ep_s *privep,
  ****************************************************************************/
 
 static void stm32l4_epin_transfer(FAR struct stm32l4_ep_s *privep,
-                                  FAR uint8_t *buf, int nbytes)
+                                FAR uint8_t *buf, int nbytes)
 {
   uint32_t pktcnt;
   uint32_t regval;
@@ -1267,7 +1257,7 @@ static void stm32l4_epin_transfer(FAR struct stm32l4_ep_s *privep,
  ****************************************************************************/
 
 static void stm32l4_epin_request(FAR struct stm32l4_usbdev_s *priv,
-                                 FAR struct stm32l4_ep_s *privep)
+                               FAR struct stm32l4_ep_s *privep)
 {
   struct stm32l4_req_s *privreq;
   uint32_t regaddr;
@@ -1487,7 +1477,7 @@ static void stm32l4_epin_request(FAR struct stm32l4_usbdev_s *priv,
  ****************************************************************************/
 
 static void stm32l4_rxfifo_read(FAR struct stm32l4_ep_s *privep,
-                                FAR uint8_t *dest, uint16_t len)
+                              FAR uint8_t *dest, uint16_t len)
 {
   uint32_t regaddr;
   int i;
@@ -1567,9 +1557,9 @@ static void stm32l4_rxfifo_discard(FAR struct stm32l4_ep_s *privep, int len)
  ****************************************************************************/
 
 static void stm32l4_epout_complete(FAR struct stm32l4_usbdev_s *priv,
-                                   FAR struct stm32l4_ep_s *privep)
+                                 FAR struct stm32l4_ep_s *privep)
 {
-  FAR struct stm32l4_req_s *privreq;
+  struct stm32l4_req_s *privreq;
 
   /* Since a transfer just completed, there must be a read request at the head of
    * the endpoint request queue.
@@ -1615,8 +1605,7 @@ static void stm32l4_epout_complete(FAR struct stm32l4_usbdev_s *priv,
  *
  ****************************************************************************/
 
-static inline void stm32l4_ep0out_receive(FAR struct stm32l4_ep_s *privep,
-                                          int bcnt)
+static inline void stm32l4_ep0out_receive(FAR struct stm32l4_ep_s *privep, int bcnt)
 {
   FAR struct stm32l4_usbdev_s *priv;
 
@@ -1674,11 +1663,10 @@ static inline void stm32l4_ep0out_receive(FAR struct stm32l4_ep_s *privep,
  *
  ****************************************************************************/
 
-static inline void stm32l4_epout_receive(FAR struct stm32l4_ep_s *privep,
-                                         int bcnt)
+static inline void stm32l4_epout_receive(FAR struct stm32l4_ep_s *privep, int bcnt)
 {
-  FAR struct stm32l4_req_s *privreq;
-  FAR uint8_t *dest;
+  struct stm32l4_req_s *privreq;
+  uint8_t *dest;
   int buflen;
   int readlen;
 
@@ -1758,9 +1746,9 @@ static inline void stm32l4_epout_receive(FAR struct stm32l4_ep_s *privep,
  ****************************************************************************/
 
 static void stm32l4_epout_request(FAR struct stm32l4_usbdev_s *priv,
-                                  FAR struct stm32l4_ep_s *privep)
+                                FAR struct stm32l4_ep_s *privep)
 {
-  FAR struct stm32l4_req_s *privreq;
+  struct stm32l4_req_s *privreq;
   uint32_t regaddr;
   uint32_t regval;
   uint32_t xfrsize;
@@ -1894,7 +1882,7 @@ static void stm32l4_epout_request(FAR struct stm32l4_usbdev_s *priv,
  *
  ****************************************************************************/
 
-static void stm32l4_ep_flush(FAR struct stm32l4_ep_s *privep)
+static void stm32l4_ep_flush(struct stm32l4_ep_s *privep)
 {
   if (privep->isin)
     {
@@ -1914,8 +1902,7 @@ static void stm32l4_ep_flush(FAR struct stm32l4_ep_s *privep)
  *
  ****************************************************************************/
 
-static void stm32l4_req_complete(FAR struct stm32l4_ep_s *privep,
-                                 int16_t result)
+static void stm32l4_req_complete(struct stm32l4_ep_s *privep, int16_t result)
 {
   FAR struct stm32l4_req_s *privreq;
 
@@ -1955,7 +1942,7 @@ static void stm32l4_req_complete(FAR struct stm32l4_ep_s *privep,
  *
  ****************************************************************************/
 
-static void stm32l4_req_cancel(FAR struct stm32l4_ep_s *privep, int16_t status)
+static void stm32l4_req_cancel(struct stm32l4_ep_s *privep, int16_t status)
 {
   if (!stm32l4_rqempty(privep))
     {
@@ -1979,8 +1966,8 @@ static void stm32l4_req_cancel(FAR struct stm32l4_ep_s *privep, int16_t status)
  *
  ****************************************************************************/
 
-static FAR struct stm32l4_ep_s *stm32l4_ep_findbyaddr(FAR struct stm32l4_usbdev_s *priv,
-                                                      uint16_t eplog)
+static struct stm32l4_ep_s *stm32l4_ep_findbyaddr(struct stm32l4_usbdev_s *priv,
+                                              uint16_t eplog)
 {
   struct stm32l4_ep_s *privep;
   uint8_t epphy = USB_EPNO(eplog);
@@ -2016,8 +2003,8 @@ static FAR struct stm32l4_ep_s *stm32l4_ep_findbyaddr(FAR struct stm32l4_usbdev_
  *
  ****************************************************************************/
 
-static int stm32l4_req_dispatch(FAR struct stm32l4_usbdev_s *priv,
-                                FAR const struct usb_ctrlreq_s *ctrl)
+static int stm32l4_req_dispatch(struct stm32l4_usbdev_s *priv,
+                              const struct usb_ctrlreq_s *ctrl)
 {
   int ret = -EIO;
 
@@ -2049,7 +2036,7 @@ static int stm32l4_req_dispatch(FAR struct stm32l4_usbdev_s *priv,
  *
  ****************************************************************************/
 
-static void stm32l4_usbreset(FAR struct stm32l4_usbdev_s *priv)
+static void stm32l4_usbreset(struct stm32l4_usbdev_s *priv)
 {
   FAR struct stm32l4_ep_s *privep;
   uint32_t regval;
@@ -2148,7 +2135,7 @@ static void stm32l4_usbreset(FAR struct stm32l4_usbdev_s *priv)
  ****************************************************************************/
 
 static inline void stm32l4_ep0out_testmode(FAR struct stm32l4_usbdev_s *priv,
-                                           uint16_t index)
+                                         uint16_t index)
 {
   uint8_t testmode;
 
@@ -2195,8 +2182,8 @@ static inline void stm32l4_ep0out_testmode(FAR struct stm32l4_usbdev_s *priv,
  *
  ****************************************************************************/
 
-static inline void stm32l4_ep0out_stdrequest(FAR struct stm32l4_usbdev_s *priv,
-                                             FAR struct stm32l4_ctrlreq_s *ctrlreq)
+static inline void stm32l4_ep0out_stdrequest(struct stm32l4_usbdev_s *priv,
+                                           FAR struct stm32l4_ctrlreq_s *ctrlreq)
 {
   FAR struct stm32l4_ep_s *privep;
 
@@ -2565,7 +2552,7 @@ static inline void stm32l4_ep0out_stdrequest(FAR struct stm32l4_usbdev_s *priv,
  *
  ****************************************************************************/
 
-static inline void stm32l4_ep0out_setup(FAR struct stm32l4_usbdev_s *priv)
+static inline void stm32l4_ep0out_setup(struct stm32l4_usbdev_s *priv)
 {
   struct stm32l4_ctrlreq_s ctrlreq;
 
@@ -3875,8 +3862,8 @@ static void stm32l4_disablegonak(FAR struct stm32l4_ep_s *privep)
  *
  ****************************************************************************/
 
-static int stm32l4_epout_configure(FAR struct stm32l4_ep_s *privep,
-                                   uint8_t eptype, uint16_t maxpacket)
+static int stm32l4_epout_configure(FAR struct stm32l4_ep_s *privep, uint8_t eptype,
+                                 uint16_t maxpacket)
 {
   uint32_t mpsiz;
   uint32_t regaddr;
@@ -3970,8 +3957,8 @@ static int stm32l4_epout_configure(FAR struct stm32l4_ep_s *privep,
  *
  ****************************************************************************/
 
-static int stm32l4_epin_configure(FAR struct stm32l4_ep_s *privep,
-                                  uint8_t eptype, uint16_t maxpacket)
+static int stm32l4_epin_configure(FAR struct stm32l4_ep_s *privep, uint8_t eptype,
+                                uint16_t maxpacket)
 {
   uint32_t mpsiz;
   uint32_t regaddr;
@@ -4071,8 +4058,8 @@ static int stm32l4_epin_configure(FAR struct stm32l4_ep_s *privep,
  ****************************************************************************/
 
 static int stm32l4_ep_configure(FAR struct usbdev_ep_s *ep,
-                                FAR const struct usb_epdesc_s *desc,
-                                bool last)
+                              FAR const struct usb_epdesc_s *desc,
+                              bool last)
 {
   FAR struct stm32l4_ep_s *privep = (FAR struct stm32l4_ep_s *)ep;
   uint16_t maxpacket;
@@ -4430,8 +4417,7 @@ static void stm32l4_ep_freebuffer(FAR struct usbdev_ep_s *ep, FAR void *buf)
  *
  ****************************************************************************/
 
-static int stm32l4_ep_submit(FAR struct usbdev_ep_s *ep,
-                             FAR struct usbdev_req_s *req)
+static int stm32l4_ep_submit(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *req)
 {
   FAR struct stm32l4_req_s *privreq = (FAR struct stm32l4_req_s *)req;
   FAR struct stm32l4_ep_s *privep = (FAR struct stm32l4_ep_s *)ep;
@@ -4525,8 +4511,7 @@ static int stm32l4_ep_submit(FAR struct usbdev_ep_s *ep,
  *
  ****************************************************************************/
 
-static int stm32l4_ep_cancel(FAR struct usbdev_ep_s *ep,
-                             FAR struct usbdev_req_s *req)
+static int stm32l4_ep_cancel(FAR struct usbdev_ep_s *ep, FAR struct usbdev_req_s *req)
 {
   FAR struct stm32l4_ep_s *privep = (FAR struct stm32l4_ep_s *)ep;
   irqstate_t flags;
@@ -4805,8 +4790,8 @@ static void stm32l4_ep0_stall(FAR struct stm32l4_usbdev_s *priv)
  ****************************************************************************/
 
 static FAR struct usbdev_ep_s *stm32l4_ep_alloc(FAR struct usbdev_s *dev,
-                                                uint8_t eplog, bool in,
-                                                uint8_t eptype)
+                                              uint8_t eplog, bool in,
+                                              uint8_t eptype)
 {
   FAR struct stm32l4_usbdev_s *priv = (FAR struct stm32l4_usbdev_s *)dev;
   uint8_t epavail;
@@ -4889,8 +4874,7 @@ static FAR struct usbdev_ep_s *stm32l4_ep_alloc(FAR struct usbdev_s *dev,
  *
  ****************************************************************************/
 
-static void stm32l4_ep_free(FAR struct usbdev_s *dev,
-                            FAR struct usbdev_ep_s *ep)
+static void stm32l4_ep_free(FAR struct usbdev_s *dev, FAR struct usbdev_ep_s *ep)
 {
   FAR struct stm32l4_usbdev_s *priv = (FAR struct stm32l4_usbdev_s *)dev;
   FAR struct stm32l4_ep_s *privep = (FAR struct stm32l4_ep_s *)ep;
@@ -4916,7 +4900,7 @@ static void stm32l4_ep_free(FAR struct usbdev_s *dev,
  *
  ****************************************************************************/
 
-static int stm32l4_getframe(FAR struct usbdev_s *dev)
+static int stm32l4_getframe(struct usbdev_s *dev)
 {
   uint32_t regval;
 
@@ -4936,7 +4920,7 @@ static int stm32l4_getframe(FAR struct usbdev_s *dev)
  *
  ****************************************************************************/
 
-static int stm32l4_wakeup(FAR struct usbdev_s *dev)
+static int stm32l4_wakeup(struct usbdev_s *dev)
 {
   FAR struct stm32l4_usbdev_s *priv = (FAR struct stm32l4_usbdev_s *)dev;
   uint32_t regval;
@@ -4984,7 +4968,7 @@ static int stm32l4_wakeup(FAR struct usbdev_s *dev)
  *
  ****************************************************************************/
 
-static int stm32l4_selfpowered(FAR struct usbdev_s *dev, bool selfpowered)
+static int stm32l4_selfpowered(struct usbdev_s *dev, bool selfpowered)
 {
   FAR struct stm32l4_usbdev_s *priv = (FAR struct stm32l4_usbdev_s *)dev;
 
@@ -5010,7 +4994,7 @@ static int stm32l4_selfpowered(FAR struct usbdev_s *dev, bool selfpowered)
  *
  ****************************************************************************/
 
-static int stm32l4_pullup(FAR struct usbdev_s *dev, bool enable)
+static int stm32l4_pullup(struct usbdev_s *dev, bool enable)
 {
   uint32_t regval;
 
@@ -5048,8 +5032,7 @@ static int stm32l4_pullup(FAR struct usbdev_s *dev, bool enable)
  *
  ****************************************************************************/
 
-static void stm32l4_setaddress(FAR struct stm32l4_usbdev_s *priv,
-                               uint16_t address)
+static void stm32l4_setaddress(struct stm32l4_usbdev_s *priv, uint16_t address)
 {
   uint32_t regval;
 
@@ -5672,7 +5655,7 @@ void up_usbuninitialize(void)
  *
  ****************************************************************************/
 
-int usbdev_register(FAR struct usbdevclass_driver_s *driver)
+int usbdev_register(struct usbdevclass_driver_s *driver)
 {
   /* At present, there is only a single OTG FS device support. Hence it is
    * pre-allocated as g_otgfsdev.  However, in most code, the private data
@@ -5743,7 +5726,7 @@ int usbdev_register(FAR struct usbdevclass_driver_s *driver)
  *
  ****************************************************************************/
 
-int usbdev_unregister(FAR struct usbdevclass_driver_s *driver)
+int usbdev_unregister(struct usbdevclass_driver_s *driver)
 {
   /* At present, there is only a single OTG FS device support. Hence it is
    * pre-allocated as g_otgfsdev.  However, in most code, the private data
-- 
GitLab


From b1740bc5d6909ede533249b6424d8852ca3e66d5 Mon Sep 17 00:00:00 2001
From: Heath Petersen 
Date: Tue, 12 Jul 2016 05:41:17 +0000
Subject: [PATCH 212/229] fix qemu-i486/ostest/Make.defs test for M32

---
 configs/qemu-i486/ostest/Make.defs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/qemu-i486/ostest/Make.defs b/configs/qemu-i486/ostest/Make.defs
index 72f26452bb..e2ac40b09f 100644
--- a/configs/qemu-i486/ostest/Make.defs
+++ b/configs/qemu-i486/ostest/Make.defs
@@ -71,7 +71,7 @@ ARCHDEFINES =
 
 # Check if building a 32-bit target with a 64-bit toolchain
 
-ifeq ($(ARCH_X86_M32),y)
+ifeq ($(CONFIG_ARCH_X86_M32),y)
 ARCHCPUFLAGS += -m32
 endif
 
-- 
GitLab


From 4f75609fa9e7189c4cf7db1d7f517119d00c4953 Mon Sep 17 00:00:00 2001
From: Heath Petersen 
Date: Tue, 12 Jul 2016 05:43:23 +0000
Subject: [PATCH 213/229] fix qemu-i486/nsh/Make.defs test for M32

---
 configs/qemu-i486/nsh/Make.defs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/qemu-i486/nsh/Make.defs b/configs/qemu-i486/nsh/Make.defs
index 7f5be321fd..0d16a608b0 100644
--- a/configs/qemu-i486/nsh/Make.defs
+++ b/configs/qemu-i486/nsh/Make.defs
@@ -71,7 +71,7 @@ ARCHDEFINES =
 
 # Check if building a 32-bit target with a 64-bit toolchain
 
-ifeq ($(ARCH_X86_M32),y)
+ifeq ($(CONFIG_ARCH_X86_M32),y)
 ARCHCPUFLAGS += -m32
 endif
 
-- 
GitLab


From dc72e16625480caf7aef29e589265c64de79a35c Mon Sep 17 00:00:00 2001
From: Heath Petersen 
Date: Tue, 12 Jul 2016 06:50:58 +0000
Subject: [PATCH 214/229] handle when CONFIG_SERIAL_UART_ARCH_IOCTL is not
 enabled

---
 drivers/serial/uart_16550.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/serial/uart_16550.c b/drivers/serial/uart_16550.c
index 022adf3abe..b55597bdf1 100644
--- a/drivers/serial/uart_16550.c
+++ b/drivers/serial/uart_16550.c
@@ -871,14 +871,17 @@ static int u16550_ioctl(struct file *filep, int cmd, unsigned long arg)
   struct inode      *inode = filep->f_inode;
   struct uart_dev_s *dev   = inode->i_private;
   struct u16550_s   *priv  = (FAR struct u16550_s *)dev->priv;
+  int ret;
 
 #ifdef CONFIG_SERIAL_UART_ARCH_IOCTL
-  int ret = uart_ioctl(filep, cmd, arg);
+  ret = uart_ioctl(filep, cmd, arg);
 
   if (ret != -ENOTTY)
     {
       return ret;
     }
+#else
+  ret = OK;
 #endif
 
   switch (cmd)
-- 
GitLab


From 38999dfe9d77b56754a03d96c93ddd9e1b5bf5b6 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 12 Jul 2016 09:46:09 -0600
Subject: [PATCH 215/229] Fix two incorrectly named header files

---
 .../chip/{kinetis_k40memormap.h => kinetis_k40memorymap.h}        | 0
 .../chip/{kinetis_k60memormap.h => kinetis_k60memorymap.h}        | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename arch/arm/src/kinetis/chip/{kinetis_k40memormap.h => kinetis_k40memorymap.h} (100%)
 rename arch/arm/src/kinetis/chip/{kinetis_k60memormap.h => kinetis_k60memorymap.h} (100%)

diff --git a/arch/arm/src/kinetis/chip/kinetis_k40memormap.h b/arch/arm/src/kinetis/chip/kinetis_k40memorymap.h
similarity index 100%
rename from arch/arm/src/kinetis/chip/kinetis_k40memormap.h
rename to arch/arm/src/kinetis/chip/kinetis_k40memorymap.h
diff --git a/arch/arm/src/kinetis/chip/kinetis_k60memormap.h b/arch/arm/src/kinetis/chip/kinetis_k60memorymap.h
similarity index 100%
rename from arch/arm/src/kinetis/chip/kinetis_k60memormap.h
rename to arch/arm/src/kinetis/chip/kinetis_k60memorymap.h
-- 
GitLab


From 3bc504b68576091163d0d23ff374d1a89da5071a Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 12 Jul 2016 06:58:21 -0600
Subject: [PATCH 216/229] Per comment from David Alession: M_E128 will never be
 used since it is greater than FLT_MAX.

---
 libc/math/lib_libexpif.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/libc/math/lib_libexpif.c b/libc/math/lib_libexpif.c
index 88dd9dd61e..1ab9b90f43 100644
--- a/libc/math/lib_libexpif.c
+++ b/libc/math/lib_libexpif.c
@@ -49,13 +49,16 @@
 #define M_E16    (M_E8  * M_E8)
 #define M_E32    (M_E16 * M_E16)
 #define M_E64    (M_E32 * M_E32)
-#define M_E128   (M_E64 * M_E64)
 
 /****************************************************************************
  * Private Data
  ****************************************************************************/
 
-static const float g_expif_square_tbl[8] =
+/* Values above M_E64 will never be used since it’s larger than FLT_MAX
+ *(3.402823e+38).
+ */
+
+static const float g_expif_square_tbl[7] =
 {
   (float)M_E,    /* e^1 */
   (float)M_E2,   /* e^2 */
@@ -64,7 +67,6 @@ static const float g_expif_square_tbl[8] =
   (float)M_E16,  /* e^16 */
   (float)M_E32,  /* e^32 */
   (float)M_E64,  /* e^64 */
-  (float)M_E128, /* e^128 */
 };
 
 /****************************************************************************
@@ -76,7 +78,7 @@ float lib_expif(size_t n)
   size_t i;
   float val;
 
-  if (n > 128)
+  if (n >= 128)
     {
       return INFINITY_F;
     }
-- 
GitLab


From c8f053de929fe2cbc5e7ed52f0c10f9c63cfb7d4 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 12 Jul 2016 09:34:16 -0600
Subject: [PATCH 217/229] Kinetis Ethernet:  Add support for the KSZ8081 PHY

---
 arch/arm/src/kinetis/Kconfig        |  46 +++++----
 arch/arm/src/kinetis/kinetis_enet.c | 153 +++++++++++++++++++++-------
 include/nuttx/net/mii.h             |   2 +-
 3 files changed, 140 insertions(+), 61 deletions(-)

diff --git a/arch/arm/src/kinetis/Kconfig b/arch/arm/src/kinetis/Kconfig
index 55a6930211..2e0ff4ae89 100644
--- a/arch/arm/src/kinetis/Kconfig
+++ b/arch/arm/src/kinetis/Kconfig
@@ -205,19 +205,22 @@ config KINETIS_UART5
 config KINETIS_ENET
 	bool "Ethernet"
 	default n
-	depends on ARCH_FAMILY_K60
-	select NET
+	depends on ARCH_FAMILY_K60 || ARCH_FAMILY_K64
+	select ARCH_HAVE_PHY
 	select ARCH_HAVE_NETDEV_STATISTICS
+	select NET
+	select NETDEVICES
+	select NET_MULTIBUFFER
 	---help---
-		Support Ethernet (K60 only)
+		Support Ethernet (K6x only)
 
 config KINETIS_RNGB
 	bool "Random number generator"
 	default n
-	depends on ARCH_FAMILY_K60
+	depends on ARCH_FAMILY_K60 || ARCH_FAMILY_K64
 	select ARCH_HAVE_RNG
 	---help---
-		Support the random number generator(K60 only)
+		Support the random number generator(K6x only)
 
 config KINETIS_FLEXCAN0
 	bool "FlexCAN0"
@@ -478,7 +481,7 @@ config KINETIS_FTM2_CHANNEL
 		If FTM2 is enabled for PWM usage, you also need specifies the timer output
 		channel {0,..,1}
 
-comment "Kinetis GPIO Interrupt Configuration"
+menu "Kinetis GPIO Interrupt Configuration"
 
 config GPIO_IRQ
 	bool "GPIO pin interrupts"
@@ -513,55 +516,54 @@ config KINETIS_PORTEINTS
 		Enable support for 32 interrupts from GPIO port E pins
 
 endif
+endmenu # Kinetis GPIO Interrupt Configuration
 
-if KINETIS_ENET
+menu "Kinetis Ethernet Configuration"
+	depends on KINETIS_ENET
 
-comment "Kinetis Ethernet Configuration"
-
-config ENET_ENHANCEDBD
+config KINETIS_ENETENHANCEDBD
 	bool "Use enhanced buffer descriptors"
 	default n
 	---help---
 		Use enhanced, 32-byte buffer descriptors
 
-config ENET_NETHIFS
+config KINETIS_ENETNETHIFS
 	int "Number of Ethernet interfaces"
 	default 1
 	---help---
 		Number of Ethernet interfaces supported by the hardware.  Must be
 		one for now.
 
-config ENET_NRXBUFFERS
+config KINETIS_ENETNRXBUFFERS
 	int "Number of Ethernet Rx buffers"
 	default 6
 	---help---
 		Number of Ethernet Rx buffers to use.  The size of one buffer is
 		determined by NET_BUFSIZE
 
-config ENET_NTXBUFFERS
+config KINETIS_ENETNTXBUFFERS
 	int "Number of Ethernet Tx buffers"
 	default 2
 	---help---
 		Number of Ethernet Tx buffers to use. The size of one buffer is
 		determined by NET_BUFSIZE
 
-config ENET_PHYADDR
+config KINETIS_ENETPHYADDR
 	int "PHY address"
 	default 1
 	---help---
 		MII/RMII address of the PHY
 
-config ENET_USEMII
+config KINETIS_ENETUSEMII
 	bool "Use MII interface"
 	default n
 	---help---
 		The the MII PHY interface.  Default:  Use RMII interface
 
-endif
+endmenu # Kinetis Ethernet Configuration
 
-if KINETIS_SDHC
-
-comment "Kinetis SDHC Configuration"
+menu "Kinetis SDHC Configuration"
+	depends on KINETIS_SDHC
 
 config KINETIS_SDHC_ABSFREQ
 	bool "Custom transfer frequencies"
@@ -611,11 +613,13 @@ config KINETIS_SDHC_DMAPRIO
 	---help---
 		SDHC DMA priority
 
-endif
+endmenu # Kinetis SDHC Configuration
 
-comment "Kinetis UART Configuration"
+menu "Kinetis UART Configuration"
 
 config KINETIS_UARTFIFOS
 	bool "Enable UART0 FIFO"
 	default n
 	depends on KINETIS_UART0
+
+endmenu # Kinetis UART Configuration
diff --git a/arch/arm/src/kinetis/kinetis_enet.c b/arch/arm/src/kinetis/kinetis_enet.c
index b3364a6bd3..c72c12951b 100644
--- a/arch/arm/src/kinetis/kinetis_enet.c
+++ b/arch/arm/src/kinetis/kinetis_enet.c
@@ -76,23 +76,23 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/* CONFIG_ENET_NETHIFS determines the number of physical interfaces
+/* CONFIG_KINETIS_ENETNETHIFS determines the number of physical interfaces
  * that will be supported.
  */
 
-#if CONFIG_ENET_NETHIFS != 1
-#  error "CONFIG_ENET_NETHIFS must be one for now"
+#if CONFIG_KINETIS_ENETNETHIFS != 1
+#  error "CONFIG_KINETIS_ENETNETHIFS must be one for now"
 #endif
 
-#if CONFIG_ENET_NTXBUFFERS < 1
+#if CONFIG_KINETIS_ENETNTXBUFFERS < 1
 #  error "Need at least one TX buffer"
 #endif
 
-#if CONFIG_ENET_NRXBUFFERS < 1
+#if CONFIG_KINETIS_ENETNRXBUFFERS < 1
 #  error "Need at least one RX buffer"
 #endif
 
-#define NENET_NBUFFERS (CONFIG_ENET_NTXBUFFERS+CONFIG_ENET_NRXBUFFERS)
+#define NENET_NBUFFERS (CONFIG_KINETIS_ENETNTXBUFFERS+CONFIG_KINETIS_ENETNRXBUFFERS)
 
 #ifndef CONFIG_NET_MULTIBUFFER
 #  error "CONFIG_NET_MULTIBUFFER is required in the configuration"
@@ -108,14 +108,47 @@
 #define MII_MAXPOLLS      (0x1ffff)
 #define LINK_WAITUS       (500*1000)
 
-/* PHY hardware specifics.  This was copied from the FreeScale code examples.
- * this is a vendor specific register and bit settings.  I really should
- * do the research and find out what this really is.
+/* PHY definitions.
+ *
+ * The selected PHY must be selected from the drivers/net/Kconfig PHY menu.
+ * A description of the PHY must be provided here.  That description must
+ * include:
+ *
+ * 1. BOARD_PHY_NAME: A PHY name string (for debug output),
+ * 2. BOARD_PHYID1 and BOARD_PHYID2: The PHYID1 and PHYID2 values (from
+ *    include/nuttx/net/mii.h)
+ * 3. BOARD_PHY_STATUS:  The address of the status register to use when
+ *    querying link status (from include/nuttx/net/mii.h)
+ * 4. BOARD_PHY_ISDUPLEX:  A macro that can convert the status register
+ *    value into a boolean: true=duplex mode, false=half-duplex mode
+ * 5. BOARD_PHY_10BASET:  A macro that can convert the status register
+ *    value into a boolean: true=10Base-T, false=Not 10Base-T
+ * 6. BOARD_PHY_100BASET:  A macro that can convert the status register
+ *    value into a boolean: true=100Base-T, false=Not 100Base-T
+ *
+ * The Tower SER board uses a KSZ8041 PHY.
+ * The Freedom K64F board uses a KSZ8081 PHY
  */
 
-#define PHY_STATUS         (0x1f)
-#define PHY_DUPLEX_STATUS  (4 << 2)
-#define PHY_SPEED_STATUS   (1 << 2)
+#if defined(CONFIG_ETH0_PHY_KSZ8041)
+#  define BOARD_PHY_NAME        "KSZ8041"
+#  define BOARD_PHYID1          MII_PHYID1_KSZ8041
+#  define BOARD_PHYID2          MII_PHYID2_KSZ8041
+#  define BOARD_PHY_STATUS      MII_KSZ8041_PHYCTRL2
+#  define BOARD_PHY_ISDUPLEX(s) (((s) & (4 << MII_PHYCTRL2_MODE_SHIFT)) != 0)
+#  define BOARD_PHY_10BASET(s)  (((s) & (1 << MII_PHYCTRL2_MODE_SHIFT)) != 0)
+#  define BOARD_PHY_100BASET(s) (((s) & (2 << MII_PHYCTRL2_MODE_SHIFT)) != 0)
+#elif defined(CONFIG_ETH0_PHY_KSZ8081)
+#  define BOARD_PHY_NAME        "KSZ8081"
+#  define BOARD_PHYID1          MII_PHYID1_KSZ8081
+#  define BOARD_PHYID2          MII_PHYID2_KSZ8081
+#  define BOARD_PHY_STATUS      MII_KSZ8081_PHYCTRL2
+#  define BOARD_PHY_ISDUPLEX(s) (((s) & (4 << MII_PHYCTRL2_MODE_SHIFT)) != 0)
+#  define BOARD_PHY_10BASET(s)  (((s) & (1 << MII_PHYCTRL2_MODE_SHIFT)) != 0)
+#  define BOARD_PHY_100BASET(s) (((s) & (2 << MII_PHYCTRL2_MODE_SHIFT)) != 0)
+#else
+#  error "Unrecognized or missing PHY selection"
+#endif
 
 /* Estimate the hold time to use based on the peripheral (bus) clock:
  *
@@ -188,7 +221,7 @@ struct kinetis_driver_s
  * Private Data
  ****************************************************************************/
 
-static struct kinetis_driver_s g_enet[CONFIG_ENET_NETHIFS];
+static struct kinetis_driver_s g_enet[CONFIG_KINETIS_ENETNETHIFS];
 
 /****************************************************************************
  * Private Function Prototypes
@@ -222,8 +255,8 @@ static int  kinetis_interrupt(int irq, FAR void *context);
 
 /* Watchdog timer expirations */
 
-static void kinetis_polltimer(int argc, uint32_t arg, ...);
 static void kinetis_txtimeout(int argc, uint32_t arg, ...);
+static void kinetis_polltimer(int argc, uint32_t arg, ...);
 
 /* NuttX callback functions */
 
@@ -241,6 +274,10 @@ static int kinetis_ioctl(struct net_driver_s *dev, int cmd, long arg);
 /* PHY/MII support */
 
 static inline void kinetis_initmii(struct kinetis_driver_s *priv);
+static int kinetis_writemii(struct kinetis_driver_s *priv, uint8_t phyaddr,
+                            uint8_t regaddr, uint16_t data);
+static int kinetis_readmii(struct kinetis_driver_s *priv, uint8_t phyaddr,
+                           uint8_t regaddr, uint16_t *data);
 static inline void kinetis_initphy(struct kinetis_driver_s *priv);
 
 /* Initialization */
@@ -323,7 +360,7 @@ static bool kinetics_txringfull(FAR struct kinetis_driver_s *priv)
    */
 
   txnext = priv->txhead + 1;
-  if (txnext >= CONFIG_ENET_NTXBUFFERS)
+  if (txnext >= CONFIG_KINETIS_ENETNTXBUFFERS)
     {
       txnext = 0;
     }
@@ -375,7 +412,7 @@ static int kinetis_transmit(FAR struct kinetis_driver_s *priv)
 
   txdesc = &priv->txdesc[priv->txhead];
   priv->txhead++;
-  if (priv->txhead >= CONFIG_ENET_NTXBUFFERS)
+  if (priv->txhead >= CONFIG_KINETIS_ENETNTXBUFFERS)
     {
       priv->txhead = 0;
     }
@@ -392,7 +429,7 @@ static int kinetis_transmit(FAR struct kinetis_driver_s *priv)
    */
 
   txdesc->length  = kinesis_swap16(priv->dev.d_len);
-#ifdef CONFIG_ENET_ENHANCEDBD
+#ifdef CONFIG_KINETIS_ENETENHANCEDBD
   txdesc->bdu     = 0x00000000;
   txdesc->status2 = TXDESC_INT | TXDESC_TS; /* | TXDESC_IINS | TXDESC_PINS; */
 #endif
@@ -668,7 +705,7 @@ static void kinetis_receive(FAR struct kinetis_driver_s *priv)
       /* Update the index to the next descriptor */
 
       priv->rxtail++;
-      if (priv->rxtail >= CONFIG_ENET_NRXBUFFERS)
+      if (priv->rxtail >= CONFIG_KINETIS_ENETNRXBUFFERS)
         {
           priv->rxtail = 0;
         }
@@ -708,7 +745,7 @@ static void kinetis_txdone(FAR struct kinetis_driver_s *priv)
       /* Yes.. bump up the tail pointer, making space for a new TX descriptor */
 
       priv->txtail++;
-      if (priv->txtail >= CONFIG_ENET_NTXBUFFERS)
+      if (priv->txtail >= CONFIG_KINETIS_ENETNTXBUFFERS)
         {
           priv->txtail = 0;
         }
@@ -961,7 +998,7 @@ static int kinetis_ifup(struct net_driver_s *dev)
 
   /* Select legacy of enhanced buffer descriptor format */
 
-#ifdef CONFIG_ENET_ENHANCEDBD
+#ifdef CONFIG_KINETIS_ENETENHANCEDBD
   putreg32(ENET_ECR_EN1588, KINETIS_ENET_ECR);
 #else
   putreg32(0, KINETIS_ENET_ECR);
@@ -1216,7 +1253,7 @@ static int kinetis_ioctl(struct net_driver_s *dev, int cmd, long arg)
     {
       struct mii_ioctl_data_s *req =
         (struct mii_ioctl_data_s *)((uintptr_t)arg);
-      req->phy_id = CONFIG_ENET_PHYADDR;
+      req->phy_id = CONFIG_KINETIS_ENETPHYADDR;
       ret = OK;
     }
     break;
@@ -1424,13 +1461,41 @@ static inline void kinetis_initphy(struct kinetis_driver_s *priv)
     {
       usleep(LINK_WAITUS);
       phydata = 0xffff;
-      kinetis_readmii(priv, CONFIG_ENET_PHYADDR, MII_PHYID1, &phydata);
+      kinetis_readmii(priv, CONFIG_KINETIS_ENETPHYADDR, MII_PHYID1, &phydata);
     }
   while (phydata == 0xffff);
 
+#if CONFIG_DEBUG_NET_ERROR
+  /* Verify PHYID1.  Compare OUI bits 3-18 */
+
+  ninfo("%s: PHYID1: %04x\n", BOARD_PHY_NAME, phydata);
+  if (phydata != BOARD_PHYID1)
+    {
+      nerr("ERROR: PHYID1=%04x incorrect for %s.  Expected %04x\n",
+           phydata, BOARD_PHY_NAME, BOARD_PHYID1);
+    }
+  else
+    {
+      /* Read PHYID2 */
+
+      kinetis_readmii(priv, CONFIG_KINETIS_ENETPHYADDR, MII_PHYID2, &phydata);
+      ninfo("%s: PHYID2: %04x\n", BOARD_PHY_NAME, phydata);
+
+      /* Verify PHYID2:  Compare OUI bits 19-24 and the 6-bit model number
+       * (ignoring the 4-bit revision number).
+       */
+
+      if ((phydata & 0xfff0) != (BOARD_PHYID2 & 0xfff0))
+        {
+          nerr("ERROR: PHYID2=%04x incorrect for %s.  Expected %04x\n",
+               (phydata & 0xfff0), BOARD_PHY_NAME, (BOARD_PHYID2 & 0xfff0));
+        }
+    }
+#endif
+
   /* Start auto negotiation */
 
-  kinetis_writemii(priv, CONFIG_ENET_PHYADDR, MII_MCR,
+  kinetis_writemii(priv, CONFIG_KINETIS_ENETPHYADDR, MII_MCR,
                   (MII_MCR_ANRESTART | MII_MCR_ANENABLE));
 
   /* Wait (potentially forever) for auto negotiation to complete */
@@ -1438,21 +1503,24 @@ static inline void kinetis_initphy(struct kinetis_driver_s *priv)
   do
     {
       usleep(LINK_WAITUS);
-      kinetis_readmii(priv, CONFIG_ENET_PHYADDR, MII_MSR, &phydata);
-
+      kinetis_readmii(priv, CONFIG_KINETIS_ENETPHYADDR, MII_MSR, &phydata);
     }
   while ((phydata & MII_MSR_ANEGCOMPLETE) == 0);
 
+  ninfo("%s: MII_MSR: %04x\n", BOARD_PHY_NAME, phydata);
+
   /* When we get here we have a link - Find the negotiated speed and duplex. */
 
   phydata = 0;
-  kinetis_readmii(priv, CONFIG_ENET_PHYADDR, PHY_STATUS, &phydata);
+  kinetis_readmii(priv, CONFIG_KINETIS_ENETPHYADDR, BOARD_PHY_STATUS, &phydata);
+
+  ninfo("%s: BOARD_PHY_STATUS: %04x\n", BOARD_PHY_NAME, phydata);
 
   /* Set up the transmit and receive control registers based on the
    * configuration and the auto negotiation results.
    */
 
-#ifdef CONFIG_ENET_USEMII
+#ifdef CONFIG_KINETIS_ENETUSEMII
   rcr = ENET_RCR_MII_MODE | ENET_RCR_CRCFWD |
         CONFIG_NET_ETH_MTU << ENET_RCR_MAX_FL_SHIFT |
         ENET_RCR_MII_MODE;
@@ -1468,7 +1536,7 @@ static inline void kinetis_initphy(struct kinetis_driver_s *priv)
 
   /* Setup half or full duplex */
 
-  if ((phydata & PHY_DUPLEX_STATUS) != 0)
+  if (BOARD_PHY_ISDUPLEX(phydata))
     {
       /* Full duplex */
 
@@ -1481,12 +1549,17 @@ static inline void kinetis_initphy(struct kinetis_driver_s *priv)
       rcr |= ENET_RCR_DRT;
     }
 
-  if ((phydata & PHY_SPEED_STATUS) != 0)
+  if (BOARD_PHY_10BASET(phydata))
     {
       /* 10Mbps */
 
       rcr |= ENET_RCR_RMII_10T;
     }
+  else if (!BOARD_PHY_100BASET(phydata))
+    {
+      nerr("ERROR: Neither 10- nor 100-BaseT reported: PHY STATUS=%04x\n",
+           phydata);
+    }
 
   putreg32(rcr, KINETIS_ENET_RCR);
   putreg32(tcr, KINETIS_ENET_TCR);
@@ -1520,7 +1593,7 @@ static void kinetis_initbuffers(struct kinetis_driver_s *priv)
 
   /* Get an aligned RX descriptor (array) address */
 
-  addr        +=  CONFIG_ENET_NTXBUFFERS * sizeof(struct enet_desc_s);
+  addr        +=  CONFIG_KINETIS_ENETNTXBUFFERS * sizeof(struct enet_desc_s);
   priv->rxdesc = (struct enet_desc_s *)addr;
 
   /* Get the beginning of the first aligned buffer */
@@ -1529,12 +1602,12 @@ static void kinetis_initbuffers(struct kinetis_driver_s *priv)
 
   /* Then fill in the TX descriptors */
 
-  for (i = 0; i < CONFIG_ENET_NTXBUFFERS; i++)
+  for (i = 0; i < CONFIG_KINETIS_ENETNTXBUFFERS; i++)
     {
       priv->txdesc[i].status1 = 0;
       priv->txdesc[i].length  = 0;
       priv->txdesc[i].data    = (uint8_t *)kinesis_swap32((uint32_t)addr);
-#ifdef CONFIG_ENET_ENHANCEDBD
+#ifdef CONFIG_KINETIS_ENETENHANCEDBD
       priv->txdesc[i].status2 = TXDESC_IINS | TXDESC_PINS;
 #endif
       addr                   += KINETIS_BUF_SIZE;
@@ -1542,12 +1615,12 @@ static void kinetis_initbuffers(struct kinetis_driver_s *priv)
 
   /* Then fill in the RX descriptors */
 
-  for (i = 0; i < CONFIG_ENET_NRXBUFFERS; i++)
+  for (i = 0; i < CONFIG_KINETIS_ENETNRXBUFFERS; i++)
     {
       priv->rxdesc[i].status1 = RXDESC_E;
       priv->rxdesc[i].length  = 0;
       priv->rxdesc[i].data    = (uint8_t *)kinesis_swap32((uint32_t)addr);
-#ifdef CONFIG_ENET_ENHANCEDBD
+#ifdef CONFIG_KINETIS_ENETENHANCEDBD
       priv->rxdesc[i].bdu     = 0;
       priv->rxdesc[i].status2 = RXDESC_INT;
 #endif
@@ -1556,8 +1629,8 @@ static void kinetis_initbuffers(struct kinetis_driver_s *priv)
 
   /* Set the wrap bit in the last descriptors to form a ring */
 
-  priv->txdesc[CONFIG_ENET_NTXBUFFERS-1].status1 |= TXDESC_W;
-  priv->rxdesc[CONFIG_ENET_NRXBUFFERS-1].status1 |= RXDESC_W;
+  priv->txdesc[CONFIG_KINETIS_ENETNTXBUFFERS-1].status1 |= TXDESC_W;
+  priv->rxdesc[CONFIG_KINETIS_ENETNRXBUFFERS-1].status1 |= RXDESC_W;
 
   /* We start with RX descriptor 0 and with no TX descriptors in use */
 
@@ -1631,7 +1704,7 @@ int kinetis_netinitialize(int intf)
 
   /* Get the interface structure associated with this interface number. */
 
-  DEBUGASSERT(intf < CONFIG_ENET_NETHIFS);
+  DEBUGASSERT(intf < CONFIG_KINETIS_ENETNETHIFS);
   priv = &g_enet[intf];
 
   /* Enable the ENET clock */
@@ -1646,9 +1719,9 @@ int kinetis_netinitialize(int intf)
 
   putreg32(0, KINETIS_MPU_CESR);
 
+#ifdef CONFIG_KINETIS_ENETUSEMII
   /* Configure all ENET/MII pins */
 
-#ifdef CONFIG_ENET_USEMII
   kinetis_pinconfig(PIN_MII0_MDIO);
   kinetis_pinconfig(PIN_MII0_MDC);
   kinetis_pinconfig(PIN_MII0_RXDV);
@@ -1668,6 +1741,8 @@ int kinetis_netinitialize(int intf)
   kinetis_pinconfig(PIN_MII0_CRS);
   kinetis_pinconfig(PIN_MII0_COL);
 #else
+  /* Use RMII subset */
+
   kinetis_pinconfig(PIN_RMII0_MDIO);
   kinetis_pinconfig(PIN_RMII0_MDC);
   kinetis_pinconfig(PIN_RMII0_CRS_DV);
@@ -1773,7 +1848,7 @@ int kinetis_netinitialize(int intf)
  *
  ****************************************************************************/
 
-#if CONFIG_ENET_NETHIFS == 1
+#if CONFIG_KINETIS_ENETNETHIFS == 1
 void up_netinitialize(void)
 {
   (void)kinetis_netinitialize(0);
diff --git a/include/nuttx/net/mii.h b/include/nuttx/net/mii.h
index 9d10beb32f..d595202738 100644
--- a/include/nuttx/net/mii.h
+++ b/include/nuttx/net/mii.h
@@ -547,7 +547,7 @@
 #define MII_KSZ80x1_INT_LU           (1 << 0)  /* Link up interrupt */
 
 /* KSZ8041 Register 0x1e: PHY Control 1 -- To be provided */
-/* KSZ8041 Register 0x1e: PHY Control 2 */
+/* KSZ8041 Register 0x1f: PHY Control 2 */
 
 #define MII_PHYCTRL2_MDIX            (1 << 15) /* Bit 15: Micrel/HP MDI/MDI-X state */
 #define MII_PHYCTRL2_MDIX_SEL        (1 << 14) /* Bit 14: MDI/MDI-X select */
-- 
GitLab


From de3b8d85a42190b3e0c91c132267e164e9c523e0 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 12 Jul 2016 09:40:49 -0600
Subject: [PATCH 218/229] Freedom K64F: Add a networking NSH configuration.

---
 configs/freedom-k64f/README.txt       |   33 +-
 configs/freedom-k64f/netnsh/Make.defs |  111 +++
 configs/freedom-k64f/netnsh/defconfig | 1142 +++++++++++++++++++++++++
 configs/freedom-k64f/netnsh/setenv.sh |   77 ++
 4 files changed, 1362 insertions(+), 1 deletion(-)
 create mode 100644 configs/freedom-k64f/netnsh/Make.defs
 create mode 100644 configs/freedom-k64f/netnsh/defconfig
 create mode 100644 configs/freedom-k64f/netnsh/setenv.sh

diff --git a/configs/freedom-k64f/README.txt b/configs/freedom-k64f/README.txt
index 87519c37fa..cfdac464d1 100644
--- a/configs/freedom-k64f/README.txt
+++ b/configs/freedom-k64f/README.txt
@@ -13,6 +13,9 @@ Contents
   o Ethernet
   o Development Environment
   o GNU Toolchain Options
+  o Freedom K64F Configuration Options
+  o Configurations
+  o Status
 
 Kinetis Freedom K64F Features:
 =============================
@@ -380,6 +383,23 @@ can be selected as follow:
 
 Where  is one of the following:
 
+  netnsh:
+  ------
+    This configuration is identical to the nsh configuration described
+    below except that networking support is enabled.
+
+    NOTES:
+
+    1. Most of the notes associated with the nsh configuration apply here
+       as well (see below).
+
+    2. Default platform/toolchain:
+
+       CONFIG_HOST_WINDOWS=y               : Cygwin under Windows
+       CONFIG_WINDOWS_CYGWIN=y
+       CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : ARM/mbed toolcahin (arm-none-elf-gcc)
+       CONFIG_INTELHEX_BINARY=y            : Output formats: Intel hex binary
+
   nsh:
   ---
     Configures the NuttShell (nsh) located at apps/examples/nsh using a
@@ -401,7 +421,7 @@ Where  is one of the following:
        CONFIG_HOST_LINUX=y                 : Linux (Cygwin under Windows okay too).
        CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y : Buildroot (arm-nuttx-elf-gcc)
        CONFIG_ARMV7M_OABI_TOOLCHAIN=y      : The older OABI version
-       CONFIG_RAW_BINARY=y                 : Output formats: ELF and raw binary
+       CONFIG_INTELHEX_BINARY=y            : Output formats: Intel hex binary
 
     3. The Serial Console is provided on UART3 with the correct pin
        configuration for use with an Arduino Serial Shield.
@@ -426,3 +446,14 @@ Where  is one of the following:
       CONFIG_SCHED_WORKQUEUE=y             : Enable the NuttX workqueue
 
       CONFIG_NSH_ARCHINIT=y                : Provide NSH initializeation logic
+
+Status
+======
+
+  2016-07-11:  Received hardware today and the board came up on the very
+    first try.  That does not happen often.  At this point, the very basic
+    NSH configuration is working and LEDs are working.  The only odd
+    behavior that I see is that pressing SW3 causes an unexpected interrupt
+    error.
+  2016-07-12:  Added support for the KSZ8081 PHY and added the netnsh
+    configuration.  Untested as of this writing.
diff --git a/configs/freedom-k64f/netnsh/Make.defs b/configs/freedom-k64f/netnsh/Make.defs
new file mode 100644
index 0000000000..81ee818d81
--- /dev/null
+++ b/configs/freedom-k64f/netnsh/Make.defs
@@ -0,0 +1,111 @@
+############################################################################
+# configs/freedom-k64f/netnsh/Make.defs
+#
+#   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.
+#
+############################################################################
+
+include ${TOPDIR}/.config
+include ${TOPDIR}/tools/Config.mk
+include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
+
+ifeq ($(WINTOOL),y)
+  # Windows-native toolchains
+  DIRLINK = $(TOPDIR)/tools/copydir.sh
+  DIRUNLINK = $(TOPDIR)/tools/unlink.sh
+  MKDEP = $(TOPDIR)/tools/mkwindeps.sh
+  ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
+  ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
+  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/flash.ld}"
+else
+  # Linux/Cygwin-native toolchain
+  MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
+  ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
+  ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
+  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/flash.ld
+endif
+
+CC = $(CROSSDEV)gcc
+CXX = $(CROSSDEV)g++
+CPP = $(CROSSDEV)gcc -E
+LD = $(CROSSDEV)ld
+AR = $(CROSSDEV)ar rcs
+NM = $(CROSSDEV)nm
+OBJCOPY = $(CROSSDEV)objcopy
+OBJDUMP = $(CROSSDEV)objdump
+
+ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
+ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
+
+ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
+  ARCHOPTIMIZATION = -g
+endif
+
+ifneq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
+endif
+
+ARCHCFLAGS = -fno-builtin
+ARCHCXXFLAGS = -fno-builtin -fno-exceptions
+ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
+ARCHWARNINGSXX = -Wall -Wshadow -Wundef
+ARCHDEFINES =
+ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
+
+CFLAGS = $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
+CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
+CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
+AFLAGS = $(CFLAGS) -D__ASSEMBLY__
+
+NXFLATLDFLAGS1 = -r -d -warn-common
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
+LDNXFLATFLAGS = -e main -s 2048
+
+ASMEXT = .S
+OBJEXT = .o
+LIBEXT = .a
+EXEEXT =
+
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
+  LDFLAGS += -nostartfiles -nodefaultlibs
+endif
+ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
+  LDFLAGS += -g
+endif
+
+
+HOSTCC = gcc
+HOSTINCLUDES = -I.
+HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe
+HOSTLDFLAGS =
+
diff --git a/configs/freedom-k64f/netnsh/defconfig b/configs/freedom-k64f/netnsh/defconfig
new file mode 100644
index 0000000000..0cb2657d58
--- /dev/null
+++ b/configs/freedom-k64f/netnsh/defconfig
@@ -0,0 +1,1142 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Nuttx/ Configuration
+#
+
+#
+# Build Setup
+#
+# CONFIG_EXPERIMENTAL is not set
+# CONFIG_DEFAULT_SMALL is not set
+# CONFIG_HOST_LINUX is not set
+# CONFIG_HOST_OSX is not set
+CONFIG_HOST_WINDOWS=y
+# CONFIG_HOST_OTHER is not set
+# CONFIG_WINDOWS_NATIVE is not set
+CONFIG_WINDOWS_CYGWIN=y
+# CONFIG_WINDOWS_MSYS is not set
+# CONFIG_WINDOWS_OTHER is not set
+
+#
+# Build Configuration
+#
+# CONFIG_APPS_DIR="../apps"
+CONFIG_BUILD_FLAT=y
+# CONFIG_BUILD_2PASS is not set
+
+#
+# Binary Output Formats
+#
+# CONFIG_RRLOAD_BINARY is not set
+CONFIG_INTELHEX_BINARY=y
+CONFIG_MOTOROLA_SREC=y
+# CONFIG_RAW_BINARY is not set
+# CONFIG_UBOOT_UIMAGE is not set
+
+#
+# Customize Header Files
+#
+# CONFIG_ARCH_STDINT_H is not set
+# CONFIG_ARCH_STDBOOL_H is not set
+# CONFIG_ARCH_MATH_H is not set
+# CONFIG_ARCH_FLOAT_H is not set
+# CONFIG_ARCH_STDARG_H is not set
+# CONFIG_ARCH_DEBUG_H is not set
+
+#
+# Debug Options
+#
+CONFIG_DEBUG_ALERT=y
+# CONFIG_DEBUG_FEATURES is not set
+CONFIG_ARCH_HAVE_STACKCHECK=y
+# CONFIG_STACK_COLORATION is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
+CONFIG_DEBUG_SYMBOLS=y
+CONFIG_ARCH_HAVE_CUSTOMOPT=y
+# CONFIG_DEBUG_NOOPT is not set
+# CONFIG_DEBUG_CUSTOMOPT is not set
+CONFIG_DEBUG_FULLOPT=y
+
+#
+# System Type
+#
+CONFIG_ARCH_ARM=y
+# CONFIG_ARCH_AVR is not set
+# CONFIG_ARCH_HC is not set
+# CONFIG_ARCH_MIPS is not set
+# CONFIG_ARCH_RGMP is not set
+# CONFIG_ARCH_SH is not set
+# CONFIG_ARCH_SIM is not set
+# CONFIG_ARCH_X86 is not set
+# CONFIG_ARCH_Z16 is not set
+# CONFIG_ARCH_Z80 is not set
+CONFIG_ARCH="arm"
+
+#
+# ARM Options
+#
+# CONFIG_ARCH_CHIP_A1X is not set
+# CONFIG_ARCH_CHIP_C5471 is not set
+# CONFIG_ARCH_CHIP_CALYPSO is not set
+# CONFIG_ARCH_CHIP_DM320 is not set
+# CONFIG_ARCH_CHIP_EFM32 is not set
+# CONFIG_ARCH_CHIP_IMX1 is not set
+# CONFIG_ARCH_CHIP_IMX6 is not set
+CONFIG_ARCH_CHIP_KINETIS=y
+# CONFIG_ARCH_CHIP_KL is not set
+# CONFIG_ARCH_CHIP_LM is not set
+# CONFIG_ARCH_CHIP_TIVA is not set
+# CONFIG_ARCH_CHIP_LPC11XX is not set
+# CONFIG_ARCH_CHIP_LPC17XX is not set
+# CONFIG_ARCH_CHIP_LPC214X is not set
+# CONFIG_ARCH_CHIP_LPC2378 is not set
+# CONFIG_ARCH_CHIP_LPC31XX is not set
+# CONFIG_ARCH_CHIP_LPC43XX is not set
+# CONFIG_ARCH_CHIP_NUC1XX is not set
+# CONFIG_ARCH_CHIP_SAMA5 is not set
+# CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
+# CONFIG_ARCH_CHIP_SAM34 is not set
+# CONFIG_ARCH_CHIP_SAMV7 is not set
+# CONFIG_ARCH_CHIP_STM32 is not set
+# CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
+# CONFIG_ARCH_CHIP_STR71X is not set
+# CONFIG_ARCH_CHIP_TMS570 is not set
+# CONFIG_ARCH_CHIP_MOXART is not set
+# CONFIG_ARCH_ARM7TDMI is not set
+# CONFIG_ARCH_ARM926EJS is not set
+# CONFIG_ARCH_ARM920T is not set
+# CONFIG_ARCH_CORTEXM0 is not set
+# CONFIG_ARCH_CORTEXM3 is not set
+CONFIG_ARCH_CORTEXM4=y
+# CONFIG_ARCH_CORTEXM7 is not set
+# CONFIG_ARCH_CORTEXA5 is not set
+# CONFIG_ARCH_CORTEXA8 is not set
+# CONFIG_ARCH_CORTEXA9 is not set
+# CONFIG_ARCH_CORTEXR4 is not set
+# CONFIG_ARCH_CORTEXR4F is not set
+# CONFIG_ARCH_CORTEXR5 is not set
+# CONFIG_ARCH_CORTEX5F is not set
+# CONFIG_ARCH_CORTEXR7 is not set
+# CONFIG_ARCH_CORTEXR7F is not set
+CONFIG_ARCH_FAMILY="armv7-m"
+CONFIG_ARCH_CHIP="kinetis"
+# CONFIG_ARM_TOOLCHAIN_IAR is not set
+CONFIG_ARM_TOOLCHAIN_GNU=y
+# CONFIG_ARMV7M_USEBASEPRI is not set
+CONFIG_ARCH_HAVE_FPU=y
+# CONFIG_ARCH_HAVE_DPFPU is not set
+# CONFIG_ARCH_FPU is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
+CONFIG_ARM_HAVE_MPU_UNIFIED=y
+# CONFIG_ARM_MPU is not set
+
+#
+# ARMV7M Configuration Options
+#
+# CONFIG_ARMV7M_HAVE_ICACHE is not set
+# CONFIG_ARMV7M_HAVE_DCACHE is not set
+# CONFIG_ARMV7M_HAVE_ITCM is not set
+# CONFIG_ARMV7M_HAVE_DTCM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_IARW is not set
+# CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
+# CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
+# CONFIG_ARMV7M_TOOLCHAIN_CODEREDW is not set
+# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW is not set
+# CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM is not set
+# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
+CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y
+# CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE is not set
+# CONFIG_ARMV7M_HAVE_STACKCHECK is not set
+# CONFIG_ARMV7M_ITMSYSLOG is not set
+
+#
+# Kinetis Configuration Options
+#
+# CONFIG_ARCH_CHIP_MK20DN32VLH5 is not set
+# CONFIG_ARCH_CHIP_MK20DX32VLH5 is not set
+# CONFIG_ARCH_CHIP_MK20DN64VLH5 is not set
+# CONFIG_ARCH_CHIP_MK20DX64VLH5 is not set
+# CONFIG_ARCH_CHIP_MK20DN128VLH5 is not set
+# CONFIG_ARCH_CHIP_MK20DX128VLH5 is not set
+# CONFIG_ARCH_CHIP_MK20DX64VLH7 is not set
+# CONFIG_ARCH_CHIP_MK20DX128VLH7 is not set
+# CONFIG_ARCH_CHIP_MK20DX256VLH7 is not set
+# CONFIG_ARCH_CHIP_MK40N512VLQ100 is not set
+# CONFIG_ARCH_CHIP_MK40N512VMD100 is not set
+# CONFIG_ARCH_CHIP_MK40X128VLQ100 is not set
+# CONFIG_ARCH_CHIP_MK40X128VMD100 is not set
+# CONFIG_ARCH_CHIP_MK40X256VLQ100 is not set
+# CONFIG_ARCH_CHIP_MK40X256VMD100 is not set
+# CONFIG_ARCH_CHIP_MK60N256VLQ100 is not set
+# CONFIG_ARCH_CHIP_MK60N256VMD100 is not set
+# CONFIG_ARCH_CHIP_MK60N512VLL100 is not set
+# CONFIG_ARCH_CHIP_MK60N512VLQ100 is not set
+# CONFIG_ARCH_CHIP_MK60N512VMD100 is not set
+# CONFIG_ARCH_CHIP_MK60X256VLQ100 is not set
+# CONFIG_ARCH_CHIP_MK60X256VMD100 is not set
+CONFIG_ARCH_CHIP_MK64FN1M0VLL12=y
+# CONFIG_ARCH_CHIP_MK64FX512VLL12 is not set
+# CONFIG_ARCH_CHIP_MK64FX512VDC12 is not set
+# CONFIG_ARCH_CHIP_MK64FN1M0VDC12 is not set
+# CONFIG_ARCH_CHIP_MK64FX512VLQ12 is not set
+# CONFIG_ARCH_CHIP_MK64FX512VMD12 is not set
+# CONFIG_ARCH_CHIP_MK64FN1M0VMD12 is not set
+# CONFIG_ARCH_FAMILY_K20 is not set
+# CONFIG_ARCH_FAMILY_K40 is not set
+# CONFIG_ARCH_FAMILY_K60 is not set
+CONFIG_ARCH_FAMILY_K64=y
+
+#
+# Kinetis Peripheral Support
+#
+# CONFIG_KINETIS_TRACE is not set
+# CONFIG_KINETIS_FLEXBUS is not set
+# CONFIG_KINETIS_UART0 is not set
+# CONFIG_KINETIS_UART1 is not set
+# CONFIG_KINETIS_UART2 is not set
+CONFIG_KINETIS_UART3=y
+# CONFIG_KINETIS_UART4 is not set
+# CONFIG_KINETIS_UART5 is not set
+CONFIG_KINETIS_ENET=y
+# CONFIG_KINETIS_RNGB is not set
+# CONFIG_KINETIS_FLEXCAN0 is not set
+# CONFIG_KINETIS_FLEXCAN1 is not set
+# CONFIG_KINETIS_SPI0 is not set
+# CONFIG_KINETIS_SPI1 is not set
+# CONFIG_KINETIS_SPI2 is not set
+# CONFIG_KINETIS_I2C0 is not set
+# CONFIG_KINETIS_I2C1 is not set
+# CONFIG_KINETIS_I2S is not set
+# CONFIG_KINETIS_DAC0 is not set
+# CONFIG_KINETIS_DAC1 is not set
+# CONFIG_KINETIS_ADC0 is not set
+# CONFIG_KINETIS_ADC1 is not set
+# CONFIG_KINETIS_CMP is not set
+# CONFIG_KINETIS_VREF is not set
+# CONFIG_KINETIS_SDHC is not set
+# CONFIG_KINETIS_FTM0 is not set
+# CONFIG_KINETIS_FTM1 is not set
+# CONFIG_KINETIS_FTM2 is not set
+# CONFIG_KINETIS_LPTIMER is not set
+# CONFIG_KINETIS_RTC is not set
+# CONFIG_KINETIS_EWM is not set
+# CONFIG_KINETIS_CMT is not set
+# CONFIG_KINETIS_USBOTG is not set
+# CONFIG_KINETIS_USBDCD is not set
+# CONFIG_KINETIS_LLWU is not set
+# CONFIG_KINETIS_TSI is not set
+# CONFIG_KINETIS_FTFL is not set
+# CONFIG_KINETIS_DMA is not set
+# CONFIG_KINETIS_CRC is not set
+# CONFIG_KINETIS_PDB is not set
+# CONFIG_KINETIS_PIT is not set
+
+#
+# Kinetis GPIO Interrupt Configuration
+#
+# CONFIG_GPIO_IRQ is not set
+
+#
+# Kinetis Ethernet Configuration
+#
+# CONFIG_KINETIS_ENETENHANCEDBD is not set
+CONFIG_KINETIS_ENETNETHIFS=1
+CONFIG_KINETIS_ENETNRXBUFFERS=6
+CONFIG_KINETIS_ENETNTXBUFFERS=2
+CONFIG_KINETIS_ENETPHYADDR=1
+# CONFIG_KINETIS_ENETUSEMII is not set
+
+#
+# Kinetis UART Configuration
+#
+
+#
+# Architecture Options
+#
+# CONFIG_ARCH_NOINTC is not set
+# CONFIG_ARCH_VECNOTIRQ is not set
+# CONFIG_ARCH_DMA is not set
+CONFIG_ARCH_HAVE_IRQPRIO=y
+# CONFIG_ARCH_L2CACHE is not set
+# CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
+# CONFIG_ARCH_HAVE_ADDRENV is not set
+# CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
+# CONFIG_ARCH_HAVE_MULTICPU is not set
+CONFIG_ARCH_HAVE_VFORK=y
+# CONFIG_ARCH_HAVE_MMU is not set
+CONFIG_ARCH_HAVE_MPU=y
+# CONFIG_ARCH_NAND_HWECC is not set
+# CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+CONFIG_ARCH_HAVE_RESET=y
+# CONFIG_ARCH_USE_MPU is not set
+# CONFIG_ARCH_IRQPRIO is not set
+CONFIG_ARCH_STACKDUMP=y
+# CONFIG_ENDIAN_BIG is not set
+# CONFIG_ARCH_IDLE_CUSTOM is not set
+CONFIG_ARCH_HAVE_RAMFUNCS=y
+CONFIG_ARCH_RAMFUNCS=y
+CONFIG_ARCH_HAVE_RAMVECTORS=y
+# CONFIG_ARCH_RAMVECTORS is not set
+
+#
+# Board Settings
+#
+CONFIG_BOARD_LOOPSPERMSEC=9535
+# CONFIG_ARCH_CALIBRATION is not set
+
+#
+# Interrupt options
+#
+CONFIG_ARCH_HAVE_INTERRUPTSTACK=y
+CONFIG_ARCH_INTERRUPTSTACK=0
+CONFIG_ARCH_HAVE_HIPRI_INTERRUPT=y
+# CONFIG_ARCH_HIPRI_INTERRUPT is not set
+
+#
+# Boot options
+#
+# CONFIG_BOOT_RUNFROMEXTSRAM is not set
+CONFIG_BOOT_RUNFROMFLASH=y
+# CONFIG_BOOT_RUNFROMISRAM is not set
+# CONFIG_BOOT_RUNFROMSDRAM is not set
+# CONFIG_BOOT_COPYTORAM is not set
+
+#
+# Boot Memory Configuration
+#
+CONFIG_RAM_START=0x1fff0000
+CONFIG_RAM_SIZE=131072
+# CONFIG_ARCH_HAVE_SDRAM is not set
+
+#
+# Board Selection
+#
+CONFIG_ARCH_BOARD_FREEDOM_K64F=y
+# CONFIG_ARCH_BOARD_CUSTOM is not set
+CONFIG_ARCH_BOARD="freedom-k64f"
+
+#
+# Common Board Options
+#
+CONFIG_ARCH_HAVE_LEDS=y
+CONFIG_ARCH_LEDS=y
+CONFIG_ARCH_HAVE_BUTTONS=y
+# CONFIG_ARCH_BUTTONS is not set
+CONFIG_ARCH_HAVE_IRQBUTTONS=y
+
+#
+# Board-Specific Options
+#
+# CONFIG_BOARD_CRASHDUMP is not set
+# CONFIG_LIB_BOARDCTL is not set
+
+#
+# RTOS Features
+#
+CONFIG_DISABLE_OS_API=y
+# CONFIG_DISABLE_POSIX_TIMERS is not set
+# CONFIG_DISABLE_PTHREAD is not set
+# CONFIG_DISABLE_SIGNALS is not set
+# CONFIG_DISABLE_MQUEUE is not set
+# CONFIG_DISABLE_ENVIRON is not set
+
+#
+# Clocks and Timers
+#
+CONFIG_USEC_PER_TICK=10000
+# CONFIG_SYSTEM_TIME64 is not set
+# CONFIG_CLOCK_MONOTONIC is not set
+# CONFIG_JULIAN_TIME is not set
+CONFIG_START_YEAR=2013
+CONFIG_START_MONTH=3
+CONFIG_START_DAY=25
+CONFIG_MAX_WDOGPARMS=2
+CONFIG_PREALLOC_WDOGS=4
+CONFIG_WDOG_INTRESERVE=0
+CONFIG_PREALLOC_TIMERS=4
+
+#
+# Tasks and Scheduling
+#
+# CONFIG_INIT_NONE is not set
+CONFIG_INIT_ENTRYPOINT=y
+# CONFIG_INIT_FILEPATH is not set
+CONFIG_USER_ENTRYPOINT="nsh_main"
+CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
+CONFIG_TASK_NAME_SIZE=0
+CONFIG_MAX_TASKS=16
+# CONFIG_SCHED_HAVE_PARENT is not set
+CONFIG_SCHED_WAITPID=y
+
+#
+# Pthread Options
+#
+# CONFIG_MUTEX_TYPES is not set
+CONFIG_NPTHREAD_KEYS=4
+
+#
+# Performance Monitoring
+#
+# CONFIG_SCHED_CPULOAD is not set
+# CONFIG_SCHED_INSTRUMENTATION is not set
+
+#
+# Files and I/O
+#
+CONFIG_DEV_CONSOLE=y
+# CONFIG_FDCLONE_DISABLE is not set
+# CONFIG_FDCLONE_STDIO is not set
+CONFIG_SDCLONE_DISABLE=y
+CONFIG_NFILE_DESCRIPTORS=8
+CONFIG_NFILE_STREAMS=8
+CONFIG_NAME_MAX=32
+# CONFIG_PRIORITY_INHERITANCE is not set
+
+#
+# RTOS hooks
+#
+# CONFIG_BOARD_INITIALIZE is not set
+# CONFIG_SCHED_STARTHOOK is not set
+# CONFIG_SCHED_ATEXIT is not set
+# CONFIG_SCHED_ONEXIT is not set
+
+#
+# Signal Numbers
+#
+CONFIG_SIG_SIGUSR1=1
+CONFIG_SIG_SIGUSR2=2
+CONFIG_SIG_SIGALARM=3
+CONFIG_SIG_SIGCONDTIMEDOUT=16
+
+#
+# POSIX Message Queue Options
+#
+CONFIG_PREALLOC_MQ_MSGS=4
+CONFIG_MQ_MAXMSGSIZE=32
+# CONFIG_MODULE is not set
+
+#
+# Work queue support
+#
+# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_SCHED_HPWORK is not set
+# CONFIG_SCHED_LPWORK is not set
+
+#
+# Stack and heap information
+#
+CONFIG_IDLETHREAD_STACKSIZE=1024
+CONFIG_USERMAIN_STACKSIZE=2048
+CONFIG_PTHREAD_STACK_MIN=256
+CONFIG_PTHREAD_STACK_DEFAULT=2048
+# CONFIG_LIB_SYSCALL is not set
+
+#
+# Device Drivers
+#
+CONFIG_DISABLE_POLL=y
+CONFIG_DEV_NULL=y
+# CONFIG_DEV_ZERO is not set
+# CONFIG_DEV_LOOP is not set
+
+#
+# Buffering
+#
+# CONFIG_DRVR_WRITEBUFFER is not set
+# CONFIG_DRVR_READAHEAD is not set
+# CONFIG_RAMDISK is not set
+# CONFIG_CAN is not set
+# CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
+# CONFIG_PWM is not set
+# CONFIG_ARCH_HAVE_I2CRESET is not set
+# CONFIG_I2C is not set
+# CONFIG_SPI is not set
+# CONFIG_I2S is not set
+
+#
+# Timer Driver Support
+#
+# CONFIG_TIMER is not set
+# CONFIG_RTC is not set
+# CONFIG_WATCHDOG is not set
+# CONFIG_ANALOG is not set
+# CONFIG_AUDIO_DEVICES is not set
+# CONFIG_VIDEO_DEVICES is not set
+# CONFIG_BCH is not set
+# CONFIG_INPUT is not set
+
+#
+# IO Expander/GPIO Support
+#
+# CONFIG_IOEXPANDER is not set
+# CONFIG_DEV_GPIO is not set
+
+#
+# LCD Driver Support
+#
+# CONFIG_LCD is not set
+# CONFIG_SLCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_RGBLED is not set
+# CONFIG_PCA9635PW is not set
+# CONFIG_NCP5623C is not set
+# CONFIG_MMCSD is not set
+# CONFIG_MODEM is not set
+# CONFIG_MTD is not set
+# CONFIG_EEPROM is not set
+CONFIG_NETDEVICES=y
+
+#
+# General Ethernet MAC Driver Options
+#
+# CONFIG_NETDEV_LOOPBACK is not set
+CONFIG_NETDEV_TELNET=y
+CONFIG_TELNET_RXBUFFER_SIZE=256
+CONFIG_TELNET_TXBUFFER_SIZE=256
+# CONFIG_NETDEV_MULTINIC is not set
+CONFIG_ARCH_HAVE_NETDEV_STATISTICS=y
+CONFIG_NETDEV_STATISTICS=y
+# CONFIG_NETDEV_LATEINIT is not set
+
+#
+# External Ethernet MAC Device Support
+#
+# CONFIG_NET_DM90x0 is not set
+# CONFIG_ENC28J60 is not set
+# CONFIG_ENCX24J600 is not set
+# CONFIG_NET_E1000 is not set
+# CONFIG_NET_SLIP is not set
+# CONFIG_NET_FTMAC100 is not set
+# CONFIG_NET_VNET is not set
+
+#
+# External Ethernet PHY Device Support
+#
+# CONFIG_ARCH_PHY_INTERRUPT is not set
+# CONFIG_ETH0_PHY_NONE is not set
+# CONFIG_ETH0_PHY_AM79C874 is not set
+# CONFIG_ETH0_PHY_KS8721 is not set
+# CONFIG_ETH0_PHY_KSZ8041 is not set
+# CONFIG_ETH0_PHY_KSZ8051 is not set
+# CONFIG_ETH0_PHY_KSZ8061 is not set
+CONFIG_ETH0_PHY_KSZ8081=y
+# CONFIG_ETH0_PHY_KSZ90x1 is not set
+# CONFIG_ETH0_PHY_DP83848C is not set
+# CONFIG_ETH0_PHY_LAN8720 is not set
+# CONFIG_ETH0_PHY_LAN8740 is not set
+# CONFIG_ETH0_PHY_LAN8740A is not set
+# CONFIG_ETH0_PHY_LAN8742A is not set
+# CONFIG_ETH0_PHY_DM9161 is not set
+# CONFIG_PIPES is not set
+# CONFIG_PM is not set
+# CONFIG_POWER is not set
+# CONFIG_SENSORS is not set
+# CONFIG_SERCOMM_CONSOLE is not set
+CONFIG_SERIAL=y
+# CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_SERIAL_REMOVABLE is not set
+CONFIG_SERIAL_CONSOLE=y
+# CONFIG_16550_UART is not set
+# CONFIG_UART_SERIALDRIVER is not set
+# CONFIG_UART0_SERIALDRIVER is not set
+# CONFIG_UART1_SERIALDRIVER is not set
+# CONFIG_UART2_SERIALDRIVER is not set
+CONFIG_UART3_SERIALDRIVER=y
+# CONFIG_UART4_SERIALDRIVER is not set
+# CONFIG_UART5_SERIALDRIVER is not set
+# CONFIG_UART6_SERIALDRIVER is not set
+# CONFIG_UART7_SERIALDRIVER is not set
+# CONFIG_UART8_SERIALDRIVER is not set
+# CONFIG_SCI0_SERIALDRIVER is not set
+# CONFIG_SCI1_SERIALDRIVER is not set
+# CONFIG_USART0_SERIALDRIVER is not set
+# CONFIG_USART1_SERIALDRIVER is not set
+# CONFIG_USART2_SERIALDRIVER is not set
+# CONFIG_USART3_SERIALDRIVER is not set
+# CONFIG_USART4_SERIALDRIVER is not set
+# CONFIG_USART5_SERIALDRIVER is not set
+# CONFIG_USART6_SERIALDRIVER is not set
+# CONFIG_USART7_SERIALDRIVER is not set
+# CONFIG_USART8_SERIALDRIVER is not set
+# CONFIG_OTHER_UART_SERIALDRIVER is not set
+CONFIG_MCU_SERIAL=y
+CONFIG_STANDARD_SERIAL=y
+# CONFIG_SERIAL_IFLOWCONTROL is not set
+# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
+# CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
+CONFIG_UART3_SERIAL_CONSOLE=y
+# CONFIG_OTHER_SERIAL_CONSOLE is not set
+# CONFIG_NO_SERIAL_CONSOLE is not set
+
+#
+# UART3 Configuration
+#
+CONFIG_UART3_RXBUFSIZE=256
+CONFIG_UART3_TXBUFSIZE=256
+CONFIG_UART3_BAUD=115200
+CONFIG_UART3_BITS=8
+CONFIG_UART3_PARITY=0
+CONFIG_UART3_2STOP=0
+# CONFIG_UART3_IFLOWCONTROL is not set
+# CONFIG_UART3_OFLOWCONTROL is not set
+# CONFIG_UART3_DMA is not set
+# CONFIG_USBDEV is not set
+# CONFIG_USBHOST is not set
+# CONFIG_HAVE_USBTRACE is not set
+# CONFIG_DRIVERS_WIRELESS is not set
+
+#
+# System Logging
+#
+# CONFIG_ARCH_SYSLOG is not set
+# CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_INTBUFFER is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
+CONFIG_SYSLOG_SERIAL_CONSOLE=y
+# CONFIG_SYSLOG_CHAR is not set
+CONFIG_SYSLOG_CONSOLE=y
+# CONFIG_SYSLOG_NONE is not set
+# CONFIG_SYSLOG_FILE is not set
+# CONFIG_SYSLOG_CHARDEV is not set
+
+#
+# Networking Support
+#
+CONFIG_ARCH_HAVE_NET=y
+CONFIG_ARCH_HAVE_PHY=y
+CONFIG_NET=y
+# CONFIG_NET_NOINTS is not set
+# CONFIG_NET_PROMISCUOUS is not set
+
+#
+# Driver buffer configuration
+#
+CONFIG_NET_MULTIBUFFER=y
+CONFIG_NET_ETH_MTU=590
+CONFIG_NET_ETH_TCP_RECVWNDO=536
+CONFIG_NET_GUARDSIZE=2
+
+#
+# Data link support
+#
+# CONFIG_NET_MULTILINK is not set
+CONFIG_NET_ETHERNET=y
+# CONFIG_NET_LOOPBACK is not set
+# CONFIG_NET_TUN is not set
+
+#
+# Network Device Operations
+#
+CONFIG_NETDEV_PHY_IOCTL=y
+
+#
+# Internet Protocol Selection
+#
+CONFIG_NET_IPv4=y
+# CONFIG_NET_IPv6 is not set
+
+#
+# Socket Support
+#
+CONFIG_NSOCKET_DESCRIPTORS=8
+CONFIG_NET_NACTIVESOCKETS=16
+CONFIG_NET_SOCKOPTS=y
+# CONFIG_NET_SOLINGER is not set
+
+#
+# Raw Socket Support
+#
+# CONFIG_NET_PKT is not set
+
+#
+# Unix Domain Socket Support
+#
+# CONFIG_NET_LOCAL is not set
+
+#
+# TCP/IP Networking
+#
+CONFIG_NET_TCP=y
+# CONFIG_NET_TCPURGDATA is not set
+CONFIG_NET_TCP_CONNS=8
+CONFIG_NET_MAX_LISTENPORTS=20
+CONFIG_NET_TCP_READAHEAD=y
+CONFIG_NET_TCP_WRITE_BUFFERS=y
+CONFIG_NET_TCP_NWRBCHAINS=8
+CONFIG_NET_TCP_RECVDELAY=0
+CONFIG_NET_TCPBACKLOG=y
+# CONFIG_NET_SENDFILE is not set
+
+#
+# UDP Networking
+#
+CONFIG_NET_UDP=y
+# CONFIG_NET_UDP_CHECKSUMS is not set
+CONFIG_NET_UDP_CONNS=8
+CONFIG_NET_BROADCAST=y
+# CONFIG_NET_RXAVAIL is not set
+CONFIG_NET_UDP_READAHEAD=y
+
+#
+# ICMP Networking Support
+#
+CONFIG_NET_ICMP=y
+CONFIG_NET_ICMP_PING=y
+
+#
+# IGMPv2 Client Support
+#
+# CONFIG_NET_IGMP is not set
+
+#
+# ARP Configuration
+#
+CONFIG_NET_ARP=y
+CONFIG_NET_ARPTAB_SIZE=16
+CONFIG_NET_ARP_MAXAGE=120
+# CONFIG_NET_ARP_IPIN is not set
+CONFIG_NET_ARP_SEND=y
+CONFIG_ARP_SEND_MAXTRIES=5
+CONFIG_ARP_SEND_DELAYMSEC=20
+
+#
+# Network I/O Buffer Support
+#
+CONFIG_NET_IOB=y
+CONFIG_IOB_NBUFFERS=36
+CONFIG_IOB_BUFSIZE=196
+CONFIG_IOB_NCHAINS=8
+CONFIG_IOB_THROTTLE=8
+# CONFIG_NET_ARCH_INCR32 is not set
+# CONFIG_NET_ARCH_CHKSUM is not set
+CONFIG_NET_STATISTICS=y
+
+#
+# Routing Table Configuration
+#
+# CONFIG_NET_ROUTE is not set
+CONFIG_NET_HOSTNAME="Freedom-K64F"
+
+#
+# Crypto API
+#
+# CONFIG_CRYPTO is not set
+
+#
+# File Systems
+#
+
+#
+# File system configuration
+#
+# CONFIG_DISABLE_MOUNTPOINT is not set
+# CONFIG_FS_AUTOMOUNTER is not set
+# CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
+CONFIG_FS_READABLE=y
+CONFIG_FS_WRITABLE=y
+# CONFIG_FS_NAMED_SEMAPHORES is not set
+CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
+# CONFIG_FS_RAMMAP is not set
+CONFIG_FS_FAT=y
+# CONFIG_FAT_LCNAMES is not set
+# CONFIG_FAT_LFN is not set
+# CONFIG_FS_FATTIME is not set
+# CONFIG_FAT_FORCE_INDIRECT is not set
+# CONFIG_FAT_DMAMEMORY is not set
+# CONFIG_FAT_DIRECT_RETRY is not set
+# CONFIG_NFS is not set
+# CONFIG_FS_NXFFS is not set
+# CONFIG_FS_ROMFS is not set
+# CONFIG_FS_TMPFS is not set
+# CONFIG_FS_SMARTFS is not set
+# CONFIG_FS_PROCFS is not set
+# CONFIG_FS_UNIONFS is not set
+
+#
+# Graphics Support
+#
+# CONFIG_NX is not set
+
+#
+# Memory Management
+#
+# CONFIG_MM_SMALL is not set
+CONFIG_MM_REGIONS=1
+# CONFIG_ARCH_HAVE_HEAP2 is not set
+# CONFIG_GRAN is not set
+
+#
+# Audio Support
+#
+# CONFIG_AUDIO is not set
+
+#
+# Wireless Support
+#
+
+#
+# Binary Loader
+#
+# CONFIG_BINFMT_DISABLE is not set
+# CONFIG_BINFMT_EXEPATH is not set
+# CONFIG_NXFLAT is not set
+# CONFIG_ELF is not set
+# CONFIG_BUILTIN is not set
+# CONFIG_PIC is not set
+# CONFIG_SYMTAB_ORDEREDBYNAME is not set
+
+#
+# Library Routines
+#
+
+#
+# Standard C Library Options
+#
+CONFIG_STDIO_BUFFER_SIZE=64
+CONFIG_STDIO_LINEBUFFER=y
+CONFIG_NUNGET_CHARS=2
+CONFIG_LIB_HOMEDIR="/"
+# CONFIG_LIBM is not set
+# CONFIG_NOPRINTF_FIELDWIDTH is not set
+# CONFIG_LIBC_FLOATINGPOINT is not set
+CONFIG_LIBC_LONG_LONG=y
+# CONFIG_LIBC_IOCTL_VARIADIC is not set
+CONFIG_LIB_RAND_ORDER=1
+# CONFIG_EOL_IS_CR is not set
+# CONFIG_EOL_IS_LF is not set
+# CONFIG_EOL_IS_BOTH_CRLF is not set
+CONFIG_EOL_IS_EITHER_CRLF=y
+# CONFIG_LIBC_EXECFUNCS is not set
+CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
+CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
+# CONFIG_LIBC_STRERROR is not set
+# CONFIG_LIBC_PERROR_STDOUT is not set
+CONFIG_LIBC_TMPDIR="/tmp"
+CONFIG_LIBC_MAX_TMPFILE=32
+CONFIG_ARCH_LOWPUTC=y
+# CONFIG_LIBC_LOCALTIME is not set
+# CONFIG_TIME_EXTENDED is not set
+CONFIG_LIB_SENDFILE_BUFSIZE=512
+# CONFIG_ARCH_ROMGETC is not set
+# CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
+CONFIG_LIBC_NETDB=y
+# CONFIG_NETDB_HOSTFILE is not set
+CONFIG_NETDB_DNSCLIENT=y
+CONFIG_NETDB_DNSCLIENT_ENTRIES=8
+CONFIG_NETDB_DNSCLIENT_NAMESIZE=32
+CONFIG_NETDB_DNSCLIENT_LIFESEC=3600
+CONFIG_NETDB_DNSCLIENT_MAXRESPONSE=96
+# CONFIG_NETDB_RESOLVCONF is not set
+# CONFIG_NETDB_DNSSERVER_NOADDR is not set
+CONFIG_NETDB_DNSSERVER_IPv4=y
+CONFIG_NETDB_DNSSERVER_IPv4ADDR=0x0a000001
+
+#
+# Non-standard Library Support
+#
+# CONFIG_LIB_CRC64_FAST is not set
+# CONFIG_LIB_KBDCODEC is not set
+# CONFIG_LIB_SLCDCODEC is not set
+# CONFIG_LIB_HEX2BIN is not set
+
+#
+# Basic CXX Support
+#
+# CONFIG_C99_BOOL8 is not set
+# CONFIG_HAVE_CXX is not set
+
+#
+# Application Configuration
+#
+
+#
+# CAN Utilities
+#
+
+#
+# Examples
+#
+# CONFIG_EXAMPLES_CHAT is not set
+# CONFIG_EXAMPLES_CONFIGDATA is not set
+# CONFIG_EXAMPLES_CPUHOG is not set
+# CONFIG_EXAMPLES_DHCPD is not set
+# CONFIG_EXAMPLES_DISCOVER is not set
+# CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FSTEST is not set
+# CONFIG_EXAMPLES_FTPC is not set
+# CONFIG_EXAMPLES_FTPD is not set
+# CONFIG_EXAMPLES_HELLO is not set
+# CONFIG_EXAMPLES_HIDKBD is not set
+# CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_MEDIA is not set
+# CONFIG_EXAMPLES_MM is not set
+# CONFIG_EXAMPLES_MODBUS is not set
+# CONFIG_EXAMPLES_MOUNT is not set
+# CONFIG_EXAMPLES_NETTEST is not set
+# CONFIG_EXAMPLES_NRF24L01TERM is not set
+CONFIG_EXAMPLES_NSH=y
+# CONFIG_EXAMPLES_NULL is not set
+# CONFIG_EXAMPLES_NX is not set
+# CONFIG_EXAMPLES_NXFFS is not set
+# CONFIG_EXAMPLES_NXHELLO is not set
+# CONFIG_EXAMPLES_NXIMAGE is not set
+# CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTERM is not set
+# CONFIG_EXAMPLES_NXTEXT is not set
+# CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
+# CONFIG_EXAMPLES_PIPE is not set
+# CONFIG_EXAMPLES_POLL is not set
+# CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_PPPD is not set
+# CONFIG_EXAMPLES_RGBLED is not set
+# CONFIG_EXAMPLES_RGMP is not set
+# CONFIG_EXAMPLES_SENDMAIL is not set
+# CONFIG_EXAMPLES_SERIALBLASTER is not set
+# CONFIG_EXAMPLES_SERIALRX is not set
+# CONFIG_EXAMPLES_SERLOOP is not set
+# CONFIG_EXAMPLES_SLCD is not set
+# CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_SMP is not set
+# CONFIG_EXAMPLES_TCPECHO is not set
+# CONFIG_EXAMPLES_TELNETD is not set
+# CONFIG_EXAMPLES_TIFF is not set
+# CONFIG_EXAMPLES_TOUCHSCREEN is not set
+# CONFIG_EXAMPLES_UDP is not set
+# CONFIG_EXAMPLES_UDPBLASTER is not set
+# CONFIG_EXAMPLES_USBTERM is not set
+# CONFIG_EXAMPLES_WATCHDOG is not set
+# CONFIG_EXAMPLES_WEBSERVER is not set
+# CONFIG_EXAMPLES_WGET is not set
+
+#
+# File System Utilities
+#
+# CONFIG_FSUTILS_INIFILE is not set
+# CONFIG_FSUTILS_PASSWD is not set
+
+#
+# GPS Utilities
+#
+# CONFIG_GPSUTILS_MINMEA_LIB is not set
+
+#
+# Graphics Support
+#
+# CONFIG_TIFF is not set
+# CONFIG_GRAPHICS_TRAVELER is not set
+
+#
+# Interpreters
+#
+# CONFIG_INTERPRETERS_BAS is not set
+# CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_MICROPYTHON is not set
+# CONFIG_INTERPRETERS_PCODE is not set
+
+#
+# FreeModBus
+#
+# CONFIG_MODBUS is not set
+
+#
+# Network Utilities
+#
+# CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_DHCPC is not set
+# CONFIG_NETUTILS_DHCPD is not set
+# CONFIG_NETUTILS_DISCOVER is not set
+# CONFIG_NETUTILS_ESP8266 is not set
+# CONFIG_NETUTILS_FTPC is not set
+# CONFIG_NETUTILS_JSON is not set
+CONFIG_NETUTILS_NETLIB=y
+# CONFIG_NETUTILS_NTPCLIENT is not set
+# CONFIG_NETUTILS_PPPD is not set
+# CONFIG_NETUTILS_SMTP is not set
+CONFIG_NETUTILS_TELNETD=y
+CONFIG_NETUTILS_TFTPC=y
+CONFIG_NETUTILS_WEBCLIENT=y
+CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
+CONFIG_WEBCLIENT_TIMEOUT=10
+# CONFIG_NETUTILS_WEBSERVER is not set
+# CONFIG_NETUTILS_XMLRPC is not set
+
+#
+# NSH Library
+#
+CONFIG_NSH_LIBRARY=y
+# CONFIG_NSH_MOTD is not set
+
+#
+# Command Line Configuration
+#
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
+CONFIG_NSH_LINELEN=64
+# CONFIG_NSH_DISABLE_SEMICOLON is not set
+CONFIG_NSH_CMDPARMS=y
+CONFIG_NSH_MAXARGUMENTS=6
+CONFIG_NSH_ARGCAT=y
+CONFIG_NSH_NESTDEPTH=3
+# CONFIG_NSH_DISABLEBG is not set
+
+#
+# Disable Individual commands
+#
+# CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_ARP is not set
+# CONFIG_NSH_DISABLE_BASENAME is not set
+# CONFIG_NSH_DISABLE_CAT is not set
+# CONFIG_NSH_DISABLE_CD is not set
+# CONFIG_NSH_DISABLE_CP is not set
+# CONFIG_NSH_DISABLE_CMP is not set
+CONFIG_NSH_DISABLE_DATE=y
+# CONFIG_NSH_DISABLE_DD is not set
+# CONFIG_NSH_DISABLE_DF is not set
+# CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_DIRNAME is not set
+# CONFIG_NSH_DISABLE_ECHO is not set
+# CONFIG_NSH_DISABLE_EXEC is not set
+# CONFIG_NSH_DISABLE_EXIT is not set
+# CONFIG_NSH_DISABLE_FREE is not set
+# CONFIG_NSH_DISABLE_GET is not set
+# CONFIG_NSH_DISABLE_HELP is not set
+# CONFIG_NSH_DISABLE_HEXDUMP is not set
+# CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
+# CONFIG_NSH_DISABLE_KILL is not set
+# CONFIG_NSH_DISABLE_LOSETUP is not set
+CONFIG_NSH_DISABLE_LOSMART=y
+# CONFIG_NSH_DISABLE_LS is not set
+# CONFIG_NSH_DISABLE_MB is not set
+# CONFIG_NSH_DISABLE_MKDIR is not set
+# CONFIG_NSH_DISABLE_MKFATFS is not set
+# CONFIG_NSH_DISABLE_MKFIFO is not set
+# CONFIG_NSH_DISABLE_MKRD is not set
+# CONFIG_NSH_DISABLE_MH is not set
+# CONFIG_NSH_DISABLE_MOUNT is not set
+# CONFIG_NSH_DISABLE_MV is not set
+# CONFIG_NSH_DISABLE_MW is not set
+# CONFIG_NSH_DISABLE_NSLOOKUP is not set
+# CONFIG_NSH_DISABLE_PS is not set
+# CONFIG_NSH_DISABLE_PING is not set
+# CONFIG_NSH_DISABLE_PUT is not set
+# CONFIG_NSH_DISABLE_PWD is not set
+# CONFIG_NSH_DISABLE_RM is not set
+# CONFIG_NSH_DISABLE_RMDIR is not set
+# CONFIG_NSH_DISABLE_SET is not set
+# CONFIG_NSH_DISABLE_SH is not set
+# CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_TIME is not set
+# CONFIG_NSH_DISABLE_TEST is not set
+# CONFIG_NSH_DISABLE_UMOUNT is not set
+# CONFIG_NSH_DISABLE_UNAME is not set
+# CONFIG_NSH_DISABLE_UNSET is not set
+# CONFIG_NSH_DISABLE_USLEEP is not set
+# CONFIG_NSH_DISABLE_WGET is not set
+# CONFIG_NSH_DISABLE_XD is not set
+CONFIG_NSH_MMCSDMINOR=0
+
+#
+# Configure Command Options
+#
+CONFIG_NSH_CMDOPT_DF_H=y
+CONFIG_NSH_CODECS_BUFSIZE=128
+CONFIG_NSH_CMDOPT_HEXDUMP=y
+CONFIG_NSH_FILEIOSIZE=512
+
+#
+# Scripting Support
+#
+# CONFIG_NSH_DISABLESCRIPT is not set
+# CONFIG_NSH_DISABLE_ITEF is not set
+# CONFIG_NSH_DISABLE_LOOPS is not set
+
+#
+# Console Configuration
+#
+CONFIG_NSH_CONSOLE=y
+# CONFIG_NSH_ARCHINIT is not set
+
+#
+# Networking Configuration
+#
+CONFIG_NSH_NETINIT=y
+CONFIG_NSH_NETINIT_THREAD=y
+CONFIG_NSH_NETINIT_THREAD_STACKSIZE=1568
+CONFIG_NSH_NETINIT_THREAD_PRIORITY=80
+
+#
+# IP Address Configuration
+#
+
+#
+# IPv4 Addresses
+#
+CONFIG_NSH_IPADDR=0x0a000002
+CONFIG_NSH_DRIPADDR=0x0a000001
+CONFIG_NSH_NETMASK=0xffffff00
+# CONFIG_NSH_DNS is not set
+CONFIG_NSH_NOMAC=y
+CONFIG_NSH_SWMAC=y
+CONFIG_NSH_MACADDR=0x00e0deadbeef
+CONFIG_NSH_MAX_ROUNDTRIP=20
+
+#
+# Telnet Configuration
+#
+CONFIG_NSH_TELNET=y
+CONFIG_NSH_TELNETD_PORT=23
+CONFIG_NSH_TELNETD_DAEMONPRIO=100
+CONFIG_NSH_TELNETD_DAEMONSTACKSIZE=2048
+CONFIG_NSH_TELNETD_CLIENTPRIO=100
+CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=2048
+CONFIG_NSH_IOBUFFER_SIZE=512
+# CONFIG_NSH_LOGIN is not set
+# CONFIG_NSH_CONSOLE_LOGIN is not set
+# CONFIG_NSH_TELNET_LOGIN is not set
+
+#
+# NxWidgets/NxWM
+#
+
+#
+# Platform-specific Support
+#
+# CONFIG_PLATFORM_CONFIGDATA is not set
+
+#
+# System Libraries and NSH Add-Ons
+#
+# CONFIG_SYSTEM_CLE is not set
+# CONFIG_SYSTEM_CUTERM is not set
+# CONFIG_SYSTEM_FREE is not set
+# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_SYSTEM_HEXED is not set
+# CONFIG_SYSTEM_INSTALL is not set
+# CONFIG_SYSTEM_MDIO is not set
+# CONFIG_SYSTEM_NETDB is not set
+# CONFIG_SYSTEM_RAMTEST is not set
+CONFIG_READLINE_HAVE_EXTMATCH=y
+CONFIG_SYSTEM_READLINE=y
+CONFIG_READLINE_ECHO=y
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
+# CONFIG_SYSTEM_SUDOKU is not set
+# CONFIG_SYSTEM_UBLOXMODEM is not set
+# CONFIG_SYSTEM_VI is not set
+# CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/freedom-k64f/netnsh/setenv.sh b/configs/freedom-k64f/netnsh/setenv.sh
new file mode 100644
index 0000000000..c07c4f1607
--- /dev/null
+++ b/configs/freedom-k64f/netnsh/setenv.sh
@@ -0,0 +1,77 @@
+#!/bin/bash
+# configs/freedom-k64f/netnsh/setenv.sh
+#
+#   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.
+#
+
+if [ "$_" = "$0" ] ; then
+  echo "You must source this script, not run it!" 1>&2
+  exit 1
+fi
+
+WD=`pwd`
+if [ ! -x "setenv.sh" ]; then
+  echo "This script must be executed from the top-level NuttX build directory"
+  exit 1
+fi
+
+if [ -z "${PATH_ORIG}" ]; then
+  export PATH_ORIG="${PATH}"
+fi
+
+# This is the Cygwin path to the location where I installed the Atmel GCC
+# toolchain under Windows.  You will also have to edit this if you install
+# this toolchain in any other location
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Atmel/Atmel Toolchain/ARM GCC/Native/4.7.3.99/arm-gnu-toolchain/bin"
+
+# This is the Cygwin path to the location where I installed the CodeSourcery
+# toolchain under windows.  You will also have to edit this if you install
+# the CodeSourcery toolchain in any other location
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin"
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin"
+# export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin"
+
+# This is the location where I installed the ARM "GNU Tools for ARM Embedded Processors"
+# You can this free toolchain here https://launchpad.net/gcc-arm-embedded
+export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/GNU Tools ARM Embedded/4.9 2015q2/bin"
+
+# This is the path to the location where I installed the devkitARM toolchain
+# You can get this free toolchain from http://devkitpro.org/ or http://sourceforge.net/projects/devkitpro/
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/devkitARM/bin"
+
+# This is the Cygwin path to the location where I build the buildroot
+# toolchain.
+#export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+
+# Add the path to the toolchain to the PATH varialble
+export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
+
+echo "PATH : ${PATH}"
-- 
GitLab


From 96edfdb4c7ef2cc2a19981375513d23b484989e5 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 12 Jul 2016 09:50:32 -0600
Subject: [PATCH 219/229] libm: Fix/improve range checks in lib_expi() and
 lib_expif().

---
 libc/math/lib_libexpi.c  | 10 +++++-----
 libc/math/lib_libexpif.c |  8 +++++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/libc/math/lib_libexpi.c b/libc/math/lib_libexpi.c
index bcb5622130..3cd5f8f6d7 100644
--- a/libc/math/lib_libexpi.c
+++ b/libc/math/lib_libexpi.c
@@ -52,13 +52,12 @@
 #define M_E128  (M_E64  * M_E64)
 #define M_E256  (M_E128 * M_E128)
 #define M_E512  (M_E256 * M_E256)
-#define M_E1024 (M_E512 * M_E512)
 
 /****************************************************************************
  * Private Data
  ****************************************************************************/
 
-static const double g_expi_square_tbl[11] =
+static const double g_expi_square_tbl[] =
 {
   M_E,          /* e^1 */
   M_E2,         /* e^2 */
@@ -69,8 +68,7 @@ static const double g_expi_square_tbl[11] =
   M_E64,        /* e^64 */
   M_E128,       /* e^128 */
   M_E256,       /* e^256 */
-  M_E512,       /* e^512 */
-  M_E1024,      /* e^1024 */
+  M_E512        /* e^512 */
 };
 
 /****************************************************************************
@@ -82,7 +80,9 @@ double lib_expi(size_t n)
   size_t i;
   double val;
 
-  if (n > 1024)
+  /* The largest calculable value for n is floor(ln(DBL_MAX)) */
+
+  if (n > 709)
     {
       return INFINITY;
     }
diff --git a/libc/math/lib_libexpif.c b/libc/math/lib_libexpif.c
index 1ab9b90f43..22c60f48d1 100644
--- a/libc/math/lib_libexpif.c
+++ b/libc/math/lib_libexpif.c
@@ -58,7 +58,7 @@
  *(3.402823e+38).
  */
 
-static const float g_expif_square_tbl[7] =
+static const float g_expif_square_tbl[] =
 {
   (float)M_E,    /* e^1 */
   (float)M_E2,   /* e^2 */
@@ -66,7 +66,7 @@ static const float g_expif_square_tbl[7] =
   (float)M_E8,   /* e^8 */
   (float)M_E16,  /* e^16 */
   (float)M_E32,  /* e^32 */
-  (float)M_E64,  /* e^64 */
+  (float)M_E64   /* e^64 */
 };
 
 /****************************************************************************
@@ -78,7 +78,9 @@ float lib_expif(size_t n)
   size_t i;
   float val;
 
-  if (n >= 128)
+  /* The largest calculable value for n is floor(ln(FLT_MAX)) */
+
+  if (n > 88)
     {
       return INFINITY_F;
     }
-- 
GitLab


From 0d41a1cd42cf2c168d2f54c0a51cb0e0734bfadc Mon Sep 17 00:00:00 2001
From: Sebastien Lorquet 
Date: Tue, 12 Jul 2016 10:34:03 -0600
Subject: [PATCH 220/229] Before accessing the sst26 flash, the "Global Unlock"
 command must me executed, which I do in the sst26 driver.

BUT. re-reading the datasheet, the WREN instruction is required to enable the execution of this command. This was not done.

I have no idea how the driver currently works except by chance. The writes
should never happen at all, the flash is half-enabled!
---
 drivers/mtd/sst26.c | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/sst26.c b/drivers/mtd/sst26.c
index 51888da063..27648ae91a 100644
--- a/drivers/mtd/sst26.c
+++ b/drivers/mtd/sst26.c
@@ -245,6 +245,7 @@ static inline void sst26_unlock(FAR struct spi_dev_s *dev);
 static inline int sst26_readid(struct sst26_dev_s *priv);
 static void sst26_waitwritecomplete(struct sst26_dev_s *priv);
 static void sst26_writeenable(struct sst26_dev_s *priv);
+static void sst26_writedisable(struct sst26_dev_s *priv);
 static void sst26_globalunlock(struct sst26_dev_s *priv);
 static inline void sst26_sectorerase(struct sst26_dev_s *priv, off_t offset, uint8_t type);
 static inline int  sst26_chiperase(struct sst26_dev_s *priv);
@@ -427,7 +428,7 @@ static void sst26_globalunlock(struct sst26_dev_s *priv)
 
   SPI_SELECT(priv->dev, SPIDEV_FLASH, true);
 
-  /* Send "Write Enable (WREN)" command */
+  /* Send "Global Unlock (ULBPR)" command */
 
   (void)SPI_SEND(priv->dev, SST26_ULBPR);
 
@@ -459,6 +460,27 @@ static void sst26_writeenable(struct sst26_dev_s *priv)
   sstinfo("Enabled\n");
 }
 
+/************************************************************************************
+ * Name:  sst26_writedisable
+ ************************************************************************************/
+
+static void sst26_writedisable(struct sst26_dev_s *priv)
+{
+  /* Select this FLASH part */
+
+  SPI_SELECT(priv->dev, SPIDEV_FLASH, true);
+
+  /* Send "Write Disable (WRDI)" command */
+
+  (void)SPI_SEND(priv->dev, SST26_WRDI);
+
+  /* Deselect the FLASH */
+
+  SPI_SELECT(priv->dev, SPIDEV_FLASH, false);
+
+  sstinfo("Disabled\n");
+}
+
 /************************************************************************************
  * Name:  sst26_sectorerase (4k)
  ************************************************************************************/
@@ -939,8 +961,9 @@ FAR struct mtd_dev_s *sst26_initialize_spi(FAR struct spi_dev_s *dev)
       else
         {
           /* Make sure that the FLASH is unprotected so that we can write into it */
-
+          sst26_writeenable(priv);
           sst26_globalunlock(priv);
+          sst26_writedisable(priv);
 
 #ifdef CONFIG_MTD_REGISTRATION
           /* Register the MTD with the procfs system if enabled */
-- 
GitLab


From 74777499bc8c53c797579754645a2b8d85731f08 Mon Sep 17 00:00:00 2001
From: ziggurat29 
Date: Tue, 12 Jul 2016 11:46:08 -0500
Subject: [PATCH 221/229] alter the notion of 'blocksize' to be equivalent to
 'flash write page size' in order to align with assumptions in the smartfs
 driver (at least, maybe other things do as well). Correct a bug that was
 previously masked by having blocksize=eraseblocksize which would cause buffer
 overflows and delicious hardfaults. Trivial spelling changes in comments,
 etc.

---
 drivers/mtd/n25qxxx.c | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/drivers/mtd/n25qxxx.c b/drivers/mtd/n25qxxx.c
index 191cc1cd22..38bde4e275 100644
--- a/drivers/mtd/n25qxxx.c
+++ b/drivers/mtd/n25qxxx.c
@@ -87,7 +87,6 @@
 #  define CONFIG_N25QXXX_DUMMIES 6
 #endif
 
-
 /* N25QXXX Commands *****************************************************************/
 /* Configuration, Status, Erase, Program Commands ***********************************/
 /*      Command                    Value    Description:                            */
@@ -98,7 +97,7 @@
                                           *   0x01 | SR                             */
 #define N25QXXX_READ_VOLCFG        0x85  /* Read volatile configuration register:   *
                                           *   0x85 | VCR                            */
-#define N25QXXX_WRITE_VOLCFG       0x81  /* Write status register:                  *
+#define N25QXXX_WRITE_VOLCFG       0x81  /* Write svolatile configuration register: *
                                           *   0x81 | VCR                            */
 #define N25QXXX_WRITE_ENABLE       0x06  /* Write enable:                           *
                                           *   0x06                                  */
@@ -123,7 +122,7 @@
 /*      Command                    Value    Description:                            */
 /*                                            Data sequence                         */
 
-/* ID/Security Commands *************************&***********************************/
+/* ID/Security Commands *************************************************************/
 /*      Command                    Value    Description:                            */
 /*                                            Data sequence                         */
 #define N25QXXX_JEDEC_ID           0x9f  /* JEDEC ID:                               *
@@ -141,8 +140,8 @@
 
 /* N25QXXX JEDIC IDs */
 
-#define N25QXXX3V_JEDEC_DEVICE_TYPE   0xba  /* 3v memory device type */
-#define N25QXXX2V_JEDEC_DEVICE_TYPE   0xbb  /* 2v memory device type */
+#define N25QXXX3V_JEDEC_DEVICE_TYPE 0xba  /* 3v memory device type */
+#define N25QXXX2V_JEDEC_DEVICE_TYPE 0xbb  /* 2v memory device type */
 
 #define N25Q016_JEDEC_CAPACITY      0x15  /* N25Q016 (2 MB) memory capacity */
 #define N25Q032_JEDEC_CAPACITY      0x16  /* N25Q032 (4 MB) memory capacity */
@@ -168,7 +167,7 @@
 #define STATUS_TB_MASK             (1 << 5) /* Bit 5: Top / Bottom Protect          */
 #  define STATUS_TB_TOP            (0 << 5) /*   0 = BP2-BP0 protect Top down       */
 #  define STATUS_TB_BOTTOM         (1 << 5) /*   1 = BP2-BP0 protect Bottom up      */
-#define STATUS_BP3_MASK             (1 << 5) /* Bit 6: BP3                          */
+#define STATUS_BP3_MASK            (1 << 5) /* Bit 6: BP3                           */
 #define STATUS_SRP0_MASK           (1 << 7) /* Bit 7: Status register protect 0     */
 #  define STATUS_SRP0_UNLOCKED     (0 << 7) /*   0 = WP# no effect / PS Lock Down   */
 #  define STATUS_SRP0_LOCKED       (1 << 7) /*   1 = WP# protect / OTP Lock Down    */
@@ -979,7 +978,7 @@ static int n25qxxx_flush_cache(struct n25qxxx_dev_s *priv)
           ferr("ERROR: n25qxxx_write_page failed: %d\n", ret);
         }
 
-      /* The case is no long dirty and the FLASH is no longer erased */
+      /* The cache is no long dirty and the FLASH is no longer erased */
 
       CLR_DIRTY(priv);
       CLR_ERASED(priv);
@@ -1002,7 +1001,7 @@ static FAR uint8_t *n25qxxx_read_cache(struct n25qxxx_dev_s *priv, off_t sector)
   int   ret;
 
   /* Convert from the 512 byte sector to the erase sector size of the device.  For
-   * exmample, if the actual erase sector size if 4Kb (1 << 12), then we first
+   * example, if the actual erase sector size is 4Kb (1 << 12), then we first
    * shift to the right by 3 to get the sector number in 4096 increments.
    */
 
@@ -1218,11 +1217,11 @@ static ssize_t n25qxxx_bread(FAR struct mtd_dev_s *dev, off_t startblock,
       nbytes >>= N25QXXX_SECTOR512_SHIFT;
     }
 #else
-  nbytes = n25qxxx_read(dev, startblock << priv->sectorshift,
-                       nblocks << priv->sectorshift, buffer);
+  nbytes = n25qxxx_read(dev, startblock << priv->pageshift,
+                       nblocks << priv->pageshift, buffer);
   if (nbytes > 0)
     {
-      nbytes >>= priv->sectorshift;
+      nbytes >>= priv->pageshift;
     }
 #endif
 
@@ -1253,8 +1252,8 @@ static ssize_t n25qxxx_bwrite(FAR struct mtd_dev_s *dev, off_t startblock,
     }
 
 #else
-  ret = n25qxxx_write_page(priv, buffer, startblock << priv->sectorshift,
-                          nblocks << priv->sectorshift);
+  ret = n25qxxx_write_page(priv, buffer, startblock << priv->pageshift,
+                          nblocks << priv->pageshift);
   if (ret < 0)
     {
       ferr("ERROR: n25qxxx_write_page failed: %d\n", ret);
@@ -1328,7 +1327,7 @@ static int n25qxxx_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
               geo->erasesize    = (1 << N25QXXX_SECTOR512_SHIFT);
               geo->neraseblocks = priv->nsectors << (priv->sectorshift - N25QXXX_SECTOR512_SHIFT);
 #else
-              geo->blocksize    = (1 << priv->sectorshift);
+              geo->blocksize    = (1 << priv->pageshift);
               geo->erasesize    = (1 << priv->sectorshift);
               geo->neraseblocks = priv->nsectors;
 #endif
-- 
GitLab


From a45bc22eb59e221935d19bae6485149421b660fc Mon Sep 17 00:00:00 2001
From: ziggurat29 
Date: Tue, 12 Jul 2016 12:33:25 -0500
Subject: [PATCH 222/229] update stm32l476 disco to include init code for
 smartfs and nxffs for cases where those fs are included in build.

---
 configs/stm32l476vg-disco/src/stm32_appinit.c | 61 +++++++++++++++----
 1 file changed, 50 insertions(+), 11 deletions(-)

diff --git a/configs/stm32l476vg-disco/src/stm32_appinit.c b/configs/stm32l476vg-disco/src/stm32_appinit.c
index 10eaf1fe88..e242acc67e 100644
--- a/configs/stm32l476vg-disco/src/stm32_appinit.c
+++ b/configs/stm32l476vg-disco/src/stm32_appinit.c
@@ -210,22 +210,60 @@ FAR struct mtd_dev_s *mtd_temp;
       g_mtd_fs = mtd_temp;
         
 #ifdef CONFIG_MTD_PARTITION
-      /* Setup a partition of 256KiB for our file system. */
-
-#if defined(CONFIG_N25QXXX_SECTOR512)
-      mtd_temp = mtd_partition(g_mtd_fs, 0, 512);
-#else
-      mtd_temp = mtd_partition(g_mtd_fs, 0, 64);
+      {
+        FAR struct mtd_geometry_s geo;
+        off_t nblocks;
+
+        /* Setup a partition of 256KiB for our file system. */
+
+        ret = MTD_IOCTL(g_mtd_fs, MTDIOC_GEOMETRY, (unsigned long)(uintptr_t)&geo);
+        if (ret < 0)
+          {
+            _err("ERROR: MTDIOC_GEOMETRY failed\n");
+            return ret;
+          }
+
+        nblocks = (256*1024) / geo.blocksize;
+
+        mtd_temp = mtd_partition(g_mtd_fs, 0, nblocks);
+        if (!mtd_temp)
+          {
+            _err("ERROR: mtd_partition failed\n");
+            return ret;
+          }
+
+        g_mtd_fs = mtd_temp;
+      }
 #endif
-      if (!g_mtd_fs)
+
+#ifdef HAVE_N25QXXX_SMARTFS
+      /* Configure the device with no partition support */
+
+      ret = smart_initialize(N25QXXX_SMART_MINOR, g_mtd_fs, NULL);
+      if (ret != OK)
         {
-          _err("ERROR: mtd_partition failed\n");
-          return ret;
+          _err("ERROR: Failed to initialize SmartFS: %d\n", ret);
         }
 
-      g_mtd_fs = mtd_temp;
-#endif
+#elif defined(HAVE_N25QXXX_NXFFS)
+      /* Initialize to provide NXFFS on the N25QXXX MTD interface */
 
+      ret = nxffs_initialize(g_mtd_fs);
+      if (ret < 0)
+        {
+         _err("ERROR: NXFFS initialization failed: %d\n", ret);
+        }
+
+      /* Mount the file system at /mnt/nxffs */
+
+      ret = mount(NULL, "/mnt/nxffs", "nxffs", 0, NULL);
+      if (ret < 0)
+        {
+          _err("ERROR: Failed to mount the NXFFS volume: %d\n", errno);
+          return ret;
+        }
+
+#else /* if  defined(HAVE_N25QXXX_CHARDEV) */
       /* Use the FTL layer to wrap the MTD driver as a block driver */
 
       ret = ftl_initialize(N25QXXX_MTD_MINOR, g_mtd_fs);
@@ -256,6 +294,7 @@ FAR struct mtd_dev_s *mtd_temp;
           _err("ERROR: bchdev_register %s failed: %d\n", chardev, ret);
           return ret;
         }
+#endif
     }
 #endif
 
-- 
GitLab


From 10667bd38af48b5c1b019f3953cf6da761517a94 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 12 Jul 2016 13:46:27 -0600
Subject: [PATCH 223/229] Kinetis Ethernet and Freedcom-K64F:  PHY address was
 wrong.  Modified driver to try all PHY addresses and then only fail if the
 driver cannot find a usable PHY address.  MDIO pin must have an internal
 pull-up on the Freedom-K64F.

---
 arch/arm/src/kinetis/Kconfig                  |  21 ++-
 arch/arm/src/kinetis/chip/kinetis_k60pinmux.h |  14 +-
 arch/arm/src/kinetis/chip/kinetis_k64pinmux.h |  24 +++-
 arch/arm/src/kinetis/kinetis_enet.c           | 125 ++++++++++++++----
 configs/freedom-k64f/README.txt               |  74 +++++++----
 configs/freedom-k64f/include/board.h          |   3 +-
 configs/freedom-k64f/netnsh/defconfig         |  15 ++-
 configs/freedom-k64f/nsh/defconfig            |  15 ++-
 configs/freedom-k64f/src/k64_bringup.c        |  39 +++++-
 9 files changed, 254 insertions(+), 76 deletions(-)

diff --git a/arch/arm/src/kinetis/Kconfig b/arch/arm/src/kinetis/Kconfig
index 2e0ff4ae89..6a0c036765 100644
--- a/arch/arm/src/kinetis/Kconfig
+++ b/arch/arm/src/kinetis/Kconfig
@@ -548,18 +548,27 @@ config KINETIS_ENETNTXBUFFERS
 		Number of Ethernet Tx buffers to use. The size of one buffer is
 		determined by NET_BUFSIZE
 
-config KINETIS_ENETPHYADDR
-	int "PHY address"
-	default 1
-	---help---
-		MII/RMII address of the PHY
-
 config KINETIS_ENETUSEMII
 	bool "Use MII interface"
 	default n
 	---help---
 		The the MII PHY interface.  Default:  Use RMII interface
 
+config KINETIS_ENET_MDIOPULLUP
+	bool "MDIO pull-up"
+	default n
+	---help---
+		If there is no on-board pull-up resister on the MII/RMII MDIO line,
+		then this option may be selected in order to configure an internal
+		pull-up on MDIO.
+
+config KINETIS_ENET_NORXER
+	bool "Suppress RXER"
+	default n
+	---help---
+		If selected, then the MII/RMII RXER output will be configured as a
+		GPIO and pulled low.
+
 endmenu # Kinetis Ethernet Configuration
 
 menu "Kinetis SDHC Configuration"
diff --git a/arch/arm/src/kinetis/chip/kinetis_k60pinmux.h b/arch/arm/src/kinetis/chip/kinetis_k60pinmux.h
index 5cfb3a1aa0..4e7619c18f 100644
--- a/arch/arm/src/kinetis/chip/kinetis_k60pinmux.h
+++ b/arch/arm/src/kinetis/chip/kinetis_k60pinmux.h
@@ -83,12 +83,12 @@
 #define PIN_FTM0_CH1_1           (PIN_ALT3   | PIN_PORTA | PIN4)
 #define PIN_NMI                  (PIN_ALT7   | PIN_PORTA | PIN4)
 #define PIN_FTM0_CH2_1           (PIN_ALT3   | PIN_PORTA | PIN5)
-#if 0
+#ifdef CONFIG_KINETIS_ENET_NORXER
+#  define PIN_RMII0_RXER         (GPIO_PULLDOWN | PIN_PORTA | PIN5)
+#  define PIN_MII0_RXER          (GPIO_PULLDOWN | PIN_PORTA | PIN5)
+#else
 #  define PIN_RMII0_RXER         (PIN_ALT4   | PIN_PORTA | PIN5)
 #  define PIN_MII0_RXER          (PIN_ALT4   | PIN_PORTA | PIN5)
-#else
-#  define PIN_RMII0_RXER         (GPIO_PULLDOWN | PIN_PORTA | PIN5)
-# define PIN_MII0_RXER           (GPIO_PULLDOWN | PIN_PORTA | PIN5)
 #endif
 #define PIN_CMP2_OUT_1           (PIN_ALT5   | PIN_PORTA | PIN5)
 #define PIN_I2S0_RX_BCLK_1       (PIN_ALT6   | PIN_PORTA | PIN5)
@@ -174,7 +174,11 @@
 #define PIN_TSI0_CH0             (PIN_ANALOG | PIN_PORTB | PIN0)
 #define PIN_I2C0_SCL_1           (PIN_ALT2   | PIN_PORTB | PIN0)
 #define PIN_FTM1_CH0_3           (PIN_ALT3   | PIN_PORTB | PIN0)
-#define PIN_RMII0_MDIO           (PIN_ALT4   | PIN_PORTB | PIN0)
+#ifdef CONFIG_KINETIS_ENET_MDIOPULLUP
+#  define PIN_RMII0_MDIO         (PIN_ALT4_PULLUP | PIN_PORTB | PIN0)
+#else
+#  define PIN_RMII0_MDIO         (PIN_ALT4   | PIN_PORTB | PIN0)
+#endif
 #define PIN_MII0_MDIO            (PIN_ALT4   | PIN_PORTB | PIN0)
 #define PIN_FTM1_QD_PHA_3        (PIN_ALT6   | PIN_PORTB | PIN0)
 #define PIN_ADC0_SE9             (PIN_ANALOG | PIN_PORTB | PIN1)
diff --git a/arch/arm/src/kinetis/chip/kinetis_k64pinmux.h b/arch/arm/src/kinetis/chip/kinetis_k64pinmux.h
index 724761a6e8..3479099bf6 100644
--- a/arch/arm/src/kinetis/chip/kinetis_k64pinmux.h
+++ b/arch/arm/src/kinetis/chip/kinetis_k64pinmux.h
@@ -398,14 +398,22 @@
 #define PIN_MII0_COL              (PIN_ALT4   | PIN_PORTA | PIN29)
 #define PIN_MII0_CRS              (PIN_ALT4   | PIN_PORTA | PIN27)
 #define PIN_MII0_MDC              (PIN_ALT4   | PIN_PORTB | PIN1)
-#define PIN_MII0_MDIO             (PIN_ALT4   | PIN_PORTB | PIN0)
+#ifdef CONFIG_KINETIS_ENET_MDIOPULLUP
+#  define PIN_MII0_MDIO           (PIN_ALT4_PULLUP | PIN_PORTB | PIN0)
+#else
+#  define PIN_MII0_MDIO           (PIN_ALT4   | PIN_PORTB | PIN0)
+#endif
 #define PIN_MII0_RXCLK            (PIN_ALT4   | PIN_PORTA | PIN11)
 #define PIN_MII0_RXD0             (PIN_ALT4   | PIN_PORTA | PIN13)
 #define PIN_MII0_RXD1             (PIN_ALT4   | PIN_PORTA | PIN12)
 #define PIN_MII0_RXD2             (PIN_ALT4   | PIN_PORTA | PIN10)
 #define PIN_MII0_RXD3             (PIN_ALT4   | PIN_PORTA | PIN9)
 #define PIN_MII0_RXDV             (PIN_ALT4   | PIN_PORTA | PIN14)
-#define PIN_MII0_RXER             (PIN_ALT4   | PIN_PORTA | PIN5)
+#ifdef CONFIG_KINETIS_ENET_NORXER
+#  define PIN_MII0_RXER           (GPIO_PULLDOWN | PIN_PORTA | PIN5)
+#else
+#  define PIN_MII0_RXER           (PIN_ALT4   | PIN_PORTA | PIN5)
+#endif
 #define PIN_MII0_TXCLK            (PIN_ALT4   | PIN_PORTA | PIN25)
 #define PIN_MII0_TXD0             (PIN_ALT4   | PIN_PORTA | PIN16)
 #define PIN_MII0_TXD1             (PIN_ALT4   | PIN_PORTA | PIN17)
@@ -427,10 +435,18 @@
 
 #define PIN_RMII0_CRS_DV          (PIN_ALT4   | PIN_PORTA | PIN14)
 #define PIN_RMII0_MDC             (PIN_ALT4   | PIN_PORTB | PIN1)
-#define PIN_RMII0_MDIO            (PIN_ALT4   | PIN_PORTB | PIN0)
+#ifdef CONFIG_KINETIS_ENET_MDIOPULLUP
+#  define PIN_RMII0_MDIO          (PIN_ALT4_PULLUP | PIN_PORTB | PIN0)
+#else
+#  define PIN_RMII0_MDIO          (PIN_ALT4   | PIN_PORTB | PIN0)
+#endif
 #define PIN_RMII0_RXD0            (PIN_ALT4   | PIN_PORTA | PIN13)
 #define PIN_RMII0_RXD1            (PIN_ALT4   | PIN_PORTA | PIN12)
-#define PIN_RMII0_RXER            (PIN_ALT4   | PIN_PORTA | PIN5)
+#ifdef CONFIG_KINETIS_ENET_NORXER
+#  define PIN_RMII0_RXER          (GPIO_PULLDOWN | PIN_PORTA | PIN5)
+#else
+#  define PIN_RMII0_RXER          (PIN_ALT4   | PIN_PORTA | PIN5)
+#endif
 #define PIN_RMII0_TXD0            (PIN_ALT4   | PIN_PORTA | PIN16)
 #define PIN_RMII0_TXD1            (PIN_ALT4   | PIN_PORTA | PIN17)
 #define PIN_RMII0_TXEN            (PIN_ALT4   | PIN_PORTA | PIN15)
diff --git a/arch/arm/src/kinetis/kinetis_enet.c b/arch/arm/src/kinetis/kinetis_enet.c
index c72c12951b..070da795f3 100644
--- a/arch/arm/src/kinetis/kinetis_enet.c
+++ b/arch/arm/src/kinetis/kinetis_enet.c
@@ -193,6 +193,7 @@ struct kinetis_driver_s
   uint8_t txtail;              /* The oldest busy TX descriptor */
   uint8_t txhead;              /* The next TX descriptor to use */
   uint8_t rxtail;              /* The next RX descriptor to use */
+  uint8_t phyaddr;             /* Selected PHY address */
   WDOG_ID txpoll;              /* TX poll timer */
   WDOG_ID txtimeout;           /* TX timeout timer */
   struct enet_desc_s *txdesc;  /* A pointer to the list of TX descriptor */
@@ -278,7 +279,7 @@ static int kinetis_writemii(struct kinetis_driver_s *priv, uint8_t phyaddr,
                             uint8_t regaddr, uint16_t data);
 static int kinetis_readmii(struct kinetis_driver_s *priv, uint8_t phyaddr,
                            uint8_t regaddr, uint16_t *data);
-static inline void kinetis_initphy(struct kinetis_driver_s *priv);
+static inline int kinetis_initphy(struct kinetis_driver_s *priv);
 
 /* Initialization */
 
@@ -954,6 +955,7 @@ static int kinetis_ifup(struct net_driver_s *dev)
     (FAR struct kinetis_driver_s *)dev->d_private;
   uint8_t *mac = dev->d_mac.ether_addr_octet;
   uint32_t regval;
+  int ret;
 
   ninfo("Bringing up: %d.%d.%d.%d\n",
         dev->d_ipaddr & 0xff, (dev->d_ipaddr >> 8) & 0xff,
@@ -986,7 +988,12 @@ static int kinetis_ifup(struct net_driver_s *dev)
 
   /* Configure the PHY */
 
-  kinetis_initphy(priv);
+  ret = kinetis_initphy(priv);
+  if (ret < 0)
+    {
+      nerr("ERROR: Failed to configure the PHY: %d\n", ret);
+      return ret;
+    }
 
   /* Handle promiscuous mode */
 
@@ -1253,7 +1260,7 @@ static int kinetis_ioctl(struct net_driver_s *dev, int cmd, long arg)
     {
       struct mii_ioctl_data_s *req =
         (struct mii_ioctl_data_s *)((uintptr_t)arg);
-      req->phy_id = CONFIG_KINETIS_ENETPHYADDR;
+      req->phy_id = priv->phyaddr;
       ret = OK;
     }
     break;
@@ -1418,6 +1425,7 @@ static int kinetis_readmii(struct kinetis_driver_s *priv, uint8_t phyaddr,
 
   if (timeout >= MII_MAXPOLLS)
     {
+      nerr("ERROR: Timed out waiting for transfer to complete\n");
       return -ETIMEDOUT;
     }
 
@@ -1441,31 +1449,59 @@ static int kinetis_readmii(struct kinetis_driver_s *priv, uint8_t phyaddr,
  *   priv - Reference to the private ENET driver state structure
  *
  * Returned Value:
- *   None
+ *   Zero (OK) returned on success; a negated errno value is returned on any
+ *   failure;
  *
  * Assumptions:
  *
  ****************************************************************************/
 
-static inline void kinetis_initphy(struct kinetis_driver_s *priv)
+static inline int kinetis_initphy(struct kinetis_driver_s *priv)
 {
   uint32_t rcr;
   uint32_t tcr;
   uint16_t phydata;
+  uint8_t phyaddr;
+  int retries;
+  int ret;
 
   /* Loop (potentially infinitely?) until we successfully communicate with
    * the PHY.
    */
 
-  do
+  for (phyaddr = 0; phyaddr < 32; phyaddr++)
     {
-      usleep(LINK_WAITUS);
-      phydata = 0xffff;
-      kinetis_readmii(priv, CONFIG_KINETIS_ENETPHYADDR, MII_PHYID1, &phydata);
+      ninfo("%s: Try phyaddr: %u\n", BOARD_PHY_NAME, phyaddr);
+
+      /* Try to read PHYID1 few times using this address */
+
+      retries = 0;
+      do
+        {
+          usleep(LINK_WAITUS);
+          ninfo("%s: Read PHYID1, retries=%d\n",  BOARD_PHY_NAME, retries + 1);
+          phydata = 0xffff;
+          ret = kinetis_readmii(priv, phyaddr, MII_PHYID1, &phydata);
+        }
+      while (ret >= 0 && phydata == 0xffff && ++retries < 3);
+
+      /* If we successfully read anything then break out, using this PHY address */
+
+      if (retries < 3)
+        {
+          break;
+        }
     }
-  while (phydata == 0xffff);
 
-#if CONFIG_DEBUG_NET_ERROR
+  if (phyaddr >= 32)
+    {
+      nerr("ERROR: Failed to read %s PHYID1 at any address\n");
+      return -ENOENT;
+    }
+
+  ninfo("%s: Using PHY address %u\n", BOARD_PHY_NAME, phyaddr);
+  priv->phyaddr = phyaddr;
+
   /* Verify PHYID1.  Compare OUI bits 3-18 */
 
   ninfo("%s: PHYID1: %04x\n", BOARD_PHY_NAME, phydata);
@@ -1473,29 +1509,35 @@ static inline void kinetis_initphy(struct kinetis_driver_s *priv)
     {
       nerr("ERROR: PHYID1=%04x incorrect for %s.  Expected %04x\n",
            phydata, BOARD_PHY_NAME, BOARD_PHYID1);
+      return -ENXIO;
     }
-  else
+
+  /* Read PHYID2 */
+
+  ret = kinetis_readmii(priv, phyaddr, MII_PHYID2, &phydata);
+  if (ret < 0)
     {
-      /* Read PHYID2 */
+      nerr("ERROR: Failed to read %s PHYID2: %d\n", BOARD_PHY_NAME, ret);
+      return ret;
+    }
 
-      kinetis_readmii(priv, CONFIG_KINETIS_ENETPHYADDR, MII_PHYID2, &phydata);
-      ninfo("%s: PHYID2: %04x\n", BOARD_PHY_NAME, phydata);
+  ninfo("%s: PHYID2: %04x\n", BOARD_PHY_NAME, phydata);
 
-      /* Verify PHYID2:  Compare OUI bits 19-24 and the 6-bit model number
-       * (ignoring the 4-bit revision number).
-       */
+  /* Verify PHYID2:  Compare OUI bits 19-24 and the 6-bit model number
+   * (ignoring the 4-bit revision number).
+   */
 
-      if ((phydata & 0xfff0) != (BOARD_PHYID2 & 0xfff0))
-        {
-          nerr("ERROR: PHYID2=%04x incorrect for %s.  Expected %04x\n",
-               (phydata & 0xfff0), BOARD_PHY_NAME, (BOARD_PHYID2 & 0xfff0));
-        }
+  if ((phydata & 0xfff0) != (BOARD_PHYID2 & 0xfff0))
+    {
+      nerr("ERROR: PHYID2=%04x incorrect for %s.  Expected %04x\n",
+           (phydata & 0xfff0), BOARD_PHY_NAME, (BOARD_PHYID2 & 0xfff0));
+      return -ENXIO;
     }
-#endif
 
   /* Start auto negotiation */
 
-  kinetis_writemii(priv, CONFIG_KINETIS_ENETPHYADDR, MII_MCR,
+  ninfo("%s: Start autonegotiation...\n",  BOARD_PHY_NAME);
+  kinetis_writemii(priv, phyaddr, MII_MCR,
                   (MII_MCR_ANRESTART | MII_MCR_ANENABLE));
 
   /* Wait (potentially forever) for auto negotiation to complete */
@@ -1503,16 +1545,30 @@ static inline void kinetis_initphy(struct kinetis_driver_s *priv)
   do
     {
       usleep(LINK_WAITUS);
-      kinetis_readmii(priv, CONFIG_KINETIS_ENETPHYADDR, MII_MSR, &phydata);
+      ret = kinetis_readmii(priv, phyaddr, MII_MSR, &phydata);
+      if (ret < 0)
+        {
+          nerr("ERROR: Failed to read %s MII_MSR: %d\n",
+                BOARD_PHY_NAME, ret);
+          return ret;
+        }
     }
   while ((phydata & MII_MSR_ANEGCOMPLETE) == 0);
 
+  ninfo("%s: Autonegotiation complete\n",  BOARD_PHY_NAME);
   ninfo("%s: MII_MSR: %04x\n", BOARD_PHY_NAME, phydata);
 
   /* When we get here we have a link - Find the negotiated speed and duplex. */
 
   phydata = 0;
-  kinetis_readmii(priv, CONFIG_KINETIS_ENETPHYADDR, BOARD_PHY_STATUS, &phydata);
+  ret = kinetis_readmii(priv, phyaddr, BOARD_PHY_STATUS, &phydata);
+  if (ret < 0)
+    {
+      nerr("ERROR: Failed to read %s BOARD_PHY_STATUS{%02x]: %d\n",
+           BOARD_PHY_NAME, BOARD_PHY_STATUS, ret);
+      return ret;
+   }
+
 
   ninfo("%s: BOARD_PHY_STATUS: %04x\n", BOARD_PHY_NAME, phydata);
 
@@ -1540,29 +1596,42 @@ static inline void kinetis_initphy(struct kinetis_driver_s *priv)
     {
       /* Full duplex */
 
+      ninfo("%s: Full duplex\n",  BOARD_PHY_NAME);
       tcr |= ENET_TCR_FDEN;
     }
   else
     {
       /* Half duplex */
 
+      ninfo("%s: Half duplex\n",  BOARD_PHY_NAME);
       rcr |= ENET_RCR_DRT;
     }
 
   if (BOARD_PHY_10BASET(phydata))
     {
-      /* 10Mbps */
+      /* 10 Mbps */
 
+      ninfo("%s: 10 Base-T\n",  BOARD_PHY_NAME);
       rcr |= ENET_RCR_RMII_10T;
     }
   else if (!BOARD_PHY_100BASET(phydata))
     {
+      /* 100 Mbps */
+
+      ninfo("%s: 100 Base-T\n",  BOARD_PHY_NAME);
+    }
+  else
+    {
+      /* This might happen if autonegotiation did not complete(?) */
+
       nerr("ERROR: Neither 10- nor 100-BaseT reported: PHY STATUS=%04x\n",
            phydata);
+      return -EIO;
     }
 
   putreg32(rcr, KINETIS_ENET_RCR);
   putreg32(tcr, KINETIS_ENET_TCR);
+  return OK;
 }
 
 /****************************************************************************
diff --git a/configs/freedom-k64f/README.txt b/configs/freedom-k64f/README.txt
index cfdac464d1..302b37638e 100644
--- a/configs/freedom-k64f/README.txt
+++ b/configs/freedom-k64f/README.txt
@@ -134,35 +134,41 @@ Ethernet
 
   ------------ ----------------- --------------------------------------------
   KSZ8081      Board Signal(s)   K64F Pin
-  Pin Signal                     Function
+  Pin Signal                     Function                       pinmux Name
   --- -------- ----------------- --------------------------------------------
-   1  VDD_1V2  VDDPLL_1.2V       ---
-   2  VDDA_3V3 VDDA_ENET         ---
-   3  RXM      ENET1_RX-         ---
-   4  RXP      ENET1_RX+         ---
-   5  TXM      ENET1_TX-         ---
-   6  TXP      ENET1_TX+         ---
-   7  X0       RMII_XTAL0        ---
-   8  XI       RMII_XTAL1        ---
-   9  REXT     ---               ---, Apparently not connected
-  10  MDIO     RMII0_MDIO        PTB0/RMII0_MDIO
-  11  MDC      RMII0_MDC         PTB1/RMII0_MDC
-  12  RXD1     RMII0_RXD_1       PTA12/RMII0_RXD1
-  13  RXD0     RMII0_RXD_0       PTA13/RMII0_RXD0
-  14  VDDIO    VDDIO_ENET        ---
-  15  CRS_DIV                    PTA14/RMII0_CRS_DV
-  16  REF_CLK  RMII_RXCLK        PTA18/EXTAL0, PHY clock input
-  17  RXER     RMII0_RXER        PTA5/RMII0_RXER
-  18  INTRP    RMII0_INT_B,      J14 Pin 2, Apparently not available unless jumpered
-               PHY_INT_1
-  19  TXEN     RMII0_TXEN        PTA15/RMII0_TXEN
-  20  TXD0     RMII0_TXD_0       PTA16/RMII0_TXD0
-  21  TXD1     RMII0_TXD_1       PTA17/RMII0_TXD1
-  22  GND1     ---               ---
-  24  nRST     PHY_RST_B         ---
-  25  GND2     ---               ---
+   1  VDD_1V2  VDDPLL_1.2V       ---                            ---
+   2  VDDA_3V3 VDDA_ENET         ---                            ---
+   3  RXM      ENET1_RX-         ---                            ---
+   4  RXP      ENET1_RX+         ---                            ---
+   5  TXM      ENET1_TX-         ---                            ---
+   6  TXP      ENET1_TX+         ---                            ---
+   7  X0       RMII_XTAL0        ---                            ---
+   8  XI       RMII_XTAL1        ---                            ---
+   9  REXT     ---               ---, Apparently not connected  ---
+  10  MDIO     RMII0_MDIO        PTB0/RMII0_MDIO                PIN_RMII0_MDIO
+  11  MDC      RMII0_MDC         PTB1/RMII0_MDC                 PIN_RMII0_MDC
+  12  RXD1     RMII0_RXD_1       PTA12/RMII0_RXD1               PIN_RMII0_RXD1
+  13  RXD0     RMII0_RXD_0       PTA13/RMII0_RXD0               PIN_RMII0_RXD0
+  14  VDDIO    VDDIO_ENET        ---                            ---
+  15  CRS_DIV                    PTA14/RMII0_CRS_DV             PIN_RMII0_CRS_DV
+  16  REF_CLK  RMII_RXCLK        PTA18/EXTAL0, PHY clock input  ---
+  17  RXER     RMII0_RXER        PTA5/RMII0_RXER                PIN_RMII0_RXER
+  18  INTRP    RMII0_INT_B,      J14 Pin 2, Apparently not      ---
+               PHY_INT_1         available unless jumpered
+  19  TXEN     RMII0_TXEN        PTA15/RMII0_TXEN               PIN_RMII0_TXEN
+  20  TXD0     RMII0_TXD_0       PTA16/RMII0_TXD0               PIN_RMII0_TXD0
+  21  TXD1     RMII0_TXD_1       PTA17/RMII0_TXD1               PIN_RMII0_TXD1
+  22  GND1     ---               ---                            ---
+  24  nRST     PHY_RST_B         ---                            ---
+  25  GND2     ---               ---                            ---
   --- -------- ----------------- --------------------------------------------
 
+  No external pullup is available on MDIO signal when MK64FN1M0VLL12 MCU is
+  requests status of the Ethernet link connection. Internal pullup is required
+  when port configuration for MDIO signal is enabled:
+
+    CONFIG_KINETIS_ENET_MDIOPULLUP=y
+
 Development Environment
 =======================
 
@@ -400,6 +406,12 @@ Where  is one of the following:
        CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : ARM/mbed toolcahin (arm-none-elf-gcc)
        CONFIG_INTELHEX_BINARY=y            : Output formats: Intel hex binary
 
+    3. No external pullup is available on MDIO signal when MK64FN1M0VLL12 MCU
+       is requests status of the Ethernet link connection. Internal pullup is
+       required when port configuration for MDIO signal is enabled:
+
+       CONFIG_KINETIS_ENET_MDIOPULLUP=y
+
   nsh:
   ---
     Configures the NuttShell (nsh) located at apps/examples/nsh using a
@@ -455,5 +467,13 @@ Status
     NSH configuration is working and LEDs are working.  The only odd
     behavior that I see is that pressing SW3 causes an unexpected interrupt
     error.
+
   2016-07-12:  Added support for the KSZ8081 PHY and added the netnsh
-    configuration.  Untested as of this writing.
+    configuration.  The network is basically functional, but a lot more
+    testing is needed to confirm that.
+ 
+    In testing, I notice a strange thing.  If I run at full optimization the
+    code runs (albeit with bugs-to-be-solved).  But with no optimization or
+    even at -O1, the system fails to boot.  This seems to be related to the
+    watchdog timer.
+
diff --git a/configs/freedom-k64f/include/board.h b/configs/freedom-k64f/include/board.h
index 7dcb29fc43..a0da55991e 100644
--- a/configs/freedom-k64f/include/board.h
+++ b/configs/freedom-k64f/include/board.h
@@ -41,8 +41,9 @@
  ************************************************************************************/
 
 #include 
+
 #ifndef __ASSEMBLY__
-# include 
+#  include 
 #endif
 
 /************************************************************************************
diff --git a/configs/freedom-k64f/netnsh/defconfig b/configs/freedom-k64f/netnsh/defconfig
index 0cb2657d58..cc59c552c3 100644
--- a/configs/freedom-k64f/netnsh/defconfig
+++ b/configs/freedom-k64f/netnsh/defconfig
@@ -245,8 +245,9 @@ CONFIG_KINETIS_ENET=y
 CONFIG_KINETIS_ENETNETHIFS=1
 CONFIG_KINETIS_ENETNRXBUFFERS=6
 CONFIG_KINETIS_ENETNTXBUFFERS=2
-CONFIG_KINETIS_ENETPHYADDR=1
 # CONFIG_KINETIS_ENETUSEMII is not set
+CONFIG_KINETIS_ENET_MDIOPULLUP=y
+# CONFIG_KINETIS_ENET_NORXER is not set
 
 #
 # Kinetis UART Configuration
@@ -759,7 +760,16 @@ CONFIG_FS_FAT=y
 # CONFIG_FS_ROMFS is not set
 # CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
-# CONFIG_FS_PROCFS is not set
+CONFIG_FS_PROCFS=y
+CONFIG_FS_PROCFS_REGISTER=y
+
+#
+# Exclude individual procfs entries
+#
+# CONFIG_FS_PROCFS_EXCLUDE_PROCESS is not set
+# CONFIG_FS_PROCFS_EXCLUDE_UPTIME is not set
+# CONFIG_FS_PROCFS_EXCLUDE_MOUNTS is not set
+# CONFIG_FS_PROCFS_EXCLUDE_NET is not set
 # CONFIG_FS_UNIONFS is not set
 
 #
@@ -1057,6 +1067,7 @@ CONFIG_NSH_MMCSDMINOR=0
 CONFIG_NSH_CMDOPT_DF_H=y
 CONFIG_NSH_CODECS_BUFSIZE=128
 CONFIG_NSH_CMDOPT_HEXDUMP=y
+CONFIG_NSH_PROC_MOUNTPOINT="/proc"
 CONFIG_NSH_FILEIOSIZE=512
 
 #
diff --git a/configs/freedom-k64f/nsh/defconfig b/configs/freedom-k64f/nsh/defconfig
index 085afbde09..9da3e6ab0e 100644
--- a/configs/freedom-k64f/nsh/defconfig
+++ b/configs/freedom-k64f/nsh/defconfig
@@ -192,6 +192,8 @@ CONFIG_ARCH_FAMILY_K64=y
 CONFIG_KINETIS_UART3=y
 # CONFIG_KINETIS_UART4 is not set
 # CONFIG_KINETIS_UART5 is not set
+# CONFIG_KINETIS_ENET is not set
+# CONFIG_KINETIS_RNGB is not set
 # CONFIG_KINETIS_FLEXCAN0 is not set
 # CONFIG_KINETIS_FLEXCAN1 is not set
 # CONFIG_KINETIS_SPI0 is not set
@@ -545,6 +547,7 @@ CONFIG_SYSLOG_SERIAL_CONSOLE=y
 CONFIG_SYSLOG_CONSOLE=y
 # CONFIG_SYSLOG_NONE is not set
 # CONFIG_SYSLOG_FILE is not set
+# CONFIG_SYSLOG_CHARDEV is not set
 
 #
 # Networking Support
@@ -584,7 +587,15 @@ CONFIG_FS_FAT=y
 # CONFIG_FS_ROMFS is not set
 # CONFIG_FS_TMPFS is not set
 # CONFIG_FS_SMARTFS is not set
-# CONFIG_FS_PROCFS is not set
+CONFIG_FS_PROCFS=y
+CONFIG_FS_PROCFS_REGISTER=y
+
+#
+# Exclude individual procfs entries
+#
+# CONFIG_FS_PROCFS_EXCLUDE_PROCESS is not set
+# CONFIG_FS_PROCFS_EXCLUDE_UPTIME is not set
+# CONFIG_FS_PROCFS_EXCLUDE_MOUNTS is not set
 # CONFIG_FS_UNIONFS is not set
 
 #
@@ -829,7 +840,6 @@ CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_MV is not set
 # CONFIG_NSH_DISABLE_MW is not set
 # CONFIG_NSH_DISABLE_PS is not set
-# CONFIG_NSH_DISABLE_PSSTACKUSAGE is not set
 # CONFIG_NSH_DISABLE_PUT is not set
 # CONFIG_NSH_DISABLE_PWD is not set
 # CONFIG_NSH_DISABLE_RM is not set
@@ -853,6 +863,7 @@ CONFIG_NSH_MMCSDMINOR=0
 CONFIG_NSH_CMDOPT_DF_H=y
 CONFIG_NSH_CODECS_BUFSIZE=128
 CONFIG_NSH_CMDOPT_HEXDUMP=y
+CONFIG_NSH_PROC_MOUNTPOINT="/proc"
 CONFIG_NSH_FILEIOSIZE=512
 
 #
diff --git a/configs/freedom-k64f/src/k64_bringup.c b/configs/freedom-k64f/src/k64_bringup.c
index 0739f95d00..2dfdd963a4 100644
--- a/configs/freedom-k64f/src/k64_bringup.c
+++ b/configs/freedom-k64f/src/k64_bringup.c
@@ -39,6 +39,7 @@
 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -59,6 +60,25 @@
  ****************************************************************************/
 /* Configuration ************************************************************/
 
+/* Automount procfs */
+
+#define HAVE_PROC 1
+
+#if !defined(CONFIG_FS_PROCFS)
+#  undef HAVE_PROC
+#endif
+
+#if defined(HAVE_PROC) && defined(CONFIG_DISABLE_MOUNTPOINT)
+#  warning Mountpoints disabled.  No procfs support
+#  undef HAVE_PROC
+#endif
+
+#if defined(CONFIG_NSH_PROC_MOUNTPOINT)
+#  define PROCFS_MOUNTPOUNT CONFIG_NSH_PROC_MOUNTPOINT
+#else
+#  define PROCFS_MOUNTPOUNT "/proc"
+#endif
+
 /* PORT and SLOT number probably depend on the board configuration */
 
 #ifdef CONFIG_ARCH_BOARD_FREEDOM_K64F
@@ -199,9 +219,24 @@ static int k64_cdinterrupt(int irq, FAR void *context)
 
 int k64_bringup(void)
 {
-#ifdef NSH_HAVEMMCSD
   int ret;
 
+#ifdef HAVE_PROC
+  /* Mount the proc filesystem */
+
+  syslog(LOG_INFO, "Mounting procfs to /proc\n");
+
+  ret = mount(NULL, PROCFS_MOUNTPOUNT, "procfs", 0, NULL);
+  if (ret < 0)
+    {
+      syslog(LOG_ERR,
+             "ERROR: Failed to mount the PROC filesystem: %d (%d)\n",
+             ret, errno);
+      return ret;
+    }
+#endif
+
+#ifdef NSH_HAVEMMCSD
   /* Configure GPIO pins */
 
   /* Attached the card detect interrupt (but don't enable it yet) */
@@ -249,6 +284,8 @@ int k64_bringup(void)
 
   kinetis_pinirqenable(GPIO_SD_CARDDETECT);
 #endif
+
+  UNUSED(ret);
   return OK;
 }
 
-- 
GitLab


From 6b0b4f9910f3a02cc5b8e47dddaf04b98714ec84 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 12 Jul 2016 14:08:51 -0600
Subject: [PATCH 224/229] Freedom-K64F: Some fixes needed after k64_bringup.c
 first use.

---
 configs/freedom-k64f/netnsh/defconfig   | 12 +++-
 configs/freedom-k64f/nsh/defconfig      | 12 +++-
 configs/freedom-k64f/src/freedom-k64f.h | 59 ++++++++++++++++++
 configs/freedom-k64f/src/k64_bringup.c  | 80 ++-----------------------
 4 files changed, 83 insertions(+), 80 deletions(-)

diff --git a/configs/freedom-k64f/netnsh/defconfig b/configs/freedom-k64f/netnsh/defconfig
index cc59c552c3..05a73a3220 100644
--- a/configs/freedom-k64f/netnsh/defconfig
+++ b/configs/freedom-k64f/netnsh/defconfig
@@ -332,7 +332,14 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # Board-Specific Options
 #
 # CONFIG_BOARD_CRASHDUMP is not set
-# CONFIG_LIB_BOARDCTL is not set
+CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_RESET is not set
+# CONFIG_BOARDCTL_UNIQUEID is not set
+# CONFIG_BOARDCTL_TSCTEST is not set
+# CONFIG_BOARDCTL_ADCTEST is not set
+# CONFIG_BOARDCTL_PWMTEST is not set
+# CONFIG_BOARDCTL_GRAPHICS is not set
+# CONFIG_BOARDCTL_IOCTL is not set
 
 #
 # RTOS Features
@@ -928,6 +935,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UDPBLASTER is not set
+# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WEBSERVER is not set
@@ -1081,7 +1089,7 @@ CONFIG_NSH_FILEIOSIZE=512
 # Console Configuration
 #
 CONFIG_NSH_CONSOLE=y
-# CONFIG_NSH_ARCHINIT is not set
+CONFIG_NSH_ARCHINIT=y
 
 #
 # Networking Configuration
diff --git a/configs/freedom-k64f/nsh/defconfig b/configs/freedom-k64f/nsh/defconfig
index 9da3e6ab0e..7fb687ca4a 100644
--- a/configs/freedom-k64f/nsh/defconfig
+++ b/configs/freedom-k64f/nsh/defconfig
@@ -314,7 +314,14 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # Board-Specific Options
 #
 # CONFIG_BOARD_CRASHDUMP is not set
-# CONFIG_LIB_BOARDCTL is not set
+CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_RESET is not set
+# CONFIG_BOARDCTL_UNIQUEID is not set
+# CONFIG_BOARDCTL_TSCTEST is not set
+# CONFIG_BOARDCTL_ADCTEST is not set
+# CONFIG_BOARDCTL_PWMTEST is not set
+# CONFIG_BOARDCTL_GRAPHICS is not set
+# CONFIG_BOARDCTL_IOCTL is not set
 
 #
 # RTOS Features
@@ -741,6 +748,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_TELNETD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
+# CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 # CONFIG_EXAMPLES_WEBSERVER is not set
@@ -878,7 +886,7 @@ CONFIG_NSH_FILEIOSIZE=512
 #
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
-# CONFIG_NSH_ARCHINIT is not set
+CONFIG_NSH_ARCHINIT=y
 # CONFIG_NSH_LOGIN is not set
 # CONFIG_NSH_CONSOLE_LOGIN is not set
 
diff --git a/configs/freedom-k64f/src/freedom-k64f.h b/configs/freedom-k64f/src/freedom-k64f.h
index a253dd3be4..a6758ebb0f 100644
--- a/configs/freedom-k64f/src/freedom-k64f.h
+++ b/configs/freedom-k64f/src/freedom-k64f.h
@@ -49,6 +49,65 @@
  * Pre-processor Definitions
  ************************************************************************************/
 
+/* Application Configuration ********************************************************/
+
+/* Assume we have everything */
+
+#define HAVE_PROC      1
+#define NSH_HAVEUSBDEV 1
+#define NSH_HAVEMMCSD  1
+
+/* Automount procfs */
+
+#if !defined(CONFIG_FS_PROCFS)
+#  undef HAVE_PROC
+#endif
+
+#if defined(HAVE_PROC) && defined(CONFIG_DISABLE_MOUNTPOINT)
+#  warning Mountpoints disabled.  No procfs support
+#  undef HAVE_PROC
+#endif
+
+#if defined(CONFIG_NSH_PROC_MOUNTPOINT)
+#  define PROCFS_MOUNTPOUNT CONFIG_NSH_PROC_MOUNTPOINT
+#else
+#  define PROCFS_MOUNTPOUNT "/proc"
+#endif
+
+/* SD card support */
+
+#define MMCSD_SLOTNO 0
+
+/* Can't support MMC/SD features if mountpoints are disabled or if SDHC support
+ * is not enabled.
+ */
+
+#if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_KINETIS_SDHC)
+#  undef NSH_HAVEMMCSD
+#endif
+
+#ifdef NSH_HAVEMMCSD
+#  if defined(CONFIG_NSH_MMCSDSLOTNO) && CONFIG_NSH_MMCSDSLOTNO != 0
+#    error "Only one MMC/SD slot, slot 0"
+#  endif
+
+/* We expect to receive GPIO interrupts for card insertion events */
+
+#  ifndef CONFIG_GPIO_IRQ
+#    error "CONFIG_GPIO_IRQ required for card detect interrupt"
+#  endif
+
+#  ifndef CONFIG_KINETIS_PORTEINTS
+#    error "CONFIG_KINETIS_PORTEINTS required for card detect interrupt"
+#  endif
+#endif
+
+/* Can't support USB features if USB is not enabled */
+
+#ifndef CONFIG_USBDEV
+#  undef NSH_HAVEUSBDEV
+#endif
+
 /* How many SPI modules does this chip support? The LM3S6918 supports 2 SPI
  * modules (others may support more -- in such case, the following must be
  * expanded).
diff --git a/configs/freedom-k64f/src/k64_bringup.c b/configs/freedom-k64f/src/k64_bringup.c
index 2dfdd963a4..0cbbb1bb28 100644
--- a/configs/freedom-k64f/src/k64_bringup.c
+++ b/configs/freedom-k64f/src/k64_bringup.c
@@ -55,77 +55,6 @@
 
 #if defined(CONFIG_LIB_BOARDCTL) || defined(CONFIG_BOARD_INITIALIZE)
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-/* Configuration ************************************************************/
-
-/* Automount procfs */
-
-#define HAVE_PROC 1
-
-#if !defined(CONFIG_FS_PROCFS)
-#  undef HAVE_PROC
-#endif
-
-#if defined(HAVE_PROC) && defined(CONFIG_DISABLE_MOUNTPOINT)
-#  warning Mountpoints disabled.  No procfs support
-#  undef HAVE_PROC
-#endif
-
-#if defined(CONFIG_NSH_PROC_MOUNTPOINT)
-#  define PROCFS_MOUNTPOUNT CONFIG_NSH_PROC_MOUNTPOINT
-#else
-#  define PROCFS_MOUNTPOUNT "/proc"
-#endif
-
-/* PORT and SLOT number probably depend on the board configuration */
-
-#ifdef CONFIG_ARCH_BOARD_FREEDOM_K64F
-#  define NSH_HAVEUSBDEV 1
-#  define NSH_HAVEMMCSD  1
-#  if defined(CONFIG_NSH_MMCSDSLOTNO) && CONFIG_NSH_MMCSDSLOTNO != 0
-#    error "Only one MMC/SD slot, slot 0"
-#    undef CONFIG_NSH_MMCSDSLOTNO
-#  endif
-#  ifndef CONFIG_NSH_MMCSDSLOTNO
-#    define CONFIG_NSH_MMCSDSLOTNO 0
-#  endif
-#else
-   /* Add configuration for new Kinetis boards here */
-#  error "Unrecognized Kinetis board"
-#  undef NSH_HAVEUSBDEV
-#  undef NSH_HAVEMMCSD
-#endif
-
-/* Can't support USB features if USB is not enabled */
-
-#ifndef CONFIG_USBDEV
-#  undef NSH_HAVEUSBDEV
-#endif
-
-/* Can't support MMC/SD features if mountpoints are disabled or if SDHC support
- * is not enabled.
- */
-
-#if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_KINETIS_SDHC)
-#  undef NSH_HAVEMMCSD
-#endif
-
-#ifndef CONFIG_NSH_MMCSDMINOR
-#  define CONFIG_NSH_MMCSDMINOR 0
-#endif
-
-/* We expect to receive GPIO interrupts for card insertion events */
-
-#ifndef CONFIG_GPIO_IRQ
-#  error "CONFIG_GPIO_IRQ required for card detect interrupt"
-#endif
-
-#ifndef CONFIG_KINETIS_PORTEINTS
-#  error "CONFIG_KINETIS_PORTEINTS required for card detect interrupt"
-#endif
-
 /****************************************************************************
  * Private Types
  ****************************************************************************/
@@ -246,19 +175,18 @@ int k64_bringup(void)
 
   /* Configure the write protect GPIO */
 
-  kinetis_pinconfig(GPIO_SD_WRPROTECT);
+  //kinetis_pinconfig(GPIO_SD_WRPROTECT);
 
   /* Mount the SDHC-based MMC/SD block driver */
   /* First, get an instance of the SDHC interface */
 
-  syslog(LOG_INFO, "Initializing SDHC slot %d\n",
-         CONFIG_NSH_MMCSDSLOTNO);
+  syslog(LOG_INFO, "Initializing SDHC slot %d\n", MMCSD_SLOTNO);
 
-  g_nsh.sdhc = sdhc_initialize(CONFIG_NSH_MMCSDSLOTNO);
+  g_nsh.sdhc = sdhc_initialize(MMCSD_SLOTNO);
   if (!g_nsh.sdhc)
     {
       syslog(LOG_ERR, "ERROR: Failed to initialize SDHC slot %d\n",
-             CONFIG_NSH_MMCSDSLOTNO);
+             MMCSD_SLOTNO);
       return -ENODEV;
     }
 
-- 
GitLab


From 0154e300e835a0c1dcf57b5c8b9605b9173a4805 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 12 Jul 2016 15:05:35 -0600
Subject: [PATCH 225/229] Freedom K16F: Correct calculations for SDHC clock

---
 configs/freedom-k64f/include/board.h | 29 ++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/configs/freedom-k64f/include/board.h b/configs/freedom-k64f/include/board.h
index a0da55991e..198915caa9 100644
--- a/configs/freedom-k64f/include/board.h
+++ b/configs/freedom-k64f/include/board.h
@@ -69,7 +69,7 @@
  *
  *   PLL Input frequency:   PLLIN  = REFCLK / PRDIV = 50  Mhz  / 20 = 2.5 MHz
  *   PLL Output frequency:  PLLOUT = PLLIN  * VDIV  = 2.5 Mhz  * 48 = 120 MHz
- *   MCG Frequency:         PLLOUT = 96MHz
+ *   MCG Frequency:         PLLOUT = 120 MHz
  *
  * PRDIV register value is the divider minus one.  So 20 -> 19
  * VDIV  regiser value is offset by 24.  So 28 -> 24
@@ -101,36 +101,37 @@
  *   SDCLK  frequency = (base clock) / (prescaler * divisor)
  *
  * The SDHC module is always configure configured so that the core clock is the base
- * clock.
+ * clock.  Possible values for presscaler and divisor are:
+ *
+ *   SDCLKFS: {2, 4, 8, 16, 32, 63, 128, 256}
+ *   DVS:     {1..16}
  */
 
-/* Identification mode:  400KHz = 96MHz / ( 16 * 15) */
+/* Identification mode:  Optimal 400KHz, Actual 120MHz / (32 * 10) = 375 Khz */
 
-#define BOARD_SDHC_IDMODE_PRESCALER    SDHC_SYSCTL_SDCLKFS_DIV16
-#define BOARD_SDHC_IDMODE_DIVISOR      SDHC_SYSCTL_DVS_DIV(15)
+#define BOARD_SDHC_IDMODE_PRESCALER    SDHC_SYSCTL_SDCLKFS_DIV32
+#define BOARD_SDHC_IDMODE_DIVISOR      SDHC_SYSCTL_DVS_DIV(10)
 
-/* MMC normal mode: 16MHz  = 96MHz / (2 * 3) */
+/* MMC normal mode: Optimal 20MHz, Actual 120MHz / (2 * 3) = 20 MHz */
 
 #define BOARD_SDHC_MMCMODE_PRESCALER   SDHC_SYSCTL_SDCLKFS_DIV2
 #define BOARD_SDHC_MMCMODE_DIVISOR     SDHC_SYSCTL_DVS_DIV(3)
 
-/* SD normal mode (1-bit): 16MHz  = 96MHz / (2 * 3) */
+/* SD normal mode (1-bit): Optimal 20MHz, Actual 120MHz / (2 * 3) = 20 MHz */
 
 #define BOARD_SDHC_SD1MODE_PRESCALER   SDHC_SYSCTL_SDCLKFS_DIV2
 #define BOARD_SDHC_SD1MODE_DIVISOR     SDHC_SYSCTL_DVS_DIV(3)
 
-/* SD normal mode (4-bit): 24MHz  = 96MHz / (2 * 2) (with DMA)
- * SD normal mode (4-bit): 16MHz  = 96MHz / (2 * 3) (no DMA)
+/* SD normal mode (4-bit): Optimal 25MHz, Actual 120MHz / (2 * 3) = 20 MHz (with DMA)
+ * SD normal mode (4-bit): Optimal 20MHz, Actual 120MHz / (2 * 3) = 20 MHz (no DMA)
  */
 
 #ifdef CONFIG_SDIO_DMA
 #  define BOARD_SDHC_SD4MODE_PRESCALER SDHC_SYSCTL_SDCLKFS_DIV2
-#  define BOARD_SDHC_SD4MODE_DIVISOR   SDHC_SYSCTL_DVS_DIV(2)
+#  define BOARD_SDHC_SD4MODE_DIVISOR   SDHC_SYSCTL_DVS_DIV(3)
 #else
-//#  define BOARD_SDHC_SD4MODE_PRESCALER SDHC_SYSCTL_SDCLKFS_DIV2
-//#  define BOARD_SDHC_SD4MODE_DIVISOR   SDHC_SYSCTL_DVS_DIV(3)
-#  define BOARD_SDHC_SD4MODE_PRESCALER SDHC_SYSCTL_SDCLKFS_DIV16
-#  define BOARD_SDHC_SD4MODE_DIVISOR   SDHC_SYSCTL_DVS_DIV(15)
+#  define BOARD_SDHC_SD4MODE_PRESCALER SDHC_SYSCTL_SDCLKFS_DIV2
+#  define BOARD_SDHC_SD4MODE_DIVISOR   SDHC_SYSCTL_DVS_DIV(3)
 #endif
 
 /* LED definitions ******************************************************************/
-- 
GitLab


From dee77a5dd9a7830cfe7494efe13393ebbbe64e37 Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 12 Jul 2016 16:17:35 -0600
Subject: [PATCH 226/229] Kinetis Ethernet:  Add support for CONFIG_NET_NOINTS

---
 TODO                                  |   1 +
 arch/arm/src/kinetis/kinetis_enet.c   | 453 +++++++++++++++++++++++---
 configs/freedom-k64f/netnsh/defconfig |  11 +-
 3 files changed, 414 insertions(+), 51 deletions(-)

diff --git a/TODO b/TODO
index 5c67ae83ac..bbc8f7657a 100644
--- a/TODO
+++ b/TODO
@@ -937,6 +937,7 @@ o Network (net/, drivers/net)
                  LM3S         NO                      NO
                  TM4C         YES                     YES
                eZ80           NO                      NO
+               Kinetis        YES                     YES (not tested)
                LPC17xx        YES                     YES (not tested)
                LPC43xx        YES                     YES (not tested)
                DMxxx NIC      NO                      NO
diff --git a/arch/arm/src/kinetis/kinetis_enet.c b/arch/arm/src/kinetis/kinetis_enet.c
index 070da795f3..6c30bac415 100644
--- a/arch/arm/src/kinetis/kinetis_enet.c
+++ b/arch/arm/src/kinetis/kinetis_enet.c
@@ -57,6 +57,10 @@
 #include 
 #include 
 
+#ifdef CONFIG_NET_NOINTS
+#  include 
+#endif
+
 #ifdef CONFIG_NET_PKT
 #  include 
 #endif
@@ -76,6 +80,14 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
+/* If processing is not done at the interrupt level, then high priority
+ * work queue support is required.
+ */
+
+#if defined(CONFIG_NET_NOINTS) && !defined(CONFIG_SCHED_HPWORK)
+#  error High priority work queue support is required
+#endif
+
 /* CONFIG_KINETIS_ENETNETHIFS determines the number of physical interfaces
  * that will be supported.
  */
@@ -92,13 +104,16 @@
 #  error "Need at least one RX buffer"
 #endif
 
-#define NENET_NBUFFERS (CONFIG_KINETIS_ENETNTXBUFFERS+CONFIG_KINETIS_ENETNRXBUFFERS)
+#define NENET_NBUFFERS \
+  (CONFIG_KINETIS_ENETNTXBUFFERS+CONFIG_KINETIS_ENETNRXBUFFERS)
 
 #ifndef CONFIG_NET_MULTIBUFFER
 #  error "CONFIG_NET_MULTIBUFFER is required in the configuration"
 #endif
 
-/* TX poll delay = 1 seconds. CLK_TCK is the number of clock ticks per second */
+/* TX poll delay = 1 seconds. CLK_TCK is the number of clock ticks per
+ * second.
+ */
 
 #define KINETIS_WDDELAY   (1*CLK_TCK)
 
@@ -196,6 +211,9 @@ struct kinetis_driver_s
   uint8_t phyaddr;             /* Selected PHY address */
   WDOG_ID txpoll;              /* TX poll timer */
   WDOG_ID txtimeout;           /* TX timeout timer */
+#ifdef CONFIG_NET_NOINTS
+  struct work_s work;          /* For deferring work to the work queue */
+#endif
   struct enet_desc_s *txdesc;  /* A pointer to the list of TX descriptor */
   struct enet_desc_s *rxdesc;  /* A pointer to the list of RX descriptors */
 
@@ -252,22 +270,43 @@ static int  kinetis_txpoll(struct net_driver_s *dev);
 
 static void kinetis_receive(FAR struct kinetis_driver_s *priv);
 static void kinetis_txdone(FAR struct kinetis_driver_s *priv);
+
+static inline void kinetis_interrupt_process(FAR struct kinetis_driver_s *priv);
+#ifdef CONFIG_NET_NOINTS
+static void kinetis_interrupt_work(FAR void *arg);
+#endif
 static int  kinetis_interrupt(int irq, FAR void *context);
 
 /* Watchdog timer expirations */
 
-static void kinetis_txtimeout(int argc, uint32_t arg, ...);
-static void kinetis_polltimer(int argc, uint32_t arg, ...);
+static inline void kinetis_txtimeout_process(FAR struct kinetis_driver_s *priv);
+#ifdef CONFIG_NET_NOINTS
+static void kinetis_txtimeout_work(FAR void *arg);
+#endif
+static void kinetis_txtimeout_expiry(int argc, uint32_t arg, ...);
+
+static inline void kinetis_poll_process(FAR struct kinetis_driver_s *priv);
+#ifdef CONFIG_NET_NOINTS
+static void kinetis_poll_work(FAR void *arg);
+#endif
+static void kinetis_polltimer_expiry(int argc, uint32_t arg, ...);
 
 /* NuttX callback functions */
 
 static int kinetis_ifup(struct net_driver_s *dev);
 static int kinetis_ifdown(struct net_driver_s *dev);
+
+static inline void kinetis_txavail_process(FAR struct kinetis_driver_s *priv);
+#ifdef CONFIG_NET_NOINTS
+static void kinetis_txavail_work(FAR void *arg);
+#endif
 static int kinetis_txavail(struct net_driver_s *dev);
+
 #ifdef CONFIG_NET_IGMP
 static int kinetis_addmac(struct net_driver_s *dev, FAR const uint8_t *mac);
 static int kinetis_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac);
 #endif
+
 #ifdef CONFIG_NETDEV_PHY_IOCTL
 static int kinetis_ioctl(struct net_driver_s *dev, int cmd, long arg);
 #endif
@@ -464,8 +503,8 @@ static int kinetis_transmit(FAR struct kinetis_driver_s *priv)
 
   /* Setup the TX timeout watchdog (perhaps restarting the timer) */
 
-  (void)wd_start(priv->txtimeout, KINETIS_TXTIMEOUT, kinetis_txtimeout, 1,
-                 (uint32_t)priv);
+  (void)wd_start(priv->txtimeout, KINETIS_TXTIMEOUT, kinetis_txtimeout_expiry, 1,
+                 (wdparm_t)priv);
   return OK;
 }
 
@@ -777,28 +816,25 @@ static void kinetis_txdone(FAR struct kinetis_driver_s *priv)
 }
 
 /****************************************************************************
- * Function: kinetis_interrupt
+ * Function: kinetis_interrupt_process
  *
  * Description:
- *   Three interrupt sources will vector this this function:
- *   1. Ethernet MAC transmit interrupt handler
- *   2. Ethernet MAC receive interrupt handler
- *   3.
+ *   Interrupt processing.  This may be performed either within the interrupt
+ *   handler or on the worker thread, depending upon the configuration
  *
  * Parameters:
- *   irq     - Number of the IRQ that generated the interrupt
- *   context - Interrupt register state save info (architecture-specific)
+ *   priv - Reference to the driver state structure
  *
  * Returned Value:
- *   OK on success
+ *   None
  *
  * Assumptions:
+ *   The network is locked.
  *
  ****************************************************************************/
 
-static int kinetis_interrupt(int irq, FAR void *context)
+static inline void kinetis_interrupt_process(FAR struct kinetis_driver_s *priv)
 {
-  register FAR struct kinetis_driver_s *priv = &g_enet[0];
   uint32_t pending;
 
   /* Get the set of unmasked, pending interrupt. */
@@ -848,33 +884,130 @@ static int kinetis_interrupt(int irq, FAR void *context)
 
       putreg32(ENET_RDAR, KINETIS_ENET_RDAR);
     }
-
-  return OK;
 }
 
 /****************************************************************************
- * Function: kinetis_txtimeout
+ * Function: kinetis_interrupt_work
  *
  * Description:
- *   Our TX watchdog timed out.  Called from the timer interrupt handler.
- *   The last TX never completed.  Reset the hardware and start again.
+ *   Perform interrupt related work from the worker thread
  *
  * Parameters:
- *   argc - The number of available arguments
- *   arg  - The first argument
+ *   arg - The argument passed when work_queue() was called.
  *
  * Returned Value:
- *   None
+ *   OK on success
  *
  * Assumptions:
- *   Global interrupts are disabled by the watchdog logic.
+ *   The network is locked.
  *
  ****************************************************************************/
 
-static void kinetis_txtimeout(int argc, uint32_t arg, ...)
+#ifdef CONFIG_NET_NOINTS
+static void kinetis_interrupt_work(FAR void *arg)
 {
   FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)arg;
+  net_lock_t state;
+
+  /* Process pending Ethernet interrupts */
+
+  state = net_lock();
+  kinetis_interrupt_process(priv);
+  net_unlock(state);
+
+  /* Re-enable Ethernet interrupts */
+
+#if 0
+  up_enable_irq(KINETIS_IRQ_EMACTMR);
+#endif
+  up_enable_irq(KINETIS_IRQ_EMACTX);
+  up_enable_irq(KINETIS_IRQ_EMACRX);
+  up_enable_irq(KINETIS_IRQ_EMACMISC);
+}
+#endif
+
+/****************************************************************************
+ * Function: kinetis_interrupt
+ *
+ * Description:
+ *   Three interrupt sources will vector this this function:
+ *   1. Ethernet MAC transmit interrupt handler
+ *   2. Ethernet MAC receive interrupt handler
+ *   3.
+ *
+ * Parameters:
+ *   irq     - Number of the IRQ that generated the interrupt
+ *   context - Interrupt register state save info (architecture-specific)
+ *
+ * Returned Value:
+ *   OK on success
+ *
+ * Assumptions:
+ *
+ ****************************************************************************/
+
+static int kinetis_interrupt(int irq, FAR void *context)
+{
+  register FAR struct kinetis_driver_s *priv = &g_enet[0];
+
+#ifdef CONFIG_NET_NOINTS
+  /* Disable further Ethernet interrupts.  Because Ethernet interrupts are
+   * also disabled if the TX timeout event occurs, there can be no race
+   * condition here.
+   */
+
+  up_disable_irq(KINETIS_IRQ_EMACTMR);
+  up_disable_irq(KINETIS_IRQ_EMACTX);
+  up_disable_irq(KINETIS_IRQ_EMACRX);
+  up_disable_irq(KINETIS_IRQ_EMACMISC);
+
+  /* TODO: Determine if a TX transfer just completed */
+
+    {
+      /* If a TX transfer just completed, then cancel the TX timeout so
+       * there will be do race condition between any subsequent timeout
+       * expiration and the deferred interrupt processing.
+       */
+
+       wd_cancel(priv->txtimeout);
+    }
+
+  /* Cancel any pending poll work */
+
+  work_cancel(HPWORK, &priv->work);
+
+  /* Schedule to perform the interrupt processing on the worker thread. */
+
+  work_queue(HPWORK, &priv->work, kinetis_interrupt_work, priv, 0);
+
+#else
+  /* Process the interrupt now */
+
+  kinetis_interrupt_process(priv);
+#endif
+
+  return OK;
+}
+
+/****************************************************************************
+ * Function: kinetis_txtimeout_process
+ *
+ * Description:
+ *   Process a TX timeout.  Called from the either the watchdog timer
+ *   expiration logic or from the worker thread, depending upon the
+ *   configuration.  The timeout means that the last TX never completed.
+ *   Reset the hardware and start again.
+ *
+ * Parameters:
+ *   priv - Reference to the driver state structure
+ *
+ * Returned Value:
+ *   None
+ *
+ ****************************************************************************/
 
+static inline void kinetis_txtimeout_process(FAR struct kinetis_driver_s *priv)
+{
   /* Increment statistics and dump debug info */
 
   NETDEV_TXTIMEOUTS(&priv->dev);
@@ -892,10 +1025,42 @@ static void kinetis_txtimeout(int argc, uint32_t arg, ...)
 }
 
 /****************************************************************************
- * Function: kinetis_polltimer
+ * Function: kinetis_txtimeout_work
  *
  * Description:
- *   Periodic timer handler.  Called from the timer interrupt handler.
+ *   Perform TX timeout related work from the worker thread
+ *
+ * Parameters:
+ *   arg - The argument passed when work_queue() as called.
+ *
+ * Returned Value:
+ *   OK on success
+ *
+ * Assumptions:
+ *   The network is locked.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_NET_NOINTS
+static void kinetis_txtimeout_work(FAR void *arg)
+{
+  FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)arg;
+  net_lock_t state;
+
+  /* Process pending Ethernet interrupts */
+
+  state = net_lock();
+  kinetis_txtimeout_process(priv);
+  net_unlock(state);
+}
+#endif
+
+/****************************************************************************
+ * Function: kinetis_txtimeout_expiry
+ *
+ * Description:
+ *   Our TX watchdog timed out.  Called from the timer interrupt handler.
+ *   The last TX never completed.  Reset the hardware and start again.
  *
  * Parameters:
  *   argc - The number of available arguments
@@ -909,10 +1074,56 @@ static void kinetis_txtimeout(int argc, uint32_t arg, ...)
  *
  ****************************************************************************/
 
-static void kinetis_polltimer(int argc, uint32_t arg, ...)
+static void kinetis_txtimeout_expiry(int argc, uint32_t arg, ...)
 {
   FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)arg;
 
+#ifdef CONFIG_NET_NOINTS
+  /* Disable further Ethernet interrupts.  This will prevent some race
+   * conditions with interrupt work.  There is still a potential race
+   * condition with interrupt work that is already queued and in progress.
+   */
+
+  up_disable_irq(KINETIS_IRQ_EMACTMR);
+  up_disable_irq(KINETIS_IRQ_EMACTX);
+  up_disable_irq(KINETIS_IRQ_EMACRX);
+  up_disable_irq(KINETIS_IRQ_EMACMISC);
+
+  /* Cancel any pending poll or interrupt work.  This will have no effect
+   * on work that has already been started.
+   */
+
+  work_cancel(HPWORK, &priv->work);
+
+  /* Schedule to perform the TX timeout processing on the worker thread. */
+
+  work_queue(HPWORK, &priv->work, kinetis_txtimeout_work, priv, 0);
+#else
+  /* Process the timeout now */
+
+  kinetis_txtimeout_process(priv);
+#endif
+}
+
+/****************************************************************************
+ * Function: kinetis_poll_process
+ *
+ * Description:
+ *   Perform the periodic poll.  This may be called either from watchdog
+ *   timer logic or from the worker thread, depending upon the configuration.
+ *
+ * Parameters:
+ *   priv - Reference to the driver state structure
+ *
+ * Returned Value:
+ *   None
+ *
+ * Assumptions:
+ *
+ ****************************************************************************/
+
+static inline void kinetis_poll_process(FAR struct kinetis_driver_s *priv)
+{
   /* Check if there is there is a transmission in progress.  We cannot perform
    * the TX poll if he are unable to accept another packet for transmission.
    */
@@ -929,7 +1140,89 @@ static void kinetis_polltimer(int argc, uint32_t arg, ...)
 
   /* Setup the watchdog poll timer again in any case */
 
-  (void)wd_start(priv->txpoll, KINETIS_WDDELAY, kinetis_polltimer, 1, arg);
+  (void)wd_start(priv->txpoll, KINETIS_WDDELAY, kinetis_polltimer_expiry,
+                 1, (wdparm_t)priv);
+}
+
+/****************************************************************************
+ * Function: kinetis_poll_work
+ *
+ * Description:
+ *   Perform periodic polling from the worker thread
+ *
+ * Parameters:
+ *   arg - The argument passed when work_queue() as called.
+ *
+ * Returned Value:
+ *   OK on success
+ *
+ * Assumptions:
+ *   The network is locked.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_NET_NOINTS
+static void kinetis_poll_work(FAR void *arg)
+{
+  FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)arg;
+  net_lock_t state;
+
+  /* Perform the poll */
+
+  state = net_lock();
+  kinetis_poll_process(priv);
+  net_unlock(state);
+}
+#endif
+
+/****************************************************************************
+ * Function: kinetis_polltimer_expiry
+ *
+ * Description:
+ *   Periodic timer handler.  Called from the timer interrupt handler.
+ *
+ * Parameters:
+ *   argc - The number of available arguments
+ *   arg  - The first argument
+ *
+ * Returned Value:
+ *   None
+ *
+ * Assumptions:
+ *   Global interrupts are disabled by the watchdog logic.
+ *
+ ****************************************************************************/
+
+static void kinetis_polltimer_expiry(int argc, uint32_t arg, ...)
+{
+  FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)arg;
+
+#ifdef CONFIG_NET_NOINTS
+  /* Is our single work structure available?  It may not be if there are
+   * pending interrupt actions.
+   */
+
+  if (work_available(&priv->work))
+    {
+      /* Schedule to perform the interrupt processing on the worker thread. */
+
+      work_queue(HPWORK, &priv->work, kinetis_poll_work, priv, 0);
+    }
+  else
+    {
+      /* No.. Just re-start the watchdog poll timer, missing one polling
+       * cycle.
+       */
+
+      (void)wd_start(priv->txpoll, KINETIS_WDDELAY, kinetis_polltimer_expiry,
+                     1, (wdparm_t)arg);
+    }
+
+#else
+  /* Process the interrupt now */
+
+  kinetis_poll_process(priv);
+#endif
 }
 
 /****************************************************************************
@@ -1039,8 +1332,8 @@ static int kinetis_ifup(struct net_driver_s *dev)
 
   /* Set and activate a timer process */
 
-  (void)wd_start(priv->txpoll, KINETIS_WDDELAY, kinetis_polltimer, 1,
-                 (uint32_t)priv);
+  (void)wd_start(priv->txpoll, KINETIS_WDDELAY, kinetis_polltimer_expiry, 1,
+                 (wdparm_t)priv);
 
   /* Clear all pending ENET interrupt */
 
@@ -1116,15 +1409,13 @@ static int kinetis_ifdown(struct net_driver_s *dev)
 }
 
 /****************************************************************************
- * Function: kinetis_txavail
+ * Function: kinetis_txavail_process
  *
  * Description:
- *   Driver callback invoked when new TX data is available.  This is a
- *   stimulus perform an out-of-cycle poll and, thereby, reduce the TX
- *   latency.
+ *   Perform an out-of-cycle poll.
  *
  * Parameters:
- *   dev  - Reference to the NuttX driver state structure
+ *   dev - Reference to the NuttX driver state structure
  *
  * Returned Value:
  *   None
@@ -1134,20 +1425,13 @@ static int kinetis_ifdown(struct net_driver_s *dev)
  *
  ****************************************************************************/
 
-static int kinetis_txavail(struct net_driver_s *dev)
+static inline void kinetis_txavail_process(FAR struct kinetis_driver_s *priv)
 {
-  FAR struct kinetis_driver_s *priv =
-    (FAR struct kinetis_driver_s *)dev->d_private;
-  irqstate_t flags;
-
-  /* Disable interrupts because this function may be called from interrupt
-   * level processing.
-   */
-
-  flags = enter_critical_section();
+  net_lock_t state;
 
   /* Ignore the notification if the interface is not yet up */
 
+  state = net_lock();
   if (priv->bifup)
     {
       /* Check if there is room in the hardware to hold another outgoing
@@ -1164,7 +1448,80 @@ static int kinetis_txavail(struct net_driver_s *dev)
         }
     }
 
-  leave_critical_section(flags);
+  net_unlock(state);
+}
+
+/****************************************************************************
+ * Function: kinetis_txavail_work
+ *
+ * Description:
+ *   Perform an out-of-cycle poll on the worker thread.
+ *
+ * Parameters:
+ *   arg - Reference to the NuttX driver state structure (cast to void*)
+ *
+ * Returned Value:
+ *   None
+ *
+ * Assumptions:
+ *   Called on the higher priority worker thread.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_NET_NOINTS
+static void kinetis_txavail_work(FAR void *arg)
+{
+  FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)arg;
+
+  /* Perform the poll */
+
+  kinetis_txavail_process(priv);
+}
+#endif
+
+/****************************************************************************
+ * Function: kinetis_txavail
+ *
+ * Description:
+ *   Driver callback invoked when new TX data is available.  This is a
+ *   stimulus perform an out-of-cycle poll and, thereby, reduce the TX
+ *   latency.
+ *
+ * Parameters:
+ *   dev  - Reference to the NuttX driver state structure
+ *
+ * Returned Value:
+ *   None
+ *
+ * Assumptions:
+ *   Called in normal user mode
+ *
+ ****************************************************************************/
+
+static int kinetis_txavail(struct net_driver_s *dev)
+{
+  FAR struct kinetis_driver_s *priv =
+    (FAR struct kinetis_driver_s *)dev->d_private;
+
+#ifdef CONFIG_NET_NOINTS
+  /* Is our single work structure available?  It may not be if there are
+   * pending interrupt actions and we will have to ignore the Tx
+   * availability action.
+   */
+
+  if (work_available(&priv->work))
+    {
+      /* Schedule to serialize the poll on the worker thread. */
+
+      work_queue(HPWORK, &priv->work, kinetis_txavail_work, priv, 0);
+    }
+
+#else
+  /* Perform the out-of-cycle poll now */
+
+  kinetis_txavail_process(priv);
+#endif
+
   return OK;
 }
 
diff --git a/configs/freedom-k64f/netnsh/defconfig b/configs/freedom-k64f/netnsh/defconfig
index 05a73a3220..a4a8968bdd 100644
--- a/configs/freedom-k64f/netnsh/defconfig
+++ b/configs/freedom-k64f/netnsh/defconfig
@@ -411,6 +411,7 @@ CONFIG_NAME_MAX=32
 # CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
+# CONFIG_SIG_EVTHREAD is not set
 
 #
 # Signal Numbers
@@ -419,6 +420,7 @@ CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
 CONFIG_SIG_SIGCONDTIMEDOUT=16
+CONFIG_SIG_SIGWORK=17
 
 #
 # POSIX Message Queue Options
@@ -430,8 +432,11 @@ CONFIG_MQ_MAXMSGSIZE=32
 #
 # Work queue support
 #
-# CONFIG_SCHED_WORKQUEUE is not set
-# CONFIG_SCHED_HPWORK is not set
+CONFIG_SCHED_WORKQUEUE=y
+CONFIG_SCHED_HPWORK=y
+CONFIG_SCHED_HPWORKPRIORITY=224
+CONFIG_SCHED_HPWORKPERIOD=50000
+CONFIG_SCHED_HPWORKSTACKSIZE=2048
 # CONFIG_SCHED_LPWORK is not set
 
 #
@@ -623,7 +628,7 @@ CONFIG_SYSLOG_CONSOLE=y
 CONFIG_ARCH_HAVE_NET=y
 CONFIG_ARCH_HAVE_PHY=y
 CONFIG_NET=y
-# CONFIG_NET_NOINTS is not set
+CONFIG_NET_NOINTS=y
 # CONFIG_NET_PROMISCUOUS is not set
 
 #
-- 
GitLab


From 9f72204bb6adb2d4d414185a4ea76e02ff29119d Mon Sep 17 00:00:00 2001
From: Gregory Nutt 
Date: Tue, 12 Jul 2016 16:50:27 -0600
Subject: [PATCH 227/229] Update README

---
 configs/freedom-k64f/README.txt | 258 +++++++++++++++++++++++++++++++-
 1 file changed, 255 insertions(+), 3 deletions(-)

diff --git a/configs/freedom-k64f/README.txt b/configs/freedom-k64f/README.txt
index 302b37638e..0aaeb99a9c 100644
--- a/configs/freedom-k64f/README.txt
+++ b/configs/freedom-k64f/README.txt
@@ -10,7 +10,7 @@ Contents
   o Freedom K64F Features
   o Serial Console
   o LEDs and Buttons
-  o Ethernet
+  o Networking Support
   o Development Environment
   o GNU Toolchain Options
   o Freedom K64F Configuration Options
@@ -129,9 +129,11 @@ LEDs and Buttons
   SW2       PTC6/SPI0_SOUT/PD0_EXTRG/I2S0_RX_BCLK/FB_AD9/I2S0_MCLK/LLWU_P10
   SW3       PTA4/FTM0_CH1/NMI_b/LLWU_P3
 
-Ethernet
-========
+Networking Support
+==================
 
+  Ethernet MAC/KSZ8081 PHY
+  ------------------------
   ------------ ----------------- --------------------------------------------
   KSZ8081      Board Signal(s)   K64F Pin
   Pin Signal                     Function                       pinmux Name
@@ -169,6 +171,244 @@ Ethernet
 
     CONFIG_KINETIS_ENET_MDIOPULLUP=y
 
+  Networking support via the can be added to NSH by selecting the following
+  configuration options.
+
+  Selecting the EMAC peripheral
+  -----------------------------
+
+  System Type -> Kinetis Peripheral Support
+    CONFIG_KINETIS_ENET=y               : Enable the EThernet MAC peripheral
+
+  System Type -> Ethernet Configuration
+    CONFIG_KINETIS_ENETNETHIFS=1
+    CONFIG_KINETIS_ENETNRXBUFFERS=6
+    CONFIG_KINETIS_ENETNTXBUFFERS=2
+    CONFIG_KINETIS_ENET_MDIOPULLUP=y
+
+  Networking Support
+    CONFIG_NET=y                        : Enable Neworking
+    CONFIG_NET_ETHERNET=y               : Support Ethernet data link
+    CONFIG_NET_NOINTS=y                 : Should operative at non-interrupt level
+    CONFIG_NET_SOCKOPTS=y               : Enable socket operations
+    CONFIG_NET_MULTIBUFFER=y            : Multi-packet buffer option required
+    CONFIG_NET_ETH_MTU=590              : Maximum packet size (MTU) 1518 is more standard
+    CONFIG_NET_ETH_TCP_RECVWNDO=536     : Should be the same as CONFIG_NET_ETH_MTU
+    CONFIG_NET_ARP=y                    : Enable ARP
+    CONFIG_NET_ARPTAB_SIZE=16           : ARP table size
+    CONFIG_NET_ARP_IPIN=y               : Enable ARP address harvesting
+    CONFIG_NET_ARP_SEND=y               : Send ARP request before sending data
+    CONFIG_NET_TCP=y                    : Enable TCP/IP networking
+    CONFIG_NET_TCP_READAHEAD=y          : Support TCP read-ahead
+    CONFIG_NET_TCP_WRITE_BUFFERS=y      : Support TCP write-buffering
+    CONFIG_NET_TCPBACKLOG=y             : Support TCP/IP backlog
+    CONFIG_NET_MAX_LISTENPORTS=20       :
+    CONFIG_NET_TCP_READAHEAD_BUFSIZE=536  Read-ahead buffer size
+    CONFIG_NET_UDP=y                    : Enable UDP networking
+    CONFIG_NET_BROADCAST=y              : Needed for DNS name resolution
+    CONFIG_NET_ICMP=y                   : Enable ICMP networking
+    CONFIG_NET_ICMP_PING=y              : Needed for NSH ping command
+                                        : Defaults should be okay for other options
+f Application Configuration -> Network Utilities
+    CONFIG_NETDB_DNSCLIENT=y               : Enable host address resolution
+    CONFIG_NETUTILS_TELNETD=y           : Enable the Telnet daemon
+    CONFIG_NETUTILS_TFTPC=y             : Enable TFTP data file transfers for get and put commands
+    CONFIG_NETUTILS_NETLIB=y            : Network library support is needed
+    CONFIG_NETUTILS_WEBCLIENT=y         : Needed for wget support
+                                        : Defaults should be okay for other options
+  Application Configuration -> NSH Library
+    CONFIG_NSH_TELNET=y                 : Enable NSH session via Telnet
+    CONFIG_NSH_IPADDR=0x0a000002        : Select a fixed IP address
+    CONFIG_NSH_DRIPADDR=0x0a000001      : IP address of gateway/host PC
+    CONFIG_NSH_NETMASK=0xffffff00       : Netmask
+    CONFIG_NSH_NOMAC=y                  : Need to make up a bogus MAC address
+                                        : Defaults should be okay for other options
+
+  You can also enable enable the DHCPC client for networks that use
+  dynamically assigned address:
+
+  Application Configuration -> Network Utilities
+    CONFIG_NETUTILS_DHCPC=y             : Enables the DHCP client
+
+  Networking Support
+    CONFIG_NET_UDP=y                    : Depends on broadcast UDP
+
+  Application Configuration -> NSH Library
+    CONFIG_NET_BROADCAST=y
+    CONFIG_NSH_DHCPC=y                  : Tells NSH to use DHCPC, not
+                                        : the fixed addresses
+
+  Using the network with NSH
+  --------------------------
+
+  So what can you do with this networking support?  First you see that
+  NSH has several new network related commands:
+
+    ifconfig, ifdown, ifup:  Commands to help manage your network
+    get and put:             TFTP file transfers
+    wget:                    HTML file transfers
+    ping:                    Check for access to peers on the network
+    Telnet console:          You can access the NSH remotely via telnet.
+
+  You can also enable other add on features like full FTP or a Web
+  Server or XML RPC and others.  There are also other features that
+  you can enable like DHCP client (or server) or network name
+  resolution.
+
+  By default, the IP address of the DK-TM4C129X will be 10.0.0.2 and
+  it will assume that your host is the gateway and has the IP address
+  10.0.0.1.
+
+    nsh> ifconfig
+    eth0    HWaddr 00:e0:de:ad:be:ef at UP
+            IPaddr:10.0.0.2 DRaddr:10.0.0.1 Mask:255.255.255.0
+
+  You can use ping to test for connectivity to the host (Careful,
+  Window firewalls usually block ping-related ICMP traffic).  On the
+  target side, you can:
+
+    nsh> ping 10.0.0.1
+    PING 10.0.0.1 56 bytes of data
+    56 bytes from 10.0.0.1: icmp_seq=1 time=0 ms
+    56 bytes from 10.0.0.1: icmp_seq=2 time=0 ms
+    56 bytes from 10.0.0.1: icmp_seq=3 time=0 ms
+    56 bytes from 10.0.0.1: icmp_seq=4 time=0 ms
+    56 bytes from 10.0.0.1: icmp_seq=5 time=0 ms
+    56 bytes from 10.0.0.1: icmp_seq=6 time=0 ms
+    56 bytes from 10.0.0.1: icmp_seq=7 time=0 ms
+    56 bytes from 10.0.0.1: icmp_seq=8 time=0 ms
+    56 bytes from 10.0.0.1: icmp_seq=9 time=0 ms
+    56 bytes from 10.0.0.1: icmp_seq=10 time=0 ms
+    10 packets transmitted, 10 received, 0% packet loss, time 10100 ms
+
+  NOTE: In this configuration is is normal to have packet loss > 0%
+  the first time you ping due to the default handling of the ARP
+  table.
+
+  On the host side, you should also be able to ping the DK-TM4C129X:
+
+    $ ping 10.0.0.2
+
+  You can also log into the NSH from the host PC like this:
+
+    $ telnet 10.0.0.2
+    Trying 10.0.0.2...
+    Connected to 10.0.0.2.
+    Escape character is '^]'.
+    sh_telnetmain: Session [3] Started
+
+    NuttShell (NSH) NuttX-6.31
+    nsh> help
+    help usage:  help [-v] []
+
+      [           echo        ifconfig    mkdir       mw          sleep
+      ?           exec        ifdown      mkfatfs     ping        test
+      cat         exit        ifup        mkfifo      ps          umount
+      cp          free        kill        mkrd        put         usleep
+      cmp         get         losetup     mh          rm          wget
+      dd          help        ls          mount       rmdir       xd
+      df          hexdump     mb          mv          sh
+
+    Builtin Apps:
+    nsh>
+
+  NOTE:  If you enable this networking as described above, you will
+  experience a delay on booting NSH.  That is because the start-up logic
+  waits for the network connection to be established before starting
+  NuttX.  In a real application, you would probably want to do the
+  network bringup on a separate thread so that access to the NSH prompt
+  is not delayed.
+
+  This delay will be especially long if the board is not connected to
+  a network.  On the order of minutes!  You will probably think that
+  NuttX has crashed!  And then, when it finally does come up after
+  numerous timeouts and retries, the network will not be available --
+  even if the network cable is plugged in later.
+
+  The long delays can be eliminated by using a separate the network
+  initialization thread discussed below.  Recovering after the network
+  becomes available requires the network monitor feature, also discussed
+  below.
+
+  Network Initialization Thread
+  -----------------------------
+  There is a configuration option enabled by CONFIG_NSH_NETINIT_THREAD
+  that will do the NSH network bring-up asynchronously in parallel on
+  a separate thread.  This eliminates the (visible) networking delay
+  altogether.  This current implementation, however, has some limitations:
+
+    - If no network is connected, the network bring-up will fail and
+      the network initialization thread will simply exit.  There are no
+      retries and no mechanism to know if the network initialization was
+      successful (it could perform a network Ioctl to see if the link is
+      up and it now, keep trying, but it does not do that now).
+
+    - Furthermore, there is currently no support for detecting loss of
+      network connection and recovery of the connection (similarly, this
+      thread could poll periodically for network status, but does not).
+
+  Both of these shortcomings could be eliminated by enabling the network
+  monitor:
+
+  Network Monitor
+  ---------------
+  By default the network initialization thread will bring-up the network
+  then exit, freeing all of the resources that it required.  This is a
+  good behavior for systems with limited memory.
+
+  If the CONFIG_NSH_NETINIT_MONITOR option is selected, however, then the
+  network initialization thread will persist forever; it will monitor the
+  network status.  In the event that the network goes down (for example, if
+  a cable is removed), then the thread will monitor the link status and
+  attempt to bring the network back up.  In this case the resources
+  required for network initialization are never released.
+
+  Pre-requisites:
+
+    - CONFIG_NSH_NETINIT_THREAD as described above.
+
+    - The K64F EMAC block does not support PHY interrupts.  The KSZ8081
+      PHY interrupt line is brought to a jumper block and it should be
+      possible to connect that some some interrupt port pin.  You would
+      need to provide some custom logic in the Freedcom K64F
+      configuration to set up that PHY interrupt.
+
+    - In addtion to the PHY interrupt, the Network Monitor also requires the
+      following setting:
+
+        CONFIG_NETDEV_PHY_IOCTL. Enable PHY IOCTL commands in the Ethernet
+        device driver. Special IOCTL commands must be provided by the Ethernet
+        driver to support certain PHY operations that will be needed for link
+        management. There operations are not complex and are implemented for
+        the Atmel SAMA5 family.
+
+        CONFIG_ARCH_PHY_INTERRUPT. This is not a user selectable option.
+        Rather, it is set when you select a board that supports PHY
+        interrupts.  For the K64F, like most other architectures, the PHY
+        interrupt must be provided via some board-specific GPIO.  In any
+        event, the board-specific logic must provide support for the PHY
+        interrupt. To do this, the board logic must do two things: (1) It
+        must provide the function arch_phy_irq() as described and prototyped
+        in the nuttx/include/nuttx/arch.h, and (2) it must select
+        CONFIG_ARCH_PHY_INTERRUPT in the board configuration file to
+        advertise that it supports arch_phy_irq().
+
+        And a few other things: UDP support is required (CONFIG_NET_UDP) and
+        signals must not be disabled (CONFIG_DISABLE_SIGNALS).
+
+  Given those prerequisites, the network monitor can be selected with these
+  additional settings.
+
+    System Type -> Kinetis Ethernet Configuration
+      CONFIG_ARCH_PHY_INTERRUPT=y           : (auto-selected)
+      CONFIG_NETDEV_PHY_IOCTL=y             : (auto-selected)
+
+    Application Configuration -> NSH Library -> Networking Configuration
+      CONFIG_NSH_NETINIT_THREAD             : Enable the network initialization thread
+      CONFIG_NSH_NETINIT_MONITOR=y          : Enable the network monitor
+      CONFIG_NSH_NETINIT_RETRYMSEC=2000     : Configure the network monitor as you like
+      CONFIG_NSH_NETINIT_SIGNO=18
+
 Development Environment
 =======================
 
@@ -412,6 +652,18 @@ Where  is one of the following:
 
        CONFIG_KINETIS_ENET_MDIOPULLUP=y
 
+    4. Configured to use a fixed IPv4 address:
+
+       CONFIG_NSH_IPADDR=0x0a000002
+       CONFIG_NSH_DRIPADDR=0x0a000001
+       CONFIG_NSH_NETMASK=0xffffff00
+
+       And a bogus MAC address:
+
+       CONFIG_NSH_NOMAC=y
+       CONFIG_NSH_SWMAC=y
+       CONFIG_NSH_MACADDR=0x00e0deadbeef
+
   nsh:
   ---
     Configures the NuttShell (nsh) located at apps/examples/nsh using a
-- 
GitLab


From 6be72272eb757383c17f19456bb6fe2d20df327d Mon Sep 17 00:00:00 2001
From: Sebastien Lorquet 
Date: Tue, 12 Jul 2016 17:18:46 -0600
Subject: [PATCH 228/229] STM32L4: Apply the stm32l4 namespace and FAR
 qualifiers to the serial driver, also, indentation.

---
 arch/arm/src/stm32l4/stm32l4_serial.c | 494 +++++++++++++-------------
 1 file changed, 256 insertions(+), 238 deletions(-)

diff --git a/arch/arm/src/stm32l4/stm32l4_serial.c b/arch/arm/src/stm32l4/stm32l4_serial.c
index aa21ada61d..548d1e1957 100644
--- a/arch/arm/src/stm32l4/stm32l4_serial.c
+++ b/arch/arm/src/stm32l4/stm32l4_serial.c
@@ -90,13 +90,13 @@
 
 #  if defined(CONFIG_USART2_RXDMA) || defined(CONFIG_USART3_RXDMA)
 #    ifndef CONFIG_STM32L4_DMA1
-#      error STM32 USART2/3 receive DMA requires CONFIG_STM32L4_DMA1
+#      error STM32L4 USART2/3 receive DMA requires CONFIG_STM32L4_DMA1
 #    endif
 #  endif
 
 #  if defined(CONFIG_UART4_RXDMA) || defined(CONFIG_UART5_RXDMA)
 #    ifndef CONFIG_STM32L4_DMA2
-#      error STM32 USART4/5 receive DMA requires CONFIG_STM32L4_DMA2
+#      error STM32L4 USART4/5 receive DMA requires CONFIG_STM32L4_DMA2
 #    endif
 #  endif
 
@@ -216,7 +216,7 @@
  *    register. It must not collide with USART_CR1_USED_INTS or USART_CR3_EIE
  * 2) USART_CR3_EIE is also carried in the up_dev_s ie member.
  *
- * See up_restoreusartint where the masking is done.
+ * See stm32l4serial_restoreusartint where the masking is done.
  */
 
 #ifdef CONFIG_STM32L4_SERIALBRK_BSDCOMPAT
@@ -231,7 +231,7 @@
  * Private Types
  ****************************************************************************/
 
-struct up_dev_s
+struct stm32l4_serial_s
 {
   struct uart_dev_s dev;       /* Generic UART device */
   uint16_t          ie;        /* Saved interrupt mask bits value */
@@ -302,57 +302,63 @@ struct up_dev_s
  * Private Function Prototypes
  ****************************************************************************/
 
-static void up_set_format(struct uart_dev_s *dev);
-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);
-static int  up_interrupt_common(struct up_dev_s *dev);
-static int  up_ioctl(struct file *filep, int cmd, unsigned long arg);
+#ifndef CONFIG_SUPPRESS_UART_CONFIG
+static void stm32l4serial_setformat(FAR struct uart_dev_s *dev);
+#endif
+static int  stm32l4serial_setup(FAR struct uart_dev_s *dev);
+static void stm32l4serial_shutdown(FAR struct uart_dev_s *dev);
+static int  stm32l4serial_attach(FAR struct uart_dev_s *dev);
+static void stm32l4serial_detach(FAR struct uart_dev_s *dev);
+static int  up_interrupt_common(FAR struct stm32l4_serial_s *dev);
+static int  stm32l4serial_ioctl(FAR struct file *filep, int cmd,
+                                unsigned long arg);
 #ifndef SERIAL_HAVE_ONLY_DMA
-static int  up_receive(struct uart_dev_s *dev, unsigned int *status);
-static void up_rxint(struct uart_dev_s *dev, bool enable);
-static bool up_rxavailable(struct uart_dev_s *dev);
+static int  stm32l4serial_receive(FAR struct uart_dev_s *dev,
+                                  FAR unsigned int *status);
+static void stm32l4serial_rxint(FAR struct uart_dev_s *dev, bool enable);
+static bool stm32l4serial_rxavailable(FAR struct uart_dev_s *dev);
 #endif
 #ifdef CONFIG_SERIAL_IFLOWCONTROL
-static bool up_rxflowcontrol(struct uart_dev_s *dev, unsigned int nbuffered,
-                             bool upper);
+static bool stm32l4serial_rxflowcontrol(FAR struct uart_dev_s *dev,
+                                        unsigned int nbuffered, bool upper);
 #endif
-static void up_send(struct uart_dev_s *dev, int ch);
-static void up_txint(struct uart_dev_s *dev, bool enable);
-static bool up_txready(struct uart_dev_s *dev);
+static void stm32l4serial_send(FAR struct uart_dev_s *dev, int ch);
+static void stm32l4serial_txint(FAR struct uart_dev_s *dev, bool enable);
+static bool stm32l4serial_txready(FAR struct uart_dev_s *dev);
 
 #ifdef SERIAL_HAVE_DMA
-static int  up_dma_setup(struct uart_dev_s *dev);
-static void up_dma_shutdown(struct uart_dev_s *dev);
-static int  up_dma_receive(struct uart_dev_s *dev, unsigned int *status);
-static void up_dma_rxint(struct uart_dev_s *dev, bool enable);
-static bool up_dma_rxavailable(struct uart_dev_s *dev);
+static int  stm32l4serial_dmasetup(FAR struct uart_dev_s *dev);
+static void stm32l4serial_dmashutdown(FAR struct uart_dev_s *dev);
+static int  stm32l4serial_dmareceive(FAR struct uart_dev_s *dev,
+                                     FAR unsigned int *status);
+static void stm32l4serial_dmarxint(FAR struct uart_dev_s *dev, bool enable);
+static bool stm32l4serial_dmarxavailable(struct uart_dev_s *dev);
 
-static void up_dma_rxcallback(DMA_HANDLE handle, uint8_t status, void *arg);
+static void stm32l4serial_dmarxcallback(DMA_HANDLE handle, uint8_t status,
+                                        FAR void *arg);
 #endif
 
 #ifdef CONFIG_PM
-static void up_pm_notify(struct pm_callback_s *cb, int domain,
-                         enum pm_state_e pmstate);
-static int  up_pm_prepare(struct pm_callback_s *cb, int domain,
-                          enum pm_state_e pmstate);
+static void stm32l4serial_pmnotify(FAR struct pm_callback_s *cb, int domain,
+                                   enum pm_state_e pmstate);
+static int  stm32l4serial_pmprepare(FAR struct pm_callback_s *cb, int domain,
+                                    enum pm_state_e pmstate);
 #endif
 
 #ifdef CONFIG_STM32L4_USART1
-static int up_interrupt_usart1(int irq, void *context);
+static int up_interrupt_usart1(int irq, FAR void *context);
 #endif
 #ifdef CONFIG_STM32L4_USART2
-static int up_interrupt_usart2(int irq, void *context);
+static int up_interrupt_usart2(int irq, FAR void *context);
 #endif
 #ifdef CONFIG_STM32L4_USART3
-static int up_interrupt_usart3(int irq, void *context);
+static int up_interrupt_usart3(int irq, FAR void *context);
 #endif
 #ifdef CONFIG_STM32L4_UART4
-static int up_interrupt_uart4(int irq, void *context);
+static int up_interrupt_uart4(int irq, FAR void *context);
 #endif
 #ifdef CONFIG_STM32L4_UART5
-static int up_interrupt_uart5(int irq, void *context);
+static int up_interrupt_uart5(int irq, FAR void *context);
 #endif
 
 /****************************************************************************
@@ -362,42 +368,42 @@ static int up_interrupt_uart5(int irq, void *context);
 #ifndef SERIAL_HAVE_ONLY_DMA
 static const struct uart_ops_s g_uart_ops =
 {
-  .setup          = up_setup,
-  .shutdown       = up_shutdown,
-  .attach         = up_attach,
-  .detach         = up_detach,
-  .ioctl          = up_ioctl,
-  .receive        = up_receive,
-  .rxint          = up_rxint,
-  .rxavailable    = up_rxavailable,
+  .setup          = stm32l4serial_setup,
+  .shutdown       = stm32l4serial_shutdown,
+  .attach         = stm32l4serial_attach,
+  .detach         = stm32l4serial_detach,
+  .ioctl          = stm32l4serial_ioctl,
+  .receive        = stm32l4serial_receive,
+  .rxint          = stm32l4serial_rxint,
+  .rxavailable    = stm32l4serial_rxavailable,
 #ifdef CONFIG_SERIAL_IFLOWCONTROL
-  .rxflowcontrol  = up_rxflowcontrol,
+  .rxflowcontrol  = stm32l4serial_rxflowcontrol,
 #endif
-  .send           = up_send,
-  .txint          = up_txint,
-  .txready        = up_txready,
-  .txempty        = up_txready,
+  .send           = stm32l4serial_send,
+  .txint          = stm32l4serial_txint,
+  .txready        = stm32l4serial_txready,
+  .txempty        = stm32l4serial_txready,
 };
 #endif
 
 #ifdef SERIAL_HAVE_DMA
 static const struct uart_ops_s g_uart_dma_ops =
 {
-  .setup          = up_dma_setup,
-  .shutdown       = up_dma_shutdown,
-  .attach         = up_attach,
-  .detach         = up_detach,
-  .ioctl          = up_ioctl,
-  .receive        = up_dma_receive,
-  .rxint          = up_dma_rxint,
-  .rxavailable    = up_dma_rxavailable,
+  .setup          = stm32l4serial_dmasetup,
+  .shutdown       = stm32l4serial_dmashutdown,
+  .attach         = stm32l4serial_attach,
+  .detach         = stm32l4serial_detach,
+  .ioctl          = stm32l4serial_ioctl,
+  .receive        = stm32l4serial_dmareceive,
+  .rxint          = stm32l4serial_dmarxint,
+  .rxavailable    = stm32l4serial_dmarxavailable,
 #ifdef CONFIG_SERIAL_IFLOWCONTROL
-  .rxflowcontrol  = up_rxflowcontrol,
+  .rxflowcontrol  = stm32l4serial_rxflowcontrol,
 #endif
-  .send           = up_send,
-  .txint          = up_txint,
-  .txready        = up_txready,
-  .txempty        = up_txready,
+  .send           = stm32l4serial_send,
+  .txint          = stm32l4serial_txint,
+  .txready        = stm32l4serial_txready,
+  .txempty        = stm32l4serial_txready,
 };
 #endif
 
@@ -446,7 +452,7 @@ static char g_uart5rxfifo[RXDMA_BUFFER_SIZE];
 /* This describes the state of the STM32 USART1 ports. */
 
 #ifdef CONFIG_STM32L4_USART1
-static struct up_dev_s g_usart1priv =
+static struct stm32l4_serial_s g_usart1priv =
 {
   .dev =
     {
@@ -508,7 +514,7 @@ static struct up_dev_s g_usart1priv =
 /* This describes the state of the STM32 USART2 port. */
 
 #ifdef CONFIG_STM32L4_USART2
-static struct up_dev_s g_usart2priv =
+static struct stm32l4_serial_s g_usart2priv =
 {
   .dev =
     {
@@ -570,7 +576,7 @@ static struct up_dev_s g_usart2priv =
 /* This describes the state of the STM32 USART3 port. */
 
 #ifdef CONFIG_STM32L4_USART3
-static struct up_dev_s g_usart3priv =
+static struct stm32l4_serial_s g_usart3priv =
 {
   .dev =
     {
@@ -632,7 +638,7 @@ static struct up_dev_s g_usart3priv =
 /* This describes the state of the STM32 UART4 port. */
 
 #ifdef CONFIG_STM32L4_UART4
-static struct up_dev_s g_uart4priv =
+static struct stm32l4_serial_s g_uart4priv =
 {
   .dev =
     {
@@ -698,7 +704,7 @@ static struct up_dev_s g_uart4priv =
 /* This describes the state of the STM32 UART5 port. */
 
 #ifdef CONFIG_STM32L4_UART5
-static struct up_dev_s g_uart5priv =
+static struct stm32l4_serial_s g_uart5priv =
 {
   .dev =
     {
@@ -763,7 +769,7 @@ static struct up_dev_s g_uart5priv =
 
 /* This table lets us iterate over the configured USARTs */
 
-static struct up_dev_s * const uart_devs[STM32L4_NUSART] =
+FAR static struct stm32l4_serial_s * const uart_devs[STM32L4_NUSART] =
 {
 #ifdef CONFIG_STM32L4_USART1
   [0] = &g_usart1priv,
@@ -785,8 +791,8 @@ static struct up_dev_s * const uart_devs[STM32L4_NUSART] =
 #ifdef CONFIG_PM
 static  struct pm_callback_s g_serialcb =
 {
-  .notify  = up_pm_notify,
-  .prepare = up_pm_prepare,
+  .notify  = stm32l4serial_pmnotify,
+  .prepare = stm32l4serial_pmprepare,
 };
 #endif
 
@@ -795,28 +801,31 @@ static  struct pm_callback_s g_serialcb =
  ****************************************************************************/
 
 /****************************************************************************
- * Name: up_serialin
+ * Name: stm32l4serial_getreg
  ****************************************************************************/
 
-static inline uint32_t up_serialin(struct up_dev_s *priv, int offset)
+static inline uint32_t stm32l4serial_getreg(FAR struct stm32l4_serial_s *priv,
+                                            int offset)
 {
   return getreg32(priv->usartbase + offset);
 }
 
 /****************************************************************************
- * Name: up_serialout
+ * Name: stm32l4serial_putreg
  ****************************************************************************/
 
-static inline void up_serialout(struct up_dev_s *priv, int offset, uint32_t value)
+static inline void stm32l4serial_putreg(FAR struct stm32l4_serial_s *priv,
+                                        int offset, uint32_t value)
 {
   putreg32(value, priv->usartbase + offset);
 }
 
 /****************************************************************************
- * Name: up_restoreusartint
+ * Name: stm32l4serial_restoreusartint
  ****************************************************************************/
 
-static void up_restoreusartint(struct up_dev_s *priv, uint16_t ie)
+static void stm32l4serial_restoreusartint(FAR struct stm32l4_serial_s *priv,
+                                          uint16_t ie)
 {
   uint32_t cr;
 
@@ -826,22 +835,23 @@ static void up_restoreusartint(struct up_dev_s *priv, uint16_t ie)
 
   /* And restore the interrupt state (see the interrupt enable/usage table above) */
 
-  cr = up_serialin(priv, STM32L4_USART_CR1_OFFSET);
+  cr = stm32l4serial_getreg(priv, STM32L4_USART_CR1_OFFSET);
   cr &= ~(USART_CR1_USED_INTS);
   cr |= (ie & (USART_CR1_USED_INTS));
-  up_serialout(priv, STM32L4_USART_CR1_OFFSET, cr);
+  stm32l4serial_putreg(priv, STM32L4_USART_CR1_OFFSET, cr);
 
-  cr = up_serialin(priv, STM32L4_USART_CR3_OFFSET);
+  cr = stm32l4serial_getreg(priv, STM32L4_USART_CR3_OFFSET);
   cr &= ~USART_CR3_EIE;
   cr |= (ie & USART_CR3_EIE);
-  up_serialout(priv, STM32L4_USART_CR3_OFFSET, cr);
+  stm32l4serial_putreg(priv, STM32L4_USART_CR3_OFFSET, cr);
 }
 
 /****************************************************************************
- * Name: up_disableusartint
+ * Name: stm32l4serial_disableusartint
  ****************************************************************************/
 
-static inline void up_disableusartint(struct up_dev_s *priv, uint16_t *ie)
+static inline void stm32l4serial_disableusartint(FAR struct stm32l4_serial_s *priv,
+                                                 FAR uint16_t *ie)
 {
   if (ie)
     {
@@ -866,8 +876,8 @@ static inline void up_disableusartint(struct up_dev_s *priv, uint16_t *ie)
        * USART_CR3_CTSIE    USART_ISR_CTS    CTS flag                       (not used)
        */
 
-      cr1 = up_serialin(priv, STM32L4_USART_CR1_OFFSET);
-      cr3 = up_serialin(priv, STM32L4_USART_CR3_OFFSET);
+      cr1 = stm32l4serial_getreg(priv, STM32L4_USART_CR1_OFFSET);
+      cr3 = stm32l4serial_getreg(priv, STM32L4_USART_CR3_OFFSET);
 
       /* Return the current interrupt mask value for the used interrupts.  Notice
        * that this depends on the fact that none of the used interrupt enable bits
@@ -879,11 +889,11 @@ static inline void up_disableusartint(struct up_dev_s *priv, uint16_t *ie)
 
   /* Disable all interrupts */
 
-  up_restoreusartint(priv, 0);
+  stm32l4serial_restoreusartint(priv, 0);
 }
 
 /****************************************************************************
- * Name: up_dma_nextrx
+ * Name: stm32l4serial_dmanextrx
  *
  * Description:
  *   Returns the index into the RX FIFO where the DMA will place the next
@@ -892,7 +902,7 @@ static inline void up_disableusartint(struct up_dev_s *priv, uint16_t *ie)
  ****************************************************************************/
 
 #ifdef SERIAL_HAVE_DMA
-static int up_dma_nextrx(struct up_dev_s *priv)
+static int stm32l4serial_dmanextrx(FAR struct stm32l4_serial_s *priv)
 {
   size_t dmaresidual;
 
@@ -903,7 +913,7 @@ static int up_dma_nextrx(struct up_dev_s *priv)
 #endif
 
 /****************************************************************************
- * Name: up_set_format
+ * Name: stm32l4serial_setformat
  *
  * Description:
  *   Set the serial line format and speed.
@@ -911,9 +921,9 @@ static int up_dma_nextrx(struct up_dev_s *priv)
  ****************************************************************************/
 
 #ifndef CONFIG_SUPPRESS_UART_CONFIG
-static void up_set_format(struct uart_dev_s *dev)
+static void stm32l4serial_setformat(FAR struct uart_dev_s *dev)
 {
-  struct up_dev_s *priv = (struct up_dev_s *)dev->priv;
+  FAR struct stm32l4_serial_s *priv = (FAR struct stm32l4_serial_s *)dev->priv;
   uint32_t regval;
 
   /* This first implementation is for U[S]ARTs that support oversampling
@@ -942,7 +952,7 @@ static void up_set_format(struct uart_dev_s *dev)
 
   /* Use oversamply by 8 only if the divisor is small.  But what is small? */
 
-  cr1 = up_serialin(priv, STM32L4_USART_CR1_OFFSET);
+  cr1 = stm32l4serial_getreg(priv, STM32L4_USART_CR1_OFFSET);
   if (usartdiv8 > 100)
     {
       /* Use usartdiv16 */
@@ -966,12 +976,12 @@ static void up_set_format(struct uart_dev_s *dev)
       cr1 |= USART_CR1_OVER8;
     }
 
-   up_serialout(priv, STM32L4_USART_CR1_OFFSET, cr1);
-   up_serialout(priv, STM32L4_USART_BRR_OFFSET, brr);
+   stm32l4serial_putreg(priv, STM32L4_USART_CR1_OFFSET, cr1);
+   stm32l4serial_putreg(priv, STM32L4_USART_BRR_OFFSET, brr);
 
   /* Configure parity mode */
 
-  regval  = up_serialin(priv, STM32L4_USART_CR1_OFFSET);
+  regval  = stm32l4serial_getreg(priv, STM32L4_USART_CR1_OFFSET);
   regval &= ~(USART_CR1_PCE | USART_CR1_PS | USART_CR1_M0 | USART_CR1_M1);
 
   if (priv->parity == 1)       /* Odd parity */
@@ -1008,11 +1018,11 @@ static void up_set_format(struct uart_dev_s *dev)
    *              1 start, 8 data (no parity), n stop.
    */
 
-  up_serialout(priv, STM32L4_USART_CR1_OFFSET, regval);
+  stm32l4serial_putreg(priv, STM32L4_USART_CR1_OFFSET, regval);
 
   /* Configure STOP bits */
 
-  regval = up_serialin(priv, STM32L4_USART_CR2_OFFSET);
+  regval = stm32l4serial_getreg(priv, STM32L4_USART_CR2_OFFSET);
   regval &= ~(USART_CR2_STOP_MASK);
 
   if (priv->stopbits2)
@@ -1020,11 +1030,11 @@ static void up_set_format(struct uart_dev_s *dev)
       regval |= USART_CR2_STOP2;
     }
 
-  up_serialout(priv, STM32L4_USART_CR2_OFFSET, regval);
+  stm32l4serial_putreg(priv, STM32L4_USART_CR2_OFFSET, regval);
 
   /* Configure hardware flow control */
 
-  regval  = up_serialin(priv, STM32L4_USART_CR3_OFFSET);
+  regval  = stm32l4serial_getreg(priv, STM32L4_USART_CR3_OFFSET);
   regval &= ~(USART_CR3_CTSE | USART_CR3_RTSE);
 
 #if defined(CONFIG_SERIAL_IFLOWCONTROL) && !defined(CONFIG_STM32L4_FLOWCONTROL_BROKEN)
@@ -1041,12 +1051,12 @@ static void up_set_format(struct uart_dev_s *dev)
     }
 #endif
 
-  up_serialout(priv, STM32L4_USART_CR3_OFFSET, regval);
+  stm32l4serial_putreg(priv, STM32L4_USART_CR3_OFFSET, regval);
 }
 #endif /* CONFIG_SUPPRESS_UART_CONFIG */
 
 /****************************************************************************
- * Name: up_set_apb_clock
+ * Name: stm32l4serial_setapbclock
  *
  * Description:
  *   Enable or disable APB clock for the USART peripheral
@@ -1057,9 +1067,9 @@ static void up_set_format(struct uart_dev_s *dev)
  *
  ****************************************************************************/
 
-static void up_set_apb_clock(struct uart_dev_s *dev, bool on)
+static void stm32l4serial_setapbclock(FAR struct uart_dev_s *dev, bool on)
 {
-  struct up_dev_s *priv = (struct up_dev_s *)dev->priv;
+  FAR struct stm32l4_serial_s *priv = (FAR struct stm32l4_serial_s *)dev->priv;
   uint32_t rcc_en;
   uint32_t regaddr;
 
@@ -1114,7 +1124,7 @@ static void up_set_apb_clock(struct uart_dev_s *dev, bool on)
 }
 
 /****************************************************************************
- * Name: up_setup
+ * Name: stm32l4serial_setup
  *
  * Description:
  *   Configure the USART baud, bits, parity, etc. This method is called the
@@ -1122,9 +1132,9 @@ static void up_set_apb_clock(struct uart_dev_s *dev, bool on)
  *
  ****************************************************************************/
 
-static int up_setup(struct uart_dev_s *dev)
+static int stm32l4serial_setup(FAR struct uart_dev_s *dev)
 {
-  struct up_dev_s *priv = (struct up_dev_s *)dev->priv;
+  FAR struct stm32l4_serial_s *priv = (FAR struct stm32l4_serial_s *)dev->priv;
 
 #ifndef CONFIG_SUPPRESS_UART_CONFIG
   uint32_t regval;
@@ -1135,7 +1145,7 @@ static int up_setup(struct uart_dev_s *dev)
 
   /* Enable USART APB1/2 clock */
 
-  up_set_apb_clock(dev, true);
+  stm32l4serial_setapbclock(dev, true);
 
   /* Configure pins for USART use */
 
@@ -1174,7 +1184,7 @@ static int up_setup(struct uart_dev_s *dev)
   /* Configure CR2 */
   /* Clear STOP, CLKEN, CPOL, CPHA, LBCL, and interrupt enable bits */
 
-  regval  = up_serialin(priv, STM32L4_USART_CR2_OFFSET);
+  regval  = stm32l4serial_getreg(priv, STM32L4_USART_CR2_OFFSET);
   regval &= ~(USART_CR2_STOP_MASK | USART_CR2_CLKEN | USART_CR2_CPOL |
               USART_CR2_CPHA | USART_CR2_LBCL | USART_CR2_LBDIE);
 
@@ -1185,33 +1195,34 @@ static int up_setup(struct uart_dev_s *dev)
       regval |= USART_CR2_STOP2;
     }
 
-  up_serialout(priv, STM32L4_USART_CR2_OFFSET, regval);
+  stm32l4serial_putreg(priv, STM32L4_USART_CR2_OFFSET, regval);
 
   /* Configure CR1 */
   /* Clear TE, REm and all interrupt enable bits */
 
-  regval  = up_serialin(priv, STM32L4_USART_CR1_OFFSET);
+  regval  = stm32l4serial_getreg(priv, STM32L4_USART_CR1_OFFSET);
   regval &= ~(USART_CR1_TE | USART_CR1_RE | USART_CR1_ALLINTS);
 
-  up_serialout(priv, STM32L4_USART_CR1_OFFSET, regval);
+  stm32l4serial_putreg(priv, STM32L4_USART_CR1_OFFSET, regval);
 
   /* Configure CR3 */
   /* Clear CTSE, RTSE, and all interrupt enable bits */
 
-  regval  = up_serialin(priv, STM32L4_USART_CR3_OFFSET);
-  regval &= ~(USART_CR3_CTSIE | USART_CR3_CTSE | USART_CR3_RTSE | USART_CR3_EIE);
+  regval  = stm32l4serial_getreg(priv, STM32L4_USART_CR3_OFFSET);
+  regval &= ~(USART_CR3_CTSIE | USART_CR3_CTSE | USART_CR3_RTSE |
+              USART_CR3_EIE);
 
-  up_serialout(priv, STM32L4_USART_CR3_OFFSET, regval);
+  stm32l4serial_putreg(priv, STM32L4_USART_CR3_OFFSET, regval);
 
   /* Configure the USART line format and speed. */
 
-  up_set_format(dev);
+  stm32l4serial_setformat(dev);
 
   /* Enable Rx, Tx, and the USART */
 
-  regval      = up_serialin(priv, STM32L4_USART_CR1_OFFSET);
+  regval      = stm32l4serial_getreg(priv, STM32L4_USART_CR1_OFFSET);
   regval     |= (USART_CR1_UE | USART_CR1_TE | USART_CR1_RE);
-  up_serialout(priv, STM32L4_USART_CR1_OFFSET, regval);
+  stm32l4serial_putreg(priv, STM32L4_USART_CR1_OFFSET, regval);
 
 #endif /* CONFIG_SUPPRESS_UART_CONFIG */
 
@@ -1222,7 +1233,7 @@ static int up_setup(struct uart_dev_s *dev)
 }
 
 /****************************************************************************
- * Name: up_dma_setup
+ * Name: stm32l4serial_dmasetup
  *
  * Description:
  *   Configure the USART baud, bits, parity, etc. This method is called the
@@ -1231,9 +1242,9 @@ static int up_setup(struct uart_dev_s *dev)
  ****************************************************************************/
 
 #ifdef SERIAL_HAVE_DMA
-static int up_dma_setup(struct uart_dev_s *dev)
+static int stm32l4serial_dmasetup(FAR struct uart_dev_s *dev)
 {
-  struct up_dev_s *priv = (struct up_dev_s *)dev->priv;
+  FAR struct stm32l4_serial_s *priv = (FAR struct stm32l4_serial_s *)dev->priv;
   int result;
   uint32_t regval;
 
@@ -1241,7 +1252,7 @@ static int up_dma_setup(struct uart_dev_s *dev)
 
   if (!dev->isconsole)
     {
-      result = up_setup(dev);
+      result = stm32l4serial_setup(dev);
       if (result != OK)
         {
           return result;
@@ -1283,9 +1294,9 @@ static int up_dma_setup(struct uart_dev_s *dev)
 
   /* Enable receive DMA for the UART */
 
-  regval  = up_serialin(priv, STM32L4_USART_CR3_OFFSET);
+  regval  = stm32l4serial_getreg(priv, STM32L4_USART_CR3_OFFSET);
   regval |= USART_CR3_DMAR;
-  up_serialout(priv, STM32L4_USART_CR3_OFFSET, regval);
+  stm32l4serial_putreg(priv, STM32L4_USART_CR3_OFFSET, regval);
 
 #ifdef CONFIG_SERIAL_IFLOWCONTROL
   if (priv->iflow)
@@ -1295,7 +1306,8 @@ static int up_dma_setup(struct uart_dev_s *dev)
        * in and DMA transfer is stopped.
        */
 
-      stm32l4_dmastart(priv->rxdma, up_dma_rxcallback, (void *)priv, false);
+      stm32l4_dmastart(priv->rxdma, stm32l4serial_dmarxcallback,
+                       (void *)priv, false);
     }
   else
 #endif
@@ -1305,7 +1317,8 @@ static int up_dma_setup(struct uart_dev_s *dev)
        * worth of time to claim bytes before they are overwritten.
        */
 
-      stm32l4_dmastart(priv->rxdma, up_dma_rxcallback, (void *)priv, true);
+      stm32l4_dmastart(priv->rxdma, stm32l4serial_dmarxcallback,
+                       (void *)priv, true);
     }
 
   return OK;
@@ -1313,7 +1326,7 @@ static int up_dma_setup(struct uart_dev_s *dev)
 #endif
 
 /****************************************************************************
- * Name: up_shutdown
+ * Name: stm32l4serial_shutdown
  *
  * Description:
  *   Disable the USART.  This method is called when the serial
@@ -1321,24 +1334,24 @@ static int up_dma_setup(struct uart_dev_s *dev)
  *
  ****************************************************************************/
 
-static void up_shutdown(struct uart_dev_s *dev)
+static void stm32l4serial_shutdown(FAR struct uart_dev_s *dev)
 {
-  struct up_dev_s *priv = (struct up_dev_s *)dev->priv;
+  FAR struct stm32l4_serial_s *priv = (FAR struct stm32l4_serial_s *)dev->priv;
   uint32_t regval;
 
   /* Disable all interrupts */
 
-  up_disableusartint(priv, NULL);
+  stm32l4serial_disableusartint(priv, NULL);
 
   /* Disable USART APB1/2 clock */
 
-  up_set_apb_clock(dev, false);
+  stm32l4serial_setapbclock(dev, false);
 
   /* Disable Rx, Tx, and the UART */
 
-  regval  = up_serialin(priv, STM32L4_USART_CR1_OFFSET);
+  regval  = stm32l4serial_getreg(priv, STM32L4_USART_CR1_OFFSET);
   regval &= ~(USART_CR1_UE | USART_CR1_TE | USART_CR1_RE);
-  up_serialout(priv, STM32L4_USART_CR1_OFFSET, regval);
+  stm32l4serial_putreg(priv, STM32L4_USART_CR1_OFFSET, regval);
 
   /* Release pins. "If the serial-attached device is powered down, the TX
    * pin causes back-powering, potentially confusing the device to the point
@@ -1374,7 +1387,7 @@ static void up_shutdown(struct uart_dev_s *dev)
 }
 
 /****************************************************************************
- * Name: up_dma_shutdown
+ * Name: stm32l4serial_dmashutdown
  *
  * Description:
  *   Disable the USART.  This method is called when the serial
@@ -1383,13 +1396,13 @@ static void up_shutdown(struct uart_dev_s *dev)
  ****************************************************************************/
 
 #ifdef SERIAL_HAVE_DMA
-static void up_dma_shutdown(struct uart_dev_s *dev)
+static void stm32l4serial_dmashutdown(FAR struct uart_dev_s *dev)
 {
-  struct up_dev_s *priv = (struct up_dev_s *)dev->priv;
+  FAR struct stm32l4_serial_s *priv = (FAR struct stm32l4_serial_s *)dev->priv;
 
   /* Perform the normal UART shutdown */
 
-  up_shutdown(dev);
+  stm32l4serial_shutdown(dev);
 
   /* Stop the DMA channel */
 
@@ -1403,7 +1416,7 @@ static void up_dma_shutdown(struct uart_dev_s *dev)
 #endif
 
 /****************************************************************************
- * Name: up_attach
+ * Name: stm32l4serial_attach
  *
  * Description:
  *   Configure the USART to operation in interrupt driven mode.  This method is
@@ -1417,9 +1430,9 @@ static void up_dma_shutdown(struct uart_dev_s *dev)
  *
  ****************************************************************************/
 
-static int up_attach(struct uart_dev_s *dev)
+static int stm32l4serial_attach(FAR struct uart_dev_s *dev)
 {
-  struct up_dev_s *priv = (struct up_dev_s *)dev->priv;
+  FAR struct stm32l4_serial_s *priv = (FAR struct stm32l4_serial_s *)dev->priv;
   int ret;
 
   /* Attach and enable the IRQ */
@@ -1437,7 +1450,7 @@ static int up_attach(struct uart_dev_s *dev)
 }
 
 /****************************************************************************
- * Name: up_detach
+ * Name: stm32l4serial_detach
  *
  * Description:
  *   Detach USART interrupts.  This method is called when the serial port is
@@ -1446,9 +1459,9 @@ static int up_attach(struct uart_dev_s *dev)
  *
  ****************************************************************************/
 
-static void up_detach(struct uart_dev_s *dev)
+static void stm32l4serial_detach(FAR struct uart_dev_s *dev)
 {
-  struct up_dev_s *priv = (struct up_dev_s *)dev->priv;
+  FAR struct stm32l4_serial_s *priv = (FAR struct stm32l4_serial_s *)dev->priv;
   up_disable_irq(priv->irq);
   irq_detach(priv->irq);
 }
@@ -1465,7 +1478,7 @@ static void up_detach(struct uart_dev_s *dev)
  *
  ****************************************************************************/
 
-static int up_interrupt_common(struct up_dev_s *priv)
+static int up_interrupt_common(FAR struct stm32l4_serial_s *priv)
 {
   int  passes;
   bool handled;
@@ -1487,7 +1500,7 @@ static int up_interrupt_common(struct up_dev_s *priv)
 
       /* Get the masked USART status word. */
 
-      priv->sr = up_serialin(priv, STM32L4_USART_ISR_OFFSET);
+      priv->sr = stm32l4serial_getreg(priv, STM32L4_USART_ISR_OFFSET);
 
       /* USART interrupts:
        *
@@ -1522,7 +1535,7 @@ static int up_interrupt_common(struct up_dev_s *priv)
           (priv->ie & USART_CR1_TXEIE) == 0)
         {
           stm32l4_gpiowrite(priv->rs485_dir_gpio, !priv->rs485_dir_polarity);
-          up_restoreusartint(priv, priv->ie & ~USART_CR1_TCIE);
+          stm32l4serial_restoreusartint(priv, priv->ie & ~USART_CR1_TCIE);
         }
 #endif
 
@@ -1548,8 +1561,8 @@ static int up_interrupt_common(struct up_dev_s *priv)
            * interrupt clear register (ICR).
            */
 
-          up_serialout(priv, STM32L4_USART_ICR_OFFSET,
-                      (USART_ICR_NCF | USART_ICR_ORECF | USART_ICR_FECF));
+          stm32l4serial_putreg(priv, STM32L4_USART_ICR_OFFSET,
+                               (USART_ICR_NCF | USART_ICR_ORECF | USART_ICR_FECF));
         }
 
       /* Handle outgoing, transmit bytes */
@@ -1567,22 +1580,23 @@ static int up_interrupt_common(struct up_dev_s *priv)
 }
 
 /****************************************************************************
- * Name: up_ioctl
+ * Name: stm32l4serial_ioctl
  *
  * Description:
  *   All ioctl calls will be routed through this method
  *
  ****************************************************************************/
 
-static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
+static int stm32l4serial_ioctl(FAR struct file *filep, int cmd,
+                               unsigned long arg)
 {
 #if defined(CONFIG_SERIAL_TERMIOS) || defined(CONFIG_SERIAL_TIOCSERGSTRUCT) \
     || defined(CONFIG_STM32F7_SERIALBRK_BSDCOMPAT)
-  struct inode      *inode = filep->f_inode;
-  struct uart_dev_s *dev   = inode->i_private;
+  FAR struct inode      *inode = filep->f_inode;
+  FAR struct uart_dev_s *dev   = inode->i_private;
 #endif
 #if defined(CONFIG_SERIAL_TERMIOS) || defined(CONFIG_STM32F7_SERIALBRK_BSDCOMPAT)
-  struct up_dev_s   *priv  = (struct up_dev_s *)dev->priv;
+  FAR struct stm32l4_serial_s   *priv  = (FAR struct stm32l4_serial_s *)dev->priv;
 #endif
   int                ret    = OK;
 
@@ -1591,14 +1605,14 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
 #ifdef CONFIG_SERIAL_TIOCSERGSTRUCT
     case TIOCSERGSTRUCT:
       {
-        struct up_dev_s *user = (struct up_dev_s *)arg;
+        FAR struct stm32l4_serial_s *user = (FAR struct stm32l4_serial_s *)arg;
         if (!user)
           {
             ret = -EINVAL;
           }
         else
           {
-            memcpy(user, dev, sizeof(struct up_dev_s));
+            memcpy(user, dev, sizeof(struct stm32l4_serial_s));
           }
       }
       break;
@@ -1611,7 +1625,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
          * half-duplex mode.
          */
 
-        uint32_t cr = up_serialin(priv, STM32L4_USART_CR3_OFFSET);
+        uint32_t cr = stm32l4serial_getreg(priv, STM32L4_USART_CR3_OFFSET);
 
 #if defined(CONFIG_STM32L4_STM32F10XX)
         if (arg == SER_SINGLEWIRE_ENABLED)
@@ -1637,7 +1651,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
           }
 #endif
 
-        up_serialout(priv, STM32L4_USART_CR3_OFFSET, cr);
+        stm32l4serial_putreg(priv, STM32L4_USART_CR3_OFFSET, cr);
       }
      break;
 #endif
@@ -1645,7 +1659,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
 #ifdef CONFIG_SERIAL_TERMIOS
     case TCGETS:
       {
-        struct termios *termiosp = (struct termios *)arg;
+        FAR struct termios *termiosp = (FAR struct termios *)arg;
 
         if (!termiosp)
           {
@@ -1677,7 +1691,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
 
     case TCSETS:
       {
-        struct termios *termiosp = (struct termios *)arg;
+        FAR struct termios *termiosp = (FAR struct termios *)arg;
 
         if (!termiosp)
           {
@@ -1732,7 +1746,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
          * TCSADRAIN / TCSAFLUSH
          */
 
-        up_set_format(dev);
+        stm32l4serial_setformat(dev);
       }
       break;
 #endif /* CONFIG_SERIAL_TERMIOS */
@@ -1750,7 +1764,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
 
         priv->ie |= USART_CR1_IE_BREAK_INPROGRESS;
 
-        up_txint(dev, false);
+        stm32l4serial_txint(dev, false);
 
         /* Configure TX as a GPIO output pin and Send a break signal*/
 
@@ -1775,7 +1789,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
 
         /* Enable further tx activity */
 
-        up_txint(dev, true);
+        stm32l4serial_txint(dev, true);
 
         leave_critical_section(flags);
       }
@@ -1787,8 +1801,8 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
         irqstate_t flags;
 
         flags = enter_critical_section();
-        cr1   = up_serialin(priv, STM32_USART_CR1_OFFSET);
-        up_serialout(priv, STM32_USART_CR1_OFFSET, cr1 | USART_CR1_SBK);
+        cr1   = stm32l4serial_getreg(priv, STM32_USART_CR1_OFFSET);
+        stm32l4serial_putreg(priv, STM32_USART_CR1_OFFSET, cr1 | USART_CR1_SBK);
         leave_critical_section(flags);
       }
       break;
@@ -1799,8 +1813,8 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
         irqstate_t flags;
 
         flags = enter_critical_section();
-        cr1   = up_serialin(priv, STM32_USART_CR1_OFFSET);
-        up_serialout(priv, STM32_USART_CR1_OFFSET, cr1 & ~USART_CR1_SBK);
+        cr1   = stm32l4serial_getreg(priv, STM32_USART_CR1_OFFSET);
+        stm32l4serial_putreg(priv, STM32_USART_CR1_OFFSET, cr1 & ~USART_CR1_SBK);
         leave_critical_section(flags);
       }
       break;
@@ -1816,7 +1830,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
 }
 
 /****************************************************************************
- * Name: up_receive
+ * Name: stm32l4serial_receive
  *
  * Description:
  *   Called (usually) from the interrupt level to receive one
@@ -1826,14 +1840,15 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
  ****************************************************************************/
 
 #ifndef SERIAL_HAVE_ONLY_DMA
-static int up_receive(struct uart_dev_s *dev, unsigned int *status)
+static int stm32l4serial_receive(FAR struct uart_dev_s *dev,
+                                 FAR unsigned int *status)
 {
-  struct up_dev_s *priv = (struct up_dev_s *)dev->priv;
+  FAR struct stm32l4_serial_s *priv = (FAR struct stm32l4_serial_s *)dev->priv;
   uint32_t rdr;
 
   /* Get the Rx byte */
 
-  rdr      = up_serialin(priv, STM32L4_USART_RDR_OFFSET);
+  rdr      = stm32l4serial_getreg(priv, STM32L4_USART_RDR_OFFSET);
 
   /* Get the Rx byte plux error information.  Return those in status */
 
@@ -1847,7 +1862,7 @@ static int up_receive(struct uart_dev_s *dev, unsigned int *status)
 #endif
 
 /****************************************************************************
- * Name: up_rxint
+ * Name: stm32l4serial_rxint
  *
  * Description:
  *   Call to enable or disable RX interrupts
@@ -1855,9 +1870,9 @@ static int up_receive(struct uart_dev_s *dev, unsigned int *status)
  ****************************************************************************/
 
 #ifndef SERIAL_HAVE_ONLY_DMA
-static void up_rxint(struct uart_dev_s *dev, bool enable)
+static void stm32l4serial_rxint(FAR struct uart_dev_s *dev, bool enable)
 {
-  struct up_dev_s *priv = (struct up_dev_s *)dev->priv;
+  FAR struct stm32l4_serial_s *priv = (FAR struct stm32l4_serial_s *)dev->priv;
   irqstate_t flags;
   uint16_t ie;
 
@@ -1899,13 +1914,13 @@ static void up_rxint(struct uart_dev_s *dev, bool enable)
 
   /* Then set the new interrupt state */
 
-  up_restoreusartint(priv, ie);
+  stm32l4serial_restoreusartint(priv, ie);
   leave_critical_section(flags);
 }
 #endif
 
 /****************************************************************************
- * Name: up_rxavailable
+ * Name: stm32l4serial_rxavailable
  *
  * Description:
  *   Return true if the receive register is not empty
@@ -1913,15 +1928,15 @@ static void up_rxint(struct uart_dev_s *dev, bool enable)
  ****************************************************************************/
 
 #ifndef SERIAL_HAVE_ONLY_DMA
-static bool up_rxavailable(struct uart_dev_s *dev)
+static bool stm32l4serial_rxavailable(FAR struct uart_dev_s *dev)
 {
-  struct up_dev_s *priv = (struct up_dev_s *)dev->priv;
-  return ((up_serialin(priv, STM32L4_USART_ISR_OFFSET) & USART_ISR_RXNE) != 0);
+  FAR struct stm32l4_serial_s *priv = (FAR struct stm32l4_serial_s *)dev->priv;
+  return ((stm32l4serial_getreg(priv, STM32L4_USART_ISR_OFFSET) & USART_ISR_RXNE) != 0);
 }
 #endif
 
 /****************************************************************************
- * Name: up_rxflowcontrol
+ * Name: stm32l4serial_rxflowcontrol
  *
  * Description:
  *   Called when Rx buffer is full (or exceeds configured watermark levels
@@ -1944,10 +1959,10 @@ static bool up_rxavailable(struct uart_dev_s *dev)
  ****************************************************************************/
 
 #ifdef CONFIG_SERIAL_IFLOWCONTROL
-static bool up_rxflowcontrol(struct uart_dev_s *dev,
-                             unsigned int nbuffered, bool upper)
+static bool stm32l4serial_rxflowcontrol(FAR struct uart_dev_s *dev,
+                                        unsigned int nbuffered, bool upper)
 {
-  struct up_dev_s *priv = (struct up_dev_s *)dev->priv;
+  FAR struct stm32l4_serial_s *priv = (FAR struct stm32l4_serial_s *)dev->priv;
 
 #if defined(CONFIG_SERIAL_IFLOWCONTROL_WATERMARKS) && \
     defined(CONFIG_STM32L4_FLOWCONTROL_BROKEN)
@@ -2001,7 +2016,7 @@ static bool up_rxflowcontrol(struct uart_dev_s *dev,
 #endif
 
 /****************************************************************************
- * Name: up_dma_receive
+ * Name: stm32l4serial_dmareceive
  *
  * Description:
  *   Called (usually) from the interrupt level to receive one
@@ -2011,12 +2026,13 @@ static bool up_rxflowcontrol(struct uart_dev_s *dev,
  ****************************************************************************/
 
 #ifdef SERIAL_HAVE_DMA
-static int up_dma_receive(struct uart_dev_s *dev, unsigned int *status)
+static int stm32l4serial_dmareceive(FAR struct uart_dev_s *dev,
+                                    FAR unsigned int *status)
 {
-  struct up_dev_s *priv = (struct up_dev_s *)dev->priv;
+  FAR struct stm32l4_serial_s *priv = (FAR struct stm32l4_serial_s *)dev->priv;
   int c = 0;
 
-  if (up_dma_nextrx(priv) != priv->rxdmanext)
+  if (stm32l4serial_dmanextrx(priv) != priv->rxdmanext)
     {
       c = priv->rxfifo[priv->rxdmanext];
 
@@ -2043,7 +2059,7 @@ static int up_dma_receive(struct uart_dev_s *dev, unsigned int *status)
 #endif
 
 /****************************************************************************
- * Name: up_dma_reenable
+ * Name: stm32l4serial_dmareenable
  *
  * Description:
  *   Call to re-enable RX DMA.
@@ -2051,7 +2067,7 @@ static int up_dma_receive(struct uart_dev_s *dev, unsigned int *status)
  ****************************************************************************/
 
 #if defined(SERIAL_HAVE_DMA) && defined(CONFIG_SERIAL_IFLOWCONTROL)
-static void up_dma_reenable(struct up_dev_s *priv)
+static void stm32l4serial_dmareenable(FAR struct stm32l4_serial_s *priv)
 {
   /* Configure for non-circular DMA reception into the RX fifo */
 
@@ -2072,12 +2088,13 @@ static void up_dma_reenable(struct up_dev_s *priv)
    * DMA transfer is stopped.
    */
 
-  stm32l4_dmastart(priv->rxdma, up_dma_rxcallback, (void *)priv, false);
+  stm32l4_dmastart(priv->rxdma, stm32l4serial_dmarxcallback, (FAR void *)priv,
+                   false);
 }
 #endif
 
 /****************************************************************************
- * Name: up_dma_rxint
+ * Name: stm32l4serial_dmarxint
  *
  * Description:
  *   Call to enable or disable RX interrupts
@@ -2085,9 +2102,9 @@ static void up_dma_reenable(struct up_dev_s *priv)
  ****************************************************************************/
 
 #ifdef SERIAL_HAVE_DMA
-static void up_dma_rxint(struct uart_dev_s *dev, bool enable)
+static void stm32l4serial_dmarxint(FAR struct uart_dev_s *dev, bool enable)
 {
-  struct up_dev_s *priv = (struct up_dev_s *)dev->priv;
+  FAR struct stm32l4_serial_s *priv = (FAR struct stm32l4_serial_s *)dev->priv;
 
   /* En/disable DMA reception.
    *
@@ -2104,14 +2121,14 @@ static void up_dma_rxint(struct uart_dev_s *dev, bool enable)
     {
       /* Re-enable RX DMA. */
 
-      up_dma_reenable(priv);
+      stm32l4serial_dmareenable(priv);
     }
 #endif
 }
 #endif
 
 /****************************************************************************
- * Name: up_dma_rxavailable
+ * Name: stm32l4serial_dmarxavailable
  *
  * Description:
  *   Return true if the receive register is not empty
@@ -2119,29 +2136,29 @@ static void up_dma_rxint(struct uart_dev_s *dev, bool enable)
  ****************************************************************************/
 
 #ifdef SERIAL_HAVE_DMA
-static bool up_dma_rxavailable(struct uart_dev_s *dev)
+static bool stm32l4serial_dmarxavailable(FAR struct uart_dev_s *dev)
 {
-  struct up_dev_s *priv = (struct up_dev_s *)dev->priv;
+  FAR struct stm32l4_serial_s *priv = (FAR struct stm32l4_serial_s *)dev->priv;
 
   /* Compare our receive pointer to the current DMA pointer, if they
    * do not match, then there are bytes to be received.
    */
 
-  return (up_dma_nextrx(priv) != priv->rxdmanext);
+  return (stm32l4serial_dmanextrx(priv) != priv->rxdmanext);
 }
 #endif
 
 /****************************************************************************
- * Name: up_send
+ * Name: stm32l4serial_send
  *
  * Description:
  *   This method will send one byte on the USART
  *
  ****************************************************************************/
 
-static void up_send(struct uart_dev_s *dev, int ch)
+static void stm32l4serial_send(FAR struct uart_dev_s *dev, int ch)
 {
-  struct up_dev_s *priv = (struct up_dev_s *)dev->priv;
+  FAR struct stm32l4_serial_s *priv = (FAR struct stm32l4_serial_s *)dev->priv;
 
 #ifdef HAVE_RS485
   if (priv->rs485_dir_gpio != 0)
@@ -2150,20 +2167,20 @@ static void up_send(struct uart_dev_s *dev, int ch)
     }
 #endif
 
-  up_serialout(priv, STM32L4_USART_TDR_OFFSET, (uint32_t)ch);
+  stm32l4serial_putreg(priv, STM32L4_USART_TDR_OFFSET, (uint32_t)ch);
 }
 
 /****************************************************************************
- * Name: up_txint
+ * Name: stm32l4serial_txint
  *
  * Description:
  *   Call to enable or disable TX interrupts
  *
  ****************************************************************************/
 
-static void up_txint(struct uart_dev_s *dev, bool enable)
+static void stm32l4serial_txint(FAR struct uart_dev_s *dev, bool enable)
 {
-  struct up_dev_s *priv = (struct up_dev_s *)dev->priv;
+  FAR struct stm32l4_serial_s *priv = (FAR struct stm32l4_serial_s *)dev->priv;
   irqstate_t flags;
 
   /* USART transmit interrupts:
@@ -2201,7 +2218,7 @@ static void up_txint(struct uart_dev_s *dev, bool enable)
         }
 #  endif
 
-      up_restoreusartint(priv, ie);
+      stm32l4serial_restoreusartint(priv, ie);
 
       /* Fake a TX interrupt here by just calling uart_xmitchars() with
        * interrupts disabled (note this may recurse).
@@ -2214,24 +2231,24 @@ static void up_txint(struct uart_dev_s *dev, bool enable)
     {
       /* Disable the TX interrupt */
 
-      up_restoreusartint(priv, priv->ie & ~USART_CR1_TXEIE);
+      stm32l4serial_restoreusartint(priv, priv->ie & ~USART_CR1_TXEIE);
     }
 
   leave_critical_section(flags);
 }
 
 /****************************************************************************
- * Name: up_txready
+ * Name: stm32l4serial_txready
  *
  * Description:
  *   Return true if the transmit data register is empty
  *
  ****************************************************************************/
 
-static bool up_txready(struct uart_dev_s *dev)
+static bool stm32l4serial_txready(FAR struct uart_dev_s *dev)
 {
-  struct up_dev_s *priv = (struct up_dev_s *)dev->priv;
-  return ((up_serialin(priv, STM32L4_USART_ISR_OFFSET) & USART_ISR_TXE) != 0);
+  FAR struct stm32l4_serial_s *priv = (FAR struct stm32l4_serial_s *)dev->priv;
+  return ((stm32l4serial_getreg(priv, STM32L4_USART_ISR_OFFSET) & USART_ISR_TXE) != 0);
 }
 
 /****************************************************************************
@@ -2243,42 +2260,42 @@ static bool up_txready(struct uart_dev_s *dev)
  ****************************************************************************/
 
 #ifdef CONFIG_STM32L4_USART1
-static int up_interrupt_usart1(int irq, void *context)
+static int up_interrupt_usart1(int irq, FAR void *context)
 {
   return up_interrupt_common(&g_usart1priv);
 }
 #endif
 
 #ifdef CONFIG_STM32L4_USART2
-static int up_interrupt_usart2(int irq, void *context)
+static int up_interrupt_usart2(int irq, FAR void *context)
 {
   return up_interrupt_common(&g_usart2priv);
 }
 #endif
 
 #ifdef CONFIG_STM32L4_USART3
-static int up_interrupt_usart3(int irq, void *context)
+static int up_interrupt_usart3(int irq, FAR void *context)
 {
   return up_interrupt_common(&g_usart3priv);
 }
 #endif
 
 #ifdef CONFIG_STM32L4_UART4
-static int up_interrupt_uart4(int irq, void *context)
+static int up_interrupt_uart4(int irq, FAR void *context)
 {
   return up_interrupt_common(&g_uart4priv);
 }
 #endif
 
 #ifdef CONFIG_STM32L4_UART5
-static int up_interrupt_uart5(int irq, void *context)
+static int up_interrupt_uart5(int irq, FAR void *context)
 {
   return up_interrupt_common(&g_uart5priv);
 }
 #endif
 
 /****************************************************************************
- * Name: up_dma_rxcallback
+ * Name: stm32l4serial_dmarxcallback
  *
  * Description:
  *   This function checks the current DMA state and calls the generic
@@ -2287,11 +2304,12 @@ static int up_interrupt_uart5(int irq, void *context)
  ****************************************************************************/
 
 #ifdef SERIAL_HAVE_DMA
-static void up_dma_rxcallback(DMA_HANDLE handle, uint8_t status, void *arg)
+static void stm32l4serial_dmarxcallback(DMA_HANDLE handle, uint8_t status,
+                                        FAR void *arg)
 {
-  struct up_dev_s *priv = (struct up_dev_s *)arg;
+  FAR struct stm32l4_serial_s *priv = (FAR struct stm32l4_serial_s *)arg;
 
-  if (priv->rxenable && up_dma_rxavailable(&priv->dev))
+  if (priv->rxenable && stm32l4serial_dmarxavailable(&priv->dev))
     {
       uart_recvchars(&priv->dev);
 
@@ -2301,7 +2319,7 @@ static void up_dma_rxcallback(DMA_HANDLE handle, uint8_t status, void *arg)
         {
           /* Re-enable RX DMA. */
 
-          up_dma_reenable(priv);
+          stm32l4serial_dmareenable(priv);
         }
 #endif
     }
@@ -2309,7 +2327,7 @@ static void up_dma_rxcallback(DMA_HANDLE handle, uint8_t status, void *arg)
 #endif
 
 /****************************************************************************
- * Name: up_pm_notify
+ * Name: stm32l4serial_pmnotify
  *
  * Description:
  *   Notify the driver of new power state. This callback is  called after
@@ -2331,8 +2349,8 @@ static void up_dma_rxcallback(DMA_HANDLE handle, uint8_t status, void *arg)
  ****************************************************************************/
 
 #ifdef CONFIG_PM
-static void up_pm_notify(struct pm_callback_s *cb, int domain,
-                         enum pm_state_e pmstate)
+static void stm32l4serial_pmnotify(FAR struct pm_callback_s *cb, int domain,
+                                   enum pm_state_e pmstate)
 {
   switch (pmstate)
     {
@@ -2372,7 +2390,7 @@ static void up_pm_notify(struct pm_callback_s *cb, int domain,
 #endif
 
 /****************************************************************************
- * Name: up_pm_prepare
+ * Name: stm32l4serial_pmprepare
  *
  * Description:
  *   Request the driver to prepare for a new power state. This is a warning
@@ -2405,8 +2423,8 @@ static void up_pm_notify(struct pm_callback_s *cb, int domain,
  ****************************************************************************/
 
 #ifdef CONFIG_PM
-static int up_pm_prepare(struct pm_callback_s *cb, int domain,
-                         enum pm_state_e pmstate)
+static int stm32l4serial_pmprepare(FAR struct pm_callback_s *cb, int domain,
+                                   enum pm_state_e pmstate)
 {
   /* Logic to prepare for a reduced power state goes here. */
 
@@ -2428,7 +2446,7 @@ static int up_pm_prepare(struct pm_callback_s *cb, int domain,
  * Description:
  *   Performs the low level USART initialization early in debug so that the
  *   serial console will be available during bootup.  This must be called
- *   before up_serialinit.
+ *   before stm32l4serial_getregit.
  *
  ****************************************************************************/
 
@@ -2444,21 +2462,21 @@ void up_earlyserialinit(void)
     {
       if (uart_devs[i])
         {
-          up_disableusartint(uart_devs[i], NULL);
+          stm32l4serial_disableusartint(uart_devs[i], NULL);
         }
     }
 
   /* Configure whichever one is the console */
 
 #if CONSOLE_UART > 0
-  up_setup(&uart_devs[CONSOLE_UART - 1]->dev);
+  stm32l4serial_setup(&uart_devs[CONSOLE_UART - 1]->dev);
 #endif
 #endif /* HAVE UART */
 }
 #endif
 
 /****************************************************************************
- * Name: up_serialinit
+ * Name: stm32l4serial_getregit
  *
  * Description:
  *   Register serial console and serial ports.  This assumes
@@ -2466,7 +2484,7 @@ void up_earlyserialinit(void)
  *
  ****************************************************************************/
 
-void up_serialinit(void)
+void stm32l4serial_getregit(void)
 {
 #ifdef HAVE_UART
   char devname[16];
@@ -2501,7 +2519,7 @@ void up_serialinit(void)
 #ifdef SERIAL_HAVE_CONSOLE_DMA
   /* If we need to re-initialise the console to enable DMA do that here. */
 
-  up_dma_setup(&uart_devs[CONSOLE_UART - 1]->dev);
+  stm32l4serial_dmasetup(&uart_devs[CONSOLE_UART - 1]->dev);
 #endif
 #endif /* CONSOLE_UART > 0 */
 
@@ -2536,7 +2554,7 @@ void up_serialinit(void)
 }
 
 /****************************************************************************
- * Name: stm32l4_serial_dma_poll
+ * Name: stm32l4serial_dmapoll
  *
  * Description:
  *   Checks receive DMA buffers for received bytes that have not accumulated
@@ -2547,7 +2565,7 @@ void up_serialinit(void)
  ****************************************************************************/
 
 #ifdef SERIAL_HAVE_DMA
-void stm32l4_serial_dma_poll(void)
+void stm32l4serial_dmapoll(void)
 {
     irqstate_t flags;
 
@@ -2556,35 +2574,35 @@ void stm32l4_serial_dma_poll(void)
 #ifdef CONFIG_USART1_RXDMA
   if (g_usart1priv.rxdma != NULL)
     {
-      up_dma_rxcallback(g_usart1priv.rxdma, 0, &g_usart1priv);
+      stm32l4serial_dmarxcallback(g_usart1priv.rxdma, 0, &g_usart1priv);
     }
 #endif
 
 #ifdef CONFIG_USART2_RXDMA
   if (g_usart2priv.rxdma != NULL)
     {
-      up_dma_rxcallback(g_usart2priv.rxdma, 0, &g_usart2priv);
+      stm32l4serial_dmarxcallback(g_usart2priv.rxdma, 0, &g_usart2priv);
     }
 #endif
 
 #ifdef CONFIG_USART3_RXDMA
   if (g_usart3priv.rxdma != NULL)
     {
-      up_dma_rxcallback(g_usart3priv.rxdma, 0, &g_usart3priv);
+      stm32l4serial_dmarxcallback(g_usart3priv.rxdma, 0, &g_usart3priv);
     }
 #endif
 
 #ifdef CONFIG_UART4_RXDMA
   if (g_uart4priv.rxdma != NULL)
     {
-      up_dma_rxcallback(g_uart4priv.rxdma, 0, &g_uart4priv);
+      stm32l4serial_dmarxcallback(g_uart4priv.rxdma, 0, &g_uart4priv);
     }
 #endif
 
 #ifdef CONFIG_UART5_RXDMA
   if (g_uart5priv.rxdma != NULL)
     {
-      up_dma_rxcallback(g_uart5priv.rxdma, 0, &g_uart5priv);
+      stm32l4serial_dmarxcallback(g_uart5priv.rxdma, 0, &g_uart5priv);
     }
 #endif
 
@@ -2603,10 +2621,10 @@ void stm32l4_serial_dma_poll(void)
 int up_putc(int ch)
 {
 #if CONSOLE_UART > 0
-  struct up_dev_s *priv = uart_devs[CONSOLE_UART - 1];
+  struct stm32l4_serial_s *priv = uart_devs[CONSOLE_UART - 1];
   uint16_t ie;
 
-  up_disableusartint(priv, &ie);
+  stm32l4serial_disableusartint(priv, &ie);
 
   /* Check for LF */
 
@@ -2618,7 +2636,7 @@ int up_putc(int ch)
     }
 
   up_lowputc(ch);
-  up_restoreusartint(priv, ie);
+  stm32l4serial_restoreusartint(priv, ie);
 #endif
   return ch;
 }
-- 
GitLab


From b616918e0f1186cddf7575c4b4516e97006d0ba1 Mon Sep 17 00:00:00 2001
From: Ken Pettit 
Date: Tue, 12 Jul 2016 17:28:06 -0600
Subject: [PATCH 229/229] SmartFS: Fix a 32-byte memory leak

---
 fs/smartfs/smartfs_smart.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/fs/smartfs/smartfs_smart.c b/fs/smartfs/smartfs_smart.c
index c5390d4201..c269031d27 100644
--- a/fs/smartfs/smartfs_smart.c
+++ b/fs/smartfs/smartfs_smart.c
@@ -1691,6 +1691,11 @@ static int smartfs_unlink(struct inode *mountpt, const char *relpath)
   ret = OK;
 
 errout_with_semaphore:
+  if (entry.name != NULL)
+    {
+      kmm_free(entry.name);
+    }
+
   smartfs_semgive(fs);
   return ret;
 }
@@ -1856,6 +1861,11 @@ int smartfs_rmdir(struct inode *mountpt, const char *relpath)
   ret = OK;
 
 errout_with_semaphore:
+  if (entry.name != NULL)
+    {
+      kmm_free(entry.name);
+    }
+
   smartfs_semgive(fs);
   return ret;
 }
-- 
GitLab