configs/stm3210e-eval/pm: Configuration converted to use the kconfig-frontends tools

10 files changed, 994 insertions, 758 deletions

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index f2bac1b37..32cda60d7 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -6797,3 +6797,5 @@
 	* configs/*/dhcpd:  Add missing DHCPD configuratino settings (2014-3-3).
 	* configs/stm32f4discovery/pm: Configuration converted to use the
 	  kconfig-frontends tools (2014-3-4)
+	* configs/stm3210e-eval/pm: Configuration converted to use the
+	  kconfig-frontends tools (2014-3-4)
diff --git a/nuttx/configs/fire-stm32v2/README.txt b/nuttx/configs/fire-stm32v2/README.txt
index 962d1ad66..8e2ce3734 100644
--- a/nuttx/configs/fire-stm32v2/README.txt
+++ b/nuttx/configs/fire-stm32v2/README.txt
@@ -805,7 +805,6 @@ M3 Wildfire-specific Configuration Options
 
     CONFIG_STM32_AM240320_DISABLE
     CONFIG_STM32_SPFD5408B_DISABLE
-    CONFIG_STM32_R61580_DISABLE
 
 Configurations
 ==============
diff --git a/nuttx/configs/stm3210e-eval/Kconfig b/nuttx/configs/stm3210e-eval/Kconfig
index 90b60c5e7..9fee5b446 100644
--- a/nuttx/configs/stm3210e-eval/Kconfig
+++ b/nuttx/configs/stm3210e-eval/Kconfig
@@ -9,30 +9,31 @@ comment "STM3210E-EVAL LCD Hardware Configuration"
 config STM3210E_LCD
 	bool "Select support for the STM3210E-EVAL LCD"
 	default y
-	depends on LCD && STM32_FSMC
+	depends on STM32_FSMC
+	select LCD
 	---help---
 		Enable support for the LCD on the STM3210E-EVAL board.  See additional,
 		LCD-common settings in the drivers/lcd Kconfig file.
 
-config LCD_BACKLIGHT
+config STM3210E_LCD_BACKLIGHT
 	bool "LCD backlight support"
 	depends on STM3210E_LCD
 	default n
 	---help---
 		Define to support a backlight.
 
-config LCD_PWM
+config STM3210E_LCD_PWM
 	bool "LCD backlight PWM control"
 	default n
-	depends on LCD_BACKLIGHT && STM32_TIM1
+	depends on STM3210E_LCD_BACKLIGHT && STM32_TIM1
 	---help---
 		If STM32_TIM1 is also defined, then an adjustable backlight will be
 		provided using timer 1 to generate various pulse widthes.  The
-		granularity of the settings is determined by LCD_MAXPOWER.  If LCD_PWM
+		granularity of the settings is determined by LCD_MAXPOWER.  If STM3210E_LCD_PWM
 		(or STM32_TIM1) is not defined, then a simple on/off backlight is
 		provided.
 
-config LCD_RDSHIFT
+config STM3210E_LCD_RDSHIFT
 	int "LCD data shift"
 	default 5
 	depends on STM3210E_LCD
@@ -40,7 +41,7 @@ config LCD_RDSHIFT
 		When reading 16-bit gram data, there appears to be a shift in the returned
 		data.  This value fixes the offset.  Default 5.
 
-config STM32_AM240320_DISABLE
+config STM3210E_AM240320_DISABLE
 	bool "Disable AM240320 support"
 	default n
 	depends on STM3210E_LCD
@@ -49,7 +50,7 @@ config STM32_AM240320_DISABLE
 		ID value.  However, code size can be reduced by suppressing support for
 		individual LCDs using this option
 
-config STM32_SPFD5408B_DISABLE
+config STM3210E_SPFD5408B_DISABLE
 	bool "Disable SPFD5408B support"
 	default n
 	depends on STM3210E_LCD
@@ -58,7 +59,7 @@ config STM32_SPFD5408B_DISABLE
 		ID value.  However, code size can be reduced by suppressing support for
 		individual LCDs using this option
 
-config STM32_R61580_DISABLE
+config STM3210E_R61580_DISABLE
 	bool "Disable R61580 support"
 	default n
 	depends on STM3210E_LCD
diff --git a/nuttx/configs/stm3210e-eval/README.txt b/nuttx/configs/stm3210e-eval/README.txt
index c60049555..41846990e 100644
--- a/nuttx/configs/stm3210e-eval/README.txt
+++ b/nuttx/configs/stm3210e-eval/README.txt
@@ -658,14 +658,14 @@ STM3210E-EVAL-specific Configuration Options
       portrait" orientation support.  In this orientation, the
       STM3210E-EVAL's LCD ribbon cable is at the top of the display.
       Default is 320x240 "landscape" orientation.
-    CONFIG_LCD_BACKLIGHT - Define to support a backlight.
-    CONFIG_LCD_PWM - If CONFIG_STM32_TIM1 is also defined, then an
+    CONFIG_STM3210E_LCD_BACKLIGHT - Define to support a backlight.
+    CONFIG_STM3210E_LCD_PWM - If CONFIG_STM32_TIM1 is also defined, then an
       adjustable backlight will be provided using timer 1 to generate
       various pulse widthes.  The granularity of the settings is
-      determined by CONFIG_LCD_MAXPOWER.  If CONFIG_LCD_PWM (or
+      determined by CONFIG_LCD_MAXPOWER.  If CONFIG_STM3210E_LCD_PWM (or
       CONFIG_STM32_TIM1) is not defined, then a simple on/off backlight
       is provided.
-    CONFIG_LCD_RDSHIFT - When reading 16-bit gram data, there appears
+    CONFIG_STM3210E_LCD_RDSHIFT - When reading 16-bit gram data, there appears
       to be a shift in the returned data.  This value fixes the offset.
       Default 5.
 
@@ -673,9 +673,9 @@ STM3210E-EVAL-specific Configuration Options
     ID value.  However, code size can be reduced by suppressing support for
     individual LCDs using:
 
-    CONFIG_STM32_AM240320_DISABLE
-    CONFIG_STM32_SPFD5408B_DISABLE
-    CONFIG_STM32_R61580_DISABLE
+    CONFIG_STM3210E_AM240320_DISABLE
+    CONFIG_STM3210E_SPFD5408B_DISABLE
+    CONFIG_STM3210E_R61580_DISABLE
 
 Configurations
 ==============
@@ -941,43 +941,60 @@ Where <subdir> is one of the following:
     configuration should provide some guideline for power management in your
     STM32 application.
 
-      CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y  : CodeSourcery under Windows
+    NOTES:
+
+    1. This configuration uses the mconf-based configuration tool.  To
+       change this configurations using that tool, you should:
+
+       a. Build and install the kconfig-mconf tool.  See nuttx/README.txt
+          and misc/tools/
+
+       b. Execute 'make menuconfig' in nuttx/ in order to start the
+          reconfiguration process.
+
+    2. Default configuration is Cygwin under windows using the CodeSourcery
+       toolchain:
+
+         CONFIG_HOST_WINDOWS=y         : Windows
+         CONFIG_WINDOWS_CYGWIN=y       : Cygwin
+         CONFIG_STM32_CODESOURCERYW=y  : CodeSourcery under Windows
 
-    CONFIG_ARCH_CUSTOM_PMINIT and CONFIG_ARCH_IDLE_CUSTOM are necessary parts of the
-    PM configuration:
+    3. CONFIG_ARCH_CUSTOM_PMINIT and CONFIG_ARCH_IDLE_CUSTOM are necessary
+       parts of the PM configuration:
 
-      CONFIG_ARCH_CUSTOM_PMINIT=y
+         CONFIG_ARCH_CUSTOM_PMINIT=y
 
-    CONFIG_ARCH_CUSTOM_PMINIT moves the PM initialization from arch/arm/src/stm32/stm32_pminitialiaze.c
-    to configs/stm3210-eval/src/up_pm.c.  This allows us to support board-
-    specific PM initialization.
+       CONFIG_ARCH_CUSTOM_PMINIT moves the PM initialization from
+       arch/arm/src/stm32/stm32_pminitialiaze.c to configs/stm3210-eval/src/stm32_pm.c.
+       This allows us to support board-specific PM initialization.
 
-      CONFIG_ARCH_IDLE_CUSTOM=y
+         CONFIG_ARCH_IDLE_CUSTOM=y
 
-    The bulk of the PM activities occur in the IDLE loop.  The IDLE loop is
-    special because it is what runs when there is no other task running.  Therefore
-    when the IDLE executes, we can be assure that nothing else is going on; this
-    is the ideal condition for doing reduced power management.
+       The bulk of the PM activities occur in the IDLE loop.  The IDLE loop
+       is special because it is what runs when there is no other task running.
+       Therefore when the IDLE executes, we can be assure that nothing else
+       is going on; this is the ideal condition for doing reduced power
+       management.
 
-    The configuration CONFIG_ARCH_IDLE_CUSTOM allows us to "steal" the normal STM32
-    IDLE loop (of arch/arm/src/stm32/stm32_idle.c) and replace this with our own
-    custom IDLE loop (at configs/stm3210-eval/src/up_idle.c).
+       The configuration CONFIG_ARCH_IDLE_CUSTOM allows us to "steal" the
+       normal STM32 IDLE loop (of arch/arm/src/stm32/stm32_idle.c) and replace
+       this with our own custom IDLE loop (at configs/stm3210-eval/src/up_idle.c).
 
-    Here are some additional things to note in the configuration:
+    4. Here are some additional things to note in the configuration:
 
-      CONFIG_PM_BUTTONS=y
+        CONFIG_PM_BUTTONS=y
 
-    CONFIG_PM_BUTTONS enables button support for PM testing.  Buttons can drive
-    EXTI interrupts and EXTI interrrupts can be used to wakeup for certain reduced
-    power modes (STOP mode).  The use of the buttons here is for PM testing purposes
-    only; buttons would normally be part the application code and CONFIG_PM_BUTTONS
-    would not be defined.
+       CONFIG_PM_BUTTONS enables button support for PM testing.  Buttons can
+       drive EXTI interrupts and EXTI interrrupts can be used to wakeup for
+       certain reduced power modes (STOP mode).  The use of the buttons here
+       is for PM testing purposes only; buttons would normally be part the
+       application code and CONFIG_PM_BUTTONS would not be defined.
 
-      CONFIG_RTC_ALARM=y
+         CONFIG_RTC_ALARM=y
 
-    The RTC alarm is used to wake up from STOP mode and to transition to
-    STANDBY mode.  This used of the RTC alarm could conflict with other uses of
-    the RTC alarm in your application.
+       The RTC alarm is used to wake up from STOP mode and to transition to
+       STANDBY mode.  This used of the RTC alarm could conflict with other
+       uses of the RTC alarm in your application.
 
   usbserial:
   ---------
diff --git a/nuttx/configs/stm3210e-eval/nsh2/defconfig b/nuttx/configs/stm3210e-eval/nsh2/defconfig
index e58b88e10..06b8d9a0d 100644
--- a/nuttx/configs/stm3210e-eval/nsh2/defconfig
+++ b/nuttx/configs/stm3210e-eval/nsh2/defconfig
@@ -379,11 +379,11 @@ CONFIG_NSH_MMCSDSLOTNO=0
 # STM3210E-EVAL LCD Hardware Configuration
 #
 CONFIG_STM3210E_LCD=y
-# CONFIG_LCD_BACKLIGHT is not set
-CONFIG_LCD_RDSHIFT=5
-# CONFIG_STM32_AM240320_DISABLE is not set
-# CONFIG_STM32_SPFD5408B_DISABLE is not set
-CONFIG_STM32_R61580_DISABLE=y
+# CONFIG_STM3210E_LCD_BACKLIGHT is not set
+CONFIG_STM3210E_LCD_RDSHIFT=5
+# CONFIG_STM3210E_AM240320_DISABLE is not set
+# CONFIG_STM3210E_SPFD5408B_DISABLE is not set
+CONFIG_STM3210E_R61580_DISABLE=y
 
 #
 # RTOS Features
@@ -678,7 +678,7 @@ CONFIG_FAT_MAXFNAME=32
 CONFIG_NX=y
 CONFIG_NX_LCDDRIVER=y
 CONFIG_NX_NPLANES=1
-CONFIG_NX_WRITEONLY=y
+# CONFIG_NX_WRITEONLY is not set
 
 #
 # Supported Pixel Depths
diff --git a/nuttx/configs/stm3210e-eval/nx/defconfig b/nuttx/configs/stm3210e-eval/nx/defconfig
index 0f18adc66..64443a172 100644
--- a/nuttx/configs/stm3210e-eval/nx/defconfig
+++ b/nuttx/configs/stm3210e-eval/nx/defconfig
@@ -369,11 +369,11 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 # STM3210E-EVAL LCD Hardware Configuration
 #
 CONFIG_STM3210E_LCD=y
-# CONFIG_LCD_BACKLIGHT is not set
-CONFIG_LCD_RDSHIFT=5
-# CONFIG_STM32_AM240320_DISABLE is not set
-# CONFIG_STM32_SPFD5408B_DISABLE is not set
-CONFIG_STM32_R61580_DISABLE=y
+# CONFIG_STM3210E_LCD_BACKLIGHT is not set
+CONFIG_STM3210E_LCD_RDSHIFT=5
+# CONFIG_STM3210E_AM240320_DISABLE is not set
+# CONFIG_STM3210E_SPFD5408B_DISABLE is not set
+CONFIG_STM3210E_R61580_DISABLE=y
 
 #
 # RTOS Features
@@ -604,7 +604,7 @@ CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_NX=y
 CONFIG_NX_LCDDRIVER=y
 CONFIG_NX_NPLANES=1
-CONFIG_NX_WRITEONLY=y
+# CONFIG_NX_WRITEONLY is not set
 
 #
 # Supported Pixel Depths
diff --git a/nuttx/configs/stm3210e-eval/nxconsole/defconfig b/nuttx/configs/stm3210e-eval/nxconsole/defconfig
index 07c1db872..29b4f91d5 100644
--- a/nuttx/configs/stm3210e-eval/nxconsole/defconfig
+++ b/nuttx/configs/stm3210e-eval/nxconsole/defconfig
@@ -162,9 +162,9 @@ CONFIG_UART5_2STOP=0
 #
 # STM3210E-EVAL specific LCD settings
 #
-CONFIG_STM32_AM240320_DISABLE=n
-CONFIG_STM32_SPFD5408B_DISABLE=n
-CONFIG_STM32_R61580_DISABLE=y
+CONFIG_STM3210E_AM240320_DISABLE=n
+CONFIG_STM3210E_SPFD5408B_DISABLE=n
+CONFIG_STM3210E_R61580_DISABLE=y
 
 #
 # General build options
@@ -465,8 +465,8 @@ CONFIG_LCD_NOGETRUN=y
 CONFIG_LCD_LANDSCAPE=y
 CONFIG_LCD_PORTRAIT=n
 CONFIG_LCD_RPORTRAIT=n
-CONFIG_LCD_BACKLIGHT=n
-CONFIG_LCD_PWM=n
+CONFIG_STM3210E_LCD_BACKLIGHT=n
+CONFIG_STM3210E_LCD_PWM=n
 
 #
 # Settings for examples/uip
diff --git a/nuttx/configs/stm3210e-eval/pm/appconfig b/nuttx/configs/stm3210e-eval/pm/appconfig
deleted file mode 100644
index 6fae050a7..000000000
--- a/nuttx/configs/stm3210e-eval/pm/appconfig
+++ /dev/null
@@ -1,63 +0,0 @@
-############################################################################
-# configs/stm3210e-eval/pm/appconfig
-#
-#   Copyright (C) 2012 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# 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.
-#
-############################################################################
-
-# Path to example in apps/examples containing the user_start entry point
-
-CONFIGURED_APPS += examples/nsh
-
-# The NSH application library
-
-CONFIGURED_APPS += system/readline
-CONFIGURED_APPS += nshlib
-
-# The NX and NXHELLO examples configured as an NX built-in commands
-# Various NX tests can be supported, simply comment-out examples/nx and
-# uncomment the test you wish to perform
-
-CONFIGURED_APPS += examples/nx
-CONFIGURED_APPS += examples/nxhello
-#CONFIGURED_APPS += examples/nxlines
-#CONFIGURED_APPS += examples/nxtext
-CONFIGURED_APPS += system/usbmsc
-
-ifeq ($(CONFIG_I2C),y)
-CONFIGURED_APPS += system/i2c
-endif
-
-# Applications configured as an NX built-in commands
-
-ifeq ($(CONFIG_CAN),y)
-CONFIGURED_APPS += examples/can
-endif
diff --git a/nuttx/configs/stm3210e-eval/pm/defconfig b/nuttx/configs/stm3210e-eval/pm/defconfig
index 77053db49..1507b9129 100644
--- a/nuttx/configs/stm3210e-eval/pm/defconfig
+++ b/nuttx/configs/stm3210e-eval/pm/defconfig
@@ -1,346 +1,430 @@
-############################################################################
-# configs/stm3210e-eval/pm/defconfig
-#
-#   Copyright (C) 2012 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# 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.
-#
-############################################################################
-#
-# Architecture Selection
 #
-CONFIG_ARCH="arm"
-CONFIG_ARCH_ARM=y
-CONFIG_ARCH_CORTEXM3=y
-CONFIG_ARCH_CHIP="stm32"
-CONFIG_ARCH_CHIP_STM32F103ZET6=y
-CONFIG_ARCH_BOARD="stm3210e-eval"
-CONFIG_ARCH_BOARD_STM3210E_EVAL=y
-CONFIG_BOARD_LOOPSPERMSEC=5483
-CONFIG_RAM_SIZE=65536
-CONFIG_RAM_START=0x20000000
-CONFIG_ARCH_IRQPRIO=y
-CONFIG_ARCH_INTERRUPTSTACK=0
-CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_LEDS=y
-CONFIG_ARCH_BUTTONS=y
-CONFIG_ARCH_IRQBUTTONS=y
-CONFIG_ARCH_CALIBRATION=n
-CONFIG_ARCH_DMA=y
-
+# Automatically generated file; DO NOT EDIT.
+# Nuttx/ Configuration
 #
-# Identify toolchain and linker options
+CONFIG_NUTTX_NEWCONFIG=y
+
 #
-CONFIG_STM32_CODESOURCERYW=y
-CONFIG_STM32_CODESOURCERYL=n
-CONFIG_STM32_DEVKITARM=n
-CONFIG_STM32_RAISONANCE=n
-CONFIG_STM32_BUILDROOT=n
+# 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
 
 #
-# JTAG Enable settings (by default JTAG-DP and SW-DP are disabled):
+# Build Configuration
 #
-CONFIG_STM32_DFU=y
-CONFIG_STM32_JTAG_FULL_ENABLE=y
-CONFIG_STM32_JTAG_NOJNTRST_ENABLE=n
-CONFIG_STM32_JTAG_SW_ENABLE=n
-
-#
-# Alternate pin mappings
-#
-CONFIG_STM32_TIM1_FULL_REMAP=n
-CONFIG_STM32_TIM1_PARTIAL_REMAP=n
-CONFIG_STM32_TIM2_FULL_REMAP=n
-CONFIG_STM32_TIM2_PARTIAL_REMAP_1=n
-CONFIG_STM32_TIM2_PARTIAL_REMAP_2=n
-CONFIG_STM32_TIM3_FULL_REMAP=n
-CONFIG_STM32_TIM3_PARTIAL_REMAP=n
-CONFIG_STM32_TIM4_REMAP=n
-CONFIG_STM32_USART1_REMAP=n
-CONFIG_STM32_USART2_REMAP=n
-CONFIG_STM32_USART3_FULL_REMAP=n
-CONFIG_STM32_USART3_PARTIAL_REMAP=n
-CONFIG_STM32_SPI1_REMAP=n
-CONFIG_STM32_SPI3_REMAP=n
-CONFIG_STM32_I2C1_REMAP=n
-CONFIG_STM32_CAN1_REMAP1=y
-CONFIG_STM32_CAN1_REMAP2=n 
-
-#
-# Individual subsystems can be enabled:
-# AHB: 
-CONFIG_STM32_DMA1=n
-CONFIG_STM32_DMA2=n
-CONFIG_STM32_CRC=n
-CONFIG_STM32_FSMC=y
-CONFIG_STM32_SDIO=n
-# APB1:
-CONFIG_STM32_TIM2=n
-CONFIG_STM32_TIM3=n
-CONFIG_STM32_TIM4=n
-CONFIG_STM32_TIM5=n
-CONFIG_STM32_TIM6=n
-CONFIG_STM32_TIM7=n
-CONFIG_STM32_WWDG=n
-CONFIG_STM32_IWDG=n
-CONFIG_STM32_SPI2=n
-CONFIG_STM32_SPI4=n
-CONFIG_STM32_USART2=y
-CONFIG_STM32_USART3=n
-CONFIG_STM32_UART4=n
-CONFIG_STM32_UART5=n
-CONFIG_STM32_I2C1=n
-CONFIG_STM32_I2C2=n
-CONFIG_STM32_USB=n
-CONFIG_STM32_CAN1=n
-CONFIG_STM32_BKP=y
-CONFIG_STM32_PWR=y
-CONFIG_STM32_DAC=n
-# APB2:
-CONFIG_STM32_ADC1=n
-CONFIG_STM32_ADC2=n
-CONFIG_STM32_TIM1=y
-CONFIG_STM32_SPI1=n
-CONFIG_STM32_TIM8=n
-CONFIG_STM32_USART1=y
-CONFIG_STM32_ADC3=n
+# CONFIG_APPS_DIR="../apps"
+# CONFIG_BUILD_2PASS is not set
 
 #
-# RTC
+# Binary Output Formats
 #
-CONFIG_RTC=y
-CONFIG_RTC_DATETIME=n
-CONFIG_RTC_HIRES=y
-CONFIG_RTC_FREQUENCY=16384
-CONFIG_RTC_ALARM=y
+# CONFIG_RRLOAD_BINARY is not set
+CONFIG_INTELHEX_BINARY=y
+# CONFIG_MOTOROLA_SREC is not set
+# CONFIG_RAW_BINARY is not set
 
 #
-# Timer and I2C devices may need to the following to force power to be applied:
+# Customize Header Files
 #
-#CONFIG_STM32_FORCEPOWER=y
+# 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
 
 #
-# STM32F103Z specific serial device driver settings
+# Debug Options
 #
-CONFIG_USART1_SERIAL_CONSOLE=y
-CONFIG_USART2_SERIAL_CONSOLE=n
-CONFIG_USART3_SERIAL_CONSOLE=n
-CONFIG_UART4_SERIAL_CONSOLE=n
-CONFIG_UART5_SERIAL_CONSOLE=n
-
-CONFIG_USART1_TXBUFSIZE=256
-CONFIG_USART2_TXBUFSIZE=256
-CONFIG_USART3_TXBUFSIZE=256
-CONFIG_UART4_TXBUFSIZE=256
-CONFIG_UART5_TXBUFSIZE=256
+# CONFIG_DEBUG is not set
+CONFIG_ARCH_HAVE_STACKCHECK=y
+CONFIG_ARCH_HAVE_HEAPCHECK=y
+# 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
 
-CONFIG_USART1_RXBUFSIZE=256
-CONFIG_USART2_RXBUFSIZE=256
-CONFIG_USART3_RXBUFSIZE=256
-CONFIG_UART4_RXBUFSIZE=256
-CONFIG_UART5_RXBUFSIZE=256
+#
+# System Type
+#
+# CONFIG_ARCH_8051 is not set
+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"
 
-CONFIG_USART1_BAUD=115200
-CONFIG_USART2_BAUD=115200
-CONFIG_USART3_BAUD=115200
-CONFIG_UART4_BAUD=115200
-CONFIG_UART5_BAUD=115200
+#
+# 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_IMX 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_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_SAM34 is not set
+CONFIG_ARCH_CHIP_STM32=y
+# CONFIG_ARCH_CHIP_STR71X 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_CORTEXA5 is not set
+# CONFIG_ARCH_CORTEXA8 is not set
+CONFIG_ARCH_FAMILY="armv7-m"
+CONFIG_ARCH_CHIP="stm32"
+# CONFIG_ARMV7M_USEBASEPRI is not set
+CONFIG_ARCH_HAVE_CMNVECTOR=y
+# CONFIG_ARMV7M_CMNVECTOR is not set
+# CONFIG_ARCH_HAVE_FPU is not set
+CONFIG_ARCH_HAVE_MPU=y
+# CONFIG_ARMV7M_MPU is not set
 
-CONFIG_USART1_BITS=8
-CONFIG_USART2_BITS=8
-CONFIG_USART3_BITS=8
-CONFIG_UART4_BITS=8
-CONFIG_UART5_BITS=8
+#
+# ARMV7M Configuration Options
+#
+# 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=y
+# 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_SERIAL_TERMIOS is not set
 
-CONFIG_USART1_PARITY=0
-CONFIG_USART2_PARITY=0
-CONFIG_USART3_PARITY=0
-CONFIG_UART4_PARITY=0
-CONFIG_UART5_PARITY=0
+#
+# 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_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_STM32F103C4 is not set
+# CONFIG_ARCH_CHIP_STM32F103C8 is not set
+# CONFIG_ARCH_CHIP_STM32F103T8 is not set
+# CONFIG_ARCH_CHIP_STM32F103TB 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_STM32F103V8 is not set
+# CONFIG_ARCH_CHIP_STM32F103VB is not set
+# CONFIG_ARCH_CHIP_STM32F103RET6 is not set
+# CONFIG_ARCH_CHIP_STM32F103VCT6 is not set
+# CONFIG_ARCH_CHIP_STM32F103VET6 is not set
+CONFIG_ARCH_CHIP_STM32F103ZET6=y
+# CONFIG_ARCH_CHIP_STM32F105VBT7 is not set
+# CONFIG_ARCH_CHIP_STM32F107VC is not set
+# CONFIG_ARCH_CHIP_STM32F207IG is not set
+# CONFIG_ARCH_CHIP_STM32F207ZE 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_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_STM32F303VB is not set
+# CONFIG_ARCH_CHIP_STM32F303VC 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 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_STM32_STM32L15XX is not set
+# CONFIG_STM32_ENERGYLITE is not set
+CONFIG_STM32_STM32F10XX=y
+# CONFIG_STM32_VALUELINE is not set
+# CONFIG_STM32_CONNECTIVITYLINE is not set
+CONFIG_STM32_PERFORMANCELINE=y
+CONFIG_STM32_HIGHDENSITY=y
+# CONFIG_STM32_MEDIUMDENSITY is not set
+# CONFIG_STM32_LOWDENSITY is not set
+# CONFIG_STM32_STM32F20XX is not set
+# CONFIG_STM32_STM32F30XX is not set
+# CONFIG_STM32_STM32F40XX is not set
+CONFIG_STM32_DFU=y
 
-CONFIG_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_UART4_2STOP=0
-CONFIG_UART5_2STOP=0
+#
+# STM32 Peripheral Support
+#
+CONFIG_STM32_HAVE_USBDEV=y
+# CONFIG_STM32_HAVE_OTGFS is not set
+# CONFIG_STM32_ADC1 is not set
+# CONFIG_STM32_ADC2 is not set
+# CONFIG_STM32_ADC3 is not set
+CONFIG_STM32_BKP=y
+# CONFIG_STM32_CAN1 is not set
+# CONFIG_STM32_CRC 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_FSMC=y
+# CONFIG_STM32_I2C1 is not set
+# CONFIG_STM32_I2C2 is not set
+CONFIG_STM32_PWR=y
+# 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_TIM1=y
+# 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_USART1=y
+CONFIG_STM32_USART2=y
+# CONFIG_STM32_USART3 is not set
+# CONFIG_STM32_UART4 is not set
+# CONFIG_STM32_UART5 is not set
+# CONFIG_STM32_USB is not set
+# CONFIG_STM32_IWDG is not set
+# CONFIG_STM32_WWDG is not set
 
 #
-# STM3210E-EVAL specific LCD settings
+# Alternate Pin Mapping
 #
-CONFIG_STM32_AM240320_DISABLE=n
-CONFIG_STM32_SPFD5408B_DISABLE=n
-CONFIG_STM32_R61580_DISABLE=y
+CONFIG_STM32_TIM1_NO_REMAP=y
+# CONFIG_STM32_TIM1_FULL_REMAP is not set
+# CONFIG_STM32_TIM1_PARTIAL_REMAP is not set
+# CONFIG_STM32_USART1_REMAP is not set
+# CONFIG_STM32_USART2_REMAP is not set
+# CONFIG_STM32_JTAG_DISABLE is not set
+CONFIG_STM32_JTAG_FULL_ENABLE=y
+# CONFIG_STM32_JTAG_NOJNTRST_ENABLE is not set
+# CONFIG_STM32_JTAG_SW_ENABLE is not set
+# 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_FSMC_SRAM is not set
+# CONFIG_STM32_TIM1_PWM is not set
+CONFIG_STM32_USART=y
 
 #
-# STM32F10xxx specific CAN device driver settings
+# U[S]ART Configuration
 #
-CONFIG_CAN=n
-CONFIG_CAN_EXTID=y
-#CONFIG_CAN_FIFOSIZE
-#CONFIG_CAN_NPENDINGRTR
-CONFIG_CAN_LOOPBACK=n
-# ISO-11783 requires the baud to be set to 250K
-CONFIG_CAN1_BAUD=250000
-# ISO-11783 requires the sample point to be within 75 to 80%
-CONFIG_CAN_TSEG1=12
-CONFIG_CAN_TSEG2=3
+# CONFIG_USART1_RS485 is not set
+# CONFIG_USART2_RS485 is not set
+# CONFIG_SERIAL_DISABLE_REORDERING is not set
+# CONFIG_STM32_USART_SINGLEWIRE is not set
 
 #
-# I2C configuration
+# USB Host Configuration
 #
-CONFIG_I2C=n
-CONFIG_I2C_POLLED=y
-CONFIG_I2C_TRANSFER=y
-CONFIG_I2C_TRACE=n
 
 #
-# General build options
+# USB Device Configuration
 #
-CONFIG_RRLOAD_BINARY=n
-CONFIG_INTELHEX_BINARY=y
-CONFIG_MOTOROLA_SREC=n
-CONFIG_RAW_BINARY=n
 
 #
-# General OS setup
+# 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_CUSTOM_STACK is not set
+# CONFIG_ADDRENV is not set
+CONFIG_ARCH_HAVE_VFORK=y
+# CONFIG_ARCH_HAVE_MMU is not set
+# CONFIG_ARCH_NAND_HWECC is not set
+CONFIG_ARCH_IRQPRIO=y
+CONFIG_ARCH_STACKDUMP=y
+# CONFIG_ENDIAN_BIG is not set
+CONFIG_ARCH_IDLE_CUSTOM=y
+CONFIG_ARCH_CUSTOM_PMINIT=y
+# CONFIG_ARCH_HAVE_RAMFUNCS is not set
+CONFIG_ARCH_HAVE_RAMVECTORS=y
+# CONFIG_ARCH_RAMVECTORS is not set
+
 #
-CONFIG_USER_ENTRYPOINT="nsh_main"
-CONFIG_DEBUG=n
-CONFIG_DEBUG_VERBOSE=n
-CONFIG_DEBUG_GRAPHICS=n
-CONFIG_DEBUG_LCD=n
-CONFIG_DEBUG_USB=n
-CONFIG_DEBUG_I2C=n
-CONFIG_DEBUG_SYMBOLS=n
-CONFIG_DEBUG_CAN=n
-CONFIG_HAVE_CXX=n
-CONFIG_HAVE_CXXINITIALIZE=n
-CONFIG_MM_REGIONS=1
-CONFIG_ARCH_LOWPUTC=y
-CONFIG_RR_INTERVAL=200
-CONFIG_SCHED_INSTRUMENTATION=n
-CONFIG_TASK_NAME_SIZE=0
-CONFIG_START_YEAR=2011
-CONFIG_START_MONTH=7
-CONFIG_START_DAY=5
-CONFIG_GREGORIAN_TIME=n
-CONFIG_JULIAN_TIME=n
-CONFIG_DEV_CONSOLE=y
-CONFIG_DEV_LOWCONSOLE=n
-CONFIG_MUTEX_TYPES=n
-CONFIG_PRIORITY_INHERITANCE=n
-CONFIG_SEM_PREALLOCHOLDERS=0
-CONFIG_SEM_NNESTPRIO=0
-CONFIG_FDCLONE_DISABLE=n
-CONFIG_FDCLONE_STDIO=n
-CONFIG_SDCLONE_DISABLE=y
-CONFIG_SCHED_WORKQUEUE=y
-CONFIG_SCHED_WORKPRIORITY=192
-CONFIG_SCHED_WORKPERIOD=50000
-CONFIG_SCHED_WORKSTACKSIZE=1024
-CONFIG_SIG_SIGWORK=17
-CONFIG_SCHED_WAITPID=y
-CONFIG_SCHED_ATEXIT=n
+# Board Settings
+#
+CONFIG_BOARD_LOOPSPERMSEC=5483
+# CONFIG_ARCH_CALIBRATION is not set
 
 #
-# General Power Management Configuration
-# (see include/nuttx/power/pm.h for many more standard configuration options)
+# Interrupt options
 #
-CONFIG_PM=y
-CONFIG_ARCH_CUSTOM_PMINIT=y
-CONFIG_ARCH_IDLE_CUSTOM=y
-CONFIG_PM_SLEEP_WAKEUP=n
+CONFIG_ARCH_HAVE_INTERRUPTSTACK=y
+CONFIG_ARCH_INTERRUPTSTACK=0
+CONFIG_ARCH_HAVE_HIPRI_INTERRUPT=y
+# CONFIG_ARCH_HIPRI_INTERRUPT is not set
 
 #
-# Board/Application-Specific Power Management Configuration.
-# These settings are probably not meaningful outside of this configuration
+# Boot options
 #
-# Button support can be built into the configs/stm3210e-eval/pm configuration
-# to support PM testing.  These would not be part of a normal, operational
-# configuration.
+# 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
+
 #
-CONFIG_PM_BUTTONS=y
-CONFIG_PM_IRQBUTTONS_MIN=0
-CONFIG_PM_IRQBUTTONS_MAX=7
+# Boot Memory Configuration
+#
+CONFIG_RAM_START=0x20000000
+CONFIG_RAM_SIZE=65536
+# CONFIG_ARCH_HAVE_SDRAM is not set
 
 #
-# Settings for NXFLAT
+# Board Selection
 #
-CONFIG_NXFLAT=y
-CONFIG_NXFLAT_DUMPBUFFER=n
-CONFIG_SYMTAB_ORDEREDBYNAME=y
+CONFIG_ARCH_BOARD_STM3210E_EVAL=y
+# CONFIG_ARCH_BOARD_CUSTOM is not set
+CONFIG_ARCH_BOARD="stm3210e-eval"
 
 #
-# The following can be used to disable categories of
-# APIs supported by the OS.  If the compiler supports
-# weak functions, then it should not be necessary to
-# disable functions unless you want to restrict usage
-# of those APIs.
+# Common Board Options
 #
-# There are certain dependency relationships in these
-# features.
+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=y
+CONFIG_NSH_MMCSDMINOR=0
+
 #
-# o mq_notify logic depends on signals to awaken tasks
-#   waiting for queues to become full or empty.
-# o pthread_condtimedwait() depends on signals to wake
-#   up waiting tasks.
+# Board-Specific Options
 #
-CONFIG_DISABLE_CLOCK=n
-CONFIG_DISABLE_POSIX_TIMERS=n
-CONFIG_DISABLE_PTHREAD=n
-CONFIG_DISABLE_SIGNALS=n
-CONFIG_DISABLE_MQUEUE=n
-CONFIG_DISABLE_MOUNTPOINT=n
-CONFIG_DISABLE_ENVIRON=n
-CONFIG_DISABLE_POLL=y
+CONFIG_PM_ALARM_SEC=15
+CONFIG_PM_ALARM_NSEC=0
+# CONFIG_PM_SLEEP_WAKEUP is not set
+CONFIG_PM_SLEEP_WAKEUP_SEC=10
+CONFIG_PM_SLEEP_WAKEUP_NSEC=0
 
 #
-# Misc libc settings
+# STM3210E-EVAL LCD Hardware Configuration
 #
-CONFIG_NOPRINTF_FIELDWIDTH=n
+CONFIG_STM3210E_LCD=y
+CONFIG_STM3210E_LCD_BACKLIGHT=y
+CONFIG_STM3210E_LCD_PWM=y
+CONFIG_STM3210E_LCD_RDSHIFT=5
+# CONFIG_STM3210E_AM240320_DISABLE is not set
+# CONFIG_STM3210E_SPFD5408B_DISABLE is not set
+CONFIG_STM3210E_R61580_DISABLE=y
+CONFIG_PM_BUTTONS=y
+CONFIG_PM_BUTTONS_MIN=0
+CONFIG_PM_BUTTONS_MAX=7
+CONFIG_PM_IRQBUTTONS_MIN=0
+CONFIG_PM_IRQBUTTONS_MAX=7
+CONFIG_PM_BUTTON_ACTIVITY=10
 
 #
-# Allow for architecture optimized implementations
+# RTOS Features
 #
-# The architecture can provide optimized versions of the
-# following to improve system performance
+# CONFIG_BOARD_INITIALIZE is not set
+CONFIG_MSEC_PER_TICK=10
+# 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_JULIAN_TIME is not set
+CONFIG_START_YEAR=2011
+CONFIG_START_MONTH=7
+CONFIG_START_DAY=5
+CONFIG_DEV_CONSOLE=y
+# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PRIORITY_INHERITANCE is not set
+# CONFIG_FDCLONE_DISABLE is not set
+# CONFIG_FDCLONE_STDIO is not set
+CONFIG_SDCLONE_DISABLE=y
+CONFIG_SCHED_WAITPID=y
+# 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_CLOCK is not set
+# 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
 #
-CONFIG_ARCH_MEMCPY=n
-CONFIG_ARCH_MEMCMP=n
-CONFIG_ARCH_MEMMOVE=n
-CONFIG_ARCH_MEMSET=n
-CONFIG_ARCH_STRCMP=n
-CONFIG_ARCH_STRCPY=n
-CONFIG_ARCH_STRNCPY=n
-CONFIG_ARCH_STRLEN=n
-CONFIG_ARCH_STRNLEN=n
-CONFIG_ARCH_BZERO=n
+CONFIG_SIG_SIGUSR1=1
+CONFIG_SIG_SIGUSR2=2
+CONFIG_SIG_SIGALARM=3
+CONFIG_SIG_SIGCONDTIMEDOUT=16
+CONFIG_SIG_SIGWORK=17
 
 #
 # Sizes of configurable things (0 disables)
@@ -351,8 +435,6 @@ CONFIG_NPTHREAD_KEYS=4
 CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NFILE_STREAMS=8
 CONFIG_NAME_MAX=32
-CONFIG_STDIO_BUFFER_SIZE=64
-CONFIG_NUNGET_CHARS=2
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
 CONFIG_MAX_WDOGPARMS=2
@@ -360,409 +442,607 @@ CONFIG_PREALLOC_WDOGS=4
 CONFIG_PREALLOC_TIMERS=4
 
 #
-# Framebuffer driver options
+# Stack and heap information
 #
-CONFIG_FB_CMAP=n
-CONFIG_FB_HWCURSOR=n
-CONFIG_FB_HWCURSORIMAGE=n
-#CONFIG_FB_HWCURSORSIZE
-#CONFIG_FB_TRANSPARENCY
+CONFIG_IDLETHREAD_STACKSIZE=1024
+CONFIG_USERMAIN_STACKSIZE=2048
+CONFIG_PTHREAD_STACK_MIN=256
+CONFIG_PTHREAD_STACK_DEFAULT=2048
 
 #
-# Filesystem configuration
+# Device Drivers
 #
-CONFIG_FS_FAT=y
-CONFIG_FAT_LCNAMES=y
-CONFIG_FAT_LFN=y
-CONFIG_FAT_MAXFNAME=32
-CONFIG_FS_NXFFS=n
-CONFIG_FS_ROMFS=n
+CONFIG_DISABLE_POLL=y
+CONFIG_DEV_NULL=y
+# CONFIG_DEV_ZERO is not set
+# CONFIG_LOOP is not set
+# CONFIG_RAMDISK is not set
+# CONFIG_CAN is not set
+# CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_PWM is not set
+CONFIG_ARCH_HAVE_I2CRESET=y
+# CONFIG_I2C is not set
+# CONFIG_SPI is not set
+# CONFIG_I2S is not set
+CONFIG_RTC=y
+# CONFIG_RTC_DATETIME is not set
+CONFIG_RTC_HIRES=y
+CONFIG_RTC_FREQUENCY=16384
+CONFIG_RTC_ALARM=y
+# 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_LCD=y
 
 #
-# Maintain legacy build behavior (revisit)
+# Common LCD Settings
 #
+CONFIG_LCD_NOGETRUN=y
+CONFIG_LCD_MAXCONTRAST=100
+CONFIG_LCD_MAXPOWER=100
 
-CONFIG_MMCSD=y
-CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SDIO=y
-CONFIG_MTD=y
+#
+# Graphic LCD Devices
+#
+# CONFIG_LCD_P14201 is not set
+# CONFIG_LCD_NOKIA6100 is not set
+# CONFIG_LCD_MIO283QT2 is not set
+# CONFIG_LCD_ST7567 is not set
+# CONFIG_LCD_UG2864AMBAG01 is not set
+# CONFIG_LCD_SSD1289 is not set
+# CONFIG_LCD_SHARP_MEMLCD is not set
+# CONFIG_LCD_LANDSCAPE is not set
+# CONFIG_LCD_PORTRAIT is not set
+CONFIG_LCD_RPORTRAIT=y
+# CONFIG_LCD_RLANDSCAPE is not set
 
 #
-# SPI-based MMC/SD driver
+# Alphanumeric/Segment LCD Devices
 #
-CONFIG_MMCSD_NSLOTS=1
-CONFIG_MMCSD_READONLY=n
-CONFIG_MMCSD_SPICLOCK=12500000
+# CONFIG_LCD_LCD1602 is not set
+# CONFIG_MMCSD is not set
+# CONFIG_MTD is not set
+# CONFIG_PIPES is not set
+CONFIG_PM=y
+# 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_ARCH_HAVE_USART1=y
+CONFIG_ARCH_HAVE_USART2=y
 
 #
-# Block driver buffering
+# USART Configuration
 #
-CONFIG_FS_READAHEAD=n
-CONFIG_FS_WRITEBUFFER=n
+CONFIG_USART1_ISUART=y
+CONFIG_USART2_ISUART=y
+CONFIG_MCU_SERIAL=y
+CONFIG_STANDARD_SERIAL=y
+CONFIG_USART1_SERIAL_CONSOLE=y
+# CONFIG_USART2_SERIAL_CONSOLE is not set
+# CONFIG_NO_SERIAL_CONSOLE is not set
 
 #
-# STM32 SDIO-based MMC/SD driver
+# USART1 Configuration
 #
-CONFIG_SDIO_DMA=n
-#CONFIG_SDIO_PRI=128
-#CONFIG_SDIO_DMAPRIO
-#CONFIG_SDIO_WIDTH_D1_ONLY
-CONFIG_MMCSD_MMCSUPPORT=n
-CONFIG_MMCSD_HAVECARDDETECT=n
+CONFIG_USART1_RXBUFSIZE=256
+CONFIG_USART1_TXBUFSIZE=256
+CONFIG_USART1_BAUD=115200
+CONFIG_USART1_BITS=8
+CONFIG_USART1_PARITY=0
+CONFIG_USART1_2STOP=0
+# CONFIG_USART1_IFLOWCONTROL is not set
+# CONFIG_USART1_OFLOWCONTROL is not set
 
 #
-# TCP/IP and UDP support via uIP
+# USART2 Configuration
 #
-CONFIG_NET=n
-CONFIG_NET_IPv6=n
-CONFIG_NSOCKET_DESCRIPTORS=0
-CONFIG_NET_SOCKOPTS=y
-CONFIG_NET_BUFSIZE=420
-CONFIG_NET_TCP=n
-CONFIG_NET_TCP_CONNS=40
-CONFIG_NET_MAX_LISTENPORTS=40
-CONFIG_NET_UDP=n
-CONFIG_NET_UDP_CHECKSUMS=y
-#CONFIG_NET_UDP_CONNS=10
-CONFIG_NET_ICMP=n
-CONFIG_NET_ICMP_PING=n
-#CONFIG_NET_PINGADDRCONF=0
-CONFIG_NET_STATISTICS=y
-#CONFIG_NET_RECEIVE_WINDOW=
-#CONFIG_NET_ARPTAB_SIZE=8
-CONFIG_NET_BROADCAST=n
+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_SERIAL_IFLOWCONTROL is not set
+# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_USBDEV is not set
+# CONFIG_USBHOST is not set
+# CONFIG_WIRELESS is not set
 
 #
-# UIP Network Utilities
+# System Logging Device Options
 #
-CONFIG_NET_DHCP_LIGHT=n
-CONFIG_NET_RESOLV_ENTRIES=4
 
 #
-# USB Device Configuration
+# System Logging
+#
+# CONFIG_RAMLOG is not set
+
+#
+# Networking Support
+#
+# CONFIG_ARCH_HAVE_NET is not set
+# CONFIG_ARCH_HAVE_PHY is not set
+# CONFIG_NET is not set
+
+#
+# File Systems
+#
+
+#
+# File system configuration
+#
+# CONFIG_DISABLE_MOUNTPOINT is not set
+# CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
+# CONFIG_FS_READABLE is not set
+# CONFIG_FS_WRITABLE is not set
+# 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_SMARTFS is not set
+# CONFIG_FS_BINFS is not set
+# CONFIG_FS_PROCFS is not set
+
+#
+# System Logging
 #
-CONFIG_USBDEV=n
-CONFIG_USBDEV_COMPOSITE=n
-CONFIG_USBDEV_ISOCHRONOUS=n
-CONFIG_USBDEV_DUALSPEED=n
-CONFIG_USBDEV_SELFPOWERED=y
-CONFIG_USBDEV_REMOTEWAKEUP=n
-CONFIG_USBDEV_MAXPOWER=100
-CONFIG_USBDEV_TRACE=n
-CONFIG_USBDEV_TRACE_NRECORDS=128
-
-#
-# USB Serial Device Configuration
-#
-CONFIG_PL2303=n
-CONFIG_PL2303_EPINTIN=1
-CONFIG_PL2303_EPBULKOUT=2
-CONFIG_PL2303_EPBULKIN=3
-CONFIG_PL2303_NWRREQS=4
-CONFIG_PL2303_NRDREQS=4
-CONFIG_PL2303_VENDORID=0x067b
-CONFIG_PL2303_PRODUCTID=0x2303
-CONFIG_PL2303_VENDORSTR="Nuttx"
-CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
-CONFIG_PL2303_RXBUFSIZE=512
-CONFIG_PL2303_TXBUFSIZE=512
-
-#
-# USB serial device class driver (Standard CDC ACM class)
-#
-CONFIG_CDCACM=n
-CONFIG_CDCACM_COMPOSITE=y
-#CONFIG_CDCACM_EP0MAXPACKET
-#CONFIG_CDCACM_EPINTIN
-#CONFIG_CDCACM_EPINTIN_FSSIZE
-#CONFIG_CDCACM_EPINTIN_HSSIZE
-#CONFIG_CDCACM_EPBULKOUT
-#CONFIG_CDCACM_EPBULKOUT_FSSIZE
-#CONFIG_CDCACM_EPBULKOUT_HSSIZE
-#CONFIG_CDCACM_EPBULKIN
-#CONFIG_CDCACM_EPBULKIN_FSSIZE
-#CONFIG_CDCACM_EPBULKIN_HSSIZE
-#CONFIG_CDCACM_NWRREQS
-#CONFIG_CDCACM_NRDREQS
-#CONFIG_CDCACM_VENDORID
-#CONFIG_CDCACM_VENDORSTR
-#CONFIG_CDCACM_PRODUCTID
-#CONFIG_CDCACM_PRODUCTSTR
-#CONFIG_CDCACM_RXBUFSIZE
-#CONFIG_CDCACM_TXBUFSIZE
-#
-# USB Storage Device Configuration
-#
-CONFIG_USBMSC=n
-CONFIG_USBMSC_COMPOSITE=y
-CONFIG_USBMSC_EP0MAXPACKET=64
-CONFIG_USBMSC_EPBULKOUT=2
-CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBMSC_BULKOUTREQLEN=256
-CONFIG_USBMSC_VENDORID=0x584e
-CONFIG_USBMSC_VENDORSTR="NuttX"
-CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBMSC_VERSIONNO=0x0399
-CONFIG_USBMSC_REMOVABLE=y
-
-#
-# Watchdog timer configuration
-#
-CONFIG_WATCHDOG=n
-
-#
-# Graphics related configuration settings
+# CONFIG_SYSLOG_ENABLE is not set
+# CONFIG_SYSLOG is not set
+
+#
+# Graphics Support
 #
 CONFIG_NX=y
-CONFIG_NX_MULTIUSER=n
+CONFIG_NX_LCDDRIVER=y
 CONFIG_NX_NPLANES=1
+# CONFIG_NX_WRITEONLY is not set
+
+#
+# Supported Pixel Depths
+#
 CONFIG_NX_DISABLE_1BPP=y
 CONFIG_NX_DISABLE_2BPP=y
 CONFIG_NX_DISABLE_4BPP=y
 CONFIG_NX_DISABLE_8BPP=y
-CONFIG_NX_DISABLE_16BPP=n
+# CONFIG_NX_DISABLE_16BPP is not set
 CONFIG_NX_DISABLE_24BPP=y
 CONFIG_NX_DISABLE_32BPP=y
-CONFIG_NX_PACKEDMSFIRST=n
-CONFIG_NX_LCDDRIVER=y
-CONFIG_LCD_MAXPOWER=100
-CONFIG_LCD_MAXCONTRAST=100
-CONFIG_NX_MOUSE=y
-CONFIG_NX_KBD=y
-#CONFIG_NXTK_BORDERWIDTH=4
-CONFIG_NXTK_BORDERCOLOR1=0xd69a
-CONFIG_NXTK_BORDERCOLOR2=0xad55
-CONFIG_NXTK_AUTORAISE=n
-CONFIG_NXFONT_SANS22X29=n
-CONFIG_NXFONT_SANS23X27=y
-CONFIG_NXFONT_SANS28X37=n
-CONFIG_NXFONT_SANS22X29B=n
-CONFIG_NXFONT_SANS28X37B=y
-CONFIG_NXFONT_SANS40X49B=n
-CONFIG_NXFONT_SERIF22X29=n
-CONFIG_NXFONT_SERIF29X37=n
-CONFIG_NXFONT_SERIF38X48=n
-CONFIG_NXFONT_SERIF22X28B=n
-CONFIG_NXFONT_SERIF27X38B=n
-CONFIG_NXFONT_SERIF38X49B=n
-CONFIG_NXFONTS_CHARBITS=7
-CONFIG_NX_BLOCKING=y
-CONFIG_NX_MXSERVERMSGS=32
-CONFIG_NX_MXCLIENTMSGS=16
+# CONFIG_NX_PACKEDMSFIRST is not set
 
 #
-# NxConsole Configuration Settings:
-#
-CONFIG_NXCONSOLE=n
-CONFIG_NXCONSOLE_BPP=16
-CONFIG_NXCONSOLE_MXCHARS=256
-CONFIG_NXCONSOLE_CACHESIZE=32
+# Input Devices
 #
+CONFIG_NX_MOUSE=y
+CONFIG_NX_KBD=y
 
 #
-# STM3210E-EVAL LCD Hardware Configuration
+# Framed Window Borders
 #
-CONFIG_LCD_NOGETRUN=y
-CONFIG_LCD_LANDSCAPE=n
-CONFIG_LCD_PORTRAIT=n
-CONFIG_LCD_RPORTRAIT=y
-CONFIG_LCD_BACKLIGHT=y
-CONFIG_LCD_PWM=y
+CONFIG_NXTK_BORDERWIDTH=4
+# CONFIG_NXTK_DEFAULT_BORDERCOLORS is not set
+CONFIG_NXTK_BORDERCOLOR1=0xad55
+CONFIG_NXTK_BORDERCOLOR2=0x6b4d
+CONFIG_NXTK_BORDERCOLOR3=0xdedb
+# CONFIG_NXTK_AUTORAISE is not set
 
 #
-# Settings for examples/uip
+# Font Selections
 #
-CONFIG_EXAMPLES_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLES_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLES_UIP_DHCPC=n
+CONFIG_NXFONTS_CHARBITS=7
+# CONFIG_NXFONT_MONO5X8 is not set
+# CONFIG_NXFONT_SANS17X22 is not set
+# CONFIG_NXFONT_SANS20X26 is not set
+CONFIG_NXFONT_SANS23X27=y
+# CONFIG_NXFONT_SANS22X29 is not set
+# CONFIG_NXFONT_SANS28X37 is not set
+# CONFIG_NXFONT_SANS39X48 is not set
+# CONFIG_NXFONT_SANS17X23B is not set
+# CONFIG_NXFONT_SANS20X27B is not set
+# CONFIG_NXFONT_SANS22X29B is not set
+CONFIG_NXFONT_SANS28X37B=y
+# CONFIG_NXFONT_SANS40X49B is not set
+# CONFIG_NXFONT_SERIF22X29 is not set
+# CONFIG_NXFONT_SERIF29X37 is not set
+# CONFIG_NXFONT_SERIF38X48 is not set
+# CONFIG_NXFONT_SERIF22X28B is not set
+# CONFIG_NXFONT_SERIF27X38B is not set
+# CONFIG_NXFONT_SERIF38X49B is not set
+# CONFIG_NXCONSOLE is not set
 
 #
-# Settings for examples/nettest
-CONFIG_EXAMPLES_NETTEST_SERVER=n
-CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLES_NETTEST_NOMAC=n
-CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
+# NX Multi-user only options
+#
+# CONFIG_NX_MULTIUSER is not set
 
 #
-# Settings for examples/buttons
+# Memory Management
 #
-CONFIG_EXAMPLES_IRQBUTTONS_MIN=0
-CONFIG_EXAMPLES_IRQBUTTONS_MAX=7
-CONFIG_EXAMPLES_BUTTONS_NAME0="WAKEUP"
-CONFIG_EXAMPLES_BUTTONS_NAME1="TAMPER"
-CONFIG_EXAMPLES_BUTTONS_NAME2="KEY"
-CONFIG_EXAMPLES_BUTTONS_NAME3="SELECT"
-CONFIG_EXAMPLES_BUTTONS_NAME4="DOWN"
-CONFIG_EXAMPLES_BUTTONS_NAME5="LEFT"
-CONFIG_EXAMPLES_BUTTONS_NAME6="RIGHT"
-CONFIG_EXAMPLES_BUTTONS_NAME7="UP"
+# CONFIG_MM_MULTIHEAP is not set
+# CONFIG_MM_SMALL is not set
+CONFIG_MM_REGIONS=1
+# CONFIG_ARCH_HAVE_HEAP2 is not set
+# CONFIG_GRAN is not set
 
 #
-# Settings for examples/ostest
+# Audio Support
 #
-CONFIG_EXAMPLES_OSTEST_LOOPS=1
-CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
-CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
+# CONFIG_AUDIO is not set
 
 #
-# Settings for apps/nshlib
+# Binary Formats
 #
+# 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_NSH_BUILTIN_APPS=y
-CONFIG_NSH_FILEIOSIZE=512
-CONFIG_NSH_STRERROR=n
-CONFIG_NSH_LINELEN=64
-CONFIG_NSH_NESTDEPTH=3
-CONFIG_NSH_DISABLESCRIPT=n
-CONFIG_NSH_DISABLEBG=n
-CONFIG_NSH_ROMFSETC=n
-CONFIG_NSH_CONSOLE=y
-#CONFIG_NSH_CONDEV="/dev/ttyS1"
-CONFIG_NSH_TELNET=n
-CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_IOBUFFER_SIZE=512
-CONFIG_NSH_DHCPC=n
-CONFIG_NSH_NOMAC=n
-CONFIG_NSH_IPADDR=0x0a000002
-CONFIG_NSH_DRIPADDR=0x0a000001
-CONFIG_NSH_NETMASK=0xffffff00
-CONFIG_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_NSH_ROMFSDEVNO=0
-CONFIG_NSH_ROMFSSECTSIZE=64
-CONFIG_NSH_FATDEVNO=1
-CONFIG_NSH_FATSECTSIZE=512
-CONFIG_NSH_FATNSECTORS=1024
-CONFIG_NSH_FATMOUNTPT="/tmp"
-
-#
-# Architecture-specific NSH options
-#
-CONFIG_NSH_MMCSDSPIPORTNO=0
-CONFIG_NSH_MMCSDSLOTNO=0
-CONFIG_NSH_MMCSDMINOR=0
+# CONFIG_PIC is not set
+# CONFIG_SYMTAB_ORDEREDBYNAME is not set
 
+#
+# Library Routines
+#
 
 #
-# I2C tool settings
+# Standard C Library Options
 #
-CONFIG_I2CTOOL_MINBUS=1
-CONFIG_I2CTOOL_MAXBUS=2
-#CONFIG_I2CTOOL_MINADDR
-#CONFIG_I2CTOOL_MAXADDR
-#CONFIG_I2CTOOL_MAXREGADDR
-CONFIG_I2CTOOL_DEFFREQ=100000
+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_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_LIB_SENDFILE_BUFSIZE=512
+# CONFIG_ARCH_ROMGETC is not set
+# CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
 
 #
-# Settings for examples/usbserial
+# Non-standard Library Support
 #
-CONFIG_EXAMPLES_USBSERIAL_INONLY=n
-CONFIG_EXAMPLES_USBSERIAL_OUTONLY=n
-CONFIG_EXAMPLES_USBSERIAL_ONLYSMALL=n
-CONFIG_EXAMPLES_USBSERIAL_ONLYBIG=n
+CONFIG_SCHED_WORKQUEUE=y
+CONFIG_SCHED_HPWORK=y
+CONFIG_SCHED_WORKPRIORITY=192
+CONFIG_SCHED_WORKPERIOD=50000
+CONFIG_SCHED_WORKSTACKSIZE=1024
+# CONFIG_SCHED_LPWORK is not set
+# CONFIG_LIB_KBDCODEC is not set
+# CONFIG_LIB_SLCDCODEC is not set
 
-CONFIG_EXAMPLES_USBSERIAL_TRACEINIT=n
-CONFIG_EXAMPLES_USBSERIAL_TRACECLASS=n
-CONFIG_EXAMPLES_USBSERIAL_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS=n
+#
+# Basic CXX Support
+#
+# CONFIG_C99_BOOL8 is not set
+# CONFIG_HAVE_CXX is not set
 
-# Settings for examples/can
+#
+# Application Configuration
 #
 
 #
-# Settings for examples/nx
+# Built-In Applications
+#
+CONFIG_BUILTIN_PROXY_STACKSIZE=1024
+
 #
+# Examples
+#
+# CONFIG_EXAMPLES_BUTTONS is not set
+# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CONFIGDATA 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_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=y
 CONFIG_EXAMPLES_NX_VPLANE=0
 CONFIG_EXAMPLES_NX_DEVNO=0
+# CONFIG_EXAMPLES_NX_DEFAULT_COLORS is not set
 CONFIG_EXAMPLES_NX_BGCOLOR=0x0011
 CONFIG_EXAMPLES_NX_COLOR1=0xaedc
 CONFIG_EXAMPLES_NX_COLOR2=0xe7ff
 CONFIG_EXAMPLES_NX_TBCOLOR=0xd69a
-CONFIG_EXAMPLES_NX_FONTID=0
 CONFIG_EXAMPLES_NX_FONTCOLOR=0x0000
+# CONFIG_EXAMPLES_NX_DEFAULT_FONT is not set
+CONFIG_EXAMPLES_NX_FONTID=0
 CONFIG_EXAMPLES_NX_BPP=16
-CONFIG_EXAMPLES_NX_RAWWINDOWS=n
-CONFIG_EXAMPLES_NX_STACKSIZE=2048
-CONFIG_EXAMPLES_NX_CLIENTPRIO=80
-CONFIG_EXAMPLES_NX_SERVERPRIO=120
-CONFIG_EXAMPLES_NX_NOTIFYSIGNO=4
-CONFIG_EXAMPLES_NX_EXTERNINIT=n
+# CONFIG_EXAMPLES_NX_RAWWINDOWS is not set
+CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT=16
+# CONFIG_EXAMPLES_NX_EXTERNINIT is not set
+# CONFIG_EXAMPLES_NXCONSOLE is not set
+# CONFIG_EXAMPLES_NXFFS is not set
+# CONFIG_EXAMPLES_NXFLAT is not set
+CONFIG_EXAMPLES_NXHELLO=y
+CONFIG_EXAMPLES_NXHELLO_VPLANE=0
+CONFIG_EXAMPLES_NXHELLO_DEVNO=0
+CONFIG_EXAMPLES_NXHELLO_BPP=16
 
 #
-# Settings for examples/nxhello
+# Example Color Configuration
 #
-CONFIG_EXAMPLES_NXHELLO_VPLANE=0
-CONFIG_EXAMPLES_NXHELLO_DEVNO=0
+# CONFIG_EXAMPLES_NXHELLO_DEFAULT_COLORS is not set
 CONFIG_EXAMPLES_NXHELLO_BGCOLOR=0x0011
-CONFIG_EXAMPLES_NXHELLO_FONTID=6
 CONFIG_EXAMPLES_NXHELLO_FONTCOLOR=0xffdf
-CONFIG_EXAMPLES_NXHELLO_BPP=16
-CONFIG_EXAMPLES_NXHELLO_EXTERNINIT=n
 
 #
-# Settings for examples/nximage
+# Example Font Configuration
 #
-CONFIG_EXAMPLES_NXIMAGE_VPLANE=0
-CONFIG_EXAMPLES_NXIMAGE_DEVNO=0
-CONFIG_EXAMPLES_NXIMAGE_BPP=16
-CONFIG_EXAMPLES_NXIMAGE_XSCALEp5=n
-CONFIG_EXAMPLES_NXIMAGE_XSCALE1p5=y
-CONFIG_EXAMPLES_NXIMAGE_XSCALE2p0=n
-CONFIG_EXAMPLES_NXIMAGE_YSCALEp5=n
-CONFIG_EXAMPLES_NXIMAGE_YSCALE1p5=y
-CONFIG_EXAMPLES_NXIMAGE_YSCALE2p0=n
-CONFIG_EXAMPLES_NXIMAGE_EXTERNINIT=n
+# CONFIG_EXAMPLES_NXHELLO_DEFAULT_FONT is not set
+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_NXTEXT is not set
+# CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PASHELLO is not set
+# CONFIG_EXAMPLES_PIPE is not set
+# CONFIG_EXAMPLES_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_RGMP is not set
+# CONFIG_EXAMPLES_ROMFS is not set
+# CONFIG_EXAMPLES_SENDMAIL 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_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_UIP is not set
+# CONFIG_EXAMPLES_USBSERIAL is not set
+# CONFIG_EXAMPLES_USBTERM is not set
+# CONFIG_EXAMPLES_WATCHDOG is not set
 
 #
-# Settings for examples/nxlines
+# Graphics Support
 #
-CONFIG_EXAMPLES_NXLINES_VPLANE=0
-CONFIG_EXAMPLES_NXLINES_DEVNO=0
-CONFIG_EXAMPLES_NXLINES_BGCOLOR=0x0320
-CONFIG_EXAMPLES_NXLINES_LINEWIDTH=16
-CONFIG_EXAMPLES_NXLINES_LINECOLOR=0xffe0
-CONFIG_EXAMPLES_NXLINES_BORDERWIDTH=4
-CONFIG_EXAMPLES_NXLINES_BORDERCOLOR=0xffe0
-CONFIG_EXAMPLES_NXLINES_CIRCLECOLOR=0xf7bb
-CONFIG_EXAMPLES_NXLINES_BPP=16
-CONFIG_EXAMPLES_NXLINES_EXTERNINIT=n
+# CONFIG_TIFF is not set
 
 #
-# Settings for system/usbmsc
+# Interpreters
 #
-CONFIG_SYSTEM_USBMSC_NLUNS=1
-CONFIG_SYSTEM_USBMSC_DEVMINOR1=0
-CONFIG_SYSTEM_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_SYSTEM_USBMSC_DEBUGMM=n
-CONFIG_SYSTEM_USBMSC_TRACEINIT=n
-CONFIG_SYSTEM_USBMSC_TRACECLASS=n
-CONFIG_SYSTEM_USBMSC_TRACETRANSFERS=n
-CONFIG_SYSTEM_USBMSC_TRACECONTROLLER=n
-CONFIG_SYSTEM_USBMSC_TRACEINTERRUPTS=n
+# CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Settings for examples/watchdog
+# Network Utilities
 #
-# This test depends on these specific Watchdog/NSH configurations settings (your
-# specific watchdog hardware settings might require additional settings).
+
 #
+# Networking Utilities
+#
+# CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_DHCPD 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_UIPLIB is not set
+# CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
-# Stack and heap information
+# FreeModBus
 #
-CONFIG_BOOT_RUNFROMFLASH=n
-CONFIG_BOOT_COPYTORAM=n
-CONFIG_CUSTOM_STACK=n
-CONFIG_IDLETHREAD_STACKSIZE=1024
-CONFIG_USERMAIN_STACKSIZE=2048
-CONFIG_PTHREAD_STACK_MIN=256
-CONFIG_PTHREAD_STACK_DEFAULT=2048
+# CONFIG_MODBUS is not set
+
+#
+# NSH Library
+#
+CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_READLINE=y
+# CONFIG_NSH_CLE is not set
+CONFIG_NSH_BUILTIN_APPS=y
+
+#
+# Disable Individual commands
+#
+# CONFIG_NSH_DISABLE_ADDROUTE 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_DD is not set
+# CONFIG_NSH_DISABLE_DF is not set
+# CONFIG_NSH_DISABLE_DELROUTE 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_KILL is not set
+# CONFIG_NSH_DISABLE_LOSETUP is not set
+# 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_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_TEST is not set
+# CONFIG_NSH_DISABLE_UMOUNT 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
+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
+# 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
+#
+# CONFIG_NSH_CONDEV is not set
+CONFIG_NSH_ARCHINIT=y
+
+#
+# NxWidgets/NxWM
+#
+
+#
+# Platform-specific Support
+#
+# CONFIG_PLATFORM_CONFIGDATA is not set
+
+#
+# System Libraries and NSH Add-Ons
+#
+
+#
+# USB CDC/ACM Device Commands
+#
+
+#
+# USB Composite Device Commands
+#
+
+#
+# Custom Free Memory Command
+#
+# CONFIG_SYSTEM_FREE is not set
+
+#
+# I2C tool
+#
+
+#
+# INI File Parser
+#
+# CONFIG_SYSTEM_INIFILE is not set
+
+#
+# FLASH Program Installation
+#
+# 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_SYSTEM_READLINE=y
+CONFIG_READLINE_ECHO=y
+
+#
+# Power Off
+#
+# CONFIG_SYSTEM_POWEROFF is not set
+
+#
+# RAMTRON
+#
+# CONFIG_SYSTEM_RAMTRON is not set
+
+#
+# SD Card
+#
+# CONFIG_SYSTEM_SDCARD is not set
+
+#
+# Sysinfo
+#
+# CONFIG_SYSTEM_SYSINFO is not set
+
+#
+# USB Monitor
+#
+
+#
+# EMACS-like Command Line Editor
+#
+# CONFIG_SYSTEM_CLE is not set
+
+#
+# VI Work-Alike Editor
+#
+# CONFIG_SYSTEM_VI is not set
+
+#
+# Stack Monitor
+#
+
+#
+# USB Mass Storage Device Commands
+#
+
+#
+# Zmodem Commands
+#
+# CONFIG_SYSTEM_ZMODEM is not set
diff --git a/nuttx/configs/stm3210e-eval/src/up_lcd.c b/nuttx/configs/stm3210e-eval/src/up_lcd.c
index 9320a7789..4a65ee4cb 100644
--- a/nuttx/configs/stm3210e-eval/src/up_lcd.c
+++ b/nuttx/configs/stm3210e-eval/src/up_lcd.c
@@ -46,9 +46,9 @@
  * The driver dynamically selects the LCD based on the reported LCD ID value.  However,
  * code size can be reduced by suppressing support for individual LCDs using:
  *
- *   CONFIG_STM32_AM240320_DISABLE
- *   CONFIG_STM32_SPFD5408B_DISABLE
- *   CONFIG_STM32_R61580_DISABLE
+ *   CONFIG_STM3210E_AM240320_DISABLE
+ *   CONFIG_STM3210E_SPFD5408B_DISABLE
+ *   CONFIG_STM3210E_R61580_DISABLE
  *
  * Omitting the above (or setting them to "n") enables support for the LCD.  Setting
  * any of the above to "y" will disable support for the corresponding LCD.
@@ -90,22 +90,22 @@
 
 /* Backlight */
 
-#ifndef CONFIG_LCD_BACKLIGHT
-#  undef CONFIG_LCD_PWM
+#ifndef CONFIG_STM3210E_LCD_BACKLIGHT
+#  undef CONFIG_STM3210E_LCD_PWM
 #endif
 
-#if defined(CONFIG_LCD_BACKLIGHT) && defined(CONFIG_LCD_PWM)
+#if defined(CONFIG_STM3210E_LCD_BACKLIGHT) && defined(CONFIG_STM3210E_LCD_PWM)
 #  if !defined(CONFIG_STM32_TIM1)
-#    warning "CONFIG_LCD_PWM requires CONFIG_STM32_TIM1"
-#    undef CONFIG_LCD_PWM
+#    warning "CONFIG_STM3210E_LCD_PWM requires CONFIG_STM32_TIM1"
+#    undef CONFIG_STM3210E_LCD_PWM
 #  endif
 #  if defined(CONFIG_STM32_TIM1_FULL_REMAP)
 #    warning "PA8 cannot be configured as TIM1 CH1 with full remap"
-#    undef CONFIG_LCD_PWM
+#    undef CONFIG_STM3210E_LCD_PWM
 #  endif
 #endif
 
-#if defined(CONFIG_LCD_BACKLIGHT) && defined(CONFIG_LCD_PWM)
+#if defined(CONFIG_STM3210E_LCD_BACKLIGHT) && defined(CONFIG_STM3210E_LCD_PWM)
 #  if CONFIG_LCD_MAXPOWER < 2
 #    warning "A larger value of CONFIG_LCD_MAXPOWER is recommended"
 #  endif
@@ -115,7 +115,7 @@
 
 #if !defined(CONFIG_LCD_MAXPOWER) || CONFIG_LCD_MAXPOWER < 1
 #  undef CONFIG_LCD_MAXPOWER
-#  if defined(CONFIG_LCD_BACKLIGHT) && defined(CONFIG_LCD_PWM)
+#  if defined(CONFIG_STM3210E_LCD_BACKLIGHT) && defined(CONFIG_STM3210E_LCD_PWM)
 #    define CONFIG_LCD_MAXPOWER 100
 #  else
 #    define CONFIG_LCD_MAXPOWER 1
@@ -128,8 +128,8 @@
 
 /* PWM Frequency */
 
-#ifndef CONFIG_LCD_PWMFREQUENCY
-#  define CONFIG_LCD_PWMFREQUENCY 100
+#ifndef CONFIG_STM3210E_LCD_PWMFREQUENCY
+#  define CONFIG_STM3210E_LCD_PWMFREQUENCY 100
 #endif
 
 /* Check orientation */
@@ -347,7 +347,7 @@ struct stm3210e_dev_s
 
   struct lcd_dev_s dev;
 
-#if defined(CONFIG_LCD_BACKLIGHT) && defined(CONFIG_LCD_PWM)
+#if defined(CONFIG_STM3210E_LCD_BACKLIGHT) && defined(CONFIG_STM3210E_LCD_PWM)
   uint32_t reload;
 #endif
 
@@ -367,7 +367,7 @@ static uint16_t stm3210e_readreg(uint8_t regaddr);
 static inline void stm3210e_gramselect(void);
 static inline void stm3210e_writegram(uint16_t rgbval);
 static void stm3210e_readsetup(FAR uint16_t *accum);
-#ifndef CONFIG_STM32_AM240320_DISABLE
+#ifndef CONFIG_STM3210E_AM240320_DISABLE
 static void stm3210e_readnosetup(FAR uint16_t *accum);
 #endif
 static uint16_t stm3210e_readshift(FAR uint16_t *accum);
@@ -417,7 +417,7 @@ static int stm3210e_pm_prepare(struct pm_callback_s *cb, enum pm_state_e pmstate
 /* Initialization */
 
 static inline void stm3210e_lcdinitialize(void);
-#ifdef CONFIG_LCD_BACKLIGHT
+#ifdef CONFIG_STM3210E_LCD_BACKLIGHT
 static void stm3210e_backlight(void);
 #else
 #  define stm3210e_backlight()
@@ -572,7 +572,7 @@ static inline void stm3210e_writegram(uint16_t rgbval)
 
 /* Used for SPFD5408B and R61580 */
 
-#if !defined(CONFIG_STM32_SPFD5408B_DISABLE) || !defined(CONFIG_STM32_R61580_DISABLE)
+#if !defined(CONFIG_STM3210E_SPFD5408B_DISABLE) || !defined(CONFIG_STM3210E_R61580_DISABLE)
 static void stm3210e_readsetup(FAR uint16_t *accum)
 {
   /* Read-ahead one pixel */
@@ -583,7 +583,7 @@ static void stm3210e_readsetup(FAR uint16_t *accum)
 
 /* Used only for AM240320 */
 
-#ifndef CONFIG_STM32_AM240320_DISABLE
+#ifndef CONFIG_STM3210E_AM240320_DISABLE
 static void stm3210e_readnosetup(FAR uint16_t *accum)
 {
 }
@@ -608,7 +608,7 @@ static void stm3210e_readnosetup(FAR uint16_t *accum)
  * red and green
  */
 
-#ifndef CONFIG_STM32_SPFD5408B_DISABLE
+#ifndef CONFIG_STM3210E_SPFD5408B_DISABLE
 static uint16_t stm3210e_readshift(FAR uint16_t *accum)
 {
   uint16_t red;
@@ -663,7 +663,7 @@ static uint16_t stm3210e_readshift(FAR uint16_t *accum)
  * swaps colors.
  */
 
-#if !defined(CONFIG_STM32_R61580_DISABLE) || !defined(CONFIG_STM32_AM240320_DISABLE)
+#if !defined(CONFIG_STM3210E_R61580_DISABLE) || !defined(CONFIG_STM3210E_AM240320_DISABLE)
 static uint16_t stm3210e_readnoshift(FAR uint16_t *accum)
 {
   /* Read the value (GRAM register already selected) */
@@ -839,21 +839,21 @@ static int stm3210e_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer,
 
   switch (g_lcddev.type)
    {
-#ifndef CONFIG_STM32_SPFD5408B_DISABLE
+#ifndef CONFIG_STM3210E_SPFD5408B_DISABLE
      case LCD_TYPE_SPFD5408B:
        readsetup = stm3210e_readsetup;
        readgram  = stm3210e_readshift;
        break;
 #endif
 
-#ifndef CONFIG_STM32_R61580_DISABLE
+#ifndef CONFIG_STM3210E_R61580_DISABLE
      case LCD_TYPE_R61580:
        readsetup = stm3210e_readsetup;
        readgram  = stm3210e_readnoshift;
        break;
 #endif
 
-#ifndef CONFIG_STM32_AM240320_DISABLE
+#ifndef CONFIG_STM3210E_AM240320_DISABLE
      case LCD_TYPE_AM240320:
        readsetup = stm3210e_readnosetup;
        readgram  = stm3210e_readnoshift;
@@ -1004,8 +1004,8 @@ static int stm3210e_poweroff(void)
 
   /* Disable timer 1 clocking */
 
-#if defined(CONFIG_LCD_BACKLIGHT)
-# if defined(CONFIG_LCD_PWM)
+#if defined(CONFIG_STM3210E_LCD_BACKLIGHT)
+# if defined(CONFIG_STM3210E_LCD_PWM)
   modifyreg32(STM32_RCC_APB2ENR, RCC_APB2ENR_TIM1EN, 0);
 #endif
 
@@ -1042,7 +1042,7 @@ static int stm3210e_setpower(struct lcd_dev_s *dev, int power)
 
   if (power > 0)
     {
-#if defined(CONFIG_LCD_BACKLIGHT) && defined(CONFIG_LCD_PWM)
+#if defined(CONFIG_STM3210E_LCD_BACKLIGHT) && defined(CONFIG_STM3210E_LCD_PWM)
       uint32_t frac;
       uint32_t duty;
 
@@ -1080,8 +1080,8 @@ static int stm3210e_setpower(struct lcd_dev_s *dev, int power)
 #endif
       /* Then turn the display on */
 
-#ifndef CONFIG_STM32_AM240320_DISABLE
-#  if !defined (CONFIG_STM32_SPFD5408B_DISABLE) || !defined(CONFIG_STM32_R61580_DISABLE)
+#ifndef CONFIG_STM3210E_AM240320_DISABLE
+#  if !defined (CONFIG_STM3210E_SPFD5408B_DISABLE) || !defined(CONFIG_STM3210E_R61580_DISABLE)
       stm3210e_writereg(LCD_REG_7, g_lcddev.type == LCD_TYPE_AM240320 ? 0x0173 : 0x0112);
 #  else
       stm3210e_writereg(LCD_REG_7, 0x0173);
@@ -1154,7 +1154,7 @@ static int stm3210e_setcontrast(struct lcd_dev_s *dev, unsigned int contrast)
 #ifdef CONFIG_PM
 static void stm3210e_pm_notify(struct pm_callback_s *cb , enum pm_state_e pmstate)
 {
-#ifdef CONFIG_LCD_PWM
+#ifdef CONFIG_STM3210E_LCD_PWM
   uint32_t frac;
   uint32_t duty;
 #endif
@@ -1165,7 +1165,7 @@ static void stm3210e_pm_notify(struct pm_callback_s *cb , enum pm_state_e pmstat
         {
           /* Restore normal LCD operation */
 
-#ifdef CONFIG_LCD_PWM
+#ifdef CONFIG_STM3210E_LCD_PWM
           frac = (g_lcddev.power << 16) / CONFIG_LCD_MAXPOWER;
           duty = (g_lcddev.reload * frac) >> 16;
           if (duty > 0)
@@ -1182,7 +1182,7 @@ static void stm3210e_pm_notify(struct pm_callback_s *cb , enum pm_state_e pmstat
         {
           /* Entering IDLE mode - Reduce LCD light */
 
-#ifdef CONFIG_LCD_PWM
+#ifdef CONFIG_STM3210E_LCD_PWM
           frac = (g_lcddev.power << 16) / CONFIG_LCD_MAXPOWER;
           duty = (g_lcddev.reload * frac) >> 16;
           if (duty > 0)
@@ -1202,7 +1202,7 @@ static void stm3210e_pm_notify(struct pm_callback_s *cb , enum pm_state_e pmstat
         {
           /* Entering STANDBY mode - Turn display backlight off */
 
-#ifdef CONFIG_LCD_PWM
+#ifdef CONFIG_STM3210E_LCD_PWM
           putreg16(0, STM32_TIM1_CCR1);
 #endif
         }
@@ -1320,7 +1320,7 @@ static inline void stm3210e_lcdinitialize(void)
 
   /* Check if the ID is for the SPFD5408B */
 
-#if !defined(CONFIG_STM32_SPFD5408B_DISABLE)
+#if !defined(CONFIG_STM3210E_SPFD5408B_DISABLE)
   if (id == SPFD5408B_ID)
     {
       /* Set the LCD type for the SPFD5408B */
@@ -1425,7 +1425,7 @@ static inline void stm3210e_lcdinitialize(void)
 
   /* Check if the ID is for the almost compatible R61580 */
 
-#if !defined(CONFIG_STM32_R61580_DISABLE)
+#if !defined(CONFIG_STM3210E_R61580_DISABLE)
   if (id == R61580_ID)
     {
       /* Set the LCD type for the R61580 */
@@ -1497,7 +1497,7 @@ static inline void stm3210e_lcdinitialize(void)
   else
 #endif
     {
-#ifndef CONFIG_STM32_AM240320_DISABLE
+#ifndef CONFIG_STM3210E_AM240320_DISABLE
       /* Set the LCD type for the AM240320 */
 
       g_lcddev.type = LCD_TYPE_AM240320;
@@ -1605,10 +1605,10 @@ static inline void stm3210e_lcdinitialize(void)
  *
  **************************************************************************************/
 
-#ifdef CONFIG_LCD_BACKLIGHT
+#ifdef CONFIG_STM3210E_LCD_BACKLIGHT
 static void stm3210e_backlight(void)
 {
-#ifdef CONFIG_LCD_PWM
+#ifdef CONFIG_STM3210E_LCD_PWM
   uint32_t prescaler;
   uint32_t reload;
   uint32_t timclk;
@@ -1619,7 +1619,7 @@ static void stm3210e_backlight(void)
 
   /* Calculate the TIM1 prescaler value */
 
-  prescaler = (STM32_PCLK2_FREQUENCY / CONFIG_LCD_PWMFREQUENCY + 65534) / 65535;
+  prescaler = (STM32_PCLK2_FREQUENCY / CONFIG_STM3210E_LCD_PWMFREQUENCY + 65534) / 65535;
   if (prescaler < 1)
     {
       prescaler = 1;
@@ -1632,7 +1632,7 @@ static void stm3210e_backlight(void)
   /* Calculate the TIM1 reload value */
 
   timclk = STM32_PCLK2_FREQUENCY / prescaler;
-  reload = timclk / CONFIG_LCD_PWMFREQUENCY;
+  reload = timclk / CONFIG_STM3210E_LCD_PWMFREQUENCY;
 
   if (reload < 1)
     {